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 diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index d457098..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. @@ -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 @@ -353,24 +353,39 @@ 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} + 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/%{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/%{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 %postun kernel%{?ksuffix} 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 @@ -430,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