summaryrefslogtreecommitdiffstats
path: root/openembedded/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-27 21:49:50 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-27 21:49:50 +0000
commit3097ab0f62233dc336dfe611fef4b8b633355190 (patch)
tree8173abc003c9703cf625d4e100f57d3d5141177d /openembedded/conf
parentb77fcc05cacdf70819cc226d53156a9e70e84e04 (diff)
downloadpoky-3097ab0f62233dc336dfe611fef4b8b633355190.tar.gz
Sync conf and classes with OE - changes have been tested and don't affect poky
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@446 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
-rw-r--r--openembedded/conf/bitbake.conf9
-rw-r--r--openembedded/conf/distro/angstrom-2006.9.conf23
-rw-r--r--openembedded/conf/distro/angstrom.conf4
-rw-r--r--openembedded/conf/distro/familiar-unstable.conf6
-rw-r--r--openembedded/conf/distro/openzaurus-unstable.conf19
-rw-r--r--openembedded/conf/distro/preferred-e-versions.inc46
-rw-r--r--openembedded/conf/distro/preferred-opie-versions.inc7
-rw-r--r--openembedded/conf/documentation.conf9
-rw-r--r--openembedded/conf/machine/include/ixp4xx.conf10
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell.conf7
-rw-r--r--openembedded/conf/machine/ipaq-pxa270.conf2
-rw-r--r--openembedded/conf/machine/jornada7xx.conf1
-rw-r--r--openembedded/conf/machine/nokia770.conf10
-rw-r--r--openembedded/conf/machine/qemuarm.conf2
14 files changed, 95 insertions, 60 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 2043a500eb..9c1ba1f47c 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -57,6 +57,7 @@ TARGET_CC_ARCH = ""
57 57
58PACKAGE_ARCH = "${HOST_ARCH}" 58PACKAGE_ARCH = "${HOST_ARCH}"
59MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" 59MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
60IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
60 61
61################################################################## 62##################################################################
62# Date/time variables. 63# Date/time variables.
@@ -239,9 +240,9 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
239# Build flags and options. 240# Build flags and options.
240################################################################## 241##################################################################
241 242
242export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" 243export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
243export CPPFLAGS = "${TARGET_CPPFLAGS}" 244export CPPFLAGS = "${TARGET_CPPFLAGS}"
244export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" 245export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
245 246
246export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" 247export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
247export CFLAGS = "${TARGET_CFLAGS}" 248export CFLAGS = "${TARGET_CFLAGS}"
@@ -382,7 +383,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
382# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything. 383# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
383# 384#
384# This works for functions as well, they are really just environment variables. 385# This works for functions as well, they are really just environment variables.
385OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" 386#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
387# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
388OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
386 389
387################################################################## 390##################################################################
388# Include the rest of the config files. 391# Include the rest of the config files.
diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf
index c80a574a0d..5c1ed1296d 100644
--- a/openembedded/conf/distro/angstrom-2006.9.conf
+++ b/openembedded/conf/distro/angstrom-2006.9.conf
@@ -1,3 +1,11 @@
1#@--------------------------------------------------------------------
2#@TYPE: Distribution
3#@NAME: Angstrom <http://www.angstrom-distribution.org>
4#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
5#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
6#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
7#@--------------------------------------------------------------------
8
1#DISTRO_VERSION = "2006.9" 9#DISTRO_VERSION = "2006.9"
2DISTRO_VERSION = "test-${DATE}" 10DISTRO_VERSION = "test-${DATE}"
3 11
@@ -14,9 +22,12 @@ FEED_URIS += " \
14# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ 22# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
15# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" 23# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
16 24
17SRCDATE = "20060425" 25SRCDATE = "20060518"
18SRCDATE_handhelds-pxa-2.6 = "20060506" 26#SRCDATE_handhelds-pxa-2.6 = "20060516"
19 27
28CVS_TARBALL_STASH = "\
29http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
30http://www.oesources.org/source/current/"
20 31
21# Opie 32# Opie
22#use 1337 mt version of opie to have a webbrowser 33#use 1337 mt version of opie to have a webbrowser
@@ -56,9 +67,9 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
56 67
57 68
58#use EABI toolchain 69#use EABI toolchain
59PREFERRED_VERSION_gcc ?= "4.1.0" 70PREFERRED_VERSION_gcc ?= "4.1.1"
60PREFERRED_VERSION_gcc-cross ?= "4.1.0" 71PREFERRED_VERSION_gcc-cross ?= "4.1.1"
61PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" 72PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
62PREFERRED_VERSION_binutils ?= "2.16.91.0.7" 73PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
63PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" 74PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
64PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" 75PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
@@ -75,7 +86,7 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
75PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" 86PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
76PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" 87PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
77PREFERRED_VERSION_dbus ?= "0.61" 88PREFERRED_VERSION_dbus ?= "0.61"
78PREFERRED_VERSION_gstreamer ?= "0.10.5" 89PREFERRED_VERSION_gstreamer ?= "0.10.6"
79 90
80PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" 91PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
81PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" 92PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/openembedded/conf/distro/angstrom.conf b/openembedded/conf/distro/angstrom.conf
index a94fcee140..403b13934f 100644
--- a/openembedded/conf/distro/angstrom.conf
+++ b/openembedded/conf/distro/angstrom.conf
@@ -5,8 +5,8 @@
5DISTRO = "angstrom" 5DISTRO = "angstrom"
6DISTRO_NAME = "Angstrom" 6DISTRO_NAME = "Angstrom"
7 7
8#we'll use this till we get a real domain 8#Use this variable in feeds and other parts that need a URI
9ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom" 9ANGSTROM_URI = "http://www.angstrom-distribution.org/"
10 10
11#Set the default maintainer to angstrom-dev 11#Set the default maintainer to angstrom-dev
12MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>" 12MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index 8b40c5811a..e42456672c 100644
--- a/openembedded/conf/distro/familiar-unstable.conf
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -55,8 +55,10 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
55# Opie 55# Opie
56# 56#
57 57
58#OPIE_VERSION = "1.2.1" 58OPIE_VERSION = "1.2.2"
59#include conf/distro/preferred-opie-versions.inc 59QTE_VERSION = "2.3.10"
60PALMTOP_USE_MULTITHREADED_QT = "yes"
61include conf/distro/preferred-opie-versions.inc
60 62
61# 63#
62# GPE 64# GPE
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
index cc87380494..9f79c32118 100644
--- a/openembedded/conf/distro/openzaurus-unstable.conf
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -1,5 +1,16 @@
1#@--------------------------------------------------------------------
2#@TYPE: Distribution
3#@NAME: OpenZaurus <http://www.openzaurus.org>
4#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family
5#@--------------------------------------------------------------------
6
1DISTRO_VERSION = ".dev-snapshot-${DATE}" 7DISTRO_VERSION = ".dev-snapshot-${DATE}"
2 8
9CVS_TARBALL_STASH = "\
10http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
11http://www.oesources.org/source/current/"
12
13
3include conf/distro/openzaurus.conf 14include conf/distro/openzaurus.conf
4 15
5DISTRO_TYPE = "debug" 16DISTRO_TYPE = "debug"
@@ -14,8 +25,7 @@ DISTRO_TYPE = "debug"
14# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ 25# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
15# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" 26# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
16 27
17# SRCDATE = "20050704" 28SRCDATE = "20060514"
18
19# 29#
20# Zaurus 30# Zaurus
21# 31#
@@ -42,9 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
42# 52#
43# Opie 53# Opie
44# 54#
45QTE_VERSION = "2.3.10" 55#QTE_VERSION = "2.3.10"
46OPIE_VERSION = "1.2.2" 56#OPIE_VERSION = "1.2.2"
47PALMTOP_USE_MULTITHREADED_QT = "no"
48#PALMTOP_USE_MULTITHREADED_QT = "yes" 57#PALMTOP_USE_MULTITHREADED_QT = "yes"
49include conf/distro/preferred-opie-versions.inc 58include conf/distro/preferred-opie-versions.inc
50 59
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
index ca35c83796..607acad858 100644
--- a/openembedded/conf/distro/preferred-e-versions.inc
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
2# Specify which versions of E-related libraries and applications to build 2# Specify which versions of E-related libraries and applications to build
3# 3#
4 4
5PREFERRED_VERSION_e = "0.16.999.025" 5#PREFERRED_VERSION_e = "0.16.999.025"
6PREFERRED_VERSION_ecore-x11 = "0.9.9.025" 6#PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
7PREFERRED_VERSION_ecore-native = "0.9.9.025" 7#PREFERRED_VERSION_ecore-native = "0.9.9.025"
8PREFERRED_VERSION_edb = "1.0.5.006" 8#PREFERRED_VERSION_edb = "1.0.5.006"
9PREFERRED_VERSION_edb-native = "1.0.5.006" 9#PREFERRED_VERSION_edb-native = "1.0.5.006"
10PREFERRED_VERSION_edje = "0.5.0.025" 10#PREFERRED_VERSION_edje = "0.5.0.025"
11PREFERRED_VERSION_edje-native = "0.5.0.025" 11#PREFERRED_VERSION_edje-native = "0.5.0.025"
12PREFERRED_VERSION_eet = "0.9.10.025" 12#PREFERRED_VERSION_eet = "0.9.10.025"
13PREFERRED_VERSION_eet-native = "0.9.10.025" 13#PREFERRED_VERSION_eet-native = "0.9.10.025"
14PREFERRED_VERSION_embryo = "0.9.1.025" 14#PREFERRED_VERSION_embryo = "0.9.1.025"
15PREFERRED_VERSION_embryo-native = "0.9.1.025" 15#PREFERRED_VERSION_embryo-native = "0.9.1.025"
16PREFERRED_VERSION_emotion = "0.0.1.004" 16#PREFERRED_VERSION_emotion = "0.0.1.004"
17PREFERRED_VERSION_emotion-native = "0.0.1.004" 17#PREFERRED_VERSION_emotion-native = "0.0.1.004"
18PREFERRED_VERSION_epeg = "0.9.0.006" 18#PREFERRED_VERSION_epeg = "0.9.0.006"
19PREFERRED_VERSION_epsilon = "0.3.0.006" 19#PREFERRED_VERSION_epsilon = "0.3.0.006"
20PREFERRED_VERSION_esmart-x11 = "0.9.0.006" 20#PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
21PREFERRED_VERSION_evas-x11 = "0.9.9.025" 21#PREFERRED_VERSION_evas-x11 = "0.9.9.025"
22PREFERRED_VERSION_evas-native = "0.9.9.025" 22#PREFERRED_VERSION_evas-native = "0.9.9.025"
23PREFERRED_VERSION_ewl = "0.0.4.006" 23#PREFERRED_VERSION_ewl = "0.0.4.006"
24PREFERRED_VERSION_imlib2-x11 = "1.2.1.011" 24#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
25PREFERRED_VERSION_imlib2-native = "1.2.1.011" 25#PREFERRED_VERSION_imlib2-native = "1.2.1.011"
26PREFERRED_VERSION_e-wm = "0.16.999.025" 26#PREFERRED_VERSION_e-wm = "0.16.999.025"
27PREFERRED_VERSION_entrance = "0.9.0.006" 27#PREFERRED_VERSION_entrance = "0.9.0.006"
28 28
29PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" 29PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
30PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" 30PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc
index 5811856e55..51c9937628 100644
--- a/openembedded/conf/distro/preferred-opie-versions.inc
+++ b/openembedded/conf/distro/preferred-opie-versions.inc
@@ -1,4 +1,11 @@
1# 1#
2# Default versions
3QTE_VERSION ?= "2.3.10"
4OPIE_VERSION ?= "1.2.2"
5PALMTOP_USE_MULTITHREADED_QT ?= "yes"
6
7#
8#
2# Opie libraries 9# Opie libraries
3# 10#
4PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' 11PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf
index 20bcc53f5f..c07c8fa68b 100644
--- a/openembedded/conf/documentation.conf
+++ b/openembedded/conf/documentation.conf
@@ -38,6 +38,8 @@ PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If y
38machine dependant configuration options in your bitbake file add a \ 38machine dependant configuration options in your bitbake file add a \
39PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' 39PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.'
40 40
41IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
42IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
41 43
42DATE[doc] = "The date the build was started Ymd" 44DATE[doc] = "The date the build was started Ymd"
43TIME[doc] = "The time the build was started HMS" 45TIME[doc] = "The time the build was started HMS"
@@ -63,8 +65,9 @@ HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net."
63GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \ 65GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \
64and the resulting packages." 66and the resulting packages."
65DEPENDS[doc] = "Build time dependencies, things needed to build the package. @group dependencies" 67DEPENDS[doc] = "Build time dependencies, things needed to build the package. @group dependencies"
66RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. @group dependencies" 68RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. This is used to populate the ipkg:Depends field. @group dependencies"
67PROVIDES[doc] = "Names for additional dependencies that this package will provide. @group dependencies" 69PROVIDES[doc] = "Names for additional build time dependencies that this package will provide. @group dependencies"
70RPROVIDES[doc] = "Names for additional run time dependencies that this package will provide. This is used to populate the ipkg:Provides field. @group dependencies"
68 71
69 72
70# packaging 73# packaging
@@ -98,4 +101,4 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the
98PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread" 101PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
99 102
100COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser." 103COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser."
101COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." \ No newline at end of file 104COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
diff --git a/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf
index 639bf4a74e..93befb92ce 100644
--- a/openembedded/conf/machine/include/ixp4xx.conf
+++ b/openembedded/conf/machine/include/ixp4xx.conf
@@ -62,7 +62,7 @@ IXP4XX_SUFFIX = "${MACHINE_ARCH}"
62# arm/thumb interworking are enabled in the inputs. 62# arm/thumb interworking are enabled in the inputs.
63OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" 63OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
64OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" 64OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
65OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}" 65OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast"
66 66
67# TARGET_CC_ARCH 67# TARGET_CC_ARCH
68# TARGET_CC_KERNEL_ARCH 68# TARGET_CC_KERNEL_ARCH
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
111# because everything built here is no more specific than that. 111# because everything built here is no more specific than that.
112MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" 112MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
113 113
114# IPKG_ARCHS 114# IPKG_EXTRA_ARCHS
115# The full list of package architectures which should run on the system. 115# The full list of package architectures which should run on the system.
116# This takes into account both the board level issues and the INPUTS set 116# This takes into account both the board level issues and the INPUTS set
117# by the distro. The arm list is derived from the architecture settings 117# by the distro. The arm list is derived from the architecture settings
@@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$
126# NOTE: this list contains just the things which rootfs_ipk.bbclass does 126# NOTE: this list contains just the things which rootfs_ipk.bbclass does
127# not add, rootfs_ipk.bbclass evaluates: 127# not add, rootfs_ipk.bbclass evaluates:
128# 128#
129# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}" 129# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
130# 130#
131# This is a priority ordered list - most desireable architecture at the end, 131# This is a priority ordered list - most desireable architecture at the end,
132# so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if 132# so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
133# THUMB_INTERWORK precede this with the other architectures. 133# THUMB_INTERWORK precede this with the other architectures.
134IPKG_ARCHS = "ixp4xx ${MACHINE} \ 134IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
135 ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ 135 ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
136 (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ 136 (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
137 + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ 137 + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
@@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \
146# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and 146# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and
147# ixp4xx are included at the start (lower priority) as the non-byte-sex specific 147# ixp4xx are included at the start (lower priority) as the non-byte-sex specific
148# versions. 148# versions.
149IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}" 149IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
150 150
151#------------------------------------------------------------------------------- 151#-------------------------------------------------------------------------------
152# Package versions 152# Package versions
diff --git a/openembedded/conf/machine/include/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
index e437a64609..4fd1780605 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
1TARGET_ARCH = "arm" 1TARGET_ARCH = "arm"
2IPKG_ARCHS = "all arm armv4 armv5te" 2IPKG_EXTRA_ARCHS = "armv4 armv5te"
3 3
4PREFERRED_PROVIDER_xserver = "xserver-kdrive" 4PREFERRED_PROVIDER_xserver = "xserver-kdrive"
5 5
@@ -11,6 +11,11 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
11 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ 11 cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
12 ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" 12 ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
13 13
14# add a summary to the jffs2 file to make it mount a lot faster
15EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
16 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \
17 --eraseblock=0x4000"
18
14GUI_MACHINE_CLASS = "bigscreen" 19GUI_MACHINE_CLASS = "bigscreen"
15GPE_EXTRA_INSTALL += "gaim sylpheed" 20GPE_EXTRA_INSTALL += "gaim sylpheed"
16 21
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 07753ccf64..f5cc893c9c 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices 3#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" 6IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
7#use this for a hx47xx ipaq 7#use this for a hx47xx ipaq
8PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" 8PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
9 9
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
index 82eff0b563..e8218138d5 100644
--- a/openembedded/conf/machine/jornada7xx.conf
+++ b/openembedded/conf/machine/jornada7xx.conf
@@ -3,6 +3,5 @@
3#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer 3#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_ARCHS = "all arm ${MACHINE}"
7 6
8include conf/machine/include/tune-strongarm.conf \ No newline at end of file 7include conf/machine/include/tune-strongarm.conf \ No newline at end of file
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index dd2127610a..c50c1a1bc8 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -2,11 +2,11 @@
2#@NAME: Nokia 770 internet tablet 2#@NAME: Nokia 770 internet tablet
3#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet 3#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
4TARGET_ARCH = "arm" 4TARGET_ARCH = "arm"
5IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" 5IPKG_EXTRA_ARCHS = "armv4 armv5te"
6 6
7PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" 7PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
8PREFERRED_PROVIDER_virtual/bootloader = "" 8PREFERRED_PROVIDER_virtual/bootloader = ""
9PREFERRED_PROVIDER_virutal/tslib = "tslib-maemo" 9PREFERRED_PROVIDER_tslib = "tslib-maemo"
10 10
11XSERVER = "xserver-kdrive-omap" 11XSERVER = "xserver-kdrive-omap"
12 12
@@ -20,15 +20,11 @@ include conf/machine/include/tune-arm926ejs.conf
20 20
21#size of the root partition (yes, it is 123 MB) 21#size of the root partition (yes, it is 123 MB)
22ROOT_FLASH_SIZE = "123" 22ROOT_FLASH_SIZE = "123"
23#EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers" 23EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
24EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n "
25 24
26# serial console port on devboard rev. B3 25# serial console port on devboard rev. B3
27#SERIAL_CONSOLE = "115200 tts/0"
28SERIAL_CONSOLE = "115200 ttyS0" 26SERIAL_CONSOLE = "115200 ttyS0"
29 27
30
31#build omap1 till nokia releases the patches
32PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" 28PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
33 29
34BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init detect-stylus \ 30BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init detect-stylus \
diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf
index 78b1fe33fc..3341efd1a7 100644
--- a/openembedded/conf/machine/qemuarm.conf
+++ b/openembedded/conf/machine/qemuarm.conf
@@ -3,7 +3,7 @@
3#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation 3#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
4 4
5TARGET_ARCH = "arm" 5TARGET_ARCH = "arm"
6IPKG_ARCHS = "all arm armv4 armv5te qemuarm" 6IPKG_EXTRA_ARCHS = "armv4 armv5te"
7 7
8PCMCIA_MANAGER = "pcmciautils" 8PCMCIA_MANAGER = "pcmciautils"
9PREFERRED_PROVIDER_xserver = "xserver-kdrive" 9PREFERRED_PROVIDER_xserver = "xserver-kdrive"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 11:59:44 +0000