From 677226f8977a8e342b8f6b9703e82d961c9872b8 Mon Sep 17 00:00:00 2001 From: cd-builder user Date: Tue, 7 May 2013 00:29:55 +0000 Subject: [PATCH] Tweak debootstrap handling: The correct path for debootstrap code is /usr/share, not /usr/lib; use that and assume it now. Cope with the $(CODENAME) script not existing, and create a symlink to sid where necessary. Just found in jessie - debootstrap needs updating. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 07c34553..37e2e137 100755 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ TASKDIR=$(BDIR)/tasks ADIR=$(APTTMP) DB_DIR=$(BDIR)/debootstrap -export DEBOOTSTRAP_DIR := $(DB_DIR)/usr/lib/debootstrap +export DEBOOTSTRAP_DIR := $(DB_DIR)/usr/share/debootstrap export PATH := $(DB_DIR)/usr/sbin:$(PATH) export BDIR export TASKDIR @@ -172,8 +172,8 @@ LATEST_DB := $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debootstrap) $(DB_DIR): $(LATEST_DB) @rm -rf $(DB_DIR) $(Q)dpkg -x $(LATEST_DB) $(DB_DIR) - $(Q)if [ ! -e $(DEBOOTSTRAP_DIR) ] ; then \ - ln -sf share $(DB_DIR)/usr/lib ; \ + $(Q)if [ ! -e $(DEBOOTSTRAP_DIR)/scripts/$(CODENAME) ] ; then \ + ln -sf sid $(DEBOOTSTRAP_DIR)/scripts/$(CODENAME) ; \ fi endif