Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Use deb822 APT source for armbian-config #7782

Merged
merged 1 commit into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading