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

5 files changed, 54 insertions, 2 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5d4ec2b39b..0caa162f67 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -322,7 +322,6 @@ SDK_PATH = "/usr/local/${SDK_NAME}"
 # Kernel info.
 ##################################################################
 
-OLDEST_KERNEL = "2.4.0"
 STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel"
 
 ##################################################################
@@ -657,6 +656,8 @@ require conf/enterprise.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
+OLDEST_KERNEL ?= "2.4.0"
+
 DL_DIR ?= "${TMPDIR}/downloads"
 IMAGE_FSTYPES ?= "tar.gz"
 PCMCIA_MANAGER ?= "pcmcia-cs"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2d7e77c515..03624c2661 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5078,6 +5078,10 @@ sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
 md5=59033388df36987d2b9c9bbf7e19bd57
 sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.5.tar.gz]
+md5=e218df6c84fc17c1126d31de9472a76c
+sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
+
 [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
 md5=c7545bb05e0c2fc59174f0dc455c6519
 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
@@ -5122,6 +5126,10 @@ sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
 md5=258d0a8277ace7fab06c55fdb2b249c4
 sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.5.tar.gz]
+md5=c75f112d24bdc39c76dbec61d59a4a91
+sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48
+
 [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz]
 md5=1829b2b261e0e0d07566066769b5b28b
 sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
@@ -6102,6 +6110,10 @@ sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 md5=2bfc127cdda02834d0491ab531a20960
 sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
 
+[http://downloads.sourceforge.net/flac/flac-1.2.1.tar.gz]
+md5=153c8b15a54da428d1f0fadc756c22c7
+sha256=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
+
 [http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.12.36-release.i386.rpm]
 md5=8845d4536fcd3a329690c93bce9bbf8e
 sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0
@@ -8174,6 +8186,10 @@ sha256=74846344de2c24a76408ee9c598dbc75d6c33a02f888f8b5491cb1af9a097cb4
 md5=37242776b08625fa10c73c18b790e552
 sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d
 
+[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.5.3.tar.gz]
+md5=d4c9de56f77f5cd86ac67ab53e027181
+sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef
+
 [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz]
 md5=eb12e6eea8413d35c033aedee61b89ee
 sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0
@@ -10078,6 +10094,10 @@ sha256=b011f194e1ab90e753744405bb5b85949cdda1a02320cb174b8d4a8e5e182dc3
 md5=750cf074e88b6fb7012f26d99cd39b9b
 sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
 
+[http://hal.freedesktop.org/releases/hal-0.5.12.tar.gz]
+md5=bb7c36e142437f7363f9a80ae8391926
+sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02
+
 [http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz]
 md5=3b351822ba359669646026013a3d5a03
 sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17
@@ -10122,6 +10142,10 @@ sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9
 md5=6fc99d15d38945c17a291ea93e664664
 sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0
 
+[http://hal.freedesktop.org/releases/hal-info-20090414.tar.gz]
+md5=ae7177ab8f0163d3ef2df71f0de2b357
+sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f
+
 [http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz]
 md5=488b0f2f346361bba7996b459c5d7b6f
 sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3
@@ -12398,6 +12422,10 @@ sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
 md5=f619b4f01aeda6d5f2679be9dcec5a51
 sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c
 
+[http://downloads.sourceforge.net/libassa/libassa-3.5.0.tar.gz]
+md5=9b61dfd94bf4e083829ffb0231243d8b
+sha256=72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314
+
 [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz]
 md5=db4e6939fafbaae80cab11a67f28771d
 sha256=c72dc7b2a3bb2945d1fb693b401ddff44f3eefbe248f2e6d29c86487b69c1dd4
@@ -13514,6 +13542,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea
 md5=6a4db221129f230c64a0f937d00bb703
 sha256=003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2
 
+[ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.2.tar.gz]
+md5=2853d8f32417e3c5f3b18fda38f96e52
+sha256=1e095469f7d159e5b9c91106484e10f0b3ce3265c55b9864407bd4ea5952111f
+
 [http://mikmod.raphnet.net/files/libmikmod-3.1.11.tar.gz]
 md5=705106da305e8de191549f1e7393185c
 sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929
@@ -17266,6 +17298,10 @@ sha256=58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db
 md5=917f4e05f3982bd7fceaede197f0e1d4
 sha256=d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b
 
+[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz]
+md5=03938f17646efbb50aa70ba5f99f51d7
+sha256=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
+
 [http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz]
 md5=f384fb230145f90fb75df1e33062583f
 sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5
@@ -23462,6 +23498,10 @@ sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d
 md5=23f227da49df36f33fe47e917e332cd8
 sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
 
+[http://kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2]
+md5=71919b69eeecbba05612224d8f2c450f
+sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd
+
 [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2]
 md5=51952682d8b42aeda3af5cee0133ce2c
 sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
@@ -27206,6 +27246,14 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
 md5=791e8986c6e16dcd1c9878126725e06b
 sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119
 
+[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
+md5=b9989582ea43f8fd58819d85ef9c9bc5
+sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
+
+[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.26/zenity-2.26.0.tar.bz2]
+md5=6660ce6dac0a6ca495a0e954cb6b40a2
+sha256=fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1
+
 [http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.6.1.tar.gz]
 md5=31ac40fdaf24b3e666ed83c1320dd7a5
 sha256=3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index bb50220f29..3432db42b5 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -20,6 +20,8 @@ DISTRO_VERSION = "2009.X-test-${DATE}"
 DISTRO_REVISION = "2"
 DISTRO_PR = ".2"
 
+OLDEST_KERNEL ?= "2.6.18"
+
 #build staging from packages
 INHERIT += "packaged-staging"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index add9586c7e..8d2bc93359 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -78,6 +78,7 @@ SRCREV_pn-gnuradio ?= "10302"
 SRCREV_pn-gpe-conf ?= "9900"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-gallery ?= "9376"
+SRCREV_pn-gpe-mini-browser2 ?= "9900"
 SRCREV_pn-gpe-sketchbook ?= "9547"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 9f48f750e7..bb4fa7eaf0 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r33" 
+MACHINE_KERNEL_PR = "r34" 
 
 KERNEL_IMAGETYPE = "uImage"