[PATCH] kbuild: move init/build-version to scripts/

[PATCH] kbuild: move init/build-version to scripts/

[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 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>
---

 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%)

diff --git a/init/Makefile b/init/Makefile
index ab71cedc5fd6..10b652d33e87 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -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)
diff --git a/init/build-version b/scripts/build-version
similarity index 100%
rename from init/build-version
rename to scripts/build-version
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 070149c985fe..b9a5b789c655 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -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}
 
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index ce201bfa8377..cffc2567bef2 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -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"
-- 
2.43.0

Re: [PATCH] kbuild: move init/build-version to scripts/

[Nathan Chancellor]

On Wed, Jun 12, 2024 at 03:24:47AM +0900, Masahiro Yamada wrote:
> 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.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
> 
>  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%)
> 
> diff --git a/init/Makefile b/init/Makefile
> index ab71cedc5fd6..10b652d33e87 100644
> --- a/init/Makefile
> +++ b/init/Makefile
> @@ -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)
> diff --git a/init/build-version b/scripts/build-version
> similarity index 100%
> rename from init/build-version
> rename to scripts/build-version
> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index 070149c985fe..b9a5b789c655 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -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}
>  
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index ce201bfa8377..cffc2567bef2 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -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"
> -- 
> 2.43.0
>