Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

7 files changed, 18 insertions, 405 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 04eb0dc263..d12ba5cf26 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2538,6 +2538,10 @@ sha256=c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
 md5=0e2e0f757f9e1e89b66033905860fded
 sha256=2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
 
+[ftp://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2]
+md5=c2972c4d9b3e29c03d5f2af86249876f
+sha256=5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae
+
 [ftp://ftp.gnu.org/gnu/automake/automake-1.7.7.tar.bz2]
 md5=4323c25644ed092c3d4fdfef434ab28d
 sha256=d2c98fb12188461b0542bd928e91c3767db2cb6cd951a222b6c305bd99a75878
@@ -24294,6 +24298,10 @@ sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba
 md5=f28c48e2caf79b8e9056636259056de7
 sha256=67c58590430d04799644d164e4a5977356d95528864ea787356e35dd314e660f
 
+[http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-0.4.8.tar.bz2]
+md5=c3cbeb30141d9bcd13460ba5cc8acddc
+sha256=053c91b3e3f344c0eec614d38812bfdf3310b8bedaf614399322f614f71aca57
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-dma.patch]
 md5=4336cca098b577608813a7c1454f2edd
 sha256=c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2010.1.conf
index 72d89282c2..c60d65ddb8 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -1,17 +1,20 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: Jlime 2009.1 <http://jlime.com>
+#@NAME: Jlime 2010.1 <http://www.jlime.com>
 #@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
 #              HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c,
 #	       Ben Nanonote.
+#	       Unofficial support for Netbook pro, Bsquare Maui.
 #@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
+#@MAINTAINER: Alex Ferguson <thoughtmonster@gmail.com>
+#@MAINTAINER: Filip Zyzniewski <filip.zyzniewski@gmail.com>
 #-----------------------------------------------------------------------------
 
 #
 # Header
 #
 DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "2009.1"
+DISTRO_VERSION = "2010.1"
 DISTRO_TYPE = "release"
 export FEED_URLS_jlime = "http://repository.jlime.com/"
 
@@ -37,6 +40,7 @@ SPLASH = "psplash"
 INHERIT += "debian package_tar package_ipk src_distribute_local"
 SRC_DIST_LOCAL ?= "symlink"
 IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
 
 #
 # Kernel
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
deleted file mode 100644
index db964f00bc..0000000000
--- a/conf/distro/jlime-donkey.conf
+++ /dev/null
@@ -1,139 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "jlime"
-DISTRO_VERSION = "donkey"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
-
-#<>----------------------------------------------------------------->
-#<> No uniroot
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#<>----------------------------------------------------------------->
-#<> We will set CVS DATE when things are known to work.
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}g++:gcc-cross"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-#<>----------------------------------------------------------------->
-#<> We want this so we can crosscompile the kernel using gcc 3.4.3
-#<> Also, select version of modules (and kernel)
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel"
-PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
-
-
-#<>----------------------------------------------------------------->
-#<>We want kdrive as our default X-Server.
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/xserver  = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11    = "libx11"
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-
-
-#<>----------------------------------------------------------------->
-#<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
-#<>-----------------------------------------------------------------<
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_binutils-cross-sdk = "2.18"
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"                                             		    
-PREFERRED_VERSION_glibc = "2.6.1"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
-#<>------------------------------------------------------------------<
-#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_PROVIDER_tslib          = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>System-critical software with known working versions.
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
-PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_busybox = "1.9.1"
-
-#<>------------------------------------------------------------------>
-#<>Other Specific stuff.
-#<>
-#<>
-#<>We want to be able to build this for all jornadas so
-#<>to not mess up the folders we need to make them dynamic.
-#<>It will use different folders depending on Arch (set in local.conf)
-#<>------------------------------------------------------------------<
-SRC_DIST_LOCAL = "copy"
-INHERIT += "package_ipk package_tar src_distribute_local"
-BBINCLUDELOGS = "yes"
-IMAGE_FSTYPES = "tar.bz2"
-TARGET_OS = "linux"
-
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra) 
-#<>                                            
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools \
-                         parted dialog"
-
-
-#<>------------------------------------------------------------------>
-#<>What Qte, libqte.. versions should we use.
-#<>------------------------------------------------------------------<
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions-1.2.3.inc
-
-
-#<>------------------------------------------------------------------>
-#<> We want pcmciautils, not pcmcia-cs
-#<>------------------------------------------------------------------<
-PCMCIA_MANAGER = "pcmciautils"
-
-
-#<>------------------------------------------------------------------>
-#<> We are using gcc 4.1.1 so lets keep optimizations low
-#<>------------------------------------------------------------------< 
-FULL_OPTIMIZATION = "-O2"
-
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
-
-
-#<>------------------------------------------------------------------>
-#<>
-#<>
-#<> General non-essential programs with known working versions
-#<>
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_tightvnc = "1.3.9"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
-#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
-PREFERRED_VERSION_icewm = "1.2.34"
-PREFERRED_VERSION_xchat = "1.8.11"
-PREFERRED_VERSION_rxvt = "2.6.4"
diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf
deleted file mode 100644
index 14ea57d18c..0000000000
--- a/conf/distro/jlime-henchman.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Jlime Henchman <jlime.com>
-#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-#              NEC Mobile Pro 900/900c handheld pc.
-#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "Henchman"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
-#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra) 
-#<>                                            
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
-			console-tools tslib-tests parted dialog"
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
-
-#
-# Naming schemes
-#
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.bz2"
-
-#
-# Kernel
-#
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-
-#
-# Target OS & FPU system
-# 
-TARGET_OS = "linux"
-TARGET_FPU_arm = "fixed"
-TARGET_FPU_armeb = "fixed"
-
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
-PREFERRED_VERSION_glibc = "2.5"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf
deleted file mode 100644
index 2e6c43462e..0000000000
--- a/conf/distro/jlime-mongo.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Jlime Mongo <jlime.com>
-#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-#              HP Jornada 720/728 handheld pc.
-#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "Mongo"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
-export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra) 
-#<>                                            
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
-			console-tools tslib-tests parted dialog"
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
-
-#
-# Naming schemes
-#
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-INHERIT += "package_tar"
-IMAGE_FSTYPES = "tar.bz2"
-
-#
-# Kernel
-#
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-
-#
-# Target OS & FPU system
-# 
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-PREFERRED_VERSION_glibc = "2.5"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
deleted file mode 100644
index 98844d76a4..0000000000
--- a/conf/distro/jlime-shrek.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "JLime"
-DISTRO_VERSION = "Shrek"
-DISTRO_TYPE = "release"
-
-export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/Releases/shrek/${TARGET_ARCH}/feed/"
-
-SRCDATE = "20050518"
-
-PREFERRED_PROVIDERS  =  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS  =  "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}"
-PREFERRED_PROVIDER_xserver        = "xserver-kdrive"
-
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_gcc = "3.4.3"
-PREFERRED_VERSION_gcc-cross = "3.4.3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.3"
-PREFERRED_VERSION_gcc-cross-intermediate = "3.4.3"
-PREFERRED_VERSION_linux-libc-headers = "2.6.7.0"                                             		    
-PREFERRED_VERSION_glib-2.0-native = "2.6.2"
-PREFERRED_VERSION_glib-2.0 = "2.6.2"
-PREFERRED_VERSION_dpkg = "1.10.23"
-PREFERRED_VERSION_xserver-kdrive = "20050207"
-
-INHERIT += "package_tar package_ipk"
-BBINCLUDELOGS = "yes"
-MODUTILS = "26"
-IMAGE_FSTYPES = "tar.bz2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools            \
-kernel-module-3c574-cs    kernel-module-3c589-cs    kernel-module-8390        \
-kernel-module-airo-cs     kernel-module-airo        console-tools             \
-kernel-module-arlan                                                           \
-kernel-module-atmel-cs    kernel-module-atmel       kernel-module-axnet-cs    \
-kernel-module-hermes                                                          \
-kernel-module-wavelan     kernel-module-wavelan-cs                            \
-kernel-module-xirc2ps-cs  kernel-module-orinoco-cs  kernel-module-orinoco     \
-kernel-module-nmclan-cs   kernel-module-pcnet-cs    e2tools e2fsprogs"
-
-TARGET_OS = "linux"
-
-OPIE_VERSION = "1.2.1"  
-require conf/distro/include/preferred-opie-versions.inc  
diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf
index 391f4a542d..08bcdea3e5 100644
--- a/conf/machine/ben-nanonote.conf
+++ b/conf/machine/ben-nanonote.conf
@@ -1,8 +1,11 @@
 #@TYPE: Machine
 #@NAME: Ben Nanonote
 #@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote
+
 TARGET_ARCH = "mipsel"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+require conf/machine/include/tune-mips32.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben"
 KERNEL_IMAGETYPE = "uImage"
 IMAGE_FSTYPES ?= "jffs2"