kbuild: move init/build-version to scripts/
PATCH 1/1 kbuild: move init/build-version to scripts/
At first, I thought this script would be used 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.
---
init/Makefile | 2 +-
{init => scripts}/build-version | 0
scripts/package/mkdebian | 2 +-
scripts/package/mkspec | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename {init => scripts}/build-version (100%)init/Makefile +1 -1
@@ -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)
scripts/build-version renamed from init/build-version +0 -0
scripts/package/mkdebian +1 -1
@@ -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}
scripts/package/mkspec +1 -1
@@ -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"
Signature · 1 line
2.43.0
Quoted 10 lines · Masahiro Yamada
At first, I thought this script would be used only in init/Makefile.
However, commit
5db8face97f8("kbuild: Restore .version auto-increment behaviour for Debian packages") and commit1789fc912541("kbuild:
rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkg") revealed that it was actually needed forscripts/package/mk*as well.After all,
scripts/is a better place for it.Signed-off-by Masahiro Yamada <[email protected]>
Quoted 55 lines
---
init/Makefile | 2 +- {init => scripts}/build-version | 0 scripts/package/mkdebian | 2 +- scripts/package/mkspec | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {init => scripts}/build-version (100%)init/Makefile +1
-1@@ -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)scripts/build-version renamed from init/build-version +0
-0scripts/package/mkdebian +1
-1@@ -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}scripts/package/mkspec +1
-1@@ -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"Signature · 1 line
2.43.0