diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2023-01-03 17:02:21 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-01-04 15:33:58 -0800 |
commit | eefad4d27a4578e56bc686b6aa0306e4ec5491c0 (patch) | |
tree | 71c957e6886773cdc10b0d60dd0ac656d7592f26 /meta-initramfs/recipes-devtools/grubby/grubby_git.bb | |
parent | 29abac4415ca21de10e80cca7fd4a87ca76b8f03 (diff) | |
download | meta-openembedded-eefad4d27a4578e56bc686b6aa0306e4ec5491c0.tar.gz |
grubby: update to latest git rev
* Refresh patches.
* Update SRC_URI. The upstrem repository has been archived.
* Depends on rpm to rpm-sort build.
* Add a patch to fix rpm-sort build error.
* Do not specify PREFIX as the issue has been fixed upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools/grubby/grubby_git.bb')
-rw-r--r-- | meta-initramfs/recipes-devtools/grubby/grubby_git.bb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb index bbfabf020..ff673e21b 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb | |||
@@ -9,25 +9,26 @@ LICENSE = "GPL-2.0-or-later" | |||
9 | 9 | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" |
11 | 11 | ||
12 | DEPENDS = "popt util-linux" | 12 | DEPENDS = "popt util-linux rpm" |
13 | DEPENDS:append:libc-musl = " libexecinfo" | 13 | DEPENDS:append:libc-musl = " libexecinfo argp-standalone" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | SRCREV = "a1d2ae93408c3408e672d7eba4550fdf27fb0201" | 16 | SRCREV = "c01b0d5bb182bde35b464d14996acf354a3ada2e" |
17 | SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https;;branch=master \ | 17 | SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https;;branch=main \ |
18 | file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ | 18 | file://0001-rename-grub2-editenv-to-grub-editenv.patch \ |
19 | file://0002-Add-another-variable-LIBS-to-provides-libraries-from.patch \ | ||
20 | file://0003-include-paths.h-for-_PATH_MOUNTED.patch \ | ||
21 | file://0004-rpm-sort-include-string.h-for-strverscmp.patch \ | ||
19 | file://run-ptest \ | 22 | file://run-ptest \ |
20 | file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \ | ||
21 | file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | RDEPENDS:${PN} += "dracut" | 25 | RDEPENDS:${PN} += "dracut" |
25 | 26 | ||
26 | inherit autotools-brokensep ptest | 27 | inherit autotools-brokensep ptest |
27 | 28 | ||
28 | EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}' 'PREFIX'=${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}" | 29 | EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'LIBS=${LIBS}'" |
29 | 30 | ||
30 | LIBS:libc-musl = "-lexecinfo" | 31 | LIBS:libc-musl = "-lexecinfo -largp" |
31 | LIBS ?= "" | 32 | LIBS ?= "" |
32 | do_install_ptest() { | 33 | do_install_ptest() { |
33 | install -d ${D}${PTEST_PATH} | 34 | install -d ${D}${PTEST_PATH} |