Skip to contentSkip to conversation

scripts/package: binrpm-pkg do not build source tar file v2

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/package: binrpm-pkg do not build source tar file v2

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

When doing make binrpm-pkg we do not want to build the source tar file. This patch avoid doing the gigantic tar file.

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..31b7b7f 100755
@@ -119,8 +119,10 @@ 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 -)"
+fi
 echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
@@ -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.8.3.1
#1 lore raw
Quoted 4 lines · On 2014-12-01 21:57, [email protected] wrote:

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

When doing make binrpm-pkg we do not want to build the source tar file. This patch avoid doing the gigantic tar file.

Can you also update the changelog and subject? There is no gigantic tar file.

scripts/package/mkspec echo "%endif" · line 128

Quoted 10 lines

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

scripts/package/mkspec +2 -0
+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 -)"
+fi
 echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"

The /usr/src/kernels/... directory and the build and source symlinks are not needed either, if we are not building the -devel package.

Michal