Update drivers

[vuplus_openembedded] / classes / package_ipk.bbclass

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index f05b744..420c892 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
@@ -16,7 +17,6 @@ python package_ipk_install () {
        # Warning - this function is not multimachine safe (see stagingdir reference)!
        #
 
-       import os, sys
        pkg = bb.data.getVar('PKG', d, 1)
        pkgfn = bb.data.getVar('PKGFN', d, 1)
        rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1)
@@ -30,6 +30,7 @@ python package_ipk_install () {
                bb.mkdirhier(rootfs)
                os.chdir(rootfs)
        except OSError:
+               import sys
                (type, value, traceback) = sys.exc_info()
                print value
                raise bb.build.FuncFailed
@@ -66,10 +67,16 @@ python package_ipk_install () {
                raise bb.build.FuncFailed
 }
 
+do_package_update_index_ipk[lockfiles] = "${DEPLOY_DIR_IPK}.lock"
+do_package_update_index_ipk[nostamp] = "1"
+do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk"
+do_package_update_index_ipk[recrdeptask] += "do_package_write_ipk"
+do_package_update_index_ipk[depends] += "ipkg-utils-native:do_populate_staging"
+
 #
 # Update the Packages index files in ${DEPLOY_DIR_IPK}
 #
-package_update_index_ipk () {
+do_package_update_index_ipk () {
        set -x
 
        ipkgarchs="${PACKAGE_ARCHS}"
@@ -78,6 +85,7 @@ package_update_index_ipk () {
                return
        fi
 
+       mkdir -p ${DEPLOY_DIR_IPK}
        touch ${DEPLOY_DIR_IPK}/Packages
        ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
 
@@ -90,6 +98,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 +114,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,18 +128,21 @@ 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
 }
 
 python do_package_ipk () {
-       import sys, re, copy
+       import re, copy
 
        workdir = bb.data.getVar('WORKDIR', d, 1)
        if not workdir:
                bb.error("WORKDIR not defined, unable to package")
                return
 
-       import os # path manipulations
+
        outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1)
        if not outdir:
                bb.error("DEPLOY_DIR_IPK not defined, unable to package")
@@ -157,10 +174,9 @@ python do_package_ipk () {
                        pkgname = pkg
                bb.data.setVar('PKG', pkgname, localdata)
 
-               overrides = bb.data.getVar('OVERRIDES', localdata)
+               overrides = bb.data.getVar('OVERRIDES', localdata, True)
                if not overrides:
                        raise bb.build.FuncFailed('OVERRIDES not defined')
-               overrides = bb.data.expand(overrides, localdata)
                bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
 
                bb.data.update_data(localdata)
@@ -170,15 +186,14 @@ python do_package_ipk () {
                bb.mkdirhier(pkgoutdir)
                os.chdir(root)
                from glob import glob
-               g = glob('*')
+               g = glob('*') + glob('.[!.]*')
                try:
                        del g[g.index('CONTROL')]
                        del g[g.index('./CONTROL')]
                except ValueError:
                        pass
                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)))
+                       bb.note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', localdata, True)))
                        bb.utils.unlockfile(lf)
                        continue
 
@@ -193,13 +208,14 @@ python do_package_ipk () {
                fields = []
                pe = bb.data.getVar('PE', d, 1)
                if pe and int(pe) > 0:
-                       fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
+                       fields.append(["Version: %s:%s-%s\n", ['PE', 'PKGV', 'PKGR']])
                else:
-                       fields.append(["Version: %s-%s\n", ['PV', 'PR']])
+                       fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']])
                fields.append(["Description: %s\n", ['DESCRIPTION']])
                fields.append(["Section: %s\n", ['SECTION']])
                fields.append(["Priority: %s\n", ['PRIORITY']])
                fields.append(["Maintainer: %s\n", ['MAINTAINER']])
+               fields.append(["License: %s\n", ['LICENSE']])
                fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
                fields.append(["OE: %s\n", ['PN']])
                fields.append(["Homepage: %s\n", ['HOMEPAGE']])
@@ -219,6 +235,7 @@ python do_package_ipk () {
                                                raise KeyError(f)
                                ctrlfile.write(c % tuple(pullData(fs, localdata)))
                except KeyError:
+                       import sys
                        (type, value, traceback) = sys.exc_info()
                        ctrlfile.close()
                        bb.utils.unlockfile(lf)
@@ -233,6 +250,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:
@@ -245,10 +266,9 @@ python do_package_ipk () {
                        ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces))
                if rconflicts:
                        ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts))
-               src_uri = bb.data.getVar("SRC_URI", localdata, 1)
-               if src_uri:
-                       src_uri = re.sub("\s+", " ", src_uri)
-                       ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
+               src_uri = bb.data.getVar("SRC_URI", localdata, 1) or d.getVar("FILE", True)
+               src_uri = re.sub("\s+", " ", src_uri)
+               ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
                ctrlfile.close()
 
                for script in ["preinst", "postinst", "prerm", "postrm"]:
@@ -282,21 +302,11 @@ 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)
 }
 
 python () {
-    import bb
     if bb.data.getVar('PACKAGES', d, True) != '':
         deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
         deps.append('ipkg-utils-native:do_populate_staging')
@@ -315,3 +325,4 @@ python do_package_write_ipk () {
 }
 do_package_write_ipk[dirs] = "${D}"
 addtask package_write_ipk before do_package_write after do_package
+addtask package_update_index_ipk before do_rootfs