Skip to contentSkip to conversation

scripts/package: binrpm-pkg do not create source and devel package v3

PATCH In review [email protected] 2 participants 3 messages Dec 2, 2014 – Dec 4, 2014 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/package: binrpm-pkg do not create source and devel package v3

From: Jérôme Glisse <[email protected]>

When doing make binrpm-pkg we only want to build the binary and header package as the documentation of binrpm-pkg target claims. Hence this patch avoid building the source and devel package. This makes binrpm-pkg target lot faster and way more usefull.

Changed since v2 :
- Avoid symlinks in /usr/src/kernel.
- Update subject line and changelog.

Changed since v1 :
- Avoid building the devel package too.

---
 scripts/package/mkspec | 4 ++++
 1 file changed, 4 insertions(+)
scripts/package/mkspec +4 -0
index 1395760..010653c 100755
@@ -119,11 +119,13 @@ echo "%endif"
 
 echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
+if ! $PREBUILT; then
 echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
 echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
 echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
+fi
 
 echo ""
 echo "%clean"
@@ -151,9 +153,11 @@ echo "%files headers"
 echo '%defattr (-, root, root)'
 echo "/usr/include"
 echo ""
+if ! $PREBUILT; then
 echo "%files devel"
 echo '%defattr (-, root, root)'
 echo "/usr/src/kernels/$KERNELRELEASE"
 echo "/lib/modules/$KERNELRELEASE/build"
 echo "/lib/modules/$KERNELRELEASE/source"
 echo ""
+fi
Signature · 1 line
1.9.3
#1 lore raw
Quoted 7 lines · On Tue, Dec 02, 2014 at 03:45:59PM -0500, [email protected] wrote:

From: Jérôme Glisse <[email protected]>

When doing make binrpm-pkg we only want to build the binary and header package as the documentation of binrpm-pkg target claims. Hence this patch avoid building the source and devel package. This makes binrpm-pkg target lot faster and way more usefull.

Quoted 8 lines

Changed since v2 :
- Avoid symlinks in /usr/src/kernel.
- Update subject line and changelog.

Changed since v1 :
- Avoid building the devel package too.

Drop your cc while updating commit log

Quoted 37 lines
---
 scripts/package/mkspec | 4 ++++
 1 file changed, 4 insertions(+)
scripts/package/mkspec +4 -0
index 1395760..010653c 100755
@@ -119,11 +119,13 @@ echo "%endif"
 
 echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
+if ! $PREBUILT; then
 echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
 echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
 echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
+fi
 
 echo ""
 echo "%clean"
@@ -151,9 +153,11 @@ echo "%files headers"
 echo '%defattr (-, root, root)'
 echo "/usr/include"
 echo ""
+if ! $PREBUILT; then
 echo "%files devel"
 echo '%defattr (-, root, root)'
 echo "/usr/src/kernels/$KERNELRELEASE"
 echo "/lib/modules/$KERNELRELEASE/build"
 echo "/lib/modules/$KERNELRELEASE/source"
 echo ""
+fi
Signature · 1 line
1.9.3
#2 lore raw
In reply to [email protected]
Quoted 10 lines · On 2014-12-02 21:45, [email protected] wrote:

From: Jérôme Glisse <[email protected]>

When doing make binrpm-pkg we only want to build the binary and header package as the documentation of binrpm-pkg target claims. Hence this patch avoid building the source and devel package. This makes binrpm-pkg target lot faster and way more usefull.

Changed since v2 :
- Avoid symlinks in /usr/src/kernel.
- Update subject line and changelog.

Thanks, much better!

Quoted 2 lines

echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}" echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"

One last nitpick, then I'll merge the patch (promise!) -- the /usr/src/kernels/$KERNELRELEASE directory is not needed and in fact the rm -f above is also irrelevant. So please wrap the whole block in if ! $PREBUILT.

Thanks,
Michal