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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108
  1. From cafe01ae116792598633633f255893e768886422 Mon Sep 17 00:00:00 2001
  2. From: Maximilian Luz <luzmaximilian@gmail.com>
  3. Date: Fri, 3 Apr 2020 01:16:39 +0200
  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. ---
  12. scripts/package/builddeb | 13 ++++++++-----
  13. scripts/package/mkdebian | 13 +++++++++----
  14. 2 files changed, 17 insertions(+), 9 deletions(-)
  15. diff --git a/scripts/package/builddeb b/scripts/package/builddeb
  16. index 6df3c9f8b2da..156a44f951f0 100755
  17. --- a/scripts/package/builddeb
  18. +++ b/scripts/package/builddeb
  19. @@ -71,7 +71,7 @@ deploy_kernel_headers () {
  20. fi
  21. } > debian/hdrobjfiles
  22. - destdir=$pdir/usr/src/linux-headers-$version
  23. + destdir=$pdir/usr/src/$kernel_headers_packagename
  24. mkdir -p $destdir
  25. tar -c -f - -C $srctree -T debian/hdrsrcfiles | tar -xf - -C $destdir
  26. tar -c -f - -T debian/hdrobjfiles | tar -xf - -C $destdir
  27. @@ -81,7 +81,7 @@ deploy_kernel_headers () {
  28. cp $KCONFIG_CONFIG $destdir/.config
  29. mkdir -p $pdir/lib/modules/$version/
  30. - ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build
  31. + ln -s /usr/src/$kernel_headers_packagename $pdir/lib/modules/$version/build
  32. }
  33. deploy_libc_headers () {
  34. @@ -100,9 +100,12 @@ deploy_libc_headers () {
  35. }
  36. version=$KERNELRELEASE
  37. +featureset=$(echo "$version" | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-(.*)/\1/')
  38. tmpdir=debian/linux-image
  39. dbg_dir=debian/linux-image-dbg
  40. -packagename=linux-image-$version
  41. +packagename=linux-image-$featureset
  42. +kernel_headers_packagename=linux-headers-$featureset
  43. +libc_headers_packagename=linux-libc-dev-$featureset
  44. dbg_packagename=$packagename-dbg
  45. if [ "$ARCH" = "um" ] ; then
  46. @@ -203,10 +206,10 @@ done
  47. if [ "$ARCH" != "um" ]; then
  48. deploy_kernel_headers debian/linux-headers
  49. - create_package linux-headers-$version debian/linux-headers
  50. + create_package $kernel_headers_packagename debian/linux-headers
  51. deploy_libc_headers debian/linux-libc-dev
  52. - create_package linux-libc-dev debian/linux-libc-dev
  53. + create_package $libc_headers_packagename debian/linux-libc-dev
  54. fi
  55. create_package "$packagename" "$tmpdir"
  56. diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
  57. index 357dc56bcf30..4a3c570be220 100755
  58. --- a/scripts/package/mkdebian
  59. +++ b/scripts/package/mkdebian
  60. @@ -86,6 +86,8 @@ set_debarch() {
  61. # Some variables and settings used throughout the script
  62. version=$KERNELRELEASE
  63. +featureset=$(echo "$version" | sed -E 's/[0-9]+\.[0-9]+\.[0-9]+-(.*)/\1/')
  64. +shortversion=$(echo "$version" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/')
  65. if [ -n "$KDEB_PKGVERSION" ]; then
  66. packageversion=$KDEB_PKGVERSION
  67. revision=${packageversion##*-}
  68. @@ -94,8 +96,9 @@ else
  69. packageversion=$version-$revision
  70. fi
  71. sourcename=$KDEB_SOURCENAME
  72. -packagename=linux-image-$version
  73. -kernel_headers_packagename=linux-headers-$version
  74. +packagename=linux-image-$featureset
  75. +kernel_headers_packagename=linux-headers-$featureset
  76. +libc_headers_packagename=linux-libc-dev-$featureset
  77. dbg_packagename=$packagename-dbg
  78. debarch=
  79. set_debarch
  80. @@ -190,9 +193,11 @@ Description: Linux kernel headers for $version on $debarch
  81. .
  82. This is useful for people who need to build external modules
  83. -Package: linux-libc-dev
  84. +Package: $libc_headers_packagename
  85. Section: devel
  86. -Provides: linux-kernel-headers
  87. +Provides: linux-kernel-headers, linux-libc-dev (= $shortversion)
  88. +Conflicts: linux-libc-dev
  89. +Replaces: linux-libc-dev
  90. Architecture: $debarch
  91. Description: Linux support headers for userspace development
  92. This package provides userspaces headers from the Linux kernel. These headers
  93. --
  94. 2.26.0