mirror of
https://github.com/kernelkit/infix.git
synced 2026-07-22 01:13:00 +02:00
Namespace Infix Kconfig options under IX_
Infix defines its own Kconfig options with unprefixed names (IMAGE_*, QEMU_*, TRUSTED_KEYS*) and an INFIX_ prefix. Unprefixed names risk clashing with Buildroot and with other br2-externals/spins that source our tree. Rename all 86 options to a common IX_ prefix, collapsing the existing INFIX_ ones, e.g. INFIX_IMAGE_ID becomes IX_IMAGE_ID. The os-release INFIX_DESC field is a runtime interface, not a Kconfig option, and is kept; the qemu Config.in generator's @ARCH@ symbol is updated to match. Closes #1305 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
+5
-5
@@ -33,7 +33,7 @@ Arguments:
|
||||
|
||||
Description:
|
||||
When called from Buildroot (no options), uses environment variables:
|
||||
BINARIES_DIR, BUILD_DIR, BR2_EXTERNAL_INFIX_PATH, RELEASE, INFIX_ID
|
||||
BINARIES_DIR, BUILD_DIR, BR2_EXTERNAL_INFIX_PATH, RELEASE, IX_ID
|
||||
|
||||
When called with -b/-r options, enters standalone mode and combines artifacts
|
||||
from separate boot and rootfs sources. Useful for CI or manual image creation.
|
||||
@@ -484,7 +484,7 @@ if [ -n "$STANDALONE" ]; then
|
||||
export BUILD_DIR="$BOOT_DIR/build"
|
||||
export BR2_EXTERNAL_INFIX_PATH
|
||||
export RELEASE="${RELEASE:-""}"
|
||||
export INFIX_ID="${INFIX_ID:-"infix"}"
|
||||
export IX_ID="${IX_ID:-"infix"}"
|
||||
|
||||
# Add host tools to PATH (for genimage, bmaptool, etc.)
|
||||
for dir in "$BOOT_DIR" "$ROOT_DIR"; do
|
||||
@@ -550,7 +550,7 @@ fi
|
||||
|
||||
# Set defaults for optional variables
|
||||
: "${RELEASE:=""}"
|
||||
: "${INFIX_ID:="infix"}"
|
||||
: "${IX_ID:="infix"}"
|
||||
|
||||
# Download bootloader if requested
|
||||
if [ -n "$DOWNLOAD_BOOT" ]; then
|
||||
@@ -626,12 +626,12 @@ fi
|
||||
# For boot-only mode, append "-boot" to the target name in the image filename
|
||||
if [ -n "$BOOT_ONLY" ]; then
|
||||
sed "s|#VERSION#|${RELEASE}|" "$GENIMAGE_TEMPLATE" | \
|
||||
sed "s|#INFIX_ID#|${INFIX_ID}|" | \
|
||||
sed "s|#IX_ID#|${IX_ID}|" | \
|
||||
sed "s|#TARGET#|${TARGET}|" | \
|
||||
sed "s|-${TARGET}\.img|-${TARGET}-boot.img|" > "$GENIMAGE_CFG"
|
||||
else
|
||||
sed "s|#VERSION#|${RELEASE}|" "$GENIMAGE_TEMPLATE" | \
|
||||
sed "s|#INFIX_ID#|${INFIX_ID}|" | \
|
||||
sed "s|#IX_ID#|${IX_ID}|" | \
|
||||
sed "s|#TARGET#|${TARGET}|" > "$GENIMAGE_CFG"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user