Update to 6.6.26

lunatilia · Apr 17, 2024 · a2eaf15 · a2eaf15
1 parent 4d7eacb
commit a2eaf15
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
@@ -1,2 +1,2 @@
-80381636c32da573b0307af5e728700000c1533b  SOURCES/5384efc5ee19d506690d56dea4922e2428addaa5.tar.gz
-703863334ec5a6a862e72ebd19cbb0dc740c222d  SOURCES/ae8a4ce56fcac6cfd2bf9c3bbbdd939725c1ae45.tar.gz
+29cf3a67bb0720c1d47e57b4b60db42d69b83bae  SOURCES/044dae4ac76ab3677977f432e78b29e423e8c54e.tar.gz
+6d1de14ec40630bc1487a789c9e70289df2ebb55  SOURCES/c167a3336a2a770ab840e94f2cb1d379d8478c1d.tar.gz
diff --git a/SOURCES/bcm2711_selinux_config.patch b/SOURCES/bcm2711_selinux_config.patch
@@ -1,8 +1,8 @@
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 2bf13fd55..6157b990d 100644
+index c9860e302..4238bd96b 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1566,8 +1566,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1570,8 +1570,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -11,7 +11,7 @@ index 2bf13fd55..6157b990d 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_AES=m
  CONFIG_CRYPTO_CAST5=m
-@@ -1608,3 +1606,38 @@ CONFIG_STACK_TRACER=y
+@@ -1612,3 +1610,38 @@ CONFIG_STACK_TRACER=y
  CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
@@ -51,10 +51,10 @@ index 2bf13fd55..6157b990d 100644
 +CONFIG_FW_LOADER_COMPRESS_XZ=y
 +CONFIG_FW_LOADER_COMPRESS_ZSTD=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 6ac8c83f6..d25f43119 100644
+index e87791286..1591bbbb9 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1618,8 +1618,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1622,8 +1622,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -63,7 +63,7 @@ index 6ac8c83f6..d25f43119 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_AES=m
-@@ -1670,3 +1668,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1674,3 +1672,39 @@ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
  # CONFIG_STRICT_DEVMEM is not set

diff --git a/SOURCES/bcm2712_selinux_config.patch b/SOURCES/bcm2712_selinux_config.patch
@@ -1,8 +1,8 @@
 diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
-index 875b905be..e5c2714f7 100644
+index 79c433258..4e3e6f2e6 100644
 --- a/arch/arm64/configs/bcm2712_defconfig
 +++ b/arch/arm64/configs/bcm2712_defconfig
-@@ -1621,8 +1621,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1625,8 +1625,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -11,7 +11,7 @@ index 875b905be..e5c2714f7 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_AES=m
-@@ -1673,3 +1671,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1677,3 +1675,39 @@ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
  # CONFIG_STRICT_DEVMEM is not set

diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
@@ -1,5 +1,5 @@
-%global commit_firmware_long 5384efc5ee19d506690d56dea4922e2428addaa5
-%global commit_linux_long ae8a4ce56fcac6cfd2bf9c3bbbdd939725c1ae45
+%global commit_firmware_long c167a3336a2a770ab840e94f2cb1d379d8478c1d
+%global commit_linux_long 044dae4ac76ab3677977f432e78b29e423e8c54e
 
 ExclusiveArch: aarch64
 
@@ -26,7 +26,7 @@ ExclusiveArch: aarch64
 %endif
 
 %define kversion 6.6
-%define patchlevel 25
+%define patchlevel 26
 
 Name:           raspberrypi2
 Version:        %{kversion}.%{patchlevel}
@@ -290,6 +290,9 @@ cp $(ls -1 /boot/config-kernel-*-%{local_version}+*|sort -V|tail -1) /boot/confi
 %doc /boot/LICENCE.broadcom
 
 %changelog
+* Wed Apr 17 2024 Mitsuki Shirase <maintainer@celos.dev> - 6.6.26
+- Update to version v6.6.26
+
 * Wed Apr 17 2024 Mitsuki Shirase <maintainer@celos.dev> - 6.6.25
 - Change initramfs name from 'initramfs-${version}-${release}' to 'initramfs${armtarget}'.