1 files changed, 27 insertions, 10 deletions

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index bef055c6f5..b6c706c580 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -8,8 +8,18 @@ ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
 do_rootfs[recrdeptask] += "do_package_write_deb"
 
+DEB_POSTPROCESS_COMMANDS = "rootfs_install_all_locales; "
+
 opkglibdir = "${localstatedir}/lib/opkg"
 
+deb_package_setflag() {
+        sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/lib/dpkg/status
+}
+
+deb_package_getflag() {
+        cat ${IMAGE_ROOTFS}/var/lib/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}"
+}
+
 fakeroot rootfs_deb_do_rootfs () {
         set +e
 
@@ -28,25 +38,18 @@ fakeroot rootfs_deb_do_rootfs () {
         export INSTALL_TASK_DEB="rootfs"
 
         package_install_internal_deb
-
+        ${DEB_POSTPROCESS_COMMANDS}
 
         export D=${IMAGE_ROOTFS}
         export OFFLINE_ROOT=${IMAGE_ROOTFS}
         export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
         export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
 
-        _flag () {
-                sed -i -e "/^Package: $2\$/{n; s/Status: install ok .*/Status: install ok $1/;}" ${IMAGE_ROOTFS}/var/lib/dpkg/status
-        }
-        _getflag () {
-                cat ${IMAGE_ROOTFS}/var/lib/dpkg/status | sed -n -e "/^Package: $2\$/{n; s/Status: install ok .*/$1/; p}"
-        }
-
         # Attempt to run preinsts
         # Mark packages with preinst failures as unpacked
         for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.preinst; do
                 if [ -f $i ] && ! sh $i; then
-                        _flag unpacked `basename $i .preinst`
+                        deb_package_setflag unpacked `basename $i .preinst`
                 fi
         done
 
@@ -54,7 +57,7 @@ fakeroot rootfs_deb_do_rootfs () {
         # Mark packages with postinst failures as unpacked
         for i in ${IMAGE_ROOTFS}/var/lib/dpkg/info/*.postinst; do
                 if [ -f $i ] && ! sh $i configure; then
-                        _flag unpacked `basename $i .postinst`
+                        deb_package_setflag unpacked `basename $i .postinst`
                 fi
         done
 
@@ -104,3 +107,17 @@ list_package_depends() {
 list_package_recommends() {
         ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
 }
+
+rootfs_check_package_exists() {
+        if [ `apt-cache showpkg $1 | wc -l` -gt 2 ]; then
+                echo $1
+        fi
+}
+
+rootfs_install_packages() {
+        ${STAGING_BINDIR_NATIVE}/apt-get install $@ --force-yes --allow-unauthenticated
+
+        for pkg in $@ ; do
+                deb_package_setflag installed $pkg
+        done
+}