tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kbuild: move init/build-version to scripts/

At first, I thought this script would be needed only in init/Makefile.

However, commit 5db8face97f8 ("kbuild: Restore .version auto-increment
behaviour for Debian packages") and commit 1789fc912541 ("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>

Masahiro Yamada ae4c4cee 9b114520

+3 -3
+1 -1
init/Makefile
··· 52 52 # Build version-timestamp.c with final UTS_VERSION 53 53 # 54 54 55 - include/generated/utsversion.h: build-version-auto = $(shell $(src)/build-version) 55 + include/generated/utsversion.h: build-version-auto = $(shell $(srctree)/scripts/build-version) 56 56 include/generated/utsversion.h: build-timestamp-auto = $(shell LC_ALL=C date) 57 57 include/generated/utsversion.h: FORCE 58 58 $(call filechk,uts_version)
init/build-version scripts/build-version
+1 -1
scripts/package/mkdebian
··· 150 150 if [ -n "$KDEB_PKGVERSION" ]; then 151 151 packageversion=$KDEB_PKGVERSION 152 152 else 153 - packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/init/build-version) 153 + packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/scripts/build-version) 154 154 fi 155 155 sourcename=${KDEB_SOURCENAME:-linux-upstream} 156 156
+1 -1
scripts/package/mkspec
··· 24 24 cat<<EOF 25 25 %define ARCH ${ARCH} 26 26 %define KERNELRELEASE ${KERNELRELEASE} 27 - %define pkg_release $("${srctree}/init/build-version") 27 + %define pkg_release $("${srctree}/scripts/build-version") 28 28 EOF 29 29 30 30 cat "${srctree}/scripts/package/kernel.spec"