diff options
Diffstat (limited to 'openembedded')
| -rw-r--r-- | openembedded/conf/bitbake.conf | 11 | ||||
| -rw-r--r-- | openembedded/conf/distro/angstrom-2006.9.conf | 92 | ||||
| -rw-r--r-- | openembedded/conf/distro/angstrom.conf | 48 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-e-versions.inc | 8 | ||||
| -rw-r--r-- | openembedded/conf/documentation.conf | 99 | ||||
| -rw-r--r-- | openembedded/conf/local.conf.sample | 130 | ||||
| -rw-r--r-- | openembedded/conf/machine/include/handheld-common.conf | 4 | ||||
| -rw-r--r-- | openembedded/conf/machine/include/tosa-2.6.conf | 14 | ||||
| -rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell-2.4.conf | 1 | ||||
| -rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell-2.6.conf | 21 | ||||
| -rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell.conf | 4 | ||||
| -rw-r--r-- | openembedded/conf/machine/ipaq-pxa270.conf | 22 | ||||
| -rw-r--r-- | openembedded/conf/machine/qemuarm.conf | 4 |
13 files changed, 257 insertions, 201 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 9d8ce784b3..3b642e58f7 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native" ################################################################## # Package default variables. @@ -298,7 +298,7 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" -GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source" +GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" @@ -306,6 +306,7 @@ FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" +APACHE_MIRROR = "http://www.apache.org/dist" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" @@ -394,3 +395,9 @@ include conf/machine/${MACHINE}.conf include conf/distro/${DISTRO}.conf include conf/documentation.conf require conf/sanity.conf + +################################################################## +# Weak variables (usually to retain backwards compatibility) +################################################################## + +PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf new file mode 100644 index 0000000000..ce11ddf08c --- /dev/null +++ b/openembedded/conf/distro/angstrom-2006.9.conf @@ -0,0 +1,92 @@ +#DISTRO_VERSION = "2006.9" +DISTRO_VERSION = "test-${DATE}" + +include conf/distro/angstrom.conf + + +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" +#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! + + +FEED_URIS += " \ + base##${ANGSTROM_URI}/unstable/feed/base/" +# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ +# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ +# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + +#CVSDATE = 20050331 + + +# Opie +include conf/distro/preferred-opie-versions.inc + +# GPE +include conf/distro/preferred-gpe-versions-2.8.inc + +# E +include conf/distro/preferred-e-versions.inc + +PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" +PREFERRED_VERSION_qte = "2.3.10" + + +PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" +PREFERRED_PROVIDER_libx11 = "diet-x11" + + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +#EABI stuff +PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +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_binutils ?= "2.16.91.0.6" +PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.4" +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" + + +#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff + +#### Bootstrap options #### + +PCMCIA_MANAGER_c7x0 = "pcmciautils" +PCMCIA_MANAGER_akita = "pcmciautils" +PCMCIA_MANAGER_spitz = "pcmciautils" +PCMCIA_MANAGER_borzoi = "pcmciautils" +PCMCIA_MANAGER_nokia770 = "pcmciautils" +PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" + +#### GPE section ### + +#Install libgtkinput in devices without a keyboard +GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" +GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" +#As soon as a kill switch is in place we can add it to devices with a keyboard +#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" +#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" +#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" +#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" + + diff --git a/openembedded/conf/distro/angstrom.conf b/openembedded/conf/distro/angstrom.conf new file mode 100644 index 0000000000..e9e05201e8 --- /dev/null +++ b/openembedded/conf/distro/angstrom.conf @@ -0,0 +1,48 @@ +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: Distribution configuration for Angstrom + +DISTRO = "angstrom" +DISTRO_NAME = "Angstrom" + +#we'll use this till we get a real domain +ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom" + +#Set the default maintainer to angstrom-dev +MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>" + +#use ipkg package format with debian style naming +INHERIT += "package_ipk debian" + +#use multimachine buildrules +include conf/distro/include/multimachine.conf + +#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +ENABLE_BINARY_LOCALE_GENERATION ?= "" + + +#Use the ARM EABI when building for an ARM cpu. We can't use overrides +#here because this breaks all places where ":=" is used. +TARGET_VENDOR = "${@['','-none'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" + +#EABI is softfloat by default, but let's make sure :) +TARGET_FPU = "soft" + +PARALLEL_INSTALL_MODULES = "1" + +#Always ship these packages +BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit" +BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit" + +#Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" +DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} + +# Angstrom *always* has some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc index e4571f1ae6..53f363bf3d 100644 --- a/openembedded/conf/distro/preferred-e-versions.inc +++ b/openembedded/conf/distro/preferred-e-versions.inc @@ -25,3 +25,11 @@ PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" PREFERRED_VERSION_imlib2-native = "1.2.1.010" PREFERRED_VERSION_e-wm = "0.16.999.023" PREFERRED_VERSION_entrance = "0.9.0.005" + +PREFERRED_PROVIDER_virtual/evas = "evas-x11" +PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" + +PREFERRED_VERSION_gnome-vfs-dbus = "svn" + +PREFERRED_VERSION_gcc = "3.4.4" diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf index 19aaf2dd48..320361398e 100644 --- a/openembedded/conf/documentation.conf +++ b/openembedded/conf/documentation.conf @@ -1,38 +1,42 @@ -# this file holds documentation for known keys, possible values and their meaning -# feel free to send updates and corrections to oe@handhelds.org +# this file holds documentation for known keys, possible values and +# their meaning. Please update, correct and extend this documentation. +# Mail your changes to oe@handhelds.org # conf/bitbake.conf -PREFERRED_VERSION[doc] = "Normally use it as PREFERRED_VERSION_package-name = \"\" to set the preferred \ -version of more than one version for the package-name is available." +PREFERRED_VERSION[doc] = 'Normally use it as PREFERRED_VERSION_package-name = "" to set the preferred \ +version of more than one version for the package-name is available.' -BUILD_ARCH[doc] = "The name of the building architecture. For example i686" -BUILD_OS[doc] = "The operating system (in lower case) of the building architecture. For example \ -linux" +BUILD_ARCH[doc] = "The name of the building architecture. E.g. i686." +BUILD_OS[doc] = "The operating system (in lower case) of the building architecture. E.g \ +linux." BUILD_VENDOR[doc] = "FIXME" BUILD_SYS[doc] = "FIXME" BUILD_PREFIX[doc] = "FIXME" BUILD_CC_ARCH[doc] = "FIXME" -HOST_ARCH[doc] = "The name of the target architecture. Normally same as the TARGET_ARCH @see TARGET_ARCH @group base" -HOST_OS[doc] = "The name of the target operating system. Normally the same as the TARGET_OS \ +HOST_ARCH[doc] = "The name of the target architecture. Normally same as the TARGET_ARCH. @see TARGET_ARCH @group base" +HOST_OS[doc] = "The name of the target operating system. Normally the same as the TARGET_OS. \ @see TARGET_OS @group base" -HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR @see TARGET_VENDOR" +HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR. @see TARGET_VENDOR" HOST_SYS[doc] = "FIXME" -HOST_PREFIX[doc] = "Normally same as the TARGET_PREFIX @see TARGET_PREFIX @group base" -HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH @see TARGET_CC_ARCH @group base" - -TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc" -TARGET_OS[doc] = "Build for which Operating System. Currently possible values are \ -linux and linux-uclibc. When using linux-uclibc you might want to set USE_NLS_gcc-cross to \"no\"." +HOST_PREFIX[doc] = "Normally same as the TARGET_PREFIX. @see TARGET_PREFIX @group base" +HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH. @see TARGET_CC_ARCH @group base" +HOST_NONSYSV[doc] = 'This flag can be set to "1" if the host system is not SysV compatible. E.g.\ +fakeroot-native will be build with tcp as IPC implementation.' + +TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc." +TARGET_OS[doc] = 'Build for which Operating System. Currently possible values are \ +linux and linux-uclibc. When using linux-uclibc you might want to set USE_NLS_gcc-cross to "no".' TARGET_VENDOR[doc] = "FIXME" -TARGET_SYS[doc] = "The target system is composed out of TARGET_ARCH,TARGET_VENDOR and TARGET_OS" -TARGET_PREFIX[doc] = "The prefix for the cross compile toolchain. For example arm-linux-" +TARGET_SYS[doc] = "The target system is composed out of TARGET_ARCH,TARGET_VENDOR and TARGET_OS." +TARGET_PREFIX[doc] = "The prefix for the cross compile toolchain. E.g arm-linux- ." TARGET_CC_ARCH[doc] = "FIXME" -TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty" +TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \ +for hardware floating point instructions." -PACKAGE_ARCH[doc] = "The architecture needed for using a resulting package. If you have \ +PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \ machine dependant configuration options in your bitbake file add a \ -PACKAGE_ARCH = \"${MACHINE_ARCH}\" to the file" +PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' DATE[doc] = "The date the build was started Ymd" @@ -41,35 +45,48 @@ DATETIME[doc] = "The date and time the build was started at" PN[doc] = "PN holds the name of the package (Package Name). It is gathered from the bitbake-file filename" PV[doc] = "PV holds the version of the package (Package Version). The default value is 1.0, it is \ -retrieved from the bitbake-file filename." -PR[doc] = "PR is the revision of the package (Package Revision). By default it is set to r0" +retrieved from the bitbake-file filename but can be changed." +PR[doc] = "PR is the revision of the package (Package Revision). By default it is set to r0." PF[doc] = "Package name - Package version - Package revision (PN-PV-PR)" P[doc] = "Package name - Package version (PN-PF)" -S[doc] = "Directory that holds the sources to build, WORKDIR/PN-PV by default. The 'make' or equivalent command is run from here" +S[doc] = "Directory that holds the sources to build, WORKDIR/PN-PV by default. The 'make' or equivalent command is run from this directory." SECTION[doc] = "Section of the packages e.g. console/networking" -PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed'" -DESCRIPTION[doc] = "A small description of the package" +PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed'." +DESCRIPTION[doc] = "A small description of the package." LICENSE[doc] = "The license of the resulting package e.g. GPL" -AUTHOR[doc] = "The author of the stuff contained in the package" -MAINTAINER[doc] = "Maintainer of the .bb and the resulting package" -HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net" +AUTHOR[doc] = "The author of the files installed." +MAINTAINER[doc] = "Maintainer of the .bb file and the resulting package." +HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net." + + +# dependencies +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" + +# packaging +GROUP_packaging[doc] = "The keys in this group influence the package building process. They influence \ +which packages will be generated and which files will be present in the generated packages." +PACKAGES[doc] = "Names of packages to be generated. @group packaging" +FILES[doc] = "Files/Directories belonging to the package. @group packaging" -DEPENDS[doc] = "Build time dependencies, things needed to build the package" -RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run" -PROVIDES[doc] = "Names for additional dependencies that this package will provide" -PACKAGES[doc] = "Names of packages to be generated" -FILES[doc] = "Files/Directories belonging to the package" +TMPDIR[doc] = "The temporary directory of openembedded holding work-, deploy, staging- and other directories." +CACHE[doc] = "The directory holding the cache of the metadata." +GROUP_fetcher[doc] = "The key highly influence the fetcher implementations." +DL_DIR[doc] = "The directory where tarballs will be stored. @group fetcher" +CVSDIR[doc] = "The directory where cvs checkouts will be stored in. @group fetcher" +GITDIR[doc] = "The directory where git clones will be stored. @group fetcher" +STAMP[doc] = "The directory that holds files to keep track of what was built." +WORKDIR[doc] = "The directory where a concrete package will be unpacked and built." +T[doc] = "Temporary directory within the WORKDIR." -TMPDIR[doc] = "The temporary directory of openembedded holding work-, deploy, staging- and some more dirs" -CACHE[doc] = "The directory holding the parsing cache." -DL_DIR[doc] = "The directory where tarballs will be downloaded." -CVSDIR[doc] = "The directory where cvs checkouts will be stored in." +GROUP_locale[doc] = "Locale generation of the GNU libc implementation" +ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale" -STAMP[doc] = "The directory that holds files to keep track of what was built" -WORKDIR[doc] = "The directory where a concrete package will be unpacked and built" -T[doc] = "Temporary directory within the WORKDIR" diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample deleted file mode 100644 index 70abc98921..0000000000 --- a/openembedded/conf/local.conf.sample +++ /dev/null @@ -1,130 +0,0 @@ -# XXXX NOTE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -# -# This file is not used, see build/conf/local.conf instead -# -# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - -# -# OpenEmbedded local configuration file (sample) -# -# Please visit the Wiki at http://openembedded.org/ for more info. -# -# -# Be SURE to read this file in its entirety and the GettingStarted page on the -# wiki before proceeding. -# -# Once you have done that, remove the line at the end of this -# file and build away. -# -# WARNING: lines starting with a space (' ') will result in parse failures. -# Remove '# ' from commented lines to activate them. -# -# NOTE: Do NOT use $HOME in your paths, BitBake does NOT expand ~ for you. If you -# must have paths relative to your homedir use ${HOME} (note the {}'s there -# you MUST have them for the variable expansion to be done by BitBake). Your -# paths should all be absolute paths (They should all start with a / after -# expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok). - -# Use this to specify where BitBake should place the downloaded sources into -DL_DIR = "${HOME}/sources" - -# Delete the line below. Then specify which .bb files to consider for -# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb" -BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}" - -# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files -# This is a regulary expression, so be sure to get your parenthesis balanced. -BBMASK = "" - -# Uncomment this if you want to use a prebuilt toolchain. You will need to -# provide packages for toolchain and additional libraries yourself. You also -# have to set PATH in your environment to make sure BitBake finds additional binaries. -# Note: You will definitely need to say: -# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" -# to build any of two Linux 2.4 Embedix kernels, -# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget -# to rename the binaries as instructed in the Wiki. -# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" - -# Select between multiple alternative providers, if more than one is eligible. -PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" -PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" - -# Uncomment this to specify where BitBake should create its temporary files. -# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard -# disk space, so make sure to free enough space. The default TMPDIR is -# <build directory>/tmp -# Don't use symlinks in in the path to avoid problems -# TMPDIR = /usr/local/projects/oetmp - -# Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -# MACHINE = "collie" - -# Use this to specify the target architecture. Note that this is only -# needed when building for a machine not known to OpenEmbedded. Better use -# the MACHINE attribute (see above) -# TARGET_ARCH = "arm" - -# Use this to specify the target operating system. The default is "linux", -# for a normal linux system with glibc. Set this to "linux-uclibc" if you want -# to build a uclibc based system. -# TARGET_OS = "linux" -# TARGET_OS = "linux-uclibc" - -# Uncomment this to select a distribution policy. See the conf directory -# for distributions currently known to OpenEmbedded. -# Stay away from unversioned distros unless you really know what you are doing -# DISTRO = "familiar-unstable" - -# Uncomment this to select a particular kernel version if supported by -# your MACHINE setting. Currently only supported on Zaurus Clamshells. -# KERNEL_VERSION = "2.6" - -# Uncomment one of these to build packages during the build process. -# This is done automatically if you set DISTRO (see above) -# INHERIT = "package_ipk" -# INHERIT = "package_tar" - -# Add the required image file system types below. Valid are jffs2, tar, cramfs and ext2 -IMAGE_FSTYPES = "jffs2 tar" - -# Uncomment this to disable the parse cache (not recommended). -# CACHE = "" - -# Uncomment this if you want BitBake to emit debugging output -# BBDEBUG = "yes" - -# Uncomment these two if you want BitBake to build images useful for debugging. -# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined -# DEBUG_BUILD = "1" -# INHIBIT_PACKAGE_STRIP = "1" - -# Uncomment these to build a package such that you can use gprof to profile it. -# NOTE: This will only work with 'linux' targets, not -# 'linux-uclibc', as uClibc doesn't provide the necessary -# object files. Also, don't build glibc itself with these -# flags, or it'll fail to build. -# -# PROFILE_OPTIMIZATION = "-pg" -# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" -# LDFLAGS =+ "-pg" - -# Uncomment this to enable parallel make. -# This allows make to spawn mutliple processes to take advantage of multiple -# processors. Useful on SMP machines. This may break some packages - we're -# in the process of marking these so let us know if you find any. -# PARALLEL_MAKE = "-j 4" - -# Uncomment this if you want BitBake to emit the log if a build fails. -BBINCLUDELOGS = "yes" - -# Specifies a location to search for pre-generated tarballs when fetching -# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. -CVS_TARBALL_STASH = "http://www.oesources.org/source/current/" - -# EDIT THIS FILE and then remove the line below before using! -REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" diff --git a/openembedded/conf/machine/include/handheld-common.conf b/openembedded/conf/machine/include/handheld-common.conf index 467d5e59f1..f8767d2ddf 100644 --- a/openembedded/conf/machine/include/handheld-common.conf +++ b/openembedded/conf/machine/include/handheld-common.conf @@ -7,7 +7,7 @@ ide-cs ide-disk ide-probe-mod \ loop \ vfat ext2 \ sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \ +btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \ pcnet-cs serial-cs airo-cs \ af_packet \ ppp-async ppp-deflate ppp-mppe \ @@ -16,8 +16,6 @@ irda irlan irnet irport irtty ircomm-tty \ input uinput \ " -PCMCIA_MANAGER ?= "pcmcia-cs" - # Configuration bits for "generic handheld" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" diff --git a/openembedded/conf/machine/include/tosa-2.6.conf b/openembedded/conf/machine/include/tosa-2.6.conf index fdd706d093..c7805c36fe 100644 --- a/openembedded/conf/machine/include/tosa-2.6.conf +++ b/openembedded/conf/machine/include/tosa-2.6.conf @@ -1,14 +1,6 @@ include conf/machine/include/zaurus-clamshell-2.6.conf -# SOUND Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore" - -module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97" -module_autoload_snd-pcm-oss ="snd-pcm-oss" +# wlan-ng Modules +BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb" # WM97xx Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" -module_autoload_wm9705 = "wm9705" -#module_autoload_pxa-wm97xx = "pen_int=0" - -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx" -#module_autoload_wm97xx = "wm97xx" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf index 184258c8b6..af66c7294e 100644 --- a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf @@ -42,3 +42,4 @@ BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-u kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ kernel-module-usb-ohci-pxa27x kernel-module-bfusb" +GPE_EXTRA_INSTALL += "chkhinge" diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf index 271a6ca3e7..e73028d7ee 100644 --- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf @@ -2,10 +2,13 @@ # Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_wpa_supplicant = "0.4.7" + +PCMCIA_MANAGER ?= "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ -pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" # Ethernet modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" @@ -36,10 +39,12 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ hostap-conf orinoco-conf" # Sound Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ - kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" +BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ + kernel-module-snd-pcm \ kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" -BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " -BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " + +BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " +BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " +BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " +BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/openembedded/conf/machine/include/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf index ec10cd5e4e..2a174288b1 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 c7x0" +IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -12,7 +12,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge" +GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/include/handheld-common.conf diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf index 0c432ad674..c6f4804d5f 100644 --- a/openembedded/conf/machine/ipaq-pxa270.conf +++ b/openembedded/conf/machine/ipaq-pxa270.conf @@ -4,19 +4,30 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" +#use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" + +#use this for a hx2xxx ipaq +#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" + PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3" PREFERRED_VERSION_orinoco-modules = "0.15rc1" ROOT_FLASH_SIZE = "80" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p" + +MODUTILS = "26" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " +BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ - nls_cp437 nls_iso8859-1 nls_utf8" + nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" @@ -29,10 +40,15 @@ GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf -BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#include conf/machine/include/tune-iwmmxt.conf + +BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power" + + module_autoload_hx4700_power = "hx4700_power" module_autoload_pcmcia = "pcmcia" module_autoload_hx4700_pcmcia = "hx4700_pcmcia" diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf index 2238f6673e..7a558a731d 100644 --- a/openembedded/conf/machine/qemuarm.conf +++ b/openembedded/conf/machine/qemuarm.conf @@ -7,13 +7,15 @@ KERNEL_VERSION ?= "2.6" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te qemuarm" +PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-arm926ejs.conf -SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE = "115200 ttyAMA0" PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" |