Skip to content

Commit f96539d

Browse files
dmanlfcdmanlfc
authored
Merge pull request #1154 from dmanlfc/linux-7.1
linux 7.1
2 parents 907771f + 06cc51c commit f96539d

10 files changed

Lines changed: 50 additions & 18 deletions

File tree

‎linux/from-6.17/linux.hash‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# From https://www.kernel.org/pub/linux/kernel/v7.x/sha256sums.asc
2-
sha256 e56c8356dda01136a6041c6ef832bd0ec99bd2d35dff97832aa5ec10ed014304 linux-7.0.11.tar.xz
2+
sha256 691f44797fbe790dc8a321604c927087526ad27b6d649925d60f8eed0a2564a0 linux-7.1.tar.xz
3+
sha256 57edc9a41efc1ca6b797afa8f4a587a30da2af6bca7356eb56e1e1a4ada265da linux-7.0.12.tar.xz
34

45
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
5-
sha256 c33ea75b1f3bc5fccab836790cd3684eab7057ff383464b5efd8a68ba622a83c linux-6.18.29.tar.xz
6+
sha256 f78602932219125e211c5f5bfd84edcfd4ec5ce88fc944f8248413f665bef236 linux-6.18.35.tar.xz
67

78
# Licenses hashes
89
sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING

‎package/linux-headers/7.1/7.1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../linux/from-6.17

‎package/linux-headers/Config.in.host‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ comment "Kernel Header Options"
33
choice
44
prompt "Kernel Headers"
55
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
6-
default BR2_KERNEL_HEADERS_7_0
6+
default BR2_KERNEL_HEADERS_7_1
77
help
88
Select the kernel version to get headers from.
99

@@ -55,6 +55,10 @@ config BR2_KERNEL_HEADERS_6_18
5555
config BR2_KERNEL_HEADERS_7_0
5656
bool "Linux 7.0.x kernel headers"
5757
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
58+
59+
config BR2_KERNEL_HEADERS_7_1
60+
bool "Linux 7.1.x kernel headers"
61+
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1
5862
select BR2_KERNEL_HEADERS_LATEST
5963

6064
config BR2_KERNEL_HEADERS_VERSION
@@ -133,8 +137,12 @@ choice
133137
If your kernel headers are more recent than the latest version
134138
in the choice, then select the latest version.
135139

140+
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_7_1
141+
bool "7.1.x or later"
142+
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1
143+
136144
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_7_0
137-
bool "7.0.x or later"
145+
bool "7.0.x"
138146
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
139147

140148
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_19
@@ -468,13 +476,14 @@ endchoice
468476

469477
config BR2_DEFAULT_KERNEL_HEADERS
470478
string
471-
default "5.10.255" if BR2_KERNEL_HEADERS_5_10
472-
default "5.15.206" if BR2_KERNEL_HEADERS_5_15
473-
default "6.1.172" if BR2_KERNEL_HEADERS_6_1
474-
default "6.6.138" if BR2_KERNEL_HEADERS_6_6
475-
default "6.12.87" if BR2_KERNEL_HEADERS_6_12
476-
default "6.18.29" if BR2_KERNEL_HEADERS_6_18
477-
default "7.0.11" if BR2_KERNEL_HEADERS_7_0
479+
default "5.10.258" if BR2_KERNEL_HEADERS_5_10
480+
default "5.15.209" if BR2_KERNEL_HEADERS_5_15
481+
default "6.1.175" if BR2_KERNEL_HEADERS_6_1
482+
default "6.6.142" if BR2_KERNEL_HEADERS_6_6
483+
default "6.12.93" if BR2_KERNEL_HEADERS_6_12
484+
default "6.18.35" if BR2_KERNEL_HEADERS_6_18
485+
default "7.0.12" if BR2_KERNEL_HEADERS_7_0
486+
default "7.1" if BR2_KERNEL_HEADERS_7_1
478487
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
479488
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
480489
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -488,4 +497,4 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS_LICENSE_FILES
488497
default "COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note"
489498
help
490499
A space-separated list of license files related to the Linux
491-
kernel headers.
500+
kernel headers.

‎package/rtl8188eu/rtl8188eu.hash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Locally computed
2-
sha256 bed53ce2ce2b947795f795538d823a8ecdf3845f2f7571d54ba351ddf4ddb243 rtl8188eu-2ef2819d2d3ef7701a739c66525bca4731c6abbf.tar.gz
2+
sha256 8ec126dc722b4e0837c866ec3f73eea9f0835d518fef38b880e2c37fd2fac55a rtl8188eu-cca7c28087db740d7d745e81e4096c9eb9084f9a.tar.gz
33
sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING

