Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
cd-builder user 2013-05-07 00:29:55 +00:00
parent 5f0cdbd1ee
commit 677226f897
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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