]> git.openpandora.org Git - openembedded.git/commitdiff
Merge oe-devel@oe-devel.bkbits.net:packages
authorChris Larson <clarson@kergoth.com>
Fri, 3 Dec 2004 21:21:40 +0000 (21:21 +0000)
committerChris Larson <clarson@kergoth.com>
Fri, 3 Dec 2004 21:21:40 +0000 (21:21 +0000)
into odin.sc.ti.com:/home/kergoth/code/packages

2004/12/03 15:21:29-06:00 ti.com!kergoth
Update the PACKAGE_ARCH bits to suck a bit less.

BKrev: 41b0d8e4rsL0NS7oeNg9h5Mf9Y9g4A

16 files changed:
classes/base.oeclass
conf/oe.conf
gpe-session-scripts/gpe-session-scripts_0.61.oe
gpe-session-scripts/gpe-session-scripts_0.62.oe
meta/task-bootstrap.oe
mplayer/mplayer_1.0pre3try2.oe
opie-button-settings/opie-button-settings_1.1.7.oe
opie-button-settings/opie-button-settings_cvs.oe
opie-taskbar/opie-taskbar_1.1.7.oe
opie-taskbar/opie-taskbar_cvs.oe
qte/qte_2.3.7.oe
qte/qte_2.3.8-snapshot.oe
sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.oe
sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe
sysvinit/sysvinit_2.85.oe
sysvinit/sysvinit_2.86.oe

index 22447b36ce73e352a851f07c2d9531594fd5d188..caa40a9c0d20b1c9ee9c945d7a28c466294dbaec 100644 (file)
@@ -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
 }
 
index 5e186c38203b74386965fe3ab4aae5d3083a87e2..11b5631e5334dfdbe4694ef883226b2b5e449acb 100644 (file)
@@ -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.
index 41c6501698f2ce7c0707ff5ac1bb28e35ca6f9f8..acd5158828c03f91fed9b4a2ed410c93821c03de 100644 (file)
@@ -20,3 +20,5 @@ do_install_append() {
        fi
 }
 
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH := "${MACHINE_ARCH}"
index 4aa0ce01c1a83a27c888ed7864dee9e2772ceac4..de532928c1364db731726ab2e8248d33cca4174f 100644 (file)
@@ -25,3 +25,5 @@ do_install_append() {
        fi
 }
 
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH := "${MACHINE_ARCH}"
index 95541109f0a4633b70cb6852a6ec0879586f3f19..9199ed98cd3d0bae9a7039e777e3035a68e4941f 100644 (file)
@@ -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}"
 
index 3d43658fbc3368eefc9d44346a44c6b965d81dd9..009d258dcf2e33bc27d6847151f48c1c2f85efee 100644 (file)
@@ -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 "
index f2313f7f392e859c589fa798c0eddaf66ad21e48..f9796c260d99ccc081bdbc2f34a0849287ef0c06 100644 (file)
@@ -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}"
index 8e1ef8b79d761b0cf3b120d59e9f802452901ead..bd4b1dc041df8aef700ca677eb312a68747f0e4c 100644 (file)
@@ -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}"
index 460bbd725eb246eb2929fa9a2904e3411968495d..dbcb23c07db3da98497134f41812500ce1bf5ce4 100644 (file)
@@ -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}"
index 1c89d324277a2457bc41fcd1c7cda7516dad8d12..469c36bfd4c908a76fcdba5ef8b8740fe826f30e 100644 (file)
@@ -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}"
index c6ae04555800a3d9f034b99e58dc6bb030475b0d..104c4b34b9fbf5e45cea5a17cd57730db3bd8285 100644 (file)
@@ -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"
index 4ddfa978539dcc3fa3ecc14c21879fdacd521dac..137b504465ee9e494abf6a16bf79ff085d9edc90 100644 (file)
@@ -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"
index ef2bab794aef1490e6d8e0bdee766244a7a640f0..fd31c3b732a3999682ea137864f736f8e79d2d00 100644 (file)
@@ -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}"
index a56b6a440c59729383c96689e7f42e7a71781dcf..66bb84ac78ec7d3d6200f376f9d97575c92fbe9e 100644 (file)
@@ -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}"
index b1c2c01cc085cdb4ab5bb2953fa8d698a2a8c5c9..149e186537f1d650d4303744d5af5109cf2a2595 100644 (file)
@@ -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"
 
index da081f401bd64d8d668b6133d4b4f85475f10cd3..4c698c7aa58ee8c850456f973050d2fd57b8a8b6 100644 (file)
@@ -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"