mtr: Build script adjustments

Adjust the kernel build scripts so that we can attach a tag to a kernel
build and have that tag appear in both the generated kernel directories
and the debian package.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

2 files changed, 18 insertions, 12 deletions

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 99b15fd8eb6b..a211bdc5581a 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -107,9 +107,9 @@ deploy_libc_headers () {
 }
 
 version=$KERNELRELEASE
-tmpdir=debian/linux-image
-dbg_dir=debian/linux-image-dbg
-packagename=linux-image-$version
+tmpdir=debian/linux-image-mtr$LOCALVERSION
+dbg_dir=debian/linux-image-mtr$LOCALVERSION-dbg
+packagename=linux-image-mtr$LOCALVERSION
 dbg_packagename=$packagename-dbg
 
 if [ "$ARCH" = "um" ] ; then
@@ -186,6 +186,9 @@ if is_enabled CONFIG_MODULES; then
 			INSTALL_MOD_PATH="$tmpdir" $MAKE -f $srctree/Makefile modules_sign
 		fi
 	fi
+
+	rm -rf "$tmpdir/lib/modules/$version/build" "$tmpdir/lib/modules/$version/source"
+	ln -sf "/usr/src/linux-headers-$version" "$tmpdir/lib/modules/$version/source"
 fi
 
 # Install the maintainer scripts
@@ -216,11 +219,11 @@ done
 if [ "$ARCH" != "um" ]; then
 	if is_enabled CONFIG_MODULES; then
 		deploy_kernel_headers debian/linux-headers
-		create_package linux-headers-$version debian/linux-headers
+		create_package linux-headers-mtr$LOCALVERSION debian/linux-headers
 	fi
 
 	deploy_libc_headers debian/linux-libc-dev
-	create_package linux-libc-dev debian/linux-libc-dev
+	create_package linux-libc-dev-mtr$LOCALVERSION debian/linux-libc-dev
 fi
 
 create_package "$packagename" "$tmpdir"
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 60a2a63a5e90..495821c958c8 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -98,7 +98,7 @@ sourcename=$KDEB_SOURCENAME
 if [ "$ARCH" = "um" ] ; then
 	packagename=user-mode-linux
 else
-	packagename=linux-image
+	packagename=linux-image-mtr$LOCALVERSION
 fi
 
 debarch=
@@ -143,8 +143,10 @@ extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUST
 cat <<EOF > debian/changelog
 $sourcename ($packageversion) $distribution; urgency=low
 
-  * Custom built Linux kernel.
-
+  * Custom built Linux kernel with these patches:
+EOF
+(cd source/ ; stg ser | sed -e '/^-/d' -e 's/^. /  * /g') >> debian/changelog
+cat <<EOF >> debian/changelog
  -- $maintainer  $(date -R)
 EOF
 
@@ -178,13 +180,14 @@ Rules-Requires-Root: no
 Build-Depends: bc, rsync, kmod, cpio, bison, flex | flex:native $extra_build_depends
 Homepage: https://www.kernel.org/
 
-Package: $packagename-$version
+Package: $packagename
 Architecture: $debarch
+Depends: djwong-kernel-support
 Description: Linux kernel, version $version
  This package contains the Linux kernel, modules and corresponding other
  files, version: $version.
 
-Package: linux-libc-dev
+Package: linux-libc-dev-mtr$LOCALVERSION
 Section: devel
 Provides: linux-kernel-headers
 Architecture: $debarch
@@ -197,7 +200,7 @@ EOF
 if is_enabled CONFIG_MODULES; then
 cat <<EOF >> debian/control
 
-Package: linux-headers-$version
+Package: linux-headers-mtr$LOCALVERSION
 Architecture: $debarch
 Description: Linux kernel headers for $version on $debarch
  This package provides kernel header files for $version on $debarch
@@ -209,7 +212,7 @@ fi
 if is_enabled CONFIG_DEBUG_INFO; then
 cat <<EOF >> debian/control
 
-Package: linux-image-$version-dbg
+Package: $packagename-dbg
 Section: debug
 Architecture: $debarch
 Description: Linux kernel debugging symbols for $version