diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-10-14 03:38:20 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-10-14 12:49:39 +0900 |
| commit | 0fa21cf4489fe11737d56f8056dda1ba0257bd8d (patch) | |
| tree | a2d823b0e508f04942d2f2dd8789570579ad486e | |
| parent | bac977cbc0d6731fb8e67c2be0e4acbd959e10b3 (diff) | |
| download | linux-stable-0fa21cf4489fe11737d56f8056dda1ba0257bd8d.tar.gz linux-stable-0fa21cf4489fe11737d56f8056dda1ba0257bd8d.tar.bz2 linux-stable-0fa21cf4489fe11737d56f8056dda1ba0257bd8d.zip | |
kbuild: deb-pkg: clean up package name variables
Hard-code the names of linux-headers and debug packages in the
control file.
The kernel package is different for ARCH=um. Change the code
for better readability.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| -rwxr-xr-x | scripts/package/mkdebian | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 273fd6ed790e..60a2a63a5e90 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -94,16 +94,16 @@ else packageversion=$version-$revision fi sourcename=$KDEB_SOURCENAME -packagename=linux-image-$version -kernel_headers_packagename=linux-headers-$version -dbg_packagename=$packagename-dbg -debarch= -set_debarch if [ "$ARCH" = "um" ] ; then - packagename=user-mode-linux-$version + packagename=user-mode-linux +else + packagename=linux-image fi +debarch= +set_debarch + email=${DEBEMAIL-$EMAIL} # use email string directly if it contains <email> @@ -178,7 +178,7 @@ Rules-Requires-Root: no Build-Depends: bc, rsync, kmod, cpio, bison, flex | flex:native $extra_build_depends Homepage: https://www.kernel.org/ -Package: $packagename +Package: $packagename-$version Architecture: $debarch Description: Linux kernel, version $version This package contains the Linux kernel, modules and corresponding other @@ -197,7 +197,7 @@ EOF if is_enabled CONFIG_MODULES; then cat <<EOF >> debian/control -Package: $kernel_headers_packagename +Package: linux-headers-$version Architecture: $debarch Description: Linux kernel headers for $version on $debarch This package provides kernel header files for $version on $debarch @@ -209,7 +209,7 @@ fi if is_enabled CONFIG_DEBUG_INFO; then cat <<EOF >> debian/control -Package: $dbg_packagename +Package: linux-image-$version-dbg Section: debug Architecture: $debarch Description: Linux kernel debugging symbols for $version |