Enlightenment-x11 meta for building.

[vuplus_openembedded] / classes / rootfs_ipk.oeclass

diff --git a/classes/rootfs_ipk.oeclass b/classes/rootfs_ipk.oeclass
index 9e8a072..772984c 100644 (file)
--- a/classes/rootfs_ipk.oeclass
+++ b/classes/rootfs_ipk.oeclass
@@ -15,7 +15,7 @@ do_rootfs[dirs] = ${TOPDIR}
 
 IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
 
-IMAGE_POSTPROCESS_COMMAND ?= ""
+ROOTFS_POSTPROCESS_COMMAND ?= ""
 
 # some default locales
 IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
@@ -38,6 +38,9 @@ arch any 1
 arch noarch 1
 arch ${TARGET_ARCH} 10
 EOF
+       if [ "${TARGET_ARCH}" != "${PACKAGE_ARCH}" ]; then
+               echo "arch ${PACKAGE_ARCH} 15" >>${T}/ipkg.conf
+       fi
        if [ ! -z ${MACHINE} ]; then
                echo "arch ${MACHINE} 20" >>${T}/ipkg.conf
        fi
@@ -47,10 +50,14 @@ EOF
                fi
        done
        ipkg-cl ${IPKG_ARGS} update
-       ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+       if [ ! -z "${IPKG_INSTALL}" ]; then
+               ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+       fi
 
        export D=${IMAGE_ROOTFS}
        export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+       mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/
+       grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf
 
        for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.preinst; do
                if [ -f $i ] && ! sh $i; then
@@ -58,7 +65,7 @@ EOF
                fi
        done
        for i in ${IMAGE_ROOTFS}/usr/lib/ipkg/info/*.postinst; do
-               if [ -f $i ] && ! sh $i; then
+               if [ -f $i ] && ! sh $i configure; then
                        ipkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
                fi
        done
@@ -66,7 +73,7 @@ EOF
        install -d ${IMAGE_ROOTFS}/${sysconfdir}
        echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
-       ${IMAGE_POSTPROCESS_COMMAND}
+       ${ROOTFS_POSTPROCESS_COMMAND}
 }
 
 fakeroot do_rootfs () {