.raspberrypi2.metadata

@@ -1,2 +1,3 @@
-4a2fbe9165da20c5ed42fd8fa0ea24db39707946 SOURCES/f2f68e79f16fe405f43e957f5aac8ac6f400b112.tar.gz
-f711e9fed66a0b40064395a686e8d3b739b4ec50 1.20260408.tar.gz
+62f4117436e8eaa59e4974300a4481174a4ef1af SOURCES/cb9500d6021e083a182ba168fe4424e3db2494cf.tar.gz
+30996d7c1c59ddbd495bd9eb37c8dfdb1a67c1c3 SOURCES/linux-6.1.tar.xz
+7fb75dae049c3687780b214931dca33820ebddc9 SOURCES/patch-6.1.31.xz

SOURCES/1100-crypto-algif_aead-Revert-to-operating-out-of-place.patch

@@ -1,315 +0,0 @@
-From a664bf3d603dc3bdcf9ae47cc21e0daec706d7a5 Mon Sep 17 00:00:00 2001
-From: Herbert Xu <herbert@gondor.apana.org.au>
-Date: Thu, 26 Mar 2026 15:30:20 +0900
-Subject: [PATCH] crypto: algif_aead - Revert to operating out-of-place
-
-This mostly reverts commit 72548b093ee3 except for the copying of
-the associated data.
-
-There is no benefit in operating in-place in algif_aead since the
-source and destination come from different mappings.  Get rid of
-all the complexity added for in-place operation and just copy the
-AD directly.
-
-Fixes: 72548b093ee3 ("crypto: algif_aead - copy AAD from src to dst")
-Reported-by: Taeyang Lee <0wn@theori.io>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- crypto/af_alg.c         |  49 ++++----------------
- crypto/algif_aead.c     | 100 ++++++++--------------------------------
- crypto/algif_skcipher.c |   6 +--
- include/crypto/if_alg.h |   5 +-
- 4 files changed, 34 insertions(+), 126 deletions(-)
-
-diff --git a/crypto/af_alg.c b/crypto/af_alg.c
-index c2fd9cd86c5efa..8e0199394984d8 100644
---- a/crypto/af_alg.c
-+++ b/crypto/af_alg.c
-@@ -637,15 +637,13 @@ static int af_alg_alloc_tsgl(struct sock *sk)
- /**
-  * af_alg_count_tsgl - Count number of TX SG entries
-  *
-- * The counting starts from the beginning of the SGL to @bytes. If
-- * an @offset is provided, the counting of the SG entries starts at the @offset.
-+ * The counting starts from the beginning of the SGL to @bytes.
-  *
-  * @sk: socket of connection to user space
-  * @bytes: Count the number of SG entries holding given number of bytes.
-- * @offset: Start the counting of SG entries from the given offset.
-  * Return: Number of TX SG entries found given the constraints
-  */
--unsigned int af_alg_count_tsgl(struct sock *sk, size_t bytes, size_t offset)
-+unsigned int af_alg_count_tsgl(struct sock *sk, size_t bytes)
- {
- 	const struct alg_sock *ask = alg_sk(sk);
- 	const struct af_alg_ctx *ctx = ask->private;
-@@ -660,25 +658,11 @@ unsigned int af_alg_count_tsgl(struct sock *sk, size_t bytes, size_t offset)
- 		const struct scatterlist *sg = sgl->sg;
- 
- 		for (i = 0; i < sgl->cur; i++) {
--			size_t bytes_count;
--
--			/* Skip offset */
--			if (offset >= sg[i].length) {
--				offset -= sg[i].length;
--				bytes -= sg[i].length;
--				continue;
--			}
--
--			bytes_count = sg[i].length - offset;
--
--			offset = 0;
- 			sgl_count++;
--
--			/* If we have seen requested number of bytes, stop */
--			if (bytes_count >= bytes)
-+			if (sg[i].length >= bytes)
- 				return sgl_count;
- 
--			bytes -= bytes_count;
-+			bytes -= sg[i].length;
- 		}
- 	}
- 
-@@ -690,19 +674,14 @@ EXPORT_SYMBOL_GPL(af_alg_count_tsgl);
-  * af_alg_pull_tsgl - Release the specified buffers from TX SGL
-  *
-  * If @dst is non-null, reassign the pages to @dst. The caller must release
-- * the pages. If @dst_offset is given only reassign the pages to @dst starting
-- * at the @dst_offset (byte). The caller must ensure that @dst is large
-- * enough (e.g. by using af_alg_count_tsgl with the same offset).
-+ * the pages.
-  *
-  * @sk: socket of connection to user space
-  * @used: Number of bytes to pull from TX SGL
-  * @dst: If non-NULL, buffer is reassigned to dst SGL instead of releasing. The
-  *	 caller must release the buffers in dst.
-- * @dst_offset: Reassign the TX SGL from given offset. All buffers before
-- *	        reaching the offset is released.
-  */
--void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst,
--		      size_t dst_offset)
-+void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst)
- {
- 	struct alg_sock *ask = alg_sk(sk);
- 	struct af_alg_ctx *ctx = ask->private;
-@@ -727,18 +706,10 @@ void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst,
- 			 * SG entries in dst.
- 			 */
- 			if (dst) {
--				if (dst_offset >= plen) {
--					/* discard page before offset */
--					dst_offset -= plen;
--				} else {
--					/* reassign page to dst after offset */
--					get_page(page);
--					sg_set_page(dst + j, page,
--						    plen - dst_offset,
--						    sg[i].offset + dst_offset);
--					dst_offset = 0;
--					j++;
--				}
-+				/* reassign page to dst after offset */
-+				get_page(page);
-+				sg_set_page(dst + j, page, plen, sg[i].offset);
-+				j++;
- 			}
- 
- 			sg[i].length -= plen;
-diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
-index 79b016a899a1ef..dda15bb05e892d 100644
---- a/crypto/algif_aead.c
-+++ b/crypto/algif_aead.c
-@@ -26,7 +26,6 @@
- #include <crypto/internal/aead.h>
- #include <crypto/scatterwalk.h>
- #include <crypto/if_alg.h>
--#include <crypto/skcipher.h>
- #include <linux/init.h>
- #include <linux/list.h>
- #include <linux/kernel.h>
-@@ -72,9 +71,8 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,
- 	struct alg_sock *pask = alg_sk(psk);
- 	struct af_alg_ctx *ctx = ask->private;
- 	struct crypto_aead *tfm = pask->private;
--	unsigned int i, as = crypto_aead_authsize(tfm);
-+	unsigned int as = crypto_aead_authsize(tfm);
- 	struct af_alg_async_req *areq;
--	struct af_alg_tsgl *tsgl, *tmp;
- 	struct scatterlist *rsgl_src, *tsgl_src = NULL;
- 	int err = 0;
- 	size_t used = 0;		/* [in]  TX bufs to be en/decrypted */
-@@ -154,23 +152,24 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,
- 		outlen -= less;
- 	}
- 
-+	/*
-+	 * Create a per request TX SGL for this request which tracks the
-+	 * SG entries from the global TX SGL.
-+	 */
- 	processed = used + ctx->aead_assoclen;
--	list_for_each_entry_safe(tsgl, tmp, &ctx->tsgl_list, list) {
--		for (i = 0; i < tsgl->cur; i++) {
--			struct scatterlist *process_sg = tsgl->sg + i;
--
--			if (!(process_sg->length) || !sg_page(process_sg))
--				continue;
--			tsgl_src = process_sg;
--			break;
--		}
--		if (tsgl_src)
--			break;
--	}
--	if (processed && !tsgl_src) {
--		err = -EFAULT;
-+	areq->tsgl_entries = af_alg_count_tsgl(sk, processed);
-+	if (!areq->tsgl_entries)
-+		areq->tsgl_entries = 1;
-+	areq->tsgl = sock_kmalloc(sk, array_size(sizeof(*areq->tsgl),
-+					         areq->tsgl_entries),
-+				  GFP_KERNEL);
-+	if (!areq->tsgl) {
-+		err = -ENOMEM;
- 		goto free;
- 	}
-+	sg_init_table(areq->tsgl, areq->tsgl_entries);
-+	af_alg_pull_tsgl(sk, processed, areq->tsgl);
-+	tsgl_src = areq->tsgl;
- 
- 	/*
- 	 * Copy of AAD from source to destination
-@@ -179,76 +178,15 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,
- 	 * when user space uses an in-place cipher operation, the kernel
- 	 * will copy the data as it does not see whether such in-place operation
- 	 * is initiated.
--	 *
--	 * To ensure efficiency, the following implementation ensure that the
--	 * ciphers are invoked to perform a crypto operation in-place. This
--	 * is achieved by memory management specified as follows.
- 	 */
- 
- 	/* Use the RX SGL as source (and destination) for crypto op. */
- 	rsgl_src = areq->first_rsgl.sgl.sgt.sgl;
- 
--	if (ctx->enc) {
--		/*
--		 * Encryption operation - The in-place cipher operation is
--		 * achieved by the following operation:
--		 *
--		 * TX SGL: AAD || PT
--		 *	    |	   |
--		 *	    | copy |
--		 *	    v	   v
--		 * RX SGL: AAD || PT || Tag
--		 */
--		memcpy_sglist(areq->first_rsgl.sgl.sgt.sgl, tsgl_src,
--			      processed);
--		af_alg_pull_tsgl(sk, processed, NULL, 0);
--	} else {
--		/*
--		 * Decryption operation - To achieve an in-place cipher
--		 * operation, the following  SGL structure is used:
--		 *
--		 * TX SGL: AAD || CT || Tag
--		 *	    |	   |	 ^
--		 *	    | copy |	 | Create SGL link.
--		 *	    v	   v	 |
--		 * RX SGL: AAD || CT ----+
--		 */
--
--		/* Copy AAD || CT to RX SGL buffer for in-place operation. */
--		memcpy_sglist(areq->first_rsgl.sgl.sgt.sgl, tsgl_src, outlen);
--
--		/* Create TX SGL for tag and chain it to RX SGL. */
--		areq->tsgl_entries = af_alg_count_tsgl(sk, processed,
--						       processed - as);
--		if (!areq->tsgl_entries)
--			areq->tsgl_entries = 1;
--		areq->tsgl = sock_kmalloc(sk, array_size(sizeof(*areq->tsgl),
--							 areq->tsgl_entries),
--					  GFP_KERNEL);
--		if (!areq->tsgl) {
--			err = -ENOMEM;
--			goto free;
--		}
--		sg_init_table(areq->tsgl, areq->tsgl_entries);
--
--		/* Release TX SGL, except for tag data and reassign tag data. */
--		af_alg_pull_tsgl(sk, processed, areq->tsgl, processed - as);
--
--		/* chain the areq TX SGL holding the tag with RX SGL */
--		if (usedpages) {
--			/* RX SGL present */
--			struct af_alg_sgl *sgl_prev = &areq->last_rsgl->sgl;
--			struct scatterlist *sg = sgl_prev->sgt.sgl;
--
--			sg_unmark_end(sg + sgl_prev->sgt.nents - 1);
--			sg_chain(sg, sgl_prev->sgt.nents + 1, areq->tsgl);
--		} else
--			/* no RX SGL present (e.g. authentication only) */
--			rsgl_src = areq->tsgl;
--	}
-+	memcpy_sglist(rsgl_src, tsgl_src, ctx->aead_assoclen);
- 
- 	/* Initialize the crypto operation */
--	aead_request_set_crypt(&areq->cra_u.aead_req, rsgl_src,
-+	aead_request_set_crypt(&areq->cra_u.aead_req, tsgl_src,
- 			       areq->first_rsgl.sgl.sgt.sgl, used, ctx->iv);
- 	aead_request_set_ad(&areq->cra_u.aead_req, ctx->aead_assoclen);
- 	aead_request_set_tfm(&areq->cra_u.aead_req, tfm);
-@@ -450,7 +388,7 @@ static void aead_sock_destruct(struct sock *sk)
- 	struct crypto_aead *tfm = pask->private;
- 	unsigned int ivlen = crypto_aead_ivsize(tfm);
- 
--	af_alg_pull_tsgl(sk, ctx->used, NULL, 0);
-+	af_alg_pull_tsgl(sk, ctx->used, NULL);
- 	sock_kzfree_s(sk, ctx->iv, ivlen);
- 	sock_kfree_s(sk, ctx, ctx->len);
- 	af_alg_release_parent(sk);
-diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
-index 125d395c5e009e..82735e51be108d 100644
---- a/crypto/algif_skcipher.c
-+++ b/crypto/algif_skcipher.c
-@@ -138,7 +138,7 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
- 	 * Create a per request TX SGL for this request which tracks the
- 	 * SG entries from the global TX SGL.
- 	 */
--	areq->tsgl_entries = af_alg_count_tsgl(sk, len, 0);
-+	areq->tsgl_entries = af_alg_count_tsgl(sk, len);
- 	if (!areq->tsgl_entries)
- 		areq->tsgl_entries = 1;
- 	areq->tsgl = sock_kmalloc(sk, array_size(sizeof(*areq->tsgl),
-@@ -149,7 +149,7 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
- 		goto free;
- 	}
- 	sg_init_table(areq->tsgl, areq->tsgl_entries);
--	af_alg_pull_tsgl(sk, len, areq->tsgl, 0);
-+	af_alg_pull_tsgl(sk, len, areq->tsgl);
- 
- 	/* Initialize the crypto operation */
- 	skcipher_request_set_tfm(&areq->cra_u.skcipher_req, tfm);
-@@ -363,7 +363,7 @@ static void skcipher_sock_destruct(struct sock *sk)
- 	struct alg_sock *pask = alg_sk(psk);
- 	struct crypto_skcipher *tfm = pask->private;
- 
--	af_alg_pull_tsgl(sk, ctx->used, NULL, 0);
-+	af_alg_pull_tsgl(sk, ctx->used, NULL);
- 	sock_kzfree_s(sk, ctx->iv, crypto_skcipher_ivsize(tfm));
- 	if (ctx->state)
- 		sock_kzfree_s(sk, ctx->state, crypto_skcipher_statesize(tfm));
-diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
-index 107b797c33ecf7..0cc8fa749f68d2 100644
---- a/include/crypto/if_alg.h
-+++ b/include/crypto/if_alg.h
-@@ -230,9 +230,8 @@ static inline bool af_alg_readable(struct sock *sk)
- 	return PAGE_SIZE <= af_alg_rcvbuf(sk);
- }
- 
--unsigned int af_alg_count_tsgl(struct sock *sk, size_t bytes, size_t offset);
--void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst,
--		      size_t dst_offset);
-+unsigned int af_alg_count_tsgl(struct sock *sk, size_t bytes);
-+void af_alg_pull_tsgl(struct sock *sk, size_t used, struct scatterlist *dst);
- void af_alg_wmem_wakeup(struct sock *sk);
- int af_alg_wait_for_data(struct sock *sk, unsigned flags, unsigned min);
- int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size,

SOURCES/bcm2709_selinux_config.patch

@@ -1,34 +1,31 @@
-From 830e3d1891cd911bee5d3424445b47c1f50c317e Mon Sep 17 00:00:00 2001
-From: Koichiro Iwao <meta@almalinux.org>
-Date: Tue, 31 Mar 2026 17:52:13 +0900
-Subject: [PATCH 1/2] Apply config patch for Raspberry Pi (BCM2711)
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Pablo Greco <pgreco@centosproject.org>
+Date: Fri, 7 Aug 2020 02:59:05 +0000
+Subject: [PATCH 1/2] configs 2709
 
-The patch is originally provided by Pablo Greco <pgreco@centosproject.org>.
-
-Signed-off-by: Koichiro Iwao <meta@almalinux.org>
 ---
- arch/arm64/configs/bcm2711_defconfig | 42 ++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
+ arch/arm/configs/bcm2709_defconfig | 40 ++++++++++++++++++++++++++++--
+ 1 file changed, 38 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 56795bf145bd..2ba26e955191 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1714,8 +1714,6 @@ CONFIG_DLM=m
- CONFIG_UNICODE=m
- CONFIG_KEY_DH_OPERATIONS=y
+diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
+index 4b1f46c..537c622 100644
+--- a/arch/arm/configs/bcm2709_defconfig
++++ b/arch/arm/configs/bcm2709_defconfig
+@@ -1530,8 +1530,6 @@ CONFIG_NLS_KOI8_R=m
+ CONFIG_NLS_KOI8_U=m
+ CONFIG_DLM=m
  CONFIG_SECURITY=y
 -CONFIG_SECURITY_APPARMOR=y
 -CONFIG_LSM=""
  CONFIG_CRYPTO_USER=m
- CONFIG_CRYPTO_NULL=m
- CONFIG_CRYPTO_CRYPTD=m
-@@ -1762,3 +1760,43 @@ CONFIG_FTRACE_SYSCALLS=y
+ CONFIG_CRYPTO_CAST5=m
+ CONFIG_CRYPTO_DES=y
+@@ -1569,3 +1567,38 @@ CONFIG_IRQSOFF_TRACER=y
+ CONFIG_SCHED_TRACER=y
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_UPROBE_EVENTS is not set
- # CONFIG_STRICT_DEVMEM is not set
 +
-+# CentOS/AlmaLinux added
++# CentOS added
 +CONFIG_AUDIT=y
 +CONFIG_NETLABEL=y
 +CONFIG_NETFILTER_XT_TARGET_AUDIT=m
@@ -50,23 +47,18 @@ index 56795bf145bd..2ba26e955191 100644
 +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 +CONFIG_CRYPTO_BLAKE2S=m
 +CONFIG_CRYPTO_CURVE25519=m
++CONFIG_CRYPTO_CURVE25519_NEON=m
 +CONFIG_CRYPTO_LIB_BLAKE2S=m
 +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 +CONFIG_CRYPTO_LIB_CHACHA=m
 +CONFIG_CRYPTO_LIB_CURVE25519=m
 +CONFIG_CRYPTO_LIB_POLY1305=m
-+CONFIG_CRYPTO_POLY1305_NEON=m
-+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
++CONFIG_CRYPTO_POLY1305_ARM=m
 +# CONFIG_WIREGUARD_DEBUG is not set
 +CONFIG_WIREGUARD=m
-+CONFIG_BLK_DEV_RBD=m
 +CONFIG_FW_LOADER_COMPRESS=y
 +CONFIG_FW_LOADER_COMPRESS_XZ=y
 +CONFIG_FW_LOADER_COMPRESS_ZSTD=y
-+CONFIG_EROFS_FS=m
-+CONFIG_EROFS_FS_XATTR=y
-+CONFIG_EROFS_POSIX_ACL=y
-+CONFIG_EROFS_FS_SECURITY=y
 -- 
-2.53.0
+2.39.0
 

SOURCES/bcm2711_selinux_config.patch

@@ -0,0 +1,118 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Pablo Greco <pgreco@centosproject.org>
+Date: Fri, 7 Aug 2020 02:59:05 +0000
+Subject: [PATCH 2/2] configs 2711
+
+---
+ arch/arm/configs/bcm2711_defconfig   | 35 +++++++++++++++++++++++++--
+ arch/arm64/configs/bcm2711_defconfig | 36 ++++++++++++++++++++++++++--
+ 2 files changed, 67 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
+index d31636c..28e0bbd 100644
+--- a/arch/arm/configs/bcm2711_defconfig
++++ b/arch/arm/configs/bcm2711_defconfig
+@@ -1556,8 +1556,6 @@ CONFIG_NLS_KOI8_R=m
+ CONFIG_NLS_KOI8_U=m
+ CONFIG_DLM=m
+ CONFIG_SECURITY=y
+-CONFIG_SECURITY_APPARMOR=y
+-CONFIG_LSM=""
+ CONFIG_CRYPTO_USER=m
+ CONFIG_CRYPTO_CAST5=m
+ CONFIG_CRYPTO_DES=y
+@@ -1595,3 +1593,38 @@ CONFIG_IRQSOFF_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
++CONFIG_NETFILTER_XT_TARGET_AUDIT=m
++CONFIG_IP_NF_SECURITY=m
++CONFIG_IP6_NF_SECURITY=m
++CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
++CONFIG_NFSD_V4_SECURITY_LABEL=y
++CONFIG_SECURITY_NETWORK=y
++CONFIG_SECURITY_PATH=y
++CONFIG_SECURITY_SELINUX=y
++CONFIG_SECURITY_SELINUX_BOOTPARAM=y
++CONFIG_SECURITY_SELINUX_DISABLE=y
++CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
++CONFIG_NET_TEAM=m
++CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
++CONFIG_NET_TEAM_MODE_BROADCAST=m
++CONFIG_NET_TEAM_MODE_LOADBALANCE=m
++CONFIG_NET_TEAM_MODE_RANDOM=m
++CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
++CONFIG_CRYPTO_BLAKE2S=m
++CONFIG_CRYPTO_CURVE25519=m
++CONFIG_CRYPTO_CURVE25519_NEON=m
++CONFIG_CRYPTO_LIB_BLAKE2S=m
++CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
++CONFIG_CRYPTO_LIB_CHACHA=m
++CONFIG_CRYPTO_LIB_CURVE25519=m
++CONFIG_CRYPTO_LIB_POLY1305=m
++CONFIG_CRYPTO_POLY1305_ARM=m
++# CONFIG_WIREGUARD_DEBUG is not set
++CONFIG_WIREGUARD=m
++CONFIG_FW_LOADER_COMPRESS=y
++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 55e6082..b9acdbc 100644
+--- a/arch/arm64/configs/bcm2711_defconfig
++++ b/arch/arm64/configs/bcm2711_defconfig
+@@ -1573,8 +1573,6 @@ CONFIG_NLS_KOI8_R=m
+ CONFIG_NLS_KOI8_U=m
+ CONFIG_DLM=m
+ CONFIG_SECURITY=y
+-CONFIG_SECURITY_APPARMOR=y
+-CONFIG_LSM=""
+ CONFIG_CRYPTO_USER=m
+ CONFIG_CRYPTO_CRYPTD=m
+ CONFIG_CRYPTO_AES=m
+@@ -1614,3 +1612,39 @@ CONFIG_IRQSOFF_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
++CONFIG_NETFILTER_XT_TARGET_AUDIT=m
++CONFIG_IP_NF_SECURITY=m
++CONFIG_IP6_NF_SECURITY=m
++CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
++CONFIG_NFSD_V4_SECURITY_LABEL=y
++CONFIG_SECURITY_NETWORK=y
++CONFIG_SECURITY_PATH=y
++CONFIG_SECURITY_SELINUX=y
++CONFIG_SECURITY_SELINUX_BOOTPARAM=y
++CONFIG_SECURITY_SELINUX_DISABLE=y
++CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
++CONFIG_NET_TEAM=m
++CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
++CONFIG_NET_TEAM_MODE_BROADCAST=m
++CONFIG_NET_TEAM_MODE_LOADBALANCE=m
++CONFIG_NET_TEAM_MODE_RANDOM=m
++CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
++CONFIG_CRYPTO_BLAKE2S=m
++CONFIG_CRYPTO_CURVE25519=m
++CONFIG_CRYPTO_LIB_BLAKE2S=m
++CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
++CONFIG_CRYPTO_LIB_CHACHA=m
++CONFIG_CRYPTO_LIB_CURVE25519=m
++CONFIG_CRYPTO_LIB_POLY1305=m
++CONFIG_CRYPTO_POLY1305_NEON=m
++# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
++# CONFIG_WIREGUARD_DEBUG is not set
++CONFIG_WIREGUARD=m
++CONFIG_BLK_DEV_RBD=m
++CONFIG_FW_LOADER_COMPRESS=y
++CONFIG_FW_LOADER_COMPRESS_XZ=y
++CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+-- 
+2.39.0
+

SOURCES/config_2712.patch

@@ -1,72 +0,0 @@
-From c79f1902314f6aca86f4df9bec6f203f6bdb1231 Mon Sep 17 00:00:00 2001
-From: Koichiro Iwao <meta@almalinux.org>
-Date: Tue, 31 Mar 2026 17:53:02 +0900
-Subject: [PATCH 2/2] Apply config patch for Raspberry Pi (BCM2712)
-
-The patch is originally provided by Pablo Greco <pgreco@centosproject.org>.
-
-Signed-off-by: Koichiro Iwao <meta@almalinux.org>
----
- arch/arm64/configs/bcm2712_defconfig | 42 ++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
-index 65e4f476536a..5530ed8c9dda 100644
---- a/arch/arm64/configs/bcm2712_defconfig
-+++ b/arch/arm64/configs/bcm2712_defconfig
-@@ -1716,8 +1716,6 @@ CONFIG_DLM=m
- CONFIG_UNICODE=m
- CONFIG_KEY_DH_OPERATIONS=y
- CONFIG_SECURITY=y
--CONFIG_SECURITY_APPARMOR=y
--CONFIG_LSM=""
- CONFIG_CRYPTO_USER=m
- CONFIG_CRYPTO_NULL=m
- CONFIG_CRYPTO_CRYPTD=m
-@@ -1764,3 +1762,43 @@ CONFIG_FTRACE_SYSCALLS=y
- CONFIG_BLK_DEV_IO_TRACE=y
- # CONFIG_UPROBE_EVENTS is not set
- # CONFIG_STRICT_DEVMEM is not set
-+
-+# CentOS/AlmaLinux added
-+CONFIG_AUDIT=y
-+CONFIG_NETLABEL=y
-+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-+CONFIG_IP_NF_SECURITY=m
-+CONFIG_IP6_NF_SECURITY=m
-+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-+CONFIG_NFSD_V4_SECURITY_LABEL=y
-+CONFIG_SECURITY_NETWORK=y
-+CONFIG_SECURITY_PATH=y
-+CONFIG_SECURITY_SELINUX=y
-+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-+CONFIG_SECURITY_SELINUX_DISABLE=y
-+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-+CONFIG_NET_TEAM=m
-+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-+CONFIG_NET_TEAM_MODE_BROADCAST=m
-+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-+CONFIG_NET_TEAM_MODE_RANDOM=m
-+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-+CONFIG_CRYPTO_BLAKE2S=m
-+CONFIG_CRYPTO_CURVE25519=m
-+CONFIG_CRYPTO_LIB_BLAKE2S=m
-+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-+CONFIG_CRYPTO_LIB_CHACHA=m
-+CONFIG_CRYPTO_LIB_CURVE25519=m
-+CONFIG_CRYPTO_LIB_POLY1305=m
-+CONFIG_CRYPTO_POLY1305_NEON=m
-+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
-+# CONFIG_WIREGUARD_DEBUG is not set
-+CONFIG_WIREGUARD=m
-+CONFIG_BLK_DEV_RBD=m
-+CONFIG_FW_LOADER_COMPRESS=y
-+CONFIG_FW_LOADER_COMPRESS_XZ=y
-+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
-+CONFIG_EROFS_FS=m
-+CONFIG_EROFS_FS_XATTR=y
-+CONFIG_EROFS_POSIX_ACL=y
-+CONFIG_EROFS_FS_SECURITY=y
--- 
-2.53.0
-

SOURCES/cpupower.config

@@ -1,3 +0,0 @@
-# See 'cpupower help' and cpupower(1) for more info
-CPUPOWER_START_OPTS="frequency-set -g ondemand"
-CPUPOWER_STOP_OPTS="frequency-set -g powersave"

SOURCES/cpupower.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Configure CPU power related settings
-After=syslog.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/etc/sysconfig/cpupower
-ExecStart=/usr/bin/cpupower $CPUPOWER_START_OPTS
-ExecStop=/usr/bin/cpupower $CPUPOWER_STOP_OPTS
-
-[Install]
-WantedBy=multi-user.target

SOURCES/kvm_stat.logrotate

@@ -1,11 +0,0 @@
-/var/log/kvm_stat.csv {
-	size 10M
-	missingok
-	compress
-	maxage 30
-	rotate 5
-	nodateext
-	postrotate
-		/usr/bin/systemctl try-restart kvm_stat.service
-	endscript
-}

SPECS/raspberrypi2.spec

@@ -1,76 +1,72 @@
-%global firmware_tag	1.20260408
-%global version_tag	f2f68e79f16fe405f43e957f5aac8ac6f400b112
+%global commit_firmware_long cb9500d6021e083a182ba168fe4424e3db2494cf
+%global commit_linux_long 4fc5a03ad1d2fb811d8652be67260312fa3125fc
 
-ExclusiveArch: aarch64
+ExclusiveArch: aarch64 armv7hl
 
 %undefine _debugsource_packages
 
+%ifarch aarch64
 %define Arch arm64
-%define build_image Image.gz
+%define build_image Image
 %define armtarget 8
-
-%define local_version v8
-%define bcmmodel 2711
-%define extra_version 1
-
-# This originally implies Kernel 4.x for RPi 2 and is not appropriate now.
-# Be careful to change this not to disturb the seamless package update.
-%define rpisuffix 2
-%define ksuffix 4
-
-%define kversion 6.18
-%define patchlevel 24
-
-%if 0%{?rhel} >= 10 || 0%{?fedora} >= 40
-%define pathfix %{__python3} %{_rpmconfigdir}/redhat/pathfix.py
+%define with_rpi4 1
 %else
-%define pathfix pathfix.py
+%define Arch arm
+%define build_image zImage
+%define armtarget 7
+%bcond_with rpi4
 %endif
 
-# standard kernel
-%define with_up        %{?_without_up:        0} %{?!_without_up:        1}
-# tools
-%define with_tools     %{?_without_tools:     0} %{?!_without_tools:     1}
-# firmware
-%define with_firmware  %{?_without_firmware:  0} %{?!_without_firmware:  1}
-# kernel-headers
-%define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
+%if %{with rpi4}
+%ifarch aarch64
+%define local_version v8
+%else
+%define local_version v7l
+%endif
+%define bcmmodel 2711
+%define ksuffix 4
+%else
+%define local_version v7
+%define bcmmodel 2709
+%endif
+%define extra_version 1
 
-Name:           raspberrypi%{rpisuffix}
+%define kversion 6.1
+%define patchlevel 31
+
+Name:           raspberrypi2
 Version:        %{kversion}.%{patchlevel}
-Release:        20260423.%{local_version}.%{extra_version}%{?dist}
+Release:        %{local_version}.%{extra_version}%{?dist}
 Summary:        Specific kernel and bootcode for Raspberry Pi
 
-License:        GPL-2.0 WITH Linux-syscall-note
+License:        GPLv2
 URL:            https://github.com/raspberrypi/linux
-Source0:        https://github.com/raspberrypi/linux/archive/%{version_tag}.tar.gz
-Source1:        https://github.com/raspberrypi/firmware/archive/refs/tags/%{firmware_tag}.tar.gz
-Patch100:       config_2711.patch
-Patch101:       config_2712.patch
-# Sources for kernel-tools
-Source2000:    cpupower.service
-Source2001:    cpupower.config
-Source2002:    kvm_stat.logrotate
-# AlmaLinux patches
-## CVE-2026-31431
-Patch1100:     1100-crypto-algif_aead-Revert-to-operating-out-of-place.patch
+Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{kversion}.tar.xz
+Source1:        https://github.com/raspberrypi/firmware/archive/%{commit_firmware_long}.tar.gz
+%if %{patchlevel} > 0
+Source2:        https://cdn.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
+%endif
+Source3:        rpi-6.1.x.patch
 
 BuildRequires: kmod, patch, bash, coreutils, tar
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk
-BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc
+BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, git
 BuildRequires: net-tools, hostname, bc
 BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python3-devel perl(ExtUtils::Embed) bison flex xz-devel
 BuildRequires: audit-libs-devel
 BuildRequires: pciutils-devel gettext ncurses-devel
 BuildRequires: openssl-devel
-%if %{with_tools}
-# kernel-tools
-BuildRequires: asciidoc
-%endif
-%if %{with_headers}
-BuildRequires: rsync
+%if 0%{?rhel} == 7
+BuildRequires:  devtoolset-8-build
+BuildRequires:  devtoolset-8-binutils
+BuildRequires:  devtoolset-8-gcc
+BuildRequires:  devtoolset-8-make
 %endif
 
+# Compile with SELinux but disable per default
+Patch100:       bcm2709_selinux_config.patch
+Patch101:       bcm2711_selinux_config.patch
+
 %description
 Specific kernel and bootcode for Raspberry Pi
 
@@ -78,128 +74,31 @@ Specific kernel and bootcode for Raspberry Pi
 Group:          System Environment/Kernel
 Summary:        The Linux kernel
 Provides:       kernel = %{version}-%{release}
-Provides:       kernel-core = %{version}-%{release}
-Provides:       installonlypkg(kernel)
-Requires:       coreutils
-Requires:       dracut
+Requires:	coreutils
+#Requires:	dracut
+
 %description kernel%{?ksuffix}
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
 of the operating system: memory allocation, process allocation, device
 input and output, etc.
 
+
 %package kernel%{?ksuffix}-devel
 Group:          System Environment/Kernel
 Summary:        Development package for building kernel modules to match the kernel
 Provides:       kernel-devel = %{version}-%{release}
 Provides:       kernel-devel-uname-r = %{version}-%{release}
-Provides:       installonlypkg(kernel)
 Autoreq:        no
 Requires(pre):  findutils
 Requires:       findutils
 Requires:       perl-interpreter
+
 %description kernel%{?ksuffix}-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%if 0%{?rhel} >= 10
-%package kernel%{?ksuffix}-modules
-Summary:        Pseudo package for kernel modules
-Group:          System Environment/Kernel
-Provides:       installonlypkg(kernel-module)
-Provides:       kernel-modules = %{version}-%{release}
-Provides:       kernel-modules-uname-r = %{version}-%{release}
-Obsoletes:      kernel-modules < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules packages.
 
-%package kernel%{?ksuffix}-modules-core
-Summary:        Pseudo package for core kernel modules
-Group:          System Environment/Kernel
-Provides:       installonlypkg(kernel-module)
-Provides:       kernel-modules-core = %{version}-%{release}
-Provides:       kernel-modules-core-uname-r = %{version}-%{release}
-Obsoletes:      kernel-modules-core < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules-core
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules-core packages.
-
-%package kernel%{?ksuffix}-modules-extra
-Summary:        Pseudo package for extra kernel modules
-Group:          System Environment/Kernel
-Provides:       kernel-modules-extra = %{version}-%{release}
-Provides:       kernel-modules-extra-uname-r = %{version}-%{release}
-Provides:       installonlypkg(kernel-module)
-Obsoletes:      kernel-modules-extra < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules-extra
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules-extra packages.
-
-%package kernel%{?ksuffix}-modules-extra-matched
-Summary:        Pseudo package for extra kernel modules
-Group:          System Environment/Kernel
-Provides:       kernel-modules-extra-matched = %{version}-%{release}
-Provides:       kernel-modules-extra-matched-uname-r = %{version}-%{release}
-Provides:       installonlypkg(kernel-module)
-Obsoletes:      kernel-modules-extra-matched < %{version}-%{release}
-Requires:       %{name}-kernel%{?ksuffix} = %{version}-%{release}
-AutoReq:        no
-AutoProv:       yes
-%description kernel%{?ksuffix}-modules-extra-matched
-This package provides pseudo dependency for the packages that depends on regular
-kernel-modules-extra-matched packages.
-%endif
-
-%if %{with_tools}
-%package kernel%{?ksuffix}-tools
-Summary: Assortment of tools for the Linux kernel
-Provides:  cpupowerutils = 1:009-0.6.p1
-Obsoletes: cpupowerutils < 1:009-0.6.p1
-Provides:  cpufreq-utils = 1:009-0.6.p1
-Provides:  cpufrequtils = 1:009-0.6.p1
-Obsoletes: cpufreq-utils < 1:009-0.6.p1
-Obsoletes: cpufrequtils < 1:009-0.6.p1
-Obsoletes: cpuspeed < 1:1.5-16
-Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release}
-Obsoletes: kernel-tools < %{version}
-Provides: kernel-tools = %{version}-%{release}
-%define __requires_exclude ^%{_bindir}/python
-%description kernel%{?ksuffix}-tools
-This package contains the tools/ directory from the kernel source
-and the supporting documentation.
-
-%package kernel%{?ksuffix}-tools-libs
-Summary: Libraries for the kernels-tools
-Obsoletes: kernel-tools-libs < %{version}
-Provides: kernel-tools-libs = %{version}-%{release}
-%description kernel%{?ksuffix}-tools-libs
-This package contains the libraries built from the tools/ directory
-from the kernel source.
-
-%package kernel%{?ksuffix}-tools-libs-devel
-Summary: Assortment of tools for the Linux kernel
-Requires: %{name}-kernel%{?ksuffix}-tools = %{version}-%{release}
-Provides:  cpupowerutils-devel = 1:009-0.6.p1
-Obsoletes: cpupowerutils-devel < 1:009-0.6.p1
-Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release}
-Obsoletes: kernel-tools-libs-devel < %{version}
-Provides: kernel-tools-libs-devel = %{version}-%{release}
-%description kernel%{?ksuffix}-tools-libs-devel
-This package contains the development files for the tools/ directory from
-the kernel source.
-%endif
-
-%if %{with_firmware}
 %package firmware
 Summary:        GPU firmware for the Raspberry Pi computer
 License:        Redistributable, with restrictions; see LICENSE.broadcom
