summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/rsnapshot
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2014-10-17 02:49:30 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-27 12:50:00 +0100
commit0ee5bea84105040ae54bcbc5d2baac7be80bc801 (patch)
tree8294c2c9f214351c7636d46ded2187919ce125fb /meta-oe/recipes-support/rsnapshot
parent39357871df157f2cb0013599758143fb006cfe9d (diff)
downloadmeta-openembedded-0ee5bea84105040ae54bcbc5d2baac7be80bc801.tar.gz
rsnapshot: fix rsnapshot.conf.default
This change is used for fixing cmd path in rsnapshot.conf.default. The options --without-* disable checking command * on host and get the default path used, otherwise the host path will be injected into target configs. The runtime dependencies to ssh, logger, cp, du are optional and could be customized in rsnapshot.conf, so it's not needed that using PACKAGECONFIG to define the runtime dependencies. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/rsnapshot')
-rw-r--r--meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch44
-rw-r--r--meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb12
2 files changed, 54 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch b/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch
new file mode 100644
index 000000000..7b2361b4a
--- /dev/null
+++ b/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch
@@ -0,0 +1,44 @@
1From 26ad431e19788898fb4ed19ff91392e8b20f1bab Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Thu, 16 Oct 2014 04:06:55 -0400
4Subject: [PATCH] fix cmd_rsync
5
6Don't break configure if rsync is not installed on host.
7
8rsync is a runtime dependency and this change is only used for
9generating rsnapshot.conf.default. It allows cmd_rsync to use
10default path if options --without-rsync is specfied.
11
12Upstream-Status: Pending
13
14Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
15---
16 configure.ac | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index bc9df9e..2a33d29 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -55,7 +55,7 @@ AC_ARG_WITH(rsync,
24 AC_MSG_ERROR(rsync not found)
25 fi
26 else
27- AC_MSG_ERROR(rsync is required)
28+ RSYNC=no
29 fi
30 ]
31 )
32@@ -67,7 +67,8 @@ if test "$RSYNC" = ""; then
33 fi
34 dnl bail out if we can't find it
35 if test "$RSYNC" = "no"; then
36- AC_MSG_ERROR(rsync is required)
37+ RSYNC=/usr/bin/rsync
38+ AC_SUBST(CMD_RSYNC, "cmd_rsync $RSYNC")
39 fi
40
41
42--
431.7.9.5
44
diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
index afd367806..3f919b568 100644
--- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
@@ -24,11 +24,19 @@ SRCREV = "1047cbb57937c29233388e2fcd847fecd3babe74"
24PV = "1.3.1+git${SRCPV}" 24PV = "1.3.1+git${SRCPV}"
25 25
26SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ 26SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \
27 file://configure-fix-cmd_rsync.patch \
27 " 28 "
28 29
29S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
30 31
31inherit autotools 32inherit autotools
32 33
33PACKAGECONFIG ??= "logger" 34# Fix rsnapshot.conf.default:
34PACKAGECONFIG[logger] = "--with-logger=${bindir}/logger,--without-logger,,util-linux" 35# don't inject the host path into target configs.
36EXTRA_OECONF += "--without-cp \
37 --without-rm \
38 --without-du \
39 --without-ssh \
40 --without-logger \
41 --without-rsync \
42 "