Skip to content

Commit 6185d32

Browse files
committed
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>
1 parent 1b5e946 commit 6185d32

File tree

1 file changed

+12
-29
lines changed

1 file changed

+12
-29
lines changed

scripts/package/builddeb

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ if_enabled_echo() {
2525
}
2626

2727
create_package() {
28-
local pname="$1" pdir="$2"
29-
30-
export DH_OPTIONS="-p${pname} -P${pdir}"
28+
export DH_OPTIONS="-p${1}"
3129

3230
dh_installdocs
3331
dh_installchangelogs
@@ -39,8 +37,8 @@ create_package() {
3937
}
4038

4139
install_linux_image () {
42-
pdir=$1
43-
pname=$2
40+
pname=$1
41+
pdir=debian/$1
4442

4543
rm -rf ${pdir}
4644

@@ -109,7 +107,7 @@ install_linux_image () {
109107
}
110108

111109
install_linux_image_dbg () {
112-
pdir=$1
110+
pdir=debian/$1
113111

114112
rm -rf ${pdir}
115113

@@ -139,8 +137,8 @@ install_linux_image_dbg () {
139137
}
140138

141139
install_kernel_headers () {
142-
pdir=$1
143-
version=$2
140+
pdir=debian/$1
141+
version=${1#linux-headers-}
144142

145143
rm -rf $pdir
146144

@@ -151,7 +149,7 @@ install_kernel_headers () {
151149
}
152150

153151
install_libc_headers () {
154-
pdir=$1
152+
pdir=debian/$1
155153

156154
rm -rf $pdir
157155

@@ -171,28 +169,13 @@ for package in ${packages_enabled}
171169
do
172170
case ${package} in
173171
*-dbg)
174-
install_linux_image_dbg debian/linux-image-dbg;;
175-
linux-image-*|user-mode-linux-*)
176-
install_linux_image debian/linux-image ${package};;
177-
linux-libc-dev)
178-
install_libc_headers debian/linux-libc-dev;;
179-
linux-headers-*)
180-
install_kernel_headers debian/linux-headers ${package#linux-headers-};;
181-
esac
182-
done
183-
184-
for package in ${packages_enabled}
185-
do
186-
case ${package} in
187-
*-dbg)
188-
create_package ${package} debian/linux-image-dbg;;
172+
install_linux_image_dbg "${package}";;
189173
linux-image-*|user-mode-linux-*)
190-
create_package ${package} debian/linux-image;;
174+
install_linux_image "${package}";;
191175
linux-libc-dev)
192-
create_package ${package} debian/linux-libc-dev;;
176+
install_libc_headers "${package}";;
193177
linux-headers-*)
194-
create_package ${package} debian/linux-headers;;
178+
install_kernel_headers "${package}";;
195179
esac
180+
create_package "${package}"
196181
done
197-
198-
exit 0

0 commit comments

Comments
 (0)