diff options
| author |   Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-02-21 07:24:14 -0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-02-21 14:21:52 -0800 |
| commit | 247b9dff37092d96b7964b00a843d422bb732a81 (patch) | |
| tree | fa9cb96f591d94fa637cf5882c2eb2ff232d9b8b /meta-oe/recipes-kernel | |
| parent | e10d2bdede30d5cb3a59830a1195695d2bb674fd (diff) | |
| download | meta-openembedded-247b9dff37092d96b7964b00a843d422bb732a81.tar.gz | |
kpatch: upgrade 0.8.0 -> 0.9.0
refresh the following patch:
0002-kpatch-build-allow-overriding-of-distro-name.patch
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel')
| -rw-r--r-- | meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch | 6 | ||||
| -rw-r--r-- | meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 |
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 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -571,7 +576,7 @@ fi +@@ -613,7 +613,7 @@ fi # Don't check external file. - # shellcheck disable=SC1091 - source /etc/os-release + # shellcheck disable=SC1090 + [[ -f "$RELEASE_FILE" ]] && source "$RELEASE_FILE" -DISTRO="$ID" +DISTRO="${DISTRO:-${ID}}" 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 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "2a29bc7dea9a7da12705c7b50315eee1acdd9156" +SRCREV = "fd8209aa00525f3e6092eaccbc34f7ce13c4ebc9" -PV = "0.8.0" +PV = "0.9.0" S = "${WORKDIR}/git" |