Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save cerebrate/b9215f99b069946a8e933f26f96c9be1 to your computer and use it in GitHub Desktop.
Save cerebrate/b9215f99b069946a8e933f26f96c9be1 to your computer and use it in GitHub Desktop.
Lowercase the kernel version string to work as a Debian package name
From 33890150b1898474d16d141fba7865068d1e2f7b Mon Sep 17 00:00:00 2001
From: Alistair Young <avatar@arkane-systems.net>
Date: Thu, 6 May 2021 19:41:36 -0500
Subject: [PATCH] Case hack for Debian build.
---
scripts/Makefile.package | 6 ++++--
scripts/package/builddeb | 7 ++++---
scripts/package/mkdebian | 8 +++++---
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index f952fb64789d..201e6635597e 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -24,8 +24,10 @@ include $(srctree)/scripts/Kbuild.include
# but the binrpm-pkg target can; for some reason O= gets ignored.
# Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
-KDEB_SOURCENAME ?= linux-$(KERNELRELEASE)
+KERNELRELEASELC = $(shell echo $(KERNELRELEASE) | tr '[:upper:]' '[:lower:]')
+
+KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASELC))
+KDEB_SOURCENAME ?= linux-$(KERNELRELEASELC)
KBUILD_PKG_ROOTCMD ?="fakeroot -u"
export KDEB_SOURCENAME
# Include only those top-level files that are needed by make, plus the GPL copy
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 91a502bb97e8..9d7fc917d19c 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -107,13 +107,14 @@ deploy_libc_headers () {
}
version=$KERNELRELEASE
+pkgversion=$(echo $KERNELRELEASE | tr '[:upper:]' '[:lower:]')
tmpdir=debian/linux-image
dbg_dir=debian/linux-image-dbg
-packagename=linux-image-$version
+packagename=linux-image-$pkgversion
dbg_packagename=$packagename-dbg
if [ "$ARCH" = "um" ] ; then
- packagename=user-mode-linux-$version
+ packagename=user-mode-linux-$pkgversion
fi
# Not all arches have the same installed path in debian
@@ -211,7 +212,7 @@ 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-$pkgversion debian/linux-headers
fi
deploy_libc_headers debian/linux-libc-dev
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 60a2a63a5e90..985a72e90a13 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -85,7 +85,9 @@ set_debarch() {
}
# Some variables and settings used throughout the script
-version=$KERNELRELEASE
+version=$(echo $KERNELRELEASE | tr '[:upper:]' '[:lower:]')
+mkversion=$KERNELRELEASE
+
if [ -n "$KDEB_PKGVERSION" ]; then
packageversion=$KDEB_PKGVERSION
revision=${packageversion##*-}
@@ -225,14 +227,14 @@ srctree ?= .
build-indep:
build-arch:
- \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+ \$(MAKE) KERNELRELEASE=${mkversion} ARCH=${ARCH} \
KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile
build: build-arch
binary-indep:
binary-arch: build-arch
- \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+ \$(MAKE) KERNELRELEASE=${mkversion} ARCH=${ARCH} \
KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg
clean:
--
2.31.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment