summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/base.oeclass21
-rw-r--r--conf/oe.conf2
-rw-r--r--gpe-session-scripts/gpe-session-scripts_0.61.oe2
-rw-r--r--gpe-session-scripts/gpe-session-scripts_0.62.oe2
-rw-r--r--meta/task-bootstrap.oe4
-rw-r--r--mplayer/mplayer_1.0pre3try2.oe6
-rw-r--r--opie-button-settings/opie-button-settings_1.1.7.oe2
-rw-r--r--opie-button-settings/opie-button-settings_cvs.oe2
-rw-r--r--opie-taskbar/opie-taskbar_1.1.7.oe3
-rw-r--r--opie-taskbar/opie-taskbar_cvs.oe3
-rw-r--r--qte/qte_2.3.7.oe2
-rw-r--r--qte/qte_2.3.8-snapshot.oe2
-rw-r--r--sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe6
-rw-r--r--sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe6
-rw-r--r--sysvinit/sysvinit_2.85.oe8
-rw-r--r--sysvinit/sysvinit_2.86.oe8
16 files changed, 33 insertions, 46 deletions
diff --git a/classes/base.oeclass b/classes/base.oeclass
index 22447b36ce..caa40a9c0d 100644
--- a/classes/base.oeclass
+++ b/classes/base.oeclass
@@ -248,12 +248,8 @@ python do_showdata() {
oe.data.emit_env(sys.__stdout__, d, True)
# emit the metadata which isnt valid shell
for e in d.keys():
- if oe.data.getVarFlag(e, 'python', d):
- sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, oe.data.getVar(e, d, 1)))
- elif oe.data.getVarFlag(e, 'func', d):
- sys.__stdout__.write("\n%s () {\n%s}\n" % (e, oe.data.getVar(e, d, 1)))
- else:
- sys.__stdout__.write("%s=%s\n" % (e, oe.data.getVar(e, d, 1)))
+ if oe.data.getVarFlag(e, 'python', d):
+ sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, oe.data.getVar(e, d, 1)))
}
addtask listtasks
@@ -659,23 +655,20 @@ python __anonymous () {
python () {
import oe, os
- machine = oe.data.getVar('MACHINE', d, 1)
- if not machine:
- # can't specialise if MACHINE not defined
- return
+ mach_arch = oe.data.getVar('MACHINE_ARCH', d, 1)
old_arch = oe.data.getVar('PACKAGE_ARCH', d, 1)
- if (old_arch == machine):
+ if (old_arch == mach_arch):
# Nothing to do
return
paths = []
for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
- paths.append(oe.data.expand(os.path.join(p, machine), d))
+ paths.append(oe.data.expand(os.path.join(p, mach_arch), d))
for s in oe.data.getVar('SRC_URI', d, 1).split():
local = oe.data.expand(oe.fetch.localpath(s, d), d)
for mp in paths:
if local.startswith(mp):
-# oe.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, machine))
- oe.data.setVar('PACKAGE_ARCH', machine, d)
+# oe.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, mach_arch))
+ oe.data.setVar('PACKAGE_ARCH', mach_arch, d)
return
}
diff --git a/conf/oe.conf b/conf/oe.conf
index 5e186c3820..11b5631e53 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -45,7 +45,7 @@ TARGET_PREFIX = "${TARGET_SYS}-"
TARGET_CC_ARCH = ""
PACKAGE_ARCH = "${HOST_ARCH}"
-MACHINE_ARCH = "${MACHINE}"
+MACHINE_ARCH = "${@[oe.data.getVar('PACKAGE_ARCH', d, 1), oe.data.getVar('MACHINE', d, 1)][bool(oe.data.getVar('MACHINE', d, 1))]}"
##################################################################
# Date/time variables.
diff --git a/gpe-session-scripts/gpe-session-scripts_0.61.oe b/gpe-session-scripts/gpe-session-scripts_0.61.oe
index 41c6501698..acd5158828 100644
--- a/gpe-session-scripts/gpe-session-scripts_0.61.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.61.oe
@@ -20,3 +20,5 @@ do_install_append() {
fi
}
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/gpe-session-scripts/gpe-session-scripts_0.62.oe b/gpe-session-scripts/gpe-session-scripts_0.62.oe
index 4aa0ce01c1..de532928c1 100644
--- a/gpe-session-scripts/gpe-session-scripts_0.62.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.62.oe
@@ -25,3 +25,5 @@ do_install_append() {
fi
}
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
index 95541109f0..9199ed98cd 100644
--- a/meta/task-bootstrap.oe
+++ b/meta/task-bootstrap.oe
@@ -2,6 +2,10 @@ DESCRIPTION = "Core packages required for a basic installation"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
PR = "r10"
+# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
+# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+
ALLOW_EMPTY = 1
PACKAGES = "${PN}"
diff --git a/mplayer/mplayer_1.0pre3try2.oe b/mplayer/mplayer_1.0pre3try2.oe
index 3d43658fbc..009d258dcf 100644
--- a/mplayer/mplayer_1.0pre3try2.oe
+++ b/mplayer/mplayer_1.0pre3try2.oe
@@ -14,9 +14,9 @@ DEPENDS_corgi += "sharp-aticore"
DEPENDS_shepherd += "sharp-aticore"
DEPENDS_husky += "sharp-aticore"
-PACKAGE_ARCH_corgi = "${MACHINE}"
-PACKAGE_ARCH_shepherd = "${MACHINE}"
-PACKAGE_ARCH_husky = "${MACHINE}"
+PACKAGE_ARCH_corgi := "${MACHINE_ARCH}"
+PACKAGE_ARCH_shepherd := "${MACHINE_ARCH}"
+PACKAGE_ARCH_husky := "${MACHINE_ARCH}"
SRC_URI_append_corgi = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \
file://Makefile-vidix.patch;patch=0 "
diff --git a/opie-button-settings/opie-button-settings_1.1.7.oe b/opie-button-settings/opie-button-settings_1.1.7.oe
index f2313f7f39..f9796c260d 100644
--- a/opie-button-settings/opie-button-settings_1.1.7.oe
+++ b/opie-button-settings/opie-button-settings_1.1.7.oe
@@ -29,4 +29,4 @@ FILES_opie-button-settings-pics = "${palmtopdir}/pics/devicebuttons/z*"
FILES_opie-button-settings-pics_h3600 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_h3900 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_simpad = "${palmtopdir}/pics/devicebuttons/simpad*"
-PACKAGE_ARCH_opie-button-settings-pics = "${MACHINE_ARCH}"
+PACKAGE_ARCH_opie-button-settings-pics := "${MACHINE_ARCH}"
diff --git a/opie-button-settings/opie-button-settings_cvs.oe b/opie-button-settings/opie-button-settings_cvs.oe
index 8e1ef8b79d..bd4b1dc041 100644
--- a/opie-button-settings/opie-button-settings_cvs.oe
+++ b/opie-button-settings/opie-button-settings_cvs.oe
@@ -28,4 +28,4 @@ FILES_opie-button-settings-pics = "${palmtopdir}/pics/devicebuttons/z*"
FILES_opie-button-settings-pics_h3600 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_h3900 = "${palmtopdir}/pics/devicebuttons/ipaq*"
FILES_opie-button-settings-pics_simpad = "${palmtopdir}/pics/devicebuttons/simpad*"
-PACKAGE_ARCH_opie-button-settings-pics = "${MACHINE_ARCH}"
+PACKAGE_ARCH_opie-button-settings-pics := "${MACHINE_ARCH}"
diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
index 460bbd725e..dbcb23c07d 100644
--- a/opie-taskbar/opie-taskbar_1.1.7.oe
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe
@@ -131,5 +131,4 @@ do_install_append_tosa () {
FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 1c89d32427..469c36bfd4 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -128,5 +128,4 @@ do_install_append_tosa () {
FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index c6ae045558..104c4b34b9 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -164,7 +164,7 @@ ${sbindir}/update-qtfontdir
PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica-small qte-font-helvetica-large \
qte-font-smoothtimes qte-font-smallsmooth qte-font-unicode qte-font-lcd \
qte-font-japanese qte-font-micro qte-font-courier"
-PACKAGE_ARCH_libqte2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_libqte2 := "${MACHINE_ARCH}"
FILES_${PN} = ""
FILES_libqte2 = "${palmtopdir}/lib/libqte.so* /usr/sbin/update-qtfontdir"
diff --git a/qte/qte_2.3.8-snapshot.oe b/qte/qte_2.3.8-snapshot.oe
index 4ddfa97853..137b504465 100644
--- a/qte/qte_2.3.8-snapshot.oe
+++ b/qte/qte_2.3.8-snapshot.oe
@@ -166,7 +166,7 @@ PACKAGES = "libqte2 qte-font-fixed qte-font-helvetica-small qte-font-helvetica-l
qte-font-unicode qte-font-lcd qte-font-japanese qte-font-micro \
qte-font-courier"
-PACKAGE_ARCH_libqte2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_libqte2 := "${MACHINE_ARCH}"
FILES_${PN} = ""
FILES_libqte2 = "${palmtopdir}/lib/libqte.so* /usr/sbin/update-qtfontdir"
diff --git a/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe b/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe
index ef2bab794a..fd31c3b732 100644
--- a/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe
+++ b/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe
@@ -23,8 +23,4 @@ do_install() {
FILES_${PN} = "/"
-python () {
- mach = oe.data.getVar('MACHINE', d, 1)
- if mach:
- oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
-}
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe b/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
index a56b6a440c..66bb84ac78 100644
--- a/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
+++ b/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
@@ -28,8 +28,4 @@ do_install() {
FILES_${PN} = "/"
-python () {
- mach = oe.data.getVar('MACHINE', d, 1)
- if mach:
- oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
-}
+PACKAGE_ARCH := "${MACHINE_ARCH}"
diff --git a/sysvinit/sysvinit_2.85.oe b/sysvinit/sysvinit_2.85.oe
index b1c2c01cc0..149e186537 100644
--- a/sysvinit/sysvinit_2.85.oe
+++ b/sysvinit/sysvinit_2.85.oe
@@ -10,11 +10,9 @@ FILES_${PN} = "/sbin ${bindir} ${sysconfdir}"
FILES_sysv-rc = "${sbindir}"
PR = "r1"
-python () {
- mach = oe.data.getVar('MACHINE', d, 1)
- if mach:
- oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
-}
+# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
+# Set PACKAGE_ARCH appropriately.
+PACKAGE_ARCH := "${MACHINE_ARCH}"
USE_VT ?= "1"
diff --git a/sysvinit/sysvinit_2.86.oe b/sysvinit/sysvinit_2.86.oe
index da081f401b..4c698c7aa5 100644
--- a/sysvinit/sysvinit_2.86.oe
+++ b/sysvinit/sysvinit_2.86.oe
@@ -7,11 +7,9 @@ HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
FILES_${PN} += "/sbin /bin"
PR = "r0"
-python () {
- mach = oe.data.getVar('MACHINE', d, 1)
- if mach:
- oe.data.setVar('PACKAGE_ARCH', oe.data.getVar('MACHINE_ARCH', d, 1), d)
-}
+# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
+# Set PACKAGE_ARCH appropriately.
+PACKAGE_ARCH := "${MACHINE_ARCH}"
USE_VT ?= "1"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 18:39:25 +0000