enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor all PPA sources to overcome apt-key deprecation (#3560)

Browse Source
This commit is contained in:
Igor Pečovnik 2022-03-25 15:09:07 +01:00 committed by GitHub
parent bcbe9479fa
commit 1bb5ad98ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 47 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/desktop/_all_distributions/appgroups/programming/packages Normal file
View File

@ -0,0 +1 @@
gh

1
config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.source.gpg] https://cli.github.com/packages stable main

BIN
config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source.gpg Normal file
View File

Binary file not shown.

1
config/desktop/bionic/appgroups/3dsupport
View File

@ -1 +0,0 @@
../../focal/appgroups/3dsupport

1
config/desktop/bionic/appgroups/browsers
View File

@ -1 +0,0 @@
../../focal/appgroups/browsers

1
config/desktop/bionic/appgroups/desktop_tools
View File

@ -1 +0,0 @@
../../focal/appgroups/desktop_tools

1
config/desktop/bionic/appgroups/programming
View File

@ -1 +0,0 @@
../../focal/appgroups/programming

1
config/desktop/buster/appgroups/desktop_tools/packages
View File

@ -2,4 +2,3 @@ bleachbit
fbi
gparted
kazam
system-monitoring-center

2
config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
View File

@ -1 +1 @@
ppa:oibaf/graphics-drivers
deb [signed-by=/usr/share/keyrings/oibaf.source.gpg] https://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main

BIN
config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source.gpg Normal file
View File

Binary file not shown.

2
config/desktop/focal/appgroups/browsers/packages
View File

@ -1,2 +1,2 @@
chromium-browser
firefox
firefox-esr

2
config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source
View File

@ -1 +1 @@
ppa:saiarcot895/chromium-dev
deb [signed-by=/usr/share/keyrings/chromium-browser.source.gpg] https://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ focal main

BIN
config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source.gpg Normal file
View File

Binary file not shown.

1
config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/mozilla-team.source.gpg] https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ focal main

BIN
config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.source.gpg Normal file
View File

Binary file not shown.

1
config/desktop/focal/appgroups/emulators/sources/apt/box64.source
View File

@ -1 +0,0 @@
deb http://ryanfortner.github.io/box64-debs/debian ./

51
config/desktop/focal/appgroups/emulators/sources/apt/box64.source.gpg
View File

@ -1,51 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=yWSi
-----END PGP PUBLIC KEY BLOCK-----

2
config/desktop/focal/appgroups/programming/sources/apt/vscodium.source
View File

@ -1 +1 @@
deb http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main
deb [signed-by=/usr/share/keyrings/vscodium.source.gpg] http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main

BIN
config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg
View File

Binary file not shown.

1
config/desktop/impish/appgroups
View File

@ -1 +0,0 @@
../focal/appgroups

1
config/desktop/jammy/appgroups
View File

@ -1 +0,0 @@
../focal/appgroups

7
config/desktop/jammy/environments/gnome/config_base/packages
View File

@ -33,7 +33,7 @@ gir1.2-graphene-1.0
gir1.2-gweather-3.0
gir1.2-ibus-1.0
gir1.2-json-1.0
gir1.2-mutter-8
gir1.2-mutter-10
gir1.2-nm-1.0
gir1.2-nma-1.0
gir1.2-polkit-1.0
@ -54,7 +54,6 @@ gnome-settings-daemon-common
gnome-shell
gnome-shell-common
gnome-shell-extension-appindicator
gnome-shell-extension-trash
gnome-system-monitor
gvfs-backends
hunspell-en-us
@ -111,12 +110,12 @@ libgweather-common
libgxps2
libibus-1.0-5
libical3
libidn11
libidn12
libijs-0.35
libimobiledevice6
libjavascriptcoregtk-4.0-18
libjbig2dec0
libmutter-8-0
libmutter-10-0
libnautilus-extension1a
libnma0
libnotify-bin

1
config/optional/architectures/amd64/_config/desktop/focal Symbolic link
View File

@ -0,0 +1 @@
jammy

1
config/optional/architectures/amd64/_config/desktop/hirsute Symbolic link
View File

@ -0,0 +1 @@
jammy

