classes: Sync various tweaks from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 13 insertions, 11 deletions

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index dbbdee3686..40402921cf 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -75,7 +75,6 @@ fakeroot do_rootfs () {
         mkdir -p ${IMAGE_ROOTFS}
 
         if [ "${USE_DEVFS}" != "1" ]; then
-                mkdir -p ${IMAGE_ROOTFS}/dev
                 for devtable in ${@get_devtable_list(d)}; do
                         makedevs -r ${IMAGE_ROOTFS} -D $devtable
                 done
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 550436a5eb..2ab537f174 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -136,7 +136,7 @@ python do_package_deb () {
             del g[g.index('./DEBIAN')]
         except ValueError:
             pass
-        if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
+        if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
             from bb import note
             note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
             unlockfile(lf)
@@ -253,7 +253,6 @@ python do_package_deb () {
             os.rmdir(controldir)
         except OSError:
             pass
-        del localdata
 
         unlockfile(lf)
 }
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 1175d1e751..9e654aac5e 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -152,7 +152,7 @@ python do_package_ipk () {
                 localdata = bb.data.createCopy(d)
                 root = "%s/install/%s" % (workdir, pkg)
 
-                lf = lockfile(root + ".lock")
+                lf = lockfile(root + ".lock")
 
                 bb.data.setVar('ROOT', '', localdata)
                 bb.data.setVar('ROOT_%s' % pkg, root, localdata)
@@ -179,11 +179,12 @@ python do_package_ipk () {
                         del g[g.index('./CONTROL')]
                 except ValueError:
                         pass
-                if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
+                if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
                         from bb import note
                         note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
                         unlockfile(lf)
                         continue
+
                 controldir = os.path.join(root, 'CONTROL')
                 bb.mkdirhier(controldir)
                 try:
@@ -289,7 +290,6 @@ python do_package_ipk () {
                         os.rmdir(controldir)
                 except OSError:
                         pass
-                del localdata
                 unlockfile(lf)
 }
 
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 3c9d03f9dd..50df68c76f 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -19,11 +19,15 @@ fakeroot rootfs_ipk_do_rootfs () {
         mkdir -p ${T}
 
         ipkg-cl ${IPKG_ARGS} update
-        if [ ! -z "${LINGUAS_INSTALL}" ]; then
-                ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
-                for i in ${LINGUAS_INSTALL}; do
-                        ipkg-cl ${IPKG_ARGS} install $i
-                done
+
+        # Uclibc builds don't provide this stuff...
+        if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
+                if [ ! -z "${LINGUAS_INSTALL}" ]; then
+                        ipkg-cl ${IPKG_ARGS} install glibc-localedata-i18n
+                        for i in ${LINGUAS_INSTALL}; do
+                                ipkg-cl ${IPKG_ARGS} install $i 
+                        done
+                fi
         fi
         if [ ! -z "${PACKAGE_INSTALL}" ]; then
                 ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}