[PATCH][linux-snap][xenial][master] Copy host trusted.gpg keyring only when it exists

Wen-chien Jesse Sung jesse.sung at canonical.com
Tue May 25 10:54:45 UTC 2021


The file may not be available when the snap doesn't build on Launchpad.

Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6f64547..4c1f7f0 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,9 @@ prepare-chroot:
 	# already added there. This does not matter as long as adding the
 	# key will not require installing some additional package.
 	cp /etc/apt/sources.list chroot/etc/apt/sources.list
-	cp /etc/apt/trusted.gpg chroot/etc/apt/trusted.gpg.d/host-trusted.gpg
+	if [ -f /etc/apt/trusted.gpg ]; then \
+		cp /etc/apt/trusted.gpg chroot/etc/apt/trusted.gpg.d/host-trusted.gpg; \
+	fi
 	echo "deb http://ppa.launchpad.net/snappy-dev/image/ubuntu $(RELEASE) main" >> chroot/etc/apt/sources.list
 
 	# install all updates
-- 
2.30.2




More information about the kernel-team mailing list