mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

lsbinitscripts: update to 9.79

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2018-03-01 16:00:42 +02:00
committed by Richard Purdie
parent 52b6a85533
commit 6c1f8b957d
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
meta/recipes-extended/lsb/lsbinitscripts/functions.patch
View File

@@ -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 <fan.xin@jp.fujitsu.com>
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 <xiaofeng.yan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
@@ -10,23 +10,24 @@ Rebase on 9.72
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
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

8
meta/recipes-extended/lsb/lsbinitscripts_9.72.bb → meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
View File

@@ -10,11 +10,13 @@ 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 \
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<pver>\d+(\.\d+)+)"
SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a"
SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db"