summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-21 11:26:25 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-21 11:26:25 +0000
commit6fc273a105201396c0dda161a00e091d2c0b9d17 (patch)
tree11f1b92435a2d5ba60b94f54c8a7509f5e60f167 /meta
parent2e56dd0a0038c26a2b83709dfe8c9246120b3612 (diff)
downloadpoky-6fc273a105201396c0dda161a00e091d2c0b9d17.tar.gz
bitbake.conf: Add nasty workaround to deal with machine specific and 'all' architecture packages. This problem needs to be revisisted
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4908 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf10
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
2 files changed, 11 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c973ce1da4..8ac5846052 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -94,6 +94,8 @@ PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}
94MULTIMACH_ARCH = "${PACKAGE_ARCH}" 94MULTIMACH_ARCH = "${PACKAGE_ARCH}"
95MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 95MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
96MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" 96MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
97BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
98BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
97 99
98# select proper CPU to get binary locales generated 100# select proper CPU to get binary locales generated
99QEMU_OPTIONS = "" 101QEMU_OPTIONS = ""
@@ -242,7 +244,9 @@ STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
242STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" 244STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
243STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" 245STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
244 246
245STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}" 247# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
248# specific packages - hack around it for now.
249STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
246STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" 250STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
247STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" 251STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
248STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" 252STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
@@ -252,7 +256,9 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
252STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" 256STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
253STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 257STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
254 258
255STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}" 259# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine
260# specific packages - hack around it for now.
261STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
256 262
257DEPLOY_DIR = "${TMPDIR}/deploy" 263DEPLOY_DIR = "${TMPDIR}/deploy"
258DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" 264DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 3025f1e07d..dc01efa420 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -56,9 +56,9 @@ SRCREV_pn-matchbox-themes-extra ?= "1524"
56SRCREV_pn-matchbox-wm-2 ?= "1873" 56SRCREV_pn-matchbox-wm-2 ?= "1873"
57SRCREV_pn-matchbox-wm ?= "1524" 57SRCREV_pn-matchbox-wm ?= "1524"
58SRCREV_pn-oh-puzzles ?= "23" 58SRCREV_pn-oh-puzzles ?= "23"
59SRCREV_pn-opkg-native ?= "4529" 59SRCREV_pn-opkg-native ?= "4545"
60SRCREV_pn-opkg-sdk ?= "4529" 60SRCREV_pn-opkg-sdk ?= "4545"
61SRCREV_pn-opkg ?= "4529" 61SRCREV_pn-opkg ?= "4545"
62SRCREV_pn-opkg-utils-native ?= "4534" 62SRCREV_pn-opkg-utils-native ?= "4534"
63SRCREV_pn-opkg-utils ?= "4534" 63SRCREV_pn-opkg-utils ?= "4534"
64SRCREV_pn-oprofileui ?= "194" 64SRCREV_pn-oprofileui ?= "194"