84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
From 8b2757ee31252c7a4fe1b3531397f76ce00e9ad6 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Sun, 19 Jan 2020 22:50:24 +0100
|
|
Subject: [PATCH] Version changes for linux-surface debian package
|
|
|
|
Rename debian kernel packages so that they do not contain the full version
|
|
in the name any more as this allows automated updates via a package
|
|
repository. Instead the package name now only contains the $LOCALVERSION
|
|
string.
|
|
|
|
Also rename libc-dev to allow multiple versions to co-exist in the same
|
|
repository.
|
|
|
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
---
|
|
scripts/package/builddeb | 7 ++++---
|
|
scripts/package/mkdebian | 13 +++++++++----
|
|
2 files changed, 13 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
|
|
index 0b31f4f1f92c..af25b9397c39 100755
|
|
--- a/scripts/package/builddeb
|
|
+++ b/scripts/package/builddeb
|
|
@@ -35,13 +35,14 @@ create_package() {
|
|
}
|
|
|
|
version=$KERNELRELEASE
|
|
+featureset=$(echo "$version" | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-(.*)/\1/')
|
|
tmpdir="$objtree/debian/tmp"
|
|
kernel_headers_dir="$objtree/debian/hdrtmp"
|
|
libc_headers_dir="$objtree/debian/headertmp"
|
|
dbg_dir="$objtree/debian/dbgtmp"
|
|
-packagename=linux-image-$version
|
|
-kernel_headers_packagename=linux-headers-$version
|
|
-libc_headers_packagename=linux-libc-dev
|
|
+packagename=linux-image-$featureset
|
|
+kernel_headers_packagename=linux-headers-$featureset
|
|
+libc_headers_packagename=linux-libc-dev-$featureset
|
|
dbg_packagename=$packagename-dbg
|
|
|
|
if [ "$ARCH" = "um" ] ; then
|
|
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
|
|
index edcad61fe3cd..34f6bd2447b6 100755
|
|
--- a/scripts/package/mkdebian
|
|
+++ b/scripts/package/mkdebian
|
|
@@ -86,6 +86,8 @@ set_debarch() {
|
|
|
|
# Some variables and settings used throughout the script
|
|
version=$KERNELRELEASE
|
|
+featureset=$(echo "$version" | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-(.*)/\1/')
|
|
+shortversion=$(echo "$version" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')
|
|
if [ -n "$KDEB_PKGVERSION" ]; then
|
|
packageversion=$KDEB_PKGVERSION
|
|
revision=${packageversion##*-}
|
|
@@ -94,8 +96,9 @@ else
|
|
packageversion=$version-$revision
|
|
fi
|
|
sourcename=$KDEB_SOURCENAME
|
|
-packagename=linux-image-$version
|
|
-kernel_headers_packagename=linux-headers-$version
|
|
+packagename=linux-image-$featureset
|
|
+kernel_headers_packagename=linux-headers-$featureset
|
|
+libc_headers_packagename=linux-libc-dev-$featureset
|
|
dbg_packagename=$packagename-dbg
|
|
debarch=
|
|
set_debarch
|
|
@@ -186,9 +189,11 @@ Description: Linux kernel headers for $version on $debarch
|
|
.
|
|
This is useful for people who need to build external modules
|
|
|
|
-Package: linux-libc-dev
|
|
+Package: $libc_headers_packagename
|
|
Section: devel
|
|
-Provides: linux-kernel-headers
|
|
+Provides: linux-kernel-headers, linux-libc-dev (= $shortversion)
|
|
+Conflicts: linux-libc-dev
|
|
+Replaces: linux-libc-dev
|
|
Architecture: $debarch
|
|
Description: Linux support headers for userspace development
|
|
This package provides userspaces headers from the Linux kernel. These headers
|
|
--
|
|
2.25.0
|
|
|