diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/rsnapshot')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch | 44 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb | 53 |
2 files changed, 97 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch new file mode 100644 index 000000000..6466df4e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch @@ -0,0 +1,44 @@ +From 26ad431e19788898fb4ed19ff91392e8b20f1bab Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Thu, 16 Oct 2014 04:06:55 -0400 +Subject: [PATCH] fix cmd_rsync + +Don't break configure if rsync is not installed on host. + +rsync is a runtime dependency and this change is only used for +generating rsnapshot.conf.default. It allows cmd_rsync to use +default path if options --without-rsync is specfied. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + configure.ac | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bc9df9e..2a33d29 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ AC_ARG_WITH(rsync, + AC_MSG_ERROR(rsync not found) + fi + else +- AC_MSG_ERROR(rsync is required) ++ RSYNC=no + fi + ] + ) +@@ -67,7 +67,8 @@ if test "$RSYNC" = ""; then + fi + dnl bail out if we can't find it + if test "$RSYNC" = "no"; then +- AC_MSG_ERROR(rsync is required) ++ RSYNC=${bindir}/rsync ++ AC_SUBST(CMD_RSYNC, "cmd_rsync $RSYNC") + fi + + +-- +1.7.9.5 + diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb new file mode 100644 index 000000000..aefe3627e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -0,0 +1,53 @@ +SUMMARY = "A filesystem snapshot utility based on rsync" +HOMEPAGE = "http://www.rsnapshot.org" +BUGTRACKER = "https://sourceforge.net/projects/rsnapshot/" +SECTION = "console/network" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +RDEPENDS_${PN} = "rsync \ + perl \ + perl-module-dirhandle \ + perl-module-cwd \ + perl-module-getopt-std \ + perl-module-file-path \ + perl-module-file-stat \ + perl-module-posix \ + perl-module-fcntl \ + perl-module-io-file \ + perl-module-constant \ + perl-module-overloading \ + " + +SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4" +PV = "1.4.2+git${SRCPV}" + +SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ + file://configure-fix-cmd_rsync.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +# Fix rsnapshot.conf.default: +# don't inject the host path into target configs. +EXTRA_OECONF += "--without-cp \ + --without-rm \ + --without-du \ + --without-ssh \ + --without-logger \ + --without-rsync \ + ac_cv_path_PERL=${bindir}/perl \ + ac_cv_path_MOUNT=${base_bindir}/mount \ + ac_cv_path_UMOUNT=${base_bindir}/umount \ + " + +# Create 't/include.ac' before starting the autoreconf to fix configure +# error: configure.ac:302: file 't/include.ac' does not exist +do_configure_prepend(){ + saved_dir=`pwd` + cd ${S}; ./autogen.sh + cd ${saved_dir} +} |
