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

Use debootstrap --no-check-gpg by default since many local mirrors 

are not signed (such as temporary mirrors created by simple-cdd).
This commit is contained in:
Raphaël Hertzog 2013-03-01 11:00:36 +00:00
parent d07434cef1
commit 1c4f1894cf
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CONF.sh
View File

@ -50,6 +50,7 @@ unset OMIT_MANUAL || true
unset OMIT_RELEASE_NOTES || true unset OMIT_RELEASE_NOTES || true
unset OMIT_DOC_TOOLS || true unset OMIT_DOC_TOOLS || true
unset MAX_PKG_SIZE || true unset MAX_PKG_SIZE || true
unset DEBOOTSTRAP_OPTS || true
# The debian-cd dir # The debian-cd dir
# Where I am (hoping I'm in the debian-cd dir) # Where I am (hoping I'm in the debian-cd dir)
@ -178,6 +179,12 @@ export CONTRIB=1
#export amd64_MKISOFS="xorriso" #export amd64_MKISOFS="xorriso"
#export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1" #export amd64_MKISOFS_OPTS="-as mkisofs -r -checksum_algorithm_iso md5,sha1"
# By default we use debootstrap --no-check-gpg to find out the minimal set
# of packages because there's no reason to not trust the local mirror. But
# you can be paranoid and then you need to indicate the keyring to use to
# validate the mirror.
#export DEBOOTSTRAP_OPTS="--keyring /usr/share/keyrings/debian-archive-keyring.gpg"
# ISOLinux support for multiboot on CD1 for i386 # ISOLinux support for multiboot on CD1 for i386
export ISOLINUX=1 export ISOLINUX=1

7
Makefile
View File

@ -56,6 +56,11 @@ endif
ifneq (${ARCH_MKISOFS_OPTS},) ifneq (${ARCH_MKISOFS_OPTS},)
MKISOFS_OPTS = ${ARCH_MKISOFS_OPTS} MKISOFS_OPTS = ${ARCH_MKISOFS_OPTS}
endif endif
ifndef DEBOOTSTRAP_OPTS
ifeq (yes,$(shell dpkg --compare-versions `dpkg-query -f'$${Version}' -W debootstrap` ge 1.0.30 && echo -n yes))
DEBOOTSTRAP_OPTS=--no-check-gpg
endif
endif
## Internal variables ## Internal variables
apt=$(BASEDIR)/tools/apt-selection apt=$(BASEDIR)/tools/apt-selection
@ -325,7 +330,7 @@ $(BDIR)/rawlist:
[ -z "$$BINCLUDE" ] || BINCLUDE="--include=$$BINCLUDE"; \ [ -z "$$BINCLUDE" ] || BINCLUDE="--include=$$BINCLUDE"; \
BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \ BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \
[ -z "$$BEXCLUDE" ] || BEXCLUDE="--exclude=$$BEXCLUDE"; \ [ -z "$$BEXCLUDE" ] || BEXCLUDE="--exclude=$$BEXCLUDE"; \
debootstrap --arch $$ARCH \ debootstrap $(DEBOOTSTRAP_OPTS) --arch $$ARCH \
--print-debs \ --print-debs \
$$BINCLUDE $$BEXCLUDE \ $$BINCLUDE $$BEXCLUDE \
$(CODENAME) \ $(CODENAME) \

2
debian/changelog vendored
View File

@ -34,6 +34,8 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
* Add dosfstools to Recommends since it's required by * Add dosfstools to Recommends since it's required by
tools/boot/wheezy/boot-x86 for EFI support. It can't be added to Depends tools/boot/wheezy/boot-x86 for EFI support. It can't be added to Depends
because it's not available on non-Linux systems. because it's not available on non-Linux systems.
* Use debootstrap --no-check-gpg by default since many local mirrors
are not signed (such as temporary mirrors created by simple-cdd).
-- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100 -- Steve McIntyre <93sam@debian.org> Wed, 26 Sep 2012 01:09:13 +0100