summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch6
-rw-r--r--meta-oe/recipes-kernel/kpatch/kpatch_git.bb4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
index 603a1475ad..0cc3684134 100644
--- a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
+++ b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
@@ -48,10 +48,10 @@ index 39933fc..c0258a2 100755
48 --skip-cleanup) 48 --skip-cleanup)
49 echo "Skipping cleanup" 49 echo "Skipping cleanup"
50 SKIPCLEANUP=1 50 SKIPCLEANUP=1
51@@ -571,7 +576,7 @@ fi 51@@ -613,7 +613,7 @@ fi
52 # Don't check external file. 52 # Don't check external file.
53 # shellcheck disable=SC1091 53 # shellcheck disable=SC1090
54 source /etc/os-release 54 [[ -f "$RELEASE_FILE" ]] && source "$RELEASE_FILE"
55-DISTRO="$ID" 55-DISTRO="$ID"
56+DISTRO="${DISTRO:-${ID}}" 56+DISTRO="${DISTRO:-${ID}}"
57 if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then 57 if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then
diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
index 6326a25381..59dbc936f9 100644
--- a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
+++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
@@ -2,9 +2,9 @@ require kpatch.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
4 4
5SRCREV = "2a29bc7dea9a7da12705c7b50315eee1acdd9156" 5SRCREV = "fd8209aa00525f3e6092eaccbc34f7ce13c4ebc9"
6 6
7PV = "0.8.0" 7PV = "0.9.0"
8 8
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
10 10