meta-stx/recipes-support/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch

   1 From 5b7a84dbb9d06112c4b2804223163d91ba8ab786 Mon Sep 17 00:00:00 2001
   2 From: Jackie Huang <jackie.huang@windriver.com>
   3 Date: Thu, 1 Jun 2017 10:34:38 +0800
   4 Subject: [PATCH] fs.sh: fix builds when srcdir and builddir are seperated
   5
   6 It fails to find fs.sh.in when srddir and builddir are not the same:
   7
   8 make[5]: Entering directory '/path/to/builddir/rgmanager/src/resources'
   9 cat fs.sh.in | sed \
  10     -e 's#@''LOGDIR@#/var/log/cluster#g' \
  11     > fs.sh.out
  12     cat: fs.sh.in: No such file or directorychmod +x fs.sh.out
  13     mv fs.sh.out fs.sh
  14
  15 Add abs_srcdir to fix this.
  16
  17 Upstream-Status: Submitted [https://github.com/ClusterLabs/resource-agents/pull/986]
  18
  19 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  20 ---
  21  rgmanager/src/resources/Makefile.am | 2 +-
  22  1 file changed, 1 insertion(+), 1 deletion(-)
  23
  24 diff --git a/rgmanager/src/resources/Makefile.am b/rgmanager/src/resources/Makefile.am
  25 index de88c69..30b3be9 100644
  26 --- a/rgmanager/src/resources/Makefile.am
  27 +++ b/rgmanager/src/resources/Makefile.am
  28 @@ -68,7 +68,7 @@ rngdir                        = ${CLUSTERDATA}/relaxng
  29  rng_DATA               = $(DTD) $(XSL) $(RESRNG)
  30
  31  $(TARGET):
  32 -       cat $@.in | sed \
  33 +       cat $(abs_srcdir)/$@.in | sed \
  34                 -e 's#@''LOGDIR@#${LOGDIR}#g' \
  35         > $@.out
  36         chmod +x $@.out
  37 --
  38 2.11.0
  39