Paul Bolle schreef op za 17-04-2021 om 00:36 [+0200]:
> I'll file this under "fun thing to look into on a rainy day or - more likely
> this spring - a night locked into my home for no obvious benefit".
It's way too late over here, but I think what's going on is that each
architecture's kernel-cross-headers file ships its OWN kernel-headers six
times. That's, well, rather odd.
For instance for powerpc I get:
rpm -qpl kernel-cross-headers-5.12.0-0.rc7.git0.1.fc35.ppc64le.rpm | grep
arm-linux-gnu | wc -l
975
[...]
rpm -qpl kernel-cross-headers-5.12.0-0.rc7.git0.1.fc35.ppc64le.rpm | grep
x86-linux-gnu | wc -l
975
While the source tarball shows:
tar tf kernel-headers-5.12.0-0.rc7.git0.1.tar.xz | grep arch-powerpc | wc
-l
976
(One off for some leading directory or so.)
This quick hack pushes things in the direction of sanity (first part is
kernel-headers, second part is kernel-cross-headers):
diff --git a/kernel-headers.spec b/kernel-headers.spec
index 46c9f293f458..d4f9e21a28b3 100644
--- a/kernel-headers.spec
+++ b/kernel-headers.spec
@@ -142,21 +142,15 @@ esac
cd arch-$ARCH/include
mkdir -p $RPM_BUILD_ROOT%{_includedir}
-cp -a asm-generic $RPM_BUILD_ROOT%{_includedir}
-
-# Copy all the architectures we care about to their respective asm directories
-for arch in $ARCH_LIST; do
- mkdir -p $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/include
- cp -a asm-generic $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/include/
-done
+cp -a * $RPM_BUILD_ROOT%{_includedir}/
-# Remove what we copied already
-rm -rf asm-generic
+cd ../..
-# Copy the rest of the headers over
-cp -a * $RPM_BUILD_ROOT%{_includedir}/
for arch in $ARCH_LIST; do
-cp -a * $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/include/
+ cd arch-${arch}
+ mkdir -p $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/
+ cp -a include $RPM_BUILD_ROOT%{_prefix}/${arch}-linux-gnu/
+ cd ..
done
%files
Thanks,
Paul Bolle
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/[email protected]
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
