merge of d3dcb0c356424f9ab47b293d423a45686bc79ba2

     and ef736222cb8bd5af85eb593d850cb17872dabfc8

6 files changed, 58 insertions, 97 deletions

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index cb648f2448..d546ed5c09 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r36"
+PR = "r37"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -124,6 +124,8 @@ do_install_append_nylon() {
 do_install_append_openslug() {
 	printf "" "" >${D}${sysconfdir}/resolv.conf
 	rm -r ${D}/mnt/*
+	rmdir ${D}/home/root
+	install -m 0755 -d ${D}/root
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
index e91dead23f..97dab68f33 100644
--- a/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
+++ b/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch
@@ -2,7 +2,7 @@
 +++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
 @@ -1,4 +1,4 @@
 -root::0:0:root:/root:/bin/sh
-+root:Xm./49bYkrkuo:0:0:root:/home/root:/bin/sh
++root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh
  daemon:*:1:1:daemon:/usr/sbin:/bin/sh
  bin:*:2:2:bin:/bin:/bin/sh
  sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
index 72caba0223..6fcb211bda 100644
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Base system password/group files."
 SECTION = "base"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPL"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
diff --git a/packages/monotone/monotone-4_0.19.bb b/packages/monotone/monotone-4_0.19.bb
index b90f0eacb9..3a7914a735 100644
--- a/packages/monotone/monotone-4_0.19.bb
+++ b/packages/monotone/monotone-4_0.19.bb
@@ -1,52 +1,8 @@
-# This package builds the devio program
-DESCRIPTION = "monotone - an SCM"
-HOMEPAGE = "http://www.venge.net/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "MIT"
+include monotone.inc
+
 SUBV = "1"
 PR = "r0"
 
 SRC_URI = "http://www.venge.net/monotone/downloads/monotone_${PV}-${SUBV}.tar.gz \
-	   file://txt2c-cross.patch;patch=1 \
-	   file://cryptopp-endianness.patch;patch=1"
-DEPENDS += "boost"
-# Following may be required, not proved yet...
-#TARGET_CFLAGS += "-fno-strict-aliasing"
-
-PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
-tsd = "/home/monotone/${PN}"
-FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
-RDEPENDS_${PN}-testsuite += "bash sed grep cvs"
-# The testsuite also requires the following - not yet available...
-#RDEPENDS_${PN}-testsuite += "patch perl"
-
-S = "${WORKDIR}/monotone-${PV}"
-
-# no cross compile support - it tries to run the test program even with
-# --enable_ipv6=yes
-EXTRA_OECONF = "--disable-ipv6 \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-nls \
-		--with-gnu-ld \
-		"
-
-inherit autotools update-alternatives
-
-ALTERNATIVE_NAME = "monotone"
-ALTERNATIVE_LINK = "${bindir}/monotone"
-ALTERNATIVE_PATH = "${bindir}/${PN}"
-ALTERNATIVE_PRIORITY = "40"
-
-
-# This makes the testsuite as a package and renames the monotone executable
-# to include the netsync suffix.
-do_install_append() {
-	install -d ${D}${tsd}
-	install -c -m 755 testsuite ${D}${tsd}/testsuite
-	cp -a tests ${D}${tsd}/tests
-	#
-	mv ${D}${bindir}/monotone ${D}${bindir}/${PN}
-}
+           file://txt2c-cross.patch;patch=1 \
+           file://cryptopp-endianness.patch;patch=1"
diff --git a/packages/monotone/monotone-5_0.20.bb b/packages/monotone/monotone-5_0.20.bb
index ec98ec26d2..3a61df634f 100644
--- a/packages/monotone/monotone-5_0.20.bb
+++ b/packages/monotone/monotone-5_0.20.bb
@@ -1,51 +1,9 @@
-# This package builds the devio program
-DESCRIPTION = "monotone - an SCM"
-HOMEPAGE = "http://www.venge.net/"
-MAINTAINER = "John Bowler <jbowler@acm.org>"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "MIT"
+include monotone.inc
+
 PR = "r0"
 
 SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
-	   file://txt2c-cross.patch;patch=1 \
-	   file://cryptopp-endianness.patch;patch=1"
-DEPENDS += "boost"
-# Following may be required, not proved yet...
-#TARGET_CFLAGS += "-fno-strict-aliasing"
-
-PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
-tsd = "/home/monotone/${PN}"
-FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
-RDEPENDS_${PN}-testsuite += "bash sed grep cvs"
-# The testsuite also requires the following - not yet available...
-#RDEPENDS_${PN}-testsuite += "patch perl"
-
-S = "${WORKDIR}/monotone-${PV}"
-
-# no cross compile support - it tries to run the test program even with
-# --enable_ipv6=yes
-EXTRA_OECONF = "--disable-ipv6 \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-nls \
-		--with-gnu-ld \
-		"
+           file://txt2c-cross.patch;patch=1 \
+           file://cryptopp-endianness.patch;patch=1"
 
-inherit autotools update-alternatives
-
-ALTERNATIVE_NAME = "monotone"
-ALTERNATIVE_LINK = "${bindir}/monotone"
-ALTERNATIVE_PATH = "${bindir}/${PN}"
 ALTERNATIVE_PRIORITY = "50"
-
-
-# This makes the testsuite as a package and renames the monotone executable
-# to include the netsync suffix.
-do_install_append() {
-	install -d ${D}${tsd}
-	install -c -m 755 testsuite ${D}${tsd}/testsuite
-	cp -a tests ${D}${tsd}/tests
-	#
-	mv ${D}${bindir}/monotone ${D}${bindir}/${PN}
-}
diff --git a/packages/monotone/monotone.inc b/packages/monotone/monotone.inc
new file mode 100644
index 0000000000..a0b9463cd8
--- /dev/null
+++ b/packages/monotone/monotone.inc
@@ -0,0 +1,45 @@
+DESCRIPTION = "Monotone is a distributed Source Control System"
+HOMEPAGE = "http://www.venge.net/"
+MAINTAINER = "John Bowler <jbowler@acm.org>"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "boost"
+
+# Following may be required, not proved yet...
+#TARGET_CFLAGS += "-fno-strict-aliasing"
+
+S = "${WORKDIR}/monotone-${PV}"
+
+# no cross compile support - it tries to run the test program even with
+# --enable_ipv6=yes
+EXTRA_OECONF = "--disable-ipv6 \
+		--disable-dependency-tracking \
+		--disable-rpath \
+		--disable-nls \
+		--with-gnu-ld \
+		--with-bundled-lua --with-bundled-sqlite"
+
+inherit autotools update-alternatives
+
+ALTERNATIVE_NAME = "monotone"
+ALTERNATIVE_LINK = "${bindir}/monotone"
+ALTERNATIVE_PATH = "${bindir}/${PN}"
+ALTERNATIVE_PRIORITY = "40"
+
+# This makes the testsuite as a package and renames the monotone executable
+# to include the netsync suffix.
+do_install_append() {
+	install -d ${D}${tsd}
+	install -c -m 755 testsuite ${D}${tsd}/testsuite
+	cp -a tests ${D}${tsd}/tests
+	#
+	mv ${D}${bindir}/monotone ${D}${bindir}/${PN}
+}
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
+tsd = "/home/monotone/${PN}"
+FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
+RDEPENDS_${PN}-testsuite += "bash sed grep cvs"
+# The testsuite also requires the following - not yet available...
+#RDEPENDS_${PN}-testsuite += "patch perl"