Skip to contentSkip to conversation

grubby: add grubby 8.40-1

PATCH New [email protected] 1 participant 1 message Jul 22, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 grubby: add grubby 8.40-1

* Add grubby bb
* Rename grub2-editenv to grub-editenv as
we don't use the name grub2-editenv for grub2
* Add ptest support
* Update #!/bin/bash to #!/bin/sh in test.sh to remove bashisms

---
 .../grubby/grubby-remove-bashisms-in-test.sh.patch | 29 +++++++++
 ...ubby-rename-grub2-editenv-to-grub-editenv.patch | 69 ++++++++++++++++++++++
 .../recipes-devtools/grubby/grubby/run-ptest       |  3 +
 .../recipes-devtools/grubby/grubby_8.40.bb         | 38 ++++++++++++
 4 files changed, 139 insertions(+)
 create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/grubby-remove-bashisms-in-test.sh.patch
 create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch
 create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby/run-ptest
 create mode 100644 meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
meta-initramfs/recipes-devtools/grubby/grubby/grubby-remove-bashisms-in-test.sh.patch new file +29 -0
new file mode 100644
index 0000000..6734e7f
@@ -0,0 +1,29 @@
+From c3a004b8d6dff1a767573dd7baf5d45efddb9f2b Mon Sep 17 00:00:00 2001
+From: Mingli Yu <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch new file +69 -0

69 lines not on this page · raw message

meta-initramfs/recipes-devtools/grubby/grubby/run-ptest new file +3 -0
new file mode 100644
index 0000000..b06ac59
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./test.sh -v
meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb new file +38 -0
new file mode 100644
index 0000000..dc6cc62
@@ -0,0 +1,38 @@
+SUMMARY = "A command line tool for updating and displaying info about boot loaders"
+DESCRIPTION = "grubby is a command line tool for updating and displaying information \
+about the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) and \
+zipl (s390) boot loaders. It is primarily designed to be used from scripts which install \
+new kernels and need to find information about the current boot environment. \
+"
+LICENSE = "GPLv2+"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
+
+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"
+SRC_URI[sha256sum] = "85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df"
+
+S = "${WORKDIR}/${BPN}-${PV}-1"
+
+RDEPENDS_${PN} += "dracut"
+
+inherit autotools-brokensep ptest
+
+EXTRA_OEMAKE = "'CC=${CC}'"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}
+	cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH}
+	sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh
+}
+
+RDEPENDS_${PN}-ptest = "util-linux-getopt"
+
+COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
Signature · 1 line
2.8.1