DLPX-94999 linux-kernel-aws update to 6.14 is failing

prakashsurya · prakashsurya · commit 95659c19c074 · 2025-08-04T09:46:06.000-07:00
PR URL: https://www.github.com/delphix/linux-pkg/pull/364
diff --git a/default-package-config.sh b/default-package-config.sh
@@ -99,9 +99,14 @@ function kernel_build() {
 	# Canonical's releases and our releases.
 	#
 	local canonical_abinum delphix_abinum kernel_release kernel_version
+
 	canonical_abinum=$(fakeroot debian/rules printenv | grep -E '^abinum ' | cut -d= -f2 | tr -d '[:space:]')
 	delphix_abinum="${canonical_abinum}-$(date -u +"dx%Y%m%d%H")-$(git rev-parse --short HEAD)"
+
 	kernel_release=$(fakeroot debian/rules printenv | grep -E '^release ' | cut -d= -f2 | tr -d '[:space:]')
+	if [[ -z "$kernel_release" ]]; then
+		kernel_release=$(fakeroot debian/rules printenv | grep -E '^DEB_VERSION_UPSTREAM ' | cut -d= -f2 | tr -d '[:space:]')
+	fi
 
 	#
 	# We record the kernel version into a file. This field is consumed

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,14 @@ function kernel_build() {`
`99`	`99`	`# Canonical's releases and our releases.`
`100`	`100`	`#`
`101`	`101`	`local canonical_abinum delphix_abinum kernel_release kernel_version`
	`102`	`+`
`102`	`103`	`canonical_abinum=$(fakeroot debian/rules printenv \| grep -E '^abinum ' \| cut -d= -f2 \| tr -d '[:space:]')`
`103`	`104`	`delphix_abinum="${canonical_abinum}-$(date -u +"dx%Y%m%d%H")-$(git rev-parse --short HEAD)"`
	`105`	`+`
`104`	`106`	`kernel_release=$(fakeroot debian/rules printenv \| grep -E '^release ' \| cut -d= -f2 \| tr -d '[:space:]')`
	`107`	`+ if [[ -z "$kernel_release" ]]; then`
	`108`	`+ kernel_release=$(fakeroot debian/rules printenv \| grep -E '^DEB_VERSION_UPSTREAM ' \| cut -d= -f2 \| tr -d '[:space:]')`
	`109`	`+ fi`
`105`	`110`
`106`	`111`	`#`
`107`	`112`	`# We record the kernel version into a file. This field is consumed`