0002-Version-changes-for-linux-surface-debian-package.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283
  1. From 8b2757ee31252c7a4fe1b3531397f76ce00e9ad6 Mon Sep 17 00:00:00 2001
  2. From: Maximilian Luz <luzmaximilian@gmail.com>
  3. Date: Sun, 19 Jan 2020 22:50:24 +0100
  4. Subject: [PATCH] Version changes for linux-surface debian package
  5. Rename debian kernel packages so that they do not contain the full version
  6. in the name any more as this allows automated updates via a package
  7. repository. Instead the package name now only contains the $LOCALVERSION
  8. string.
  9. Also rename libc-dev to allow multiple versions to co-exist in the same
  10. repository.
  11. Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
  12. ---
  13. scripts/package/builddeb | 7 ++++---
  14. scripts/package/mkdebian | 13 +++++++++----
  15. 2 files changed, 13 insertions(+), 7 deletions(-)
  16. diff --git a/scripts/package/builddeb b/scripts/package/builddeb
  17. index 0b31f4f1f92c..af25b9397c39 100755
  18. --- a/scripts/package/builddeb
  19. +++ b/scripts/package/builddeb
  20. @@ -35,13 +35,14 @@ create_package() {
  21. }
  22. version=$KERNELRELEASE
  23. +featureset=$(echo "$version" | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-(.*)/\1/')
  24. tmpdir="$objtree/debian/tmp"
  25. kernel_headers_dir="$objtree/debian/hdrtmp"
  26. libc_headers_dir="$objtree/debian/headertmp"
  27. dbg_dir="$objtree/debian/dbgtmp"
  28. -packagename=linux-image-$version
  29. -kernel_headers_packagename=linux-headers-$version
  30. -libc_headers_packagename=linux-libc-dev
  31. +packagename=linux-image-$featureset
  32. +kernel_headers_packagename=linux-headers-$featureset
  33. +libc_headers_packagename=linux-libc-dev-$featureset
  34. dbg_packagename=$packagename-dbg
  35. if [ "$ARCH" = "um" ] ; then
  36. diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
  37. index edcad61fe3cd..34f6bd2447b6 100755
  38. --- a/scripts/package/mkdebian
  39. +++ b/scripts/package/mkdebian
  40. @@ -86,6 +86,8 @@ set_debarch() {
  41. # Some variables and settings used throughout the script
  42. version=$KERNELRELEASE
  43. +featureset=$(echo "$version" | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-(.*)/\1/')
  44. +shortversion=$(echo "$version" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')
  45. if [ -n "$KDEB_PKGVERSION" ]; then
  46. packageversion=$KDEB_PKGVERSION
  47. revision=${packageversion##*-}
  48. @@ -94,8 +96,9 @@ else
  49. packageversion=$version-$revision
  50. fi
  51. sourcename=$KDEB_SOURCENAME
  52. -packagename=linux-image-$version
  53. -kernel_headers_packagename=linux-headers-$version
  54. +packagename=linux-image-$featureset
  55. +kernel_headers_packagename=linux-headers-$featureset
  56. +libc_headers_packagename=linux-libc-dev-$featureset
  57. dbg_packagename=$packagename-dbg
  58. debarch=
  59. set_debarch
  60. @@ -186,9 +189,11 @@ Description: Linux kernel headers for $version on $debarch
  61. .
  62. This is useful for people who need to build external modules
  63. -Package: linux-libc-dev
  64. +Package: $libc_headers_packagename
  65. Section: devel
  66. -Provides: linux-kernel-headers
  67. +Provides: linux-kernel-headers, linux-libc-dev (= $shortversion)
  68. +Conflicts: linux-libc-dev
  69. +Replaces: linux-libc-dev
  70. Architecture: $debarch
  71. Description: Linux support headers for userspace development
  72. This package provides userspaces headers from the Linux kernel. These headers
  73. --
  74. 2.25.0