diff options
| -rw-r--r-- | packages/install/files/install-sh | 13 | ||||
| -rw-r--r-- | packages/install/install-native_0.1.bb | 1 | ||||
| -rw-r--r-- | packages/monotone/monotone-4_0.19.bb | 52 | ||||
| -rw-r--r-- | packages/monotone/monotone-5_0.20.bb | 50 | ||||
| -rw-r--r-- | packages/monotone/monotone.inc | 45 |
5 files changed, 66 insertions, 95 deletions
diff --git a/packages/install/files/install-sh b/packages/install/files/install-sh index 0b65ee871d..8de386e4c7 100644 --- a/packages/install/files/install-sh +++ b/packages/install/files/install-sh @@ -67,6 +67,7 @@ mvcmd="$mvprog" src= dst= dir_arg= +preserve_arg= dstarg= no_target_directory= @@ -81,10 +82,13 @@ In the 4th, create DIRECTORIES. Options: -c (ignored) +-D (ignored) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. +-p apply access/modification times of SRCFILE files + to corresponding DSTFILE files -s $stripprog installed files. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. @@ -100,6 +104,9 @@ while test -n "$1"; do -c) shift continue;; + -D) shift + continue;; + -d) dir_arg=true shift continue;; @@ -121,6 +128,10 @@ while test -n "$1"; do shift continue;; + -p) preserve_arg="-p" + shift + continue;; + -s) stripcmd=$stripprog shift continue;; @@ -265,7 +276,7 @@ do trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + $doit $cpprog $preserve_arg "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits. # diff --git a/packages/install/install-native_0.1.bb b/packages/install/install-native_0.1.bb index 2ae7df615a..b912b2b65e 100644 --- a/packages/install/install-native_0.1.bb +++ b/packages/install/install-native_0.1.bb @@ -6,6 +6,7 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "MIT" INHIBIT_DEFAULT_DEPS = "1" +PR = "r1" SRC_URI = "file://install-sh" 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" |