@@ -211,84 +110,70 @@ Provides:        grubby=8.40-10
 %description firmware
 This package contains the GPU firmware for the Raspberry Pi BCM2835 SOC
 including the kernel bootloader.
-%endif
 
-%if %{with_headers}
-%package kernel%{?ksuffix}-headers
-Obsoletes: kernel-headers < %{version}
-Provides: kernel-headers = %{version}-%{release}
-Obsoletes: glibc-kernheaders < 3.0-46
-Provides: glibc-kernheaders = 3.0-46
-Summary: Header files for the Linux kernel for use by glibc
-
-%description kernel%{?ksuffix}-headers
-Kernel-headers includes the C header files that specify the interface
-between the Linux kernel and userspace libraries and programs.  The
-header files define structures and constants that are needed for
-building most standard programs and are also needed for rebuilding the
-glibc package.
-%endif
 
 %prep
-%setup -q -n linux-%{version_tag}
-%patch -P 100 -p1
-%patch -P 101 -p1
-%patch -P 1100 -p1
-perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile
-perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2711_defconfig
-perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2712_defconfig
+%if 0%{?rhel} == 7
+source scl_source enable devtoolset-8 || :
+%endif
+%setup -q -n linux-%{kversion}
+git init
+git config user.email "kernel-team@fedoraproject.org"
+git config user.name "Fedora Kernel Team"
+git config gc.auto 0
+git add .
+git commit -a -q -m "baseline"
+%if %{patchlevel} > 0
+xzcat %{SOURCE2} | patch -p1 -F1 -s
+git commit -a -q -m "%{version}"
+%endif
+git am %{SOURCE3}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28
+git am %{PATCH100}
+git am %{PATCH101}
+
+perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile
+perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm%{bcmmodel}_defconfig
+
+%if 0%{?rhel} >= 8
 # Mangle /usr/bin/python shebangs to /usr/bin/python3
 # Mangle all Python shebangs to be Python 3 explicitly
 # -p preserves timestamps
 # -n prevents creating ~backup files
 # -i specifies the interpreter for the shebang
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig scripts/bloat-o-meter scripts/show_delta \
-                                                  scripts/jobserver-exec scripts/dtc/dt-extract-compatibles
-%{pathfix} -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/kvm/kvm_stat/kvm_stat
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" scripts/diffconfig scripts/bloat-o-meter scripts/show_delta scripts/jobserver-exec
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" tools/ tools/perf/scripts/python/*.py tools/kvm/kvm_stat/kvm_stat scripts/clang-tools/*.py
 %endif
 
