Update to 6.6.47 and disable debuginfo

lunatilia · Aug 31, 2024 · 2cf36ab · 2cf36ab
1 parent be28642
commit 2cf36ab
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
@@ -1,2 +1,2 @@
-6d58dd2b0105060c57b78e566f776f38ce7e49c3  SOURCES/458df3adc11fccc3d26d3d6d8864738459290416.tar.gz
-4bf127e326b473edb41dc89b3aaba692c6dd32ff  SOURCES/dd7a15472b18d4bce738bb9213443c140473833b.tar.gz
+7fac3f24213c8d47db7886e9e510c6ac18b3f152  SOURCES/bf122227344fe9d7ecc5db6c0bf4bb0bd8ca9844.tar.gz
+93eecdd9fd55af458c7c45fec59dff24eef9d486  SOURCES/cf64a1dfecc2dc418efdd61701c1a4b185ab4761.tar.gz
diff --git a/SOURCES/bcm2709_selinux_config.patch b/SOURCES/bcm2709_selinux_config.patch
@@ -1,8 +1,8 @@
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index f54eaec96..02fdbbb75 100644
+index de49c0bfa..63ae2cf04 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1542,8 +1542,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1549,8 +1549,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -11,11 +11,10 @@ index f54eaec96..02fdbbb75 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CAST5=m
  CONFIG_CRYPTO_DES=y
-@@ -1583,3 +1581,38 @@ CONFIG_STACK_TRACER=y
+@@ -1590,3 +1588,37 @@ CONFIG_STACK_TRACER=y
  CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
-+
 +# CentOS added
 +CONFIG_AUDIT=y
 +CONFIG_NETLABEL=y

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 c21271866..d35901ae5 100644
+index 678c659d8..6128136ed 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1573,8 +1573,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1580,8 +1580,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -11,11 +11,10 @@ index c21271866..d35901ae5 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_AES=m
  CONFIG_CRYPTO_CAST5=m
-@@ -1615,3 +1613,38 @@ CONFIG_STACK_TRACER=y
+@@ -1622,3 +1620,37 @@ CONFIG_STACK_TRACER=y
  CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
-+
 +# CentOS added
 +CONFIG_AUDIT=y
 +CONFIG_NETLABEL=y
@@ -51,10 +50,10 @@ index c21271866..d35901ae5 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 f5e4a1263..6aef17c78 100644
+index c14149b75..d511a02f2 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1625,8 +1625,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1632,8 +1632,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -63,11 +62,10 @@ index f5e4a1263..6aef17c78 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_AES=m
-@@ -1677,3 +1675,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1684,3 +1682,38 @@ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
  # CONFIG_STRICT_DEVMEM is not set
-+
 +# CentOS added
 +CONFIG_AUDIT=y
 +CONFIG_NETLABEL=y

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 df8f058a1..8359e95e3 100644
+index c24f9ceb1..2f6c53cf1 100644
 --- a/arch/arm64/configs/bcm2712_defconfig
 +++ b/arch/arm64/configs/bcm2712_defconfig
-@@ -1628,8 +1628,6 @@ CONFIG_NLS_KOI8_U=m
+@@ -1635,8 +1635,6 @@ CONFIG_NLS_KOI8_U=m
  CONFIG_DLM=m
  CONFIG_KEY_DH_OPERATIONS=y
  CONFIG_SECURITY=y
@@ -11,11 +11,10 @@ index df8f058a1..8359e95e3 100644
  CONFIG_CRYPTO_USER=m
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_AES=m
-@@ -1680,3 +1678,39 @@ CONFIG_SCHED_TRACER=y
+@@ -1687,3 +1685,38 @@ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
  # CONFIG_STRICT_DEVMEM is not set
-+
 +# CentOS added
 +CONFIG_AUDIT=y
 +CONFIG_NETLABEL=y

diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
@@ -1,5 +1,8 @@
-%global commit_firmware_long 458df3adc11fccc3d26d3d6d8864738459290416
-%global commit_linux_long dd7a15472b18d4bce738bb9213443c140473833b
+%global commit_firmware_long bf122227344fe9d7ecc5db6c0bf4bb0bd8ca9844
+%global commit_linux_long cf64a1dfecc2dc418efdd61701c1a4b185ab4761
+
+# Disable debuginfo, since we package a stripped upstream binary.
+%global debug_package %{nil}
 
 ExclusiveArch: aarch64
 
@@ -26,7 +29,7 @@ ExclusiveArch: aarch64
 %endif
 
 %define kversion 6.6
-%define patchlevel 31
+%define patchlevel 47
 %define specversion %{kversion}.%{patchlevel}
 %define specrelease %{?extra_version}%{?dist}
 %define pkg_release %{local_version}+%{?dist}
@@ -300,6 +303,10 @@ cp $(ls -1 /boot/config-kernel-*-%{local_version}+*|sort -V|tail -1) /boot/confi
 %doc /boot/LICENCE.broadcom
 
 %changelog
+* Sat Aug 31 2024 Mitsuki Shirase <maintainer@celos.dev> - 6.6.47-1
+- Update to version v6.6.47
+- Disable debuginfo package.
+
 * Tue May 28 2024 Mitsuki Shirase <maintainer@celos.dev> - 6.6.31-1
 - Update to version v6.6.31