aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-11-20 11:04:45 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-11-20 11:04:45 +0000
commit3cb946597ed916b167109b9faecb8c6eb0a695e8 (patch)
tree07f9da78aeef27659c771a639c19a2b5d4b93cdb /classes
parentecccb2d03ca2ed8bc4f5811dcfe796a403bf3a55 (diff)
downloadopenembedded-3cb946597ed916b167109b9faecb8c6eb0a695e8.tar.gz
Convert IPKG_ARCHS -> PACKAGE_ARCHS, IPKG_EXTRA_ARCHS -> PACKAGE_EXTRA_ARCHS in preparation for deb handling
Diffstat (limited to 'classes')
-rw-r--r--classes/multimachine.bbclass2
-rw-r--r--classes/package_ipk.bbclass4
-rw-r--r--classes/packaged-staging.bbclass2
-rw-r--r--classes/rootfs_ipk.bbclass2
4 files changed, 5 insertions, 5 deletions
diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass
index d63aeb6d73..4187a00ec3 100644
--- a/classes/multimachine.bbclass
+++ b/classes/multimachine.bbclass
@@ -17,7 +17,7 @@ def multi_machine_after_parse(d):
# We could look for != PACKAGE_ARCH here but how to choose
# if multiple differences are present?
- # Look through IPKG_ARCHS for the priority order?
+ # Look through PACKAGE_ARCHS for the priority order?
if pkgarch and pkgarch == macharch:
multiarch = macharch
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 47cff1d27c..02bac7d62b 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -30,9 +30,9 @@ python package_ipk_install () {
# Generate ipk.conf if it or the stamp doesnt exist
conffile = os.path.join(stagingdir,"ipkg.conf")
if not os.access(conffile, os.R_OK):
- ipkg_archs = bb.data.getVar('IPKG_ARCHS',d)
+ ipkg_archs = bb.data.getVar('PACKAGE_ARCHS',d)
if ipkg_archs is None:
- bb.error("IPKG_ARCHS missing")
+ bb.error("PACKAGE_ARCHS missing")
raise FuncFailed
ipkg_archs = ipkg_archs.split()
arch_priority = 1
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 9aba940da4..4b4ebb58bf 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -113,7 +113,7 @@ do_stage_prepend() {
rm ${DEPLOY_DIR_PSTAGE}/ipkg.conf
fi
- ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
+ ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
priority=1
for arch in $ipkgarchs; do
echo "arch $arch $priority" >> ${DEPLOY_DIR_PSTAGE}/ipkg.conf
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index c4b2991874..8020fd0ca3 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -42,7 +42,7 @@ real_do_rootfs () {
fi
mkdir -p ${T}
echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
- ipkgarchs="${IPKG_ARCHS}"
+ ipkgarchs="${PACKAGE_ARCHS}"
priority=1
for arch in $ipkgarchs; do
echo "arch $arch $priority" >> ${T}/ipkg.conf