Control: tag -1 +pending Hi!
Thanks for the patch. I've just applied it in git now... On Wed, Jun 21, 2017 at 09:15:45PM +0200, jhcha54008 wrote: >Package: debian-cd >Version: 3.1.20 >Tags: patch >Severity: whishlist >X-Debbugs-CC: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>, Helge >Deller <del...@gmx.de>, James Clarke <jrt...@debian.org> > >Dear Maintainer, > >Non released architectures from www.debian-ports.org need the archive >keyring in the package debian-ports-archive-keyring (instead of the >regular debian-archive-keyring). The patch below includes it in >image-trees of the relevant architectures. > >Regards, >JH Chatenet > >--- a/Makefile >+++ b/Makefile >@@ -66,6 +66,12 @@ > DEBOOTSTRAP_OPTS=--no-check-gpg > endif > >+## Port architectures need their archive keyring >+UNRELEASED_PORT_ARCHITECTURES=alpha hppa hurd-i386 m68k ppc64 powerpcspe sh4 >sparc64 x32 >+ifneq (,$(filter $(UNRELEASED_PORT_ARCHITECTURES),$(ARCHES))) >+export BASE_INCLUDE := $(BASEDIR)/data/base_include_port_architectures >$(BASE_INCLUDE) >+endif >+ > ## Internal variables > apt=$(BASEDIR)/tools/apt-selection > check_backports_packages=$(BASEDIR)/tools/check_backports_packages >@@ -392,7 +398,7 @@ > $(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ > if [ _$(INSTALLER_CD) != _1 ]; then \ > for ARCH in $(ARCHES_NOSRC); do \ >- BINCLUDE=`[ -n "$(BASE_INCLUDE)" ] && cat >$(BASE_INCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \ >+ BINCLUDE=`[ -n "$(BASE_INCLUDE)" ] && cat >$(BASE_INCLUDE) | sort -u | tr "\n" "," | sed 's!,$$!!g'`; \ > [ -z "$$BINCLUDE" ] || > BINCLUDE="--include=$$BINCLUDE"; \ > BEXCLUDE=`[ -n "$(BASE_EXCLUDE)" ] && cat > $(BASE_EXCLUDE) | tr "\n" "," | sed 's!,$$!!g'`; \ > [ -z "$$BEXCLUDE" ] || > BEXCLUDE="--exclude=$$BEXCLUDE"; \ >--- /dev/null >+++ b/data/base_include_port_architectures >@@ -0,0 +1 @@ >+debian-ports-archive-keyring > > -- Steve McIntyre, Cambridge, UK. st...@einval.com < liw> everything I know about UK hotels I learned from "Fawlty Towers"
