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 | poky-0d7207ca39d1671682f9467a804766b151048573.tar.gz |
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 2b0c284775..56d6a0b887 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -289,7 +289,7 @@ def package_qa_check_arch(path,name,d): | |||
289 | target_arch = bb.data.getVar('TARGET_ARCH', d, True) | 289 | target_arch = bb.data.getVar('TARGET_ARCH', d, True) |
290 | 290 | ||
291 | # FIXME: Cross package confuse this check, so just skip them | 291 | # FIXME: Cross package confuse this check, so just skip them |
292 | if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): | 292 | if bb.data.inherits_class('cross', d) or bb.data.inherits_class('nativesdk', d): |
293 | return True | 293 | return True |
294 | 294 | ||
295 | # avoid following links to /usr/bin (e.g. on udev builds) | 295 | # avoid following links to /usr/bin (e.g. on udev builds) |
diff --git a/meta/classes/sdk.bbclass b/meta/classes/nativesdk.bbclass index 97fa8552cf..d1b429488b 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/nativesdk.bbclass | |||
@@ -6,7 +6,7 @@ EXCLUDE_FROM_WORLD = "1" | |||
6 | OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" | 6 | OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" |
7 | # Save PACKAGE_ARCH | 7 | # Save PACKAGE_ARCH |
8 | OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} | 8 | OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} |
9 | PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" | 9 | PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk" |
10 | # Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it | 10 | # Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it |
11 | OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" | 11 | OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" |
12 | BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" | 12 | BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" |
@@ -82,21 +82,21 @@ python __anonymous () { | |||
82 | for dep in deps: | 82 | for dep in deps: |
83 | if dep.endswith("-native") or dep.endswith("-cross"): | 83 | if dep.endswith("-native") or dep.endswith("-cross"): |
84 | continue | 84 | continue |
85 | if not dep.endswith("-sdk"): | 85 | if not dep.endswith("-nativesdk"): |
86 | if autoextend: | 86 | if autoextend: |
87 | depends = depends.replace(dep, dep + "-sdk") | 87 | depends = depends.replace(dep, dep + "-nativesdk") |
88 | elif pn == 'gcc-cross-sdk': | 88 | elif pn == 'gcc-cross-nativesdk': |
89 | continue | 89 | continue |
90 | else: | 90 | else: |
91 | bb.note("%s has depends %s which doesn't end in -sdk?" % (pn, dep)) | 91 | bb.note("%s has depends %s which doesn't end in -nativesdk?" % (pn, dep)) |
92 | bb.data.setVar("DEPENDS", depends, d) | 92 | bb.data.setVar("DEPENDS", depends, d) |
93 | provides = bb.data.getVar("PROVIDES", d, True) | 93 | provides = bb.data.getVar("PROVIDES", d, True) |
94 | for prov in provides.split(): | 94 | for prov in provides.split(): |
95 | if prov.find(pn) != -1: | 95 | if prov.find(pn) != -1: |
96 | continue | 96 | continue |
97 | if not prov.endswith("-sdk"): | 97 | if not prov.endswith("-nativesdk"): |
98 | if autoextend: | 98 | if autoextend: |
99 | provides = provides.replace(prov, prov + "-sdk") | 99 | provides = provides.replace(prov, prov + "-nativesdk") |
100 | #else: | 100 | #else: |
101 | # bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov)) | 101 | # bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov)) |
102 | bb.data.setVar("PROVIDES", provides, d) | 102 | bb.data.setVar("PROVIDES", provides, d) |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 7b13dab1be..d327bfc6b3 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -75,7 +75,7 @@ package_update_index_ipk () { | |||
75 | 75 | ||
76 | packagedirs="${DEPLOY_DIR_IPK}" | 76 | packagedirs="${DEPLOY_DIR_IPK}" |
77 | for arch in $ipkgarchs; do | 77 | for arch in $ipkgarchs; do |
78 | packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" | 78 | packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk" |
79 | done | 79 | done |
80 | 80 | ||
81 | for pkgdir in $packagedirs; do | 81 | for pkgdir in $packagedirs; do |
@@ -100,8 +100,8 @@ package_generate_ipkg_conf () { | |||
100 | if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then | 100 | if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then |
101 | echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} | 101 | echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} |
102 | fi | 102 | fi |
103 | if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then | 103 | if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk/Packages ] ; then |
104 | echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} | 104 | echo "src oe-${BUILD_ARCH}-$arch-nativesdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk" >> ${IPKGCONF_SDK} |
105 | fi | 105 | fi |
106 | done | 106 | done |
107 | } | 107 | } |
@@ -111,7 +111,7 @@ package_generate_archlist () { | |||
111 | priority=1 | 111 | priority=1 |
112 | for arch in $ipkgarchs; do | 112 | for arch in $ipkgarchs; do |
113 | echo "arch $arch $priority" >> ${IPKGCONF_TARGET} | 113 | echo "arch $arch $priority" >> ${IPKGCONF_TARGET} |
114 | echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK} | 114 | echo "arch ${BUILD_ARCH}-$arch-nativesdk $priority" >> ${IPKGCONF_SDK} |
115 | priority=$(expr $priority + 5) | 115 | priority=$(expr $priority + 5) |
116 | done | 116 | done |
117 | } | 117 | } |