sanity.bbclass: allow dash to be used as /bin/sh, but print a warning

[vuplus_openembedded] / classes / package_ipk.bbclass

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index a20b6bb..d4cb3b6 100644 (file)
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -5,6 +5,7 @@ IMAGE_PKGTYPE ?= "ipk"
 
 IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf"
 IPKGCONF_SDK =  "${STAGING_ETCDIR_NATIVE}/opkg-sdk.conf"
+IPKGCONF_CANSDK =  "${STAGING_ETCDIR_NATIVE}/opkg-canadian-sdk.conf"
 
 python package_ipk_fn () {
        from bb import data
@@ -90,6 +91,10 @@ package_update_index_ipk () {
                        touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages
                        ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/
                fi
+               if [ -e ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/ ] ; then
+                       touch ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages
+                       ipkg-make-index -r ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages -p ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages -l ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/
+               fi
        done
 }
 
@@ -102,11 +107,13 @@ package_generate_ipkg_conf () {
        mkdir -p ${STAGING_ETCDIR_NATIVE}/
        echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_TARGET}
        echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_SDK}
+       echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_CANSDK}
        ipkgarchs="${PACKAGE_ARCHS}"
        priority=1
        for arch in $ipkgarchs; do
                echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
                echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
+               echo "arch ${SDK_SYS}-sdk-$arch $priority" >> ${IPKGCONF_CANSDK}
                priority=$(expr $priority + 5)
                if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
                        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
@@ -114,6 +121,9 @@ package_generate_ipkg_conf () {
                if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then
                        echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK}
                fi
+               if [ -e ${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch/Packages ] ; then
+                       echo "src oe-${SDK_SYS}-sdk-$arch file:${DEPLOY_DIR_IPK}/${SDK_SYS}-sdk-$arch" >> ${IPKGCONF_CANSDK}
+               fi
        done
 }
 
@@ -234,6 +244,10 @@ python do_package_ipk () {
                rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split()
                rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split()
                rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split()
+
+               if not '-locale-' and not '-dbg' and not '-dev' in pkgname:
+                       rdepends.append('%s-locale*' % pkgname)
+
                if rdepends:
                        ctrlfile.write("Depends: %s\n" % ", ".join(rdepends))
                if rsuggests:
@@ -283,16 +297,7 @@ python do_package_ipk () {
                        bb.utils.unlockfile(lf)
                        raise bb.build.FuncFailed("ipkg-build execution failed")
 
-               for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
-                       scriptfile = os.path.join(controldir, script)
-                       try:
-                               os.remove(scriptfile)
-                       except OSError:
-                               pass
-               try:
-                       os.rmdir(controldir)
-               except OSError:
-                       pass
+               bb.utils.prunedir(controldir)
                bb.utils.unlockfile(lf)
 }