summaryrefslogtreecommitdiffstats
path: root/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby
diff options
context:
space:
mode:
authortakeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>2020-11-02 11:07:33 +0900
committertakeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>2020-11-02 11:07:33 +0900
commit1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch)
treecd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-initramfs/recipes-devtools/grubby
parent4204309872da5cb401cbb2729d9e2d4869a87f42 (diff)
recipes
Diffstat (limited to 'external/meta-openembedded/meta-initramfs/recipes-devtools/grubby')
-rw-r--r--external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb1
-rw-r--r--external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb3
2 files changed, 3 insertions, 1 deletions
diff --git a/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
index dc3a70bb..7403cf64 100644
--- a/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
+++ b/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
@@ -35,6 +35,7 @@ do_install_ptest() {
sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh
}
+RDEPENDS_${PN} += "bash"
RDEPENDS_${PN}-ptest = "util-linux-getopt bash"
COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
diff --git a/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb
index 8430b7e1..7248147a 100644
--- a/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb
+++ b/external/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb
@@ -25,7 +25,7 @@ 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}' 'PREFIX'=${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}"
LIBS_libc-musl = "-lexecinfo"
LIBS ?= ""
@@ -35,6 +35,7 @@ do_install_ptest() {
sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh
}
+RDEPENDS_${PN} += "bash"
RDEPENDS_${PN}-ptest = "util-linux-getopt bash"
COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'