summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openembedded/classes/base.bbclass32
-rw-r--r--openembedded/classes/native.bbclass14
-rw-r--r--openembedded/classes/rootfs_ipk.bbclass2
-rw-r--r--openembedded/classes/sanity.bbclass17
-rw-r--r--openembedded/classes/tinderclient.bbclass43
-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
19 files changed, 181 insertions, 82 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass
index 1b31d4345..673e2f054 100644
--- a/openembedded/classes/base.bbclass
+++ b/openembedded/classes/base.bbclass
@@ -475,6 +475,34 @@ python base_do_patch() {
else:
pname = os.path.basename(unpacked)
+ if "mindate" in parm:
+ mindate = parm["mindate"]
+ else:
+ mindate = 0
+
+ if "maxdate" in parm:
+ maxdate = parm["maxdate"]
+ else:
+ maxdate = "20711226"
+
+ pn = bb.data.getVar('PN', d, 1)
+ srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
+
+ if not srcdate:
+ srcdate = bb.data.getVar('SRCDATE', d, 1)
+
+ if srcdate == "now":
+ srcdate = bb.data.getVar('DATE', d, 1)
+
+ if (maxdate < srcdate) or (mindate > srcdate):
+ if (maxdate < srcdate):
+ bb.note("Patch '%s' is outdated" % pname)
+
+ if (mindate > srcdate):
+ bb.note("Patch '%s' is predated" % pname)
+
+ continue
+
bb.note("Applying patch '%s'" % pname)
bb.data.setVar("do_patchcmd", bb.data.getVar("PATCHCMD", d, 1) % (pnum, pname, unpacked), d)
bb.data.setVarFlag("do_patchcmd", "func", 1, d)
@@ -743,6 +771,10 @@ ftp://ftp.kernel.org/pub ftp://ftp.uk.kernel.org/pub
ftp://ftp.kernel.org/pub ftp://ftp.hk.kernel.org/pub
ftp://ftp.kernel.org/pub ftp://ftp.au.kernel.org/pub
ftp://ftp.kernel.org/pub ftp://ftp.jp.kernel.org/pub
+ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/
+ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/
+ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/
+
ftp://.*/.*/ http://www.oesources.org/source/current/
http://.*/.*/ http://www.oesources.org/source/current/
}
diff --git a/openembedded/classes/native.bbclass b/openembedded/classes/native.bbclass
index 011e48cf6..04ff7d92d 100644
--- a/openembedded/classes/native.bbclass
+++ b/openembedded/classes/native.bbclass
@@ -36,6 +36,20 @@ CXXFLAGS = "${BUILD_CFLAGS}"
LDFLAGS = "${BUILD_LDFLAGS}"
LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
+
+# set the compiler as well. It could have been set to something else
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
+export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
+export CPP = "${HOST_PREFIX}gcc -E"
+export LD = "${HOST_PREFIX}ld"
+export CCLD = "${CC}"
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export STRIP = "${HOST_PREFIX}strip"
+
+
# Path prefixes
base_prefix = "${exec_prefix}"
prefix = "${STAGING_DIR}"
diff --git a/openembedded/classes/rootfs_ipk.bbclass b/openembedded/classes/rootfs_ipk.bbclass
index 2880411c3..272950350 100644
--- a/openembedded/classes/rootfs_ipk.bbclass
+++ b/openembedded/classes/rootfs_ipk.bbclass
@@ -37,7 +37,7 @@ real_do_rootfs () {
fi
mkdir -p ${T}
echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
- ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+ ipkgarchs="${IPKG_ARCHS}"
priority=1
for arch in $ipkgarchs; do
echo "arch $arch $priority" >> ${T}/ipkg.conf
diff --git a/openembedded/classes/sanity.bbclass b/openembedded/classes/sanity.bbclass
index 8253b2793..a626162ff 100644
--- a/openembedded/classes/sanity.bbclass
+++ b/openembedded/classes/sanity.bbclass
@@ -4,7 +4,11 @@
def raise_sanity_error(msg):
import bb
- bb.fatal("Openembedded's config sanity checker detected a potential misconfiguration.\nEither fix the cause of this error or at your own risk disable the checker (see sanity.conf).\n%s" % msg)
+ bb.fatal(""" Openembedded's config sanity checker detected a potential misconfiguration.
+ Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
+ Following is the list of potential problems / advisories:
+
+ %s""" % msg)
def check_conf_exists(fn, data):
import bb, os
@@ -31,7 +35,10 @@ def check_app_exists(app, d):
def check_sanity(e):
from bb import note, error, data, __version__
from bb.event import Handled, NotHandled, getName
- from distutils.version import LooseVersion
+ try:
+ from distutils.version import LooseVersion
+ except ImportError:
+ def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
import os
# Check the bitbake version meets minimum requirements
@@ -83,6 +90,12 @@ def check_sanity(e):
if not check_app_exists('texi2html', e.data):
raise_sanity_error('Please install the texi2html binary')
+ if not check_app_exists('cvs', e.data):
+ raise_sanity_error('Please install the cvs utility')
+
+ if not check_app_exists('svn', e.data):
+ raise_sanity_error('Please install the svn utility')
+
oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
if not oes_bb_conf:
raise_sanity_error('You do not include OpenEmbeddeds version of conf/bitbake.conf')
diff --git a/openembedded/classes/tinderclient.bbclass b/openembedded/classes/tinderclient.bbclass
index f9243f710..6e10d0f34 100644
--- a/openembedded/classes/tinderclient.bbclass
+++ b/openembedded/classes/tinderclient.bbclass
@@ -1,3 +1,21 @@
+def tinder_http_post(server, selector, content_type, body):
+ import httplib
+ # now post it
+ for i in range(0,5):
+ try:
+ h = httplib.HTTP(server)
+ h.putrequest('POST', selector)
+ h.putheader('content-type', content_type)
+ h.putheader('content-length', str(len(body)))
+ h.endheaders()
+ h.send(body)
+ errcode, errmsg, headers = h.getreply()
+ #print errcode, errmsg, headers
+ return (errcode,errmsg, headers, h.file)
+ except:
+ # try again
+ pass
+
def tinder_form_data(bound, dict, log):
output = []
#br
@@ -29,7 +47,7 @@ def tinder_format_http_post(d,status,log):
for the tinderbox to be happy.
"""
- from bb import data
+ from bb import data, build
import os,random
# the variables we will need to send on this form post
@@ -72,7 +90,6 @@ def tinder_build_start(d):
on the server.
"""
from bb import data
- import httplib
# get the body and type
content_type, body = tinder_format_http_post(d,None,None)
@@ -84,15 +101,9 @@ def tinder_build_start(d):
#print "selector %s and url %s" % (selector, url)
# now post it
- h = httplib.HTTP(server)
- h.putrequest('POST', selector)
- h.putheader('content-type', content_type)
- h.putheader('content-length', str(len(body)))
- h.endheaders()
- h.send(body)
- errcode, errmsg, headers = h.getreply()
+ errcode, errmsg, headers, h_file = tinder_http_post(server,selector,content_type, body)
#print errcode, errmsg, headers
- report = h.file.read()
+ report = h_file.read()
# now let us find the machine id that was assigned to us
search = "<machine id='"
@@ -113,7 +124,6 @@ def tinder_send_http(d, status, log):
Send this log as build status
"""
from bb import data
- import httplib
# get the body and type
@@ -124,13 +134,7 @@ def tinder_send_http(d, status, log):
selector = url + "/xml/build_status.pl"
# now post it
- h = httplib.HTTP(server)
- h.putrequest('POST', selector)
- h.putheader('content-type', content_type)
- h.putheader('content-length', str(len(body)))
- h.endheaders()
- h.send(body)
- errcode, errmsg, headers = h.getreply()
+ errcode, errmsg, headers, h_file = tinder_http_post(server,selector,content_type, body)
#print errcode, errmsg, headers
#print h.file.read()
@@ -247,7 +251,7 @@ def tinder_do_tinder_report(event):
implemented yet.
"""
from bb.event import getName
- from bb import data, mkdirhier
+ from bb import data, mkdirhier, build
import os, glob
# variables
@@ -289,6 +293,7 @@ def tinder_do_tinder_report(event):
elif name == "PkgSucceeded":
log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True)
elif name == "PkgFailed":
+ build.exec_task('do_clean', event.data)
log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True)
status = 200
elif name == "BuildCompleted":
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf
index 2043a500e..9c1ba1f47 100644
--- a/openembedded/conf/bitbake.conf
+++ b/openembedded/conf/bitbake.conf
@@ -57,6 +57,7 @@ TARGET_CC_ARCH = ""
PACKAGE_ARCH = "${HOST_ARCH}"
MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
##################################################################
# Date/time variables.
@@ -239,9 +240,9 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
# Build flags and options.
##################################################################
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
export CFLAGS = "${TARGET_CFLAGS}"
@@ -382,7 +383,9 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
#
# This works for functions as well, they are really just environment variables.
-OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
##################################################################
# 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 c80a574a0..5c1ed1296 100644
--- a/openembedded/conf/distro/angstrom-2006.9.conf
+++ b/openembedded/conf/distro/angstrom-2006.9.conf
@@ -1,3 +1,11 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Angstrom <http://www.angstrom-distribution.org>
+#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
+#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl>
+#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
+#@--------------------------------------------------------------------
+
#DISTRO_VERSION = "2006.9"
DISTRO_VERSION = "test-${DATE}"
@@ -14,9 +22,12 @@ FEED_URIS += " \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
-SRCDATE = "20060425"
-SRCDATE_handhelds-pxa-2.6 = "20060506"
+SRCDATE = "20060518"
+#SRCDATE_handhelds-pxa-2.6 = "20060516"
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
# Opie
#use 1337 mt version of opie to have a webbrowser
@@ -56,9 +67,9 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
#use EABI toolchain
-PREFERRED_VERSION_gcc ?= "4.1.0"
-PREFERRED_VERSION_gcc-cross ?= "4.1.0"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
@@ -75,7 +86,7 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
PREFERRED_VERSION_dbus ?= "0.61"
-PREFERRED_VERSION_gstreamer ?= "0.10.5"
+PREFERRED_VERSION_gstreamer ?= "0.10.6"
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/openembedded/conf/distro/angstrom.conf b/openembedded/conf/distro/angstrom.conf
index a94fcee14..403b13934 100644
--- a/openembedded/conf/distro/angstrom.conf
+++ b/openembedded/conf/distro/angstrom.conf
@@ -5,8 +5,8 @@
DISTRO = "angstrom"
DISTRO_NAME = "Angstrom"
-#we'll use this till we get a real domain
-ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom"
+#Use this variable in feeds and other parts that need a URI
+ANGSTROM_URI = "http://www.angstrom-distribution.org/"
#Set the default maintainer to angstrom-dev
MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
index 8b40c5811..e42456672 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"
# Opie
#
-#OPIE_VERSION = "1.2.1"
-#include conf/distro/preferred-opie-versions.inc
+OPIE_VERSION = "1.2.2"
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QT = "yes"
+include conf/distro/preferred-opie-versions.inc
#
# GPE
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
index cc8738049..9f79c3211 100644
--- a/openembedded/conf/distro/openzaurus-unstable.conf
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -1,5 +1,16 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: OpenZaurus <http://www.openzaurus.org>
+#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family
+#@--------------------------------------------------------------------
+
DISTRO_VERSION = ".dev-snapshot-${DATE}"
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
+
+
include conf/distro/openzaurus.conf
DISTRO_TYPE = "debug"
@@ -14,8 +25,7 @@ DISTRO_TYPE = "debug"
# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-# SRCDATE = "20050704"
-
+SRCDATE = "20060514"
#
# Zaurus
#
@@ -42,9 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
#
# Opie
#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "no"
+#QTE_VERSION = "2.3.10"
+#OPIE_VERSION = "1.2.2"
#PALMTOP_USE_MULTITHREADED_QT = "yes"
include conf/distro/preferred-opie-versions.inc
diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc
index ca35c8379..607acad85 100644
--- a/openembedded/conf/distro/preferred-e-versions.inc
+++ b/openembedded/conf/distro/preferred-e-versions.inc
@@ -2,29 +2,29 @@
# Specify which versions of E-related libraries and applications to build
#
-PREFERRED_VERSION_e = "0.16.999.025"
-PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
-PREFERRED_VERSION_ecore-native = "0.9.9.025"
-PREFERRED_VERSION_edb = "1.0.5.006"
-PREFERRED_VERSION_edb-native = "1.0.5.006"
-PREFERRED_VERSION_edje = "0.5.0.025"
-PREFERRED_VERSION_edje-native = "0.5.0.025"
-PREFERRED_VERSION_eet = "0.9.10.025"
-PREFERRED_VERSION_eet-native = "0.9.10.025"
-PREFERRED_VERSION_embryo = "0.9.1.025"
-PREFERRED_VERSION_embryo-native = "0.9.1.025"
-PREFERRED_VERSION_emotion = "0.0.1.004"
-PREFERRED_VERSION_emotion-native = "0.0.1.004"
-PREFERRED_VERSION_epeg = "0.9.0.006"
-PREFERRED_VERSION_epsilon = "0.3.0.006"
-PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
-PREFERRED_VERSION_evas-x11 = "0.9.9.025"
-PREFERRED_VERSION_evas-native = "0.9.9.025"
-PREFERRED_VERSION_ewl = "0.0.4.006"
-PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
-PREFERRED_VERSION_imlib2-native = "1.2.1.011"
-PREFERRED_VERSION_e-wm = "0.16.999.025"
-PREFERRED_VERSION_entrance = "0.9.0.006"
+#PREFERRED_VERSION_e = "0.16.999.025"
+#PREFERRED_VERSION_ecore-x11 = "0.9.9.025"
+#PREFERRED_VERSION_ecore-native = "0.9.9.025"
+#PREFERRED_VERSION_edb = "1.0.5.006"
+#PREFERRED_VERSION_edb-native = "1.0.5.006"
+#PREFERRED_VERSION_edje = "0.5.0.025"
+#PREFERRED_VERSION_edje-native = "0.5.0.025"
+#PREFERRED_VERSION_eet = "0.9.10.025"
+#PREFERRED_VERSION_eet-native = "0.9.10.025"
+#PREFERRED_VERSION_embryo = "0.9.1.025"
+#PREFERRED_VERSION_embryo-native = "0.9.1.025"
+#PREFERRED_VERSION_emotion = "0.0.1.004"
+#PREFERRED_VERSION_emotion-native = "0.0.1.004"
+#PREFERRED_VERSION_epeg = "0.9.0.006"
+#PREFERRED_VERSION_epsilon = "0.3.0.006"
+#PREFERRED_VERSION_esmart-x11 = "0.9.0.006"
+#PREFERRED_VERSION_evas-x11 = "0.9.9.025"
+#PREFERRED_VERSION_evas-native = "0.9.9.025"
+#PREFERRED_VERSION_ewl = "0.0.4.006"
+#PREFERRED_VERSION_imlib2-x11 = "1.2.1.011"
+#PREFERRED_VERSION_imlib2-native = "1.2.1.011"
+#PREFERRED_VERSION_e-wm = "0.16.999.025"
+#PREFERRED_VERSION_entrance = "0.9.0.006"
PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc
index 5811856e5..51c993762 100644
--- a/openembedded/conf/distro/preferred-opie-versions.inc
+++ b/openembedded/conf/distro/preferred-opie-versions.inc
@@ -1,4 +1,11 @@
#
+# Default versions
+QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.2"
+PALMTOP_USE_MULTITHREADED_QT ?= "yes"
+
+#
+#
# Opie libraries
#
PREFERRED_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 20bcc53f5..c07c8fa68 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
machine dependant configuration options in your bitbake file add a \
PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.'
+IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
+IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
DATE[doc] = "The date the build was started Ymd"
TIME[doc] = "The time the build was started HMS"
@@ -63,8 +65,9 @@ HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net."
GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \
and the resulting packages."
DEPENDS[doc] = "Build time dependencies, things needed to build the package. @group dependencies"
-RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. @group dependencies"
-PROVIDES[doc] = "Names for additional dependencies that this package will provide. @group dependencies"
+RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. This is used to populate the ipkg:Depends field. @group dependencies"
+PROVIDES[doc] = "Names for additional build time dependencies that this package will provide. @group dependencies"
+RPROVIDES[doc] = "Names for additional run time dependencies that this package will provide. This is used to populate the ipkg:Provides field. @group dependencies"
# packaging
@@ -98,4 +101,4 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the
PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
COMPATIBLE_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."
-COMPATIBLE_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
+COMPATIBLE_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 639bf4a74..93befb92c 100644
--- a/openembedded/conf/machine/include/ixp4xx.conf
+++ b/openembedded/conf/machine/include/ixp4xx.conf
@@ -62,7 +62,7 @@ IXP4XX_SUFFIX = "${MACHINE_ARCH}"
# arm/thumb interworking are enabled in the inputs.
OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}"
+OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast"
# TARGET_CC_ARCH
# TARGET_CC_KERNEL_ARCH
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
# because everything built here is no more specific than that.
MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
-# IPKG_ARCHS
+# IPKG_EXTRA_ARCHS
# The full list of package architectures which should run on the system.
# This takes into account both the board level issues and the INPUTS set
# 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$
# NOTE: this list contains just the things which rootfs_ipk.bbclass does
# not add, rootfs_ipk.bbclass evaluates:
#
-# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+# ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
#
# This is a priority ordered list - most desireable architecture at the end,
# so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
# THUMB_INTERWORK precede this with the other architectures.
-IPKG_ARCHS = "ixp4xx ${MACHINE} \
+IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \
${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
(interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
+ '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
@@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \
# the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and
# ixp4xx are included at the start (lower priority) as the non-byte-sex specific
# versions.
-IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}"
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}"
#-------------------------------------------------------------------------------
# Package versions
diff --git a/openembedded/conf/machine/include/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
index e437a6460..4fd178060 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell.conf
@@ -1,5 +1,5 @@
TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -11,6 +11,11 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+# add a summary to the jffs2 file to make it mount a lot faster
+EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \
+ --eraseblock=0x4000"
+
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 07753ccf6..f5cc893c9 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices
TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
+IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
#use this for a hx47xx ipaq
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
index 82eff0b56..e8218138d 100644
--- a/openembedded/conf/machine/jornada7xx.conf
+++ b/openembedded/conf/machine/jornada7xx.conf
@@ -3,6 +3,5 @@
#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm ${MACHINE}"
include 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 dd2127610..c50c1a1bc 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -2,11 +2,11 @@
#@NAME: Nokia 770 internet tablet
#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
PREFERRED_PROVIDER_virtual/bootloader = ""
-PREFERRED_PROVIDER_virutal/tslib = "tslib-maemo"
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
XSERVER = "xserver-kdrive-omap"
@@ -20,15 +20,11 @@ include conf/machine/include/tune-arm926ejs.conf
#size of the root partition (yes, it is 123 MB)
ROOT_FLASH_SIZE = "123"
-#EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
-EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n "
+EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
# serial console port on devboard rev. B3
-#SERIAL_CONSOLE = "115200 tts/0"
SERIAL_CONSOLE = "115200 ttyS0"
-
-#build omap1 till nokia releases the patches
PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init detect-stylus \
diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf
index 78b1fe33f..3341efd1a 100644
--- a/openembedded/conf/machine/qemuarm.conf
+++ b/openembedded/conf/machine/qemuarm.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"