Adapting some builds per the recent oe metadata handling changes.

BKrev: 40689285Q7zUjk20aonhEakS324blw

14 files changed, 31 insertions, 42 deletions

diff --git a/acpid/acpid_1.0.2.oe b/acpid/acpid_1.0.2.oe
index b2e17c787e..da375e1f1f 100644
--- a/acpid/acpid_1.0.2.oe
+++ b/acpid/acpid_1.0.2.oe
@@ -17,14 +17,14 @@ do_install () {
 }
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D acpid defaults
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D acpid remove
diff --git a/acpid/acpid_1.0.3.oe b/acpid/acpid_1.0.3.oe
index b2e17c787e..da375e1f1f 100644
--- a/acpid/acpid_1.0.3.oe
+++ b/acpid/acpid_1.0.3.oe
@@ -17,14 +17,14 @@ do_install () {
 }
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D acpid defaults
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D acpid remove
diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe
index 339c27e0b3..2c8d42ee4f 100644
--- a/apache/apache_2.0.48.oe
+++ b/apache/apache_2.0.48.oe
@@ -72,14 +72,14 @@ do_install_append () {
 }
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D httpd defaults 91 20
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D httpd remove
diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index 6224f4ae06..61e385fd4d 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -52,20 +52,20 @@ do_install() {
 	install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
 	install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
 	oe_soinstall .libs/libapm.so.1.0.0 ${D}/${libdir}/
-	            
+
 	cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd
 	chmod 755 ${D}/${sysconfdir}/init.d/apmd
 }
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D apmd defaults
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D apmd remove
diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe
index c6d2d0b957..163081be6c 100644
--- a/db/db3_3.2.9.oe
+++ b/db/db3_3.2.9.oe
@@ -26,13 +26,13 @@ do_configure_prepend () {
 		. ./RELEASE
 		(echo "AC_DEFUN(AM_VERSION_SET, [" &&
 		echo "AC_SUBST(DB_VERSION_MAJOR)" &&
-		echo "DB_VERSION_MAJOR=$DB_VERSION_MAJOR" &&
+		echo "DB_VERSION_MAJOR=\$DB_VERSION_MAJOR" &&
 		echo "AC_SUBST(DB_VERSION_MINOR)" &&
-		echo "DB_VERSION_MINOR=$DB_VERSION_MINOR" &&
+		echo "DB_VERSION_MINOR=\$DB_VERSION_MINOR" &&
 		echo "AC_SUBST(DB_VERSION_PATCH)" &&
-		echo "DB_VERSION_PATCH=$DB_VERSION_PATCH" &&
+		echo "DB_VERSION_PATCH=\$DB_VERSION_PATCH" &&
 		echo "AC_SUBST(DB_VERSION_STRING)" &&
-		echo "DB_VERSION_STRING=\"\\\"$DB_VERSION_STRING\\\"\"" &&
+		echo "DB_VERSION_STRING=\"\\\"\$DB_VERSION_STRING\\\"\"" &&
 		echo "])dnl") > acinclude.m4
 	)
 }
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 50d4ec2178..1d3a4f3137 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -91,7 +91,7 @@ glibcbuild_do_unpack () {
 	cp -a "${FILESDIR}/autoconf.h" "${WORKDIR}/linux/include/linux/"
 	sed 's:\(^.*define.*__NR_waitpid.*$\):/*&*/:' < ${WORKDIR}/linux/include/asm-arm/unistd.h > ${WORKDIR}/linux/include/asm-arm/unistd.h.new
 	mv ${WORKDIR}/linux/include/asm-arm/unistd.h.new ${WORKDIR}/linux/include/asm-arm/unistd.h
-	case $TARGET_ARCH in
+	case ${TARGET_ARCH} in
 		alpha*)   TARGET_ARCH=alpha ;;
 		arm*)     TARGET_ARCH=arm ;;
 		cris*)    TARGET_ARCH=cris ;;
