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

* Extract debian-archive-keyring when setting up apt to avoid error 

messages about missing keys. Closes: #703431
This commit is contained in:
Steve McIntyre 2013-03-19 15:33:53 +00:00
parent 6cdcedd924
commit 7bccd7b9ca
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -225,6 +225,16 @@ $(ADIR)/status:
fi; \ fi; \
done; done;
:> $(ADIR)/status :> $(ADIR)/status
# Set up keyring so apt doesn't complain
@echo "Setting up debian-archive-keyring"
$(Q)mkdir -p $(TDIR)/debian-archive-keyring
$(Q)dpkg -x $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debian-archive-keyring) $(TDIR)/debian-archive-keyring
$(Q)for ARCH in $(ARCHES); do \
mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \
ln -s $(TDIR)/debian-archive-keyring/usr/share/keyrings/* $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \
done
# Updating the apt database # Updating the apt database
$(Q)for ARCH in $(ARCHES); do \ $(Q)for ARCH in $(ARCHES); do \
export ARCH=$$ARCH; \ export ARCH=$$ARCH; \

4
debian/changelog vendored
View File

@ -49,6 +49,10 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
select a different desktop. Thanks to Rick Thomas for the select a different desktop. Thanks to Rick Thomas for the
text. Tweaked slightly to list the default on the current disc too. text. Tweaked slightly to list the default on the current disc too.
[ Robert Spencer ]
* Extract debian-archive-keyring when setting up apt to avoid error
messages about missing keys. Closes: #703431
-- 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
debian-cd (3.1.11) unstable; urgency=low debian-cd (3.1.11) unstable; urgency=low