Add Signed-By to repositories

Author: jackpot51

config/pop-os/22.04.mk

@@ -11,9 +11,11 @@ GNOME_INITIAL_SETUP_STAMP=21.04
 # DEB822 format system repositories, comment out to disable
 DEB822:=1
 APPS_URI:=http://apt.pop-os.org/proprietary
+APPS_KEY=/etc/apt/trusted.gpg.d/pop-keyring-2017-archive.gpg
 
 # Repositories to be present in installed system
 RELEASE_URI:=http://apt.pop-os.org/release
+RELEASE_KEY=/etc/apt/trusted.gpg.d/pop-keyring-2017-archive.gpg
 
 # Use proposed repositories instead, if requested
 ifeq ($(PROPOSED),1)

config/pop-os/24.04.mk

@@ -14,9 +14,11 @@ GNOME_INITIAL_SETUP_STAMP=21.04
 # DEB822 format system repositories, comment out to disable
 DEB822:=1
 APPS_URI:=http://apt.pop-os.org/proprietary
+APPS_KEY=/etc/apt/trusted.gpg.d/pop-keyring-2017-archive.gpg
 
 # Repositories to be present in installed system
 RELEASE_URI:=http://apt.pop-os.org/release
+RELEASE_KEY=/etc/apt/trusted.gpg.d/pop-keyring-2017-archive.gpg
 
 # Use proposed repositories instead, if requested
 ifeq ($(PROPOSED),1)

mk/chroot.mk

@@ -70,6 +70,7 @@ $(BUILD)/chroot: $(BUILD)/debootstrap
 			URIS=\"${UBUNTU_MIRROR}\" \
 			SUITES=\"$(UBUNTU_CODE) $(UBUNTU_CODE)-security $(UBUNTU_CODE)-updates $(UBUNTU_CODE)-backports\" \
 			COMPONENTS=\"main restricted universe multiverse\" \
+			SIGNED_BY=\"${UBUNTU_KEY}\" \
 			/iso/repos.sh"; \
 	fi
 
@@ -82,6 +83,7 @@ $(BUILD)/chroot: $(BUILD)/debootstrap
 			URIS=\"${RELEASE_URI}\" \
 			SUITES=\"${UBUNTU_CODE}\" \
 			COMPONENTS=\"main\" \
+			SIGNED_BY=\"${RELEASE_KEY}\" \
 			/iso/repos.sh"; \
 	fi
 
@@ -108,6 +110,7 @@ $(BUILD)/chroot: $(BUILD)/debootstrap
 			URIS=\"${APPS_URI}\" \
 			SUITES=\"${UBUNTU_CODE}\" \
 			COMPONENTS=\"main\" \
+			SIGNED_BY=\"${APPS_KEY}\" \
 			/iso/repos.sh"; \
 	fi
 

mk/ubuntu.mk

@@ -16,6 +16,7 @@ UBUNTU_MIRROR:=http://ports.ubuntu.com/ubuntu-ports
 else
 $(error unknown DISTRO_ARCH $(DISTRO_ARCH))
 endif
+UBUNTU_KEY=/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
 
 UBUNTU_COMPONENTS:=\
 	main \

scripts/repos.sh

@@ -12,9 +12,10 @@ export LC_ALL=C
 
 # Set up sources file
 echo "Creating ${FILENAME} sources file"
-echo "X-Repolib-Name: ${NAME}" > ${FILENAME}
-echo "Enabled: yes" >> ${FILENAME}
-echo "Types: ${TYPES}" >> ${FILENAME}
-echo "URIs: ${URIS}" >> ${FILENAME}
-echo "Suites: ${SUITES}" >> ${FILENAME}
-echo "Components: ${COMPONENTS}" >> ${FILENAME}
+echo "X-Repolib-Name: ${NAME}" > "${FILENAME}"
+echo "Enabled: yes" >> "${FILENAME}"
+echo "Types: ${TYPES}" >> "${FILENAME}"
+echo "URIs: ${URIS}" >> "${FILENAME}"
+echo "Suites: ${SUITES}" >> "${FILENAME}"
+echo "Components: ${COMPONENTS}" >> "${FILENAME}"
+echo "Signed-By: ${SIGNED_BY}" >> "${FILENAME}"