+# This Prevents scripts/setlocalversion from mucking with our version numbers.
+touch .scmversion
+git commit -a -q -m "modifs"
+
 %build
-# 16K page-size kernel optimized (bcmmodel=2712) for RPi 5 is not built at the moment
-# to support both RPi 4 and 5.
+%if 0%{?rhel} == 7
+source scl_source enable devtoolset-8 || :
+%endif
 export KERNEL=kernel%{armtarget}
 make bcm%{bcmmodel}_defconfig
-%if %{with_up}
 make %{?_smp_mflags} HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" %{build_image} modules dtbs
-%endif
-
-# kernel-tools
-%if %{with_tools}
-make %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false DEBUG=false
-pushd tools/thermal/tmon/
-make %{?_smp_mflags} HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" 
-popd
-pushd tools/iio/
-make %{?_smp_mflags} HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" 
-popd
-pushd tools/gpio/
-make %{?_smp_mflags} HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" 
-popd
-pushd tools/mm/
-make %{?_smp_mflags} HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" slabinfo page_owner_sort
-popd
-%endif
 
 %install
-%if %{with_up}
+%if 0%{?rhel} == 7
+source scl_source enable devtoolset-8 || :
+%endif
 # kernel
 mkdir -p %{buildroot}/boot/overlays/
