From 70be9a2d2999f169828711dcd30b351d3ee7f393 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Tue, 1 Apr 2025 15:57:10 +0900 Subject: [PATCH] Fixes to enable bootc Signed-off-by: Kevin Fox --- SPECS/raspberrypi2.spec | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 9f65035..d56bd48 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -353,15 +353,30 @@ 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%{?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