commit c8b08ca558c0067bc9e15ce3f1e70af260410bb2 upstream.
mkspec is copying built kernel to temporrary location
/boot/vmlinuz-$KERNELRELEASE-rpm
and runs installkernel on it. This however directly leads to grub2
menuentry for this suffixed binary being generated as well during the run
of installkernel script.
Later in the process the temporary -rpm suffixed files are removed, and
therefore we end up with spurious (and non-functional) grub2 menu entries
for each installed kernel RPM.
Fix that by using a different temporary name (prefixed by '.'), so that
the binary is not recognized as an actual kernel binary and no menuentry
is created for it.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Fixes: 3c9c7a14b6
("rpm-pkg: add %post section to create initramfs and grub hooks")
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
160 lines
5.4 KiB
Bash
Executable file
160 lines
5.4 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Output a simple RPM spec file.
|
|
# This version assumes a minimum of RPM 4.0.3.
|
|
#
|
|
# The only gothic bit here is redefining install_post to avoid
|
|
# stripping the symbols from files in the kernel which we want
|
|
#
|
|
# Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
|
|
#
|
|
|
|
# how we were called determines which rpms we build and how we build them
|
|
if [ "$1" = "prebuilt" ]; then
|
|
PREBUILT=true
|
|
else
|
|
PREBUILT=false
|
|
fi
|
|
|
|
# starting to output the spec
|
|
if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
|
|
PROVIDES=kernel-drm
|
|
fi
|
|
|
|
PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
|
|
__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`
|
|
|
|
echo "Name: kernel"
|
|
echo "Summary: The Linux Kernel"
|
|
echo "Version: $__KERNELRELEASE"
|
|
# we need to determine the NEXT version number so that uname and
|
|
# rpm -q will agree
|
|
echo "Release: `. $srctree/scripts/mkversion`"
|
|
echo "License: GPL"
|
|
echo "Group: System Environment/Kernel"
|
|
echo "Vendor: The Linux Community"
|
|
echo "URL: http://www.kernel.org"
|
|
|
|
if ! $PREBUILT; then
|
|
echo "Source: kernel-$__KERNELRELEASE.tar.gz"
|
|
fi
|
|
|
|
echo "BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root"
|
|
echo "Provides: $PROVIDES"
|
|
echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :"
|
|
echo "%define debug_package %{nil}"
|
|
echo ""
|
|
echo "%description"
|
|
echo "The Linux Kernel, the operating system core itself"
|
|
echo ""
|
|
echo "%package headers"
|
|
echo "Summary: Header files for the Linux kernel for use by glibc"
|
|
echo "Group: Development/System"
|
|
echo "Obsoletes: kernel-headers"
|
|
echo "Provides: kernel-headers = %{version}"
|
|
echo "%description headers"
|
|
echo "Kernel-headers includes the C header files that specify the interface"
|
|
echo "between the Linux kernel and userspace libraries and programs. The"
|
|
echo "header files define structures and constants that are needed for"
|
|
echo "building most standard programs and are also needed for rebuilding the"
|
|
echo "glibc package."
|
|
echo ""
|
|
echo "%package devel"
|
|
echo "Summary: Development package for building kernel modules to match the $__KERNELRELEASE kernel"
|
|
echo "Group: System Environment/Kernel"
|
|
echo "AutoReqProv: no"
|
|
echo "%description -n kernel-devel"
|
|
echo "This package provides kernel headers and makefiles sufficient to build modules"
|
|
echo "against the $__KERNELRELEASE kernel package."
|
|
echo ""
|
|
|
|
if ! $PREBUILT; then
|
|
echo "%prep"
|
|
echo "%setup -q"
|
|
echo ""
|
|
fi
|
|
|
|
echo "%build"
|
|
|
|
if ! $PREBUILT; then
|
|
echo "make clean && make %{?_smp_mflags}"
|
|
echo ""
|
|
fi
|
|
|
|
echo "%install"
|
|
echo 'KBUILD_IMAGE=$(make image_name)'
|
|
echo "%ifarch ia64"
|
|
echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'
|
|
echo "%else"
|
|
echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
|
|
echo "%endif"
|
|
echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
|
|
|
|
echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'
|
|
echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
|
|
echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install
|
|
echo "%ifarch ia64"
|
|
echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
|
|
echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
|
|
echo "%else"
|
|
echo "%ifarch ppc64"
|
|
echo "cp vmlinux arch/powerpc/boot"
|
|
echo "cp arch/powerpc/boot/"'$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
|
|
echo "%else"
|
|
echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
|
|
echo "%endif"
|
|
echo "%endif"
|
|
|
|
echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install'
|
|
echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
|
|
|
|
echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
|
|
|
|
echo "%ifnarch ppc64"
|
|
echo 'bzip2 -9 --keep vmlinux'
|
|
echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
|
|
echo "%endif"
|
|
|
|
if ! $PREBUILT; then
|
|
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
|
|
echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
|
|
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 -)"
|
|
echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
|
|
echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
|
|
echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
|
|
fi
|
|
|
|
echo ""
|
|
echo "%clean"
|
|
echo 'rm -rf $RPM_BUILD_ROOT'
|
|
echo ""
|
|
echo "%post"
|
|
echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
|
|
echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/.vmlinuz-$KERNELRELEASE-rpm"
|
|
echo "cp /boot/System.map-$KERNELRELEASE /boot/.System.map-$KERNELRELEASE-rpm"
|
|
echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
|
|
echo "/sbin/installkernel $KERNELRELEASE /boot/.vmlinuz-$KERNELRELEASE-rpm /boot/.System.map-$KERNELRELEASE-rpm"
|
|
echo "rm -f /boot/.vmlinuz-$KERNELRELEASE-rpm /boot/.System.map-$KERNELRELEASE-rpm"
|
|
echo "fi"
|
|
echo ""
|
|
echo "%files"
|
|
echo '%defattr (-, root, root)'
|
|
echo "/lib/modules/$KERNELRELEASE"
|
|
echo "%exclude /lib/modules/$KERNELRELEASE/build"
|
|
echo "%exclude /lib/modules/$KERNELRELEASE/source"
|
|
echo "/lib/firmware/$KERNELRELEASE"
|
|
echo "/boot/*"
|
|
echo ""
|
|
echo "%files headers"
|
|
echo '%defattr (-, root, root)'
|
|
echo "/usr/include"
|
|
echo ""
|
|
if ! $PREBUILT; then
|
|
echo "%files devel"
|
|
echo '%defattr (-, root, root)'
|
|
echo "/usr/src/kernels/$KERNELRELEASE"
|
|
echo "/lib/modules/$KERNELRELEASE/build"
|
|
echo "/lib/modules/$KERNELRELEASE/source"
|
|
echo ""
|
|
fi
|