-mkdir -p %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
+mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
 cp -p -v COPYING %{buildroot}/boot/COPYING.linux-%{kversion}
-cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
 %ifarch aarch64
-cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
 %else
-cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
+cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot
 %endif
-cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays
+#scripts/mkknlimg arch/%{Arch}/boot/zImage %{buildroot}/boot/kernel-%{version}-%{release}.img
 cp -p -v arch/%{Arch}/boot/%{build_image} %{buildroot}/boot/kernel-%{version}-%{release}.img
 make INSTALL_MOD_PATH=%{buildroot} modules_install
 cat > %{buildroot}/boot/config-kernel-%{version}-%{release}.inc <<__EOF__
@@ -335,86 +220,30 @@ touch -r %{buildroot}$DevelDir/Makefile %{buildroot}$DevelDir/include/linux/vers
 ln -T -s $DevelDir %{buildroot}/lib/modules/%{version}-%{release}/build --force
 ln -T -s build %{buildroot}/lib/modules/%{version}-%{release}/source --force
 
-%endif
+# kernel-firmware
+#rm .config
+#make INSTALL_FW_PATH=%{buildroot}/lib/firmware firmware_install
 
-%if %{with_firmware}
 # firmware
 #   precompiled GPU firmware and bootloader
 pushd %{buildroot}
