diff options
author | Wang Xin <wangxin2015.fnst@cn.fujitsu.com> | 2016-08-24 02:45:03 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-25 23:03:48 +0100 |
commit | fb12fe9994dd4afe85663a3fb285709153820a7a (patch) | |
tree | 57cce8ccaef0116c41df458c2e5a82c2183ddeb1 /meta | |
parent | 5bd1a35c8c6bd4759830dcecf3f71e5beef0abf7 (diff) | |
download | poky-fb12fe9994dd4afe85663a3fb285709153820a7a.tar.gz |
lsbinitscripts: 9.64 -> 9.68
Upgrade lsbinitscripts from 9.64 to 9.68.
(From OE-Core rev: d3f6df98318f0751948041a129faed1bd0f7a7c6)
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch | 5 | ||||
-rw-r--r-- | meta/recipes-extended/lsb/lsbinitscripts_9.68.bb (renamed from meta/recipes-extended/lsb/lsbinitscripts_9.64.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 0809c9be97..17c90029c3 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 | |||
11 | index 6850046..11223f7 100644 | 11 | index 6850046..11223f7 100644 |
12 | --- a/rc.d/init.d/functions | 12 | --- a/rc.d/init.d/functions |
13 | +++ b/rc.d/init.d/functions | 13 | +++ b/rc.d/init.d/functions |
14 | @@ -597,5 +597,5 @@ if [ "$_use_systemctl" = "1" ]; then | 14 | @@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then |
15 | fi | 15 | fi |
16 | fi | 16 | fi |
17 | 17 | ||
18 | -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x | 18 | -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x |
19 | +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true | 19 | +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true |
20 | 20 | return 0 | |
21 | |||
21 | -- | 22 | -- |
22 | 2.1.0 | 23 | 2.1.0 |
23 | 24 | ||
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.64.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.68.bb index 7273050155..0c08fffcef 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" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" |
9 | 9 | ||
10 | S="${WORKDIR}/initscripts-${PV}" | 10 | S="${WORKDIR}/initscripts-${PV}" |
11 | SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/9cce2ae1009750e84be37c09a028757e/initscripts-${PV}.tar.bz2 \ | 11 | SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/6a51a5af38e01445f53989ed0727c3e1/initscripts-${PV}.tar.bz2 \ |
12 | file://functions.patch \ | 12 | file://functions.patch \ |
13 | file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ | 13 | file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[md5sum] = "9cce2ae1009750e84be37c09a028757e" | 16 | SRC_URI[md5sum] = "6a51a5af38e01445f53989ed0727c3e1" |
17 | SRC_URI[sha256sum] = "48b59ce8157cfc58bbd4b1dfa58ad1087245761ae11c2033b66ae3864ea7e1cf" | 17 | SRC_URI[sha256sum] = "2a1c6e9dbaa37a676518f4803b501e107c058bb14ef7a8db24c52b77fbcba531" |
18 | 18 | ||
19 | inherit update-alternatives | 19 | inherit update-alternatives |
20 | 20 | ||