Skip to content

Commit

Permalink
Enable armbian-config as extension
Browse files Browse the repository at this point in the history
  • Loading branch information
igorpecovnik committed Jan 20, 2025
1 parent c30e5db commit 24d241f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
12 changes: 12 additions & 0 deletions extensions/armbian-config.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Install armbian config from repo. Now it is producing externally https://github.com/armbian/configng
# 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-development.list
}


function post_armbian_repo_customize_image__install_armbian-config() {
chroot_sdcard_apt_get_install "armbian-config"
}
3 changes: 3 additions & 0 deletions lib/functions/configuration/main-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ function do_main_configuration() {

declare -g SKIP_EXTERNAL_TOOLCHAINS="${SKIP_EXTERNAL_TOOLCHAINS:-yes}" # don't use any external toolchains, by default.

# Armbian config is central tool used in all builds. As its build externally, we have moved it to extension. Enable it here.
enable_extension "armbian-config"

# Network stack to use, default to network-manager; configuration can override this.
# Will be made read-only further down.
declare -g NETWORKING_STACK="${NETWORKING_STACK}"
Expand Down
5 changes: 0 additions & 5 deletions lib/functions/rootfs/distro-agnostic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,6 @@ function install_distribution_agnostic() {
desktop_postinstall
fi

# install armbian-config from GitHub repo added in distro-specific.sh
if [[ "${PACKAGE_LIST_RM}" != *armbian-config* ]]; then
chroot_sdcard_apt_get_install_dry_run "armbian-config"
fi

# install armbian-zsh
if [[ "${PACKAGE_LIST_RM}" != *armbian-zsh* ]]; then
if [[ $BUILD_MINIMAL != yes ]]; then
Expand Down
5 changes: 0 additions & 5 deletions lib/functions/rootfs/distro-specific.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ function create_sources_list_and_deploy_repo_key() {
echo "deb ${SIGNED_BY}http://$([[ $BETA == yes ]] && echo "beta" || echo "apt").armbian.com $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list
fi

# add armbian-config repository
cat <<- EOF > "${basedir}"/etc/apt/sources.list.d/armbian-config.list
deb ${SIGNED_BY} https://github.armbian.com/configng stable main
EOF

# replace local package server if defined. Suitable for development
[[ -n $LOCAL_MIRROR ]] && echo "deb ${SIGNED_BY}http://$LOCAL_MIRROR $RELEASE ${components[*]}" > "${basedir}"/etc/apt/sources.list.d/armbian.list

Expand Down

0 comments on commit 24d241f

Please sign in to comment.