Skip to content

Commit ab48807

Browse files
committed
fix(patches): patch linux-headers to avoid C23 keyword conflict
1 parent ead2f6b commit ab48807

File tree

2 files changed

+145
-34
lines changed

2 files changed

+145
-34
lines changed

configs/nocturne_defconfig

Lines changed: 80 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Buildroot 2025.08.1 Configuration
3+
# Buildroot 2025.11 Configuration
44
#
55
BR2_HAVE_DOT_CONFIG=y
66
BR2_EXTERNAL_NAMES="Nocturne"
7-
BR2_EXTERNAL_Nocturne_PATH="/home/dominic/nocturne-test/image/external"
8-
BR2_EXTERNAL_Nocturne_VERSION="-g5bba3e3"
7+
BR2_EXTERNAL_Nocturne_PATH="/home/dominic/Code/nocturne-image/external"
8+
BR2_EXTERNAL_Nocturne_VERSION="-gead2f6b-dirty"
99
BR2_HOST_GCC_AT_LEAST_4_9=y
1010
BR2_HOST_GCC_AT_LEAST_5=y
1111
BR2_HOST_GCC_AT_LEAST_6=y
@@ -17,6 +17,7 @@ BR2_HOST_GCC_AT_LEAST_11=y
1717
BR2_HOST_GCC_AT_LEAST_12=y
1818
BR2_HOST_GCC_AT_LEAST_13=y
1919
BR2_HOST_GCC_AT_LEAST_14=y
20+
BR2_HOST_GCC_AT_LEAST_15=y
2021

2122
#
2223
# Target options
@@ -187,17 +188,19 @@ BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
187188
#
188189
# Kernel Header Options
189190
#
190-
# BR2_KERNEL_HEADERS_5_4 is not set
191191
# BR2_KERNEL_HEADERS_5_10 is not set
192192
# BR2_KERNEL_HEADERS_5_15 is not set
193193
# BR2_KERNEL_HEADERS_6_1 is not set
194194
# BR2_KERNEL_HEADERS_6_6 is not set
195195
# BR2_KERNEL_HEADERS_6_12 is not set
196-
# BR2_KERNEL_HEADERS_6_16 is not set
196+
# BR2_KERNEL_HEADERS_6_17 is not set
197+
# BR2_KERNEL_HEADERS_6_18 is not set
197198
BR2_KERNEL_HEADERS_VERSION=y
198199
# BR2_KERNEL_HEADERS_CUSTOM_TARBALL is not set
199200
# BR2_KERNEL_HEADERS_CUSTOM_GIT is not set
200201
BR2_DEFAULT_KERNEL_VERSION="4.9.113"
202+
# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18 is not set
203+
# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_17 is not set
201204
# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_16 is not set
202205
# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_15 is not set
203206
# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_14 is not set
@@ -465,7 +468,7 @@ BR2_OPTIMIZE_2=y
465468
BR2_SHARED_LIBS=y
466469
# BR2_SHARED_STATIC_LIBS is not set
467470
BR2_PACKAGE_OVERRIDE_FILE="$(CONFIG_DIR)/local.mk"
468-
BR2_GLOBAL_PATCH_DIR=""
471+
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_Nocturne_PATH)/board/nocturne/patches"
469472

470473
#
471474
# Advanced
@@ -767,7 +770,6 @@ BR2_PACKAGE_PLY_ARCH_SUPPORTS=y
767770
BR2_PACKAGE_PTM2HUMAN_ARCH_SUPPORTS=y
768771
# BR2_PACKAGE_PTM2HUMAN is not set
769772
# BR2_PACKAGE_PV is not set
770-
# BR2_PACKAGE_RAMSPEED is not set
771773
# BR2_PACKAGE_RT_TESTS is not set
772774
# BR2_PACKAGE_RWMEM is not set
773775
# BR2_PACKAGE_SENTRY_NATIVE is not set
@@ -833,10 +835,6 @@ BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny"
833835
# Filesystem and flash utilities
834836
#
835837
# BR2_PACKAGE_ABOOTIMG is not set
836-
837-
#
838-
# aufs-util needs a linux kernel and a toolchain w/ threads
839-
#
840838
# BR2_PACKAGE_AUTOFS is not set
841839
# BR2_PACKAGE_BMAP_TOOLS is not set
842840
# BR2_PACKAGE_BMAP_WRITER is not set
@@ -933,10 +931,6 @@ BR2_PACKAGE_E2FSPROGS_FSCK=y
933931
# BR2_PACKAGE_SOUND_THEME_BOREALIS is not set
934932
# BR2_PACKAGE_SOUND_THEME_FREEDESKTOP is not set
935933

