diff options
| author |   Mingli Yu <Mingli.Yu@windriver.com> | 2016-09-19 13:45:26 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-26 08:29:12 +0200 |
| commit | be8aa13c2fef0d103bb32defa862a5ea568690c8 (patch) | |
| tree | 8b2833747c2c218c08a96d7aa85e69a8abbe4d0d | |
| parent | dfcb67af35936a351789044039a55e3fad299c1a (diff) | |
| download | meta-openembedded-contrib-be8aa13c2fef0d103bb32defa862a5ea568690c8.tar.gz | |
grubby: add bash to RDEPENDS_grubby-ptest
* Add bash to RDEPENDS_grubby-ptest
* As grubby upstream still continually updates ptest
script test.sh with bash specific syntax such as commit
98cab84501f86bd98f12653c11f4ecc632139399 and etc, so no
need to remove bashisms
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-initramfs/recipes-devtools/grubby/grubby/grubby-remove-bashisms-in-test.sh.patch | 29 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb | 3 |
2 files changed, 1 insertions, 31 deletions
diff --git a/meta-initramfs/recipes-devtools/grubby/grubby/grubby-remove-bashisms-in-test.sh.patch b/meta-initramfs/recipes-devtools/grubby/grubby/grubby-remove-bashisms-in-test.sh.patch deleted file mode 100644 index 6734e7f0f87..00000000000 --- a/meta-initramfs/recipes-devtools/grubby/grubby/grubby-remove-bashisms-in-test.sh.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c3a004b8d6dff1a767573dd7baf5d45efddb9f2b Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Fri, 15 Jul 2016 11:23:17 +0800 -Subject: [PATCH] grubby: remove bashisms in test.sh - -* Update #!/bin/bash to #!/bin/sh in test.sh to - remove below warning: - QA Issue: /usr/lib/grubby/ptest/test.sh contained - in package grubby-ptest requires /bin/bash, but no - providers found in RDEPENDS_grubby-ptest? [file-rdeps] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - test.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test.sh b/test.sh -index f738388..f3537f3 100755 ---- a/test.sh -+++ b/test.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # test.sh -- grubby regression tests - # --- -2.8.1 - diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb index 1a61e9dce12..0e93790855a 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -13,7 +13,6 @@ DEPENDS = "popt util-linux" SRC_URI = "https://github.com/rhinstaller/${BPN}/archive/${PV}-1.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \ file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ file://run-ptest \ - file://grubby-remove-bashisms-in-test.sh.patch \ " SRC_URI[md5sum] = "1005907b275d6d93368d045274537d86" @@ -33,6 +32,6 @@ do_install_ptest() { sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh } -RDEPENDS_${PN}-ptest = "util-linux-getopt" +RDEPENDS_${PN}-ptest = "util-linux-getopt bash" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' |