diff --git a/ifplugd/ifplugd_0.20.oe b/ifplugd/ifplugd_0.20.oe
index 0e2770a920..c7916009b7 100644
--- a/ifplugd/ifplugd_0.20.oe
+++ b/ifplugd/ifplugd_0.20.oe
@@ -9,14 +9,14 @@ inherit autotools
 EXTRA_OECONF = "--disable-lynx"
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D ifplugd defaults
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D ifplugd remove
diff --git a/netbase/netbase_4.16.oe b/netbase/netbase_4.16.oe
index 5d4e529e2b..9fe1f22c7c 100644
--- a/netbase/netbase_4.16.oe
+++ b/netbase/netbase_4.16.oe
@@ -15,14 +15,14 @@ do_install () {
 }
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D networking start 40 S . stop 40 0 6 1 .
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D networking remove
diff --git a/netkit-base/netkit-base_0.17.oe b/netkit-base/netkit-base_0.17.oe
index b5b56cb630..7dccf231c6 100644
--- a/netkit-base/netkit-base_0.17.oe
+++ b/netkit-base/netkit-base_0.17.oe
@@ -19,14 +19,14 @@ do_install () {
 }
 
 pkg_postinst () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D inetd start 20 2 3 4 5 . stop 20 0 1 6 .
 }
 
 pkg_prerm () {
-	if test -n "$D"; then
+	if test -n "${D}"; then
 		D="-r $D"
 	fi
 	update-rc.d $D inetd remove
diff --git a/qmake/qmake-native_3.2.3.oe b/qmake/qmake-native_3.2.3.oe
index aebb13a57c..2f14be3809 100644
--- a/qmake/qmake-native_3.2.3.oe
+++ b/qmake/qmake-native_3.2.3.oe
@@ -19,11 +19,8 @@ EXTRA_OECONF = "-static -no-gif -no-sm -system-zlib -system-libjpeg -system-libp
 EXTRA_OEMAKE = "-e"
 
 do_configure() {
-        if [ "$BUILD_ARCH" = "i686" ]; then
-                BUILD_ARCH=x86
-        fi
-        echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
-
+        oenote ./configure ${EXTRA_OECONF}
+        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {
diff --git a/qte/qte_2.3.6.oe b/qte/qte_2.3.6.oe
index 9f9f4772fb..704ba4dd8b 100644
--- a/qte/qte_2.3.6.oe
+++ b/qte/qte_2.3.6.oe
@@ -43,10 +43,8 @@ export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 
 do_configure() {
-	if [ "$BUILD_ARCH" = "i686" ]; then
-		BUILD_ARCH=x86
-	fi
-	echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
+	oenote ./configure ${EXTRA_OECONF}
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 83cb24e4cf..6d52a29547 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -44,10 +44,8 @@ export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 
 do_configure() {
-	if [ "$BUILD_ARCH" = "i686" ]; then
-		BUILD_ARCH=x86
-	fi
-	echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
+	oenote ./configure ${EXTRA_OECONF}
+	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {
diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe
index b1dc9de35a..fb07b6ed47 100644
--- a/qte/qte_2.3.8-snap.oe
+++ b/qte/qte_2.3.8-snap.oe
@@ -44,10 +44,8 @@ export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
 
 do_configure() {
-    if [ "$BUILD_ARCH" = "i686" ]; then
-        BUILD_ARCH=x86
-    fi
-    echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
+    oenote ./configure ${EXTRA_OECONF}
+    echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {
diff --git a/uicmoc/uicmoc-native_2.3.7.oe b/uicmoc/uicmoc-native_2.3.7.oe
index 9417027f05..02e2128ecf 100644
--- a/uicmoc/uicmoc-native_2.3.7.oe
+++ b/uicmoc/uicmoc-native_2.3.7.oe
@@ -16,15 +16,13 @@ export SYSCONF_LINK  = "${CCACHE} g++"
 
 ARCH_i686 = "x86"
 
-EXTRA_OECONF = "-depths 8,16 -xplatform linux-x86-g++ -no-qvfb -no-g++-exceptions -no-jpeg -no-mng -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm -no-opengl -static -qconfig oe"
+EXTRA_OECONF = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm -no-opengl -static -qconfig oe"
 EXTRA_OEMAKE = "-e"
 
 do_configure() {
-        if [ "$BUILD_ARCH" = "i686" ]; then
-                BUILD_ARCH=x86
-        fi
 	echo "#define QT_NO_FREETYPE" >>src/tools/qconfig-oe.h
-        echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
+        oenote ./configure ${EXTRA_OECONF}
+        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
 
 do_compile() {