Merge pull request #1567 from kernelkit/kernel-upgrade-c7cf8e8a-c974-4873-a74d-00042e95b98b

Upgrade to kernel 6.18.39

.github/workflows/build-boot.yml

@@ -78,7 +78,7 @@ jobs:
 
       - name: Configure ${{ matrix.defconfig }}_defconfig
         run: |
-          make ${{ matrix.defconfig }}_defconfig
+          make ${{ matrix.defconfig }}_defconfig apply-mirror
 
       - name: Build ${{ matrix.defconfig }}_defconfig
         run: |

.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

.github/workflows/build-release.yml

@@ -54,7 +54,7 @@ jobs:
         run: |
           target=${{ matrix.target }}_defconfig
           echo "Building $target ..."
-          make $target
+          make $target apply-mirror
           make
 
       - name: Generate SBOM from Build
@@ -70,6 +70,25 @@ jobs:
         run: |
           make test-spec
 
+      # rootfs.squashfs is still present here; it is stripped from the
+      # tarball below.  mkimage pulls the rpi64 bootloader from the
+      # latest-boot release and uses the freshly built host genimage.
+      - name: Build Raspberry Pi image
+        if: matrix.target == 'aarch64'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ./utils/mkimage.sh -d -r output raspberrypi-rpi64
+          mkdir -p rpi-image
+          mv output/images/*-rpi64-sdcard.img rpi-image/
+          xz -T0 rpi-image/*-rpi64-sdcard.img
+
+      - uses: actions/upload-artifact@v7
+        if: matrix.target == 'aarch64'
+        with:
+          name: artifact-rpi64-image
+          path: rpi-image/*.img.xz
+
       - name: Prepare Artifacts
         run: |
           cd output/
@@ -98,3 +117,8 @@ jobs:
         with:
           name: artifact-disk-image-${{ matrix.target }}
           path: output/images/*.qcow2
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: artifact-pkg-${{ matrix.target }}
+          path: output/images/*.pkg

.github/workflows/build.yml

@@ -129,7 +129,7 @@ jobs:
 
       - name: Configure ${{ env.TARGET }}
         run: |
-          make ${{ env.TARGET }}_defconfig
+          make ${{ env.TARGET }}_defconfig apply-mirror
 
       - name: Cleanup stale containers and ports
         run: |

.github/workflows/release.yml

@@ -95,7 +95,7 @@ jobs:
           makeLatest: ${{ steps.rel.outputs.latest }}
           discussionCategory: ${{ steps.rel.outputs.cat }}
           bodyFile: release.md
-          artifacts: "*.tar.gz,*.qcow2"
+          artifacts: "*.tar.gz,*.qcow2,*.pkg,*.img.xz"
 
       - name: Summary
         run: |

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
+	  Mandatory.  Defaults to $IX_IMAGE_ID, which in turn is composed
-	  of $INFIX_ID-$BR2_ARCH.
+	  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

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

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"
 

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

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]

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"
 	}

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"
         }

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"
 	}

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"
 	}

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"
 	}

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

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

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

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

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.

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.

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
+	depends on IX_IMAGE_ITB_QCOW
-	default IMAGE_ITB_QCOW_BOOT_EFI if BR2_x86_64
+	default IX_IMAGE_ITB_QCOW_BOOT_EFI if BR2_x86_64
-	default IMAGE_ITB_QCOW_BOOT_NONE
+	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 IX_IMAGE_ITB_QCOW
-	depends on IMAGE_ITB_QCOW_BOOT_EFI || IMAGE_ITB_QCOW_BOOT_BIN
+	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 IX_IMAGE_ITB_QCOW
-	depends on IMAGE_ITB_QCOW_BOOT_EFI || IMAGE_ITB_QCOW_BOOT_BIN
+	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

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-$(IX_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_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

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

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

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

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

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)))

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

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 "NAME=\"$IX_NAME\""
-    echo "ID=$INFIX_ID"
+    echo "ID=$IX_ID"
-    echo "PRETTY_NAME=\"$INFIX_TAGLINE $INFIX_VERSION\""
+    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
+    if [ -n "$IX_IMAGE_ID" ]; then
-	echo "IMAGE_ID=\"$INFIX_IMAGE_ID\""
+	echo "IMAGE_ID=\"$IX_IMAGE_ID\""
     fi
     if [ -n "$INFIX_RELEASE" ]; then
 	echo "IMAGE_VERSION=\"$INFIX_RELEASE\""
     fi
-    echo "ARCHITECTURE=\"${INFIX_ARCH}\""
+    echo "ARCHITECTURE=\"${IX_ARCH}\""
-    echo "HOME_URL=$INFIX_HOME"
+    echo "HOME_URL=$IX_HOME"
-    if [ -n "$INFIX_VENDOR" ]; then
+    if [ -n "$IX_VENDOR" ]; then
-	echo "VENDOR_NAME=\"$INFIX_VENDOR\""
+	echo "VENDOR_NAME=\"$IX_VENDOR\""
     fi
-    if [ -n "$INFIX_VENDOR_HOME" ]; then
+    if [ -n "$IX_VENDOR_HOME" ]; then
-	echo "VENDOR_HOME=\"$INFIX_VENDOR_HOME\""
+	echo "VENDOR_HOME=\"$IX_VENDOR_HOME\""
     fi
-    if [ -n "$INFIX_DOC" ]; then
+    if [ -n "$IX_DOC" ]; then
-	echo "DOCUMENTATION_URL=\"$INFIX_DOC\""
+	echo "DOCUMENTATION_URL=\"$IX_DOC\""
     fi
-    if [ -n "$INFIX_SUPPORT" ]; then
+    if [ -n "$IX_SUPPORT" ]; then
-	echo "SUPPORT_URL=\"$INFIX_SUPPORT\""
+	echo "SUPPORT_URL=\"$IX_SUPPORT\""
     fi
-    if [ -n "$INFIX_DESC" ]; then
+    if [ -n "$IX_DESC" ]; then
-	echo "INFIX_DESC=\"$INFIX_DESC\""
+	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

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
+config IX_QEMU_riscv64
-	bool "risv64"
+	bool "riscv64"
-	select QEMU_ARCH_IS_64
+	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 IX_QEMU_CONSOLE_SERIAL if IX_QEMU_arm
-     default QEMU_CONSOLE_VIRTIO
+     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-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 QEMU_aarch64
+	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 QEMU_x86_64
+	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
+	depends on IX_QEMU_LOADER_KERNEL
-	default "../zImage"  if QEMU_arm
+	default "../zImage"  if IX_QEMU_arm
-	default "../Image"   if QEMU_aarch64
+	default "../Image"   if IX_QEMU_aarch64
-	default "../bzImage" if QEMU_x86_64
+	default "../bzImage" if IX_QEMU_x86_64
 
-config QEMU_BIOS
+config IX_QEMU_BIOS
 	string
-	depends on !QEMU_LOADER_KERNEL
+	depends on !IX_QEMU_LOADER_KERNEL
-	default "../u-boot.bin" if QEMU_LOADER_UBOOT
+	default "../u-boot.bin" if IX_QEMU_LOADER_UBOOT
-	default "../OVMF.fd"    if QEMU_LOADER_OVMF
+	default "../OVMF.fd"    if IX_QEMU_LOADER_OVMF
 
-config QEMU_ROOTFS
+config IX_QEMU_ROOTFS
 	string
-	default "@DISK_IMG@" if !QEMU_ROOTFS_INITRD
+	default "@DISK_IMG@" if !IX_QEMU_ROOTFS_INITRD
-	default "../rootfs.squashfs" if 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
+	depends on IX_QEMU_LOADER_UBOOT
-	default y if QEMU_aarch64
+	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
+if IX_QEMU_RW_VAR_OPT
-config QEMU_RW_VAR_SIZE
+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 "utc"       if IX_QEMU_RTC_UTC
-	default "localtime" if QEMU_RTC_LOCAL
+	default "localtime" if IX_QEMU_RTC_LOCAL
-	default "random"    if QEMU_RTC_RANDOM
+	default "random"    if IX_QEMU_RTC_RANDOM
 
-config QEMU_CLOCK
+config IX_QEMU_CLOCK
 	string
-	default "host"      if QEMU_CLOCK_HOST
+	default "host"      if IX_QEMU_CLOCK_HOST
-	default "rt"        if QEMU_CLOCK_RT
+	default "rt"        if IX_QEMU_CLOCK_RT
-	default "vm"        if QEMU_CLOCK_VM
+	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,<OPTIONS>
 
-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

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:" \
 	< $< >$@
 

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_IX_QEMU_MACHINE" ] || die "Missing IX_QEMU_MACHINE"
-    [ "$CONFIG_QEMU_ROOTFS"  ] || die "Missing QEMU_ROOTFS"
+    [ "$CONFIG_IX_QEMU_ROOTFS"  ] || die "Missing IX_QEMU_ROOTFS"
 
-    [ -n "$CONFIG_QEMU_KERNEL" ] && [ -n "$CONFIG_QEMU_BIOS" ] \
+    [ -n "$CONFIG_IX_QEMU_KERNEL" ] && [ -n "$CONFIG_IX_QEMU_BIOS" ] \
-	&& die "QEMU_KERNEL conflicts with QEMU_BIOS"
+	&& die "IX_QEMU_KERNEL conflicts with IX_QEMU_BIOS"
 
-    [ -z "$CONFIG_QEMU_KERNEL" ] && [ -z "$CONFIG_QEMU_BIOS" ] \
+    [ -z "$CONFIG_IX_QEMU_KERNEL" ] && [ -z "$CONFIG_IX_QEMU_BIOS" ] \
-	&& die "QEMU_KERNEL or QEMU_BIOS must be set"
+	&& die "IX_QEMU_KERNEL or IX_QEMU_BIOS must be set"
 }
 
 loader_args()
 {
-    if [ "$CONFIG_QEMU_BIOS" ]; then
+    if [ "$CONFIG_IX_QEMU_BIOS" ]; then
-	echo -n "-bios $CONFIG_QEMU_BIOS "
+	echo -n "-bios $CONFIG_IX_QEMU_BIOS "
-    elif [ "$CONFIG_QEMU_KERNEL" ]; then
+    elif [ "$CONFIG_IX_QEMU_KERNEL" ]; then
-	echo -n "-kernel $CONFIG_QEMU_KERNEL "
+	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
+    if [ "$CONFIG_IX_QEMU_ROOTFS_INITRD" = "y" ]; then
-	echo -n "-initrd $CONFIG_QEMU_ROOTFS "
+	echo -n "-initrd $CONFIG_IX_QEMU_ROOTFS "
-    elif [ "$CONFIG_QEMU_ROOTFS_MMC" = "y" ]; then
+    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 "
+	echo -n "-drive id=mmc,file=$CONFIG_IX_QEMU_ROOTFS,if=none,format=raw "
-    elif [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then
+    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
+    if ! [ -f "$CONFIG_IX_QEMU_RW" ]; then
-	dd if=/dev/zero of="$CONFIG_QEMU_RW" bs=16M count=1 >/dev/null 2>&1
+	dd if=/dev/zero of="$CONFIG_IX_QEMU_RW" bs=16M count=1 >/dev/null 2>&1
-	mkfs.ext4 -L cfg "$CONFIG_QEMU_RW" >/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 [ "$CONFIG_IX_QEMU_RW_VAR_OPT" ]; then
-	    if ! [ -f "$CONFIG_QEMU_RW_VAR" ]; then
+	    if ! [ -f "$CONFIG_IX_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
+		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_QEMU_RW_VAR" >/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 [ "$CONFIG_IX_QEMU_RW_VAR_OPT" ]; then
-	    if ! [ -f "$CONFIG_QEMU_RW_VAR" ]; then
+	    if ! [ -f "$CONFIG_IX_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
+		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_QEMU_RW_VAR" >/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
+    if [ "$CONFIG_IX_QEMU_NET_BRIDGE" = "y" ]; then
-	echo -n "-netdev bridge,id=e1,br=$CONFIG_QEMU_NET_BRIDGE_DEV "
+	echo -n "-netdev bridge,id=e1,br=$CONFIG_IX_QEMU_NET_BRIDGE_DEV "
 	net_dev_args 1
-    elif [ "$CONFIG_QEMU_NET_TAP" = "y" ]; then
+    elif [ "$CONFIG_IX_QEMU_NET_TAP" = "y" ]; then
-	for i in $(seq 1 "$CONFIG_QEMU_NET_TAP_N"); do
+	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
+    elif [ "$CONFIG_IX_QEMU_NET_USER" = "y" ]; then
-	[ "$CONFIG_QEMU_NET_USER_OPTS" ] && useropts=",$CONFIG_QEMU_NET_USER_OPTS"
+	[ "$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}"
+    rtc="${CONFIG_IX_QEMU_RTC:-utc}"
-    clock="${CONFIG_QEMU_CLOCK:-host}"
+    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
+    if [ "$CONFIG_IX_QEMU_ROOTFS_INITRD" = "y" ] && [ ! -f "$CONFIG_IX_QEMU_ROOTFS" ]; then
-	itb="${CONFIG_QEMU_ROOTFS%.squashfs}.itb"
+	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 <<EOF
-	$CONFIG_QEMU_MACHINE -nodefaults -m $CONFIG_QEMU_MACHINE_RAM \
+	$CONFIG_IX_QEMU_MACHINE -nodefaults -m $CONFIG_IX_QEMU_MACHINE_RAM \
 	  $(loader_args) \
 	  $(rootfs_args) \
 	  $(serial_args) \
@@ -391,14 +391,14 @@ run_qemu()
 	  $(rtc_args) \
 	  $(vpd_args) \
 	  $(gdb_args) \
-	  $CONFIG_QEMU_EXTRA
+	  $CONFIG_IX_QEMU_EXTRA
 EOF
     # Save resulting command to a script, because I cannot for the life
     # of me figure out how to embed the JSON snippet for Rocker and run
     # it here without issues, spent way too much time on it -- Joachim
     run=$(mktemp -t run.qemu.XXX)
     echo "#!/bin/sh" > "$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> qtap1"
     targetports="<e1> 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> qtap$tap "
 	targetports="$targetports | <e$tap> 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
 }

board/common/rootfs/etc/sysctl.d/ipv4.conf

@@ -24,6 +24,10 @@ net.ipv4.conf.all.arp_ignore=1
 net.ipv4.ip_forward=1
 net.ipv4.ip_forward_update_priority=0
 
+# Allow binding to non-local addresses, e.g. floating VIPs not yet
+# configured on an interface, see issue #1022
+net.ipv4.ip_nonlocal_bind=1
+
 net.ipv4.conf.all.forwarding=0
 net.ipv4.conf.default.forwarding=0
 

board/common/rootfs/etc/sysctl.d/ipv6.conf

@@ -7,6 +7,10 @@ net.ipv6.conf.all.ignore_routes_with_linkdown=1
 net.ipv6.conf.all.forwarding=0
 net.ipv6.conf.default.forwarding=0
 
+# Allow binding to non-local addresses, e.g. floating VIPs not yet
+# configured on an interface, see issue #1022
+net.ipv6.ip_nonlocal_bind=1
+
 # Accept router advertisements even when forwarding is enabled
 net.ipv6.conf.all.accept_ra=2
 net.ipv6.conf.default.accept_ra=2

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 \
@@ -46,3 +46,12 @@ define UBOOT_PRE_BUILD_INSTALL_ENV
 		$(@D)/arch/$(UBOOT_ARCH)/dts/
 endef
 UBOOT_PRE_BUILD_HOOKS += UBOOT_PRE_BUILD_INSTALL_ENV
+
+# Stamp non-release builds so they cannot be mistaken for a release,
+# U-Boot's setlocalversion picks up .scmversion, see issue #919.
+define UBOOT_PRE_BUILD_DEVEL_VERSION
+	echo "-DEVEL" >$(@D)/.scmversion
+endef
+ifeq ($(INFIX_RELEASE),)
+UBOOT_PRE_BUILD_HOOKS += UBOOT_PRE_BUILD_DEVEL_VERSION
+endif

configs/aarch64_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

configs/aarch64_minimal_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

configs/arm_defconfig

@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -129,6 +129,7 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y
 BR2_PACKAGE_HOST_GENEXT2FS=y
+BR2_PACKAGE_HOST_GO_BIN=y
 BR2_PACKAGE_HOST_KMOD_XZ=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
@@ -136,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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+IX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_FEATURE_GPS=y
 BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y
 BR2_PACKAGE_FEATURE_WIFI_REALTEK=y
@@ -173,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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

configs/arm_minimal_defconfig

@@ -28,7 +28,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

configs/riscv64_defconfig

@@ -164,14 +164,15 @@ BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out"
 BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_INFIX_PATH)/board/riscv64/visionfive2/uboot/visionfive2-env.dtsi"
 BR2_PACKAGE_HOST_BMAP_TOOLS=y
+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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+IX_SUPPORT="mailto:kernelkit@googlegroups.com"
 BR2_PACKAGE_FEATURE_GPS=y
 BR2_PACKAGE_FEATURE_WIFI=y
 BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y
@@ -210,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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

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

configs/snippets/mirror.conf

@@ -0,0 +1,5 @@
+# Prefer internal download mirror over official upstream sites.  If
+# the mirror is unreachable, e.g., off-site without VPN, Buildroot
+# falls back to the upstream URL and then sources.buildroot.net
+# Set up a local mirror and add IP to /etc/hosts to override
+BR2_PRIMARY_SITE="http://mirror.internal/pub"

configs/x86_64_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

configs/x86_64_minimal_defconfig

@@ -26,7 +26,7 @@ BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNA
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.37"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
@@ -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"
+IX_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."
+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."
-INFIX_HOME="https://github.com/kernelkit/infix/"
+IX_HOME="https://github.com/kernelkit/infix/"
-INFIX_DOC="https://www.kernelkit.org/infix/"
+IX_DOC="https://www.kernelkit.org/infix/"
-INFIX_SUPPORT="mailto:kernelkit@googlegroups.com"
+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
+IX_IMAGE_ITB_AUX=y
-IMAGE_ITB_QCOW=y
+IX_IMAGE_ITB_QCOW=y
-IMAGE_ITB_RAUC=y
+IX_IMAGE_ITB_RAUC=y
-IMAGE_README=y
+IX_IMAGE_README=y
-TRUSTED_KEYS=y
+IX_TRUSTED_KEYS=y
-TRUSTED_KEYS_DEVELOPMENT=y
+IX_TRUSTED_KEYS_DEVELOPMENT=y

doc/ChangeLog.md

@@ -3,6 +3,23 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[v26.08.0][UNRELEASED]
+-------------------------
+
+### Changes
+
+- Upgrade Linux kernel to 6.18.39 (LTS)
+- Upgrade Buildroot to 2025.02.15 (LTS)
+- Add support for firewall address-set (ipset): named sets of IP addresses and
+  networks, usable as zone sources for per-IP access control, issue #1189
+- Build RPi64 SD card images in release builds
+- Include .pkg files in release builds
+
+### Fixes
+
+- Fix annoying "cannot deselect all services" or reset to YANG default in the
+  web interface's firewall configuration page
+
 [v26.06.0][] - 2026-07-01
 -------------------------
 
@@ -2206,6 +2223,7 @@ Supported YANG models in addition to those used by sysrepo and netopeer:
 
 [buildroot]:  https://buildroot.org/
 [UNRELEASED]: https://github.com/kernelkit/infix/compare/v26.06.0...HEAD
+[v26.08.0]:   https://github.com/kernelkit/infix/compare/v26.06.0...v26.08.0
 [v26.06.0]:   https://github.com/kernelkit/infix/compare/v26.05.0...v26.06.0
 [v26.05.0]:   https://github.com/kernelkit/infix/compare/v26.04.0...v26.05.0
 [v26.04.0]:   https://github.com/kernelkit/infix/compare/v26.03.0...v26.04.0

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`

doc/developers-guide.md

@@ -190,6 +190,9 @@ To apply a single snippet to the current output directory:
     make apply-ext4         # build an ext4 rootfs (needed for boards
                             # whose bootloader lacks squashfs support,
                             # e.g. Marvell ESPRESSObin)
+    make apply-mirror       # prefer an internal download mirror
+                            # (BR2_PRIMARY_SITE) over upstream sites,
+                            # see utils/mirror-sync.sh for populating it
 
 The `apply-*` targets require an existing `.config` (i.e. you must have
 already run a `make <board>_defconfig`).  The snippet is merged using

doc/firewall.md

@@ -223,6 +223,96 @@ The firewall includes over 100 pre-defined services, such as:
 > See the YANG model for the full list, or tap the ++question++ key
 > when setting up an allowed host service in a zone `set service`
 
+## Address Sets
+
+Address sets are named collections of IP addresses and networks that can be
+used as zone *sources*, alongside the `network` setting.  Traffic from a
+member of the set is classified into that zone regardless of which interface
+it arrives on.  Since source matching takes precedence over interface
+matching, an address set in a trusted zone can selectively lift devices out
+of a restrictive interface zone.
+
+This enables per-IP access control: block everything by default and grant
+individual end devices access at runtime.
+
+> [!IMPORTANT]
+> Assigning an address set to a zone only decides which zone the source IP
+> belongs to.  It does **not** by itself grant access to the device.  Access
+> to HOST services is still controlled by the zone's `action` and `service`
+> settings.  A common pattern is to keep the interface or default zone
+> restrictive (`reject`/`drop`) and attach the address set to a separate
+> trusted zone with `action accept`, as shown below.
+
+<pre class="cli"><code>admin@example:/> <b>configure</b>
+admin@example:/config/> <b>edit firewall address-set allowed</b>
+admin@example:/config/firewall/…/allowed/> <b>set description "End devices granted access"</b>
+admin@example:/config/firewall/…/allowed/> <b>set entry 192.168.1.40</b>
+admin@example:/config/firewall/…/allowed/> <b>end</b>
+admin@example:/config/firewall/> <b>edit zone trusted</b>
+admin@example:/config/firewall/…/trusted/> <b>set action accept</b>
+admin@example:/config/firewall/…/trusted/> <b>set address-set allowed</b>
+admin@example:/config/firewall/…/trusted/> <b>leave</b>
+</code></pre>
+
+### Static and Dynamic Entries
+
+Entries come in two kinds:
+
+- **Static** entries are set in the configuration, like `192.168.1.40`
+  above, and are restored at boot
+- **Dynamic** entries are added and removed at runtime using the `add`,
+  `remove`, and `flush` actions.  They take effect immediately and survive
+  firewall configuration changes, but are *not* saved to the configuration,
+  so a reboot starts from a clean slate
+
+From admin-exec context in the CLI:
+
+<pre class="cli"><code>admin@example:/> <b>firewall address-set allowed add 192.168.1.42</b>
+admin@example:/> <b>show firewall address-set allowed</b>
+name                : allowed
+family              : ipv4
+timeout             : none
+
+ENTRY            TYPE     EXPIRES
+192.168.1.40     static
+192.168.1.42     dynamic
+admin@example:/> <b>firewall address-set allowed remove 192.168.1.42</b>
+</code></pre>
+
+The same actions are available over NETCONF and RESTCONF, e.g., allowing a
+device from a network management system:
+
+```json
+~$ curl -kX POST -u admin:admin -H "Content-Type: application/yang-data+json" \
+        -d '{"infix-firewall:input": {"entry": "192.168.1.42"}}'              \
+        https://example.local/restconf/data/infix-firewall:firewall/address-set=allowed/add
+```
+
+Static entries can only be removed by changing the configuration, the
+`remove` action manages dynamic entries only.  The `flush` action removes
+all dynamic entries at once, leaving static entries in place.
+
+### Expiring Entries
+
+An address set can be created with a `timeout`, giving every dynamic entry a
+limited lifetime.  Such sets are dynamic-only: static entries cannot be
+configured, and entries cannot be removed manually, they expire on their
+own.  This suits time-limited access grants and automated ban lists.
+
+<pre class="cli"><code>admin@example:/config/firewall/> <b>edit address-set banned</b>
+admin@example:/config/firewall/…/banned/> <b>set timeout 3600</b>
+admin@example:/config/firewall/…/banned/> <b>leave</b>
+admin@example:/> <b>firewall address-set banned add 203.0.113.99</b>
+</code></pre>
+
+The remaining lifetime of each entry is shown in the `EXPIRES` column of
+<kbd>show firewall address-set</kbd>.
+
+> [!NOTE]
+> Entries in timeout sets do not survive firewall configuration changes,
+> the set is flushed when the firewall configuration is rebuilt.  Regular
+> (non-timeout) sets keep their dynamic entries over configuration changes.
+
 ## Examples
 
 ### End Device Protection

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

package/netbrowse/netbrowse.hash

@@ -0,0 +1 @@
+sha256  49c4d5edbd3ee0a0f6b15ef097b79539530a574ceed8a4dffec1d02455933029  LICENSE

package/webui/webui.hash

@@ -0,0 +1 @@
+sha256  8cdb4def6e91fde66ed0880a6e6ecc364aa96012e53b3cfb990b53b9dab976d4  LICENSE

patches/linux/6.18.39/0001-net-phy-marvell10g-Support-firmware-loading-on-88X33.patch

@@ -1,4 +1,4 @@
-From f614327b6eca20319f5eee20ac954ea8d92276e4 Mon Sep 17 00:00:00 2001
+From 38ef4ac1fa9bd9b0436311c6f8962646222c54f9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
 Subject: [PATCH 01/50] net: phy: marvell10g: Support firmware loading on

patches/linux/6.18.39/0002-net-phy-marvell10g-Fix-power-up-when-strapped-to-sta.patch

@@ -1,4 +1,4 @@
-From 7d453cb838611f44d7566b6174ae95a5d2265fa1 Mon Sep 17 00:00:00 2001
+From 48bb808a5c8d7d0d7c49e4453f4809a9fdeefddc Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
 Subject: [PATCH 02/50] net: phy: marvell10g: Fix power-up when strapped to

patches/linux/6.18.39/0003-net-phy-marvell10g-Add-LED-support-for-88X3310.patch

@@ -1,4 +1,4 @@
-From 4b08a36e3107c4018ddf3a19760cc87d02281bd7 Mon Sep 17 00:00:00 2001
+From da0565da3839ac4f85b9743a4a207fbbe6d9c719 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
 Subject: [PATCH 03/50] net: phy: marvell10g: Add LED support for 88X3310

patches/linux/6.18.39/0004-net-phy-marvell10g-Support-LEDs-tied-to-a-single-med.patch

@@ -1,4 +1,4 @@
-From e5e81eb1172db22be7c83efc8071108d0d42565e Mon Sep 17 00:00:00 2001
+From 7f3d654b9af1b449555f0076f56db9a8c48f7314 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
 Subject: [PATCH 04/50] net: phy: marvell10g: Support LEDs tied to a single

patches/linux/6.18.39/0005-net-phy-Do-not-resume-PHY-when-attaching.patch

@@ -1,4 +1,4 @@
-From 1f735096f1b8920ee6f21bf60a4c2d3f6376adeb Mon Sep 17 00:00:00 2001
+From ae3d8558243c10a3fa34534765cdc5a4ece535b1 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
 Subject: [PATCH 05/50] net: phy: Do not resume PHY when attaching

patches/linux/6.18.39/0006-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch

@@ -1,4 +1,4 @@
-From e38d2d2f07f55819d2191d4282dc2d4688075d7d Mon Sep 17 00:00:00 2001
+From 08f6224ebcba517410b4dc2b98f7b50db842dc30 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
 Subject: [PATCH 06/50] net: bridge: avoid classifying unknown multicast as

patches/linux/6.18.39/0007-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch

@@ -1,4 +1,4 @@
-From a9b80b26c96e5492ab32a72ee36e3321a2b90ee9 Mon Sep 17 00:00:00 2001
+From 9044f8f0599e025644d13c0b031826f5765bbc34 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
 Subject: [PATCH 07/50] net: bridge: Ignore router ports when forwarding L2

patches/linux/6.18.39/0008-net-bridge-drop-delay-for-applying-strict-multicast-.patch

@@ -1,4 +1,4 @@
-From 01e41d87efa1b63d292f0acfe4d1fb0e39baab20 Mon Sep 17 00:00:00 2001
+From 2ddcdd2cb31dd46e552fea1adf3e89d9925412ee Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
 Subject: [PATCH 08/50] net: bridge: drop delay for applying strict multicast

patches/linux/6.18.39/0009-net-bridge-Differentiate-MDB-additions-from-modifica.patch

@@ -1,4 +1,4 @@
-From 944c77d075c8e0655bd3a28e96892261465a5cf4 Mon Sep 17 00:00:00 2001
+From 9e9322c41e94e95c3dd4841334933a6c8ef11fd1 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
 Subject: [PATCH 09/50] net: bridge: Differentiate MDB additions from

patches/linux/6.18.39/0010-nvmem-layouts-onie-tlv-Let-device-probe-even-when-TL.patch

@@ -1,4 +1,4 @@
-From 3f58061ab8f869a6432a1256ee7422bb157b624e Mon Sep 17 00:00:00 2001
+From 1d26447cb586481eee5c4564b68f49c6731b2c83 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
 Subject: [PATCH 10/50] nvmem: layouts: onie-tlv: Let device probe even when

patches/linux/6.18.39/0011-net-usb-r8152-add-r8153b-support-for-link-activity-L.patch

@@ -1,4 +1,4 @@
-From f492d4efac3a65bca4d53e383336c36113e28a8b Mon Sep 17 00:00:00 2001
+From 4620363bad6472dbe2b8de2093f0a70df812df58 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 11 Aug 2024 11:27:35 +0200
 Subject: [PATCH 11/50] net: usb: r8152: add r8153b support for link/activity

patches/linux/6.18.39/0012-arm64-dts-mediatek-mt7986a-rename-BPi-R3-ports-to-ma.patch

@@ -1,4 +1,4 @@
-From a2448b84e5483b5b91b46ac31b27609352fd9ed6 Mon Sep 17 00:00:00 2001
+From 8f3422542356b5cb77f6c2a73431ca06e86b302f Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Sun, 10 Aug 2025 18:52:54 +0200
 Subject: [PATCH 12/50] arm64: dts: mediatek: mt7986a: rename BPi R3 ports to

patches/linux/6.18.39/0013-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch

@@ -1,4 +1,4 @@
-From c4ac90dcc5aefbb704c70ebbfe041dee683b882b Mon Sep 17 00:00:00 2001
+From dc104487c9361afb69344f4b28d67191b3a86ba6 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 20 Aug 2025 21:38:24 +0200
 Subject: [PATCH 13/50] drm/panel-simple: Add a timing for the Raspberry Pi 7"

patches/linux/6.18.39/0014-input-touchscreen-edt-ft5x06-Add-polled-mode.patch

@@ -1,4 +1,4 @@
-From 8da101ec2429ba0bf1410346260f9a7ddfb0bdbe Mon Sep 17 00:00:00 2001
+From debb5dd84c54cb3d2fd81266a16e40b4e46dc5a7 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 21 Aug 2025 11:20:23 +0200
 Subject: [PATCH 14/50] input:touchscreen:edt-ft5x06: Add polled mode

patches/linux/6.18.39/0015-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch

@@ -1,4 +1,4 @@
-From 93646f890903157bb78ef369ddf9d99a9161de0d Mon Sep 17 00:00:00 2001
+From c27a3dffd31067521fd10a9bc89e9deda4d5361f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
 Subject: [PATCH 15/50] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for

patches/linux/6.18.39/0016-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

@@ -1,4 +1,4 @@
-From 29cfa1b5ffba41728dc5e0991d1ee27b903d569c Mon Sep 17 00:00:00 2001
+From dcaafda96688a910419945920eb73487a3569c97 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
 Subject: [PATCH 16/50] net: dsa: mv88e6xxx: Improve indirect register access

patches/linux/6.18.39/0017-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch

@@ -1,4 +1,4 @@
-From a7fa9a45329781519702d46ba05815433fff4acc Mon Sep 17 00:00:00 2001
+From b23b36d1963b8a8b61adc26a1971c78623987285 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
 Subject: [PATCH 17/50] net: dsa: mv88e6xxx: Honor ports being managed via

patches/linux/6.18.39/0018-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch

@@ -1,4 +1,4 @@
-From cda7100b0a29e6a9bd29a67ff9db3bcccb72065c Mon Sep 17 00:00:00 2001
+From 04823fe9ff9c611478db9eb97281da93f4cb49d0 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
 Subject: [PATCH 18/50] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user

patches/linux/6.18.39/0019-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch

@@ -1,4 +1,4 @@
-From ccf9f9262e8570cfd522b841465f3edf76b3447a Mon Sep 17 00:00:00 2001
+From 19d957f79007833d47c3c3a646d848c9a879cb8d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
 Subject: [PATCH 19/50] net: dsa: tag_dsa: Use tag priority as initial

patches/linux/6.18.39/0020-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch

@@ -1,4 +1,4 @@
-From 3200169701ef4d9afdea35355b3fe41d6f363134 Mon Sep 17 00:00:00 2001
+From b596ef44536a882d1522d4ad058e26d887d0212d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
 Subject: [PATCH 20/50] net: dsa: Support MDB memberships whose L2 addresses

patches/linux/6.18.39/0021-net-dsa-Support-EtherType-based-priority-overrides.patch

@@ -1,4 +1,4 @@
-From dea9ff6c0bdf7c3e4abc2fb507d2ab4b94dabb63 Mon Sep 17 00:00:00 2001
+From 4df7c3a09d6596888cb4b968a04b8b24b2ffed67 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
 Subject: [PATCH 21/50] net: dsa: Support EtherType based priority overrides

patches/linux/6.18.39/0022-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch

@@ -1,4 +1,4 @@
-From 1dc01d7420e3d511babfbdeda742d93527d72abb Mon Sep 17 00:00:00 2001
+From bb62c8b847b04e674188e90cb1ce28b780aa70f0 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
 Subject: [PATCH 22/50] net: dsa: mv88e6xxx: Support EtherType based priority

patches/linux/6.18.39/0023-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch

@@ -1,4 +1,4 @@
-From caed0d150badbb040e403975645bf09ba3f44e76 Mon Sep 17 00:00:00 2001
+From 0bd5832d6a8dfe3ff5e8eae10060b8189052bea4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
 Subject: [PATCH 23/50] net: dsa: mv88e6xxx: Add mqprio qdisc support

patches/linux/6.18.39/0024-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch

@@ -1,4 +1,4 @@
-From 1bd5b0e8a5574209b386d6d8bc1cf3bcf2e4fd5e Mon Sep 17 00:00:00 2001
+From 2f1b4e2c1ac07b59a68205d17f69ac236b1272b7 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
 Subject: [PATCH 24/50] net: dsa: mv88e6xxx: Use VLAN prio over IP when both

patches/linux/6.18.39/0025-FIX-net-dsa-mv88e6xxx-Trap-locally-terminated-VLANs.patch

@@ -1,4 +1,4 @@
-From 7894882d70e8223939a6d9a0e15cc6bbc08ae33c Mon Sep 17 00:00:00 2001
+From 3ded57ad8a13d5bb817295c537f9660cc7987326 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 26 Nov 2024 19:45:59 +0100
 Subject: [PATCH 25/50] [FIX] net: dsa: mv88e6xxx: Trap locally terminated

patches/linux/6.18.39/0026-net-dsa-mv88e6xxx-collapse-disabled-state-into-block.patch

@@ -1,4 +1,4 @@
-From 09cb11eaf5cc754274620ff6eaedf768c9605e44 Mon Sep 17 00:00:00 2001
+From 1667410f54c1647cc3b9a00d4fe9ed61a3936f0b Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 16 Jan 2025 12:35:12 +0100
 Subject: [PATCH 26/50] net: dsa: mv88e6xxx: collapse disabled state into

patches/linux/6.18.39/0027-net-dsa-mv88e6xxx-Only-activate-LAG-offloading-when-.patch

@@ -1,4 +1,4 @@
-From 7127fd4194cde754cbc9ea869c9e65e335701d95 Mon Sep 17 00:00:00 2001
+From 211f53f2cc60dadda623ffd258fafb9dd6034519 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 12 Feb 2025 22:03:14 +0100
 Subject: [PATCH 27/50] net: dsa: mv88e6xxx: Only activate LAG offloading when

patches/linux/6.18.39/0028-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch

@@ -1,4 +1,4 @@
-From c2f3d9277e12e7622651b521af8b43b1fe036cf0 Mon Sep 17 00:00:00 2001
+From d42f3887e25aa770c0dd7d722f0410a926a943ae Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Wed, 14 Jan 2026 18:22:41 +0100
 Subject: [PATCH 28/50] net: dsa: mv88e6xxx: Add LED support for 6393X

patches/linux/6.18.39/0029-wifi-brcmfmac-support-deletion-and-recreation-of-pri.patch

@@ -1,4 +1,4 @@
-From ac98be8b6fd1b6afa264c68685d5dc82d73da1f8 Mon Sep 17 00:00:00 2001
+From 8cd6f1604dc816fab887eee9f297bf0df4befbd1 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Thu, 15 Jan 2026 22:47:37 +0100
 Subject: [PATCH 29/50] wifi: brcmfmac: support deletion and recreation of

patches/linux/6.18.39/0030-wifi-brcmfmac-check-connection-state-before-querying.patch

@@ -1,4 +1,4 @@
-From 9f1110fe13c878c49d28859f27bd90bc1b77f7bc Mon Sep 17 00:00:00 2001
+From 290cb9ee43a75cc2c8994850e48ee6eee9603d3f Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Mon, 19 Jan 2026 13:06:53 +0100
 Subject: [PATCH 30/50] wifi: brcmfmac: check connection state before querying

patches/linux/6.18.39/0031-wifi-brcmfmac-suppress-log-spam-for-regulatory-restr.patch

@@ -1,4 +1,4 @@
-From 188203d0d4eeeb607b29efa344280189c2566f30 Mon Sep 17 00:00:00 2001
+From a3382b395c8c23816cb713f5ad50f097bc7adaf3 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:12:10 +0100
 Subject: [PATCH 31/50] wifi: brcmfmac: suppress log spam for

patches/linux/6.18.39/0032-wifi-brcmfmac-reduce-log-noise-during-AP-to-station-.patch

@@ -1,4 +1,4 @@
-From c02051fdfbcedf99bac490bcb0358774774e2bcf Mon Sep 17 00:00:00 2001
+From e654d8b9d75a6296491fd438aa76a4f50d7404a4 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 20 Jan 2026 20:18:45 +0100
 Subject: [PATCH 32/50] wifi: brcmfmac: reduce log noise during AP to station

patches/linux/6.18.39/0033-net-phy-air_en8811h-add-OF-device-table-for-auto-loa.patch

@@ -1,4 +1,4 @@
-From 613dec2af90a208b2bb453150cb1851de07d51fb Mon Sep 17 00:00:00 2001
+From fd41a70b096f9f1890000bb5509414df88d3e175 Mon Sep 17 00:00:00 2001
 From: Mattias Walström <lazzer@gmail.com>
 Date: Tue, 17 Feb 2026 21:59:59 +0100
 Subject: [PATCH 33/50] net: phy: air_en8811h: add OF device table for

patches/linux/6.18.39/0034-drm-vc4-dsi-enable-video-and-then-retry-failed-trans.patch

@@ -1,4 +1,4 @@
-From 5df424aa25bcfd2f0309fbd05670f0b613219456 Mon Sep 17 00:00:00 2001
+From 09a7b03cf2f200f7596e4e5c1e769eea99e3b604 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 20 Sep 2024 12:05:18 +0100
 Subject: [PATCH 34/50] drm: vc4: dsi: enable video and then retry failed

patches/linux/6.18.39/0035-drm-vc4-dsi-Clocks-should-be-running-before-reset.patch

@@ -1,4 +1,4 @@
-From 88e744997f5c6ff9c9383fbe568c925c11715896 Mon Sep 17 00:00:00 2001
+From 1d7fe70e06f361fa24b90c96d3aea15b904b5638 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Jun 2022 17:23:47 +0100
 Subject: [PATCH 35/50] drm: vc4: dsi: Clocks should be running before reset