From 20461885d6fe79694431bca8ca9382090fa8f350 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 16 Jul 2005 08:00:12 +0000 Subject: Moved OpenSlug root home directory from /home/root to simply /root --- packages/base-files/base-files_3.0.14.bb | 4 +++- packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch | 2 +- packages/base-passwd/base-passwd_3.5.9.bb | 2 +- 3 files changed, 5 insertions(+), 3 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..3d93b5118e 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 /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 \ -- cgit v1.2.3 From 09457f63dad154101bdfcaadd54d79671fdca025 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 16 Jul 2005 08:05:02 +0000 Subject: Fixed the OpenSlug root move --- packages/base-files/base-files_3.0.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 3d93b5118e..d546ed5c09 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -124,7 +124,7 @@ do_install_append_nylon() { do_install_append_openslug() { printf "" "" >${D}${sysconfdir}/resolv.conf rm -r ${D}/mnt/* - rmdir /home/root + rmdir ${D}/home/root install -m 0755 -d ${D}/root } -- cgit v1.2.3 From 86a9c79a72bc08f7496b0af0acd721a6d6203222 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 16 Jul 2005 22:33:56 +0000 Subject: monotone: extract common stuff into monotone.inc --- packages/monotone/monotone-4_0.19.bb | 52 +++--------------------------------- packages/monotone/monotone-5_0.20.bb | 50 +++------------------------------- packages/monotone/monotone.inc | 45 +++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 94 deletions(-) create mode 100644 packages/monotone/monotone.inc 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 " -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 " -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 " +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" -- cgit v1.2.3