* [PATCH 0/3 V1]:lsb: Add initscripts to enhance init functions in an lsb image
@ 2012-05-30 1:47 xiaofeng.yan
2012-05-30 1:47 ` [PATCH 1/3] lsbinitscripts: " xiaofeng.yan
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: xiaofeng.yan @ 2012-05-30 1:47 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
This initscripts has more functions than the simple one. There could be some errors for the current version with simple functions when running some programs because of absent some functions provided by initscripts.
The following changes since commit f28209d9d3c67203a2c7a2b25cacfe31643d1bfa:
Kang Kai (1):
cooker.py: terminate the Parser processes
are available in the git repository at:
git://git.pokylinux.org/poky-contrib xiaofeng/2133
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/2133
Xiaofeng Yan (3):
lsbinitscripts: Add initscripts to enhance init functions in an lsb
image
lsbinitscripts: Patch file functions for confirming to an lsb image
task-core-lsb: Add another initscripts to an lsb image
.../lsb/lsbinitscripts/functions.patch | 14 ++++++++
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 36 ++++++++++++++++++++
meta/recipes-extended/tasks/task-core-lsb.bb | 3 +-
3 files changed, 52 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-extended/lsb/lsbinitscripts/functions.patch
create mode 100644 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/3] lsbinitscripts: Add initscripts to enhance init functions in an lsb image
2012-05-30 1:47 [PATCH 0/3 V1]:lsb: Add initscripts to enhance init functions in an lsb image xiaofeng.yan
@ 2012-05-30 1:47 ` xiaofeng.yan
2012-05-30 16:28 ` Richard Purdie
2012-05-30 1:47 ` [PATCH 2/3] lsbinitscripts: Patch file functions for confirming to " xiaofeng.yan
2012-05-30 1:47 ` [PATCH 3/3] task-core-lsb: Add another initscripts " xiaofeng.yan
2 siblings, 1 reply; 5+ messages in thread
From: xiaofeng.yan @ 2012-05-30 1:47 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
The version of initscripts has more functions than the simple. \
There could be some errors for current initscripts when running \
some programe because of absent some functions provided by \
initscripts.
[YOCTO #2133]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 36 ++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
new file mode 100644
index 0000000..5d2bca8
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "SysV init scripts"
+SECTION = "base"
+LICENSE = "GPLv2"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
+
+S="${WORKDIR}/initscripts-${PV}"
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/668fa2762b57ef75436303857847bba3/initscripts-${PV}.tar.bz2 \
+ file://functions.patch \
+ "
+
+SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
+SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a"
+
+do_configure[noexec] = "1"
+
+do_install(){
+ install -d ${D}/etc/init.d/
+ install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
+ if [ "${PN}" = "lsbinitscripts" ]; then
+ mv ${D}${sysconfdir}/init.d/functions ${D}${sysconfdir}/init.d/functions.${PN}
+ fi
+}
+
+pkg_postinst_${PN}(){
+ if [ "${PN}" = "lsbinitscripts" ]; then
+ update-alternatives --install ${sysconfdir}/init.d/functions functions functions.${PN} 10
+ fi
+}
+
+pkg_prerm_${PN}(){
+ if [ "${PN}" = "lsbinitscripts" ]; then
+ update-alternatives --remove functions ${sysconfdir}/init.d/functions.${PN}
+ fi
+}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] lsbinitscripts: Add initscripts to enhance init functions in an lsb image
2012-05-30 1:47 ` [PATCH 1/3] lsbinitscripts: " xiaofeng.yan
@ 2012-05-30 16:28 ` Richard Purdie
0 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2012-05-30 16:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Zhenfeng.Zhao
On Wed, 2012-05-30 at 09:47 +0800, xiaofeng.yan@windriver.com wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> The version of initscripts has more functions than the simple. \
> There could be some errors for current initscripts when running \
> some programe because of absent some functions provided by \
> initscripts.
>
> [YOCTO #2133]
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> meta/recipes-extended/lsb/lsbinitscripts_9.03.bb | 36 ++++++++++++++++++++++
> 1 files changed, 36 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
>
> diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> new file mode 100644
> index 0000000..5d2bca8
> --- /dev/null
> +++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
> @@ -0,0 +1,36 @@
> +DESCRIPTION = "SysV init scripts"
Surely we can be a little more descriptive here and at least mention
LSB?
> +SECTION = "base"
> +LICENSE = "GPLv2"
> +PR = "r0"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
> +
> +S="${WORKDIR}/initscripts-${PV}"
> +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.bz2/668fa2762b57ef75436303857847bba3/initscripts-${PV}.tar.bz2 \
> + file://functions.patch \
> + "
> +
> +SRC_URI[md5sum] = "668fa2762b57ef75436303857847bba3"
> +SRC_URI[sha256sum] = "d56547a68ce223a7413b2676650b042125f047c8d6d139c5b970e118b3dc958a"
> +
> +do_configure[noexec] = "1"
> +
> +do_install(){
> + install -d ${D}/etc/init.d/
> + install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
> + if [ "${PN}" = "lsbinitscripts" ]; then
> + mv ${D}${sysconfdir}/init.d/functions ${D}${sysconfdir}/init.d/functions.${PN}
> + fi
> +}
> +
> +pkg_postinst_${PN}(){
> + if [ "${PN}" = "lsbinitscripts" ]; then
> + update-alternatives --install ${sysconfdir}/init.d/functions functions functions.${PN} 10
> + fi
> +}
> +
> +pkg_prerm_${PN}(){
> + if [ "${PN}" = "lsbinitscripts" ]; then
> + update-alternatives --remove functions ${sysconfdir}/init.d/functions.${PN}
> + fi
> +}
Could you update this to use the recently added update-alternatives
class please?
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/3] lsbinitscripts: Patch file functions for confirming to an lsb image
2012-05-30 1:47 [PATCH 0/3 V1]:lsb: Add initscripts to enhance init functions in an lsb image xiaofeng.yan
2012-05-30 1:47 ` [PATCH 1/3] lsbinitscripts: " xiaofeng.yan
@ 2012-05-30 1:47 ` xiaofeng.yan
2012-05-30 1:47 ` [PATCH 3/3] task-core-lsb: Add another initscripts " xiaofeng.yan
2 siblings, 0 replies; 5+ messages in thread
From: xiaofeng.yan @ 2012-05-30 1:47 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Add the condition judgment to functions for avoiding to print error \
information when system start up at first.
[YOCTO #2133]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
.../lsb/lsbinitscripts/functions.patch | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/lsb/lsbinitscripts/functions.patch
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
new file mode 100644
index 0000000..1906b27
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+--- a/rc.d/init.d/functions 2009-12-10 05:24:11.000000000 +0800
++++ b/rc.d/init.d/functions.new 2012-05-29 14:48:53.900229435 +0800
+@@ -16,7 +16,8 @@
+ # Get a sane screen width
+ [ -z "${COLUMNS:-}" ] && COLUMNS=80
+
+-[ -z "${CONSOLETYPE:-}" ] && CONSOLETYPE="$(/sbin/consoletype)"
++
++[ -z "${CONSOLETYPE:-}" ] && [ -e /sbin/consoletype ] && CONSOLETYPE="$(/sbin/consoletype)"
+
+ if [ -f /etc/sysconfig/i18n -a -z "${NOLOCALE:-}" -a -z "${LANGSH_SOURCED:-}" ] ; then
+ . /etc/profile.d/lang.sh 2>/dev/null
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] task-core-lsb: Add another initscripts to an lsb image
2012-05-30 1:47 [PATCH 0/3 V1]:lsb: Add initscripts to enhance init functions in an lsb image xiaofeng.yan
2012-05-30 1:47 ` [PATCH 1/3] lsbinitscripts: " xiaofeng.yan
2012-05-30 1:47 ` [PATCH 2/3] lsbinitscripts: Patch file functions for confirming to " xiaofeng.yan
@ 2012-05-30 1:47 ` xiaofeng.yan
2 siblings, 0 replies; 5+ messages in thread
From: xiaofeng.yan @ 2012-05-30 1:47 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Initscripts with stronger functions will replace the simple one, \
which will avoid error when some packages need functions which could \
be absent in the simple initscripts.
[YOCTO #2133]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-extended/tasks/task-core-lsb.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index 99ca839..c8db300 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Small Image Tasks"
-PR = "r8"
+PR = "r9"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -80,6 +80,7 @@ RDEPENDS_task-core-sys-extended = "\
which \
xinetd \
zip \
+ lsbinitscripts\
"
RDEPENDS_task-core-db = "\
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-05-30 16:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 1:47 [PATCH 0/3 V1]:lsb: Add initscripts to enhance init functions in an lsb image xiaofeng.yan
2012-05-30 1:47 ` [PATCH 1/3] lsbinitscripts: " xiaofeng.yan
2012-05-30 16:28 ` Richard Purdie
2012-05-30 1:47 ` [PATCH 2/3] lsbinitscripts: Patch file functions for confirming to " xiaofeng.yan
2012-05-30 1:47 ` [PATCH 3/3] task-core-lsb: Add another initscripts " xiaofeng.yan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox