From 9820b4550af4547b62e6952add806b8e48a0f0db Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Fri, 28 Mar 2025 17:52:28 +0900 Subject: [PATCH 1/5] Use the consistent directory under /usr/share with the package name --- SPECS/raspberrypi2.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index d457098..9f65035 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -211,15 +211,15 @@ popd %if %{with_up} # kernel mkdir -p %{buildroot}/boot/overlays/ -mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays +mkdir -p %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{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/%{version}-%{release}/boot/overlays +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/%{version}-%{release}/boot +cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot %else -cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot +cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot %endif -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/*.dtb* %{buildroot}/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/overlays 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__ @@ -340,12 +340,12 @@ find %{buildroot}/usr/include \ %files kernel%{?ksuffix} %defattr(-,root,root,-) /lib/modules/%{version}-%{release} -/usr/share/%{name}-kernel/%{version}-%{release} -/usr/share/%{name}-kernel/%{version}-%{release}/boot -/usr/share/%{name}-kernel/%{version}-%{release}/boot/*.dtb +/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release} +/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot +/usr/share/%{name}-kernel%{?ksuffix}/%{version}-%{release}/boot/*.dtb /boot/config-%{version}-%{release} /boot/overlays/ -/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/* +/usr/share/%{name}-kernel%{?ksuffix}/%{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 @@ -358,9 +358,9 @@ if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then # 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/ +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 %postun kernel%{?ksuffix} @@ -368,9 +368,9 @@ 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 -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 -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 -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc From 49f7d4205e7616bae5ffb3aadd02dadd8ff1e468 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Tue, 1 Apr 2025 15:56:09 +0900 Subject: [PATCH 2/5] Enable EROFS --- SOURCES/config_2711.patch | 6 +++++- SOURCES/config_2712.patch | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SOURCES/config_2711.patch b/SOURCES/config_2711.patch index 7ca65b8..08e3474 100644 --- a/SOURCES/config_2711.patch +++ b/SOURCES/config_2711.patch @@ -23,7 +23,7 @@ index e87791286ab4..6fda5b261683 100644 CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AES=m -@@ -1674,3 +1672,39 @@ CONFIG_SCHED_TRACER=y +@@ -1674,3 +1672,43 @@ CONFIG_SCHED_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set @@ -63,6 +63,10 @@ index e87791286ab4..6fda5b261683 100644 +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.45.1 diff --git a/SOURCES/config_2712.patch b/SOURCES/config_2712.patch index 39c7248..7134e24 100644 --- a/SOURCES/config_2712.patch +++ b/SOURCES/config_2712.patch @@ -23,7 +23,7 @@ index 79c4332581eb..7b63683ff687 100644 CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AES=m -@@ -1677,3 +1675,39 @@ CONFIG_SCHED_TRACER=y +@@ -1677,3 +1675,43 @@ CONFIG_SCHED_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set @@ -63,6 +63,10 @@ index 79c4332581eb..7b63683ff687 100644 +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.45.1 From 0a27438f03d9e17a738246bf27fb915c385de135 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Tue, 1 Apr 2025 15:57:10 +0900 Subject: [PATCH 3/5] Fixes to enable bootc Signed-off-by: Kevin Fox --- SPECS/raspberrypi2.spec | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 9f65035..5038845 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -353,15 +353,24 @@ find %{buildroot}/usr/include \ %posttrans kernel%{?ksuffix} -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 +if [ -d /usr/lib/ostree-boot ]; then + mkdir -p /usr/lib/modules/%{version}-%{release} + mv /usr/lib/ostree-boot/config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/ + mv /usr/lib/ostree-boot/config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/ + mv /usr/lib/ostree-boot/initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs + mv /usr/lib/ostree-boot/kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz +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/%{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/ + cp /boot/config-kernel-%{version}-%{release}.inc /boot/config-kernel.inc 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 %postun kernel%{?ksuffix} if [ -f /boot/kernel%{armtarget}.img ];then From b560a57125388c3e664f0d7c583c5e10a4fe47a9 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Tue, 1 Apr 2025 15:57:10 +0900 Subject: [PATCH 4/5] Add existence checks before moving bootc related files --- SPECS/raspberrypi2.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 5038845..d56bd48 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -355,10 +355,16 @@ find %{buildroot}/usr/include \ %posttrans kernel%{?ksuffix} if [ -d /usr/lib/ostree-boot ]; then mkdir -p /usr/lib/modules/%{version}-%{release} - mv /usr/lib/ostree-boot/config-%{version}-%{release} /usr/lib/modules/%{version}-%{release}/ - mv /usr/lib/ostree-boot/config-kernel-%{version}-%{release}.inc /usr/lib/modules/%{version}-%{release}/ - mv /usr/lib/ostree-boot/initramfs-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/initramfs - mv /usr/lib/ostree-boot/kernel-%{version}-%{release}.img /usr/lib/modules/%{version}-%{release}/vmlinuz + 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 From 863a2f1858bd220c4603e80231bce1efc02dfed8 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Mon, 14 Apr 2025 17:54:35 +0900 Subject: [PATCH 5/5] Bump package version and update changelog --- SPECS/raspberrypi2.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index d56bd48..56837ab 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -11,7 +11,7 @@ ExclusiveArch: aarch64 %define local_version v8 %define bcmmodel 2711 -%define extra_version 1 +%define extra_version 2 # 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. @@ -445,6 +445,11 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc %endif %changelog +* Mon Apr 14 2025 Koichiro Iwao - 6.6.74-20250127.v8.2 +- Fixes to enable bootc +- Enable EROFS +- Use the consistent directory under /usr/share with the package name + * Thu Feb 20 2025 Koichiro Iwao - 6.6.74-20250127.v8.1 - Update kernel to v6.6.74 stable_20250127 - Update firmware to 1.20250127