From 0533f8261c387f1f047aa12a1226a096e4fa5284 Mon Sep 17 00:00:00 2001
From: Ottavio Campana <ottavio@campana.vi.it>
Date: Mon, 18 May 2009 02:51:32 +0200
Subject: libmicrohttpd: new recipe

---
 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb

diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
new file mode 100644
index 0000000000..39860dcef3
--- /dev/null
+++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application"
+HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/"
+SECTION = "libs"
+LICENSE = "LGPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.1.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        oe_runmake DESTDIR="${D}" install
+        autotools_stage_all
+}
+
+PN = "libmicrohttpd"
-- 
cgit v1.2.3


From 1b4f3b70c8e445a866b5fe5e721db2b7092d5472 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 May 2009 03:26:51 +0200
Subject: libmicrohttpd: remove unnecessary PN, add AUTHOR and improve
 DESCRIPTION and SRC_URI

---
 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
index 39860dcef3..cdf721c26e 100644
--- a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
+++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
@@ -1,10 +1,11 @@
-DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application"
+DESCRIPTION = "easy to embed and small HTTP server as a C library"
+AUTHOR = "Christian Grothoff <christian@grothoff.org>"
 HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/"
 SECTION = "libs"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.1.tar.gz"
+SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
@@ -12,5 +13,3 @@ do_stage() {
         oe_runmake DESTDIR="${D}" install
         autotools_stage_all
 }
-
-PN = "libmicrohttpd"
-- 
cgit v1.2.3


From f2f3e71e9fcc0fdd0aa73bfa5960ff27d0a70c2a Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 May 2009 03:27:48 +0200
Subject: libmicrohttpd: update to 0.4.2

---
 conf/checksums.ini                           |  4 ++++
 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb | 15 ---------------
 recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
 create mode 100644 recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2d7e77c515..537cd0c648 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13514,6 +13514,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
diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
deleted file mode 100644
index cdf721c26e..0000000000
--- a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "easy to embed and small HTTP server as a C library"
-AUTHOR = "Christian Grothoff <christian@grothoff.org>"
-HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/"
-SECTION = "libs"
-LICENSE = "LGPL"
-PR = "r2"
-
-SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-        oe_runmake DESTDIR="${D}" install
-        autotools_stage_all
-}
diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb
new file mode 100644
index 0000000000..cdf721c26e
--- /dev/null
+++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "easy to embed and small HTTP server as a C library"
+AUTHOR = "Christian Grothoff <christian@grothoff.org>"
+HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/"
+SECTION = "libs"
+LICENSE = "LGPL"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        oe_runmake DESTDIR="${D}" install
+        autotools_stage_all
+}
-- 
cgit v1.2.3


From d62d49a2858fa2b389c60008ba9ee92c46b66151 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 May 2009 03:43:20 +0200
Subject: xmms-embedded: fix -dbg packaging

---
 recipes/xmms-embedded/xmms-embedded_20040327.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/xmms-embedded/xmms-embedded_20040327.bb b/recipes/xmms-embedded/xmms-embedded_20040327.bb
index a8b24e709a..48c543948c 100644
--- a/recipes/xmms-embedded/xmms-embedded_20040327.bb
+++ b/recipes/xmms-embedded/xmms-embedded_20040327.bb
@@ -63,4 +63,4 @@ do_install() {
     done
 }
 
