From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Ben Hutchings <ben@decadent.org.uk>,
Masahiro Yamada <masahiroy@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] kbuild: deb-pkg: use debian/<package> for tmpdir
Date: Sat, 30 Dec 2023 22:51:58 +0900 [thread overview]
Message-ID: <20231230135200.1058873-3-masahiroy@kernel.org> (raw)
In-Reply-To: <20231230135200.1058873-1-masahiroy@kernel.org>
Use debian/<package> for tmpdir, which is the default of debhelper.
This simplifies the code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/package/builddeb | 41 ++++++++++++----------------------------
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 842ee4b40528..bf96a3c24608 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;;
+ install_linux_image_dbg "${package}";;
linux-image-*|user-mode-linux-*)
- install_linux_image debian/linux-image ${package};;
+ install_linux_image "${package}";;
linux-libc-dev)
- install_libc_headers debian/linux-libc-dev;;
+ install_libc_headers "${package}";;
linux-headers-*)
- install_kernel_headers debian/linux-headers ${package#linux-headers-};;
+ install_kernel_headers "${package}";;
esac
+ create_package "${package}"
done
-
-for package in ${packages_enabled}
-do
- case ${package} in
- *-dbg)
- create_package ${package} debian/linux-image-dbg;;
- linux-image-*|user-mode-linux-*)
- create_package ${package} debian/linux-image;;
- linux-libc-dev)
- create_package ${package} debian/linux-libc-dev;;
- linux-headers-*)
- create_package ${package} debian/linux-headers;;
- esac
-done
-
-exit 0
--
2.40.1
next prev parent reply other threads:[~2023-12-30 13:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 13:51 [PATCH 1/5] kbuild: deb-pkg: move 'make headers' to build-arch Masahiro Yamada
2023-12-30 13:51 ` [PATCH 2/5] kbuild: deb-pkg: make debian/rules quiet by default Masahiro Yamada
2024-01-09 14:14 ` Nicolas Schier
2024-01-09 14:46 ` Masahiro Yamada
2024-01-10 13:37 ` Nicolas Schier
2023-12-30 13:51 ` Masahiro Yamada [this message]
2024-01-09 14:18 ` [PATCH 3/5] kbuild: deb-pkg: use debian/<package> for tmpdir Nicolas Schier
2023-12-30 13:51 ` [PATCH 4/5] kbuild: deb-pkg: build binary-arch in parallel Masahiro Yamada
2024-01-10 13:47 ` Nicolas Schier
2023-12-30 13:52 ` [PATCH 5/5] kbuild: deb-pkg: call more misc debhelper commands Masahiro Yamada
2024-01-10 13:50 ` Nicolas Schier
2024-01-09 4:38 ` [PATCH 1/5] kbuild: deb-pkg: move 'make headers' to build-arch Masahiro Yamada
2024-01-09 13:24 ` Nicolas Schier
2024-01-09 14:29 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231230135200.1058873-3-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=ben@decadent.org.uk \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox