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

Include debian-ports-archive-keyring on non released architectures 

Closes: #865470
This commit is contained in:
Steve McIntyre 2017-06-22 17:33:10 +01:00
parent 14a650a569
commit b6c7df147a
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -66,6 +66,12 @@ ifndef DEBOOTSTRAP_OPTS
DEBOOTSTRAP_OPTS=--no-check-gpg DEBOOTSTRAP_OPTS=--no-check-gpg
endif 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 ## Internal variables
apt=$(BASEDIR)/tools/apt-selection apt=$(BASEDIR)/tools/apt-selection
check_backports_packages=$(BASEDIR)/tools/check_backports_packages check_backports_packages=$(BASEDIR)/tools/check_backports_packages
@ -392,7 +398,7 @@ $(BDIR)/rawlist:
$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ $(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
if [ _$(INSTALLER_CD) != _1 ]; then \ if [ _$(INSTALLER_CD) != _1 ]; then \
for ARCH in $(ARCHES_NOSRC); do \ 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"; \ [ -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"; \

1
data/base_include_port_architectures Normal file
View File

@ -0,0 +1 @@
debian-ports-archive-keyring

4
debian/changelog vendored
View File

@ -6,6 +6,10 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium
network-manager-gnome, synaptic) network-manager-gnome, synaptic)
* Start buster, simply copying stretch for now * Start buster, simply copying stretch for now
[ JH Chatenet ]
* Include debian-ports-archive-keyring on non released architectures
Closes: #865470
-- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:59:36 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 19 Jun 2017 13:59:36 +0100
debian-cd (3.1.20) unstable; urgency=medium debian-cd (3.1.20) unstable; urgency=medium