From 50056582b5951cfa97acbc038f18c57db258ccce Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 11 Apr 2014 13:42:02 -0500
Subject: [PATCH] bb.org: use keyring stored in repo
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
beagleboard.org_image.sh | 2 +-
scripts/chroot.sh | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index 0a95b2df5..29d2be39f 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -422,7 +422,7 @@ repo_external_arch="armhf"
repo_external_server="http://debian.beagleboard.org/packages"
repo_external_dist="wheezy-bbb"
repo_external_components="main"
-repo_external_key="http://debian.beagleboard.org/packages/beagleboneblack-archive-keyring.asc"
+repo_external_key="debian.beagleboard.org-archive-keyring.asc"
#Package: beaglebone
#Version: 0.20140306.1
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 4867bbf53..9c7839383 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -268,6 +268,12 @@ jessie|sid|trusty)
;;
esac
+if [ "x${repo_external}" = "xenable" ] ; then
+ if [ ! "x${repo_external_key}" = "x" ] ; then
+ sudo cp -v ${DIR}/target/keyring/${repo_external_key} ${tempdir}/tmp/${repo_external_key}
+ fi
+fi
+
if [ -f /tmp/sources.list ] ; then
sudo mv /tmp/sources.list ${tempdir}/etc/apt/sources.list
fi
@@ -383,7 +389,8 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
install_pkg_updates () {
if [ "x${repo_external}" = "xenable" ] ; then
- wget --no-verbose ${repo_external_key} -O - | apt-key add -
+ apt-key add /tmp/${repo_external_key}
+ rm -f /tmp/${repo_external_key} || true
fi
if [ "x${chroot_multiarch_armel}" = "xenable" ] ; then
echo "Log: (chroot) multiarch enabled added: [armel]"
--
GitLab