-tar -xf %{_sourcedir}/%{firmware_tag}.tar.gz \
-    firmware-%{firmware_tag}/boot/start* \
-    firmware-%{firmware_tag}/boot/fixup* \
-    firmware-%{firmware_tag}/boot/LICENCE.broadcom \
-    firmware-%{firmware_tag}/boot/bootcode.bin \
+tar -xf %{_sourcedir}/%{commit_firmware_long}.tar.gz \
+    firmware-%{commit_firmware_long}/boot/start* \
+    firmware-%{commit_firmware_long}/boot/fixup* \
+    firmware-%{commit_firmware_long}/boot/LICENCE.broadcom \
+    firmware-%{commit_firmware_long}/boot/bootcode.bin \
     --strip-components=1
-%{__chmod} -x %{buildroot}/boot/start*.elf
 popd
-%endif
 
-%if %{with_tools}
-# kernel-tools
-make  -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
-rm -f %{buildroot}%{_libdir}/*.{a,la}
-%find_lang cpupower
-
-install -D -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
-install -D -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
-pushd tools/thermal/tmon
-make INSTALL_ROOT=%{buildroot} install
-popd
-pushd tools/iio
-make DESTDIR=%{buildroot} install
-popd
-pushd tools/gpio
-make DESTDIR=%{buildroot} install
-popd
-install -m644 -D %{SOURCE2002} %{buildroot}%{_sysconfdir}/logrotate.d/kvm_stat
-pushd tools/kvm/kvm_stat
-%{__make} INSTALL_ROOT=%{buildroot} install-tools
-%{__make} INSTALL_ROOT=%{buildroot} install-man
-install -m644 -D kvm_stat.service %{buildroot}%{_unitdir}/kvm_stat.service
-popd
-pushd tools/mm/
-install -m755 slabinfo %{buildroot}%{_bindir}/slabinfo
-install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
-popd
-%endif
-
-%if %{with_headers}
-%{__make} ARCH=%{Arch} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
-
-find %{buildroot}/usr/include \
-    \( -name .install -o -name .check -o \
-       -name ..install.cmd -o -name ..check.cmd \) -delete
-%endif
-
-%if %{with_tools}
-%post kernel%{?ksuffix}-tools
-%systemd_post cpupower.service
-
-%preun kernel%{?ksuffix}-tools
-%systemd_preun cpupower.service
-
-%postun kernel%{?ksuffix}-tools
-%systemd_postun cpupower.service
-
-%post kernel%{?ksuffix}-tools-libs
-/sbin/ldconfig
-
-%postun kernel%{?ksuffix}-tools-libs
-/sbin/ldconfig
-%endif
-
-%if %{with_up}
 %files kernel%{?ksuffix}
 %defattr(-,root,root,-)
 /lib/modules/%{version}-%{release}
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb
+/usr/share/%{name}-kernel/%{version}-%{release}
+/usr/share/%{name}-kernel/%{version}-%{release}/boot
+/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb
 /boot/config-%{version}-%{release}
 /boot/overlays/
-/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*
+/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*
 %attr(0755,root,root) /boot/kernel-%{version}-%{release}.img
 %ghost /boot/initramfs-%{version}-%{release}.img
 /boot/config-kernel-%{version}-%{release}.inc
@@ -422,45 +251,25 @@ find %{buildroot}/usr/include \
 
 
 %posttrans kernel%{?ksuffix}
-if [ -d /usr/lib/ostree-boot ]; then
-  mkdir -p /usr/lib/modules/%{version}-%{release}
-  pushd /usr/lib/ostree-boot
-  [ -e config-%{version}-%{release} ] && \
-    mv config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/
-  [ -e config-kernel-%{version}-%{release}.inc ] && \
-    mv config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/
-  [ -e initramfs-%{version}-%{release}.img ] && \ 
-    mv initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs
-  [ -e kernel-%{version}-%{release}.img ] && \
-    mv kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz
-  popd
-fi
-if [ -d /boot ]; then
-  if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
-      # if nothing exists, fall back to generating the file, but don't create it
-      # if we have moved to initramfs
-      cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
-  fi
-  cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/
-  cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
-  cp /usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays/README /boot/overlays/
-  cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
-
-  /usr/bin/dracut --no-hostonly /boot/initramfs-%{version}-%{release}.img %{version}-%{release}
-  cp /boot/initramfs-%{version}-%{release}.img /boot/initramfs%{armtarget}
+if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
+    # if nothing exists, fall back to generating the file, but don't create it
+    # if we have moved to initramfs
+    cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
 fi
+cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb /boot/
+cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/*.dtb* /boot/overlays/
+cp /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/README /boot/overlays/
+/usr/bin/dracut /boot/initramfs-%{version}-%{release}.img %{version}-%{release}
+cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc
 
 %postun kernel%{?ksuffix}
-if [ -f /boot/kernel%{armtarget}.img ]; then
+if [ -f /boot/kernel%{armtarget}.img ];then
     #only restore kernel%{armtarget}.img if it exists, we may have moved to initramfs
     cp $(ls -1 /boot/kernel-*-*|sort -V|tail -1) /boot/kernel%{armtarget}.img
 fi
-if [ -f /boot/initramfs%{armtarget} ]; then
-    cp $(ls -1 /boot/initramfs-*-*|sort -V| tail -1) /boot/initramfs%{armtarget}
-fi
-cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
-cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
-cp $(ls -1d /usr/share/%{name}-kernel%{?ksuffix}/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/*.dtb /boot/
+cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/
+cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/
 cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 
 
@@ -468,160 +277,20 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %defattr(-,root,root)
 /usr/src/kernels/%{version}-%{release}
 
-%if 0%{?rhel} >= 10
-%files kernel%{?ksuffix}-modules
-# empty package
-%defattr(-,root,root)
 
-%files kernel%{?ksuffix}-modules-core
-# empty package
-%defattr(-,root,root)
+#%files kernel-firmware
+#%defattr(-,root,root)
+#/lib/firmware/*
 
-%files kernel%{?ksuffix}-modules-extra
-# empty package
-%defattr(-,root,root)
 
-%files kernel%{?ksuffix}-modules-extra-matched
-# empty package
-%defattr(-,root,root)
-%endif
-%endif
-
-%if %{with_tools}
-%files kernel%{?ksuffix}-tools -f cpupower.lang
-%{_bindir}/cpupower
-%{_datadir}/bash-completion/completions/cpupower
-%{_unitdir}/cpupower.service
-%{_mandir}/man[1-8]/cpupower*
-%{_libexecdir}/cpupower
-%config(noreplace) %{_sysconfdir}/cpupower-service.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/cpupower
-%{_bindir}/tmon
-%{_bindir}/iio_event_monitor
-%{_bindir}/iio_generic_buffer
-%{_bindir}/lsiio
-%{_bindir}/lsgpio
-%{_bindir}/gpio-hammer
-%{_bindir}/gpio-event-mon
-%{_bindir}/gpio-watch
-%{_mandir}/man1/kvm_stat*
-%{_bindir}/kvm_stat
-%{_unitdir}/kvm_stat.service
-%config(noreplace) %{_sysconfdir}/logrotate.d/kvm_stat
-%{_bindir}/page_owner_sort
-%{_bindir}/slabinfo
-
-%files kernel%{?ksuffix}-tools-libs
-%{_libdir}/libcpupower.so.1
-%{_libdir}/libcpupower.so.1.0.1
-
-%files kernel%{?ksuffix}-tools-libs-devel
-%{_libdir}/libcpupower.so
-%{_includedir}/cpufreq.h
-%{_includedir}/cpuidle.h
-%{_includedir}/powercap.h
-%endif
-
-%if %{with_firmware}
 %files firmware
 %defattr(-,root,root,-)
 /boot/bootcode.bin
 /boot/fixup*
 /boot/start*
 %doc /boot/LICENCE.broadcom
-%endif
-
-%if %{with_headers}
-%files kernel%{?ksuffix}-headers
-/usr/include/*
-%exclude %{_includedir}/cpufreq.h
-%exclude %{_includedir}/internal/
-%exclude %{_includedir}/perf/
-%endif
 
 %changelog
-* Thu Apr 30 2026 Koichiro Iwao <meta@almalinux.org> - 6.18.24-20260423.v8.1
-- Update kernel to v6.18.24 f2f68e79
-- Update firmware to 1.20260408
-- Apply fix for CVE-2026-31431 Copy Fail
-
-* Wed Apr 01 2026 Koichiro Iwao <meta@almalinux.org> - 6.18.20-20260329.v8.1
-- Update kernel to v6.18.20 21da81b5
-
-* Mon Mar 02 2026 Koichiro Iwao <meta@almalinux.org> - 6.12.47-20250916.v8.2
-- Add a pseudo subpackage -modules-extra-matched to resolve dependency issue
-
-* Fri Oct 03 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.47-20250916.v8.1
-- Update kernel to v6.12.47 stable_20250916
-- Make it buildable on Fedora
-
-* Wed Sep 24 2025 Ryosuke Nakayama <ryosuke_666@icloud.com> - 6.12.34-20250702.v8.2
-- Update firmware to 1.20250915
-
-* Wed Jul 09 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.34-20250702.v8.1
-- Update kernel to v6.12.34 stable_20240702
-
-* Mon Jun 23 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.25-20250428.v8.2
-- Reintroduce initramfs for XFS / LUKS
-  https://github.com/AlmaLinux/raspberry-pi/issues/65
-  https://github.com/AlmaLinux/raspberry-pi/issues/86 
-
-* Mon May 26 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.25-20250428.v8.1
-- Update kernel to v6.12.25 stable_20250428
-- Update firmware to 1.20250430
-- Regenerate patches
-- Use the consistent directory under /usr/share with the package name
-- Enable EROFS bootc container (contributed by Kevin Fox)
-- Fixes to enable bootc (contributed by Kevin Fox)
-
-* Mon Jan 27 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.1-20241206.v8.2
-- Add pseudo subpackages for kernel modules to resolve dependency issue
-- The main kernel package now provides kernel-core
-- Convert license to SPDX expression 
-- Remove dracut as initramfs is not needed (mentioned in 4.4.21-2)
-
-* Wed Dec 25 2024 Koichiro Iwao <meta@almalinux.org> - 6.12.1-20241206.v8.1
-- Update kernel to v6.12.1 rpi-6.12.y_20241206_2
-- Update firmware to 1.20241126
-
-* Tue Nov 12 2024 Koichiro Iwao <meta@almalinux.org> - 6.12.0-20241111.v8.1
-- Update kernel to v6.12.0-rc7 20241110 bf70ebd2
-
-* Tue Nov 12 2024 Koichiro Iwao <meta@almalinux.org> - 6.11.7-20241110.v8.1
-- Update kernel to v6.11.7 20241110 efda653d
-
-* Fri Nov 08 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.51-20241008.v8.2
-- Fix build for AL10 Kitten
-
-* Mon Oct 21 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.51-20241008.v8.1
-- Update kernel to version v6.6.51 stable_20241008
-- Update firmware to 1.20241008
-
-* Thu Sep 05 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.4
-- Add kernel-headers subpackage
-
-* Fri Aug 30 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6.6.31-20240529.v8.3
-- Fix kernel-tools dependencies
-
-* Thu Jun 20 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.2
-- Add kernel-tools to optimize CPU clock (cpupower.service)
-
-* Mon Jun 10 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.1
-- Update to v6.6.31 stable_20240529
-
-* Tue Jun 04 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.28-20240423.v8.2
-- Add installonlypkg(kernel) to kernel and -devel subpackages 
-  Resolves: https://github.com/AlmaLinux/raspberry-pi/issues/39
-  See also: https://src.fedoraproject.org/rpms/kernel/c/aba3940
-
-* Thu May 30 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.28-20240423.v8.1
-- Update to version v6.6.28
-- Support both Raspberry Pi 4 and 5
-- Refine package based on Linux for Raspberry Pi (raspberrypi/linux)
-- Generate gzip compressed kernel image
-- Drop armv7hl support
-- Drop EL7 support
-
 * Sun Jun 04 2023 Pablo Greco <pgreco@centosproject.org> - 6.1.31
 - Update to version v6.1.31