[15/19] kbuild: rpm-pkg: split out the body of spec file

Message ID	20230722044806.3867434-15-masahiroy@kernel.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-kbuild-owner@vger.kernel.org> From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu> Subject: [PATCH 15/19] kbuild: rpm-pkg: split out the body of spec file Date: Sat, 22 Jul 2023 13:48:02 +0900 Message-Id: <20230722044806.3867434-15-masahiroy@kernel.org> In-Reply-To: <20230722044806.3867434-1-masahiroy@kernel.org> References: <20230722044806.3867434-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/19] kbuild: rpm-pkg: define _arch conditionally \| expand [01/19] kbuild: rpm-pkg: define _arch conditionally [02/19] kbuild: rpm-pkg: remove unneeded '-f $srctree/Makefile' in spec file [03/19] kbuild: rpm-pkg: do not hard-code $MAKE in spec file [04/19] kbuild: rpm-pkg: use %{makeflags} to pass common Make options [05/19] kbuild: rpm-pkg: record ARCH option in spec file [06/19] kbuild: rpm-pkg: replace $__KERNELRELEASE in spec file with %{version} [07/19] kbuild: rpm-pkg: replace $KERNELRELEASE in spec file with %{KERNELRELEASE} [08/19] kbuild: add a phony target to run a command with Kbuild env vars [09/19] kbuild: refactor kernel-devel RPM package and linux-headers Deb package [10/19] kbuild: rpm-pkg: derive the Version from %{KERNELRELEASE} [11/19] kbuild: rpm-pkg: use a dummy string for _arch when undefined [12/19] kbuild: rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkg [13/19] kbuild: rpm-pkg: run modules_install for non-modular kernel [14/19] kbuild: rpm-pkg: introduce %{with_devel} switch to select devel package [15/19] kbuild: rpm-pkg: split out the body of spec file [16/19] kbuild: rpm-pkg: rename binkernel.spec to kernel.spec [17/19] kbuild: rpm-pkg: build the kernel in-place for rpm-pkg [18/19] kbuild: rpm-pkg: refactor *rpm-pkg targets [19/19] kbuild: rpm-pkg: skip build dependency check on non-rpm systems

diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec new file mode 100644 index 000000000000..ac3f2ee6d7a0 --- /dev/null +++ b/scripts/package/kernel.spec @@ -0,0 +1,117 @@ +# _arch is undefined if /usr/lib/rpm/platform/*/macros was not included. +%{!?_arch: %define _arch dummy} +%{!?make: %define make make} +%define makeflags %{?_smp_mflags} ARCH=%{ARCH} +%define __spec_install_post /usr/lib/rpm/brp-compress || : +%define debug_package %{nil} + +Name: kernel +Summary: The Linux Kernel +Version: %(echo %{KERNELRELEASE} | sed -e 's/-/_/g') +Release: %{pkg_release} +License: GPL +Group: System Environment/Kernel +Vendor: The Linux Community +URL: https://www.kernel.org +Source0: linux.tar.gz +Source1: config +Source2: diff.patch +Provides: kernel-%{KERNELRELEASE} +BuildRequires: bc binutils bison dwarves +BuildRequires: (elfutils-libelf-devel or libelf-devel) flex +BuildRequires: gcc make openssl openssl-devel perl python3 rsync + +%description +The Linux Kernel, the operating system core itself + +%package headers +Summary: Header files for the Linux kernel for use by glibc +Group: Development/System +Obsoletes: kernel-headers +Provides: kernel-headers = %{version} +%description headers +Kernel-headers includes the C header files that specify the interface +between the Linux kernel and userspace libraries and programs. The +header files define structures and constants that are needed for +building most standard programs and are also needed for rebuilding the +glibc package. + +%if %{with_devel} +%package devel +Summary: Development package for building kernel modules to match the %{version} kernel +Group: System Environment/Kernel +AutoReqProv: no +%description -n kernel-devel +This package provides kernel headers and makefiles sufficient to build modules +against the %{version} kernel package. +%endif + +%prep +%setup -q -n linux +cp %{SOURCE1} .config +patch -p1 < %{SOURCE2} + +%build +%{make} %{makeflags} KERNELRELEASE=%{KERNELRELEASE} KBUILD_BUILD_VERSION=%{release} + +%install +mkdir -p %{buildroot}/boot +%ifarch ia64 +mkdir -p %{buildroot}/boot/efi +cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/efi/vmlinuz-%{KERNELRELEASE} +ln -s efi/vmlinuz-%{KERNELRELEASE} %{buildroot}/boot/ +%else +cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE} +%endif +%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install +%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install +cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE} +cp .config %{buildroot}/boot/config-%{KERNELRELEASE} +ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build +ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source +%if %{with_devel} +%{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' +%endif + +%clean +rm -rf %{buildroot} + +%post +if [ -x /sbin/installkernel -a -r /boot/vmlinuz-%{KERNELRELEASE} -a -r /boot/System.map-%{KERNELRELEASE} ]; then +cp /boot/vmlinuz-%{KERNELRELEASE} /boot/.vmlinuz-%{KERNELRELEASE}-rpm +cp /boot/System.map-%{KERNELRELEASE} /boot/.System.map-%{KERNELRELEASE}-rpm +rm -f /boot/vmlinuz-%{KERNELRELEASE} /boot/System.map-%{KERNELRELEASE} +/sbin/installkernel %{KERNELRELEASE} /boot/.vmlinuz-%{KERNELRELEASE}-rpm /boot/.System.map-%{KERNELRELEASE}-rpm +rm -f /boot/.vmlinuz-%{KERNELRELEASE}-rpm /boot/.System.map-%{KERNELRELEASE}-rpm +fi + +%preun +if [ -x /sbin/new-kernel-pkg ]; then +new-kernel-pkg --remove %{KERNELRELEASE} --rminitrd --initrdfile=/boot/initramfs-%{KERNELRELEASE}.img +elif [ -x /usr/bin/kernel-install ]; then +kernel-install remove %{KERNELRELEASE} +fi + +%postun +if [ -x /sbin/update-bootloader ]; then +/sbin/update-bootloader --remove %{KERNELRELEASE} +fi + +%files +%defattr (-, root, root) +/lib/modules/%{KERNELRELEASE} +%exclude /lib/modules/%{KERNELRELEASE}/build +%exclude /lib/modules/%{KERNELRELEASE}/source +/boot/* + +%files headers +%defattr (-, root, root) +/usr/include + +%if %{with_devel} +%files devel +%defattr (-, root, root) +/usr/src/kernels/%{KERNELRELEASE} +/lib/modules/%{KERNELRELEASE}/build +/lib/modules/%{KERNELRELEASE}/source +%endif diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 511cae46a90d..c08567ae7fb1 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -23,127 +23,10 @@ else echo '%define with_devel 0' fi -cat<<-EOF +cat<<EOF %define ARCH ${ARCH} %define KERNELRELEASE ${KERNELRELEASE} %define pkg_release $("${srctree}/init/build-version") - -# _arch is undefined if /usr/lib/rpm/platform/*/macros was not included. -%{!?_arch: %define _arch dummy} -%{!?make: %define make make} -%define makeflags %{?_smp_mflags} ARCH=%{ARCH} - - Name: kernel - Summary: The Linux Kernel - Version: %(echo %{KERNELRELEASE} | sed -e 's/-/_/g') - Release: %{pkg_release} - License: GPL - Group: System Environment/Kernel - Vendor: The Linux Community - URL: https://www.kernel.org - Source0: linux.tar.gz - Source1: config - Source2: diff.patch - Provides: kernel-%{KERNELRELEASE} - BuildRequires: bc binutils bison dwarves - BuildRequires: (elfutils-libelf-devel or libelf-devel) flex - BuildRequires: gcc make openssl openssl-devel perl python3 rsync - - %define __spec_install_post /usr/lib/rpm/brp-compress || : - %define debug_package %{nil} - - %description - The Linux Kernel, the operating system core itself - - %package headers - Summary: Header files for the Linux kernel for use by glibc - Group: Development/System - Obsoletes: kernel-headers - Provides: kernel-headers = %{version} - %description headers - Kernel-headers includes the C header files that specify the interface - between the Linux kernel and userspace libraries and programs. The - header files define structures and constants that are needed for - building most standard programs and are also needed for rebuilding the - glibc package. - - %if %{with_devel} - %package devel - Summary: Development package for building kernel modules to match the %{version} kernel - Group: System Environment/Kernel - AutoReqProv: no - %description -n kernel-devel - This package provides kernel headers and makefiles sufficient to build modules - against the %{version} kernel package. - %endif - - %prep - %setup -q -n linux - cp %{SOURCE1} .config - patch -p1 < %{SOURCE2} - - %build - %{make} %{makeflags} KERNELRELEASE=%{KERNELRELEASE} KBUILD_BUILD_VERSION=%{release} - - %install - mkdir -p %{buildroot}/boot - %ifarch ia64 - mkdir -p %{buildroot}/boot/efi - cp \$(%{make} %{makeflags} -s image_name) %{buildroot}/boot/efi/vmlinuz-%{KERNELRELEASE} - ln -s efi/vmlinuz-%{KERNELRELEASE} %{buildroot}/boot/ - %else - cp \$(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE} - %endif - %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install - %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install - cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE} - cp .config %{buildroot}/boot/config-%{KERNELRELEASE} - ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build - ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source - %if %{with_devel} - %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='\${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' - %endif - - %clean - rm -rf %{buildroot} - - %post - if [ -x /sbin/installkernel -a -r /boot/vmlinuz-%{KERNELRELEASE} -a -r /boot/System.map-%{KERNELRELEASE} ]; then - cp /boot/vmlinuz-%{KERNELRELEASE} /boot/.vmlinuz-%{KERNELRELEASE}-rpm - cp /boot/System.map-%{KERNELRELEASE} /boot/.System.map-%{KERNELRELEASE}-rpm - rm -f /boot/vmlinuz-%{KERNELRELEASE} /boot/System.map-%{KERNELRELEASE} - /sbin/installkernel %{KERNELRELEASE} /boot/.vmlinuz-%{KERNELRELEASE}-rpm /boot/.System.map-%{KERNELRELEASE}-rpm - rm -f /boot/.vmlinuz-%{KERNELRELEASE}-rpm /boot/.System.map-%{KERNELRELEASE}-rpm - fi - - %preun - if [ -x /sbin/new-kernel-pkg ]; then - new-kernel-pkg --remove %{KERNELRELEASE} --rminitrd --initrdfile=/boot/initramfs-%{KERNELRELEASE}.img - elif [ -x /usr/bin/kernel-install ]; then - kernel-install remove %{KERNELRELEASE} - fi - - %postun - if [ -x /sbin/update-bootloader ]; then - /sbin/update-bootloader --remove %{KERNELRELEASE} - fi - - %files - %defattr (-, root, root) - /lib/modules/%{KERNELRELEASE} - %exclude /lib/modules/%{KERNELRELEASE}/build - %exclude /lib/modules/%{KERNELRELEASE}/source - /boot/* - - %files headers - %defattr (-, root, root) - /usr/include - - %if %{with_devel} - %files devel - %defattr (-, root, root) - /usr/src/kernels/%{KERNELRELEASE} - /lib/modules/%{KERNELRELEASE}/build - /lib/modules/%{KERNELRELEASE}/source - %endif EOF + +cat "${srctree}/scripts/package/kernel.spec"

[15/19] kbuild: rpm-pkg: split out the body of spec file

Commit Message

Patch