diff options
| -rw-r--r-- | packages/meta/openslug-packages.bb | 8 | ||||
| -rw-r--r-- | packages/monotone/monotone-4_0.19.bb (renamed from packages/monotone/monotone_0.19.bb) | 19 | ||||
| -rw-r--r-- | packages/monotone/monotone-5_0.20.bb (renamed from packages/monotone/monotone_0.20.bb) | 29 |
3 files changed, 35 insertions, 21 deletions
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e2c044b19..3fb0587727 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -26,7 +26,7 @@ OPENSLUG_DEVELOPMENT = "\ lsof \ m4 \ make \ - monotone \ + monotone-4 monotone-5 \ ncurses \ openssh \ patch \ @@ -62,7 +62,6 @@ OPENSLUG_PACKAGES = "\ libxml2 \ miau \ microcom \ - mpd \ mt-daapd \ mutt \ mysql \ @@ -92,10 +91,13 @@ OPENSLUG_PACKAGES = "\ " # These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc +# TARGET_OS=linux-uclibc (Note that for several this +# is because of use of single precision FP interfaces +# such as sinf.) OPENSLUG_PACKAGES_append_linux = "\ bind \ mgetty \ + mpd \ nfs-utils \ libpam \ php \ diff --git a/packages/monotone/monotone_0.19.bb b/packages/monotone/monotone-4_0.19.bb index 276bed4b6f..b90f0eacb9 100644 --- a/packages/monotone/monotone_0.19.bb +++ b/packages/monotone/monotone-4_0.19.bb @@ -6,7 +6,7 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "MIT" SUBV = "1" -PR = "r2" +PR = "r0" SRC_URI = "http://www.venge.net/monotone/downloads/monotone_${PV}-${SUBV}.tar.gz \ file://txt2c-cross.patch;patch=1 \ @@ -16,12 +16,14 @@ DEPENDS += "boost" #TARGET_CFLAGS += "-fno-strict-aliasing" PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -tsd = "/home/monotone" +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 \ @@ -31,11 +33,20 @@ EXTRA_OECONF = "--disable-ipv6 \ --with-gnu-ld \ " -inherit autotools +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 +# 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_0.20.bb b/packages/monotone/monotone-5_0.20.bb index 05c59ba5ca..ec98ec26d2 100644 --- a/packages/monotone/monotone_0.20.bb +++ b/packages/monotone/monotone-5_0.20.bb @@ -5,17 +5,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>" SECTION = "devel" PRIORITY = "optional" LICENSE = "MIT" -PR = "r1" - -#WARNING: monotone-0.20 uses a new netsync protocol, at present the -# OpenEmbedded monotone archives use monotone-0.19 as the server, -# therefore OE builds of 0.20 are disabled here. The protocol version -# is checked, 0.19 has version 4, 0.20 has version 5, it is not -# possible to pull using 0.20 from a 0.19 server. -# The 0.20 and 0.19 databases (the files) are compatible, so it is -# possible to use 0.20 then swap back to 0.19 for netsync with the -# older server. -DEFAULT_PREFERENCE = "-1" +PR = "r0" SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ file://txt2c-cross.patch;patch=1 \ @@ -25,12 +15,14 @@ DEPENDS += "boost" #TARGET_CFLAGS += "-fno-strict-aliasing" PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -tsd = "/home/monotone" +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 \ @@ -40,11 +32,20 @@ EXTRA_OECONF = "--disable-ipv6 \ --with-gnu-ld \ " -inherit autotools +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 +# 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} } |