mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 17:23:55 +08:00
kbuild: rpm-pkg: fix version number handling
The "Release:" field of the spec file is determined based on the .version file. However, the .version file is not copied to the source tar file. So, when we build the kernel from the source package, the UTS_VERSION always indicates #1. This does not match with "rpm -q". The kernel UTS_VERSION and "rpm -q" do not agree for binrpm-pkg, either. Please note the kernel has already been built before the spec file is created. Currently, mkspec invokes mkversion. This script returns an incremented version. So, the "Release:" field of the spec file is greater than the version in the kernel by one. For the source package build (where .version file is missing), we can give KBUILD_BUILD_VERSION=%{release} to the build command. For the binary package build, we can simply read out the .version file because it contains the version number that was used for building the kernel image. We can remove scripts/mkversion because scripts/package/Makefile need not touch the .version file. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
cc18abbe44
commit
25b080bd53
@ -1,6 +0,0 @@
|
||||
if [ ! -f .version ]
|
||||
then
|
||||
echo 1
|
||||
else
|
||||
expr 0`cat .version` + 1
|
||||
fi
|
@ -50,8 +50,6 @@ rpm-pkg rpm: FORCE
|
||||
$(MAKE) clean
|
||||
$(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
|
||||
$(call cmd,src_tar,$(KERNELPATH),kernel.spec)
|
||||
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
|
||||
mv -f $(objtree)/.tmp_version $(objtree)/.version
|
||||
rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz
|
||||
rm $(KERNELPATH).tar.gz kernel.spec
|
||||
|
||||
@ -60,9 +58,6 @@ rpm-pkg rpm: FORCE
|
||||
binrpm-pkg: FORCE
|
||||
$(MAKE) KBUILD_SRC=
|
||||
$(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
|
||||
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
|
||||
mv -f $(objtree)/.tmp_version $(objtree)/.version
|
||||
|
||||
rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
|
||||
$(UTS_MACHINE) -bb $(objtree)/binkernel.spec
|
||||
rm binkernel.spec
|
||||
|
@ -27,9 +27,7 @@ __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 "Release: $(cat .version 2>/dev/null || echo 1)"
|
||||
echo "License: GPL"
|
||||
echo "Group: System Environment/Kernel"
|
||||
echo "Vendor: The Linux Community"
|
||||
@ -77,7 +75,7 @@ fi
|
||||
echo "%build"
|
||||
|
||||
if ! $PREBUILT; then
|
||||
echo "make clean && make %{?_smp_mflags}"
|
||||
echo "make clean && make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user