Skip to contentSkip to conversation

kbuild: make binrpm-pkg always produce kernel-devel package

PATCH In review Masahiro Yamada 2 participants 2 messages Oct 1, 2023 – Oct 2, 2023 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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'

---

 scripts/Makefile.package | 2 --
 1 file changed, 2 deletions(-)
scripts/Makefile.package +0 -2
index 05b8c3e29aac..3addd1c0b989 100644
@@ -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
Signature · 1 line
2.39.2
maintainer Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 9 lines · Masahiro Yamada

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.

Quoted 6 lines

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

  $ make binrpm-pkg RPMOPTS='--without devel'
Quoted 21 lines

---

 scripts/Makefile.package | 2 --
 1 file changed, 2 deletions(-)
scripts/Makefile.package +0 -2
index 05b8c3e29aac..3addd1c0b989 100644
@@ -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
Signature · 1 line
2.39.2