diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 00:05:34 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-09-17 22:25:22 +0100 |
commit | 0d7207ca39d1671682f9467a804766b151048573 (patch) | |
tree | 88a9b9b8588d8df986f4d6f0f4a232ec41841261 /meta/classes | |
parent | af85ce4b4e675feb5796f87137c86d70c2f15b9a (diff) | |
download | openembedded-core-0d7207ca39d1671682f9467a804766b151048573.tar.gz openembedded-core-0d7207ca39d1671682f9467a804766b151048573.tar.bz2 openembedded-core-0d7207ca39d1671682f9467a804766b151048573.tar.xz openembedded-core-0d7207ca39d1671682f9467a804766b151048573.zip |
sdk.bbclass: Rename to nativesdk.bbclass
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/insane.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/nativesdk.bbclass (renamed from meta/classes/sdk.bbclass) | 14 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 2b0c28477..56d6a0b88 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -289,7 +289,7 @@ def package_qa_check_arch(path,name,d): target_arch = bb.data.getVar('TARGET_ARCH', d, True) # FIXME: Cross package confuse this check, so just skip them - if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): + if bb.data.inherits_class('cross', d) or bb.data.inherits_class('nativesdk', d): return True # avoid following links to /usr/bin (e.g. on udev builds) diff --git a/meta/classes/sdk.bbclass b/meta/classes/nativesdk.bbclass index 97fa8552c..d1b429488 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -6,7 +6,7 @@ EXCLUDE_FROM_WORLD = "1" OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" # Save PACKAGE_ARCH OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} -PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" +PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk" # Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" @@ -82,21 +82,21 @@ python __anonymous () { for dep in deps: if dep.endswith("-native") or dep.endswith("-cross"): continue - if not dep.endswith("-sdk"): + if not dep.endswith("-nativesdk"): if autoextend: - depends = depends.replace(dep, dep + "-sdk") - elif pn == 'gcc-cross-sdk': + depends = depends.replace(dep, dep + "-nativesdk") + elif pn == 'gcc-cross-nativesdk': continue else: - bb.note("%s has depends %s which doesn't end in -sdk?" % (pn, dep)) + bb.note("%s has depends %s which doesn't end in -nativesdk?" % (pn, dep)) bb.data.setVar("DEPENDS", depends, d) provides = bb.data.getVar("PROVIDES", d, True) for prov in provides.split(): if prov.find(pn) != -1: continue - if not prov.endswith("-sdk"): + if not prov.endswith("-nativesdk"): if autoextend: - provides = provides.replace(prov, prov + "-sdk") + provides = provides.replace(prov, prov + "-nativesdk") #else: # bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov)) bb.data.setVar("PROVIDES", provides, d) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 7b13dab1b..d327bfc6b 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -75,7 +75,7 @@ package_update_index_ipk () { packagedirs="${DEPLOY_DIR_IPK}" for arch in $ipkgarchs; do - packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" + packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk" done for pkgdir in $packagedirs; do @@ -100,8 +100,8 @@ package_generate_ipkg_conf () { if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} fi - 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} + if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk/Packages ] ; then + echo "src oe-${BUILD_ARCH}-$arch-nativesdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk" >> ${IPKGCONF_SDK} fi done } @@ -111,7 +111,7 @@ package_generate_archlist () { priority=1 for arch in $ipkgarchs; do echo "arch $arch $priority" >> ${IPKGCONF_TARGET} - echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK} + echo "arch ${BUILD_ARCH}-$arch-nativesdk $priority" >> ${IPKGCONF_SDK} priority=$(expr $priority + 5) done } |