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.

Sign up for GitHub

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

Jump to bottom

Store list of installed extensions and image vendor to image and not to BSP #7182

Merged
merged 3 commits into from
Sep 8, 2024
Merged

Store list of installed extensions and image vendor to image and not to BSP #7182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9d8126
Revert "Store list of preinstalled extensions EXTENSIONS and add VEND…
igorpecovnik Sep 7, 2024
48b6e11
Store EXTENSION list to the image instead to the BSP
igorpecovnik Sep 7, 2024
cf120ae
Store VENDORPRETTYNAME to the image instead to the BSP. This is image…
igorpecovnik Sep 7, 2024
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
2 changes: 0 additions & 2 deletions lib/functions/bsp/armbian-bsp-cli-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ function compile_armbian-bsp-cli() {
BOARDFAMILY=${BOARDFAMILY}
BUILD_REPOSITORY_URL=${BUILD_REPOSITORY_URL}
BUILD_REPOSITORY_COMMIT=${BUILD_REPOSITORY_COMMIT}
EXTENSIONS=${ENABLE_EXTENSIONS}
LINUXFAMILY=$LINUXFAMILY
ARCH=$ARCHITECTURE
BOOT_SOC=$BOOT_SOC
Expand All @@ -108,7 +107,6 @@ function compile_armbian-bsp-cli() {
FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE
FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE
VENDOR="$VENDOR"
VENDORPRETTYNAME="$VENDORPRETTYNAME"
VENDORDOCS="$VENDORDOCS"
VENDORURL="$VENDORURL"
VENDORSUPPORT="$VENDORSUPPORT"
Expand Down
1 change: 0 additions & 1 deletion lib/functions/configuration/main-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ function do_main_configuration() {

# Armbian image is set as unofficial if build manually or without declaring from outside
[[ -z $VENDOR ]] && VENDOR="Armbian-unofficial"
[[ -z $VENDORPRETTYNAME ]] && VENDORPRETTYNAME="${VENDOR}"

# Use framework defaults for community Armbian images and unsupported distribution when building Armbian distribution
if [[ ${VENDOR} == "Armbian" ]] && [[ ${BOARD_TYPE} != "conf" || $(cat $SRC/config/distributions/$RELEASE/support) != "supported" ]]; then
Expand Down
1 change: 0 additions & 1 deletion lib/functions/image/fingerprint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ function fingerprint_image() {
Build date: $(date +'%d.%m.%Y')
Sources: ${BUILD_REPOSITORY_URL}
Sources rev: ${BUILD_REPOSITORY_COMMIT}
Extensions: ${ENABLE_EXTENSIONS}
Authors: https://www.armbian.com/authors
Maintainer: ${MAINTAINER} <$MAINTAINERMAIL>
Support: ${VENDORSUPPORT}
Expand Down
8 changes: 8 additions & 0 deletions lib/functions/rootfs/distro-agnostic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,14 @@ function install_distribution_agnostic() {
# save initial armbian-release state
cp "${SDCARD}"/etc/armbian-release "${SDCARD}"/etc/armbian-image-release

# save list of enabled extensions for this image
EXTENSIONS=${ENABLE_EXTENSIONS} >> "${SDCARD}"/etc/armbian-image-release

# store vendor pretty name to image only. We don't need to save this in BSP upgrade
# files. Vendor should be only defined at build image stage.
[[ -z $VENDORPRETTYNAME ]] && VENDORPRETTYNAME="${VENDOR}"
VENDORPRETTYNAME="$VENDORPRETTYNAME" >> "${SDCARD}"/etc/armbian-image-release

# DNS fix. package resolvconf is not available everywhere
if [ -d "${SDCARD}"/etc/resolvconf/resolv.conf.d ] && [ -n "$NAMESERVER" ]; then
echo "nameserver $NAMESERVER" > "${SDCARD}"/etc/resolvconf/resolv.conf.d/head
Expand Down