* [PATCH 1/3] pciutils: fix configure script for dash
2012-02-01 0:58 [PATCH 0/3] Misc fixes - pciutils and syslogd Joshua Lock
@ 2012-02-01 0:58 ` Joshua Lock
2012-02-01 16:08 ` Khem Raj
2012-02-01 0:58 ` [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly Joshua Lock
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Joshua Lock @ 2012-02-01 0:58 UTC (permalink / raw)
To: openembedded-core
configure.patch was missing a closing quote in a sed expression which
causes script execution to error on less forgiving shells such as dash.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../pciutils/pciutils-3.1.9/configure.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
index 658e597..66c9f91 100644
--- a/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
@@ -67,7 +67,7 @@ diff -r af2b10cc3c14 lib/configure
cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
else
- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
-+ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/`}
++ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`}
fi
if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
then
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] pciutils: fix configure script for dash
2012-02-01 0:58 ` [PATCH 1/3] pciutils: fix configure script for dash Joshua Lock
@ 2012-02-01 16:08 ` Khem Raj
0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2012-02-01 16:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Jan 31, 2012 at 4:58 PM, Joshua Lock <josh@linux.intel.com> wrote:
> configure.patch was missing a closing quote in a sed expression which
> causes script execution to error on less forgiving shells such as dash.
>
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
coincidently I have same patch locally and it works :)
> ---
> .../pciutils/pciutils-3.1.9/configure.patch | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
> index 658e597..66c9f91 100644
> --- a/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
> +++ b/meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch
> @@ -67,7 +67,7 @@ diff -r af2b10cc3c14 lib/configure
> cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
> else
> - cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`
> -+ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/`}
> ++ cpu=${4:-`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'`}
> fi
> if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
> then
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly
2012-02-01 0:58 [PATCH 0/3] Misc fixes - pciutils and syslogd Joshua Lock
2012-02-01 0:58 ` [PATCH 1/3] pciutils: fix configure script for dash Joshua Lock
@ 2012-02-01 0:58 ` Joshua Lock
2012-02-01 2:06 ` Otavio Salvador
2012-02-01 0:58 ` [PATCH 3/3] distro_tracking_fields: take sysklogd off Saul's plate Joshua Lock
2012-02-02 18:28 ` [PATCH 0/3] Misc fixes - pciutils and syslogd Richard Purdie
3 siblings, 1 reply; 8+ messages in thread
From: Joshua Lock @ 2012-02-01 0:58 UTC (permalink / raw)
To: openembedded-core
This patch fixes several issues with the sysklogd recipe:
o Errors at start due to non-existent /var/log/news/ - every other log
file is created in /var/log, not a sub-directory. Do the same for news
logs.
o klogd would not be stopped due to pidfile recycling, give klogd its own
pidfile
o preinstalls failed at rootfs creation time by trying to access the host
root filesystem rather than a path relative to $D. Update the preinst to
test for $D and do the right thing.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-extended/sysklogd/files/sysklogd | 2 +-
meta/recipes-extended/sysklogd/files/syslog.conf | 6 +++---
meta/recipes-extended/sysklogd/sysklogd.inc | 14 ++++++++++----
meta/recipes-extended/sysklogd/sysklogd_1.5.bb | 2 +-
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd
index e0fa7a8..dcbc81e 100755
--- a/meta/recipes-extended/sysklogd/files/sysklogd
+++ b/meta/recipes-extended/sysklogd/files/sysklogd
@@ -15,7 +15,7 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
pidfile_syslogd=/var/run/syslogd.pid
-pidfile_klogd=/var/run/syslogd.pid
+pidfile_klogd=/var/run/klogd.pid
binpath_syslogd=/sbin/syslogd
binpath_klogd=/sbin/klogd
diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/meta/recipes-extended/sysklogd/files/syslog.conf
index 795d735..7d1858c 100644
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ b/meta/recipes-extended/sysklogd/files/syslog.conf
@@ -26,9 +26,9 @@ mail.err /var/log/mail.err
# Logging for INN news system
#
-news.crit /var/log/news/news.crit
-news.err /var/log/news/news.err
-news.notice -/var/log/news/news.notice
+news.crit /var/log/news.crit
+news.err /var/log/news.err
+news.notice -/var/log/news.notice
#
# Some `catch-all' logfiles.
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 0b84dac..d4eea41 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -46,12 +46,18 @@ do_install () {
pkg_preinst_${PN} () {
# all this is needed to avoid sysmlink errors,
# because update-rc.d runs before pkg_postinst
- if [ -e ${sysconfdir}/init.d/syslog -a ! -L ${sysconfdir}/init.d/syslog ]; then
+ if test "x$D" != "x"; then
+ ETC=$D/${sysconfdir}
+ else
+ ETC=${sysconfdir}
+ fi
+
+ if [ -e $ETC/init.d/syslog -a ! -L $ETC/init.d/syslog ]; then
echo "WARNING:" "non symlink ${sysconfdir}/init.d/syslog exist -> backup to ${sysconfdir}/init.d/syslog.old"
- mv ${sysconfdir}/init.d/syslog ${sysconfdir}/init.d/syslog.old
+ mv $ETC/init.d/syslog $ETC/init.d/syslog.old
fi
- if [ ! -e ${sysconfdir}/init.d/syslog ]; then
- ln -s dummy ${sysconfdir}/init.d/syslog
+ if [ ! -e $ETC/init.d/syslog ]; then
+ ln -s dummy $ETC/init.d/syslog
fi
}
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index 187c9f4..b58094e 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,5 +1,5 @@
require sysklogd.inc
-PR = "r4"
+PR = "r5"
SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly
2012-02-01 0:58 ` [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly Joshua Lock
@ 2012-02-01 2:06 ` Otavio Salvador
2012-02-01 6:45 ` Joshua Lock
0 siblings, 1 reply; 8+ messages in thread
From: Otavio Salvador @ 2012-02-01 2:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
On Tue, Jan 31, 2012 at 22:58, Joshua Lock <josh@linux.intel.com> wrote:
> @@ -46,12 +46,18 @@ do_install () {
> pkg_preinst_${PN} () {
> # all this is needed to avoid sysmlink errors,
> # because update-rc.d runs before pkg_postinst
> - if [ -e ${sysconfdir}/init.d/syslog -a ! -L
> ${sysconfdir}/init.d/syslog ]; then
> + if test "x$D" != "x"; then
> + ETC=$D/${sysconfdir}
> + else
> + ETC=${sysconfdir}
> + fi
>
You might use
ETC=$D${sysconfdir}
and avoid the if block as a whole.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
[-- Attachment #2: Type: text/html, Size: 1319 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly
2012-02-01 2:06 ` Otavio Salvador
@ 2012-02-01 6:45 ` Joshua Lock
0 siblings, 0 replies; 8+ messages in thread
From: Joshua Lock @ 2012-02-01 6:45 UTC (permalink / raw)
To: openembedded-core
On 31/01/12 18:06, Otavio Salvador wrote:
> On Tue, Jan 31, 2012 at 22:58, Joshua Lock <josh@linux.intel.com
> <mailto:josh@linux.intel.com>> wrote:
>
> @@ -46,12 +46,18 @@ do_install () {
> pkg_preinst_${PN} () {
> # all this is needed to avoid sysmlink errors,
> # because update-rc.d runs before pkg_postinst
> - if [ -e ${sysconfdir}/init.d/syslog -a ! -L
> ${sysconfdir}/init.d/syslog ]; then
> + if test "x$D" != "x"; then
> + ETC=$D/${sysconfdir}
> + else
> + ETC=${sysconfdir}
> + fi
>
>
> You might use
>
> ETC=$D${sysconfdir}
>
> and avoid the if block as a whole.
Quite right. That is cleaner, updated commit pushed to the same branch:
http://git.openembedded.org/openembedded-core-contrib/commit/?h=josh/fixes&id=937acf5b59e5a1de2cc334b069390b3ccdb055a0
Thanks for the review.
Cheers,
Joshua
--
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] distro_tracking_fields: take sysklogd off Saul's plate
2012-02-01 0:58 [PATCH 0/3] Misc fixes - pciutils and syslogd Joshua Lock
2012-02-01 0:58 ` [PATCH 1/3] pciutils: fix configure script for dash Joshua Lock
2012-02-01 0:58 ` [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly Joshua Lock
@ 2012-02-01 0:58 ` Joshua Lock
2012-02-02 18:28 ` [PATCH 0/3] Misc fixes - pciutils and syslogd Richard Purdie
3 siblings, 0 replies; 8+ messages in thread
From: Joshua Lock @ 2012-02-01 0:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 1eb08a2..a214a37 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -1883,7 +1883,7 @@ RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-sysklogd = "red" # need upgrade
RECIPE_LAST_UPDATE_pn-sysklogd = "Aug 27, 2010"
-RECIPE_MAINTAINER_pn-sysklogd = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_MAINTAINER_pn-sysklogd = "Joshua Lock <josh@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-sysklogd = "1.5"
RECIPE_STATUS_pn-gawk = "red" # need upgrade
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] Misc fixes - pciutils and syslogd
2012-02-01 0:58 [PATCH 0/3] Misc fixes - pciutils and syslogd Joshua Lock
` (2 preceding siblings ...)
2012-02-01 0:58 ` [PATCH 3/3] distro_tracking_fields: take sysklogd off Saul's plate Joshua Lock
@ 2012-02-02 18:28 ` Richard Purdie
3 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2012-02-02 18:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2012-01-31 at 16:58 -0800, Joshua Lock wrote:
> All,
>
> Here are a couple of patches to fix issues in test builds I've been running
> today.
>
> The first fixes our patched configure script in pciutils for users of the dash
> shell. The second ensures sysklogd is a little more useful out of the box.
>
> Cheers,
> Joshua
>
> The following changes since commit d7b13cd42ab8d5f44f97e119b73ec2e363677d26:
>
> useradd.bbclass: Fix missing quote (2012-01-27 23:57:33 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib josh/fixes
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/fixes
>
> Joshua Lock (3):
> pciutils: fix configure script for dash
> sysklogd: various fixes so it starts/stops cleanly
> distro_tracking_fields: take sysklogd off Saul's plate
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread