diff options
82 files changed, 3381 insertions, 6063 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index dee674abea..5a57482b5d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -66,6 +66,7 @@ FEED_ARCH_aximx50 = "armv5te" FEED_ARCH_aximx50v = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_compulab-pxa270 = "armv5te" +FEED_ARCH_davinci-dvevm = "armv5te" FEED_ARCH_devkitidp-pxa255 = "armv5te" FEED_ARCH_e680 = "armv5te" FEED_ARCH_er0100 = "armv5te" @@ -123,6 +124,13 @@ FEED_ARCH_triton = "armv5te" FEED_ARCH_ixp4xxbe = "armv5teb" FEED_ARCH_nslu2be = "armv5teb" +# armv6 + +FEED_ARCH_mx31ads = "armv6" +FEED_ARCH_nokia800 = "armv6" +FEED_ARCH_omap2420h4 = "armv6" +FEED_ARCH_omap2430sdp = "armv6" + #i486 machines FEED_ARCH_geodegx = "i486" FEED_ARCH_geodelx = "i486" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 7fc656fb5e..dcf224f798 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -18,19 +18,19 @@ require conf/distro/angstrom-2007.1.conf DISTRO_VERSION = "2008.1-test-${DATE}" DISTRO_REVISION = "0" -PREFERRED_VERSION_gcc ?= "4.2.1" -PREFERRED_VERSION_gcc-cross ?= "4.2.1" +PREFERRED_VERSION_gcc = "4.2.1" +PREFERRED_VERSION_gcc-cross = "4.2.1" -PREFERRED_VERSION_binutils ?= "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils = "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.22" +PREFERRED_VERSION_linux-libc-headers = "2.6.22" -#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.6" -PREFERRED_VERSION_glibc-intermediate ?= "2.6" -PREFERRED_VERSION_glibc-initial ?= "2.6" +#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. +PREFERRED_VERSION_glibc = "2.6" +PREFERRED_VERSION_glibc-intermediate = "2.6" +PREFERRED_VERSION_glibc-initial = "2.6" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 5522a12728..e3e77f9f18 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -29,6 +29,9 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1" #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" +ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" +ENABLE_BINARY_LOCALE_GENERATION_omap2420h4 = "0" +ENABLE_BINARY_LOCALE_GENERATION_omap2430sdp = "0" #ARM EABI is softfloat by default, but let's make sure :) #make it overridable for platforms with FPU, like ep93xx or i.mx31 diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index a31466a434..fb9e2815ba 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -42,7 +42,6 @@ PREFERRED_VERSION_ipaq-sleep ?= "0.9" PREFERRED_VERSION_teleport ?= "0.34" PREFERRED_VERSION_xst ?= "0.15" - PREFERRED_VERSION_gpe-aerial ?= "0.3.0" PREFERRED_VERSION_gpe-appmgr ?= "2.8" PREFERRED_VERSION_gpe-autostarter ?= "0.12" @@ -62,7 +61,7 @@ PREFERRED_VERSION_gpe-shield ?= "0.9" PREFERRED_VERSION_gpe-taskmanager ?= "0.20" PREFERRED_VERSION_minilite ?= "0.50" PREFERRED_VERSION_miniclipboard ?= "0.3" -PREFERRED_VERSION_minimix ?= "0.8" +PREFERRED_VERSION_minimix ?= "0.9" PREFERRED_VERSION_gpe-edit ?= "0.40" PREFERRED_VERSION_gpe-gallery ?= "0.97" PREFERRED_VERSION_gpe-calculator ?= "0.2" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index daffdda6de..cf3c793c68 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -106,7 +106,9 @@ 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 and ext2 +# Add the required image file system types below. Valid are +# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz) +# squashfs, squashfs-lzma IMAGE_FSTYPES = "jffs2 tar" # Uncomment this to disable the parse cache (not recommended). diff --git a/conf/machine/davinci_dvevm.conf b/conf/machine/davinci-dvevm.conf index 57afed1550..8deaa092e8 100644 --- a/conf/machine/davinci_dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI Davinci EVM board TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" HOTPLUG = "udev" @@ -12,6 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "git" +UBOOT_MACHINE = "davinci_dvevm" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index bd2e1439a5..a33510290f 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -38,13 +38,15 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ kernel-module-acx \ kernel-module-i2c-algo-bit \ kernel-module-htcuniversal-ts2 \ + kernel-module-htcuniversal-phone \ kernel-module-ts-adc-debounce \ + kernel-module-htcuniversal-bt \ " # # Modules autoload and other boot properties # -module_autoload_acx = "acx" +#module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf index 9b4174018c..68316f36bf 100644 --- a/conf/machine/include/tune-arm1136jf-s.conf +++ b/conf/machine/include/tune-arm1136jf-s.conf @@ -1,2 +1,2 @@ -TARGET_CC_ARCH = "-march=armv6 -mtune=arm1136jf-s -mfpu=vfp" +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp" PACKAGE_ARCH = "armv6"
\ No newline at end of file diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 070cdcdd05..1affae1389 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -25,7 +25,7 @@ IMAGE_FSTYPES ?= "jffs2" # serial console port on devboard rev. B3 SERIAL_CONSOLE = "115200 ttyS0" -PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770" +PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf new file mode 100644 index 0000000000..f13fa7def2 --- /dev/null +++ b/conf/machine/omap2430sdp.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: ARM 1136 cpu on OMAP2430 SDP board +#@DESCRIPTION: Machine configuration for the OMAP 2430 SDP development board with a arm1136 processor. + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" +PREFERRED_VERSION_u-boot = "1.1.4" + +SERIAL_CONSOLE ?= "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" + +MACHINE_FEATURES = "kernel26" + +require conf/machine/include/tune-arm1136jf-s.conf diff --git a/packages/0xFFFF/0xffff-native_0.1.bb b/packages/0xFFFF/0xffff-native_0.1.bb index 1cee49aafd..2530388d06 100644 --- a/packages/0xFFFF/0xffff-native_0.1.bb +++ b/packages/0xFFFF/0xffff-native_0.1.bb @@ -5,12 +5,14 @@ DEPENDS = "libusb-native" inherit native do_stage() { - install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE} + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE} } do_deploy[dirs] = "${S}" do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} install -m 755 0xFFFF ${DEPLOY_DIR_IMAGE} } diff --git a/packages/0xFFFF/0xffff-native_0.2.bb b/packages/0xFFFF/0xffff-native_0.2.bb index 1cee49aafd..eb82cb468a 100644 --- a/packages/0xFFFF/0xffff-native_0.2.bb +++ b/packages/0xFFFF/0xffff-native_0.2.bb @@ -5,12 +5,14 @@ DEPENDS = "libusb-native" inherit native do_stage() { + install -d ${STAGING_BINDIR_NATIVE} install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE} } do_deploy[dirs] = "${S}" do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} install -m 755 0xFFFF ${DEPLOY_DIR_IMAGE} } diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb index d50e8e5fde..0fb8a7980f 100644 --- a/packages/bluez/bluez-gnome_0.13.bb +++ b/packages/bluez/bluez-gnome_0.13.bb @@ -1,7 +1,10 @@ DESCRIPTION = "BLuetooth configuration applet" LICENSE = "GPL+LGPL" +PR = "r1" + DEPENDS = "dbus-glib gconf libnotify gtk+" +RRECOMMENDS = "gnome-icon-theme" SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" diff --git a/packages/bluez/bluez-gnome_0.6.bb b/packages/bluez/bluez-gnome_0.6.bb deleted file mode 100644 index d50e8e5fde..0000000000 --- a/packages/bluez/bluez-gnome_0.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "BLuetooth configuration applet" -LICENSE = "GPL+LGPL" - -DEPENDS = "dbus-glib gconf libnotify gtk+" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gconf" - diff --git a/packages/bluez/bluez-gnome_0.7.bb b/packages/bluez/bluez-gnome_0.7.bb deleted file mode 100644 index d50e8e5fde..0000000000 --- a/packages/bluez/bluez-gnome_0.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "BLuetooth configuration applet" -LICENSE = "GPL+LGPL" - -DEPENDS = "dbus-glib gconf libnotify gtk+" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gc |