diff options
Diffstat (limited to 'openembedded/conf')
| -rw-r--r-- | openembedded/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | openembedded/conf/distro/familiar-0.8.3.conf | 4 | ||||
| -rw-r--r-- | openembedded/conf/distro/openzaurus-3.5.4.conf | 15 | ||||
| -rw-r--r-- | openembedded/conf/distro/openzaurus.inc (renamed from openembedded/conf/distro/openzaurus.conf) | 0 | ||||
| -rw-r--r-- | openembedded/conf/distro/preferred-gpe-versions-2.7.inc | 7 | ||||
| -rw-r--r-- | openembedded/conf/local.conf.sample | 16 | ||||
| -rw-r--r-- | openembedded/conf/machine/ipaq-pxa270.conf | 7 | ||||
| -rw-r--r-- | openembedded/conf/machine/spitz.conf | 2 | ||||
| -rw-r--r-- | openembedded/conf/machine/zaurus-clamshell-2.6.conf | 7 |
9 files changed, 39 insertions, 22 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 04603d393..7008ce994 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf @@ -126,6 +126,7 @@ TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache" DL_DIR = "${TMPDIR}/downloads" CVSDIR = "${DL_DIR}/cvs" +GITDIR = "${DL_DIR}/git" STAMP = "${TMPDIR}/stamps/${PF}" WORKDIR = "${TMPDIR}/work/${PF}" @@ -170,6 +171,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_ IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." +IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." +IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf index 475117ceb..4b3d33dd9 100644 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ b/openembedded/conf/distro/familiar-0.8.3.conf @@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libiconv=glibc PREFERRED_PROVIDER_virtual/libintl=glibc PREFERRED_PROVIDER_x11=diet-x11 -PREFERRED_VERSION_hostap-modules ?= "0.3.9 +PREFERRED_VERSION_hostap-modules ?= "0.3.9" # The CSL compiler is unusable because # 1) certain programs stop to compile @@ -37,7 +37,7 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" PREFERRED_VERSION_qte = "2.3.10" -#OPIE_VERSION = "1.2.0" +OPIE_VERSION = "1.2.1" include conf/distro/preferred-opie-versions.inc # diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf index 61458c0b0..fbc197086 100644 --- a/openembedded/conf/distro/openzaurus-3.5.4.conf +++ b/openembedded/conf/distro/openzaurus-3.5.4.conf @@ -1,4 +1,4 @@ -include conf/distro/openzaurus.conf +include conf/distro/openzaurus.inc DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" DISTRO_VERSION = "3.5.3-snapshot-${DATE}" @@ -27,6 +27,16 @@ KERNEL_CONSOLE = "ttyS0" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" + +PREFERRED_VERSION_hostap-modules ?= "0.3.9" + +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libiconv=glibc +PREFERRED_PROVIDER_virtual/libintl=glibc + + # # Base # @@ -48,12 +58,11 @@ include conf/distro/preferred-opie-versions.inc # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDER_x11 = "diet-x11" -#PREFERRED_PROVIDER_x11 = "x11" include conf/distro/preferred-gpe-versions-2.7.inc # # E # -include conf/distro/preferred-e-versions.inc +#include conf/distro/preferred-e-versions.inc include conf/distro/poky-additions.inc
\ No newline at end of file diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.inc index 9208aeda0..9208aeda0 100644 --- a/openembedded/conf/distro/openzaurus.conf +++ b/openembedded/conf/distro/openzaurus.inc diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc index 5919f351f..4a3078240 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc @@ -7,13 +7,14 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus +PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.5" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" @@ -49,7 +50,7 @@ PREFERRED_VERSION_gpe-today ?= "0.09" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-beam ?= "0.2.8" -PREFERRED_VERSION_gpe-bluetooth ?= "0.44" +PREFERRED_VERSION_gpe-bluetooth ?= "0.45" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" PREFERRED_VERSION_gpe-clock ?= "0.21" @@ -86,7 +87,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" -PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1" +PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" PREFERRED_VERSION_poppler ?= "0.3.3" PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_gpe_mini_browser ?= "0.15" diff --git a/openembedded/conf/local.conf.sample b/openembedded/conf/local.conf.sample index 52a0d5f12..49b66b2e5 100644 --- a/openembedded/conf/local.conf.sample +++ b/openembedded/conf/local.conf.sample @@ -3,6 +3,7 @@ # This file is not used, see build/conf/local.conf instead # # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + # # OpenEmbedded local configuration file (sample) # @@ -25,12 +26,11 @@ # expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok). # Use this to specify where BitBake should place the downloaded sources into -DL_DIR = "POKYROOT/sources" +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')}" -BBFILES := "POKYROOT/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. @@ -77,7 +77,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Uncomment this to select a distribution policy. See the conf directory # for distributions currently known to OpenEmbedded. -# DISTRO = "familiar" +# Stay away from unversioned distros unless you really know what you are doing +# DISTRO = "familiar-0.8.3" # Uncomment this to select a particular kernel version if supported by # your MACHINE setting. Currently only supported on Zaurus Clamshells. @@ -88,7 +89,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # INHERIT = "package_ipk" # INHERIT = "package_tar" -# Add the required image file system types below. Valid are jffs2, tar, cramfs +# 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). @@ -97,7 +98,8 @@ IMAGE_FSTYPES = "jffs2 tar" # 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. +# 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" @@ -125,4 +127,4 @@ BBINCLUDELOGS = "yes" 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')}" +REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}" diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf index 0565b897b..ec2b1beb0 100644 --- a/openembedded/conf/machine/ipaq-pxa270.conf +++ b/openembedded/conf/machine/ipaq-pxa270.conf @@ -5,6 +5,7 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3" PREFERRED_VERSION_orinoco-modules = "0.15rc1" @@ -24,14 +25,14 @@ include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-filemanager gpe-nmf evince" -GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince" +GPE_EXTRA_DEPENDS += "gaim sylpheed" +GPE_EXTRA_INSTALL += "gaim sylpheed" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" -HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ +HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" module_autoload_hx4700_power = "hx4700_power" diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf index 6e6ea7f60..79ce0c419 100644 --- a/openembedded/conf/machine/spitz.conf +++ b/openembedded/conf/machine/spitz.conf @@ -15,6 +15,6 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += "" BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" -IMAGE_FSTYPES = "jffs2 tar" +IMAGE_FSTYPES = "jffs2 tar.gz" ROOT_FLASH_SIZE = "100" diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf index 516b07ee1..a26ae7754 100644 --- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf @@ -2,13 +2,12 @@ # Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -PREFERRED_VERSION_orinoco-modules = "0.15rc1" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \ +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw \ pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \ +BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl" @@ -34,3 +33,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel- BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ kernel-module-g-serial kernel-module-g-ether" +# Wireless Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-orinoco-cs kernel-module-spectrum-cs" |