diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-12-14 12:49:04 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-12-14 12:49:04 +0000 |
| commit | fe938bbed352811a2e176797d9f5295d270564e8 (patch) | |
| tree | b482ac8d4bbe1d878d08b41d7f73d95b00459474 /conf | |
| parent | 8c45dce3743063bf4f15c5c17597fbeb15061d5f (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/12/14 12:27:14+01:00 (none)!br1
Merge http://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/oe/openembedded
2004/12/14 12:26:43+01:00 (none)!br1
add mtx-1 i2c support
2004/12/14 11:02:03+01:00 (none)!br1
unik-olsrd 0.4.8
2004/12/14 11:00:53+01:00 (none)!br1
little fixes for bitbake
2004/12/14 10:59:06+01:00 (none)!br1
nylon updates
2004/12/14 03:27:14-06:00 ti.com!kergoth
More PACKAGE_ARCH/MACHINE_ARCH updates for the multi-z builds.
BKrev: 41bee140kQ_QwKwcIxgyouZUyeqwmA
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/distro/nylon.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index fa3e726853..ccb740ed0b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -45,7 +45,7 @@ TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" PACKAGE_ARCH = "${HOST_ARCH}" -MACHINE_ARCH = "${@[bb.data.getVar('PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" +MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" ################################################################## # Date/time variables. diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 4b651ff8af..df5ce3078e 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -30,6 +30,7 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.14.90.0.7" +PREFERRED_VERSION_unik-olsrd = "0.4.8" PREFERRED_VERSION_prism54-firmware = "1.0.3.0" # use meshcub.org mirrors |