From 87a6637c13c05cd329ee556222f13fcb7a0e31f3 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 17:50:22 +0100 Subject: [PATCH 1/7] bin: copy is a file, not a directory Fixes a warning from fakeroot by adjusting the type in the permission table. Apparently the chown + chmod operations were always done even though the type was wrong. Signed-off-by: Joachim Wiberg --- package/bin/bin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bin/bin.mk b/package/bin/bin.mk index 65e7ca1a..d00c6625 100644 --- a/package/bin/bin.mk +++ b/package/bin/bin.mk @@ -21,7 +21,7 @@ CFLAGS="$(INFIX_CFLAGS)" endef define BIN_PERMISSIONS - /usr/bin/copy d 04750 root klish - - - - - + /usr/bin/copy f 04750 root klish - - - - - endef define BIN_BUILD_PYTHON From 16f26b02a845e698425ffd8c2174e977ecf5a151 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 18:03:12 +0100 Subject: [PATCH 2/7] board: sync linux_defconfigs between archs - Enable Ext2 support where missing - Enable POSIX_ACLs where missing - Sync NLS code pages Signed-off-by: Joachim Wiberg --- board/aarch32/linux_defconfig | 5 +++++ board/aarch64/linux_defconfig | 4 ++++ board/riscv64/linux_defconfig | 2 ++ board/x86_64/linux_defconfig | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/board/aarch32/linux_defconfig b/board/aarch32/linux_defconfig index 9c8dc20d..c54ed16f 100644 --- a/board/aarch32/linux_defconfig +++ b/board/aarch32/linux_defconfig @@ -395,6 +395,9 @@ CONFIG_RASPBERRYPI_POWER=y CONFIG_PWM=y CONFIG_PWM_BCM2835=y CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_FANOTIFY=y @@ -412,8 +415,10 @@ CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZSTD=y CONFIG_9P_FS=y +CONFIG_NLS_DEFAULT="iso8859-15" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y CONFIG_NLS_UTF8=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_GCM=y diff --git a/board/aarch64/linux_defconfig b/board/aarch64/linux_defconfig index b1794ccb..b37b5959 100644 --- a/board/aarch64/linux_defconfig +++ b/board/aarch64/linux_defconfig @@ -578,6 +578,7 @@ CONFIG_PHY_SAMSUNG_USB2=y CONFIG_NVMEM_LAYOUT_ONIE_TLV=y CONFIG_MUX_MMIO=y CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_BTRFS_FS=y @@ -597,8 +598,11 @@ CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZSTD=y CONFIG_9P_FS=y +CONFIG_NLS_DEFAULT="iso8859-15" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y CONFIG_SECURITY=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,bpf" CONFIG_CRYPTO_CCM=m diff --git a/board/riscv64/linux_defconfig b/board/riscv64/linux_defconfig index 3d90e235..080eca13 100644 --- a/board/riscv64/linux_defconfig +++ b/board/riscv64/linux_defconfig @@ -415,6 +415,7 @@ CONFIG_PHY_STARFIVE_JH7110_DPHY_RX=y CONFIG_PHY_STARFIVE_JH7110_PCIE=y CONFIG_PHY_STARFIVE_JH7110_USB=y CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_BTRFS_FS=y @@ -452,6 +453,7 @@ CONFIG_NLS_DEFAULT="iso8859-15" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y CONFIG_SECURITY=y CONFIG_LSM="" CONFIG_CRYPTO_CCM=m diff --git a/board/x86_64/linux_defconfig b/board/x86_64/linux_defconfig index dc497b95..4b9f5d05 100644 --- a/board/x86_64/linux_defconfig +++ b/board/x86_64/linux_defconfig @@ -306,7 +306,10 @@ CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_BTRFS_FS=y CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_FUSE_FS=y @@ -321,8 +324,11 @@ CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZSTD=y CONFIG_9P_FS=y +CONFIG_NLS_DEFAULT="iso8859-15" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_GCM=y CONFIG_DEBUG_KERNEL=y From 68313773690f8c2d622af652fb7573a4c3434fd1 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 18:31:58 +0100 Subject: [PATCH 3/7] board: relocate firmware selction for IoT Router Board Mini The RTL8169 firmware was specifically added for the Raspberry Pi Compute Module 4 IoT Router Board Mini, it does not need to be part of defconfig. Signed-off-by: Joachim Wiberg --- board/aarch64/raspberrypi-rpi64/Config.in | 2 +- configs/aarch64_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/board/aarch64/raspberrypi-rpi64/Config.in b/board/aarch64/raspberrypi-rpi64/Config.in index 3596de7c..cf2a6342 100644 --- a/board/aarch64/raspberrypi-rpi64/Config.in +++ b/board/aarch64/raspberrypi-rpi64/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_RASPBERRYPI_RPI64 select BR2_PACKAGE_FEATURE_WIFI select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI - + select BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169 help Raspberry Pi 64-bit adds support for the Raspberry Pi family of of single-board computers (SBC), RPi 3B and later, including the diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 54667d3e..f8382471 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -38,7 +38,6 @@ BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_DBUS_CXX=y BR2_PACKAGE_DBUS_GLIB=y BR2_PACKAGE_DBUS_TRIGGERD=y From 1042ca8bb22c9d6fc27cca99e4255a78c9a26334 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 18:40:33 +0100 Subject: [PATCH 4/7] configs: sync defconfigs - Fix locations of packages to match 'make update-defconfig' order - Fix defconfig syntax for watchdogd tempmon ... - Enable check hashes on all defconfigs - Add missing wireguard and wifi support to RiscV - Rename dongle support for X86_64 build Signed-off-by: Joachim Wiberg --- configs/aarch64_defconfig | 18 ++++++++---------- configs/aarch64_minimal_defconfig | 31 ++++++++++++++----------------- configs/riscv64_defconfig | 20 +++++++++----------- configs/x86_64_defconfig | 8 +++++--- configs/x86_64_minimal_defconfig | 10 +++++----- 5 files changed, 41 insertions(+), 46 deletions(-) diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index f8382471..2b2fdef8 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -32,7 +32,6 @@ 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 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_JQ=y @@ -52,7 +51,6 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y -BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_GUNICORN=y BR2_PACKAGE_LIBSSH_OPENSSL=y BR2_PACKAGE_LIBSSH2=y @@ -73,7 +71,6 @@ BR2_PACKAGE_CONNTRACK_TOOLS=y BR2_PACKAGE_DNSMASQ=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_FPING=y -BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_FRR=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPERF3=y @@ -86,7 +83,6 @@ BR2_PACKAGE_MTR=y BR2_PACKAGE_NETCALC=y BR2_PACKAGE_NETCAT_OPENBSD=y BR2_PACKAGE_NETSNMP=y -BR2_PACKAGE_NFTABLES=y BR2_PACKAGE_NGINX=y BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y BR2_PACKAGE_NGINX_HTTP_V2_MODULE=y @@ -94,6 +90,7 @@ BR2_PACKAGE_NMAP=y BR2_PACKAGE_NMAP_NCAT=y BR2_PACKAGE_NMAP_NMAP=y BR2_PACKAGE_NMAP_NPING=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y @@ -124,7 +121,7 @@ BR2_PACKAGE_WATCHDOGD_LOADAVG=y BR2_PACKAGE_WATCHDOGD_FILENR=y BR2_PACKAGE_WATCHDOGD_MEMINFO=y BR2_PACKAGE_WATCHDOGD_FSMON=y -BR2_PACKAGE_WATCHDOGD_TEMPMON +BR2_PACKAGE_WATCHDOGD_TEMPMON=y BR2_PACKAGE_LESS=y BR2_PACKAGE_MG=y BR2_PACKAGE_NANO=y @@ -136,11 +133,6 @@ BR2_PACKAGE_HOST_GENEXT2FS=y BR2_PACKAGE_HOST_GO_BIN=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y -INFIX_VENDOR_HOME="https://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://kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_ALDER_ALDER=y BR2_PACKAGE_BANANAPI_BPI_R3=y BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S=y @@ -148,6 +140,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://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://kernelkit.org/infix/" +INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y BR2_PACKAGE_FEATURE_WIFI_REALTEK=y BR2_PACKAGE_CONFD=y @@ -165,6 +162,7 @@ BR2_PACKAGE_FINIT_RTC_DATE="2024-11-04 10:54:00" BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y +BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_IITO=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig index 5bc1b405..d4365cbc 100644 --- a/configs/aarch64_minimal_defconfig +++ b/configs/aarch64_minimal_defconfig @@ -8,13 +8,14 @@ BR2_CCACHE=y BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache" BR2_ENABLE_DEBUG=y BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="ix" BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt ${BR2_EXTERNAL_INFIX_PATH}/board/common/xattrs" -# BR2_TARGET_ENABLE_ROOT_LOGIN is not set BR2_ROOTFS_MERGED_USR=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set BR2_SYSTEM_BIN_SH_BASH=y BR2_TARGET_GENERIC_GETTY_PORT="@console" BR2_TARGET_GENERIC_GETTY_TERM="xterm" @@ -31,12 +32,11 @@ 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 BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y -BR2_PACKAGE_SYSREPO_GROUP="sysrepo" BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_DBUS_CXX=y BR2_PACKAGE_DBUS_GLIB=y BR2_PACKAGE_DBUS_TRIGGERD=y @@ -51,15 +51,13 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y -BR2_PACKAGE_PYTHON3=y -BR2_PACKAGE_LIBSSH_OPENSSL=y BR2_PACKAGE_LIBSSH2=y -BR2_PACKAGE_LIBSSH2_OPENSSL=y -BR2_PACKAGE_LIBXCRYPT=y BR2_PACKAGE_LIBOPENSSL_BIN=y +BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_NETOPEER2_CLI=y BR2_PACKAGE_NSS_MDNS=y +BR2_PACKAGE_SYSREPO_GROUP="sysrepo" BR2_PACKAGE_LINUX_PAM=y BR2_PACKAGE_ONIGURUMA=y BR2_PACKAGE_AVAHI_DAEMON=y @@ -67,7 +65,6 @@ BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y BR2_PACKAGE_CHRONY=y BR2_PACKAGE_DNSMASQ=y BR2_PACKAGE_ETHTOOL=y -BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_FRR=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPROUTE2=y @@ -78,6 +75,7 @@ BR2_PACKAGE_NETCALC=y BR2_PACKAGE_NGINX=y BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y BR2_PACKAGE_NGINX_HTTP_V2_MODULE=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y @@ -86,6 +84,7 @@ BR2_PACKAGE_WHOIS=y BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_SUDO=y +BR2_PACKAGE_GETENT=y BR2_PACKAGE_KMOD_TOOLS=y BR2_PACKAGE_PWGEN=y BR2_PACKAGE_RAUC=y @@ -101,7 +100,7 @@ BR2_PACKAGE_WATCHDOGD_LOADAVG=y BR2_PACKAGE_WATCHDOGD_FILENR=y BR2_PACKAGE_WATCHDOGD_MEMINFO=y BR2_PACKAGE_WATCHDOGD_FSMON=y -BR2_PACKAGE_WATCHDOGD_TEMPMON +BR2_PACKAGE_WATCHDOGD_TEMPMON=y BR2_PACKAGE_LESS=y BR2_PACKAGE_MG=y BR2_PACKAGE_NANO=y @@ -112,11 +111,6 @@ BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y BR2_PACKAGE_HOST_GENEXT2FS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y -INFIX_VENDOR_HOME="https://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://kernelkit.org/infix/" -INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_ALDER_ALDER=y BR2_PACKAGE_BANANAPI_BPI_R3=y BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S=y @@ -124,6 +118,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://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://kernelkit.org/infix/" +INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_CONFD=y BR2_PACKAGE_CONFD_TEST_MODE=y BR2_PACKAGE_GENCERT=y @@ -137,6 +136,7 @@ BR2_PACKAGE_FINIT_RTC_DATE="2024-11-04 10:54:00" BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y +BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_IITO=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y @@ -144,11 +144,8 @@ BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_MCD=y BR2_PACKAGE_MDNS_ALIAS=y BR2_PACKAGE_ONIEPROM=y -BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_ROUSETTE=y BR2_PACKAGE_RAUC_INSTALLATION_STATUS=y -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_PACKAGE_GETENT=y IMAGE_ITB_AUX=y IMAGE_ITB_QCOW=y IMAGE_ITB_RAUC=y diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig index c23e2ee6..2fb8a959 100644 --- a/configs/riscv64_defconfig +++ b/configs/riscv64_defconfig @@ -1,5 +1,6 @@ BR2_riscv=y BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl" BR2_CCACHE=y BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache" @@ -17,7 +18,6 @@ BR2_SYSTEM_BIN_SH_BASH=y BR2_TARGET_GENERIC_GETTY_PORT="@console" BR2_TARGET_GENERIC_GETTY_TERM="xterm" BR2_SYSTEM_DHCP="eth0" -BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA C.UTF-8" BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8" BR2_TARGET_TZ_INFO=y @@ -36,21 +36,17 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-starfive-visionfive-2-v1.3b" BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_INFIX_PATH)/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y +BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y -BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y BR2_PACKAGE_DBUS_CXX=y BR2_PACKAGE_DBUS_GLIB=y @@ -61,12 +57,10 @@ BR2_PACKAGE_GPTFDISK=y BR2_PACKAGE_GPTFDISK_SGDISK=y BR2_PACKAGE_MDIO_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y -BR2_PACKAGE_UBOOT_TOOLS=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y -BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_GUNICORN=y BR2_PACKAGE_LIBSSH_OPENSSL=y BR2_PACKAGE_LIBSSH2=y @@ -87,7 +81,6 @@ BR2_PACKAGE_CONNTRACK_TOOLS=y BR2_PACKAGE_DNSMASQ=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_FPING=y -BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_FRR=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPERF3=y @@ -100,7 +93,6 @@ BR2_PACKAGE_MTR=y BR2_PACKAGE_NETCALC=y BR2_PACKAGE_NETCAT_OPENBSD=y BR2_PACKAGE_NETSNMP=y -BR2_PACKAGE_NFTABLES=y BR2_PACKAGE_NGINX=y BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y BR2_PACKAGE_NGINX_HTTP_V2_MODULE=y @@ -108,6 +100,7 @@ BR2_PACKAGE_NMAP=y BR2_PACKAGE_NMAP_NCAT=y BR2_PACKAGE_NMAP_NMAP=y BR2_PACKAGE_NMAP_NPING=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y @@ -115,6 +108,7 @@ BR2_PACKAGE_TCPDUMP=y BR2_PACKAGE_TRACEROUTE=y BR2_PACKAGE_ULOGD=y BR2_PACKAGE_WHOIS=y +BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_NEOFETCH=y BR2_PACKAGE_SUDO=y @@ -137,7 +131,7 @@ BR2_PACKAGE_WATCHDOGD_LOADAVG=y BR2_PACKAGE_WATCHDOGD_FILENR=y BR2_PACKAGE_WATCHDOGD_MEMINFO=y BR2_PACKAGE_WATCHDOGD_FSMON=y -BR2_PACKAGE_WATCHDOGD_TEMPMON +BR2_PACKAGE_WATCHDOGD_TEMPMON=y BR2_PACKAGE_LESS=y BR2_PACKAGE_MG=y BR2_PACKAGE_NANO=y @@ -178,6 +172,9 @@ INFIX_DESC="Infix is an immutable, friendly, and secure operating system that tu INFIX_HOME="https://github.com/kernelkit/infix/" INFIX_DOC="https://kernelkit.org/infix/" INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +BR2_PACKAGE_FEATURE_WIFI=y +BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y +BR2_PACKAGE_FEATURE_WIFI_REALTEK=y BR2_PACKAGE_CONFD=y BR2_PACKAGE_GENCERT=y BR2_PACKAGE_STATD=y @@ -190,6 +187,7 @@ BR2_PACKAGE_FINIT_RTC_DATE="2024-11-04 10:54:00" BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y +BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_IITO=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index 4ce00eb6..ea136fb0 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -32,7 +32,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/lin BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_JQ=y @@ -56,6 +55,7 @@ BR2_PACKAGE_LIBSSH_OPENSSL=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBSSH2_OPENSSL=y BR2_PACKAGE_LIBOPENSSL_BIN=y +BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_NETOPEER2_CLI=y BR2_PACKAGE_NSS_MDNS=y @@ -89,6 +89,7 @@ BR2_PACKAGE_NMAP=y BR2_PACKAGE_NMAP_NCAT=y BR2_PACKAGE_NMAP_NMAP=y BR2_PACKAGE_NMAP_NPING=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y @@ -119,7 +120,7 @@ BR2_PACKAGE_WATCHDOGD_LOADAVG=y BR2_PACKAGE_WATCHDOGD_FILENR=y BR2_PACKAGE_WATCHDOGD_MEMINFO=y BR2_PACKAGE_WATCHDOGD_FSMON=y -BR2_PACKAGE_WATCHDOGD_TEMPMON +BR2_PACKAGE_WATCHDOGD_TEMPMON=y BR2_PACKAGE_LESS=y BR2_PACKAGE_MG=y BR2_PACKAGE_NANO=y @@ -144,7 +145,8 @@ INFIX_HOME="https://github.com/kernelkit/infix/" INFIX_DOC="https://kernelkit.org/infix/" INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" BR2_PACKAGE_FEATURE_WIFI=y -BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK=y +BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y +BR2_PACKAGE_FEATURE_WIFI_REALTEK=y BR2_PACKAGE_CONFD=y BR2_PACKAGE_CONFD_TEST_MODE=y BR2_PACKAGE_CURIOS_HTTPD=y diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig index 065e6f79..ed7d9ecb 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -32,12 +32,11 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/lin BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y -BR2_PACKAGE_SYSREPO_GROUP="sysrepo" BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_DBUS_CXX=y BR2_PACKAGE_DBUS_GLIB=y BR2_PACKAGE_DBUS_TRIGGERD=y @@ -51,13 +50,13 @@ BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y -BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBOPENSSL_BIN=y +BR2_PACKAGE_LIBINPUT=y BR2_PACKAGE_LIBCURL_CURL=y -BR2_PACKAGE_LIBMNL=y BR2_PACKAGE_NETOPEER2_CLI=y BR2_PACKAGE_NSS_MDNS=y +BR2_PACKAGE_SYSREPO_GROUP="sysrepo" BR2_PACKAGE_LINUX_PAM=y BR2_PACKAGE_ONIGURUMA=y BR2_PACKAGE_AVAHI_DAEMON=y @@ -65,7 +64,6 @@ BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y BR2_PACKAGE_CHRONY=y BR2_PACKAGE_DNSMASQ=y BR2_PACKAGE_ETHTOOL=y -BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_FRR=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_PACKAGE_IPROUTE2=y @@ -76,6 +74,7 @@ BR2_PACKAGE_NETCALC=y BR2_PACKAGE_NGINX=y BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y BR2_PACKAGE_NGINX_HTTP_V2_MODULE=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y @@ -136,6 +135,7 @@ BR2_PACKAGE_FINIT_RTC_DATE="2024-11-04 10:54:00" BR2_PACKAGE_FINIT_RTC_FILE="/var/lib/misc/rtc" BR2_PACKAGE_FINIT_PLUGIN_TTY=y BR2_PACKAGE_FINIT_PLUGIN_URANDOM=y +BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_IITO=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y From 64a04eb7846e8d3a78243696228a5ba9a668cc5c Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 18:02:24 +0100 Subject: [PATCH 5/7] configs: sync aarch32 defconfigs, drop post-image.sh - Bump toolchain to match other build targets GCC 13 -> 14 - Drop post-build.sh to match other build targets - Add features to arm_defconfig, all except containers - Enable chck hashes Signed-off-by: Joachim Wiberg --- configs/aarch32_defconfig | 32 +++++++++++++++++++++++++++---- configs/aarch32_minimal_defconfig | 8 ++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/configs/aarch32_defconfig b/configs/aarch32_defconfig index 261c3f9e..b27752ab 100644 --- a/configs/aarch32_defconfig +++ b/configs/aarch32_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl" BR2_CCACHE=y BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache" BR2_ENABLE_DEBUG=y BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="infix" BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y @@ -26,7 +26,6 @@ BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8" BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/rootfs" BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7" @@ -35,7 +34,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/li BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_JQ=y @@ -50,10 +48,12 @@ BR2_PACKAGE_GPTFDISK=y BR2_PACKAGE_GPTFDISK_SGDISK=y BR2_PACKAGE_MDIO_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y +BR2_PACKAGE_UBOOT_TOOLS=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y +BR2_PACKAGE_PYTHON_GUNICORN=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBINPUT=y @@ -62,31 +62,49 @@ BR2_PACKAGE_NETOPEER2_CLI=y BR2_PACKAGE_NSS_MDNS=y BR2_PACKAGE_SYSREPO_GROUP="sysrepo" BR2_PACKAGE_LINUX_PAM=y +BR2_PACKAGE_LIBPAM_RADIUS_AUTH=y BR2_PACKAGE_ONIGURUMA=y BR2_PACKAGE_AVAHI_DAEMON=y BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y BR2_PACKAGE_CHRONY=y +BR2_PACKAGE_CONNTRACK_TOOLS=y BR2_PACKAGE_DNSMASQ=y BR2_PACKAGE_ETHTOOL=y +BR2_PACKAGE_FPING=y BR2_PACKAGE_FRR=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +BR2_PACKAGE_IPERF3=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_IPUTILS=y BR2_PACKAGE_LLDPD=y BR2_PACKAGE_MSTPD=y +BR2_PACKAGE_MTR=y BR2_PACKAGE_NETCALC=y +BR2_PACKAGE_NETCAT_OPENBSD=y +BR2_PACKAGE_NETSNMP=y BR2_PACKAGE_NGINX=y BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y BR2_PACKAGE_NGINX_HTTP_V2_MODULE=y +BR2_PACKAGE_NMAP=y +BR2_PACKAGE_NMAP_NCAT=y +BR2_PACKAGE_NMAP_NMAP=y +BR2_PACKAGE_NMAP_NPING=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y BR2_PACKAGE_TCPDUMP=y +BR2_PACKAGE_TRACEROUTE=y +BR2_PACKAGE_ULOGD=y BR2_PACKAGE_WHOIS=y BR2_PACKAGE_WIREGUARD_TOOLS=y BR2_PACKAGE_BASH_COMPLETION=y +BR2_PACKAGE_NEOFETCH=y BR2_PACKAGE_SUDO=y +BR2_PACKAGE_TTYD=y BR2_PACKAGE_GETENT=y +BR2_PACKAGE_HTOP=y +BR2_PACKAGE_IRQBALANCE=y BR2_PACKAGE_KMOD_TOOLS=y BR2_PACKAGE_PWGEN=y BR2_PACKAGE_RAUC=y @@ -102,7 +120,7 @@ BR2_PACKAGE_WATCHDOGD_LOADAVG=y BR2_PACKAGE_WATCHDOGD_FILENR=y BR2_PACKAGE_WATCHDOGD_MEMINFO=y BR2_PACKAGE_WATCHDOGD_FSMON=y -BR2_PACKAGE_WATCHDOGD_TEMPMON +BR2_PACKAGE_WATCHDOGD_TEMPMON=y BR2_PACKAGE_LESS=y BR2_PACKAGE_MG=y BR2_PACKAGE_NANO=y @@ -120,6 +138,8 @@ INFIX_DESC="Infix is an immutable, friendly, and secure operating system that tu INFIX_HOME="https://github.com/kernelkit/infix/" INFIX_DOC="https://kernelkit.org/infix/" INFIX_SUPPORT="mailto:kernelkit@googlegroups.com" +BR2_PACKAGE_FEATURE_WIFI_MEDIATEK=y +BR2_PACKAGE_FEATURE_WIFI_REALTEK=y BR2_PACKAGE_CONFD=y BR2_PACKAGE_CONFD_TEST_MODE=y BR2_PACKAGE_GENCERT=y @@ -137,12 +157,16 @@ BR2_PACKAGE_FIREWALL=y BR2_PACKAGE_IITO=y BR2_PACKAGE_KEYACK=y BR2_PACKAGE_KLISH_PLUGIN_INFIX=y +BR2_PACKAGE_LANDING=y BR2_PACKAGE_LOWDOWN=y BR2_PACKAGE_MCD=y BR2_PACKAGE_MDNS_ALIAS=y +BR2_PACKAGE_NETBROWSE=y BR2_PACKAGE_ONIEPROM=y +BR2_PACKAGE_TETRIS=y BR2_PACKAGE_ROUSETTE=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 diff --git a/configs/aarch32_minimal_defconfig b/configs/aarch32_minimal_defconfig index 9815c21d..307db69b 100644 --- a/configs/aarch32_minimal_defconfig +++ b/configs/aarch32_minimal_defconfig @@ -3,13 +3,13 @@ BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y -BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE=y BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y BR2_DL_DIR="${BR2_EXTERNAL_INFIX_PATH}/dl" BR2_CCACHE=y BR2_CCACHE_DIR="${BR2_EXTERNAL_INFIX_PATH}/.ccache" BR2_ENABLE_DEBUG=y BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_INFIX_PATH}/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="ix" BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y @@ -26,7 +26,6 @@ BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8" BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/rootfs" BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.7" @@ -35,7 +34,6 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/li BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" -BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_STRACE=y BR2_PACKAGE_STRESS_NG=y BR2_PACKAGE_JQ=y @@ -50,6 +48,7 @@ BR2_PACKAGE_GPTFDISK=y BR2_PACKAGE_GPTFDISK_SGDISK=y BR2_PACKAGE_MDIO_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y +BR2_PACKAGE_UBOOT_TOOLS=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y BR2_PACKAGE_UBOOT_TOOLS_FIT_CHECK_SIGN=y @@ -78,6 +77,7 @@ BR2_PACKAGE_NETCALC=y BR2_PACKAGE_NGINX=y BR2_PACKAGE_NGINX_HTTP_SSL_MODULE=y BR2_PACKAGE_NGINX_HTTP_V2_MODULE=y +BR2_PACKAGE_ODHCP6C=y BR2_PACKAGE_OPENRESOLV=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_SOCAT=y @@ -102,7 +102,7 @@ BR2_PACKAGE_WATCHDOGD_LOADAVG=y BR2_PACKAGE_WATCHDOGD_FILENR=y BR2_PACKAGE_WATCHDOGD_MEMINFO=y BR2_PACKAGE_WATCHDOGD_FSMON=y -BR2_PACKAGE_WATCHDOGD_TEMPMON +BR2_PACKAGE_WATCHDOGD_TEMPMON=y BR2_PACKAGE_LESS=y BR2_PACKAGE_MG=y BR2_PACKAGE_NANO=y From e7943b5e05140010938ae7d36a0dd6660d4f3919 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 18:59:16 +0100 Subject: [PATCH 6/7] board,configs: rename aarch32 -> arm for consistency with BR2_ARCH All build scripts use $BR2_ARCH to determine location of critical board files and configuration. As per previous decisions, the BR2_ARCH variable controls all naming in Infix and for consistency the defconfig files are also renamed. This fixes the issue with missing DTB file(s) for the Raspberry Pi 2B. Signed-off-by: Joachim Wiberg --- board/Config.in | 2 +- board/aarch32/Config.in | 5 ----- board/aarch32/board.mk | 1 - board/arm/Config.in | 5 +++++ board/{aarch32 => arm}/README.md | 4 ++-- board/arm/board.mk | 1 + board/{aarch32 => arm}/boot.script | 0 board/{aarch32 => arm}/linux_defconfig | 0 board/{aarch32 => arm}/raspberrypi-rpi2/Config.in | 7 +++---- board/{aarch32 => arm}/raspberrypi-rpi2/LICENSE | 0 board/{aarch32 => arm}/raspberrypi-rpi2/README.md | 11 +++++------ .../raspberrypi-rpi2/barebox/env/boot/mmc | 0 .../raspberrypi-rpi2/barebox/env/config | 0 .../raspberrypi-rpi2/barebox/env/init/automount | 0 .../raspberrypi-rpi2/barebox/env/init/bootorder | 0 .../raspberrypi-rpi2/barebox/extras.config | 0 board/{aarch32 => arm}/raspberrypi-rpi2/cmdline.txt | 0 board/{aarch32 => arm}/raspberrypi-rpi2/config.txt | 0 board/{aarch32 => arm}/raspberrypi-rpi2/dts/Makefile | 0 .../raspberrypi-rpi2/dts/broadcom/Makefile | 0 .../raspberrypi-rpi2/dts/broadcom/bcm2836-rpi-2-b.dts | 0 .../raspberrypi-rpi2/dts/broadcom/infix.dtsi | 0 .../{aarch32 => arm}/raspberrypi-rpi2/genimage.cfg.in | 0 .../raspberrypi-rpi2/raspberrypi-rpi2.mk | 0 .../raspberrypi,2-model-b/etc/factory-config.cfg | 0 .../etc/product/interface-quirks.json | 0 .../raspberrypi-rpi2/uboot/extras.config | 0 .../raspberrypi-rpi2/uboot/rpi-env.dtso | 0 board/common/qemu/Config.in.in | 2 +- board/common/qemu/run.sh | 6 +++--- configs/{aarch32_defconfig => arm_defconfig} | 4 ++-- ...arch32_minimal_defconfig => arm_minimal_defconfig} | 4 ++-- configs/rpi2_boot_defconfig | 8 ++++---- utils/mkimage.sh | 2 +- 34 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 board/aarch32/Config.in delete mode 100644 board/aarch32/board.mk create mode 100644 board/arm/Config.in rename board/{aarch32 => arm}/README.md (83%) create mode 100644 board/arm/board.mk rename board/{aarch32 => arm}/boot.script (100%) rename board/{aarch32 => arm}/linux_defconfig (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/Config.in (77%) rename board/{aarch32 => arm}/raspberrypi-rpi2/LICENSE (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/README.md (90%) rename board/{aarch32 => arm}/raspberrypi-rpi2/barebox/env/boot/mmc (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/barebox/env/config (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/barebox/env/init/automount (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/barebox/env/init/bootorder (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/barebox/extras.config (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/cmdline.txt (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/config.txt (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/dts/Makefile (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/dts/broadcom/Makefile (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/dts/broadcom/bcm2836-rpi-2-b.dts (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/dts/broadcom/infix.dtsi (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/genimage.cfg.in (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/raspberrypi-rpi2.mk (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/product/interface-quirks.json (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/uboot/extras.config (100%) rename board/{aarch32 => arm}/raspberrypi-rpi2/uboot/rpi-env.dtso (100%) rename configs/{aarch32_defconfig => arm_defconfig} (98%) rename configs/{aarch32_minimal_defconfig => arm_minimal_defconfig} (98%) diff --git a/board/Config.in b/board/Config.in index e283351f..4df67ca2 100644 --- a/board/Config.in +++ b/board/Config.in @@ -1,6 +1,6 @@ menu "Board Support" -source "$BR2_EXTERNAL_INFIX_PATH/board/aarch32/Config.in" +source "$BR2_EXTERNAL_INFIX_PATH/board/arm/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in" diff --git a/board/aarch32/Config.in b/board/aarch32/Config.in deleted file mode 100644 index e6962052..00000000 --- a/board/aarch32/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -if BR2_arm - -source "$BR2_EXTERNAL_INFIX_PATH/board/aarch32/raspberrypi-rpi2/Config.in" - -endif diff --git a/board/aarch32/board.mk b/board/aarch32/board.mk deleted file mode 100644 index 8b137891..00000000 --- a/board/aarch32/board.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/board/arm/Config.in b/board/arm/Config.in new file mode 100644 index 00000000..d24bc1a6 --- /dev/null +++ b/board/arm/Config.in @@ -0,0 +1,5 @@ +if BR2_arm + +source "$BR2_EXTERNAL_INFIX_PATH/board/arm/raspberrypi-rpi2/Config.in" + +endif diff --git a/board/aarch32/README.md b/board/arm/README.md similarity index 83% rename from board/aarch32/README.md rename to board/arm/README.md index be37d755..2385ba84 100644 --- a/board/aarch32/README.md +++ b/board/arm/README.md @@ -1,5 +1,5 @@ -aarch32 -======= +Arm 32-bit +========== Board Specific Documentation ---------------------------- diff --git a/board/arm/board.mk b/board/arm/board.mk new file mode 100644 index 00000000..3223be55 --- /dev/null +++ b/board/arm/board.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/arm/*/*.mk)) diff --git a/board/aarch32/boot.script b/board/arm/boot.script similarity index 100% rename from board/aarch32/boot.script rename to board/arm/boot.script diff --git a/board/aarch32/linux_defconfig b/board/arm/linux_defconfig similarity index 100% rename from board/aarch32/linux_defconfig rename to board/arm/linux_defconfig diff --git a/board/aarch32/raspberrypi-rpi2/Config.in b/board/arm/raspberrypi-rpi2/Config.in similarity index 77% rename from board/aarch32/raspberrypi-rpi2/Config.in rename to board/arm/raspberrypi-rpi2/Config.in index 8bbc9639..83daa3fb 100644 --- a/board/aarch32/raspberrypi-rpi2/Config.in +++ b/board/arm/raspberrypi-rpi2/Config.in @@ -5,11 +5,10 @@ config BR2_PACKAGE_RASPBERRYPI_RPI2 select BR2_PACKAGE_FEATURE_WIFI select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI - help Support for the 32-bit ARMv7 Raspberry Pi 2B single-board computer (SBC) with BCM2836 quad-core Cortex-A7 processor. - This was the only Raspberry Pi model with the BCM2836 and the 2B - actually got a BCM2837 (Cortex-A53) underclocked an w/o wifi in - the v1.2 board revision. + This was the only Raspberry Pi model with the BCM2836 and the rare + RPi 2B board revision v1.2 actually got an underclocked BCM2837, + which is the saem Cortex-A53 as the RPi3, but w/o wifi. diff --git a/board/aarch32/raspberrypi-rpi2/LICENSE b/board/arm/raspberrypi-rpi2/LICENSE similarity index 100% rename from board/aarch32/raspberrypi-rpi2/LICENSE rename to board/arm/raspberrypi-rpi2/LICENSE diff --git a/board/aarch32/raspberrypi-rpi2/README.md b/board/arm/raspberrypi-rpi2/README.md similarity index 90% rename from board/aarch32/raspberrypi-rpi2/README.md rename to board/arm/raspberrypi-rpi2/README.md index f0d59fbf..fc9f6021 100644 --- a/board/aarch32/raspberrypi-rpi2/README.md +++ b/board/arm/raspberrypi-rpi2/README.md @@ -21,9 +21,8 @@ The board features: How to Build ------------ -Since there are no pre-built images for ARM32, you need to build both Infix -and the bootloader from source. - +Since there are no pre-built images for ARM 32-bit, you need to build both +Infix and the bootloader from source. 1. Clone the repository @@ -37,12 +36,12 @@ and the bootloader from source. 3. Build Infix (in another tree) - make O=x-arm32 aarch32_defconfig - make O=x-arm32 + make O=x-arm arm_defconfig + make O=x-arm 4. Create the SD card image - ./utils/mkimage.sh -b x-boot -r x-arm32 raspberrypi-rpi2 + ./utils/mkimage.sh -b x-boot -r x-arm raspberrypi-rpi2 The resulting image can be found in `x-boot/images/infix-arm-sdcard.img` diff --git a/board/aarch32/raspberrypi-rpi2/barebox/env/boot/mmc b/board/arm/raspberrypi-rpi2/barebox/env/boot/mmc similarity index 100% rename from board/aarch32/raspberrypi-rpi2/barebox/env/boot/mmc rename to board/arm/raspberrypi-rpi2/barebox/env/boot/mmc diff --git a/board/aarch32/raspberrypi-rpi2/barebox/env/config b/board/arm/raspberrypi-rpi2/barebox/env/config similarity index 100% rename from board/aarch32/raspberrypi-rpi2/barebox/env/config rename to board/arm/raspberrypi-rpi2/barebox/env/config diff --git a/board/aarch32/raspberrypi-rpi2/barebox/env/init/automount b/board/arm/raspberrypi-rpi2/barebox/env/init/automount similarity index 100% rename from board/aarch32/raspberrypi-rpi2/barebox/env/init/automount rename to board/arm/raspberrypi-rpi2/barebox/env/init/automount diff --git a/board/aarch32/raspberrypi-rpi2/barebox/env/init/bootorder b/board/arm/raspberrypi-rpi2/barebox/env/init/bootorder similarity index 100% rename from board/aarch32/raspberrypi-rpi2/barebox/env/init/bootorder rename to board/arm/raspberrypi-rpi2/barebox/env/init/bootorder diff --git a/board/aarch32/raspberrypi-rpi2/barebox/extras.config b/board/arm/raspberrypi-rpi2/barebox/extras.config similarity index 100% rename from board/aarch32/raspberrypi-rpi2/barebox/extras.config rename to board/arm/raspberrypi-rpi2/barebox/extras.config diff --git a/board/aarch32/raspberrypi-rpi2/cmdline.txt b/board/arm/raspberrypi-rpi2/cmdline.txt similarity index 100% rename from board/aarch32/raspberrypi-rpi2/cmdline.txt rename to board/arm/raspberrypi-rpi2/cmdline.txt diff --git a/board/aarch32/raspberrypi-rpi2/config.txt b/board/arm/raspberrypi-rpi2/config.txt similarity index 100% rename from board/aarch32/raspberrypi-rpi2/config.txt rename to board/arm/raspberrypi-rpi2/config.txt diff --git a/board/aarch32/raspberrypi-rpi2/dts/Makefile b/board/arm/raspberrypi-rpi2/dts/Makefile similarity index 100% rename from board/aarch32/raspberrypi-rpi2/dts/Makefile rename to board/arm/raspberrypi-rpi2/dts/Makefile diff --git a/board/aarch32/raspberrypi-rpi2/dts/broadcom/Makefile b/board/arm/raspberrypi-rpi2/dts/broadcom/Makefile similarity index 100% rename from board/aarch32/raspberrypi-rpi2/dts/broadcom/Makefile rename to board/arm/raspberrypi-rpi2/dts/broadcom/Makefile diff --git a/board/aarch32/raspberrypi-rpi2/dts/broadcom/bcm2836-rpi-2-b.dts b/board/arm/raspberrypi-rpi2/dts/broadcom/bcm2836-rpi-2-b.dts similarity index 100% rename from board/aarch32/raspberrypi-rpi2/dts/broadcom/bcm2836-rpi-2-b.dts rename to board/arm/raspberrypi-rpi2/dts/broadcom/bcm2836-rpi-2-b.dts diff --git a/board/aarch32/raspberrypi-rpi2/dts/broadcom/infix.dtsi b/board/arm/raspberrypi-rpi2/dts/broadcom/infix.dtsi similarity index 100% rename from board/aarch32/raspberrypi-rpi2/dts/broadcom/infix.dtsi rename to board/arm/raspberrypi-rpi2/dts/broadcom/infix.dtsi diff --git a/board/aarch32/raspberrypi-rpi2/genimage.cfg.in b/board/arm/raspberrypi-rpi2/genimage.cfg.in similarity index 100% rename from board/aarch32/raspberrypi-rpi2/genimage.cfg.in rename to board/arm/raspberrypi-rpi2/genimage.cfg.in diff --git a/board/aarch32/raspberrypi-rpi2/raspberrypi-rpi2.mk b/board/arm/raspberrypi-rpi2/raspberrypi-rpi2.mk similarity index 100% rename from board/aarch32/raspberrypi-rpi2/raspberrypi-rpi2.mk rename to board/arm/raspberrypi-rpi2/raspberrypi-rpi2.mk diff --git a/board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg b/board/arm/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg similarity index 100% rename from board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg rename to board/arm/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/factory-config.cfg diff --git a/board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/product/interface-quirks.json b/board/arm/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/product/interface-quirks.json similarity index 100% rename from board/aarch32/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/product/interface-quirks.json rename to board/arm/raspberrypi-rpi2/rootfs/usr/share/product/raspberrypi,2-model-b/etc/product/interface-quirks.json diff --git a/board/aarch32/raspberrypi-rpi2/uboot/extras.config b/board/arm/raspberrypi-rpi2/uboot/extras.config similarity index 100% rename from board/aarch32/raspberrypi-rpi2/uboot/extras.config rename to board/arm/raspberrypi-rpi2/uboot/extras.config diff --git a/board/aarch32/raspberrypi-rpi2/uboot/rpi-env.dtso b/board/arm/raspberrypi-rpi2/uboot/rpi-env.dtso similarity index 100% rename from board/aarch32/raspberrypi-rpi2/uboot/rpi-env.dtso rename to board/arm/raspberrypi-rpi2/uboot/rpi-env.dtso diff --git a/board/common/qemu/Config.in.in b/board/common/qemu/Config.in.in index ecebfd4d..0d49ca1b 100644 --- a/board/common/qemu/Config.in.in +++ b/board/common/qemu/Config.in.in @@ -231,7 +231,7 @@ config QEMU_NET_MODEL if you want to play with low-level stuff like ethtool, you might want to test the Intel 82545EM driver, e1000. - Note: ARM32 uses virtio-net-device (MMIO) by default. + Note: ARM 32-bit uses virtio-net-device (MMIO) by default. config QEMU_NET_BRIDGE_DEV string "Bridge device" diff --git a/board/common/qemu/run.sh b/board/common/qemu/run.sh index d7e81cec..c47d0e8b 100755 --- a/board/common/qemu/run.sh +++ b/board/common/qemu/run.sh @@ -83,7 +83,7 @@ loader_args() append_args() { - # ARM32 doesn't support virtio console properly, always use serial + # ARM 32-bit doesn't support virtio console properly, always use serial if [ "$CONFIG_QEMU_arm" ]; then echo -n "console=ttyAMA0 " elif [ "$CONFIG_QEMU_CONSOLE_VIRTIO" ]; then @@ -122,7 +122,7 @@ rootfs_args() 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 - # ARM32 virt machine uses MMIO virtio devices, not PCI + # ARM 32-bit virt machine uses MMIO virtio devices, not PCI if [ "$CONFIG_QEMU_arm" ]; then echo -n "-drive file=qemu.qcow2,if=none,format=qcow2,id=rootfs " echo -n "-device virtio-blk-device,drive=rootfs " @@ -189,7 +189,7 @@ rw_args() mkfs.ext4 -L cfg "$CONFIG_QEMU_RW" >/dev/null 2>&1 fi - # ARM32 virt machine uses MMIO virtio devices, not PCI + # ARM 32-bit virt machine uses MMIO virtio devices, not PCI if [ "$CONFIG_QEMU_arm" ]; then echo -n "-drive file=aux.ext4,if=none,format=raw,id=aux " echo -n "-device virtio-blk-device,drive=aux " diff --git a/configs/aarch32_defconfig b/configs/arm_defconfig similarity index 98% rename from configs/aarch32_defconfig rename to configs/arm_defconfig index b27752ab..e2201a47 100644 --- a/configs/aarch32_defconfig +++ b/configs/arm_defconfig @@ -24,13 +24,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA C.UTF-8" BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8" BR2_TARGET_TZ_INFO=y -BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/rootfs" +BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/arm/rootfs" 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.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" diff --git a/configs/aarch32_minimal_defconfig b/configs/arm_minimal_defconfig similarity index 98% rename from configs/aarch32_minimal_defconfig rename to configs/arm_minimal_defconfig index 307db69b..9d2589fe 100644 --- a/configs/aarch32_minimal_defconfig +++ b/configs/arm_minimal_defconfig @@ -24,13 +24,13 @@ BR2_SYSTEM_DHCP="eth0" BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA C.UTF-8" BR2_GENERATE_LOCALE="en_US en_CA C.UTF-8" BR2_TARGET_TZ_INFO=y -BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/rootfs" +BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_INFIX_PATH}/board/common/rootfs ${BR2_EXTERNAL_INFIX_PATH}/board/arm/rootfs" 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.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/linux_defconfig" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/linux_defconfig" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_BUSYBOX_CONFIG="${BR2_EXTERNAL_INFIX_PATH}/board/common/busybox_defconfig" diff --git a/configs/rpi2_boot_defconfig b/configs/rpi2_boot_defconfig index 879493da..f1a65ceb 100644 --- a/configs/rpi2_boot_defconfig +++ b/configs/rpi2_boot_defconfig @@ -17,16 +17,16 @@ BR2_SYSTEM_BIN_SH_NONE=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/config.txt" -BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/cmdline.txt" +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/config.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/cmdline.txt" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BAREBOX=y BR2_TARGET_BAREBOX_CUSTOM_VERSION=y BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2025.06.0" BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="rpi" -BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/barebox/extras.config" -BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="${BR2_EXTERNAL_INFIX_PATH}/board/aarch32/raspberrypi-rpi2/barebox/env" +BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/barebox/extras.config" +BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="${BR2_EXTERNAL_INFIX_PATH}/board/arm/raspberrypi-rpi2/barebox/env" BR2_TARGET_BAREBOX_IMAGE_FILE="images/barebox-raspberry-pi-2.img" BR2_PACKAGE_HOST_BMAP_TOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/utils/mkimage.sh b/utils/mkimage.sh index 8daf03dc..218a15bd 100755 --- a/utils/mkimage.sh +++ b/utils/mkimage.sh @@ -130,7 +130,7 @@ validate_board() fi board_underscore=$(echo "$BOARD" | tr '-' '_') - for arch in aarch32 aarch64 x86_64 riscv64; do + for arch in arm aarch64 x86_64 riscv64; do for variant in "$BOARD" "$board_underscore"; do candidate="$BR2_EXTERNAL_INFIX_PATH/board/$arch/$variant" if [ -d "$candidate" ]; then From c152c5f361223ef539953e15e262ffeb81cd6c11 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 29 Jan 2026 19:11:29 +0100 Subject: [PATCH 7/7] configs: fix fdt_add_pubkey host tool Signed-off-by: Joachim Wiberg --- buildroot | 2 +- configs/aarch64_defconfig | 1 + configs/aarch64_minimal_defconfig | 1 + configs/arm_defconfig | 3 +++ configs/arm_minimal_defconfig | 3 +++ configs/riscv64_defconfig | 1 + configs/x86_64_defconfig | 1 + configs/x86_64_minimal_defconfig | 1 + 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/buildroot b/buildroot index 8fdb8506..c3390cbf 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 8fdb85060cab8e872b15ef8eedc2330b7575dcd7 +Subproject commit c3390cbf09f6f596ce9d3171365bd6e0aac09066 diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 2b2fdef8..89519360 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -133,6 +133,7 @@ BR2_PACKAGE_HOST_GENEXT2FS=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 BR2_PACKAGE_ALDER_ALDER=y BR2_PACKAGE_BANANAPI_BPI_R3=y BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S=y diff --git a/configs/aarch64_minimal_defconfig b/configs/aarch64_minimal_defconfig index d4365cbc..6ee304f3 100644 --- a/configs/aarch64_minimal_defconfig +++ b/configs/aarch64_minimal_defconfig @@ -111,6 +111,7 @@ BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y BR2_PACKAGE_HOST_GENEXT2FS=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 BR2_PACKAGE_ALDER_ALDER=y BR2_PACKAGE_BANANAPI_BPI_R3=y BR2_PACKAGE_FRIENDLYARM_NANOPI_R2S=y diff --git a/configs/arm_defconfig b/configs/arm_defconfig index e2201a47..90fb48c0 100644 --- a/configs/arm_defconfig +++ b/configs/arm_defconfig @@ -132,6 +132,9 @@ BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y BR2_PACKAGE_HOST_GENEXT2FS=y BR2_PACKAGE_HOST_KMOD_XZ=y 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 BR2_PACKAGE_RASPBERRYPI_RPI2=y INFIX_VENDOR_HOME="https://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." diff --git a/configs/arm_minimal_defconfig b/configs/arm_minimal_defconfig index 9d2589fe..36678aa0 100644 --- a/configs/arm_minimal_defconfig +++ b/configs/arm_minimal_defconfig @@ -114,6 +114,9 @@ BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y BR2_PACKAGE_HOST_GENEXT2FS=y BR2_PACKAGE_HOST_KMOD_XZ=y 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 BR2_PACKAGE_RASPBERRYPI_RPI2=y INFIX_VENDOR_HOME="https://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." diff --git a/configs/riscv64_defconfig b/configs/riscv64_defconfig index 2fb8a959..f496f4b4 100644 --- a/configs/riscv64_defconfig +++ b/configs/riscv64_defconfig @@ -167,6 +167,7 @@ BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_INFIX_PATH)/board/riscv64/visio BR2_PACKAGE_HOST_BMAP_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 INFIX_VENDOR_HOME="https://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/" diff --git a/configs/x86_64_defconfig b/configs/x86_64_defconfig index ea136fb0..3c232736 100644 --- a/configs/x86_64_defconfig +++ b/configs/x86_64_defconfig @@ -139,6 +139,7 @@ BR2_PACKAGE_HOST_GO_BIN=y 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://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/" diff --git a/configs/x86_64_minimal_defconfig b/configs/x86_64_minimal_defconfig index ed7d9ecb..9d38c038 100644 --- a/configs/x86_64_minimal_defconfig +++ b/configs/x86_64_minimal_defconfig @@ -117,6 +117,7 @@ BR2_PACKAGE_HOST_GENEXT2FS=y 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://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/"