diff options
Diffstat (limited to 'meta-initramfs/recipes-devtools/grubby/grubby_git.bb')
| -rw-r--r-- | meta-initramfs/recipes-devtools/grubby/grubby_git.bb | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb index 8430b7e102..ff673e21bb 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -5,29 +5,30 @@ zipl (s390) boot loaders. It is primarily designed to be used from scripts which new kernels and need to find information about the current boot environment. \ " HOMEPAGE = "https://github.com/rhboot/grubby" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -DEPENDS = "popt util-linux" -DEPENDS_append_libc-musl = " libexecinfo" +DEPENDS = "popt util-linux rpm" +DEPENDS:append:libc-musl = " libexecinfo argp-standalone" S = "${WORKDIR}/git" -SRCREV = "a1d2ae93408c3408e672d7eba4550fdf27fb0201" -SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \ - file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ +SRCREV = "c01b0d5bb182bde35b464d14996acf354a3ada2e" +SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https;;branch=main \ + file://0001-rename-grub2-editenv-to-grub-editenv.patch \ + file://0002-Add-another-variable-LIBS-to-provides-libraries-from.patch \ + file://0003-include-paths.h-for-_PATH_MOUNTED.patch \ + file://0004-rpm-sort-include-string.h-for-strverscmp.patch \ file://run-ptest \ - file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \ - file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ " -RDEPENDS_${PN} += "dracut" +RDEPENDS:${PN} += "dracut" inherit autotools-brokensep ptest -EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'" +EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'LIBS=${LIBS}'" -LIBS_libc-musl = "-lexecinfo" +LIBS:libc-musl = "-lexecinfo -largp" LIBS ?= "" do_install_ptest() { install -d ${D}${PTEST_PATH} @@ -35,6 +36,11 @@ do_install_ptest() { sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh } -RDEPENDS_${PN}-ptest = "util-linux-getopt bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-ptest = "util-linux-getopt bash" + +inherit update-alternatives +ALTERNATIVE:${PN} = "installkernel" +ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' |