merge of '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'

     and '6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0'

12 files changed, 81 insertions, 77 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 648da96cb6..394d8af91e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1711,8 +1711,8 @@ md5=f7780f73d3338b17d5f2eedbe76132de
 sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b
 
 [http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch]
-md5=83763d83057bd5288bbd99f8a5b93c5c
-sha256=8b09efc89a8618d526dd210a8a296558a27b1a5324d47b219826b2e1713e5e58
+md5=fb01aea02faf4c5107292454745806ff
+sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443
 
 [http://www.busybox.net/downloads/busybox-1.11.1.tar.gz]
 md5=9c9f06c2d949c6de844c7bed8eb47064
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index 337f305c7a..b0ee16f561 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -86,7 +86,7 @@ SRCREV_pn-opkg-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
 SRCREV_pn-settings-daemon ?= "${AUTOREV}"
 SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
-SRCREV_pn-sphyrna ?= "${AUTOREV}"
+SRCREV_pn-sphyrna-python ?= "${AUTOREV}"
 SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
 SRCREV_pn-xoo ?= "${AUTOREV}"
 SRCREV_pn-mplayer ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index c63a202629..f6888e760f 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -50,69 +50,6 @@ SRCDATE_gpesyncd ?= "20070701"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
-# Enlightenment Foundation Libraries
-# Caution: This is not alphabetically, but (roughly) dependency-sorted.
-# Please leave it like that.
-EFL_SRCDATE ?= "20080802"
-SRCDATE_edb-native ?= "${EFL_SRCDATE}"
-SRCDATE_edb ?= "${EFL_SRCDATE}"
-SRCDATE_eet-native ?= "${EFL_SRCDATE}"
-SRCDATE_eet ?= "${EFL_SRCDATE}"
-SRCDATE_evas-native ?= "${EFL_SRCDATE}"
-SRCDATE_evas ?= "${EFL_SRCDATE}"
-SRCDATE_ecore-native ?= "${EFL_SRCDATE}"
-SRCDATE_ecore ?= "${EFL_SRCDATE}"
-SRCDATE_edbus ?= "${EFL_SRCDATE}"
-SRCDATE_embryo-native ?= "${EFL_SRCDATE}"
-SRCDATE_embryo ?= "${EFL_SRCDATE}"
-SRCDATE_edje-native ?= "${EFL_SRCDATE}"
-SRCDATE_edje ?= "${EFL_SRCDATE}"
-SRCDATE_emotion ?= "${EFL_SRCDATE}"
-SRCDATE_etk-native ?= "${EFL_SRCDATE}"
-SRCDATE_etk ?= "${EFL_SRCDATE}"
-SRCDATE_ewl ?= "${EFL_SRCDATE}"
-SRCDATE_epeg ?= "${EFL_SRCDATE}"
-SRCDATE_epsilon ?= "${EFL_SRCDATE}"
-SRCDATE_epdf ?= "${EFL_SRCDATE}"
-SRCDATE_esmart ?= "${EFL_SRCDATE}"
-SRCDATE_efreet ?= "${EFL_SRCDATE}"
-SRCDATE_exml ?= "${EFL_SRCDATE}"
-SRCDATE_enhance ?= "${EFL_SRCDATE}"
-SRCDATE_engrave ?= "${EFL_SRCDATE}"
-SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
-SRCDATE_evolve ?= "${EFL_SRCDATE}"
-SRCDATE_exquisite ?= "${EFL_SRCDATE}"
-SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
-SRCDATE_imlib2 ?= "${EFL_SRCDATE}"
-
-# Enlightenment Bindings
-SRCDATE_eflpp ?= "${EFL_SRCDATE}"
-SRCDATE_python-evas ?= "${EFL_SRCDATE}"
-SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
-SRCDATE_python-edje ?= "${EFL_SRCDATE}"
-SRCDATE_python-edbus ?= "${EFL_SRCDATE}"
-SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
-SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
-SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
-SRCDATE_python-etk ?= "${EFL_SRCDATE}"
-
-# Enlightenment Applications
-SRCDATE_edje-viewer ?= "${EFL_SRCDATE}"
-SRCDATE_edje-editor ?= "${EFL_SRCDATE}"
-SRCDATE_emphasis ?= "${EFL_SRCDATE}"
-SRCDATE_ephoto ?= "${EFL_SRCDATE}"
-SRCDATE_examine ?= "${EFL_SRCDATE}"
-SRCDATE_exhibit ?= "${EFL_SRCDATE}"
-SRCDATE_expedite ?= "${EFL_SRCDATE}"
-SRCDATE_elitaire ?= "${EFL_SRCDATE}"
-SRCDATE_entice ?= "${EFL_SRCDATE}"
-SRCDATE_entrance ?= "${EFL_SRCDATE}"
-SRCDATE_e-utils ?= "${EFL_SRCDATE}"
-SRCDATE_e-wm ?= "${EFL_SRCDATE}"
-SRCDATE_enna ?= "${EFL_SRCDATE}"
-SRCDATE_exquisite ?= "${EFL_SRCDATE}"
-SRCDATE_rage ?= "${EFL_SRCDATE}"
-
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index fd6d5612a2..0a198af53c 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -37,7 +37,7 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b"
+SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
@@ -47,7 +47,7 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "170"
+SRCREV_pn-illume ?= "35605"
 SRCREV_pn-illume-theme-asu ?= "170"
 SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d"
 SRCREV_pn-kismet ?= "2285"
@@ -155,6 +155,7 @@ SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
 SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-python-connexion ?= "1283"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
@@ -163,7 +164,8 @@ SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
-SRCREV_pn-sphyrna ?= "45"
+SRCREV_pn-sphyrna-python ?= "45"
+SRCREV_pn-tichy ?= "168"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
@@ -178,3 +180,68 @@ SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c"
 SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
+
+# Enlightenment Foundation Libraries
+# Caution: This is not alphabetically, but (roughly) dependency-sorted.
+# Please leave it like that.
+EFL_SRCREV ?= "35592"
+SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
+SRCREV_pn-edb ?= "${EFL_SRCREV}"
+SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
+SRCREV_pn-eet ?= "${EFL_SRCREV}"
+SRCREV_pn-evas-native ?= "${EFL_SRCREV}"
+SRCREV_pn-evas ?= "${EFL_SRCREV}"
+SRCREV_pn-ecore-native ?= "${EFL_SRCREV}"
+SRCREV_pn-ecore ?= "${EFL_SRCREV}"
+SRCREV_pn-edbus ?= "${EFL_SRCREV}"
+SRCREV_pn-embryo-native ?= "${EFL_SRCREV}"
+SRCREV_pn-embryo ?= "${EFL_SRCREV}"
+SRCREV_pn-edje-native ?= "${EFL_SRCREV}"
+SRCREV_pn-edje ?= "${EFL_SRCREV}"
+SRCREV_pn-emotion ?= "${EFL_SRCREV}"
+SRCREV_pn-etk-native ?= "${EFL_SRCREV}"
+SRCREV_pn-etk ?= "${EFL_SRCREV}"
+SRCREV_pn-ewl ?= "${EFL_SRCREV}"
+SRCREV_pn-epeg ?= "${EFL_SRCREV}"
+SRCREV_pn-epsilon ?= "${EFL_SRCREV}"
+SRCREV_pn-epdf ?= "${EFL_SRCREV}"
+SRCREV_pn-esmart ?= "${EFL_SRCREV}"
+SRCREV_pn-efreet ?= "${EFL_SRCREV}"
+SRCREV_pn-exml ?= "${EFL_SRCREV}"
+SRCREV_pn-enhance ?= "${EFL_SRCREV}"
+SRCREV_pn-engrave ?= "${EFL_SRCREV}"
+SRCREV_pn-evolve-native ?= "${EFL_SRCREV}"
+SRCREV_pn-evolve ?= "${EFL_SRCREV}"
+SRCREV_pn-gevas2 ?= "${EFL_SRCREV}"
+SRCREV_pn-imlib2 ?= "${EFL_SRCREV}"
+
+# Enlightenment Bindings
+SRCREV_pn-eflpp ?= "${EFL_SRCREV}"
+SRCREV_pn-python-evas ?= "${EFL_SRCREV}"
+SRCREV_pn-python-ecore ?= "${EFL_SRCREV}"
+SRCREV_pn-python-edje ?= "${EFL_SRCREV}"
+SRCREV_pn-python-edbus ?= "${EFL_SRCREV}"
+SRCREV_pn-python-emotion ?= "${EFL_SRCREV}"
+SRCREV_pn-python-epsilon ?= "${EFL_SRCREV}"
+SRCREV_pn-python-ewl ?= "${EFL_SRCREV}"
+SRCREV_pn-python-etk ?= "${EFL_SRCREV}"
+
+# Enlightenment Applications
+SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
+SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
+SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
+SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
+SRCREV_pn-examine ?= "${EFL_SRCREV}"
+SRCREV_pn-exhibit ?= "${EFL_SRCREV}"
+SRCREV_pn-expedite ?= "${EFL_SRCREV}"
+SRCREV_pn-elitaire ?= "${EFL_SRCREV}"
+SRCREV_pn-entice ?= "${EFL_SRCREV}"
+SRCREV_pn-entrance ?= "${EFL_SRCREV}"
+SRCREV_pn-e-utils ?= "${EFL_SRCREV}"
+SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
+SRCREV_pn-enna ?= "${EFL_SRCREV}"
+SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
+SRCREV_pn-rage ?= "${EFL_SRCREV}"
+
+# Illume module
+SRCREV_pn-illume ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index b998e4a015..05853d3936 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
 #TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.10"
+SLUGOS_VERSION = "5.0"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index d76a9c444f..db08775d4a 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -8,7 +8,7 @@
 #@COMMENT: It bases on conservative settings and should always be buildable.
 #-----------------------------------------------------------------------------
 
-require conf/distro/generic.conf
+require conf/distro/minimal.conf
 
 #
 # Header
diff --git a/conf/machine/d201gly2.conf b/conf/machine/d201gly2.conf
index d3c8780463..75a6920246 100644
--- a/conf/machine/d201gly2.conf
+++ b/conf/machine/d201gly2.conf
@@ -22,7 +22,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index b423f83f00..97d43d7a6d 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -12,6 +12,6 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 
 require conf/machine/include/tune-c3.inc
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index 6525c537b0..e715eeb83b 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -20,7 +20,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES ?= "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 15b9259b4f..685d763e6d 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -19,7 +19,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES ?= "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 #tune for pentium pro cpu
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
index 20b5a11770..91cf003420 100644
--- a/conf/machine/x86-32-nocona.conf
+++ b/conf/machine/x86-32-nocona.conf
@@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 
diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf
index 6a91bc39fb..5ea5079072 100644
--- a/conf/machine/x86-prescott.conf
+++ b/conf/machine/x86-prescott.conf
@@ -16,7 +16,7 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"