From d5e4474377e731e09ef9fc8d768d78b19bdac16b Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Sun, 6 Sep 2026 15:23:21 +0200 Subject: [PATCH] Fixed MakeFile's "CopyConfig" fuction And Updated config - Updated config to Buildroot 2025.02.17 - Disabled ext4fs generation - Enabled ISO genration --- .gitignore | 3 +- BuildRoot.config | 75 ++++++++++++++++++++++-------------------------- Linux.config | 13 +++++---- Makefile | 13 ++++++--- 4 files changed, 54 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 8b67f8b..2c34ba9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ /build /host /images -/src \ No newline at end of file +/src +/staging diff --git a/BuildRoot.config b/BuildRoot.config index f18ff3a..d8fd513 100644 --- a/BuildRoot.config +++ b/BuildRoot.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2025.02.13 Configuration +# Buildroot 2025.02.17 Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_9=y @@ -14,6 +14,7 @@ BR2_HOST_GCC_AT_LEAST_11=y BR2_HOST_GCC_AT_LEAST_12=y BR2_HOST_GCC_AT_LEAST_13=y BR2_HOST_GCC_AT_LEAST_14=y +BR2_HOST_GCC_AT_LEAST_15=y # # Target options @@ -137,7 +138,7 @@ BR2_KERNEL_HEADERS_6_12=y # BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set # BR2_KERNEL_HEADERS_CUSTOM_GIT is not set BR2_KERNEL_HEADERS_LATEST=y -BR2_DEFAULT_KERNEL_HEADERS="6.12.81" +BR2_DEFAULT_KERNEL_HEADERS="6.12.104" BR2_PACKAGE_HOST_LINUX_HEADERS_LICENSE_FILES="COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note" BR2_PACKAGE_LINUX_HEADERS=y BR2_PACKAGE_MUSL_ARCH_SUPPORTS=y @@ -467,7 +468,7 @@ BR2_LINUX_KERNEL_LATEST_VERSION=y # BR2_LINUX_KERNEL_CUSTOM_GIT is not set # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set -BR2_LINUX_KERNEL_VERSION="6.12.81" +BR2_LINUX_KERNEL_VERSION="6.12.104" BR2_LINUX_KERNEL_LICENSE_FILES="COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note" BR2_LINUX_KERNEL_PATCH="" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set @@ -1579,10 +1580,7 @@ BR2_PACKAGE_JPEG_SIMD_SUPPORT=y # BR2_PACKAGE_LIBDECOR is not set # BR2_PACKAGE_LIBDMTX is not set # BR2_PACKAGE_LIBDRM is not set - -# -# libepoxy needs an OpenGL and/or OpenGL EGL backend -# +# BR2_PACKAGE_LIBEPOXY is not set # BR2_PACKAGE_LIBEXIF is not set # @@ -1788,6 +1786,7 @@ BR2_PACKAGE_MRAA_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBXMLB is not set # BR2_PACKAGE_LIBXMLPP is not set # BR2_PACKAGE_LIBXMLRPC is not set +# BR2_PACKAGE_LIBXMLSEC1 is not set # BR2_PACKAGE_LIBXSLT is not set # BR2_PACKAGE_LIBYAML is not set # BR2_PACKAGE_MXML is not set @@ -2338,11 +2337,18 @@ BR2_PACKAGE_Z3_ARCH_SUPPORTS=y # BR2_PACKAGE_ATFTP is not set # BR2_PACKAGE_AVAHI is not set # BR2_PACKAGE_AXEL is not set -# BR2_PACKAGE_BABELD is not set + +# +# babeld needs a uClibc or glibc toolchain +# # BR2_PACKAGE_BANDWIDTHD is not set # BR2_PACKAGE_BATCTL is not set # BR2_PACKAGE_BCUSDK is not set # BR2_PACKAGE_BIND is not set + +# +# bind needs a toolchain w/ threads, dynamic library, C++, gcc >= 4.9 +# # BR2_PACKAGE_BIRD is not set # BR2_PACKAGE_BLUEZ5_UTILS is not set # BR2_PACKAGE_BMON is not set @@ -2915,10 +2921,7 @@ BR2_PACKAGE_UTIL_LINUX_LIBUUID=y # BR2_PACKAGE_UTIL_LINUX_LAST is not set # BR2_PACKAGE_UTIL_LINUX_LINE is not set # BR2_PACKAGE_UTIL_LINUX_LOGGER is not set - -# -# login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9 -# +# BR2_PACKAGE_UTIL_LINUX_LOGIN is not set # BR2_PACKAGE_UTIL_LINUX_LOSETUP is not set # BR2_PACKAGE_UTIL_LINUX_LSFD is not set # BR2_PACKAGE_UTIL_LINUX_LSLOGINS is not set @@ -2940,17 +2943,11 @@ BR2_PACKAGE_UTIL_LINUX_LIBUUID=y # # BR2_PACKAGE_UTIL_LINUX_RENAME is not set # BR2_PACKAGE_UTIL_LINUX_RFKILL is not set - -# -# runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9 -# +# BR2_PACKAGE_UTIL_LINUX_RUNUSER is not set # BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set # BR2_PACKAGE_UTIL_LINUX_SETPRIV is not set # BR2_PACKAGE_UTIL_LINUX_SETTERM is not set - -# -# su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9 -# +# BR2_PACKAGE_UTIL_LINUX_SU is not set # BR2_PACKAGE_UTIL_LINUX_SULOGIN is not set # BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set # BR2_PACKAGE_UTIL_LINUX_TUNELP is not set @@ -3003,28 +3000,14 @@ BR2_TARGET_ROOTFS_CPIO_NONE=y # BR2_TARGET_ROOTFS_CPIO_UIMAGE is not set # BR2_TARGET_ROOTFS_CRAMFS is not set # BR2_TARGET_ROOTFS_EROFS is not set -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_EXT2_2r1 is not set -# BR2_TARGET_ROOTFS_EXT2_3 is not set -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_GEN=4 -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" -BR2_TARGET_ROOTFS_EXT2_SIZE="60M" -BR2_TARGET_ROOTFS_EXT2_INODES=0 -BR2_TARGET_ROOTFS_EXT2_INODE_SIZE=256 -BR2_TARGET_ROOTFS_EXT2_RESBLKS=5 -BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit" -BR2_TARGET_ROOTFS_EXT2_NONE=y -# BR2_TARGET_ROOTFS_EXT2_GZIP is not set -# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set -# BR2_TARGET_ROOTFS_EXT2_LZ4 is not set -# BR2_TARGET_ROOTFS_EXT2_LZMA is not set -# BR2_TARGET_ROOTFS_EXT2_LZO is not set -# BR2_TARGET_ROOTFS_EXT2_XZ is not set -# BR2_TARGET_ROOTFS_EXT2_ZSTD is not set +# BR2_TARGET_ROOTFS_EXT2 is not set # BR2_TARGET_ROOTFS_F2FS is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set -# BR2_TARGET_ROOTFS_ISO9660 is not set +BR2_TARGET_ROOTFS_ISO9660=y +BR2_TARGET_ROOTFS_ISO9660_GRUB2=y +BR2_TARGET_ROOTFS_ISO9660_EFI_BOOTLOADER=y +BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="fs/iso9660/grub.cfg" +BR2_TARGET_ROOTFS_ISO9660_INITRD=y # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_OCI is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set @@ -3121,6 +3104,8 @@ BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS=y +BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS=y +BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE5_ARCH_SUPPORTS=y BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y # BR2_PACKAGE_HOST_GPTFDISK is not set # BR2_PACKAGE_HOST_IMAGEMAGICK is not set @@ -3205,6 +3190,16 @@ BR2_PACKAGE_HOST_UTIL_LINUX=y # Legacy config options # +# +# Legacy options removed in 2025.02.17 +# +# BR2_GDB_VERSION_ARC is not set +# BR2_BINUTILS_VERSION_ARC is not set +# BR2_GCC_VERSION_ARC is not set +# BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC is not set +# BR2_PACKAGE_TS4900_FPGA is not set +# BR2_PACKAGE_ARGPARSE is not set + # # Legacy options removed in 2025.02.12 # diff --git a/Linux.config b/Linux.config index 2783625..9389ff2 100644 --- a/Linux.config +++ b/Linux.config @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.12.81 Kernel Configuration +# Linux/x86_64 6.12.104 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="x86_64-buildroot-linux-musl-gcc.br_real (Buildroot 2025.02.13) 13.4.0" +CONFIG_CC_VERSION_TEXT="x86_64-buildroot-linux-musl-gcc.br_real (Buildroot 2025.02.17) 13.4.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130400 CONFIG_CLANG_VERSION=0 @@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=0 -CONFIG_RUSTC_LLVM_VERSION=0 +CONFIG_RUSTC_VERSION=109800 +CONFIG_RUSTC_LLVM_VERSION=220108 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -21,7 +21,9 @@ CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y -CONFIG_PAHOLE_VERSION=130 +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y +CONFIG_RUSTC_HAS_SUSPICIOUS_RUNTIME_SYMBOL_DEFINITIONS=y +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -2362,6 +2364,7 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_VIA is not set CONFIG_INTEL_GTT=y # CONFIG_VGA_SWITCHEROO is not set +CONFIG_GPU_BUDDY=y CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set diff --git a/Makefile b/Makefile index 70504c0..2caa961 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,15 @@ $(all): _all # Local target runs directly CopyConfig: - test -f Linux.config && mv Linux.config Linux.config.old || true - cp $$(find build/linux* -name .config) Linux.config - test -f Busybox.config && mv Busybox.config Busybox.config.old || true - cp $$(find build/busybox* -name .config) Busybox.config + if ls build/linux* >/dev/null; then \ + test -f Linux.config && mv Linux.config Linux.config.old || true; \ + cp $$(find build/linux* -name .config) Linux.config; \ + fi + + if ls build/busybox* >/dev/null; then \ + test -f Busybox.config && mv Busybox.config Busybox.config.old || true; \ + cp $$(find build/busybox* -name .config) Busybox.config; \ + fi if ! $$(test -h .config); then \ cp BuildRoot.config BuildRoot.config.old; \