936-
#
937-
# Themes
938-
#
939-
940934
#
941935
# Games
942936
#
@@ -975,7 +969,6 @@ BR2_PACKAGE_E2FSPROGS_FSCK=y
975969
#
976970
# cog needs wpewebkit and a toolchain w/ threads
977971
#
978-
# BR2_PACKAGE_DMENU_WAYLAND is not set
979972

980973
#
981974
# flutter packages need flutter-engine
@@ -1031,6 +1024,7 @@ BR2_PACKAGE_NETSURF_ARCH_SUPPORTS=y
10311024
# BR2_PACKAGE_SWAYBG is not set
10321025
# BR2_PACKAGE_TESSERACT_OCR is not set
10331026
# BR2_PACKAGE_TINIFIER is not set
1027+
# BR2_PACKAGE_WMENU is not set
10341028

10351029
#
10361030
# Graphic libraries
@@ -1076,9 +1070,17 @@ BR2_PACKAGE_QT6_ARCH_SUPPORTS=y
10761070
# BR2_PACKAGE_APITRACE is not set
10771071
# BR2_PACKAGE_MUPDF is not set
10781072

1073+
#
1074+
# pcmanfm needs X.org with an OpenGL backend
1075+
#
1076+
10791077
#
10801078
# vte needs an OpenGL or an OpenGL-EGL backend
10811079
#
1080+
1081+
#
1082+
# yad needs libgtk3 w/ X11 backend
1083+
#
10821084
# BR2_PACKAGE_XKEYBOARD_CONFIG is not set
10831085

10841086
#
@@ -1166,7 +1168,6 @@ BR2_PACKAGE_DBUS=y
11661168
#
11671169
# BR2_PACKAGE_DTV_SCAN_TABLES is not set
11681170
# BR2_PACKAGE_DUMP1090 is not set
1169-
# BR2_PACKAGE_DVBSNOOP is not set
11701171
# BR2_PACKAGE_EDID_DECODE is not set
11711172

11721173
#
@@ -1256,7 +1257,6 @@ BR2_PACKAGE_LIBUBOOTENV=y
12561257
#
12571258
# ofono needs a toolchain w/ dynamic library, wchar, threads, headers >= 4.12
12581259
#
1259-
# BR2_PACKAGE_OLA is not set
12601260
# BR2_PACKAGE_OPEN2300 is not set
12611261
# BR2_PACKAGE_OPENFPGALOADER is not set
12621262
# BR2_PACKAGE_OPENIPMI is not set
@@ -1762,6 +1762,7 @@ BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS=y
17621762
# BR2_PACKAGE_PYTHON_PARAMIKO is not set
17631763
# BR2_PACKAGE_PYTHON_PARSO is not set
17641764
# BR2_PACKAGE_PYTHON_PASSLIB is not set
1765+
# BR2_PACKAGE_PYTHON_PATCH_NG is not set
17651766
# BR2_PACKAGE_PYTHON_PATH is not set
17661767
# BR2_PACKAGE_PYTHON_PATHPY is not set
17671768
# BR2_PACKAGE_PYTHON_PATHSPEC is not set
@@ -1885,6 +1886,7 @@ BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS=y
18851886
# BR2_PACKAGE_PYTHON_SCANDIR is not set
18861887
# BR2_PACKAGE_PYTHON_SCAPY is not set
18871888
# BR2_PACKAGE_PYTHON_SCHEDULE is not set
1889+
# BR2_PACKAGE_PYTHON_SCP is not set
18881890

