2014-10-31 19:05:51

by Jerome Glisse

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

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.

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

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 1395760..b6f5e31 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -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"
--
1.9.3

2014-11-08 01:33:29

by Jerome Glisse

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

On Fri, Oct 31, 2014 at 03:05:31PM -0400, [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.
>
> Signed-off-by: J?r?me Glisse <[email protected]>
> Cc: [email protected]
> Cc: Michal Marek <[email protected]>
> Cc: Linus Torvalds <[email protected]>

Anyone ? Bueller ?

> ---
> scripts/package/mkspec | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index 1395760..b6f5e31 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -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"
> --
> 1.9.3
>

2014-11-27 14:33:45

by Michal Marek

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

On 2014-10-31 20:05, [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.
>
> Signed-off-by: Jérôme Glisse <[email protected]>
> Cc: [email protected]
> Cc: Michal Marek <[email protected]>
> Cc: Linus Torvalds <[email protected]>
> ---
> scripts/package/mkspec | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index 1395760..b6f5e31 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -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

This does not generate any tar file, but a /usr/src/kernels/... tree to
be packaged in the kernel-devel package. I'm not says we should be doing
this in make binrpm-pkg, but the change should also remove the
kernel-devel package in the binrpm-pkg case.

Michal

2014-12-01 21:11:21

by Jerome Glisse

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

On Thu, Nov 27, 2014 at 03:33:41PM +0100, Michal Marek wrote:
> On 2014-10-31 20:05, [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.
> >
> > Signed-off-by: J?r?me Glisse <[email protected]>
> > Cc: [email protected]
> > Cc: Michal Marek <[email protected]>
> > Cc: Linus Torvalds <[email protected]>
> > ---
> > scripts/package/mkspec | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> > index 1395760..b6f5e31 100755
> > --- a/scripts/package/mkspec
> > +++ b/scripts/package/mkspec
> > @@ -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
>
> This does not generate any tar file, but a /usr/src/kernels/... tree to
> be packaged in the kernel-devel package. I'm not says we should be doing
> this in make binrpm-pkg, but the change should also remove the
> kernel-devel package in the binrpm-pkg case.

Sent a v2 that also avoid building the devel package for binrpm-pkg target.

Cheers,
J?r?me

>
> Michal