Skip to contentSkip to conversation

Misc fixes - pciutils and syslogd

PATCH Applied Joshua Lock 4 participants 8 messages Feb 1, 2012 – Feb 2, 2012

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Misc fixes - pciutils and syslogd

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

 .../conf/distro/include/distro_tracking_fields.inc |    2 +-
 .../pciutils/pciutils-3.1.9/configure.patch        |    2 +-
 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 +-
 6 files changed, 17 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.7.6
author
#1 lore raw

PATCH 1/3 pciutils: fix configure script for dash

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 <[email protected]>
---
 .../pciutils/pciutils-3.1.9/configure.patch        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch +1 -1
index 658e597..66c9f91 100644
@@ -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
Signature · 1 line
1.7.7.6
author
#3 lore raw

PATCH 2/3 sysklogd: various fixes so it starts/stops cleanly

In reply to Joshua Lock

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 <[email protected]>
---
 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(-)
meta/recipes-extended/sysklogd/files/sysklogd +1 -1
index e0fa7a8..dcbc81e 100755
@@ -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
meta/recipes-extended/sysklogd/files/syslog.conf +3 -3
index 795d735..7d1858c 100644
@@ -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.
meta/recipes-extended/sysklogd/sysklogd.inc +10 -4
index 0b84dac..d4eea41 100644
@@ -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
 }
meta/recipes-extended/sysklogd/sysklogd_1.5.bb +1 -1
index 187c9f4..b58094e 100644
@@ -1,5 +1,5 @@
 require sysklogd.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
 SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"
Signature · 1 line
1.7.7.6
author
#6 lore raw

PATCH 3/3 distro_tracking_fields: take sysklogd off Saul's plate

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +1 -1
index 1eb08a2..a214a37 100644
@@ -1883,7 +1883,7 @@ RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <[email protected]>"
 
 RECIPE_STATUS_pn-sysklogd = "red"    # need upgrade
 RECIPE_LAST_UPDATE_pn-sysklogd = "Aug 27, 2010"
-RECIPE_MAINTAINER_pn-sysklogd = "Saul Wold <[email protected]>"
+RECIPE_MAINTAINER_pn-sysklogd = "Joshua Lock <[email protected]>"
 RECIPE_LATEST_VERSION_pn-sysklogd = "1.5"
 
 RECIPE_STATUS_pn-gawk = "red"    # need upgrade
Signature · 1 line
1.7.7.6
#4 lore raw

Re: [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly

In reply to Joshua Lock

meta/recipes-extended/sysklogd/sysklogd.inc do_install () { · line 53

Quoted 12 lines · Joshua Lock
meta/recipes-extended/sysklogd/sysklogd.inc +0 -1
@@ -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

meta/recipes-extended/sysklogd/sysklogd.inc +5 -0
+       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.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
author
#5 lore raw

Re: [PATCH 2/3] sysklogd: various fixes so it starts/stops cleanly

Quoted 16 lines · Otavio Salvador

On Tue, Jan 31, 2012 at 22:58, Joshua Lock <[email protected] <mailto:[email protected]>> 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

Quoted 5 lines

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

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
#2 lore raw

Re: [PATCH 1/3] pciutils: fix configure script for dash

In reply to Joshua Lock
Quoted 4 lines · Joshua Lock

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 <[email protected]>

coincidently I have same patch locally and it works :)

Quoted 25 lines

---
 .../pciutils/pciutils-3.1.9/configure.patch        |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-bsp/pciutils/pciutils-3.1.9/configure.patch +0 -0
index 658e597..66c9f91 100644
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Applied
#7 lore raw
In reply to Joshua Lock
Quoted 15 lines · Joshua Lock

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)

Quoted 8 lines

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