2023-10-01 12:38:35

by Masahiro Yamada

Subject: [PATCH] kbuild: make binrpm-pkg always produce kernel-devel package

The generation of the kernel-devel package is disabled for binrpm-pkg
presumably because it was quite big (>= 200MB) and took a long time to
package.

Commit fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package and
linux-headers Deb package") reduced the package size to 12MB, and now
it is quick to build. It won't hurt to have binrpm-pkg generate it by
default.

If you want to skip the kernel-devel package generation, you can pass
RPMOPTS='--without devel':

$ make binrpm-pkg RPMOPTS='--without devel'

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/Makefile.package | 2 --
1 file changed, 2 deletions(-)

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index 05b8c3e29aac..3addd1c0b989 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -94,8 +94,6 @@ rpm-pkg srcrpm-pkg binrpm-pkg: rpmbuild/SPECS/kernel.spec
$(if $(filter a b, $(build-type)), \
--target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \
$$(rpm -q rpm >/dev/null 2>&1 || echo --nodeps)) \
- $(if $(filter b, $(build-type)), \
- --without devel) \
$(RPMOPTS))

# deb-pkg srcdeb-pkg bindeb-pkg
--
2.39.2

2023-10-02 23:16:16

by Nathan Chancellor

Subject: Re: [PATCH] kbuild: make binrpm-pkg always produce kernel-devel package

On Sun, Oct 01, 2023 at 09:38:22PM +0900, Masahiro Yamada wrote:
> The generation of the kernel-devel package is disabled for binrpm-pkg
> presumably because it was quite big (>= 200MB) and took a long time to
> package.
>
> Commit fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package and
> linux-headers Deb package") reduced the package size to 12MB, and now
> it is quick to build. It won't hurt to have binrpm-pkg generate it by
> default.
>
> If you want to skip the kernel-devel package generation, you can pass
> RPMOPTS='--without devel':
>
> $ make binrpm-pkg RPMOPTS='--without devel'
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>
Tested-by: Nathan Chancellor <[email protected]>

> ---
>
> scripts/Makefile.package | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index 05b8c3e29aac..3addd1c0b989 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -94,8 +94,6 @@ rpm-pkg srcrpm-pkg binrpm-pkg: rpmbuild/SPECS/kernel.spec
> $(if $(filter a b, $(build-type)), \
> --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \
> $$(rpm -q rpm >/dev/null 2>&1 || echo --nodeps)) \
> - $(if $(filter b, $(build-type)), \
> - --without devel) \
> $(RPMOPTS))
>
> # deb-pkg srcdeb-pkg bindeb-pkg
> --
> 2.39.2
>