18891891
#
18901892
# python-sdbus needs systemd
@@ -2004,6 +2006,7 @@ BR2_PACKAGE_PYTHON_SETUPTOOLS=y
20042006
# BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT is not set
20052007
# BR2_PACKAGE_PYTHON_WEBSOCKETS is not set
20062008
# BR2_PACKAGE_PYTHON_WERKZEUG is not set
2009+
# BR2_PACKAGE_PYTHON_WHITENOISE is not set
20072010
# BR2_PACKAGE_PYTHON_WHOOSH is not set
20082011
# BR2_PACKAGE_PYTHON_WRAPT is not set
20092012
# BR2_PACKAGE_PYTHON_WS4PY is not set
@@ -2325,7 +2328,7 @@ BR2_PACKAGE_JPEG_SIMD_SUPPORT=y
23252328
# BR2_PACKAGE_LIBEXIF is not set
23262329

23272330
#
2328-
# libfm needs X.org and a toolchain w/ wchar, threads, C++, gcc >= 4.9
2331+
# libfm needs X.org with an OpenGL backend
23292332
#
23302333
# BR2_PACKAGE_LIBFM_EXTRA is not set
23312334

@@ -2522,10 +2525,8 @@ BR2_PACKAGE_JSON_C=y
25222525
# BR2_PACKAGE_JSON_FOR_MODERN_CPP is not set
25232526
# BR2_PACKAGE_JSON_GLIB is not set
25242527
# BR2_PACKAGE_JSONCPP is not set
2525-
# BR2_PACKAGE_LIBBSON is not set
25262528
# BR2_PACKAGE_LIBFASTJSON is not set
25272529
# BR2_PACKAGE_LIBJSON is not set
2528-
# BR2_PACKAGE_LIBJWT is not set
25292530
# BR2_PACKAGE_LIBROXML is not set
25302531
# BR2_PACKAGE_LIBUCL is not set
25312532
# BR2_PACKAGE_LIBXML2 is not set
@@ -2612,7 +2613,6 @@ BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y
26122613
# BR2_PACKAGE_LIBVPX is not set
26132614
# BR2_PACKAGE_LIBYUV is not set
26142615
# BR2_PACKAGE_LIVE555 is not set
2615-
# BR2_PACKAGE_MEDIASTREAMER is not set
26162616
# BR2_PACKAGE_X264 is not set
26172617
# BR2_PACKAGE_X265 is not set
26182618

@@ -2626,7 +2626,6 @@ BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y
26262626
#
26272627
# batman-adv needs a Linux kernel to be built
26282628
#
2629-
# BR2_PACKAGE_BELLE_SIP is not set
26302629
BR2_PACKAGE_BLUEZ5_UTILS_HEADERS=y
26312630
# BR2_PACKAGE_C_ARES is not set
26322631
# BR2_PACKAGE_CNI_PLUGINS is not set
@@ -2753,7 +2752,6 @@ BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS=y
27532752
# BR2_PACKAGE_OPENMPI is not set
27542753
# BR2_PACKAGE_OPENPGM is not set
27552754
# BR2_PACKAGE_OPENZWAVE is not set
2756-
# BR2_PACKAGE_ORTP is not set
27572755
# BR2_PACKAGE_PAHO_MQTT_C is not set
27582756
# BR2_PACKAGE_PAHO_MQTT_CPP is not set
27592757
# BR2_PACKAGE_PISTACHE is not set
@@ -2787,9 +2785,7 @@ BR2_PACKAGE_LIBZENOH_C_ARCH_SUPPORTS=y
27872785
# BR2_PACKAGE_ATF is not set
27882786
# BR2_PACKAGE_AVRO_C is not set
27892787
# BR2_PACKAGE_BASU is not set
2790-
# BR2_PACKAGE_BCTOOLBOX is not set
27912788
# BR2_PACKAGE_BDWGC is not set
2792-
# BR2_PACKAGE_BELR is not set
27932789
# BR2_PACKAGE_BOOST is not set
27942790
# BR2_PACKAGE_C_CAPNPROTO is not set
27952791
# BR2_PACKAGE_CAPNPROTO is not set
@@ -2843,7 +2839,6 @@ BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
28432839
#
28442840
BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
28452841
# BR2_PACKAGE_LIBABSEIL_CPP is not set
2846-
# BR2_PACKAGE_LIBARGTABLE2 is not set
28472842
BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
28482843
# BR2_PACKAGE_LIBATOMIC_OPS is not set
28492844
# BR2_PACKAGE_LIBAVL is not set
@@ -2924,6 +2919,8 @@ BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS=y
29242919
# BR2_PACKAGE_LIGHTNING is not set
29252920
# BR2_PACKAGE_LINUX_PAM is not set
29262921
# BR2_PACKAGE_LIQUID_DSP is not set
2922+
BR2_PACKAGE_LLAMA_CPP_ARCH_SUPPORTS=y
2923+
# BR2_PACKAGE_LLAMA_CPP is not set
29272924
BR2_PACKAGE_LLVM_ARCH_SUPPORTS=y
29282925
BR2_PACKAGE_LLVM_TARGET_ARCH="ARM"
29292926
# BR2_PACKAGE_LLVM is not set
@@ -3229,7 +3226,6 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
32293226
# BR2_PACKAGE_LIGHTTPD is not set
32303227
# BR2_PACKAGE_LINKNX is not set
32313228
# BR2_PACKAGE_LINKS is not set
3232-
# BR2_PACKAGE_LINPHONE is not set
32333229
# BR2_PACKAGE_LINUX_ZIGBEE is not set
32343230
# BR2_PACKAGE_LINUXPTP is not set
32353231
# BR2_PACKAGE_LLDPD is not set
@@ -3244,8 +3240,6 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
32443240
# BR2_PACKAGE_MINISSDPD is not set
32453241
# BR2_PACKAGE_MJPG_STREAMER is not set
32463242
# BR2_PACKAGE_MODEM_MANAGER is not set
3247-
BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y
3248-
# BR2_PACKAGE_MONGREL2 is not set
32493243
# BR2_PACKAGE_MOSH is not set
32503244
# BR2_PACKAGE_MOSQUITTO is not set
32513245
# BR2_PACKAGE_MROUTED is not set
@@ -3504,7 +3498,6 @@ BR2_PACKAGE_GNUPG2_DEPENDS=y
35043498
# BR2_PACKAGE_INOTIFY_TOOLS is not set
35053499
# BR2_PACKAGE_LOCKFILE_PROGS is not set
35063500
# BR2_PACKAGE_LOGROTATE is not set
3507-
# BR2_PACKAGE_LOGSURFER is not set
35083501
# BR2_PACKAGE_LOWDOWN is not set
35093502