-FILES-${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug"
+FILES_${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug"
-- 
cgit v1.2.3


From 4dde753d39367674125634dde61715e8a5ce4870 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 09:28:12 +0200
Subject: transmission: only run *inst scripts online

---
 recipes/transmission/transmission_1.40.bb | 9 ++++++++-
 recipes/transmission/transmission_1.61.bb | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb
index 081c2e8aff..47d674941a 100644
--- a/recipes/transmission/transmission_1.40.bb
+++ b/recipes/transmission/transmission_1.40.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 HOMEPAGE = "www.transmissionbt.com/"
 DEPENDS = "openssl gettext libtool intltool-native curl glib-2.0-native"
 LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
 SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \
            file://init"
 
@@ -18,6 +18,10 @@ do_install_append() {
 }
 
 pkg_postinst_${PN}() {
+#!/bin/sh
+if [ "x$D" != "x" ] ; then
+        exit 1
+fi
 grep -q transmission  ${sysconfdir}/group || addgroup transmission
 grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission
 mkdir -p /home/transmission/.config
@@ -26,6 +30,9 @@ chown transmission:transmission /home/transmission/.config
 
 pkg_postrm_${PN}() {
 #!/bin/sh
+if [ "x$D" != "x" ] ; then
+        exit 1
+fi
 delgroup transmission
 deluser transmission
 }
diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb
index 1692147fcf..a9fb8c9edd 100644
--- a/recipes/transmission/transmission_1.61.bb
+++ b/recipes/transmission/transmission_1.61.bb
@@ -3,7 +3,7 @@ SECTION = "network"
 HOMEPAGE = "www.transmissionbt.com/"
 DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native"
 LICENSE = "GPLv2"
-PR = "r3"
+PR = "r4"
 SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \
            file://init"
 
@@ -18,6 +18,10 @@ do_install_append() {
 }
 
 pkg_postinst_${PN}() {
+#!/bin/sh
+if [ "x$D" != "x" ] ; then        
+        exit 1
+fi
 grep -q transmission  ${sysconfdir}/group || addgroup transmission
 grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission
 mkdir -p /home/transmission/.config
@@ -26,6 +30,9 @@ chown transmission:transmission /home/transmission/.config
 
 pkg_postrm_${PN}() {
 #!/bin/sh
+if [ "x$D" != "x" ] ; then        
+        exit 1
+fi
 delgroup transmission
 deluser transmission
 }
-- 
cgit v1.2.3


From dba4943a54c97d1479b60ff05a6f36aee91082ee Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 09:39:22 +0200
Subject: transmission: update-rc.d handles online check, so add a note saying
 that,  fix packaging

---
 recipes/transmission/transmission_1.40.bb |  9 +--------
 recipes/transmission/transmission_1.61.bb | 11 +++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb
index 47d674941a..c40939fd3b 100644
--- a/recipes/transmission/transmission_1.40.bb
+++ b/recipes/transmission/transmission_1.40.bb
@@ -17,11 +17,8 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission
 }
 
+# No need for online check, since update-rc.d will prepend it to here
 pkg_postinst_${PN}() {
-#!/bin/sh
-if [ "x$D" != "x" ] ; then
-        exit 1
-fi
 grep -q transmission  ${sysconfdir}/group || addgroup transmission
 grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission
 mkdir -p /home/transmission/.config
@@ -29,10 +26,6 @@ chown transmission:transmission /home/transmission/.config
 }
 
 pkg_postrm_${PN}() {
-#!/bin/sh
-if [ "x$D" != "x" ] ; then
-        exit 1
-fi
 delgroup transmission
 deluser transmission
 }
diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb
index a9fb8c9edd..e898953dff 100644
--- a/recipes/transmission/transmission_1.61.bb
+++ b/recipes/transmission/transmission_1.61.bb
@@ -17,11 +17,10 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission
 }
 
+FILES_${PN} += "${datadir}/icons"
+
+# No need for online check, since update-rc.d will prepend it to here
 pkg_postinst_${PN}() {
-#!/bin/sh
-if [ "x$D" != "x" ] ; then        
-        exit 1
-fi
 grep -q transmission  ${sysconfdir}/group || addgroup transmission
 grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission
 mkdir -p /home/transmission/.config
@@ -29,10 +28,6 @@ chown transmission:transmission /home/transmission/.config
 }
 
 pkg_postrm_${PN}() {
-#!/bin/sh
-if [ "x$D" != "x" ] ; then        
-        exit 1
-fi
 delgroup transmission
 deluser transmission
 }
-- 
cgit v1.2.3


From 4fb5e283e611b87c4d55079c12a1a4ca1c5624a7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 10:24:05 +0200
Subject: xserver-common: add xdg-autostart support (from poky)

---
 recipes/xserver-common/files/89xdgautostart.sh | 7 +++++++
 recipes/xserver-common/xserver-common_1.24.bb  | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 recipes/xserver-common/files/89xdgautostart.sh

diff --git a/recipes/xserver-common/files/89xdgautostart.sh b/recipes/xserver-common/files/89xdgautostart.sh
new file mode 100644
index 0000000000..db7aa229d2
--- /dev/null
+++ b/recipes/xserver-common/files/89xdgautostart.sh
@@ -0,0 +1,7 @@
+XDGAUTOSTART=/etc/xdg/autostart
+if [ -d $XDGAUTOSTART ]; then
+    for SCRIPT in $XDGAUTOSTART/*; do
+        CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2`
+        $CMD &
+    done
+fi
\ No newline at end of file
diff --git a/recipes/xserver-common/xserver-common_1.24.bb b/recipes/xserver-common/xserver-common_1.24.bb
index a30a37c893..27b4ba6a70 100644
--- a/recipes/xserver-common/xserver-common_1.24.bb
+++ b/recipes/xserver-common/xserver-common_1.24.bb
@@ -2,15 +2,18 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append = " file://setDPI.sh \
+                   file://89xdgautostart.sh \
+"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+	install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xinit.d/89xdgautostart.sh"
 }
-- 
cgit v1.2.3


From cc4e74ff5f3ee6677f84d5194028953de3cd3ef7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 10:28:30 +0200
Subject: util-linux-ng: update to 2.15

---
 conf/checksums.ini                          | 4 ++++
 recipes/util-linux-ng/util-linux-ng_2.15.bb | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 recipes/util-linux-ng/util-linux-ng_2.15.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 537cd0c648..b7acaba93e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -23466,6 +23466,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
diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb
new file mode 100644
index 0000000000..d8cb0a714d
--- /dev/null
+++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb
@@ -0,0 +1,6 @@
+require util-linux-ng.inc
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.15', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+LDFLAGS_append_libc-uclibc = " -lintl"
+
-- 
cgit v1.2.3


From 393066c818047a5cf6c90455e6874c4e901f5edf Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 18 May 2009 09:52:45 +0100
Subject: libnss-mdns_0.10.bb : add new version of the mdns resolver

---
 conf/checksums.ini                      |  4 ++++
 recipes/libnss-mdns/libnss-mdns_0.10.bb | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 recipes/libnss-mdns/libnss-mdns_0.10.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 537cd0c648..fa6a2395b3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -17270,6 +17270,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
diff --git a/recipes/libnss-mdns/libnss-mdns_0.10.bb b/recipes/libnss-mdns/libnss-mdns_0.10.bb
new file mode 100644
index 0000000000..b325f826d6
--- /dev/null
+++ b/recipes/libnss-mdns/libnss-mdns_0.10.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "NSS module for Multicast DNS name resolution"
+HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+
+RRECOMMENDS_${PN} = "zeroconf"
+PR = "r0"
+
+EXTRA_OECONF = "--libdir=/lib"
+S = "${WORKDIR}/nss-mdns-${PV}"
+
+SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz"
+
+inherit autotools
+
+pkg_postinst_${PN} () {
+        # can't do this offline
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+	cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && {
+		cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf
+		mv /tmp/nsswitch.conf /etc/nsswitch.conf
+	}
+}
+
+pkg_prerm_${PN} () {
+	cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && {
+		cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf
+		mv /tmp/nsswitch.conf /etc/nsswitch.conf
+	}
+}
-- 
cgit v1.2.3


From 385172bb047b57145770a547950c2e3bed044227 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 18 May 2009 10:35:43 +0100
Subject: avahi.inc : fix override to libc-glibc instead of linux to get it to
 always work the right way avahi_0.6.24.bb : bump PR to pick up change

---
 recipes/avahi/avahi.inc       | 2 +-
 recipes/avahi/avahi_0.6.24.bb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc
index cbd6ac3d03..f5e68e26fe 100644
--- a/recipes/avahi/avahi.inc
+++ b/recipes/avahi/avahi.inc
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
 
 # uclibc has no nss
-RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
+RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
 RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d"
 RDEPENDS_avahi-autoipd += "update-rc.d"
 
diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb
index 15f56ffa95..61a62a54a4 100644
--- a/recipes/avahi/avahi_0.6.24.bb
+++ b/recipes/avahi/avahi_0.6.24.bb
@@ -1,5 +1,7 @@
 require avahi.inc
 
+PR = "r1"
+
 DEPENDS += "intltool-native"
 
 PACKAGES =+ "libavahi-gobject"
-- 
cgit v1.2.3


From c7747266beb91d1ed16ac85bf6d0ea539f4bc556 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 10:50:13 +0200
Subject: e2fsprogs(-native): update to 1.41.5 * add staging tweak from poky to
 get stuff into /bin instead of /sbin

---
 conf/checksums.ini                                 |   4 +
 .../e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch | 289 ---------------------
 recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb       |   8 +-
 recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb       |  19 ++
 recipes/e2fsprogs/e2fsprogs.inc                    |   5 +
 recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch    | 289 +++++++++++++++++++++
 recipes/e2fsprogs/e2fsprogs_1.41.5.bb              |  96 +++++++
 7 files changed, 419 insertions(+), 291 deletions(-)
 delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
 create mode 100644 recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
 create mode 100644 recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch
 create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.5.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b7acaba93e..0c44a724c4 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
diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
deleted file mode 100644
index 759e84edb0..0000000000
--- a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-This patch is based on the following:
-
-http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
-
-Index: e2fsprogs-1.41.4/configure.in
-===================================================================
---- e2fsprogs-1.41.4.orig/configure.in	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/configure.in	2009-04-09 21:19:28.000000000 +0100
-@@ -577,6 +577,7 @@
- fi
- AC_SUBST(MAKEINFO)
- AC_PROG_INSTALL
-+AC_PROG_MKDIR_P
- # See if we need a separate native compiler.
- if test $cross_compiling = no; then
-   BUILD_CC="$CC"
-Index: e2fsprogs-1.41.4/debugfs/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/debugfs/Makefile.in	2008-06-18 04:53:42.000000000 +0100
-+++ e2fsprogs-1.41.4/debugfs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -47,8 +47,8 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- 		$(DESTDIR)$(man8dir)
- 
- install: $(PROGS) $(MANPAGES) installdirs
-Index: e2fsprogs-1.41.4/doc/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/doc/Makefile.in	2008-05-26 00:52:27.000000000 +0100
-+++ e2fsprogs-1.41.4/doc/Makefile.in	2009-04-09 21:20:09.000000000 +0100
-@@ -20,8 +20,8 @@
- 
- install-doc-libs: libext2fs.info libext2fs.dvi
- 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
--	@echo "	MKINSTALLDIRS $(infodir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
-+	@echo "	MKDIR_P $(infodir)"
-+	@$(MKDIR_P) $(DESTDIR)$(infodir)
- 	-@for i in libext2fs.info* ; do \
- 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
-Index: e2fsprogs-1.41.4/e2fsck/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in	2008-11-15 04:19:57.000000000 +0000
-+++ e2fsprogs-1.41.4/e2fsck/Makefile.in	2009-04-09 21:20:44.000000000 +0100
-@@ -185,8 +185,8 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- 		$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
- 
- install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
-Index: e2fsprogs-1.41.4/intl/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/intl/Makefile.in	2007-06-30 13:58:34.000000000 +0100
-+++ e2fsprogs-1.41.4/intl/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -40,8 +40,8 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+MKDIR_P = @MKDIR_P@
-+mkdir_p = @MKDIR_P@
- 
- l = @INTL_LIBTOOL_SUFFIX_PREFIX@
- 
-Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/lib/blkid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -142,8 +142,8 @@
- 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
- 
- install:: all installdirs 
-Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/lib/e2p/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -79,8 +79,8 @@
- 	./tst_feature
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
- 
- install:: all installdirs 
-Index: e2fsprogs-1.41.4/lib/et/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/et/Makefile.in	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/lib/et/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -74,8 +74,8 @@
- 	$(TAGS) $(SRCS)
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
- 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
- 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
-Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -330,8 +330,8 @@
- 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
- 
- install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
-Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/lib/Makefile.elf-lib	2009-04-09 21:19:28.000000000 +0100
-@@ -33,8 +33,8 @@
- 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
- 
- installdirs-elf-lib::
--	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
-+	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
-+	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
- 		$(DESTDIR)$(libdir)
- 
- installdirs:: installdirs-elf-lib
-Index: e2fsprogs-1.41.4/lib/ss/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in	2008-10-07 15:22:39.000000000 +0100
-+++ e2fsprogs-1.41.4/lib/ss/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -129,8 +129,8 @@
- 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
- 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
- 
-Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in	2008-02-19 04:33:10.000000000 +0000
-+++ e2fsprogs-1.41.4/lib/uuid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -126,8 +126,8 @@
- 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
- 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
- 		$(DESTDIR)$(libdir)/pkgconfig
- 
-Index: e2fsprogs-1.41.4/MCONFIG.in
-===================================================================
---- e2fsprogs-1.41.4.orig/MCONFIG.in	2008-11-15 17:17:22.000000000 +0000
-+++ e2fsprogs-1.41.4/MCONFIG.in	2009-04-09 21:19:28.000000000 +0100
-@@ -64,7 +64,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKDIR_P = @MKDIR_P@
- 
- #
- # Library definitions
-Index: e2fsprogs-1.41.4/misc/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/misc/Makefile.in	2008-11-15 17:33:33.000000000 +0000
-+++ e2fsprogs-1.41.4/misc/Makefile.in	2009-04-09 21:21:22.000000000 +0100
-@@ -366,8 +366,8 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
-+	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
-+	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
- 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
-Index: e2fsprogs-1.41.4/po/Makefile.in.in
-===================================================================
---- e2fsprogs-1.41.4.orig/po/Makefile.in.in	2007-06-30 13:58:34.000000000 +0100
-+++ e2fsprogs-1.41.4/po/Makefile.in.in	2009-04-09 21:19:28.000000000 +0100
-@@ -26,11 +26,10 @@
- datadir = @datadir@
- localedir = $(datadir)/locale
- gettextsrcdir = $(datadir)/gettext/po
-+mkdir_p = @MKDIR_P@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
-@@ -148,7 +147,7 @@
- install-exec:
- install-data: install-data-@USE_NLS@
- 	if test "$(PACKAGE)" = "gettext-tools"; then \
--	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- 	  for file in $(DISTFILES.common) Makevars.template; do \
- 	    $(INSTALL_DATA) $(srcdir)/$$file \
- 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-@@ -161,13 +160,13 @@
- 	fi
- install-data-no: all
- install-data-yes: all
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
--	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  $(mkdir_p) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
- 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
- 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-@@ -207,19 +206,19 @@
- installdirs-exec:
- installdirs-data: installdirs-data-@USE_NLS@
- 	if test "$(PACKAGE)" = "gettext-tools"; then \
--	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- 	else \
- 	  : ; \
- 	fi
- installdirs-data-no:
- installdirs-data-yes:
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
--	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  $(mkdir_p) $(DESTDIR)$$dir; \
- 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
- 	    if test -n "$$lc"; then \
- 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-Index: e2fsprogs-1.41.4/resize/Makefile.in
-===================================================================
---- e2fsprogs-1.41.4.orig/resize/Makefile.in	2007-06-30 13:58:35.000000000 +0100
-+++ e2fsprogs-1.41.4/resize/Makefile.in	2009-04-09 21:19:28.000000000 +0100
-@@ -57,8 +57,8 @@
- 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- 		$(DESTDIR)$(man8dir)
- 
- install: $(PROGS) $(MANPAGES) installdirs
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
index f2c3898dbe..e79958cb2f 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
-PR = "r1"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF = ""
@@ -12,5 +12,9 @@ PACKAGES = ""
 DEPENDS = ""
 
 do_stage () {
-        oe_runmake install
+	oe_runmake install
+	install -d ${STAGING_BINDIR_NATIVE}/
+	for b in ${e2miscbins}; do
+	install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
+	done
 }
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
new file mode 100644
index 0000000000..b29064f5c8
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
@@ -0,0 +1,19 @@
+SECTION = "base"
+require e2fsprogs.inc
+inherit native
+
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
+
+EXTRA_OECONF = ""
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+PACKAGES = ""
+DEPENDS = ""
+
+do_stage () {
+	autotools_stage_all
+	install -d ${STAGING_BINDIR_NATIVE}/
+	for b in ${e2miscbins}; do
+		install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
+	done
+}
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index b7a1223cc9..6821d71004 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -15,3 +15,8 @@ EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi
 		--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}"
 
 PARALLEL_MAKE = ""
+
+e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \
+              e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper"
+
+
diff --git a/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch
new file mode 100644
index 0000000000..759e84edb0
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch
@@ -0,0 +1,289 @@
+This patch is based on the following:
+
+http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
+
+Index: e2fsprogs-1.41.4/configure.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/configure.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/configure.in	2009-04-09 21:19:28.000000000 +0100
+@@ -577,6 +577,7 @@
+ fi
+ AC_SUBST(MAKEINFO)
+ AC_PROG_INSTALL
++AC_PROG_MKDIR_P
+ # See if we need a separate native compiler.
+ if test $cross_compiling = no; then
+   BUILD_CC="$CC"
+Index: e2fsprogs-1.41.4/debugfs/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in	2008-06-18 04:53:42.000000000 +0100
++++ e2fsprogs-1.41.4/debugfs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -47,8 +47,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
+Index: e2fsprogs-1.41.4/doc/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/doc/Makefile.in	2008-05-26 00:52:27.000000000 +0100
++++ e2fsprogs-1.41.4/doc/Makefile.in	2009-04-09 21:20:09.000000000 +0100
+@@ -20,8 +20,8 @@
+ 
+ install-doc-libs: libext2fs.info libext2fs.dvi
+ 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+-	@echo "	MKINSTALLDIRS $(infodir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
++	@echo "	MKDIR_P $(infodir)"
++	@$(MKDIR_P) $(DESTDIR)$(infodir)
+ 	-@for i in libext2fs.info* ; do \
+ 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
+Index: e2fsprogs-1.41.4/e2fsck/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in	2008-11-15 04:19:57.000000000 +0000
++++ e2fsprogs-1.41.4/e2fsck/Makefile.in	2009-04-09 21:20:44.000000000 +0100
+@@ -185,8 +185,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
+ 
+ install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
+Index: e2fsprogs-1.41.4/intl/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/intl/Makefile.in	2007-06-30 13:58:34.000000000 +0100
++++ e2fsprogs-1.41.4/intl/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -40,8 +40,8 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++MKDIR_P = @MKDIR_P@
++mkdir_p = @MKDIR_P@
+ 
+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ 
+Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -142,8 +142,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all installdirs 
+Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -79,8 +79,8 @@
+ 	./tst_feature
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all installdirs 
+Index: e2fsprogs-1.41.4/lib/et/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/et/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -74,8 +74,8 @@
+ 	$(TAGS) $(SRCS)
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
+ 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
+Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -330,8 +330,8 @@
+ 	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
+Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib	2009-04-09 21:19:28.000000000 +0100
+@@ -33,8 +33,8 @@
+ 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ 
+ installdirs-elf-lib::
+-	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
++	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
++	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ 		$(DESTDIR)$(libdir)
+ 
+ installdirs:: installdirs-elf-lib
+Index: e2fsprogs-1.41.4/lib/ss/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in	2008-10-07 15:22:39.000000000 +0100
++++ e2fsprogs-1.41.4/lib/ss/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -129,8 +129,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
+ 
+Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in	2008-02-19 04:33:10.000000000 +0000
++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -126,8 +126,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
++	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
+ 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
+ 		$(DESTDIR)$(libdir)/pkgconfig
+ 
+Index: e2fsprogs-1.41.4/MCONFIG.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/MCONFIG.in	2008-11-15 17:17:22.000000000 +0000
++++ e2fsprogs-1.41.4/MCONFIG.in	2009-04-09 21:19:28.000000000 +0100
+@@ -64,7 +64,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKDIR_P = @MKDIR_P@
+ 
+ #
+ # Library definitions
+Index: e2fsprogs-1.41.4/misc/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/misc/Makefile.in	2008-11-15 17:33:33.000000000 +0000
++++ e2fsprogs-1.41.4/misc/Makefile.in	2009-04-09 21:21:22.000000000 +0100
+@@ -366,8 +366,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
++	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
++	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
+ 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
+ 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
+ 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
+Index: e2fsprogs-1.41.4/po/Makefile.in.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/po/Makefile.in.in	2007-06-30 13:58:34.000000000 +0100
++++ e2fsprogs-1.41.4/po/Makefile.in.in	2009-04-09 21:19:28.000000000 +0100
+@@ -26,11 +26,10 @@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
++mkdir_p = @MKDIR_P@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
+@@ -148,7 +147,7 @@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+@@ -161,13 +160,13 @@
+ 	fi
+ install-data-no: all
+ install-data-yes: all
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+@@ -207,19 +206,19 @@
+ installdirs-exec:
+ installdirs-data: installdirs-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+ 	  : ; \
+ 	fi
+ installdirs-data-no:
+ installdirs-data-yes:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ 	    if test -n "$$lc"; then \
+ 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+Index: e2fsprogs-1.41.4/resize/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.4.orig/resize/Makefile.in	2007-06-30 13:58:35.000000000 +0100
++++ e2fsprogs-1.41.4/resize/Makefile.in	2009-04-09 21:19:28.000000000 +0100
+@@ -57,8 +57,8 @@
+ 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
new file mode 100644
index 0000000000..4fc357f364
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
@@ -0,0 +1,96 @@
+require e2fsprogs.inc
+
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
+
+DEPENDS += "gettext-native"
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
+
+ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \
+		 ext2_types.h ext2_fs.h ext2_io.h \
+		 ext2fs.h"
+e2pheaders = "e2p.h"
+
+do_stage () {
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/e2p
+	for h in ${e2pheaders}; do
+		install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
+	done
+	install -d ${STAGING_INCDIR}/ext2fs
+	for h in ${ext2fsheaders}; do
+		install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
+	done
+	autotools_stage_all
+}
+
+# blkid used to be part of e2fsprogs but is useful outside, add it
+# as an RDEPENDS so that anything relying on it being in e2fsprogs
+# still works
+RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
+
+FILES_${PN} += "${libdir}/e2initrd_helper"
+
+PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
+FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
+FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
+FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
+FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
+FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
+FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
+
+do_install_append () {
+	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
+	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
+	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
+	mv ${D}${base_sbindir}/fsck.ext2 ${D}${base_sbindir}/fsck.ext2.${PN}
+	mv ${D}${base_sbindir}/fsck.ext3 ${D}${base_sbindir}/fsck.ext3.${PN}
+	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
+	mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.${PN}
+	mv ${D}${base_sbindir}/mkfs.ext3 ${D}${base_sbindir}/mkfs.ext3.${PN}
+}
+
+pkg_postinst_e2fsprogs-fsck () {
+	update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-fsck () {
+	update-alternatives --remove fsck fsck.${PN}
+}
+
+pkg_postinst_e2fsprogs-blkid () {
+    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-blkid () {
+    update-alternatives --remove blkid blkid.${PN}
+}
+
+pkg_postinst_e2fsprogs-e2fsck () {
+	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-e2fsck () {
+	update-alternatives --remove e2fsck e2fsck.${PN}
+	update-alternatives --remove fsck.ext2 fsck.ext2.${PN}
+	update-alternatives --remove fsck.ext3 fsck.ext3.${PN}
+}
+
+pkg_postinst_e2fsprogs-mke2fs () {
+	update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-mke2fs () {
+	update-alternatives --remove mke2fs mke2fs.${PN}
+	update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN}
+	update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN}
+}
-- 
cgit v1.2.3


From 563519c6361bd09c89d05aae40b4a36c775dd4c5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 11:43:32 +0200
Subject: udev 141: add /dev cache, install binaries to the correct locations

---
 recipes/udev/udev-141/akita/default |  4 ++++
 recipes/udev/udev-141/c7x0/default  |  4 ++++
 recipes/udev/udev-141/default       |  4 ++++
 recipes/udev/udev-141/init          | 29 +++++++++++++++++++++++++----
 recipes/udev/udev-141/spitz/default |  4 ++++
 recipes/udev/udev-141/tosa/default  |  4 ++++
 recipes/udev/udev_141.bb            | 23 ++++++++++++++++++-----
 7 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 recipes/udev/udev-141/akita/default
 create mode 100644 recipes/udev/udev-141/c7x0/default
 create mode 100644 recipes/udev/udev-141/default
 create mode 100644 recipes/udev/udev-141/spitz/default
 create mode 100644 recipes/udev/udev-141/tosa/default

diff --git a/recipes/udev/udev-141/akita/default b/recipes/udev/udev-141/akita/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-141/akita/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-141/c7x0/default b/recipes/udev/udev-141/c7x0/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-141/c7x0/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-141/default b/recipes/udev/udev-141/default
new file mode 100644
index 0000000000..5c4937a9a0
--- /dev/null
+++ b/recipes/udev/udev-141/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init
index 9e11f08989..efe44708ca 100644
--- a/recipes/udev/udev-141/init
+++ b/recipes/udev/udev-141/init
@@ -14,6 +14,7 @@ export TZ=/etc/localtime
 [ -d /sys/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
 [ -x /sbin/udevd ] || exit 1
+[ -f /etc/default/udev ] && . /etc/default/udev
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 
 kill_udevd() {
@@ -34,9 +35,18 @@ LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
         mkdir -m 0755 /dev/shm
 }
 
-if [ -e /etc/dev.tar ]; then
-	(cd /; tar xf /etc/dev.tar)
-	not_first_boot=1
+if [ "$DEVCACHE" != "" ]; then
+	# Invalidate udev cache if the kernel or its bootargs/cmdline have changed
+	[ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname
+	[ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline
+	[ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
+	if [ -e $DEVCACHE ] && \
+	   cmp -s /tmp/uname /etc/udev/saved.uname && \
+	   cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
+	   cmp -s /tmp/atags /etc/udev/saved.atags; then
+		(cd /; tar xf $DEVCACHE)
+		not_first_boot=1
+	fi
 fi
 
 # make_extra_nodes
@@ -50,10 +60,21 @@ kill_udevd > "/dev/null" 2>&1
 		if [ "$not_first_boot" != "" ];then
 			/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  --subsystem-nomatch=graphics  --subsystem-nomatch=backlight --subsystem-nomatch=video4linux  --subsystem-nomatch=platform
 			(/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)&
+			if [ "$DEVCACHE" != "" ]; then
+				rm -f /tmp/uname
+				rm -f /tmp/cmdline
+				rm -f /tmp/atags
+			fi
 		else
 			/sbin/udevadm trigger
 			/sbin/udevadm settle
-			(cd /; tar cf /etc/dev.tar dev)
+			if [ "$DEVCACHE" != "" ]; then
+				echo -n " and populating dev cache"
+				(cd /; tar cf $DEVCACHE dev)
+				mv /tmp/uname /etc/udev/saved.uname
+				mv /tmp/cmdline /etc/udev/saved.cmdline
+				mv /tmp/atags /etc/udev/saved.atags
+			fi
 		fi
 
 echo
diff --git a/recipes/udev/udev-141/spitz/default b/recipes/udev/udev-141/spitz/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-141/spitz/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev-141/tosa/default b/recipes/udev/udev-141/tosa/default
new file mode 100644
index 0000000000..d0050b873c
--- /dev/null
+++ b/recipes/udev/udev-141/tosa/default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 2368cb9880..63d75dc6f7 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -3,10 +3,10 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPL"
 
-# Untested, fails to create shared libs
+# Untested
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
@@ -20,6 +20,7 @@ SRC_URI += " \
        file://mount.sh \
        file://network.sh \
        file://local.rules \
+       file://default \
        file://init"
 
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
@@ -27,6 +28,13 @@ PACKAGE_ARCH_h2200 = "h2200"
 
 inherit update-rc.d autotools_stage
 
+# Put stuff in /lib and /sbin
+export sbindir="${base_sbindir}"
+export exec_prefix=""
+EXTRA_OECONF += " --with-udev-prefix= \
+                  --with-libdir-name=${base_libdir} \
+"
+
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 03 S ."
 
@@ -40,7 +48,7 @@ RPROVIDES_${PN} = "hotplug"
 FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
 FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
-FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN} += "${libdir}/udev/* ${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 
 do_install () {
@@ -50,6 +58,9 @@ do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 
+	install -d ${D}${sysconfdir}/default
+	install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
+
 	install -d ${D}${sysconfdir}/udev/rules.d/
 
 	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
@@ -62,12 +73,14 @@ do_install () {
 		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
 	fi
 
+	touch ${D}${sysconfdir}/udev/saved.uname
+	touch ${D}${sysconfdir}/udev/saved.cmdline
+	touch ${D}${sysconfdir}/udev/saved.atags
+
 	install -d ${D}${sysconfdir}/udev/scripts/
 
 	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
 	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-
-	install -d ${D}${base_libdir}/udev/
 }
 
 do_install_append_h2200() {
-- 
cgit v1.2.3


From 7790e2eda389c53cdad3568785581669579f51ed Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 12:19:34 +0200
Subject: udev 141: add fb0 -> fb symlink to make X happy * X starts, but hal
 doesn't see devices anymore

---
 recipes/udev/udev-141/local.rules | 3 +++
 recipes/udev/udev_141.bb          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes/udev/udev-141/local.rules b/recipes/udev/udev-141/local.rules
index a4866923fd..4e80a71d80 100644
--- a/recipes/udev/udev-141/local.rules
+++ b/recipes/udev/udev-141/local.rules
@@ -24,6 +24,9 @@ SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
 # The first rtc device is symlinked to /dev/rtc
 KERNEL=="rtc0", SYMLINK+="rtc"
 
+#The first framebuffer is symlinked to /dev/fb
+KERNEL=="fb0",  SYMLINK+="fb"
+
 # Try and modprobe for drivers for new hardware
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 63d75dc6f7..1482601bf9 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 # Untested
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
-- 
cgit v1.2.3


From 3d1136959ad0b77bdb37a418f17925bd5b8bcd05 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 13:01:00 +0200
Subject: util-linux-ng 2.15: stage libblkid (yes, this used to be in
 e2fsprogs(-libs))

---
 recipes/util-linux-ng/files/fix-make-c.patch    | 41 ++++++++++++++++++
 recipes/util-linux-ng/files/optional-uuid.patch | 55 +++++++++++++++++++++++++
 recipes/util-linux-ng/util-linux-ng.inc         |  2 +-
 recipes/util-linux-ng/util-linux-ng_2.15.bb     | 12 +++++-
 4 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 recipes/util-linux-ng/files/fix-make-c.patch
 create mode 100644 recipes/util-linux-ng/files/optional-uuid.patch

diff --git a/recipes/util-linux-ng/files/fix-make-c.patch b/recipes/util-linux-ng/files/fix-make-c.patch
new file mode 100644
index 0000000000..bf1082e85c
--- /dev/null
+++ b/recipes/util-linux-ng/files/fix-make-c.patch
@@ -0,0 +1,41 @@
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 11 May 2009 09:49:00 +0000 (+0200)
+Subject: build-sys: fix "make -C" bug
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=2ef7d41e6bbb7c842c06e911ffc562335a467b5d
+
+build-sys: fix "make -C" bug
+
+Running:
+
+./configure --with-fsprobe=builtin
+make -C mount mount
+
+causes the following error:
+
+gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I..  -include ../config.h
+-I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\"
+-fsigned-char -I../libs/blkid/src   -g -O2 -MT mount-setproctitle.o
+-MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o
+`test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv
+-f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po
+make -C
+make: option requires an argument -- 'C'
+Usage: make [options] [target] ...
+...
+
+Reported-by: Matthew Burgess <matthew@linuxfromscratch.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/config/include-Makefile.am b/config/include-Makefile.am
+index b42a0c3..d5da619 100644
+--- a/config/include-Makefile.am
++++ b/config/include-Makefile.am
+@@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS)
+ # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
+ #
+ ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src
++ul_libblkid_builddir = $(top_builddir)/libs/blkid/src
+ ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la
+ 
+ $(ul_libblkid_la):
diff --git a/recipes/util-linux-ng/files/optional-uuid.patch b/recipes/util-linux-ng/files/optional-uuid.patch
new file mode 100644
index 0000000000..2d0ea43cd2
--- /dev/null
+++ b/recipes/util-linux-ng/files/optional-uuid.patch
@@ -0,0 +1,55 @@
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 12 May 2009 19:22:19 +0000 (+0200)
+Subject: blkid: make libuuid optional
+X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=cdd17c7a73cab10a34bf80616225b8215ac4e2ed
+
+blkid: make libuuid optional
+
+read.c:28:23: error: uuid/uuid.h: No such file or directory
+make[3]: *** [read.lo] Error 1
+make[3]: *** Waiting for unfinished jobs....
+
+Reported-by: Olaf <mailinglists@ban-solms.de>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+
+diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c
+index 2e59218..9091736 100644
+--- a/libs/blkid/src/config.c
++++ b/libs/blkid/src/config.c
+@@ -24,9 +24,6 @@
+ #include <errno.h>
+ #endif
+ #include <stdint.h>
+-#ifdef HAVE_LIBUUID
+-#include <uuid/uuid.h>
+-#endif
+ #include <stdarg.h>
+ 
+ #include "blkdev.h"
+diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c
+index a9c9fba..f0ae126 100644
+--- a/libs/blkid/src/evaluate.c
++++ b/libs/blkid/src/evaluate.c
+@@ -27,9 +27,6 @@
+ #include <errno.h>
+ #endif
+ #include <stdint.h>
+-#ifdef HAVE_LIBUUID
+-#include <uuid/uuid.h>
+-#endif
+ #include <stdarg.h>
+ 
+ #include "pathnames.h"
+diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c
+index 4163874..b5e9cd0 100644
+--- a/libs/blkid/src/read.c
++++ b/libs/blkid/src/read.c
+@@ -25,7 +25,6 @@
+ #endif
+ 
+ #include "blkidP.h"
+-#include "uuid/uuid.h"
+ 
+ #ifdef HAVE_STRTOULL
+ #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 01e769eb6a..b49a0b2e21 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "udev zlib ncurses e2fsprogs-libs virtual/libintl"
 
-inherit autotools
+inherit autotools_stage
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb
index d8cb0a714d..2486e402f0 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.15.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb
@@ -1,6 +1,16 @@
 require util-linux-ng.inc
 
+PR = "r1"
+
+SRC_URI += "file://fix-make-c.patch;patch=1 \
+            file://optional-uuid.patch;patch=1 \
+"
+
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.15', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-LDFLAGS_append_libc-uclibc = " -lintl"
+LDFLAGS_append = " -luuid"
+LDFLAGS_append_libc-uclibc = " -luuid -lintl"
 
+do_compile_prepend() {
+	sed -i /am__append_1/d ${S}/libs/blkid/src/Makefile
+}
-- 
cgit v1.2.3


From 4e3165e4bbb28bc765397588c69f67f7f37338d3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 May 2009 14:23:59 +0200
Subject: hal: add (disabled) hal 0.5.12

---
 conf/checksums.ini        |  4 ++++
 recipes/hal/hal.inc       |  4 +++-
 recipes/hal/hal_0.5.12.bb | 11 +++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 recipes/hal/hal_0.5.12.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a35d02a861..2b9d1b96ad 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -10082,6 +10082,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=3b351822ba359