From 6185d32170b683abadddf1e68be998e24f3cc5de Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sat, 30 Dec 2023 22:51:58 +0900
Subject: [PATCH] kbuild: deb-pkg: use debian/<package> for tmpdir
Use debian/<package> for tmpdir, which is the default of debhelper.
This simplifies the code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
---
scripts/package/builddeb | 41 ++++++++++++----------------------------
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 842ee4b405285..bf96a3c246081 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -25,9 +25,7 @@ if_enabled_echo() {
}
create_package() {
- local pname="$1" pdir="$2"
-
- export DH_OPTIONS="-p${pname} -P${pdir}"
+ export DH_OPTIONS="-p${1}"
dh_installdocs
dh_installchangelogs
@@ -39,8 +37,8 @@ create_package() {
}
install_linux_image () {
- pdir=$1
- pname=$2
+ pname=$1
+ pdir=debian/$1
rm -rf ${pdir}
@@ -109,7 +107,7 @@ install_linux_image () {
}
install_linux_image_dbg () {
- pdir=$1
+ pdir=debian/$1
rm -rf ${pdir}
@@ -139,8 +137,8 @@ install_linux_image_dbg () {
}
install_kernel_headers () {
- pdir=$1
- version=$2
+ pdir=debian/$1
+ version=${1#linux-headers-}
rm -rf $pdir
@@ -151,7 +149,7 @@ install_kernel_headers () {
}
install_libc_headers () {
- pdir=$1
+ pdir=debian/$1
rm -rf $pdir
@@ -171,28 +169,13 @@ for package in ${packages_enabled}
do
case ${package} in
*-dbg)
- install_linux_image_dbg debian/linux-image-dbg;;
- linux-image-*|user-mode-linux-*)
- install_linux_image debian/linux-image ${package};;
- linux-libc-dev)
- install_libc_headers debian/linux-libc-dev;;
- linux-headers-*)
- install_kernel_headers debian/linux-headers ${package#linux-headers-};;
- esac
-done
-
-for package in ${packages_enabled}
-do
- case ${package} in
- *-dbg)
- create_package ${package} debian/linux-image-dbg;;
+ install_linux_image_dbg "${package}";;
linux-image-*|user-mode-linux-*)
- create_package ${package} debian/linux-image;;
+ install_linux_image "${package}";;
linux-libc-dev)
- create_package ${package} debian/linux-libc-dev;;
+ install_libc_headers "${package}";;
linux-headers-*)
- create_package ${package} debian/linux-headers;;
+ install_kernel_headers "${package}";;
esac
+ create_package "${package}"
done
-
-exit 0
--
GitLab