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

* Don't hardcode the path to debootstrap. And assume there is a debootstrap 

available, as it is a dependency.
This commit is contained in:
Joey Hess 2005-09-14 18:21:31 +00:00
parent 42170bf49c
commit f095d8a3fe
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -371,8 +371,8 @@ ifdef FORCENONUSONCD1
grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us)' - | \
sort | uniq > $(BDIR)/Debian_$(CODENAME)_nonUS
endif
$(Q)if [ -x "/usr/sbin/debootstrap" -a _$(INSTALLER_CD) != _1 ]; then \
/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME) \
$(Q)if [ _$(INSTALLER_CD) != _1 ]; then \
debootstrap --resolve-deps --arch $(ARCH) --print-debs $(CODENAME) \
| tr ' ' '\n' >>$(BDIR)/rawlist; \
fi
$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
@ -498,9 +498,8 @@ $(BDIR)/packages-stamp:
@# Also create .disk/base_components
$(Q)for DISK in $(FIRSTDISKS); do \
DISK=$${DISK##CD}; \
if [ -x "/usr/sbin/debootstrap" ]; then \
ok=yes; \
for p in `/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
ok=yes; \
for p in `/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
if ! grep -q ^$$p$$ $(BDIR)/$$DISK.packages; then \
if [ -n "$(BASE_EXCLUDE)" ] && grep -q ^$$p$$ $(BASE_EXCLUDE); then \
echo "Missing debootstrap-required $$p but included in $(BASE_EXCLUDE)"; \
@ -509,15 +508,12 @@ $(BDIR)/packages-stamp:
ok=no; \
echo "Missing debootstrap-required $$p"; \
fi; \
done; \
if [ "$$ok" = "yes" ]; then \
done; \
if [ "$$ok" = "yes" ]; then \
echo "CD$$DISK contains all packages needed by debootstrap"; \
touch $(BDIR)/CD$$DISK/.disk/base_installable; \
else \
echo "CD$$DISK missing some packages needed by debootstrap"; \
fi; \
else \
echo "Unable to find debootstrap program"; \
echo "CD$$DISK missing some packages needed by debootstrap"; \
fi; \
echo 'main' > $(BDIR)/CD$$DISK/.disk/base_components; \
if [ -n "$(LOCAL)" ]; then \

4
debian/changelog vendored
View File

@ -19,8 +19,10 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
the CDs, and adds IBM chrp boot files. Closes: #328274
* Remove Debian_sid task, which dates from before woody and should not be
used.
* Don't hardcode the path to debootstrap. And assume there is a debootstrap
available, as it is a dependency.
-- Joey Hess <joeyh@debian.org> Wed, 14 Sep 2005 11:32:30 -0400
-- Joey Hess <joeyh@debian.org> Wed, 14 Sep 2005 14:20:46 -0400
debian-cd (2.2.23) unstable; urgency=low