35103503
#
@@ -3632,7 +3625,6 @@ BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS=y
36323625
# podman needs a toolchain w/ headers >= 4.14, threads, wchar
36333626
#
36343627
# BR2_PACKAGE_POLKIT is not set
3635-
# BR2_PACKAGE_PROCRANK_LINUX is not set
36363628
# BR2_PACKAGE_PROCS is not set
36373629
# BR2_PACKAGE_PWGEN is not set
36383630

@@ -3755,18 +3747,20 @@ BR2_PACKAGE_UTIL_LINUX_FALLOCATE=y
37553747
# Text editors and viewers
37563748
#
37573749
# BR2_PACKAGE_BAT is not set
3750+
# BR2_PACKAGE_BROOT is not set
3751+
# BR2_PACKAGE_BVI is not set
37583752
# BR2_PACKAGE_ED is not set
37593753
# BR2_PACKAGE_JOE is not set
37603754
# BR2_PACKAGE_MC is not set
37613755
# BR2_PACKAGE_MG is not set
37623756
# BR2_PACKAGE_MOST is not set
37633757
# BR2_PACKAGE_NANO is not set
3758+
# BR2_PACKAGE_NNN is not set
37643759
# BR2_PACKAGE_UEMACS is not set
37653760

37663761
#
37673762
# Filesystem images
37683763
#
3769-
# BR2_TARGET_ROOTFS_AXFS is not set
37703764
# BR2_TARGET_ROOTFS_BTRFS is not set
37713765
# BR2_TARGET_ROOTFS_CLOOP is not set
37723766
# BR2_TARGET_ROOTFS_CPIO is not set
@@ -3889,6 +3883,7 @@ BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS=y
38893883
BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE1_ARCH_SUPPORTS=y
38903884
BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS=y
38913885
BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS=y
3886+
BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE4_ARCH_SUPPORTS=y
38923887
BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
38933888
# BR2_PACKAGE_HOST_GPTFDISK is not set
38943889
# BR2_PACKAGE_HOST_IMAGEMAGICK is not set
@@ -3964,6 +3959,7 @@ BR2_PACKAGE_PROVIDES_HOST_RUSTC="host-rust-bin"
39643959
# BR2_PACKAGE_HOST_SENTRY_CLI is not set
39653960
# BR2_PACKAGE_HOST_SKOPEO is not set
39663961
# BR2_PACKAGE_HOST_SLOCI_IMAGE is not set
3962+
# BR2_PACKAGE_HOST_SNAGBOOT is not set
39673963
# BR2_PACKAGE_HOST_SQUASHFS is not set
39683964
# BR2_PACKAGE_HOST_SUNXI_TOOLS is not set
39693965
# BR2_PACKAGE_HOST_SWIG is not set
@@ -3986,6 +3982,56 @@ BR2_PACKAGE_HOST_UTIL_LINUX=y
39863982
# Legacy config options
39873983
#
39883984

