merge of '2b710e1818e35c1ae6f03e19452a17638f3b8048'

     and '9a039e377450d290fde23e8f83821bd022343fd4'

4 files changed, 32 insertions, 8 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 749a719a23..219fb74b0c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11909,3 +11909,7 @@ sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c
 [http://simh.trailing-edge.com/sources/simhv37-1.zip]
 md5=c8c57379e2e9afbf9817fbbe99ee1106
 sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132
+
+[http://www.pengutronix.de/software/memedit/downloads/memedit-0.7.tar.gz]
+md5=3d0f372fb213e09b8d04826f3a0bc2eb
+sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 275b8e010a..ca938adc43 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -10,9 +10,12 @@
 DISTRO_VERSION = "test-${DATE}"
 DISTRO_REVISION = "46"
 
-require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
 
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
+
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace and gdb included
 # 'release' no root password, no strace and gdb by default
@@ -88,11 +91,6 @@ FEED_ARCH_simpad        = "arm-oabi"
 
 #Tweak packaging for strongarm machines since they can't use EABI
 
-PACKAGE_ARCH_collie     = "arm-oabi"
-PACKAGE_ARCH_h3600      = "arm-oabi"
-PACKAGE_ARCH_h3800      = "arm-oabi"
-PACKAGE_ARCH_simpad     = "arm-oabi"
-
 PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
 PACKAGE_EXTRA_ARCHS_h3600  = "arm-oabi"
 PACKAGE_EXTRA_ARCHS_h3800  = "arm-oabi"
@@ -138,7 +136,7 @@ PREFERRED_VERSION_file         = "4.18"
 PREFERRED_VERSION_file_native  = "4.18"
 
 PREFERRED_VERSION_fontconfig       = "2.4.1"
-PREFERRED_VERSION_freetype         = "2.3.3"
+PREFERRED_VERSION_freetype         = "2.3.4"
 PREFERRED_VERSION_freetype-native  = "2.2.1"
 PREFERRED_VERSION_cairo            = "1.4.8"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
new file mode 100644
index 0000000000..bb7bc45fbd
--- /dev/null
+++ b/conf/distro/include/angstromoabi.inc
@@ -0,0 +1,4 @@
+require conf/distro/include/angstrom.inc
+
+PACKAGE_ARCH     = "arm-oabi"
+
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index bd5703c909..75e8b86e4d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -50,7 +50,24 @@ SRCDATE_gconf-dbus ?= "20070512"
 SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
-#Misc apps, sorted by alphabet
+# Enlightenment (libs)
+SRCDATE_edb ?= "20070601"
+SRCDATE_enhanve ?= "20070601"
+SRCDATE_engrave ?= "20070601"
+SRCDATE_exml ?= "20070601"
+
+# Enlightenment (apps)
+SRCDATE_edje-viewer = "20070601"
+SRCDATE_emphasis = "20070601"
+SRCDATE_ephoto = "20070601"
+SRCDATE_examine = "20070601"
+SRCDATE_expedite = "20070601"
+SRCDATE_elitaire = "20070504"
+SRCDATE_entice = "20070601"
+SRCDATE_e-utils = "20070601"
+SRCDTE_exhibit = "20070601"
+
+# Misc apps, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_dvbstream ?= "20060814"
@@ -71,6 +88,7 @@ SRCDATE_madwifi-modules ?= "20060814"
 SRCDATE_maemo-mapper-nohildon ?= "20061114"
 SRCDATE_mileage ?= "20060814"
 SRCDATE_minimo ?= "20050401"
+SRCDATE_mpd ?= "20070210"
 SRCDATE_mystun-server ?= "20060814"
 SRCDATE_olsrd ?= "20060814"
 SRCDATE_opencvs ?= "20060814"