From: Jackie Huang <[email protected]>
It fails to find fs.sh.in when srddir and builddir are not the same:
make[5]: Entering directory '/path/to/builddir/rgmanager/src/resources'
cat fs.sh.in | sed \
-e 's#@''LOGDIR@#/var/log/cluster#g' \
> fs.sh.out
cat: fs.sh.in: No such file or directorychmod +x fs.sh.out
mv fs.sh.out fs.sh
Add abs_srcdir to fix this.
Signed-off-by: Jackie Huang <[email protected]>
---
...uilds-when-srcdir-and-builddir-are-sepera.patch | 39 ++++++++++++++++++++++
.../resource-agents_3.9.7.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644
meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
diff --git
a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
new file mode 100644
index 0000000..3247927
--- /dev/null
+++
b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
@@ -0,0 +1,39 @@
+From 5b7a84dbb9d06112c4b2804223163d91ba8ab786 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+Date: Thu, 1 Jun 2017 10:34:38 +0800
+Subject: [PATCH] fs.sh: fix builds when srcdir and builddir are seperated
+
+It fails to find fs.sh.in when srddir and builddir are not the same:
+
+make[5]: Entering directory '/path/to/builddir/rgmanager/src/resources'
+cat fs.sh.in | sed \
+ -e 's#@''LOGDIR@#/var/log/cluster#g' \
+ > fs.sh.out
+ cat: fs.sh.in: No such file or directorychmod +x fs.sh.out
+ mv fs.sh.out fs.sh
+
+Add abs_srcdir to fix this.
+
+Upstream-Status: Submitted
[https://github.com/ClusterLabs/resource-agents/pull/986]
+
+Signed-off-by: Jackie Huang <[email protected]>
+---
+ rgmanager/src/resources/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rgmanager/src/resources/Makefile.am
b/rgmanager/src/resources/Makefile.am
+index de88c69..30b3be9 100644
+--- a/rgmanager/src/resources/Makefile.am
++++ b/rgmanager/src/resources/Makefile.am
+@@ -68,7 +68,7 @@ rngdir = ${CLUSTERDATA}/relaxng
+ rng_DATA = $(DTD) $(XSL) $(RESRNG)
+
+ $(TARGET):
+- cat [email protected] | sed \
++ cat $(abs_srcdir)/[email protected] | sed \
+ -e 's#@''LOGDIR@#${LOGDIR}#g' \
+ > [email protected]
+ chmod +x [email protected]
+--
+2.11.0
+
diff --git
a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb
b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb
index 2d2dd88..2f36b1b 100644
---
a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb
+++
b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb
@@ -19,6 +19,7 @@ SRC_URI =
"https://codeload.github.com/ClusterLabs/resource-agents/tar.gz/v${PV}
file://02-set-OCF_ROOT_DIR-to-libdir-ocf.patch \
file://03-fix-header-defs-lookup.patch \
file://fix-install-sh-not-found.patch \
+ file://fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch \
"
SRC_URI[md5sum] = "c59096b1bacc704e8a5a285f15729109"
--
2.11.0
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
