diff options
| author | Fan Xin <fan.xin@jp.fujitsu.com> | 2017-06-05 16:40:05 +0900 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-06 19:49:57 +0100 |
| commit | be117d6ea79882d10cce4c061385832e26d23bff (patch) | |
| tree | 29d5a2ecb76b0f9a7bf3037fffc282d845d60ac6 | |
| parent | ae87a0967d687cf9e308b22b35facb0b38a9141a (diff) | |
| download | openembedded-core-be117d6ea79882d10cce4c061385832e26d23bff.tar.gz openembedded-core-be117d6ea79882d10cce4c061385832e26d23bff.tar.bz2 openembedded-core-be117d6ea79882d10cce4c061385832e26d23bff.zip | |
lsbinitscripts: Upgrade to 9.72
1. Upgrade lsbinitscripts from 9.68 to 9.72
2. Rebase the following patch file.
functions.patch
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/functions.patch | 43 | ||||
| -rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts_9.72.bb (renamed from meta/recipes-extended/lsb/lsbinitscripts_9.68.bb) | 8 |
2 files changed, 28 insertions, 23 deletions
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch index a756d047ef..feef610f15 100644 --- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -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: Saul Wold <sgw@linux.intel.com> -Index: initscripts-9.43/rc.d/init.d/functions -=================================================================== ---- 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 - -+ - if [ $PPID -ne 1 -a -z "$SYSTEMCTL_SKIP_REDIRECT" ] && \ - ( /bin/mountpoint -q /cgroup/systemd || /bin/mountpoint -q /sys/fs/cgroup/systemd ) ; then - case "$0" in -@@ -54,7 +55,7 @@ systemctl_redirect () { +Rebase on 9.72 + +Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> +--- + initscripts-9.72/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 +@@ -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 - CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" - else - CONSOLETYPE="serial" +- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then + CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" + else + CONSOLETYPE="serial" +-- +1.9.1 + diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.68.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb index 0c08fffcef..448663f74f 100644 --- a/meta/recipes-extended/lsb/lsbinitscripts_9.68.bb +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb @@ -8,13 +8,13 @@ RDEPENDS_${PN} += "util-linux" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/6a51a5af38e01445f53989ed0727c3e1/initscripts-${PV}.tar.bz2 \ - file://functions.patch \ +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] = "6a51a5af38e01445f53989ed0727c3e1" -SRC_URI[sha256sum] = "2a1c6e9dbaa37a676518f4803b501e107c058bb14ef7a8db24c52b77fbcba531" +SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" +SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" inherit update-alternatives |