diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-09 16:10:18 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 16:10:18 +0000 |
commit | 8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c (patch) | |
tree | 86922c4000d1f4550c9dee9c14856968c95d4951 /openembedded/conf | |
parent | 0d791a970638c9398ed94adafecbca54a0ea5374 (diff) | |
download | openembedded-core-8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c.tar.gz openembedded-core-8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c.tar.bz2 openembedded-core-8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c.tar.xz openembedded-core-8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c.zip |
Sync conf files with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@373 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
-rw-r--r-- | openembedded/conf/bitbake.conf | 18 | ||||
-rw-r--r-- | openembedded/conf/distro/preferred-e-versions.inc | 52 | ||||
-rw-r--r-- | openembedded/conf/distro/preferred-opie-versions.inc | 13 | ||||
-rw-r--r-- | openembedded/conf/documentation.conf | 8 | ||||
-rw-r--r-- | openembedded/conf/machine/akita.conf | 4 | ||||
-rw-r--r-- | openembedded/conf/machine/c7x0.conf | 4 | ||||
-rw-r--r-- | openembedded/conf/machine/include/poodle-2.4.conf | 10 | ||||
-rw-r--r-- | openembedded/conf/machine/include/poodle-2.6.conf | 41 | ||||
-rw-r--r-- | openembedded/conf/machine/include/tosa-2.4.conf | 20 | ||||
-rw-r--r-- | openembedded/conf/machine/include/tune-arm926ejs.conf | 3 | ||||
-rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell-2.4.conf | 40 | ||||
-rw-r--r-- | openembedded/conf/machine/ipaq-pxa270.conf | 1 | ||||
-rw-r--r-- | openembedded/conf/machine/nokia770.conf | 6 | ||||
-rw-r--r-- | openembedded/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | openembedded/conf/machine/spitz.conf | 4 | ||||
-rw-r--r-- | openembedded/conf/sanity.conf | 2 |
16 files changed, 105 insertions, 123 deletions
diff --git a/openembedded/conf/bitbake.conf b/openembedded/conf/bitbake.conf index 3b642e58f..2043a500e 100644 --- a/openembedded/conf/bitbake.conf +++ b/openembedded/conf/bitbake.conf @@ -304,6 +304,8 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" +E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" +E_URI = "http://enlightenment.freedesktop.org/files" 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" @@ -313,13 +315,13 @@ APACHE_MIRROR = "http://www.apache.org/dist" # export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge" # into your local.conf -FETCHCOMMAND = "" +FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}" -RESUMECOMMAND = "" +RESUMECOMMAND = "ERROR, this must be a BitBake bug" RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" -UPDATECOMMAND = "" -UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}" +UPDATECOMMAND = "ERROR, this must be a BitBake bug" +UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" SRCDATE = "${DATE}" SRC_URI = "file://${FILE}" @@ -400,4 +402,10 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## -PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file +PCMCIA_MANAGER ?= "pcmcia-cs" + + +################################################################## +# Magic Cookie for SANITY CHECK +################################################################## +OES_BITBAKE_CONF = "1" diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc index 53f363bf3..ca35c8379 100644 --- a/openembedded/conf/distro/preferred-e-versions.inc +++ b/openembedded/conf/distro/preferred-e-versions.inc @@ -2,34 +2,32 @@ # Specify which versions of E-related libraries and applications to build # -PREFERRED_VERSION_e = "0.16.999.023" -PREFERRED_VERSION_ecore-x11 = "0.9.9.023" -PREFERRED_VERSION_ecore-native = "0.9.9.023" -PREFERRED_VERSION_edb = "1.0.5.005" -PREFERRED_VERSION_edb-native = "1.0.5.005" -PREFERRED_VERSION_edje = "0.5.0.023" -PREFERRED_VERSION_edje-native = "0.5.0.023" -PREFERRED_VERSION_eet = "0.9.10.023" -PREFERRED_VERSION_eet-native = "0.9.10.023" -PREFERRED_VERSION_embryo = "0.9.1.023" -PREFERRED_VERSION_embryo-native = "0.9.1.023" +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.005" -PREFERRED_VERSION_epsilon = "0.3.0.005" -PREFERRED_VERSION_esmart-x11 = "0.9.0.005" -PREFERRED_VERSION_evas-x11 = "0.9.9.023" -PREFERRED_VERSION_evas-native = "0.9.9.023" -PREFERRED_VERSION_ewl = "0.0.4.005" -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_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" -PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" +PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11" -PREFERRED_VERSION_gnome-vfs-dbus = "svn" - -PREFERRED_VERSION_gcc = "3.4.4" diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc index d9f65b383..5811856e5 100644 --- a/openembedded/conf/distro/preferred-opie-versions.inc +++ b/openembedded/conf/distro/preferred-opie-versions.inc @@ -1,14 +1,19 @@ # -# A list of applications. +# Opie libraries # - - +PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' +PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" +PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" +PREFERRED_VERSION_qte = "${QTE_VERSION}" PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}" +# +# Opie applications +# PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" @@ -191,4 +196,4 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20030705" +PREFERRED_VERSION_konqueror-embedded = "20060404" diff --git a/openembedded/conf/documentation.conf b/openembedded/conf/documentation.conf index 57ca4fe23..20bcc53f5 100644 --- a/openembedded/conf/documentation.conf +++ b/openembedded/conf/documentation.conf @@ -91,3 +91,11 @@ 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" PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)." + +SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" + +# palmtop build class +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 diff --git a/openembedded/conf/machine/akita.conf b/openembedded/conf/machine/akita.conf index da699e725..89c0d031e 100644 --- a/openembedded/conf/machine/akita.conf +++ b/openembedded/conf/machine/akita.conf @@ -2,9 +2,7 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "58" diff --git a/openembedded/conf/machine/c7x0.conf b/openembedded/conf/machine/c7x0.conf index af1c9dad1..0bd962352 100644 --- a/openembedded/conf/machine/c7x0.conf +++ b/openembedded/conf/machine/c7x0.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. diff --git a/openembedded/conf/machine/include/poodle-2.4.conf b/openembedded/conf/machine/include/poodle-2.4.conf deleted file mode 100644 index 5453fda60..000000000 --- a/openembedded/conf/machine/include/poodle-2.4.conf +++ /dev/null @@ -1,10 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ -kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor \ -hostap-utils prism3-firmware prism3-support" - diff --git a/openembedded/conf/machine/include/poodle-2.6.conf b/openembedded/conf/machine/include/poodle-2.6.conf index 885bf40b4..907635552 100644 --- a/openembedded/conf/machine/include/poodle-2.6.conf +++ b/openembedded/conf/machine/include/poodle-2.6.conf @@ -1,4 +1,43 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" +PCMCIA_MANAGER ?= "pcmciautils" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" + +# Ethernet modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" +# NFS Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" +# Crypto Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" +# SMB and CRAMFS +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" +# Serial Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" +# Bluetooth Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ + kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ + kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" +# Infrared Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" + +# USB Gadget Modules +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-hostap kernel-module-hostap-cs \ + kernel-module-hermes kernel-module-orinoco \ + kernel-module-orinoco-cs kernel-module-spectrum-cs \ + hostap-conf orinoco-conf" + +# Sound Modules +###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_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 " diff --git a/openembedded/conf/machine/include/tosa-2.4.conf b/openembedded/conf/machine/include/tosa-2.4.conf deleted file mode 100644 index 88df07cdd..000000000 --- a/openembedded/conf/machine/include/tosa-2.4.conf +++ /dev/null @@ -1,20 +0,0 @@ -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ - kernel-module-acm \ - kernel-module-evdev kernel-module-net-fd \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ - kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" - diff --git a/openembedded/conf/machine/include/tune-arm926ejs.conf b/openembedded/conf/machine/include/tune-arm926ejs.conf index 5e2f6b7c6..d2c7bfac8 100644 --- a/openembedded/conf/machine/include/tune-arm926ejs.conf +++ b/openembedded/conf/machine/include/tune-arm926ejs.conf @@ -1,3 +1,4 @@ #if gcc breaks change arm926ejs to arm926ej-s -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" PACKAGE_ARCH = "armv5te" diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf deleted file mode 100644 index aaee8765a..000000000 --- a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.4 -# Don't forget to include zaurus-clamshell.conf as well - -PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" -PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" -PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ -wpa-supplicant-nossl ppp ppp-dialin openswan" - -# Misc Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" - -# USB Client Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" - -# Bluetooth Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ - kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ - kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \ - kernel-module-firmware-class kernel-module-bt3c-cs" - -# BI Module -BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi" - -# USB Host Modules -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" -BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - 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/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf index c6f4804d5..66d3eb38f 100644 --- a/openembedded/conf/machine/ipaq-pxa270.conf +++ b/openembedded/conf/machine/ipaq-pxa270.conf @@ -31,7 +31,6 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/include/ipaq-common.conf include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf index 41c485c01..dd2127610 100644 --- a/openembedded/conf/machine/nokia770.conf +++ b/openembedded/conf/machine/nokia770.conf @@ -6,6 +6,7 @@ IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" +PREFERRED_PROVIDER_virutal/tslib = "tslib-maemo" XSERVER = "xserver-kdrive-omap" @@ -19,7 +20,8 @@ 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 --no-cleanmarkers" +EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n " # serial console port on devboard rev. B3 #SERIAL_CONSOLE = "115200 tts/0" @@ -27,7 +29,7 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches -PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" +PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init detect-stylus \ ${PCMCIA_MANAGER} apm ppp wireless-tools console-tools" diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf index 7a558a731..f3edef989 100644 --- a/openembedded/conf/machine/qemuarm.conf +++ b/openembedded/conf/machine/qemuarm.conf @@ -2,8 +2,6 @@ #@NAME: qemu ARM Emulator setup #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation -KERNEL_VERSION ?= "2.6" - TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te qemuarm" diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf index 212da5258..f78dd7a3b 100644 --- a/openembedded/conf/machine/spitz.conf +++ b/openembedded/conf/machine/spitz.conf @@ -2,10 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -KERNEL_VERSION ?= "2.6" - include conf/machine/include/zaurus-clamshell.conf -include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PIVOTBOOT_EXTRA_RRECOMMENDS += "" diff --git a/openembedded/conf/sanity.conf b/openembedded/conf/sanity.conf index df2ec3e82..93700ef14 100644 --- a/openembedded/conf/sanity.conf +++ b/openembedded/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" - +BB_MIN_VERSION = "1.3.3" INHERIT += "sanity" |