kbuild: deb-pkg: remove "version" variable in mkdebian

[PATCH] kbuild: deb-pkg: remove "version" variable in mkdebian

Posted by Masahiro Yamada 9 months, 1 week ago

${version} and ${KERNELRELEASE} are the same.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/package/mkdebian | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 80ed96561993..6685d13737c1 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -163,7 +163,6 @@ while [ $# -gt 0 ]; do
 done
 
 # Some variables and settings used throughout the script
-version=$KERNELRELEASE
 if [ "${KDEB_PKGVERSION:+set}" ]; then
 	packageversion=$KDEB_PKGVERSION
 else
@@ -222,11 +221,11 @@ Build-Depends-Arch: bc, bison, flex,
  python3:native, rsync
 Homepage: https://www.kernel.org/
 
-Package: $packagename-$version
+Package: $packagename-${KERNELRELEASE}
 Architecture: $debarch
-Description: Linux kernel, version $version
+Description: Linux kernel, version ${KERNELRELEASE}
  This package contains the Linux kernel, modules and corresponding other
- files, version: $version.
+ files, version: ${KERNELRELEASE}.
 EOF
 
 if [ "${SRCARCH}" != um ]; then
@@ -245,11 +244,11 @@ EOF
 if is_enabled CONFIG_MODULES; then
 cat <<EOF >> debian/control
 
-Package: linux-headers-$version
+Package: linux-headers-${KERNELRELEASE}
 Architecture: $debarch
 Build-Profiles: <!pkg.${sourcename}.nokernelheaders>
-Description: Linux kernel headers for $version on $debarch
- This package provides kernel header files for $version on $debarch
+Description: Linux kernel headers for ${KERNELRELEASE} on $debarch
+ This package provides kernel header files for ${KERNELRELEASE} on $debarch
  .
  This is useful for people who need to build external modules
 EOF
@@ -259,11 +258,11 @@ fi
 if is_enabled CONFIG_DEBUG_INFO; then
 cat <<EOF >> debian/control
 
-Package: linux-image-$version-dbg
+Package: linux-image-${KERNELRELEASE}-dbg
 Section: debug
 Architecture: $debarch
 Build-Profiles: <!pkg.${sourcename}.nokerneldbg>
-Description: Linux kernel debugging symbols for $version
+Description: Linux kernel debugging symbols for ${KERNELRELEASE}
  This package will come in handy if you need to debug the kernel. It provides
  all the necessary debug symbols for the kernel and its modules.
 EOF
-- 
2.43.0

Re: [PATCH] kbuild: deb-pkg: remove "version" variable in mkdebian

Posted by Nathan Chancellor 9 months, 1 week ago

On Wed, Mar 12, 2025 at 04:02:24AM +0900, Masahiro Yamada wrote:
> ${version} and ${KERNELRELEASE} are the same.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Always love less indirection.

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

> ---
> 
>  scripts/package/mkdebian | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index 80ed96561993..6685d13737c1 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -163,7 +163,6 @@ while [ $# -gt 0 ]; do
>  done
>  
>  # Some variables and settings used throughout the script
> -version=$KERNELRELEASE
>  if [ "${KDEB_PKGVERSION:+set}" ]; then
>  	packageversion=$KDEB_PKGVERSION
>  else
> @@ -222,11 +221,11 @@ Build-Depends-Arch: bc, bison, flex,
>   python3:native, rsync
>  Homepage: https://www.kernel.org/
>  
> -Package: $packagename-$version
> +Package: $packagename-${KERNELRELEASE}
>  Architecture: $debarch
> -Description: Linux kernel, version $version
> +Description: Linux kernel, version ${KERNELRELEASE}
>   This package contains the Linux kernel, modules and corresponding other
> - files, version: $version.
> + files, version: ${KERNELRELEASE}.
>  EOF
>  
>  if [ "${SRCARCH}" != um ]; then
> @@ -245,11 +244,11 @@ EOF
>  if is_enabled CONFIG_MODULES; then
>  cat <<EOF >> debian/control
>  
> -Package: linux-headers-$version
> +Package: linux-headers-${KERNELRELEASE}
>  Architecture: $debarch
>  Build-Profiles: <!pkg.${sourcename}.nokernelheaders>
> -Description: Linux kernel headers for $version on $debarch
> - This package provides kernel header files for $version on $debarch
> +Description: Linux kernel headers for ${KERNELRELEASE} on $debarch
> + This package provides kernel header files for ${KERNELRELEASE} on $debarch
>   .
>   This is useful for people who need to build external modules
>  EOF
> @@ -259,11 +258,11 @@ fi
>  if is_enabled CONFIG_DEBUG_INFO; then
>  cat <<EOF >> debian/control
>  
> -Package: linux-image-$version-dbg
> +Package: linux-image-${KERNELRELEASE}-dbg
>  Section: debug
>  Architecture: $debarch
>  Build-Profiles: <!pkg.${sourcename}.nokerneldbg>
> -Description: Linux kernel debugging symbols for $version
> +Description: Linux kernel debugging symbols for ${KERNELRELEASE}
>   This package will come in handy if you need to debug the kernel. It provides
>   all the necessary debug symbols for the kernel and its modules.
>  EOF
> -- 
> 2.43.0
>