On 28/03/2013 09:42, Raphael Hertzog wrote:
Hi, On Tue, 19 Mar 2013, Steve McIntyre wrote:On Tue, Mar 19, 2013 at 04:41:08PM +0200, Robert Spencer wrote:There's a long standing error that I've seen even in on-line official Debian CD build logs. W: GPG error: file: squeeze Release: No keyring installed in /home/idms/tmp/apt/squeeze-amd64/apt/trusted.gpg.d/. Attached please find a patch file that fixes the error.Cool, looks good. I've applied this in svn straight away, and it'll make it into the next upload shortly.Robert, would it be possible to add some parameters to use something else than debian-archive-keyring ? debian-cd ought to be usable to build CD images of Debian derivatives and they don't reuse debian-archive-keyring, instead they provide their own keyring package. Thanks in advance!
Hi,I don't have a non-Debian system to test it on, but I hope the attached patch file meets your requirements (it's for debian-cd 3.1.12).
I have tested it on my build system and the defaults work.On a related note, should I file a bug on the addition of the following line to CONF.sh or just provide another patch?
#export DEBOOTSTRAP_OPTS="--keyring /usr/share/keyrings/debian-archive-keyring.gpg"
-- Robert Spencer
--- Makefile~ 2013-03-19 15:41:47.000000000 +0000 +++ Makefile 2013-04-10 14:29:40.000000000 +0000 @@ -37,6 +37,9 @@ ifndef HOOK HOOK=$(BASEDIR)/tools/$(CODENAME).hook endif +ifndef ARCHIVE_KEYRING +ARCHIVE_KEYRING=debian-archive-keyring +endif export BUILD_DATE=$(shell date -u +%Y%m%d-%H:%M) export ARCHES_NOSRC=$(shell echo $(ARCHES) | sed 's/source//') @@ -227,12 +230,12 @@ :> $(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 + @echo "Setting up archive-keyring" + $(Q)mkdir -p $(TDIR)/archive-keyring + $(Q)dpkg -x $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) $(ARCHIVE_KEYRING)) $(TDIR)/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; \ + ln -s $(TDIR)/archive-keyring/usr/share/keyrings/* $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \ done # Updating the apt database