Commit 2a291fc3 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: rpm-pkg: introduce %{with_devel} switch to select devel package 



scripts/package/mkspec preprocesses the spec file by sed, but it is
unreadable. This commit removes the last portion of the sed scripting.

Remove the $S$M prefixes from the conditionally generated lines.
Instead, surround the code with %if %{with_devel} ... %endif.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent b537925f

scripts/Makefile.package

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ binrpm-pkg: 
	$(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec

	$(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec

	+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \

	+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \

		$(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec \

		$(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec \

		--build-in-place --noprep --define='_smp_mflags %{nil}' \

		--build-in-place --noprep --define='_smp_mflags %{nil}' --without devel \

		--define='make $(MAKE)'

		--define='make $(MAKE)'





# deb-pkg srcdeb-pkg bindeb-pkg

# deb-pkg srcdeb-pkg bindeb-pkg

scripts/package/mkspec

+25 −28
Original line number Original line Diff line number Diff line
@@ -10,11 +10,7 @@ 
#

#





# how we were called determines which rpms we build and how we build them

# how we were called determines which rpms we build and how we build them

if [ "$1" = prebuilt ]; then

if [ -z "$1" ]; then

	S=DEL

else

	S=



	mkdir -p rpmbuild/SOURCES

	mkdir -p rpmbuild/SOURCES

	cp linux.tar.gz rpmbuild/SOURCES

	cp linux.tar.gz rpmbuild/SOURCES

	cp "${KCONFIG_CONFIG}" rpmbuild/SOURCES/config

	cp "${KCONFIG_CONFIG}" rpmbuild/SOURCES/config
@@ -22,17 +18,12 @@ else 
fi

fi





if grep -q CONFIG_MODULES=y include/config/auto.conf; then

if grep -q CONFIG_MODULES=y include/config/auto.conf; then

	M=

echo '%define with_devel %{?_without_devel: 0} %{?!_without_devel: 1}'

else

else

	M=DEL

echo '%define with_devel 0'

fi

fi





# We can label the here-doc lines for conditional output to the spec file

cat<<-EOF

#

# Labels:

#  $S: this line is enabled only when building source package

#  $M: this line is enabled only when CONFIG_MODULES is enabled

sed -e '/^DEL/d' -e 's/^\t*//' <<EOF

%define ARCH ${ARCH}

%define ARCH ${ARCH}

%define KERNELRELEASE ${KERNELRELEASE}

%define KERNELRELEASE ${KERNELRELEASE}

%define pkg_release $("${srctree}/init/build-version")

%define pkg_release $("${srctree}/init/build-version")
@@ -76,14 +67,16 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF 
	building most standard programs and are also needed for rebuilding the

	building most standard programs and are also needed for rebuilding the

	glibc package.

	glibc package.





$S$M	%package devel

	%if %{with_devel}

$S$M	Summary: Development package for building kernel modules to match the %{version} kernel

	%package devel

$S$M	Group: System Environment/Kernel

	Summary: Development package for building kernel modules to match the %{version} kernel

$S$M	AutoReqProv: no

	Group: System Environment/Kernel

$S$M	%description -n kernel-devel

	AutoReqProv: no

$S$M	This package provides kernel headers and makefiles sufficient to build modules

	%description -n kernel-devel

$S$M	against the %{version} kernel package.

	This package provides kernel headers and makefiles sufficient to build modules

$S$M

	against the %{version} kernel package.

	%endif



	%prep

	%prep

	%setup -q -n linux

	%setup -q -n linux

	cp %{SOURCE1} .config

	cp %{SOURCE1} .config
@@ -107,7 +100,9 @@ $S$M 
	cp .config %{buildroot}/boot/config-%{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}/build

	ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source

	ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source

$S$M	%{make} %{makeflags} run-command KBUILD_RUN_COMMAND='\${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'

	%if %{with_devel}

	%{make} %{makeflags} run-command KBUILD_RUN_COMMAND='\${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'

	%endif





	%clean

	%clean

	rm -rf %{buildroot}

	rm -rf %{buildroot}
@@ -143,10 +138,12 @@ $S$M %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='\${srctree}/scripts/pa 
	%files headers

	%files headers

	%defattr (-, root, root)

	%defattr (-, root, root)

	/usr/include

	/usr/include

$S$M



$S$M	%files devel

	%if %{with_devel}

$S$M	%defattr (-, root, root)

	%files devel

$S$M	/usr/src/kernels/%{KERNELRELEASE}

	%defattr (-, root, root)

$S$M	/lib/modules/%{KERNELRELEASE}/build

	/usr/src/kernels/%{KERNELRELEASE}

$S$M	/lib/modules/%{KERNELRELEASE}/source

	/lib/modules/%{KERNELRELEASE}/build

	/lib/modules/%{KERNELRELEASE}/source

	%endif

EOF
 
EOF