[oe-commits] [openembedded-core] 46/50: lsbinitscripts: 9.64 -> 9.68
git at git.openembedded.org
git at git.openembedded.org
Thu Aug 25 22:05:02 UTC 2016
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit d3f6df98318f0751948041a129faed1bd0f7a7c6
Author: Wang Xin <wangxin2015.fnst at cn.fujitsu.com>
AuthorDate: Wed Aug 24 02:45:03 2016 -0400
lsbinitscripts: 9.64 -> 9.68
Upgrade lsbinitscripts from 9.64 to 9.68.
Signed-off-by: Wang Xin <wangxin2015.fnst at cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
.../0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch | 5 +++--
.../lsb/{lsbinitscripts_9.64.bb => lsbinitscripts_9.68.bb} | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
index 0809c9b..17c9002 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
+++ b/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
@@ -11,13 +11,14 @@ diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 6850046..11223f7 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
-@@ -597,5 +597,5 @@ if [ "$_use_systemctl" = "1" ]; then
+@@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then
fi
fi
-strstr "$(cat /proc/cmdline)" "rc.debug" && set -x
+strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true
-
+ return 0
+
--
2.1.0
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.68.bb
similarity index 82%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.64.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.68.bb
index 7273050..0c08fff 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.68.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/9cce2ae1009750e84be37c09a028757e/initscripts-${PV}.tar.bz2 \
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/6a51a5af38e01445f53989ed0727c3e1/initscripts-${PV}.tar.bz2 \
file://functions.patch \
file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \
"
-SRC_URI[md5sum] = "9cce2ae1009750e84be37c09a028757e"
-SRC_URI[sha256sum] = "48b59ce8157cfc58bbd4b1dfa58ad1087245761ae11c2033b66ae3864ea7e1cf"
+SRC_URI[md5sum] = "6a51a5af38e01445f53989ed0727c3e1"
+SRC_URI[sha256sum] = "2a1c6e9dbaa37a676518f4803b501e107c058bb14ef7a8db24c52b77fbcba531"
inherit update-alternatives
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list