Misc fixes from O.S. Systems tree

PATCH New Otavio Salvador 1 participant 3 messages May 30, 2011

lore

Share & tools

lore

Otavio Salvador

author

2011-05-30 14:48 UTC #0 lore raw

cover Misc fixes from O.S. Systems tree

The following changes since commit 83ce96f44516c8a4a44c8c0140949256f8422014:

bitbake.conf: make OVERRIDES match what people expect (2011-05-30 08:31:53 +0100)

are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (2):
busybox: enable mdev by default qmake_base.bbclass: fix lrelease/lupdate binary names

 meta/classes/qmake_base.bbclass                    |    5 +++++
 meta/recipes-core/busybox/busybox-1.18.4/defconfig |    2 +-
 meta/recipes-core/busybox/busybox.inc              |    1 -
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-05-30 14:49 UTC #1 lore raw

PATCH 1/2 busybox: enable mdev by default

Since we do not require a configuration file by default we don't force it's addition on the package. If the a layer wants to have it enabled it should also set the CONFFILES for busybox-mdev package.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-core/busybox/busybox-1.18.4/defconfig |    2 +-
 meta/recipes-core/busybox/busybox.inc              |    1 -
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

meta/recipes-core/busybox/busybox-1.18.4/defconfig +1 -1

index 5327a64..6b48cc1 100644
@@ -518,7 +518,7 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 CONFIG_LOSETUP=y
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
+CONFIG_MDEV=y
 # CONFIG_FEATURE_MDEV_CONF is not set
 # CONFIG_FEATURE_MDEV_RENAME is not set
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set

meta/recipes-core/busybox/busybox.inc +0 -1

index 341c5c4..de711d2 100644
@@ -29,7 +29,6 @@ INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
 INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
 INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 
 CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
-CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
 
 RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"

meta/recipes-core/busybox/busybox_1.18.4.bb +1 -1

index cf37650..a5080d5 100644
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-05-30 14:49 UTC #2 lore raw

PATCH 2/2 qmake_base.bbclass: fix lrelease/lupdate binary names

In reply to Otavio Salvador

To support translation, qmake based projects usually call lrelease and lupdate however OE changes the binary names so this needs some mangle to work out of box.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/classes/qmake_base.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

meta/classes/qmake_base.bbclass +5 -0

index a054efd..165d689 100644
@@ -92,6 +92,11 @@ qmake_base_do_configure() {
 		bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
 	fi
 
+	# Hack .pro files to use OE utilities
+	find -name '*.pro' \
+	     -exec sed -i -e 's,=\s*.*/lrelease,= ${OE_QMAKE_LRELEASE},g' \
+	                  -e 's,=\s*.*/lupdate,= ${OE_QMAKE_LUPDATE},g' '{}' ';'
+
 #bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
 	unset QMAKESPEC || true
 	${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"

Signature · 1 line

1.7.2.5