summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-01 16:00:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:01 -0700
commit6c1f8b957db9428f5a0ae16eb1dd1b519ea57f32 (patch)
tree610bb855ba8f9764928e516965e3d8580470281b
parent52b6a85533f457a308a7e432a0d7af3d98fb55e5 (diff)
downloadpoky-6c1f8b957db9428f5a0ae16eb1dd1b519ea57f32.tar.gz
lsbinitscripts: update to 9.79
Switch to github as pkgs.fedoraproject.org is down. (From OE-Core rev: d3a6d7895f8f68042aa5b6c3ce0dcc915f330bd6) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts/functions.patch21
-rw-r--r--meta/recipes-extended/lsb/lsbinitscripts_9.79.bb (renamed from meta/recipes-extended/lsb/lsbinitscripts_9.72.bb)8
2 files changed, 16 insertions, 13 deletions
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 @@
1From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001 1From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com> 2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Mon, 5 Jun 2017 16:26:47 +0900 3Date: Mon, 5 Jun 2017 16:26:47 +0900
4Subject: [PATCH] Upstream-Status: Inappropriate [configuration] 4Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration]
5 5
6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
7Signed-off-by: Saul Wold <sgw@linux.intel.com> 7Signed-off-by: Saul Wold <sgw@linux.intel.com>
@@ -10,23 +10,24 @@ Rebase on 9.72
10 10
11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> 11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
12Upstream-Status: Pending 12Upstream-Status: Pending
13
13--- 14---
14 initscripts-9.72/rc.d/init.d/functions | 2 +- 15 rc.d/init.d/functions | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
16 17
17diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions 18diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
18index 0f627f1..a6aa092 100644 19index 2e3da964..1a204dec 100644
19--- a/initscripts-9.72/rc.d/init.d/functions 20--- a/rc.d/init.d/functions
20+++ b/initscripts-9.72/rc.d/init.d/functions 21+++ b/rc.d/init.d/functions
21@@ -59,7 +59,7 @@ systemctl_redirect () { 22@@ -59,7 +59,7 @@ systemctl_redirect () {
22 [ -z "${COLUMNS:-}" ] && COLUMNS=80 23 [ -z "${COLUMNS:-}" ] && COLUMNS=80
23 24
24 if [ -z "${CONSOLETYPE:-}" ]; then 25 if [ -z "${CONSOLETYPE:-}" ]; then
25- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then 26- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
26+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then 27+ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then
27 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" 28 CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
28 else 29 else
29 CONSOLETYPE="serial" 30 CONSOLETYPE="serial"
30-- 31--
311.9.1 322.15.1
32 33
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
index 2d74a6f9d3..46edeed8a4 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
@@ -10,11 +10,13 @@ RCONFLICTS_${PN} = "initscripts-functions"
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" 11LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
12 12
13S="${WORKDIR}/initscripts-${PV}" 13S = "${WORKDIR}/git"
14SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz \ 14SRC_URI = "git://github.com/fedora-sysv/initscripts \
15 file://functions.patch;striplevel=2 \ 15 file://functions.patch \
16 file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ 16 file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \
17 " 17 "
18SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469"
19UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)"
18 20
19SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" 21SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a"
20SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" 22SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db"