Skip to content

Commit

Permalink
feat: Use deb822 APT source for armbian-config
Browse files Browse the repository at this point in the history
- Replace creation of `armbian-config.list` with
  `armbian-config.sources`. This holds the same information in a newer
  format, deb822. This does not affect `armbian.list`.

See also: armbian/configng#407
  • Loading branch information
blieque committed Feb 3, 2025
1 parent 2d2a67c commit f1a48c5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
10 changes: 8 additions & 2 deletions extensions/armbian-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@
# and they are moved to main armbian repo periodically


function custom_apt_repo__add_armbian-github-repo(){
echo "deb ${SIGNED_BY}https://github.armbian.com/configng stable main" > "${SDCARD}"/etc/apt/sources.list.d/armbian-config.list
function custom_apt_repo__add_armbian-github-repo() {
cat <<- EOF > "${SDCARD}"/etc/apt/sources.list.d/armbian-config.sources
Types: deb
URIs: https://github.armbian.com/configng
Suites: stable
Components: main
Signed-By: "${APT_SIGNING_KEY_FILE}"
EOF
}


Expand Down
5 changes: 3 additions & 2 deletions lib/functions/rootfs/distro-specific.sh
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,9 @@ function create_sources_list_and_deploy_repo_key() {
display_alert "Adding Armbian repository and authentication key" "${when} :: /etc/apt/sources.list.d/armbian.list" "info"
mkdir -p "${basedir}"/usr/share/keyrings
# change to binary form
gpg --dearmor < "${SRC}"/config/armbian.key > "${basedir}"/usr/share/keyrings/armbian.gpg
SIGNED_BY="[signed-by=/usr/share/keyrings/armbian.gpg] "
APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian.gpg"
gpg --dearmor < "${SRC}"/config/armbian.key > "${basedir}${APT_SIGNING_KEY_FILE}"
SIGNED_BY="[signed-by=${APT_SIGNING_KEY_FILE}] "

# lets keep old way for old distributions
if [[ "${RELEASE}" =~ (focal|bullseye) ]]; then
Expand Down

0 comments on commit f1a48c5

Please sign in to comment.