propagate from branch 'org.openembedded.dev' (head e5ee515fa896606518481b09699b0237741b79e7)

            to branch 'org.openembedded.nslu2-linux' (head 9467bebba2440fba8a123b9cdcfe3ebfb3bbd4d1)

7 files changed, 17 insertions, 1 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 46f5b8babc..f1a031075c 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -26,6 +26,7 @@ ${PKGDIR}/packages/cyrus-sasl/*.bb \
 ${PKGDIR}/packages/db/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
 ${PKGDIR}/packages/diffutils/*.bb \
+${PKGDIR}/packages/diffstat/*.bb \
 ${PKGDIR}/packages/dnsmasq/*.bb \
 ${PKGDIR}/packages/dropbear/*.bb \
 ${PKGDIR}/packages/e2fsprogs/*.bb \
@@ -144,6 +145,7 @@ ${PKGDIR}/packages/screen/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/softdog/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
 ${PKGDIR}/packages/sudo/*.bb \
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index b922ffe0b9..489b1c0112 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -26,6 +26,7 @@ ${PKGDIR}/packages/cyrus-imapd/*.bb \
 ${PKGDIR}/packages/cyrus-sasl/*.bb \
 ${PKGDIR}/packages/db/*.bb \
 ${PKGDIR}/packages/devio/*.bb \
+${PKGDIR}/packages/diffstat/*.bb \
 ${PKGDIR}/packages/diffutils/*.bb \
 ${PKGDIR}/packages/dnsmasq/*.bb \
 ${PKGDIR}/packages/dropbear/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index c321f18009..7eb8e2f9ad 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -61,6 +61,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
 CMDLINE_DEBUG = "noirqdebug"
 
+# IMAGE_PREPROCESS_COMMAND is run before making the image.  In UcSlugC the
+# kernel image is removed from the root file system to recover the space used -
+# UcSlugC is assumed to boot from a separate kernel image in flash (not in the
+# root file system), if this is not the case the following must not be done!
+IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
+
 # EXTRA PACKAGES
 # --------------
 # UcSlugC builds an openslug-image with no extra packages - to add packages to the
diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles
index f707ff5519..e0a55493b3 100644
--- a/packages/cyrus-imapd/files/volatiles
+++ b/packages/cyrus-imapd/files/volatiles
@@ -1,4 +1,4 @@
-d cyrus mail 0750 /var/lib/cyrus
+d cyrus mail 0755 /var/lib/cyrus
 d cyrus root 0755 /var/lib/cyrus/db
 d cyrus mail 0755 /var/lib/cyrus/proc
 d cyrus mail 0755 /var/lib/cyrus/sieve
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 75fe4699a8..533f188795 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -57,6 +57,7 @@ OPENSLUG_PACKAGES = "\
 	cvs\
 	cyrus-imapd \
 	db4 \
+	diffstat \
 	dnsmasq \
 	expat \
 	ftpd-topfield \
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index d705de728d..e9377823b6 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -31,6 +31,7 @@ UCSLUGC_PACKAGES = "\
 	cvs\
 	cyrus-imapd \
 	db4 \
+	diffstat \
 	diffutils \
 	dnsmasq \
 	expat \
diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0
index 1c50b4ae00..002f681217 100644
--- a/packages/postfix/files/main.cf_2.0
+++ b/packages/postfix/files/main.cf_2.0
@@ -1,19 +1,24 @@
 #!/bin/sh
 cat <<EOF
+# Configure your domain and accounts
 mydomain=sample.com
 
 virtual_mailbox_domains = sample.com, other.net
 virtual_mailbox_maps = hash:/etc/postfix/virtual
 virtual_alias_maps = hash:/etc/postfix/virtual_alias
 
+
 # You'll start with the following lines for maildir storage
 virtual_mailbox_base = /var/spool/vmail
 virtual_uid_maps = static:`grep vmail /etc/passwd | cut -d ":" -f 3`
 virtual_gid_maps = static:`grep vmail /etc/passwd | cut -d ":" -f 4`
 
+
 # You'll start with the following lines for IMAP storage
+#virtual_transport = lmtp:unix:/var/lib/cyrus/socket/lmtp
 
 
+# General stuff here again
 config_directory = /etc/postfix
 sample_directory = /etc/postfix
 queue_directory = /var/spool/postfix