2014-12-04 15:53:26

by Jerome Glisse

Subject: [PATCH] scripts/package: binrpm-pkg do not build source tar file v4

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 v3 :
- Avoid creating /usr/src/kernels directory.
- Avoid useless pre clean step of source and devel package.

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

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

Signed-off-by: Jérôme Glisse <[email protected]>
Cc: Michal Marek <[email protected]>
---
scripts/package/mkspec | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 1395760..d9ab94b 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -117,6 +117,7 @@ echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
echo 'mv vmlinux.orig vmlinux'
echo "%endif"

+if ! $PREBUILT; then
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
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\""
@@ -124,6 +125,7 @@ echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNEL
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
--
1.8.3.1

2014-12-08 12:14:29

by Michal Marek

Subject: Re: [PATCH] scripts/package: binrpm-pkg do not build source tar file v4

Dne 4.12.2014 v 16:53 [email protected] napsal(a):
> 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 v3 :
> - Avoid creating /usr/src/kernels directory.
> - Avoid useless pre clean step of source and devel package.
>
> Changed since v2 :
> - Avoid symlinks in /usr/src/kernel.
> - Update subject line and changelog.
>
> Changed since v1 :
> - Avoid building the devel package too.
>
> Signed-off-by: Jérôme Glisse <[email protected]>

Thanks, applied to kbuild.git#misc. I just used the subject line from
v3, since it seems you accidentally reverted to that from v2.

Michal