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,43 @@ 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
@@ -63,10 +63,6 @@ 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
 

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,43 @@ 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
@@ -63,10 +63,6 @@ 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
 

SPECS/raspberrypi2.spec

@@ -353,30 +353,15 @@ find %{buildroot}/usr/include \
 
 
 %posttrans kernel%{?ksuffix}
-if [ -d /usr/lib/ostree-boot ]; then
+if [ -f /boot/kernel%{armtarget}.img ] || [ ! -f /boot/config-kernel.inc ];then
-  mkdir -p /usr/lib/modules/%{version}-%{release}
+    # if nothing exists, fall back to generating the file, but don't create it
-  pushd /usr/lib/ostree-boot
+    # if we have moved to initramfs
-  [ -e config-%{version}-%{release} ] && \
+    cp /boot/kernel-%{version}-%{release}.img /boot/kernel%{armtarget}.img
-    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%{?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