diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | share/build-scripts/debconf | 6 | ||||
| -rw-r--r-- | share/doc/host-setup.txt | 2 | ||||
| -rw-r--r-- | share/other/deb.progress-linux.org.gpg | bin | 0 -> 2310 bytes |
4 files changed, 10 insertions, 1 deletions
@@ -87,6 +87,9 @@ install: build cp -r VERSION.txt $(DESTDIR)/usr/share/$(SOFTWARE) cp -r share/config share/hooks share/keys share/build-scripts share/get-scripts $(DESTDIR)/usr/share/$(SOFTWARE) + # temporary sideloading new keys until keyring package in debian-stable has been updated + cp -r share/other $(DESTDIR)/usr/share/$(SOFTWARE) + mkdir -p $(DESTDIR)/usr/share/bash-completion/completions cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf index 2dd8cb7..9e28216 100755 --- a/share/build-scripts/debconf +++ b/share/build-scripts/debconf @@ -509,6 +509,12 @@ EOF case "${MODE}" in progress-linux) + # temporary sideloading new keys until keyring package in debian-stable has been updated + if [ -e "${DIRECTORY}/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg" ] + then + cp -f /usr/share/compute-tools/other/deb.progress-linux.org.gpg "${DIRECTORY}/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg" + fi + cat > "${DIRECTORY}/progress-linux.cfg" << EOF progress-linux progress-linux/archives multiselect $(echo ${ARCHIVES} | sed -e 's| |, |g') progress-linux progress-linux/archive-areas multiselect $(echo ${ARCHIVE_AREAS} | sed -e 's|,| |g') diff --git a/share/doc/host-setup.txt b/share/doc/host-setup.txt index bf2963f..432aa20 100644 --- a/share/doc/host-setup.txt +++ b/share/doc/host-setup.txt @@ -56,7 +56,7 @@ EOF cat > /etc/systemd/network/bridge0.network << EOF [Match] -Name=bridge-0 +Name=bridge0 [Network] DHCP=yes diff --git a/share/other/deb.progress-linux.org.gpg b/share/other/deb.progress-linux.org.gpg Binary files differnew file mode 100644 index 0000000..ed2bd81 --- /dev/null +++ b/share/other/deb.progress-linux.org.gpg |