mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

lsbinitscripts: Upgrade to 9.72

Browse Source 
1. Upgrade lsbinitscripts from 9.68 to 9.72

2. Rebase the following patch file.
   functions.patch

(From OE-Core rev: be117d6ea79882d10cce4c061385832e26d23bff)

Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fan Xin
2017-06-05 16:40:05 +09:00
committed by Richard Purdie
parent 5dd94a5dc4
commit ccc9b7bbd2
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/lsb/lsbinitscripts/functions.patch
+23 -18
View File
@@ -1,26 +1,31 @@
Upstream-Status: Inappropriate [configuration] From 57468c5f4e364bdad556604dca09046e1afca929 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]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: initscripts-9.43/rc.d/init.d/functions Rebase on 9.72
===================================================================
--- initscripts-9.43.orig/rc.d/init.d/functions
+++ initscripts-9.43/rc.d/init.d/functions
@@ -13,6 +13,7 @@ umask 022
PATH="/sbin:/usr/sbin:/bin:/usr/bin"
export PATH
+ Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && \ ---
( /bin/mountpoint -q /cgroup/systemd || /bin/mountpoint -q /sys/fs/cgroup/systemd ) ; then initscripts-9.72/rc.d/init.d/functions | 2 +-
case "$0" in 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -54,7 +55,7 @@ systemctl_redirect () {
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
@@ -59,7 +59,7 @@ systemctl_redirect () {
[ -z "${COLUMNS:-}" ] && COLUMNS=80 [ -z "${COLUMNS:-}" ] && COLUMNS=80
if [ -z "${CONSOLETYPE:-}" ]; then if [ -z "${CONSOLETYPE:-}" ]; then
- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; 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" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then
CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
else else
CONSOLETYPE="serial" CONSOLETYPE="serial"
--
1.9.1
meta/recipes-extended/lsb/lsbinitscripts_9.68.bb → meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
+4 -4
View File
@@ -8,13 +8,13 @@ RDEPENDS_${PN} += "util-linux"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
S="${WORKDIR}/initscripts-${PV}" S="${WORKDIR}/initscripts-${PV}"
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/6a51a5af38e01445f53989ed0727c3e1/initscripts-${PV}.tar.bz2 \ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz \
file://functions.patch \ file://functions.patch;striplevel=2 \
file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \
" "
SRC_URI[md5sum] = "6a51a5af38e01445f53989ed0727c3e1" SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a"
SRC_URI[sha256sum] = "2a1c6e9dbaa37a676518f4803b501e107c058bb14ef7a8db24c52b77fbcba531" SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db"
inherit update-alternatives inherit update-alternatives