mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 06:01:57 +00:00
kbuild: move init/build-version to scripts/
At first, I thought this script would be needed only in init/Makefile. However, commit5db8face97
("kbuild: Restore .version auto-increment behaviour for Debian packages") and commit1789fc9125
("kbuild: rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkg") revealed that it was actually needed for scripts/package/mk* as well. After all, scripts/ is a better place for it. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
This commit is contained in:
parent
9b11452083
commit
ae4c4cee81
@ -52,7 +52,7 @@ CFLAGS_version.o := -include $(obj)/utsversion-tmp.h
|
||||
# Build version-timestamp.c with final UTS_VERSION
|
||||
#
|
||||
|
||||
include/generated/utsversion.h: build-version-auto = $(shell $(src)/build-version)
|
||||
include/generated/utsversion.h: build-version-auto = $(shell $(srctree)/scripts/build-version)
|
||||
include/generated/utsversion.h: build-timestamp-auto = $(shell LC_ALL=C date)
|
||||
include/generated/utsversion.h: FORCE
|
||||
$(call filechk,uts_version)
|
||||
|
@ -150,7 +150,7 @@ version=$KERNELRELEASE
|
||||
if [ -n "$KDEB_PKGVERSION" ]; then
|
||||
packageversion=$KDEB_PKGVERSION
|
||||
else
|
||||
packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/init/build-version)
|
||||
packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/scripts/build-version)
|
||||
fi
|
||||
sourcename=${KDEB_SOURCENAME:-linux-upstream}
|
||||
|
||||
|
@ -24,7 +24,7 @@ fi
|
||||
cat<<EOF
|
||||
%define ARCH ${ARCH}
|
||||
%define KERNELRELEASE ${KERNELRELEASE}
|
||||
%define pkg_release $("${srctree}/init/build-version")
|
||||
%define pkg_release $("${srctree}/scripts/build-version")
|
||||
EOF
|
||||
|
||||
cat "${srctree}/scripts/package/kernel.spec"
|
||||
|
Loading…
Reference in New Issue
Block a user