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

* Change debootstrap --print-debs calls to pass debootstrap a mirror to use 

and a temporary directory to work in, so it will avoid downloading the
  Packages files from its hardcoded mirror, and work on amd64 and other
  situations with a non-official Debian mirror. Neccessary since the new
  version of debootstrap has dependency resolution enabled by default.
This commit is contained in:
Joey Hess 2005-10-30 19:12:22 +00:00
parent f315aecc40
commit 04999c7f3b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -375,8 +375,10 @@ ifdef FORCENONUSONCD1
sort | uniq > $(BDIR)/Debian_$(CODENAME)_nonUS
endif
$(Q)if [ _$(INSTALLER_CD) != _1 ]; then \
debootstrap --arch $(ARCH) --print-debs $(CODENAME) \
mkdir -p $(TDIR); \
debootstrap --arch $(ARCH) --print-debs $(CODENAME) $(TDIR)/debootstrap.tmp file:$(MIRROR) \
| tr ' ' '\n' >>$(BDIR)/rawlist; \
rm -rf $(TDIR)/debootstrap.tmp; \
fi
$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
@ -499,10 +501,11 @@ $(BDIR)/packages-stamp:
@# Check that all packages required by debootstrap are included
@# and create .disk/base_installable if yes
@# Also create .disk/base_components
mkdir -p $(TDIR)
$(Q)for DISK in $(FIRSTDISKS); do \
DISK=$${DISK##CD}; \
ok=yes; \
for p in `debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
for p in `debootstrap --arch $(ARCH) --print-debs $(CODENAME) $(TDIR)/debootstrap.tmp file:$(MIRROR)`; 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)"; \
@ -512,6 +515,7 @@ $(BDIR)/packages-stamp:
echo "Missing debootstrap-required $$p"; \
fi; \
done; \
rm -rf $(TDIR)/debootstrap.tmp; \
if [ "$$ok" = "yes" ]; then \
echo "CD$$DISK contains all packages needed by debootstrap"; \
touch $(BDIR)/CD$$DISK/.disk/base_installable; \

5
debian/changelog vendored
View File

@ -37,6 +37,11 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
cleaner and more robust and will make d-i more robust as well.
* Update task.list with new etch (and some old sarge) tasks.
* Update task-full-etch and improve the generation recipe.
* Change debootstrap --print-debs calls to pass debootstrap a mirror to use
and a temporary directory to work in, so it will avoid downloading the
Packages files from its hardcoded mirror, and work on amd64 and other
situations with a non-official Debian mirror. Neccessary since the new
version of debootstrap has dependency resolution enabled by default.
[ Sven Luther ]
* Fixed powerpc cd builds, added powerpc64 kernels to etch/sid, dropped