From 17a1b80b832c32dd94da66b3da65d4c693064785 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 4 Jul 2026 14:47:24 +0200 Subject: [PATCH] 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 --- .github/workflows/build-image.yml | 2 +- Config.in | 38 ++-- .../acer-connect-vero-w6m/genimage.cfg.in | 2 +- board/aarch64/bananapi-bpi-r3/genimage.cfg.in | 2 +- board/aarch64/bananapi-bpi-r4/genimage.cfg.in | 2 +- .../aarch64/bananapi-bpi-r64/genimage.cfg.in | 2 +- .../friendlyarm-nanopi-r2s/genimage.cfg.in | 2 +- .../marvell-espressobin/genimage.cfg.in | 2 +- .../aarch64/raspberrypi-rpi64/genimage.cfg.in | 2 +- .../arm/microchip-sama7g54-ek/genimage.cfg.in | 2 +- board/arm/raspberrypi-rpi2/genimage.cfg.in | 2 +- board/common/Config.in | 16 +- board/common/common.mk | 6 +- board/common/image/image-ext4-rauc/Config.in | 10 +- board/common/image/image-itb-aux/Config.in | 4 +- .../image/image-itb-dl-release/Config.in | 6 +- board/common/image/image-itb-gns3a/Config.in | 12 +- board/common/image/image-itb-qcow/Config.in | 32 +-- .../image/image-itb-qcow/image-itb-qcow.mk | 4 +- board/common/image/image-itb-rauc/Config.in | 12 +- board/common/image/image-itb-rootfs/Config.in | 6 +- board/common/image/image-readme/Config.in | 2 +- .../common/image/image-readme/image-readme.mk | 2 +- board/common/image/ix-image.mk | 10 +- board/common/lib.sh | 2 +- board/common/post-build.sh | 38 ++-- board/common/qemu/Config.in.in | 184 +++++++++--------- board/common/qemu/qemu.mk | 4 +- board/common/qemu/run.sh | 146 +++++++------- board/common/uboot/uboot.mk | 2 +- configs/aarch64_defconfig | 22 +-- configs/aarch64_minimal_defconfig | 22 +-- configs/aarch64_qemu_boot_defconfig | 4 +- configs/arm_defconfig | 22 +-- configs/arm_minimal_defconfig | 22 +-- configs/bpi_r3_emmc_boot_defconfig | 4 +- configs/bpi_r3_sd_boot_defconfig | 4 +- configs/bpi_r4_emmc_boot_defconfig | 4 +- configs/bpi_r4_sd_boot_defconfig | 4 +- configs/bpi_r64_emmc_boot_defconfig | 4 +- configs/bpi_r64_sd_boot_defconfig | 4 +- configs/cn9130_crb_boot_defconfig | 4 +- configs/nanopi_r2s_boot_defconfig | 4 +- configs/riscv64_defconfig | 22 +-- configs/rpi64_boot_defconfig | 4 +- configs/sama7g54_ek_emmc_boot_defconfig | 4 +- configs/sama7g54_ek_sd_boot_defconfig | 4 +- configs/snippets/ext4.conf | 2 +- configs/x86_64_defconfig | 22 +-- configs/x86_64_minimal_defconfig | 22 +-- doc/branding.md | 4 +- infix.mk | 4 +- test/test.mk | 4 +- utils/mkimage.sh | 10 +- 54 files changed, 392 insertions(+), 390 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 39a08bda..d13fe141 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -173,7 +173,7 @@ jobs: export BUILD_DIR=$PWD/build export BR2_EXTERNAL_INFIX_PATH=$PWD export RELEASE="" - export INFIX_ID="infix" + export IX_ID="infix" for target in $TARGETS; do export BINARIES_DIR=$PWD/output_${target}/images diff --git a/Config.in b/Config.in index f2875807..a2170112 100644 --- a/Config.in +++ b/Config.in @@ -2,7 +2,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/board/Config.in" menu "Branding" -config INFIX_VENDOR +config IX_VENDOR string "Vendor name" default "KernelKit" help @@ -15,7 +15,7 @@ config INFIX_VENDOR Used for VENDOR_NAME in /etc/os-release and GNS3 appliance files. -config INFIX_VENDOR_HOME +config IX_VENDOR_HOME string "Vendor URL" help The homepage of the OS vendor. The value should be in RFC3986 @@ -24,14 +24,14 @@ config INFIX_VENDOR_HOME Optional, used for VENDOR_HOME in /etc/os-release -config INFIX_NAME +config IX_NAME string "Operating system name" default "Infix" help Mandatory. Used for identifying the OS as NAME in /etc/os-release and product_name in GNS3 appliance files. -config INFIX_ID +config IX_ID string "Operating system identifier" default "infix" help @@ -43,9 +43,9 @@ config INFIX_ID Mandatory. Used for identifying the OS as ID in /etc/os-release and in the generated image name: ID-ARCH-VERSION.img -config INFIX_IMAGE_ID +config IX_IMAGE_ID string "Operating system image name" - default "${INFIX_ID}-${BR2_ARCH}" + default "${IX_ID}-${BR2_ARCH}" help A lower-case string (no spaces or other characters outside of 0–9, a–z, ".", "_" and "-"), for naming critical image files, directories @@ -54,18 +54,18 @@ config INFIX_IMAGE_ID Mandatory. When INFIX_RELEASE is set, this string is appended to the IMAGE_ID with a '-' separator. -config INFIX_COMPATIBLE +config IX_COMPATIBLE string "Operating system compatible string" - default "${INFIX_IMAGE_ID}" + default "${IX_IMAGE_ID}" help A lower-case string (no spaces or other characters outside of 0–9, a–z, ".", "_" and "-"), used for image identification at upgrade. E.g., the RAUC [system] compatible string. - Mandatory. Defaults to $INFIX_IMAGE_ID, which in turn is composed - of $INFIX_ID-$BR2_ARCH. + Mandatory. Defaults to $IX_IMAGE_ID, which in turn is composed + of $IX_ID-$BR2_ARCH. -config INFIX_TAGLINE +config IX_TAGLINE string "Operating system tagline" default "Infix OS — Immutable.Friendly.Secure" help @@ -74,25 +74,25 @@ config INFIX_TAGLINE This is also show at boot when the system init process starts. -config INFIX_DESC +config IX_DESC string "Operating system description" help Optional. Used for long description texts about the OS. E.g., the GNS3 appliance file description field. Saved in the file - /etc/os-release as INFIX_DESC. + /etc/os-release as IX_DESC. -config INFIX_HOME +config IX_HOME string "Operating system URL" help Used for identifying the OS, e.g. as HOME_URL in /etc/os-release -config INFIX_DOC +config IX_DOC string "Operating system docs" help Optional. Main documentation URL, will be shown in /etc/os-release as DOCUMENTATION_URL. -config INFIX_SUPPORT +config IX_SUPPORT string "Operating system support" help Main support page for the operating system, if there is any. This @@ -102,13 +102,13 @@ config INFIX_SUPPORT Optional. Shown, e.g., as SUPPORT_URL in /etc/os-release or maintainer_email in .gns3a. -config INFIX_OEM_PATH +config IX_OEM_PATH string "Path to OEM br2-external" help A br2-external using Infix will likely want to version the branded OS using their own GIT tags. Set this variable to point to the base directory (absolute path) and the Infix post-build.sh will call `git - describe -C $INFIX_OEM_PATH`. + describe -C $IX_OEM_PATH`. Note: the OS version (VERSION, VERSION_ID, BUILD_ID in /etc/os-release) is always derived from `git describe`. The global @@ -118,7 +118,7 @@ config INFIX_OEM_PATH endmenu # For /etc/os-release, uses CondtionArchitechture= from systemd.unit(5) -config INFIX_ARCH +config IX_ARCH string default "arm" if BR2_arm default "arm64" if BR2_aarch64 diff --git a/board/aarch64/acer-connect-vero-w6m/genimage.cfg.in b/board/aarch64/acer-connect-vero-w6m/genimage.cfg.in index bf76088d..accc6c46 100644 --- a/board/aarch64/acer-connect-vero-w6m/genimage.cfg.in +++ b/board/aarch64/acer-connect-vero-w6m/genimage.cfg.in @@ -22,7 +22,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-vero-w-#TARGET#.img { +image #IX_ID##VERSION#-vero-w-#TARGET#.img { hdimage { partition-table-type = "gpt" gpt-no-backup = true diff --git a/board/aarch64/bananapi-bpi-r3/genimage.cfg.in b/board/aarch64/bananapi-bpi-r3/genimage.cfg.in index f9fc6fcc..dbd8053e 100644 --- a/board/aarch64/bananapi-bpi-r3/genimage.cfg.in +++ b/board/aarch64/bananapi-bpi-r3/genimage.cfg.in @@ -24,7 +24,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-bpi-r3-#TARGET#.img { +image #IX_ID##VERSION#-bpi-r3-#TARGET#.img { hdimage { partition-table-type = "gpt" diff --git a/board/aarch64/bananapi-bpi-r4/genimage.cfg.in b/board/aarch64/bananapi-bpi-r4/genimage.cfg.in index 51bda51d..d5c66484 100644 --- a/board/aarch64/bananapi-bpi-r4/genimage.cfg.in +++ b/board/aarch64/bananapi-bpi-r4/genimage.cfg.in @@ -24,7 +24,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-bpi-r4-#TARGET#.img { +image #IX_ID##VERSION#-bpi-r4-#TARGET#.img { hdimage { partition-table-type = "gpt" gpt-no-backup = true diff --git a/board/aarch64/bananapi-bpi-r64/genimage.cfg.in b/board/aarch64/bananapi-bpi-r64/genimage.cfg.in index eda4fa13..3a2733de 100644 --- a/board/aarch64/bananapi-bpi-r64/genimage.cfg.in +++ b/board/aarch64/bananapi-bpi-r64/genimage.cfg.in @@ -24,7 +24,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-bpi-r64-#TARGET#.img { +image #IX_ID##VERSION#-bpi-r64-#TARGET#.img { hdimage { partition-table-type = "hybrid" # MT7622 TF-A partition driver detects GPT by checking MBR[0] diff --git a/board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in b/board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in index 8c0031b4..5ff86227 100644 --- a/board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in +++ b/board/aarch64/friendlyarm-nanopi-r2s/genimage.cfg.in @@ -26,7 +26,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-nanopi-r2s-sdcard.img { +image #IX_ID##VERSION#-nanopi-r2s-sdcard.img { hdimage { partition-table-type = "gpt" } diff --git a/board/aarch64/marvell-espressobin/genimage.cfg.in b/board/aarch64/marvell-espressobin/genimage.cfg.in index f1c89ff5..3924fa4d 100644 --- a/board/aarch64/marvell-espressobin/genimage.cfg.in +++ b/board/aarch64/marvell-espressobin/genimage.cfg.in @@ -24,7 +24,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-espressobin-#TARGET#.img { +image #IX_ID##VERSION#-espressobin-#TARGET#.img { hdimage { partition-table-type = "gpt" } diff --git a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in index 88d7a580..086ff177 100644 --- a/board/aarch64/raspberrypi-rpi64/genimage.cfg.in +++ b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in @@ -36,7 +36,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-rpi64-sdcard.img { +image #IX_ID##VERSION#-rpi64-sdcard.img { hdimage { partition-table-type = "hybrid" } diff --git a/board/arm/microchip-sama7g54-ek/genimage.cfg.in b/board/arm/microchip-sama7g54-ek/genimage.cfg.in index 0a8c5e3e..8bd499f2 100644 --- a/board/arm/microchip-sama7g54-ek/genimage.cfg.in +++ b/board/arm/microchip-sama7g54-ek/genimage.cfg.in @@ -39,7 +39,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-sama7g54-ek-#TARGET#.img { +image #IX_ID##VERSION#-sama7g54-ek-#TARGET#.img { hdimage { partition-table-type = "hybrid" } diff --git a/board/arm/raspberrypi-rpi2/genimage.cfg.in b/board/arm/raspberrypi-rpi2/genimage.cfg.in index 494a84ac..d5d7795b 100644 --- a/board/arm/raspberrypi-rpi2/genimage.cfg.in +++ b/board/arm/raspberrypi-rpi2/genimage.cfg.in @@ -36,7 +36,7 @@ image var.ext4 { } } -image #INFIX_ID##VERSION#-rpi2-sdcard.img { +image #IX_ID##VERSION#-rpi2-sdcard.img { hdimage { partition-table-type = "hybrid" } diff --git a/board/common/Config.in b/board/common/Config.in index 468a208a..e9d0576b 100644 --- a/board/common/Config.in +++ b/board/common/Config.in @@ -11,7 +11,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/board/common/image/image-readme/Config.in" endmenu -config QEMU_SCRIPTS +config IX_QEMU_SCRIPTS bool "QEMU scripts" default y help @@ -19,20 +19,20 @@ config QEMU_SCRIPTS directory, which can be used to launch virtual Infix instances. -menuconfig TRUSTED_KEYS +menuconfig IX_TRUSTED_KEYS bool "Trusted keys for image" help Keys that will be accepted for this image -config TRUSTED_KEYS_DEVELOPMENT +config IX_TRUSTED_KEYS_DEVELOPMENT bool "Development key" - depends on TRUSTED_KEYS + depends on IX_TRUSTED_KEYS -config TRUSTED_KEYS_DEVELOPMENT_PATH +config IX_TRUSTED_KEYS_DEVELOPMENT_PATH string - depends on TRUSTED_KEYS_DEVELOPMENT + depends on IX_TRUSTED_KEYS_DEVELOPMENT default "${BR2_EXTERNAL_INFIX_PATH}/board/common/signing-keys/development/infix.crt" -config TRUSTED_KEYS_EXTRA_PATH +config IX_TRUSTED_KEYS_EXTRA_PATH string "Path to extra keys to include in image" - depends on TRUSTED_KEYS + depends on IX_TRUSTED_KEYS diff --git a/board/common/common.mk b/board/common/common.mk index 2fcfe2d4..e0586379 100644 --- a/board/common/common.mk +++ b/board/common/common.mk @@ -1,14 +1,14 @@ include $(BR2_EXTERNAL_INFIX_PATH)/board/common/image/image.mk include $(BR2_EXTERNAL_INFIX_PATH)/board/common/qemu/qemu.mk -ifeq ($(TRUSTED_KEYS),y) +ifeq ($(IX_TRUSTED_KEYS),y) include $(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/uboot.mk -TRUSTED_KEYS=$(TRUSTED_KEYS_DEVELOPMENT_PATH) $(TRUSTED_KEYS_EXTRA_PATH) +IX_TRUSTED_KEYS=$(IX_TRUSTED_KEYS_DEVELOPMENT_PATH) $(IX_TRUSTED_KEYS_EXTRA_PATH) define RAUC_POST_BUILD_INSTALL_CERT @$(call IXMSG,"Installing signing cert for RAUC") mkdir -p $(TARGET_DIR)/etc/rauc/keys - $(foreach crt,$(shell ls $(TRUSTED_KEYS)), \ + $(foreach crt,$(shell ls $(IX_TRUSTED_KEYS)), \ cp $(crt) $(TARGET_DIR)/etc/rauc/keys/$(shell openssl x509 -hash -noout <$(crt)).0;) endef diff --git a/board/common/image/image-ext4-rauc/Config.in b/board/common/image/image-ext4-rauc/Config.in index 53ad796c..f28a6604 100644 --- a/board/common/image/image-ext4-rauc/Config.in +++ b/board/common/image/image-ext4-rauc/Config.in @@ -1,4 +1,4 @@ -config IMAGE_EXT4_RAUC +config IX_IMAGE_EXT4_RAUC bool "RAUC upgrade bundle (ext4)" depends on BR2_TARGET_ROOTFS_EXT2 select BR2_PACKAGE_HOST_RAUC @@ -7,17 +7,17 @@ config IMAGE_EXT4_RAUC image. Intended for development boards whose bootloader does not support squashfs. -config IMAGE_EXT4_RAUC_KEY +config IX_IMAGE_EXT4_RAUC_KEY string "signing key" - depends on IMAGE_EXT4_RAUC + depends on IX_IMAGE_EXT4_RAUC default "${BR2_EXTERNAL_INFIX_PATH}/board/common/signing-keys/development/infix.key" help Path to the private key, in PKCS#8 format, used to sign the RAUC bundle; or a PKCS#11 URI. -config IMAGE_EXT4_RAUC_CERT +config IX_IMAGE_EXT4_RAUC_CERT string "signing certificate" - depends on IMAGE_EXT4_RAUC + depends on IX_IMAGE_EXT4_RAUC default "${BR2_EXTERNAL_INFIX_PATH}/board/common/signing-keys/development/infix.crt" help Path to the X509 certificate which will be associated with diff --git a/board/common/image/image-itb-aux/Config.in b/board/common/image/image-itb-aux/Config.in index 4cda6cd6..b576f554 100644 --- a/board/common/image/image-itb-aux/Config.in +++ b/board/common/image/image-itb-aux/Config.in @@ -1,6 +1,6 @@ -config IMAGE_ITB_AUX +config IX_IMAGE_ITB_AUX bool "aux partition" - depends on IMAGE_ITB_ROOTFS + depends on IX_IMAGE_ITB_ROOTFS select BR2_PACKAGE_HOST_UBOOT_TOOLS select BR2_PACKAGE_HOST_GENIMAGE help diff --git a/board/common/image/image-itb-dl-release/Config.in b/board/common/image/image-itb-dl-release/Config.in index 0b6769e8..9b79ceb3 100644 --- a/board/common/image/image-itb-dl-release/Config.in +++ b/board/common/image/image-itb-dl-release/Config.in @@ -1,4 +1,4 @@ -menuconfig IMAGE_ITB_DL_RELEASE +menuconfig IX_IMAGE_ITB_DL_RELEASE bool "Download existing release" depends on !BR2_TARGET_ROOTFS_SQUASHFS help @@ -7,9 +7,9 @@ menuconfig IMAGE_ITB_DL_RELEASE Infix image, to create a full disk image that can be provisioned to an SD-card or eMMC. -config IMAGE_ITB_DL_RELEASE_URL +config IX_IMAGE_ITB_DL_RELEASE_URL string "URL" - depends on IMAGE_ITB_DL_RELEASE + depends on IX_IMAGE_ITB_DL_RELEASE default "https://github.com/kernelkit/infix/releases/download/latest/infix-${BR2_ARCH}.tar.gz" help URL to release tarball. diff --git a/board/common/image/image-itb-gns3a/Config.in b/board/common/image/image-itb-gns3a/Config.in index 5afe2392..cf960604 100644 --- a/board/common/image/image-itb-gns3a/Config.in +++ b/board/common/image/image-itb-gns3a/Config.in @@ -1,23 +1,23 @@ -menuconfig IMAGE_ITB_GNS3A +menuconfig IX_IMAGE_ITB_GNS3A bool "GNS3 Appliance (ITB)" depends on BR2_x86_64 - select IMAGE_ITB_QCOW + select IX_IMAGE_ITB_QCOW help Create a GNS3 appliance description that, together with the disk image, can be imported into GNS3. -config IMAGE_ITB_GNS3A_RAM +config IX_IMAGE_ITB_GNS3A_RAM int "Reserved RAM (MiB)" - depends on IMAGE_ITB_GNS3A + depends on IX_IMAGE_ITB_GNS3A default "192" help Amount of host RAM reserved for an appliance instance. Minimum supported size is 192M. -config IMAGE_ITB_GNS3A_IFNUM +config IX_IMAGE_ITB_GNS3A_IFNUM int "Number of interfaces" - depends on IMAGE_ITB_GNS3A + depends on IX_IMAGE_ITB_GNS3A default "1" help Number of Ethernet interfaces to create for an appliance instance. diff --git a/board/common/image/image-itb-qcow/Config.in b/board/common/image/image-itb-qcow/Config.in index 8262344f..02b1c97b 100644 --- a/board/common/image/image-itb-qcow/Config.in +++ b/board/common/image/image-itb-qcow/Config.in @@ -1,6 +1,6 @@ -menuconfig IMAGE_ITB_QCOW +menuconfig IX_IMAGE_ITB_QCOW bool "QEMU disk image (ITB)" - depends on (IMAGE_ITB_ROOTFS && IMAGE_ITB_AUX) || IMAGE_ITB_DL_RELEASE + depends on (IX_IMAGE_ITB_ROOTFS && IX_IMAGE_ITB_AUX) || IX_IMAGE_ITB_DL_RELEASE select BR2_PACKAGE_HOST_GENIMAGE help Compose a full disk image with redundant Linux OS partitions, @@ -11,9 +11,9 @@ menuconfig IMAGE_ITB_QCOW - Creating a GNS3 appliance - Developing/debugging issues in the boot process in QEMU -menuconfig IMAGE_ITB_QCOW_SIZE +menuconfig IX_IMAGE_ITB_QCOW_SIZE string "Image size" - depends on IMAGE_ITB_QCOW + depends on IX_IMAGE_ITB_QCOW default "512M" help Create a disk image of this size. A K/M/G suffix may be used @@ -26,22 +26,22 @@ menuconfig IMAGE_ITB_QCOW_SIZE choice prompt "Bootloader" - depends on IMAGE_ITB_QCOW - default IMAGE_ITB_QCOW_BOOT_EFI if BR2_x86_64 - default IMAGE_ITB_QCOW_BOOT_NONE + depends on IX_IMAGE_ITB_QCOW + default IX_IMAGE_ITB_QCOW_BOOT_EFI if BR2_x86_64 + default IX_IMAGE_ITB_QCOW_BOOT_NONE -config IMAGE_ITB_QCOW_BOOT_NONE +config IX_IMAGE_ITB_QCOW_BOOT_NONE bool "None" help Do not create any bootloader partition in the disk image. -config IMAGE_ITB_QCOW_BOOT_EFI +config IX_IMAGE_ITB_QCOW_BOOT_EFI bool "EFI" help Create a boot partition from a directory containing an EFI boot application, e.g. GRUB. -config IMAGE_ITB_QCOW_BOOT_BIN +config IX_IMAGE_ITB_QCOW_BOOT_BIN bool "Binary" help Create a boot partition from a raw image containing the boot @@ -49,18 +49,18 @@ config IMAGE_ITB_QCOW_BOOT_BIN endchoice -config IMAGE_ITB_QCOW_BOOT_DATA +config IX_IMAGE_ITB_QCOW_BOOT_DATA string "Bootloader data" - depends on IMAGE_ITB_QCOW - depends on IMAGE_ITB_QCOW_BOOT_EFI || IMAGE_ITB_QCOW_BOOT_BIN + depends on IX_IMAGE_ITB_QCOW + depends on IX_IMAGE_ITB_QCOW_BOOT_EFI || IX_IMAGE_ITB_QCOW_BOOT_BIN default "${BINARIES_DIR}/efi-part/EFI" if BR2_x86_64 help Path to the directory or file holding the bootloader data. -config IMAGE_ITB_QCOW_BOOT_OFFSET +config IX_IMAGE_ITB_QCOW_BOOT_OFFSET hex "Bootloader offset" - depends on IMAGE_ITB_QCOW - depends on IMAGE_ITB_QCOW_BOOT_EFI || IMAGE_ITB_QCOW_BOOT_BIN + depends on IX_IMAGE_ITB_QCOW + depends on IX_IMAGE_ITB_QCOW_BOOT_EFI || IX_IMAGE_ITB_QCOW_BOOT_BIN default 0x8000 help Offset at which the bootloader partition is placed. Remember diff --git a/board/common/image/image-itb-qcow/image-itb-qcow.mk b/board/common/image/image-itb-qcow/image-itb-qcow.mk index be44478a..bcf170ae 100644 --- a/board/common/image/image-itb-qcow/image-itb-qcow.mk +++ b/board/common/image/image-itb-qcow/image-itb-qcow.mk @@ -6,8 +6,8 @@ # We can source the rootfs+aux from a local build, or from a # downloaded release; so adjust our dependencies accordingly. -IMAGE_ITB_QCOW_SRC-$(IMAGE_ITB_ROOTFS) := image-itb-rootfs image-itb-aux -IMAGE_ITB_QCOW_SRC-$(IMAGE_ITB_DL_RELEASE) := image-itb-dl-release +IMAGE_ITB_QCOW_SRC-$(IX_IMAGE_ITB_ROOTFS) := image-itb-rootfs image-itb-aux +IMAGE_ITB_QCOW_SRC-$(IX_IMAGE_ITB_DL_RELEASE) := image-itb-dl-release IMAGE_ITB_QCOW_DEPENDENCIES := host-genimage $(IMAGE_ITB_QCOW_SRC-y) IMAGE_ITB_QCOW_CONFIG_VARS := BOOT_DATA BOOT_OFFSET SIZE diff --git a/board/common/image/image-itb-rauc/Config.in b/board/common/image/image-itb-rauc/Config.in index 27f7017d..2c830a8c 100644 --- a/board/common/image/image-itb-rauc/Config.in +++ b/board/common/image/image-itb-rauc/Config.in @@ -1,23 +1,23 @@ -menuconfig IMAGE_ITB_RAUC +menuconfig IX_IMAGE_ITB_RAUC bool "RAUC upgrade bundle (ITB)" - select IMAGE_ITB_ROOTFS + select IX_IMAGE_ITB_ROOTFS select BR2_PACKAGE_HOST_RAUC help Create RAUC upgrade bundle, for targets using ITB images, that can be used to upgrade a running system to this version of Infix. -config IMAGE_ITB_RAUC_KEY +config IX_IMAGE_ITB_RAUC_KEY string "signing key" - depends on IMAGE_ITB_RAUC + depends on IX_IMAGE_ITB_RAUC default "${BR2_EXTERNAL_INFIX_PATH}/board/common/signing-keys/development/infix.key" help Path to the private key, in PKCS#8 format, used to sign the RAUC bundle; or a PKCS#11 URI. -config IMAGE_ITB_RAUC_CERT +config IX_IMAGE_ITB_RAUC_CERT string "signing certificate" - depends on IMAGE_ITB_RAUC + depends on IX_IMAGE_ITB_RAUC default "${BR2_EXTERNAL_INFIX_PATH}/board/common/signing-keys/development/infix.crt" help Path to the X509 certificate which will be associated with diff --git a/board/common/image/image-itb-rootfs/Config.in b/board/common/image/image-itb-rootfs/Config.in index fbb04d8d..4b8b995c 100644 --- a/board/common/image/image-itb-rootfs/Config.in +++ b/board/common/image/image-itb-rootfs/Config.in @@ -1,4 +1,4 @@ -menuconfig IMAGE_ITB_ROOTFS +menuconfig IX_IMAGE_ITB_ROOTFS bool "rootfs.itb+.itbh" select BR2_TARGET_ROOTFS_SQUASHFS select BR2_PACKAGE_HOST_UBOOT_TOOLS @@ -7,9 +7,9 @@ menuconfig IMAGE_ITB_ROOTFS and extract detached header (.itbh) for U-Boot based targets. -config IMAGE_ITB_ROOTFS_KEY +config IX_IMAGE_ITB_ROOTFS_KEY string "signing key" - depends on IMAGE_ITB_ROOTFS + depends on IX_IMAGE_ITB_ROOTFS default "${BR2_EXTERNAL_INFIX_PATH}/board/common/signing-keys/development/infix.key" help Path to the private RSA key, in PKCS#8 format, used to sign diff --git a/board/common/image/image-readme/Config.in b/board/common/image/image-readme/Config.in index 293d12bc..65e2b42a 100644 --- a/board/common/image/image-readme/Config.in +++ b/board/common/image/image-readme/Config.in @@ -1,4 +1,4 @@ -config IMAGE_README +config IX_IMAGE_README bool "Install README.md in images" help Install a README.md with useful information about getting diff --git a/board/common/image/image-readme/image-readme.mk b/board/common/image/image-readme/image-readme.mk index f567989b..6b2cdb87 100644 --- a/board/common/image/image-readme/image-readme.mk +++ b/board/common/image/image-readme/image-readme.mk @@ -13,6 +13,6 @@ $(BINARIES_DIR)/README.md: $(IMAGE_README_DIR)/README.md @mkdir -p $(BINARIES_DIR) @cp $< $@ -ifeq ($(IMAGE_README),y) +ifeq ($(IX_IMAGE_README),y) TARGETS_ROOTFS += image-readme endif diff --git a/board/common/image/ix-image.mk b/board/common/image/ix-image.mk index 2da7cc2f..99eeb6d3 100644 --- a/board/common/image/ix-image.mk +++ b/board/common/image/ix-image.mk @@ -12,15 +12,17 @@ $(1): $$($(2)_DEPENDENCIES) BINARIES_DIR=$$(BINARIES_DIR) \ BR2_EXTERNAL_INFIX_PATH=$$(BR2_EXTERNAL_INFIX_PATH) \ ARTIFACT=$$(INFIX_ARTIFACT) \ - COMPATIBLE=$$(INFIX_COMPATIBLE) \ + COMPATIBLE=$$(IX_COMPATIBLE) \ VERSION=$$(INFIX_VERSION) \ - $$(foreach var,$$($(2)_CONFIG_VARS),$$(var)=$$($(2)_$$(var)) ) \ + $$(foreach var,$$($(2)_CONFIG_VARS),$$(var)=$$($(3)_$$(var)) ) \ $$($(2)_DIR)/generate.sh $$($(2)_OPTS) -ifeq ($$($(2)),y) +ifeq ($$($(3)),y) TARGETS_ROOTFS += $(1) endif endef -ix-image = $(call inner-ix-image,$(pkgname),$(call UPPERCASE,$(pkgname))) +# $(2) is the package-local make-var prefix (UPPERCASE pkgname); $(3) is +# the IX_ prefixed Kconfig symbol name, see issue #1305. +ix-image = $(call inner-ix-image,$(pkgname),$(call UPPERCASE,$(pkgname)),IX_$(call UPPERCASE,$(pkgname))) diff --git a/board/common/lib.sh b/board/common/lib.sh index 89f7e61a..81893812 100644 --- a/board/common/lib.sh +++ b/board/common/lib.sh @@ -16,7 +16,7 @@ die() # DISK_IMAGE_SIZE="512" # etc. # -# Nested variables, like INFIX_COMPATIBLE="${INFIX_IMAGE_ID}" +# Nested variables, like IX_COMPATIBLE="${IX_IMAGE_ID}" # are handled by sourcing the file in a subshell. # # shellcheck disable=SC1090 diff --git a/board/common/post-build.sh b/board/common/post-build.sh index 305f77ad..eef3e949 100755 --- a/board/common/post-build.sh +++ b/board/common/post-build.sh @@ -37,7 +37,7 @@ EOF } if [ -f "$TARGET_DIR/etc/rauc/system.conf" ]; then - sed -i "s/compatible=.*/compatible=$INFIX_COMPATIBLE/" "$TARGET_DIR/etc/rauc/system.conf" + sed -i "s/compatible=.*/compatible=$IX_COMPATIBLE/" "$TARGET_DIR/etc/rauc/system.conf" fi if [ -n "${ID_LIKE}" ]; then @@ -53,40 +53,40 @@ cp "$TARGET_DIR/etc/hostname" "$TARGET_DIR/etc/hostname.d/10-default" ixmsg "Creating /etc/os-release" rm -f "$TARGET_DIR/etc/os-release" { - echo "NAME=\"$INFIX_NAME\"" - echo "ID=$INFIX_ID" - echo "PRETTY_NAME=\"$INFIX_TAGLINE $INFIX_VERSION\"" + echo "NAME=\"$IX_NAME\"" + echo "ID=$IX_ID" + echo "PRETTY_NAME=\"$IX_TAGLINE $INFIX_VERSION\"" echo "ID_LIKE=\"${ID}\"" echo "DEFAULT_HOSTNAME=$BR2_TARGET_GENERIC_HOSTNAME" echo "VERSION=\"${INFIX_VERSION}\"" echo "VERSION_ID=${INFIX_VERSION}" echo "BUILD_ID=\"${INFIX_BUILD_ID}\"" - if [ -n "$INFIX_IMAGE_ID" ]; then - echo "IMAGE_ID=\"$INFIX_IMAGE_ID\"" + if [ -n "$IX_IMAGE_ID" ]; then + echo "IMAGE_ID=\"$IX_IMAGE_ID\"" fi if [ -n "$INFIX_RELEASE" ]; then echo "IMAGE_VERSION=\"$INFIX_RELEASE\"" fi - echo "ARCHITECTURE=\"${INFIX_ARCH}\"" - echo "HOME_URL=$INFIX_HOME" - if [ -n "$INFIX_VENDOR" ]; then - echo "VENDOR_NAME=\"$INFIX_VENDOR\"" + echo "ARCHITECTURE=\"${IX_ARCH}\"" + echo "HOME_URL=$IX_HOME" + if [ -n "$IX_VENDOR" ]; then + echo "VENDOR_NAME=\"$IX_VENDOR\"" fi - if [ -n "$INFIX_VENDOR_HOME" ]; then - echo "VENDOR_HOME=\"$INFIX_VENDOR_HOME\"" + if [ -n "$IX_VENDOR_HOME" ]; then + echo "VENDOR_HOME=\"$IX_VENDOR_HOME\"" fi - if [ -n "$INFIX_DOC" ]; then - echo "DOCUMENTATION_URL=\"$INFIX_DOC\"" + if [ -n "$IX_DOC" ]; then + echo "DOCUMENTATION_URL=\"$IX_DOC\"" fi - if [ -n "$INFIX_SUPPORT" ]; then - echo "SUPPORT_URL=\"$INFIX_SUPPORT\"" + if [ -n "$IX_SUPPORT" ]; then + echo "SUPPORT_URL=\"$IX_SUPPORT\"" fi - if [ -n "$INFIX_DESC" ]; then - echo "INFIX_DESC=\"$INFIX_DESC\"" + if [ -n "$IX_DESC" ]; then + echo "INFIX_DESC=\"$IX_DESC\"" fi } > "$TARGET_DIR/etc/os-release" -echo "$INFIX_TAGLINE $INFIX_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version" +echo "$IX_TAGLINE $INFIX_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version" ixmsg "Creating /etc/version: $(cat "$TARGET_DIR/etc/version")" # In case of ambguities, this is what the image was built from diff --git a/board/common/qemu/Config.in.in b/board/common/qemu/Config.in.in index 0d49ca1b..aed6a61d 100644 --- a/board/common/qemu/Config.in.in +++ b/board/common/qemu/Config.in.in @@ -1,85 +1,85 @@ mainmenu "QEMU Virtualization" -config QEMU_ARCH_IS_32 +config IX_QEMU_ARCH_IS_32 bool -config QEMU_ARCH_IS_64 +config IX_QEMU_ARCH_IS_64 bool choice prompt "Target Architecture" default @ARCH@ -config QEMU_riscv64 - bool "risv64" - select QEMU_ARCH_IS_64 +config IX_QEMU_riscv64 + bool "riscv64" + select IX_QEMU_ARCH_IS_64 -config QEMU_x86_64 +config IX_QEMU_x86_64 bool "x86_64" - select QEMU_ARCH_IS_64 + select IX_QEMU_ARCH_IS_64 -config QEMU_arm +config IX_QEMU_arm bool "AArch32 (little endian)" - select QEMU_ARCH_IS_32 + select IX_QEMU_ARCH_IS_32 -config QEMU_aarch64 +config IX_QEMU_aarch64 bool "AArch64 (little endian)" - select QEMU_ARCH_IS_64 + select IX_QEMU_ARCH_IS_64 endchoice choice prompt "Loader" - default QEMU_LOADER_KERNEL + default IX_QEMU_LOADER_KERNEL -config QEMU_LOADER_KERNEL +config IX_QEMU_LOADER_KERNEL bool "Kernel" -config QEMU_LOADER_UBOOT +config IX_QEMU_LOADER_UBOOT bool "U-Boot" - depends on QEMU_aarch64 + depends on IX_QEMU_aarch64 -config QEMU_LOADER_OVMF +config IX_QEMU_LOADER_OVMF bool "OVMF (UEFI)" - depends on QEMU_x86_64 + depends on IX_QEMU_x86_64 endchoice choice prompt "Rootfs type" - default QEMU_ROOTFS_INITRD + default IX_QEMU_ROOTFS_INITRD -config QEMU_ROOTFS_MMC +config IX_QEMU_ROOTFS_MMC bool "MMC" - depends on QEMU_aarch64 + depends on IX_QEMU_aarch64 -config QEMU_ROOTFS_INITRD +config IX_QEMU_ROOTFS_INITRD bool "Initrd" - depends on QEMU_LOADER_KERNEL + depends on IX_QEMU_LOADER_KERNEL -config QEMU_ROOTFS_VSCSI +config IX_QEMU_ROOTFS_VSCSI bool "Virtio SCSI" endchoice choice prompt "Console" - default QEMU_CONSOLE_SERIAL if QEMU_arm - default QEMU_CONSOLE_VIRTIO + default IX_QEMU_CONSOLE_SERIAL if IX_QEMU_arm + default IX_QEMU_CONSOLE_VIRTIO -config QEMU_CONSOLE_VIRTIO +config IX_QEMU_CONSOLE_VIRTIO bool "Virtio (hvc0)" -config QEMU_CONSOLE_SERIAL +config IX_QEMU_CONSOLE_SERIAL bool "Serial (ttyS0/ttyAMA0)" - depends on !QEMU_LOADER_OVMF + depends on !IX_QEMU_LOADER_OVMF endchoice -config QEMU_MACHINE +config IX_QEMU_MACHINE string "Select emulated machine" - default "qemu-system-arm -M virt,accel=kvm:tcg -cpu max" if QEMU_arm - default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu cortex-a53" if QEMU_aarch64 - default "qemu-system-x86_64 -M pc,accel=kvm:tcg -cpu max" if QEMU_x86_64 + default "qemu-system-arm -M virt,accel=kvm:tcg -cpu max" if IX_QEMU_arm + default "qemu-system-aarch64 -M virt,accel=kvm:tcg -cpu cortex-a53" if IX_QEMU_aarch64 + default "qemu-system-x86_64 -M pc,accel=kvm:tcg -cpu max" if IX_QEMU_x86_64 help You should not have to change this setting, although you may want to tweak it, or change the acceleration. @@ -88,7 +88,7 @@ config QEMU_MACHINE the defconfig you started with. Currently Infix supports arm (AArch32), aarch64 (ARM64), and x86_64 (AMD64). -config QEMU_MACHINE_RAM +config IX_QEMU_MACHINE_RAM string "RAM size (k/M/G)" default "448M" help @@ -96,62 +96,62 @@ config QEMU_MACHINE_RAM if you get kernel panic with: "System is deadlocked on memory", try increasing this one. -config QEMU_KERNEL +config IX_QEMU_KERNEL string - depends on QEMU_LOADER_KERNEL - default "../zImage" if QEMU_arm - default "../Image" if QEMU_aarch64 - default "../bzImage" if QEMU_x86_64 + depends on IX_QEMU_LOADER_KERNEL + default "../zImage" if IX_QEMU_arm + default "../Image" if IX_QEMU_aarch64 + default "../bzImage" if IX_QEMU_x86_64 -config QEMU_BIOS +config IX_QEMU_BIOS string - depends on !QEMU_LOADER_KERNEL - default "../u-boot.bin" if QEMU_LOADER_UBOOT - default "../OVMF.fd" if QEMU_LOADER_OVMF + depends on !IX_QEMU_LOADER_KERNEL + default "../u-boot.bin" if IX_QEMU_LOADER_UBOOT + default "../OVMF.fd" if IX_QEMU_LOADER_OVMF -config QEMU_ROOTFS +config IX_QEMU_ROOTFS string - default "@DISK_IMG@" if !QEMU_ROOTFS_INITRD - default "../rootfs.squashfs" if QEMU_ROOTFS_INITRD + default "@DISK_IMG@" if !IX_QEMU_ROOTFS_INITRD + default "../rootfs.squashfs" if IX_QEMU_ROOTFS_INITRD -config QEMU_DTB_EXTEND +config IX_QEMU_DTB_EXTEND bool - depends on QEMU_LOADER_UBOOT - default y if QEMU_aarch64 + depends on IX_QEMU_LOADER_UBOOT + default y if IX_QEMU_aarch64 -if QEMU_ROOTFS_INITRD +if IX_QEMU_ROOTFS_INITRD -config QEMU_RW +config IX_QEMU_RW string "Writable /cfg layer" - depends on QEMU_ROOTFS_INITRD + depends on IX_QEMU_ROOTFS_INITRD default "cfg.ext4" -config QEMU_RW_VAR_OPT +config IX_QEMU_RW_VAR_OPT bool "Separate writable /var" -if QEMU_RW_VAR_OPT -config QEMU_RW_VAR_SIZE +if IX_QEMU_RW_VAR_OPT +config IX_QEMU_RW_VAR_SIZE string "Size of /var" default "256M" -config QEMU_RW_VAR +config IX_QEMU_RW_VAR string "Writable /var layer" default "var.ext4" endif endif -config QEMU_VPD +config IX_QEMU_VPD bool "Emulate a Vital Product Data (VPD) Memory" -config QEMU_HOST +config IX_QEMU_HOST string "Export host filesystem path" default "/tmp" -config QEMU_APPEND +config IX_QEMU_APPEND string "Extra kernel options" - depends on !QEMU_ROOTFS_MMC + depends on !IX_QEMU_ROOTFS_MMC -config QEMU_EXTRA +config IX_QEMU_EXTRA string "Extra QEMU options" @@ -159,72 +159,72 @@ comment "RTC" choice prompt "Mode" - default QEMU_RTC_UTC + default IX_QEMU_RTC_UTC -config QEMU_RTC_UTC +config IX_QEMU_RTC_UTC bool "UTC" -config QEMU_RTC_LOCAL +config IX_QEMU_RTC_LOCAL bool "Local time" -config QEMU_RTC_RANDOM +config IX_QEMU_RTC_RANDOM bool "Random" endchoice choice prompt "Clock" - default QEMU_CLOCK_HOST + default IX_QEMU_CLOCK_HOST -config QEMU_CLOCK_HOST +config IX_QEMU_CLOCK_HOST bool "Host clock" -config QEMU_CLOCK_RT +config IX_QEMU_CLOCK_RT bool "Independent (monotonic)" -config QEMU_CLOCK_VM +config IX_QEMU_CLOCK_VM bool "Virtual" endchoice -config QEMU_RTC +config IX_QEMU_RTC string - default "utc" if QEMU_RTC_UTC - default "localtime" if QEMU_RTC_LOCAL - default "random" if QEMU_RTC_RANDOM + default "utc" if IX_QEMU_RTC_UTC + default "localtime" if IX_QEMU_RTC_LOCAL + default "random" if IX_QEMU_RTC_RANDOM -config QEMU_CLOCK +config IX_QEMU_CLOCK string - default "host" if QEMU_CLOCK_HOST - default "rt" if QEMU_CLOCK_RT - default "vm" if QEMU_CLOCK_VM + default "host" if IX_QEMU_CLOCK_HOST + default "rt" if IX_QEMU_CLOCK_RT + default "vm" if IX_QEMU_CLOCK_VM comment "Networking" choice prompt "Network Mode" - default QEMU_NET_USER + default IX_QEMU_NET_USER -config QEMU_NET_NONE +config IX_QEMU_NET_NONE bool "None" -config QEMU_NET_BRIDGE +config IX_QEMU_NET_BRIDGE bool "Bridged" -config QEMU_NET_USER +config IX_QEMU_NET_USER bool "User" -config QEMU_NET_TAP +config IX_QEMU_NET_TAP bool "TAP" -config QEMU_NET_ROCKER +config IX_QEMU_NET_ROCKER bool "Rocker" endchoice -config QEMU_NET_MODEL +config IX_QEMU_NET_MODEL string "Interface model" - default "virtio-net-device" if QEMU_arm + default "virtio-net-device" if IX_QEMU_arm default "virtio-net-pci" help The default, virtio-net-pci, NIC works for most use-cases, but @@ -233,23 +233,23 @@ config QEMU_NET_MODEL Note: ARM 32-bit uses virtio-net-device (MMIO) by default. -config QEMU_NET_BRIDGE_DEV +config IX_QEMU_NET_BRIDGE_DEV string "Bridge device" - depends on QEMU_NET_BRIDGE + depends on IX_QEMU_NET_BRIDGE default "virbr0" -config QEMU_NET_USER_OPTS +config IX_QEMU_NET_USER_OPTS string "User mode options" - depends on QEMU_NET_USER + depends on IX_QEMU_NET_USER help Extra -nic user, -config QEMU_NET_TAP_N +config IX_QEMU_NET_TAP_N int "Number of TAPs" - depends on QEMU_NET_TAP + depends on IX_QEMU_NET_TAP default 1 -config QEMU_NET_PORTS +config IX_QEMU_NET_PORTS int "Number of Rocker switch ports" - depends on QEMU_NET_ROCKER + depends on IX_QEMU_NET_ROCKER default 10 diff --git a/board/common/qemu/qemu.mk b/board/common/qemu/qemu.mk index 336507aa..e05d36eb 100644 --- a/board/common/qemu/qemu.mk +++ b/board/common/qemu/qemu.mk @@ -10,7 +10,7 @@ qemu-kconfig = \ BR2_CONFIG="$(BINARIES_DIR)/qemu/.config" \ $(BUILD_DIR)/buildroot-config/$(1) $(2) "$(BINARIES_DIR)/qemu/Config.in" -ifeq ($(QEMU_SCRIPTS),y) +ifeq ($(IX_QEMU_SCRIPTS),y) .PHONY: run run: @@ -33,7 +33,7 @@ $(BINARIES_DIR)/qemu/run.sh: $(QEMU_SCRIPTS_DIR)/run.sh $(BINARIES_DIR)/qemu/Config.in: $(QEMU_SCRIPTS_DIR)/Config.in.in @mkdir -p $(dir $@) @sed \ - -e "s:@ARCH@:QEMU_$(BR2_ARCH):" \ + -e "s:@ARCH@:IX_QEMU_$(BR2_ARCH):" \ -e "s:@DISK_IMG@:../$(INFIX_ARTIFACT).qcow2:" \ < $< >$@ diff --git a/board/common/qemu/run.sh b/board/common/qemu/run.sh index 69c3d71e..acc3baa9 100755 --- a/board/common/qemu/run.sh +++ b/board/common/qemu/run.sh @@ -40,7 +40,7 @@ usage() echo " ARGS1 Args before the '--' separator are for kernel space" echo " -- Separator" echo " ARGS2 Args after the '--' separator are for the init process" - echo " Also, qemu.cfg has QEMU_APPEND which can affect this." + echo " Also, qemu.cfg has IX_QEMU_APPEND which can affect this." echo echo "Example:" echo " $prognm -- finit.debug" @@ -62,45 +62,45 @@ load_qemucfg() # shellcheck disable=SC1090 . "./.config" - [ "$CONFIG_QEMU_MACHINE" ] || die "Missing QEMU_MACHINE" - [ "$CONFIG_QEMU_ROOTFS" ] || die "Missing QEMU_ROOTFS" + [ "$CONFIG_IX_QEMU_MACHINE" ] || die "Missing IX_QEMU_MACHINE" + [ "$CONFIG_IX_QEMU_ROOTFS" ] || die "Missing IX_QEMU_ROOTFS" - [ -n "$CONFIG_QEMU_KERNEL" ] && [ -n "$CONFIG_QEMU_BIOS" ] \ - && die "QEMU_KERNEL conflicts with QEMU_BIOS" + [ -n "$CONFIG_IX_QEMU_KERNEL" ] && [ -n "$CONFIG_IX_QEMU_BIOS" ] \ + && die "IX_QEMU_KERNEL conflicts with IX_QEMU_BIOS" - [ -z "$CONFIG_QEMU_KERNEL" ] && [ -z "$CONFIG_QEMU_BIOS" ] \ - && die "QEMU_KERNEL or QEMU_BIOS must be set" + [ -z "$CONFIG_IX_QEMU_KERNEL" ] && [ -z "$CONFIG_IX_QEMU_BIOS" ] \ + && die "IX_QEMU_KERNEL or IX_QEMU_BIOS must be set" } loader_args() { - if [ "$CONFIG_QEMU_BIOS" ]; then - echo -n "-bios $CONFIG_QEMU_BIOS " - elif [ "$CONFIG_QEMU_KERNEL" ]; then - echo -n "-kernel $CONFIG_QEMU_KERNEL " + if [ "$CONFIG_IX_QEMU_BIOS" ]; then + echo -n "-bios $CONFIG_IX_QEMU_BIOS " + elif [ "$CONFIG_IX_QEMU_KERNEL" ]; then + echo -n "-kernel $CONFIG_IX_QEMU_KERNEL " fi } append_args() { # ARM 32-bit doesn't support virtio console properly, always use serial - if [ "$CONFIG_QEMU_arm" ]; then + if [ "$CONFIG_IX_QEMU_arm" ]; then echo -n "console=ttyAMA0 " - elif [ "$CONFIG_QEMU_CONSOLE_VIRTIO" ]; then + elif [ "$CONFIG_IX_QEMU_CONSOLE_VIRTIO" ]; then echo -n "console=hvc0 " - elif [ "$CONFIG_QEMU_x86_64" ]; then + elif [ "$CONFIG_IX_QEMU_x86_64" ]; then echo -n "console=ttyS0 " - elif [ "$CONFIG_QEMU_aarch64" ]; then + elif [ "$CONFIG_IX_QEMU_aarch64" ]; then echo -n "console=ttyAMA0 " else die "Unknown console" fi - if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ]; then + if [ "$CONFIG_IX_QEMU_ROOTFS_INITRD" = "y" ]; then # Size of initrd, rounded up to nearest kb - size=$((($(stat -c %s "$CONFIG_QEMU_ROOTFS") + 1023) >> 10)) + size=$((($(stat -c %s "$CONFIG_IX_QEMU_ROOTFS") + 1023) >> 10)) echo -n "root=/dev/ram0 ramdisk_size=${size} " - elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then + elif [ "$CONFIG_IX_QEMU_ROOTFS_VSCSI" = "y" ]; then echo -n "root=PARTLABEL=primary " fi @@ -110,20 +110,20 @@ append_args() echo -n "debug " fi - echo -n "${QEMU_APPEND} ${QEMU_EXTRA_APPEND} " + echo -n "${IX_QEMU_APPEND} ${QEMU_EXTRA_APPEND} " } rootfs_args() { - if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ]; then - echo -n "-initrd $CONFIG_QEMU_ROOTFS " - elif [ "$CONFIG_QEMU_ROOTFS_MMC" = "y" ]; then + if [ "$CONFIG_IX_QEMU_ROOTFS_INITRD" = "y" ]; then + echo -n "-initrd $CONFIG_IX_QEMU_ROOTFS " + elif [ "$CONFIG_IX_QEMU_ROOTFS_MMC" = "y" ]; then echo -n "-device sdhci-pci " echo -n "-device sd-card,drive=mmc " - echo -n "-drive id=mmc,file=$CONFIG_QEMU_ROOTFS,if=none,format=raw " - elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then + echo -n "-drive id=mmc,file=$CONFIG_IX_QEMU_ROOTFS,if=none,format=raw " + elif [ "$CONFIG_IX_QEMU_ROOTFS_VSCSI" = "y" ]; then # ARM 32-bit virt machine uses MMIO virtio devices, not PCI - if [ "$CONFIG_QEMU_arm" ]; then + if [ "$CONFIG_IX_QEMU_arm" ]; then echo -n "-drive file=qemu.qcow2,if=none,format=qcow2,id=rootfs " echo -n "-device virtio-blk-device,drive=rootfs " else @@ -140,9 +140,9 @@ serial_args() echo -n "-chardev stdio,id=console0,mux=on " echo -n "-mon chardev=console0 " - if [ "$CONFIG_QEMU_CONSOLE_VIRTIO" ]; then + if [ "$CONFIG_IX_QEMU_CONSOLE_VIRTIO" ]; then echo -n "-device virtconsole,nr=0,name=console,chardev=console0 " - elif [ "$CONFIG_QEMU_CONSOLE_SERIAL" ]; then + elif [ "$CONFIG_IX_QEMU_CONSOLE_SERIAL" ]; then echo -n "-serial chardev:console0 " else die "Unknown console" @@ -175,7 +175,7 @@ usb_args() rw_args() { - [ "$CONFIG_QEMU_RW" ] || return + [ "$CONFIG_IX_QEMU_RW" ] || return command -v mkfs.ext4 >/dev/null || die "$prognm: cannot find mkfs.ext4" @@ -184,45 +184,45 @@ rw_args() mkfs.ext4 -L aux "aux.ext4" >/dev/null 2>&1 fi - if ! [ -f "$CONFIG_QEMU_RW" ]; then - dd if=/dev/zero of="$CONFIG_QEMU_RW" bs=16M count=1 >/dev/null 2>&1 - mkfs.ext4 -L cfg "$CONFIG_QEMU_RW" >/dev/null 2>&1 + if ! [ -f "$CONFIG_IX_QEMU_RW" ]; then + dd if=/dev/zero of="$CONFIG_IX_QEMU_RW" bs=16M count=1 >/dev/null 2>&1 + mkfs.ext4 -L cfg "$CONFIG_IX_QEMU_RW" >/dev/null 2>&1 fi # ARM 32-bit virt machine uses MMIO virtio devices, not PCI - if [ "$CONFIG_QEMU_arm" ]; then + if [ "$CONFIG_IX_QEMU_arm" ]; then echo -n "-drive file=aux.ext4,if=none,format=raw,id=aux " echo -n "-device virtio-blk-device,drive=aux " - echo -n "-drive file=$CONFIG_QEMU_RW,if=none,format=raw,id=cfg " + echo -n "-drive file=$CONFIG_IX_QEMU_RW,if=none,format=raw,id=cfg " echo -n "-device virtio-blk-device,drive=cfg " - if [ "$CONFIG_QEMU_RW_VAR_OPT" ]; then - if ! [ -f "$CONFIG_QEMU_RW_VAR" ]; then - dd if=/dev/zero of="$CONFIG_QEMU_RW_VAR" bs=$CONFIG_QEMU_RW_VAR_SIZE count=1 >/dev/null 2>&1 - mkfs.ext4 -L var "$CONFIG_QEMU_RW_VAR" >/dev/null 2>&1 + if [ "$CONFIG_IX_QEMU_RW_VAR_OPT" ]; then + if ! [ -f "$CONFIG_IX_QEMU_RW_VAR" ]; then + dd if=/dev/zero of="$CONFIG_IX_QEMU_RW_VAR" bs=$CONFIG_IX_QEMU_RW_VAR_SIZE count=1 >/dev/null 2>&1 + mkfs.ext4 -L var "$CONFIG_IX_QEMU_RW_VAR" >/dev/null 2>&1 fi - echo -n "-drive file=$CONFIG_QEMU_RW_VAR,if=none,format=raw,id=var " + echo -n "-drive file=$CONFIG_IX_QEMU_RW_VAR,if=none,format=raw,id=var " echo -n "-device virtio-blk-device,drive=var " fi else echo -n "-drive file=aux.ext4,if=virtio,format=raw,bus=0,unit=3 " - echo -n "-drive file=$CONFIG_QEMU_RW,if=virtio,format=raw,bus=0,unit=1 " + echo -n "-drive file=$CONFIG_IX_QEMU_RW,if=virtio,format=raw,bus=0,unit=1 " - if [ "$CONFIG_QEMU_RW_VAR_OPT" ]; then - if ! [ -f "$CONFIG_QEMU_RW_VAR" ]; then - dd if=/dev/zero of="$CONFIG_QEMU_RW_VAR" bs=$CONFIG_QEMU_RW_VAR_SIZE count=1 >/dev/null 2>&1 - mkfs.ext4 -L var "$CONFIG_QEMU_RW_VAR" >/dev/null 2>&1 + if [ "$CONFIG_IX_QEMU_RW_VAR_OPT" ]; then + if ! [ -f "$CONFIG_IX_QEMU_RW_VAR" ]; then + dd if=/dev/zero of="$CONFIG_IX_QEMU_RW_VAR" bs=$CONFIG_IX_QEMU_RW_VAR_SIZE count=1 >/dev/null 2>&1 + mkfs.ext4 -L var "$CONFIG_IX_QEMU_RW_VAR" >/dev/null 2>&1 fi - echo -n "-drive file=$CONFIG_QEMU_RW_VAR,if=virtio,format=raw,bus=0,unit=2 " + echo -n "-drive file=$CONFIG_IX_QEMU_RW_VAR,if=virtio,format=raw,bus=0,unit=2 " fi fi } host_args() { - [ "$CONFIG_QEMU_HOST" ] || return + [ "$CONFIG_IX_QEMU_HOST" ] || return - echo -n "-virtfs local,path=$CONFIG_QEMU_HOST,security_model=none,writeout=immediate,mount_tag=hostfs " + echo -n "-virtfs local,path=$CONFIG_IX_QEMU_HOST,security_model=none,writeout=immediate,mount_tag=hostfs " } net_dev_args() @@ -230,7 +230,7 @@ net_dev_args() name="e$1" mac=$(printf "02:00:00:00:00:%02x" "$1") - echo -n "-device $CONFIG_QEMU_NET_MODEL,netdev=$name,mac=$mac " + echo -n "-device $CONFIG_IX_QEMU_NET_MODEL,netdev=$name,mac=$mac " echo "$name $mac" >>"$mactab" } @@ -252,29 +252,29 @@ net_args() :> "$mactab" echo -n "-fw_cfg name=opt/mactab,file=$mactab " - if [ "$CONFIG_QEMU_NET_BRIDGE" = "y" ]; then - echo -n "-netdev bridge,id=e1,br=$CONFIG_QEMU_NET_BRIDGE_DEV " + if [ "$CONFIG_IX_QEMU_NET_BRIDGE" = "y" ]; then + echo -n "-netdev bridge,id=e1,br=$CONFIG_IX_QEMU_NET_BRIDGE_DEV " net_dev_args 1 - elif [ "$CONFIG_QEMU_NET_TAP" = "y" ]; then - for i in $(seq 1 "$CONFIG_QEMU_NET_TAP_N"); do + elif [ "$CONFIG_IX_QEMU_NET_TAP" = "y" ]; then + for i in $(seq 1 "$CONFIG_IX_QEMU_NET_TAP_N"); do echo -n "-netdev tap,id=e$i,ifname=qtap$i " net_dev_args "$i" done - elif [ "$CONFIG_QEMU_NET_ROCKER" = "y" ]; then + elif [ "$CONFIG_IX_QEMU_NET_ROCKER" = "y" ]; then sw=sw0 # Only single switch support atm. echo -n "-device '{\"driver\":\"rocker\", \"name\":\"${sw}\", " echo -n "\"fp_start_macaddr\":\"02:00:00:00:00:01\", " echo -n "\"ports\":[" - for i in $(seq 1 "$CONFIG_QEMU_NET_PORTS"); do + for i in $(seq 1 "$CONFIG_IX_QEMU_NET_PORTS"); do [ "$i" -gt 1 ] && echo -n ", " echo -n "\"${sw}p${i}\"" done echo -n "]}' " - for i in $(seq 1 "$CONFIG_QEMU_NET_PORTS"); do + for i in $(seq 1 "$CONFIG_IX_QEMU_NET_PORTS"); do rocker_port_args 0 "$i" done - elif [ "$CONFIG_QEMU_NET_USER" = "y" ]; then - [ "$CONFIG_QEMU_NET_USER_OPTS" ] && useropts=",$CONFIG_QEMU_NET_USER_OPTS" + elif [ "$CONFIG_IX_QEMU_NET_USER" = "y" ]; then + [ "$CONFIG_IX_QEMU_NET_USER_OPTS" ] && useropts=",$CONFIG_IX_QEMU_NET_USER_OPTS" echo -n "-netdev user,id=e1${useropts} " net_dev_args 1 else @@ -285,7 +285,7 @@ net_args() # Vital Product data vpd_args() { - [ "$CONFIG_QEMU_VPD" = "y" ] || return + [ "$CONFIG_IX_QEMU_VPD" = "y" ] || return vpd_file="${qdir}/vpd" @@ -324,8 +324,8 @@ random_date() rtc_args() { - rtc="${CONFIG_QEMU_RTC:-utc}" - clock="${CONFIG_QEMU_CLOCK:-host}" + rtc="${CONFIG_IX_QEMU_RTC:-utc}" + clock="${CONFIG_IX_QEMU_CLOCK:-host}" if [ "$rtc" = "random" ]; then rtc=$(random_date) fi @@ -358,28 +358,28 @@ extract_squashfs() run_qemu() { # Auto-extract rootfs.squashfs from rootfs.itb if needed for initrd mode - if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ] && [ ! -f "$CONFIG_QEMU_ROOTFS" ]; then - itb="${CONFIG_QEMU_ROOTFS%.squashfs}.itb" + if [ "$CONFIG_IX_QEMU_ROOTFS_INITRD" = "y" ] && [ ! -f "$CONFIG_IX_QEMU_ROOTFS" ]; then + itb="${CONFIG_IX_QEMU_ROOTFS%.squashfs}.itb" if [ -f "$itb" ]; then - extract_squashfs "$itb" "$CONFIG_QEMU_ROOTFS" + extract_squashfs "$itb" "$CONFIG_IX_QEMU_ROOTFS" else - die "Missing $CONFIG_QEMU_ROOTFS and cannot find $itb to extract it from" + die "Missing $CONFIG_IX_QEMU_ROOTFS and cannot find $itb to extract it from" fi fi - if [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then + if [ "$CONFIG_IX_QEMU_ROOTFS_VSCSI" = "y" ]; then if ! qemu-img check "qemu.qcow2"; then rm -f "qemu.qcow2" fi if [ ! -f "qemu.qcow2" ]; then echo "Creating qcow2 disk image for Qemu ..." - qemu-img create -f qcow2 -o backing_file="$CONFIG_QEMU_ROOTFS" \ + qemu-img create -f qcow2 -o backing_file="$CONFIG_IX_QEMU_ROOTFS" \ -F qcow2 "qemu.qcow2" > /dev/null fi fi read -r qemu < "$run" - if [ "$CONFIG_QEMU_KERNEL" ]; then + if [ "$CONFIG_IX_QEMU_KERNEL" ]; then echo "$qemu -append \"$(append_args)\" $*" >> "$run" else echo "$qemu $*" >> "$run" @@ -419,9 +419,9 @@ EOF dtb_args() { - [ "$CONFIG_QEMU_LOADER_UBOOT" ] || return + [ "$CONFIG_IX_QEMU_LOADER_UBOOT" ] || return - if [ "$CONFIG_QEMU_DTB_EXTEND" ]; then + if [ "$CONFIG_IX_QEMU_DTB_EXTEND" ]; then # On the current architecture, QEMU will generate an internal # DT based on the system configuration. @@ -445,12 +445,12 @@ dtb_args() generate_dot() { - [ "$CONFIG_QEMU_NET_TAP" = "y" ] || return + [ "$CONFIG_IX_QEMU_NET_TAP" = "y" ] || return hostports=" qtap1" targetports=" e1" edges="host:qtap1 -- target:e1 [kind=mgmt];" - for tap in $(seq 2 $((CONFIG_QEMU_NET_TAP_N - 1))); do + for tap in $(seq 2 $((CONFIG_IX_QEMU_NET_TAP_N - 1))); do hostports="$hostports | qtap$tap " targetports="$targetports | e$tap " edges="$edges host:qtap$tap -- target:e$tap;" @@ -485,7 +485,7 @@ EOF menuconfig() { - grep -q QEMU_MACHINE Config.in || die "$prognm: must be run from the $$O/images/qemu directory" + grep -q IX_QEMU_MACHINE Config.in || die "$prognm: must be run from the $$O/images/qemu directory" command -v kconfig-mconf >/dev/null || die "$prognm: cannot find kconfig-mconf for menuconfig" exec kconfig-mconf Config.in } diff --git a/board/common/uboot/uboot.mk b/board/common/uboot/uboot.mk index 63f65d7e..6159a371 100644 --- a/board/common/uboot/uboot.mk +++ b/board/common/uboot/uboot.mk @@ -25,7 +25,7 @@ define UBOOT_PRE_BUILD_INSTALL_KEY $(HOST_DIR)/bin/dtc -a 1024 <(echo '/dts-v1/; / { signature {}; };') \ >$(@D)/infix-key.dtb $(foreach key, \ - $(call qstrip,$(TRUSTED_KEYS_DEVELOPMENT_PATH)) $(call qstrip,$(TRUSTED_KEYS_EXTRA_PATH)),\ + $(call qstrip,$(IX_TRUSTED_KEYS_DEVELOPMENT_PATH)) $(call qstrip,$(IX_TRUSTED_KEYS_EXTRA_PATH)),\ $(call uboot-add-pubkey,$(key),$(@D)/infix-key.dtb)) $(HOST_DIR)/bin/dtc -I dtb -O dts \ <$(@D)/infix-key.dtb \ diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 6176016b..e7c3f39c 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -143,11 +143,11 @@ BR2_PACKAGE_MARVELL_CN9130_CRB=y BR2_PACKAGE_MARVELL_ESPRESSOBIN=y BR2_PACKAGE_RASPBERRYPI_RPI64=y BR2_PACKAGE_STYX_DCP_SC_28P=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_FEATURE_GPS=y BR2_PACKAGE_FEATURE_WIFI=y BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y @@ -191,9 +191,9 @@ BR2_PACKAGE_WEBUI=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y BR2_PACKAGE_HOST_PYTHON_YANGDOC=y BR2_PACKAGE_PCIUTILS=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig index b032f8a1..2d19c91b 100644 --- a/configs/aarch64_minimal_defconfig +++ b/configs/aarch64_minimal_defconfig @@ -121,11 +121,11 @@ BR2_PACKAGE_MARVELL_CN9130_CRB=y BR2_PACKAGE_MARVELL_ESPRESSOBIN=y BR2_PACKAGE_RASPBERRYPI_RPI64=y BR2_PACKAGE_STYX_DCP_SC_28P=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_CONFD=y BR2_PACKAGE_NETD=y BR2_PACKAGE_CONFD_TEST_MODE=y @@ -151,9 +151,9 @@ BR2_PACKAGE_MDNS_ALIAS=y BR2_PACKAGE_ONIEPROM=y BR2_PACKAGE_ROUSETTE=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/aarch64_qemu_boot_defconfig b/configs/aarch64_qemu_boot_defconfig index e1525181..c439dec0 100644 --- a/configs/aarch64_qemu_boot_defconfig +++ b/configs/aarch64_qemu_boot_defconfig @@ -25,5 +25,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/arm_defconfig b/configs/arm_defconfig index 2b1cbdcd..127dabff 100644 --- a/configs/arm_defconfig +++ b/configs/arm_defconfig @@ -137,11 +137,11 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y BR2_PACKAGE_MICROCHIP_SAMA7G54_EK=y BR2_PACKAGE_RASPBERRYPI_RPI2=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_FEATURE_GPS=y BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y BR2_PACKAGE_FEATURE_WIFI_REALTEK=y @@ -174,9 +174,9 @@ BR2_PACKAGE_ROUSETTE=y BR2_PACKAGE_WEBUI=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y BR2_PACKAGE_HOST_PYTHON_YANGDOC=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/arm_minimal_defconfig b/configs/arm_minimal_defconfig index 09ae64c8..ca4bf2a6 100644 --- a/configs/arm_minimal_defconfig +++ b/configs/arm_minimal_defconfig @@ -119,11 +119,11 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y BR2_PACKAGE_MICROCHIP_SAMA7G54_EK=y BR2_PACKAGE_RASPBERRYPI_RPI2=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_CONFD=y BR2_PACKAGE_NETD=y BR2_PACKAGE_CONFD_TEST_MODE=y @@ -149,9 +149,9 @@ BR2_PACKAGE_MDNS_ALIAS=y BR2_PACKAGE_ONIEPROM=y BR2_PACKAGE_ROUSETTE=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/bpi_r3_emmc_boot_defconfig b/configs/bpi_r3_emmc_boot_defconfig index 387ed369..2063555d 100644 --- a/configs/bpi_r3_emmc_boot_defconfig +++ b/configs/bpi_r3_emmc_boot_defconfig @@ -40,5 +40,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/bpi_r3_sd_boot_defconfig b/configs/bpi_r3_sd_boot_defconfig index 2e3b28c6..fb3bdf58 100644 --- a/configs/bpi_r3_sd_boot_defconfig +++ b/configs/bpi_r3_sd_boot_defconfig @@ -38,5 +38,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/bpi_r4_emmc_boot_defconfig b/configs/bpi_r4_emmc_boot_defconfig index 2ae3342a..46a3d04f 100644 --- a/configs/bpi_r4_emmc_boot_defconfig +++ b/configs/bpi_r4_emmc_boot_defconfig @@ -38,5 +38,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/bpi_r4_sd_boot_defconfig b/configs/bpi_r4_sd_boot_defconfig index 9f2a63e9..625045ab 100644 --- a/configs/bpi_r4_sd_boot_defconfig +++ b/configs/bpi_r4_sd_boot_defconfig @@ -38,5 +38,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/bpi_r64_emmc_boot_defconfig b/configs/bpi_r64_emmc_boot_defconfig index 42597189..f3e965b7 100644 --- a/configs/bpi_r64_emmc_boot_defconfig +++ b/configs/bpi_r64_emmc_boot_defconfig @@ -38,5 +38,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/bpi_r64_sd_boot_defconfig b/configs/bpi_r64_sd_boot_defconfig index 56f5f2ac..e78c2cfe 100644 --- a/configs/bpi_r64_sd_boot_defconfig +++ b/configs/bpi_r64_sd_boot_defconfig @@ -38,5 +38,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/cn9130_crb_boot_defconfig b/configs/cn9130_crb_boot_defconfig index bc880db5..13e1856b 100644 --- a/configs/cn9130_crb_boot_defconfig +++ b/configs/cn9130_crb_boot_defconfig @@ -38,5 +38,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/nanopi_r2s_boot_defconfig b/configs/nanopi_r2s_boot_defconfig index 070d3dec..65dc9e04 100644 --- a/configs/nanopi_r2s_boot_defconfig +++ b/configs/nanopi_r2s_boot_defconfig @@ -45,5 +45,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y BR2_PACKAGE_BOOTLOADER_SPLASHSCREEN=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig index 3a500e26..5c0ad566 100644 --- a/configs/riscv64_defconfig +++ b/configs/riscv64_defconfig @@ -168,11 +168,11 @@ BR2_PACKAGE_HOST_GO_BIN=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_FEATURE_GPS=y BR2_PACKAGE_FEATURE_WIFI=y BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y @@ -211,9 +211,9 @@ BR2_PACKAGE_WEBUI=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y BR2_PACKAGE_HOST_PYTHON_YANGDOC=y BR2_PACKAGE_PCIUTILS=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/rpi64_boot_defconfig b/configs/rpi64_boot_defconfig index ba606ef7..477f49f1 100644 --- a/configs/rpi64_boot_defconfig +++ b/configs/rpi64_boot_defconfig @@ -40,5 +40,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y BR2_PACKAGE_BOOTLOADER_SPLASHSCREEN=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/sama7g54_ek_emmc_boot_defconfig b/configs/sama7g54_ek_emmc_boot_defconfig index 5c76540c..1b64c205 100644 --- a/configs/sama7g54_ek_emmc_boot_defconfig +++ b/configs/sama7g54_ek_emmc_boot_defconfig @@ -34,5 +34,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/sama7g54_ek_sd_boot_defconfig b/configs/sama7g54_ek_sd_boot_defconfig index dc2f9456..9d802941 100644 --- a/configs/sama7g54_ek_sd_boot_defconfig +++ b/configs/sama7g54_ek_sd_boot_defconfig @@ -34,5 +34,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/snippets/ext4.conf b/configs/snippets/ext4.conf index 20cfc728..c2c42e67 100644 --- a/configs/snippets/ext4.conf +++ b/configs/snippets/ext4.conf @@ -1,4 +1,4 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="512M" -IMAGE_EXT4_RAUC=y +IX_IMAGE_EXT4_RAUC=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index 91bb7ce7..b2352291 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -139,11 +139,11 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_FEATURE_GPS=y BR2_PACKAGE_FEATURE_WIFI=y BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y @@ -185,9 +185,9 @@ BR2_PACKAGE_WEBUI=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y BR2_PACKAGE_HOST_PYTHON_YANGDOC=y BR2_PACKAGE_PCIUTILS=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig index 747fd096..533603a0 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -118,11 +118,11 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FDT_ADD_PUBKEY=y -INFIX_VENDOR_HOME="https://www.kernelkit.org" -INFIX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." -INFIX_HOME="https://github.com/kernelkit/infix/" -INFIX_DOC="https://www.kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +IX_VENDOR_HOME="https://www.kernelkit.org" +IX_DESC="Infix is an immutable, friendly, and secure operating system that turns any ARM or x86 device into a powerful, manageable network appliance. Deploy on anything from $35 Raspberry Pi boards to enterprise switches as routers, IoT gateways, or edge devices. Infix models Linux networking features using YANG so you can manage your devices using NETCONF/RESTCONF APIs and focus on your business logic running in isolated containers." +IX_HOME="https://github.com/kernelkit/infix/" +IX_DOC="https://www.kernelkit.org/infix/" +IX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_CONFD=y BR2_PACKAGE_NETD=y BR2_PACKAGE_CONFD_TEST_MODE=y @@ -148,9 +148,9 @@ BR2_PACKAGE_MDNS_ALIAS=y BR2_PACKAGE_ONIEPROM=y BR2_PACKAGE_ROUSETTE=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y -IMAGE_ITB_AUX=y -IMAGE_ITB_QCOW=y -IMAGE_ITB_RAUC=y -IMAGE_README=y -TRUSTED_KEYS=y -TRUSTED_KEYS_DEVELOPMENT=y +IX_IMAGE_ITB_AUX=y +IX_IMAGE_ITB_QCOW=y +IX_IMAGE_ITB_RAUC=y +IX_IMAGE_README=y +IX_TRUSTED_KEYS=y +IX_TRUSTED_KEYS_DEVELOPMENT=y diff --git a/doc/branding.md b/doc/branding.md index 7056c95f..4d9d468e 100644 --- a/doc/branding.md +++ b/doc/branding.md @@ -28,7 +28,7 @@ Verify the result after a build by inspecting: > [!IMPORTANT] > To get a proper GIT revision (hash) from your OS spin, remember to set -> in menuconfig `INFIX_OEM_PATH`. When unset, the Infix `post-build.sh` +> in menuconfig `IX_OEM_PATH`. When unset, the Infix `post-build.sh` > script defaults to the Infix base path. The revision is stored in the > file `/etc/os-release` as `BUILD_ID`, also in the file `/etc/version`. > See below for more info. @@ -427,7 +427,7 @@ Used for `BUILD_ID` in `/etc/os-release`. **Default:** `$(git describe --always --dirty --tags)`, from the _top directory_. By default, the top directory refers to the root of the Infix source tree, but this can be changed by setting the branding -variable `INFIX_OEM_PATH`, e.g. in a `defconfig` file or via `make +variable `IX_OEM_PATH`, e.g. in a `defconfig` file or via `make menuconfig`, to the path of an enclosing br2-external. #### `INFIX_RELEASE` diff --git a/infix.mk b/infix.mk index 31fc52f1..88711438 100644 --- a/infix.mk +++ b/infix.mk @@ -1,6 +1,6 @@ IXMSG = printf "\e[37;44m>>> $(call qstrip,$(1))\e[0m\n" -oem-dir := $(call qstrip,$(INFIX_OEM_PATH)) +oem-dir := $(call qstrip,$(IX_OEM_PATH)) INFIX_TOPDIR = $(if $(oem-dir),$(oem-dir),$(BR2_EXTERNAL_INFIX_PATH)) # Unless the user specifies an explicit build id, source it from git. @@ -10,6 +10,6 @@ INFIX_TOPDIR = $(if $(oem-dir),$(oem-dir),$(BR2_EXTERNAL_INFIX_PATH)) # artifacts (see INFIX_ARTIFACT below). export INFIX_BUILD_ID ?= $(shell git -C $(INFIX_TOPDIR) describe --dirty --always --tags --exclude 'latest*') export INFIX_VERSION = $(INFIX_BUILD_ID) -export INFIX_ARTIFACT = $(call qstrip,$(INFIX_IMAGE_ID)$(if $(INFIX_RELEASE),-$(INFIX_RELEASE))) +export INFIX_ARTIFACT = $(call qstrip,$(IX_IMAGE_ID)$(if $(INFIX_RELEASE),-$(INFIX_RELEASE))) INFIX_CFLAGS:=-Wall -Werror -Wextra -Wno-unused-parameter -Wformat=2 -Wformat-overflow=2 -Winit-self -Wstrict-overflow=4 -Wno-format-truncation -Wno-format-nonliteral diff --git a/test/test.mk b/test/test.mk index 36683090..ac83de78 100644 --- a/test/test.mk +++ b/test/test.mk @@ -58,7 +58,7 @@ SPEC_Q := endif test-spec: - @esc_infix_name="$(echo $(INFIX_NAME) | sed 's/\//\\\//g')"; \ + @esc_infix_name="$(echo $(IX_NAME) | sed 's/\//\\\//g')"; \ sed 's/{REPLACE}/$(subst ",,$(esc_infix_name)) $(INFIX_VERSION)/' \ $(spec-dir)/Readme.adoc.in > $(spec-dir)/Readme.adoc $(SPEC_Q)$(spec-dir)/generate_spec.py -s $(test-dir)/case/all.yaml -r $(BR2_EXTERNAL_INFIX_PATH) $(SPEC_DEBUG) @@ -86,7 +86,7 @@ xpath-coverage-report: $(xpath_coverage_report_md) \ $(xpath_coverage_report_css) \ $(xpath_coverage_logo) \ - "$(subst ",,$(INFIX_NAME)) $(INFIX_VERSION)" \ + "$(subst ",,$(IX_NAME)) $(INFIX_VERSION)" \ $(xpath_coverage_report_pdf) # Unit tests run with random (-r) hostname and container name to diff --git a/utils/mkimage.sh b/utils/mkimage.sh index a78f9fcb..5ef7153c 100755 --- a/utils/mkimage.sh +++ b/utils/mkimage.sh @@ -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