From d06b25079fb147be2cdc8a201662f7bc6da2211f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 27 Jan 2013 11:16:25 +0100
Subject: Adding bootrap_archive-keys to establish secure trust-chain on top of
 debian-keyring for derivatives.

---
 scripts/build/chroot_archives | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'scripts/build/chroot_archives')

diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index e8c375b09..af02739bd 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -554,13 +554,7 @@ EOF
 			# Installing keyring packages
 			if [ -n "${LB_KEYRING_PACKAGES}" ]
 			then
-				if [ "${LB_DERIVATIVE}" = "true" ]
-				then
-					# Temporary hack (FIXME)
-					Chroot chroot "apt-get ${APT_OPTIONS} --force-yes install ${LB_KEYRING_PACKAGES}"
-				else
-					Apt chroot "install ${LB_KEYRING_PACKAGES}"
-				fi
+				Apt chroot "install ${LB_KEYRING_PACKAGES}"
 			fi
 
 			rm -rf chroot/var/cache/apt/*.bin
-- 
cgit v1.2.3