JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: Use deb822 APT source for armbian-config

Browse Source 
- 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: https://github.com/armbian/configng/pull/407
This commit is contained in:
Blieque Mariguan
2025-02-03 20:59:18 +00:00
committed by Igor
parent 2d2a67c284
commit 3743daffa2
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/armbian-config.sh
View File

@@ -2,8 +2,14 @@
# and they are moved to main armbian repo periodically # and they are moved to main armbian repo periodically
function custom_apt_repo__add_armbian-github-repo(){ 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 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
} }

5
lib/functions/rootfs/distro-specific.sh
View File

@@ -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" display_alert "Adding Armbian repository and authentication key" "${when} :: /etc/apt/sources.list.d/armbian.list" "info"
mkdir -p "${basedir}"/usr/share/keyrings mkdir -p "${basedir}"/usr/share/keyrings
# change to binary form # change to binary form
gpg --dearmor < "${SRC}"/config/armbian.key > "${basedir}"/usr/share/keyrings/armbian.gpg APT_SIGNING_KEY_FILE="/usr/share/keyrings/armbian.gpg"
SIGNED_BY="[signed-by=/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 # lets keep old way for old distributions
if [[ "${RELEASE}" =~ (focal|bullseye) ]]; then if [[ "${RELEASE}" =~ (focal|bullseye) ]]; then