3985+
#
3986+
# Legacy options removed in 2025.11
3987+
#
3988+
# BR2_KERNEL_HEADERS_5_4 is not set
3989+
# BR2_PACKAGE_LIBARGTABLE2 is not set
3990+
# BR2_PACKAGE_OLA is not set
3991+
# BR2_PACKAGE_BATMAN_ADV_NC is not set
3992+
# BR2_PACKAGE_DVBSNOOP is not set
3993+
# BR2_PACKAGE_PROCRANK_LINUX is not set
3994+
# BR2_PACKAGE_MONGREL2 is not set
3995+
# BR2_PACKAGE_EXPECT is not set
3996+
# BR2_PACKAGE_BCTOOLBOX is not set
3997+
# BR2_PACKAGE_ORTP is not set
3998+
# BR2_PACKAGE_MEDIASTREAMER is not set
3999+
# BR2_PACKAGE_BELR is not set
4000+
# BR2_PACKAGE_BELLE_SIP is not set
4001+
# BR2_PACKAGE_LINPHONE is not set
4002+
# BR2_PACKAGE_LIBJWT is not set
4003+
# BR2_PACKAGE_RAMSPEED is not set
4004+
# BR2_PACKAGE_LESSTIF is not set
4005+
# BR2_KERNEL_HEADERS_6_16 is not set
4006+
# BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK is not set
4007+
# BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP is not set
4008+
# BR2_PACKAGE_LIBBSON is not set
4009+
# BR2_TARGET_ROOTFS_AXFS is not set
4010+
# BR2_PACKAGE_LOGSURFER is not set
4011+
# BR2_LINUX_KERNEL_EXT_FBTFT is not set
4012+
# BR2_PACKAGE_DMENU_WAYLAND is not set
4013+
# BR2_PACKAGE_SYLPHEED is not set
4014+
# BR2_PACKAGE_PINENTRY_GTK2 is not set
4015+
# BR2_PACKAGE_OPENCV4_WITH_GTK is not set
4016+
# BR2_PACKAGE_OPENCV3_WITH_GTK is not set
4017+
# BR2_PACKAGE_NETSURF_GTK is not set
4018+
# BR2_PACKAGE_METACITY is not set
4019+
# BR2_PACKAGE_LIBSEXY is not set
4020+
# BR2_PACKAGE_LIBGLADE is not set
4021+
# BR2_PACKAGE_LEAFPAD is not set
4022+
# BR2_PACKAGE_GTKPERF is not set
4023+
# BR2_PACKAGE_GTK2_ENGINES is not set
4024+
# BR2_PACKAGE_GKRELLM_CLIENT is not set
4025+
# BR2_PACKAGE_CWIID_WMGUI is not set
4026+
# BR2_LINUX_KERNEL_EXT_AUFS is not set
4027+
# BR2_PACKAGE_AUFS_UTIL is not set
4028+
# BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB is not set
4029+
# BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM is not set
4030+
# BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE is not set
4031+
# BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 is not set
4032+
# BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS is not set
4033+
# BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS is not set
4034+
39894035
#
39904036
# Legacy options removed in 2025.08
39914037
#
@@ -4920,7 +4966,7 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
49204966
#
49214967

49224968
#
4923-
# Nocturne external Buildroot tree (in /home/dominic/nocturne-test/image/external)
4969+
# Nocturne external Buildroot tree (in /home/dominic/Code/nocturne-image/external)
49244970
#
49254971

49264972
#

0 commit comments

Comments
 (0)