From 6c1f8b957db9428f5a0ae16eb1dd1b519ea57f32 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 1 Mar 2018 16:00:42 +0200 Subject: lsbinitscripts: update to 9.79 Switch to github as pkgs.fedoraproject.org is down. (From OE-Core rev: d3a6d7895f8f68042aa5b6c3ce0dcc915f330bd6) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../lsb/lsbinitscripts/functions.patch | 21 +++++++------- meta/recipes-extended/lsb/lsbinitscripts_9.72.bb | 30 -------------------- meta/recipes-extended/lsb/lsbinitscripts_9.79.bb | 32 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-extended/lsb/lsbinitscripts_9.72.bb create mode 100644 meta/recipes-extended/lsb/lsbinitscripts_9.79.bb (limited to 'meta/recipes-extended/lsb') diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch index 9c58d90c38..e912daa701 100644 --- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -1,7 +1,7 @@ -From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001 +From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 From: Fan Xin Date: Mon, 5 Jun 2017 16:26:47 +0900 -Subject: [PATCH] Upstream-Status: Inappropriate [configuration] +Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] Signed-off-by: Xiaofeng Yan Signed-off-by: Saul Wold @@ -10,23 +10,24 @@ Rebase on 9.72 Signed-off-by: Fan Xin Upstream-Status: Pending + --- - initscripts-9.72/rc.d/init.d/functions | 2 +- + rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions -index 0f627f1..a6aa092 100644 ---- a/initscripts-9.72/rc.d/init.d/functions -+++ b/initscripts-9.72/rc.d/init.d/functions +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 2e3da964..1a204dec 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions @@ -59,7 +59,7 @@ systemctl_redirect () { [ -z "${COLUMNS:-}" ] && COLUMNS=80 if [ -z "${CONSOLETYPE:-}" ]; then -- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then -+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then +- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" else CONSOLETYPE="serial" -- -1.9.1 +2.15.1 diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb deleted file mode 100644 index 2d74a6f9d3..0000000000 --- a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "SysV init scripts which are only used in an LSB image" -HOMEPAGE = "https://wiki.debian.org/LSBInitScripts" -SECTION = "base" -LICENSE = "GPLv2" -DEPENDS = "popt glib-2.0" - -RPROVIDES_${PN} += "initd-functions" -RDEPENDS_${PN} += "util-linux" -RCONFLICTS_${PN} = "initscripts-functions" - -LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" - -S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz \ - file://functions.patch;striplevel=2 \ - file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ - " - -SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" -SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" - -# Since we are only taking the patched version of functions, no need to -# configure or compile anything so do not execute these -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install(){ - install -d ${D}${sysconfdir}/init.d/ - install -m 0644 ${S}/rc.d/init.d/functions ${D}${sysconfdir}/init.d/functions -} diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb new file mode 100644 index 0000000000..46edeed8a4 --- /dev/null +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb @@ -0,0 +1,32 @@ +SUMMARY = "SysV init scripts which are only used in an LSB image" +HOMEPAGE = "https://wiki.debian.org/LSBInitScripts" +SECTION = "base" +LICENSE = "GPLv2" +DEPENDS = "popt glib-2.0" + +RPROVIDES_${PN} += "initd-functions" +RDEPENDS_${PN} += "util-linux" +RCONFLICTS_${PN} = "initscripts-functions" + +LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/fedora-sysv/initscripts \ + file://functions.patch \ + file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ + " +SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469" +UPSTREAM_CHECK_GITTAGREGEX = "^(?P\d+(\.\d+)+)" + +SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" +SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" + +# Since we are only taking the patched version of functions, no need to +# configure or compile anything so do not execute these +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install(){ + install -d ${D}${sysconfdir}/init.d/ + install -m 0644 ${S}/rc.d/init.d/functions ${D}${sysconfdir}/init.d/functions +} -- cgit v1.2.3-54-g00ecf