1
config/optional/architectures/amd64/_config/desktop/impish Symbolic link
View File

@ -0,0 +1 @@
jammy

1
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages Normal file
View File

@ -0,0 +1 @@
chrome

1
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/chrome.source.gpg arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main

BIN
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source.gpg Normal file
View File

Binary file not shown.

0
config/desktop/focal/appgroups/emulators/only_for → config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for
View File

0
config/desktop/focal/appgroups/emulators/packages → config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages
View File

1
config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/box64.source.gpg] http://ryanfortner.github.io/box64-debs/debian ./

BIN
config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source.gpg Normal file
View File

Binary file not shown.

53
lib/desktop.sh
View File

@ -208,30 +208,38 @@ add_apt_sources() {
if [[ -d "${apt_sources_dirpath}" ]]; then
for apt_source_filepath in "${apt_sources_dirpath}/"*.source; do
local new_apt_source="$(cat "${apt_source_filepath}")"
display_alert "Adding APT Source ${new_apt_source}"
# -y -> Assumes yes to all queries
# -n -> Do not update package cache after adding
run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\""
display_alert "Return code : $?"
# temporally exception for jammy
[[ $RELEASE == "jammy" ]] && find "${SDCARD}/etc/apt/sources.list.d/." -type f \( -name "*.list" ! -name "armbian.list" \) -print0 | xargs -0 sed -i 's/jammy/hirsute/g'
local apt_source_gpg_filepath="${apt_source_filepath}.gpg"
# PPA provide GPG keys automatically, it seems.
# But other repositories (Docker for example) require the
# user to import GPG keys manually
# Myy : FIXME We need some automatic Git warnings when someone
# add a GPG key, since trusting the wrong keys could lead to
# serious issues.
if [[ -f "${apt_source_gpg_filepath}" ]]; then
display_alert "Adding GPG Key ${apt_source_gpg_filepath}"
local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})"
cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}"
run_on_sdcard "apt-key add \"/tmp/${apt_source_gpg_filename}\""
echo "APT Key returned : $?"
# extract filenames
local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})"
local apt_source_filename="$(basename ${apt_source_filepath}).list"
display_alert "Adding APT Source ${new_apt_source}"
if [[ "${new_apt_source}" == ppa* ]] ; then
# add list with apt-add
# -y -> Assumes yes to all queries
# -n -> Do not update package cache after adding
run_on_sdcard "add-apt-repository -y -n \"${new_apt_source}\""
if [[ -f "${apt_source_gpg_filepath}" ]]; then
display_alert "Adding GPG Key ${apt_source_gpg_filepath}"
cp "${apt_source_gpg_filepath}" "${SDCARD}/tmp/${apt_source_gpg_filename}"
run_on_sdcard "apt-key add \"/tmp/${apt_source_gpg_filename}\""
echo "APT Key returned : $?"
fi
else
# copy list if its not ppa
echo "${new_apt_source}" > "${SDCARD}/etc/apt/sources.list.d/${apt_source_filename}"
if [[ -f "${apt_source_gpg_filepath}" ]]; then
display_alert "Adding GPG Key ${apt_source_gpg_filepath}"
# local apt_source_gpg_filename="$(basename ${apt_source_gpg_filepath})"
mkdir -p "${SDCARD}"/usr/share/keyrings/
cp "${apt_source_gpg_filepath}" "${SDCARD}"/usr/share/keyrings/
fi
fi
done
fi
done
@ -246,7 +254,8 @@ add_desktop_package_sources() {
# Myy : I see Snap and Flatpak coming up in the next releases
# so... let's prepare for that
add_apt_sources
run_on_sdcard "apt -y -q update"
run_on_sdcard "apt -y update" >> "${DEST}"/${LOG_SUBPATH}/install.log
ls -l "${SDCARD}/usr/share/keyrings" >> "${DEST}"/${LOG_SUBPATH}/install.log
ls -l "${SDCARD}/etc/apt/sources.list.d" >> "${DEST}"/${LOG_SUBPATH}/install.log
cat "${SDCARD}/etc/apt/sources.list" >> "${DEST}"/${LOG_SUBPATH}/install.log