‎package/rtl8188eu/rtl8188eu.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# rtl8188eu
44
#
55
################################################################################
6-
7-
RTL8188EU_VERSION = 2ef2819d2d3ef7701a739c66525bca4731c6abbf
6+
# batocera - linux 7.1 support
7+
RTL8188EU_VERSION = cca7c28087db740d7d745e81e4096c9eb9084f9a
88
RTL8188EU_SITE = $(call github,benetti-engineering,rtl8188eu,$(RTL8188EU_VERSION))
99
RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob)
1010
RTL8188EU_LICENSE_FILES = COPYING

‎package/rtl8192eu/rtl8192eu.hash‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Locally computed
2+
sha256 c61ef791389620b2946046918422c606a0f683310eae952c9155ead2c47fa5f6 rtl8192eu-85f3b62620b5eb7931fa129730820ae6693216ac.tar.gz
23
sha256 6cb82ae3c5c5cf783b9150035459ecb4a13aaa614d0a8bb3ab938d54f4feeb74 rtl8192eu-0a170fe9a9cd75ea4df3c209fa4a02f9858483e5.tar.gz
34
sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz
45
sha256 19e1686d6841f572d3274c96e3e4b66544027d559f5d4da528d8c8510f7d34e6 rtl8192eu-ee928d5dc065f328043711c271eb54f008e6245c.tar.gz

‎package/rtl8192eu/rtl8192eu.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ifeq ($(BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4),y)
99
RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f
1010
else
1111
# batocera - kernel 6.17+ support
12-
RTL8192EU_VERSION = e670de06ebedc844f173cf8d377691ce7f237311
12+
RTL8192EU_VERSION = 85f3b62620b5eb7931fa129730820ae6693216ac
1313
endif
1414

1515
RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION))

‎package/rtl8723bu/rtl8723bu.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs)
1010

1111
RTL8723BU_MODULE_MAKE_OPTS = \
1212
KVER=$(LINUX_VERSION_PROBED) \
13-
KSRC=$(LINUX_DIR)
13+
KSRC=$(LINUX_DIR) \
14+
USER_EXTRA_CFLAGS="-Wno-error=incompatible-pointer-types" # batocera
1415

1516
define RTL8723BU_LINUX_CONFIG_FIXUPS
1617
$(call KCONFIG_ENABLE_OPT,CONFIG_NET)

‎toolchain/Config.in‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
680680
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
681681
bool
682682
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
683+
684+
config BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1
685+
bool
686+
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
683687
select BR2_TOOLCHAIN_HEADERS_LATEST
684688

685689
# This should be selected by the latest version, above, to indicate that
@@ -693,6 +697,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
693697
# stops affecting a value on the first matching default.
694698
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
695699
string
700+
default "7.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1
696701
default "7.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
697702
default "6.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
698703
default "6.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
@@ -848,10 +853,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_15
848853
bool
849854
select BR2_TOOLCHAIN_GCC_AT_LEAST_14
850855

856+
config BR2_TOOLCHAIN_GCC_AT_LEAST_16
857+
bool
858+
select BR2_TOOLCHAIN_GCC_AT_LEAST_15
859+
851860
# This order guarantees that the highest version is set, as kconfig
852861
# stops affecting a value on the first matching default.
853862
config BR2_TOOLCHAIN_GCC_AT_LEAST
854863
string
864+
default "16" if BR2_TOOLCHAIN_GCC_AT_LEAST_16
855865
default "15" if BR2_TOOLCHAIN_GCC_AT_LEAST_15
856866
default "14" if BR2_TOOLCHAIN_GCC_AT_LEAST_14
857867
default "13" if BR2_TOOLCHAIN_GCC_AT_LEAST_13

‎toolchain/toolchain-external/toolchain-external-custom/Config.in.options‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ choice
4646
Set to the gcc version that is used by your external
4747
toolchain.
4848

49+
config BR2_TOOLCHAIN_EXTERNAL_GCC_16
50+
bool "16.x"
51+
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_17
52+
select BR2_TOOLCHAIN_GCC_AT_LEAST_16
53+
4954
config BR2_TOOLCHAIN_EXTERNAL_GCC_15
5055
bool "15.x"
5156
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_16
@@ -173,8 +178,12 @@ choice
173178
If your toolchain uses headers newer than the latest version
174179
in the choice, then select the latest version.
175180

181+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_7_1
182+
bool "7.1.x or later"
183+
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1
184+
176185
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_7_0
177-
bool "7.0.x or later"
186+
bool "7.0.x"
178187
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
179188

180189
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_19

0 commit comments

Comments
 (0)