[meta-cgl][PATCH 0/4] resource-agents: update to 4.0.1 and several fixes

[meta-cgl][PATCH 0/4] resource-agents: update to 4.0.1 and several fixes

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

--
The following changes since commit c0afa706e9cdb650c0e8bb79f503743632350b00:

  core-image-cgl: Remove ROOTFS_PKGMANAGE_BOOTSTRAP (2017-05-24 14:19:13 +0200)

are available in the git repository at:

  https://github.com/jackiehjm/meta-cgl.git jhuang0/up_resource-agents_170602_0
  https://github.com//tree/jhuang0/up_resource-agents_170602_0

Jackie Huang (4):
  resource-agents: fix dependencies
  resource-agents: fix install-sh not found
  resource-agents: fix builds error when S != B
  resource-agents: update to version 4.0.1

 .../resource-agents/fix-install-sh-not-found.patch | 60 ++++++++++++++++++++++
 ...uilds-when-srcdir-and-builddir-are-sepera.patch | 39 ++++++++++++++
 ...ce-agents_3.9.7.bb => resource-agents_4.0.1.bb} | 20 ++++++--
 3 files changed, 115 insertions(+), 4 deletions(-)
 create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch
 create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
 rename meta-cgl-common/recipes-cgl/cluster-resource-agents/{resource-agents_3.9.7.bb => resource-agents_4.0.1.bb} (82%)

-- 
2.11.0

[meta-cgl][PATCH 1/4] resource-agents: fix dependencies

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

* inherit pkgconfig or configure fails with:
  | checking for pkg-config... no
  | configure: error: You need pkgconfig installed in order to build

* Add missing runtime dependencies for:
  - many tools and scripts need bash and perl.
  - lvm.sh requires: lvm2
  - ip.sh requires: ethtool iproute2 iputils-arping
  - fs.sh requires: e2fsprogs-e2fsck util-linux quota
  - netfs.sh requires: procps util-linux nfs-utils

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../cluster-resource-agents/resource-agents_3.9.7.bb       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 a0d4e1f..2e8b8f1 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
@@ -28,9 +28,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "cluster-glue"
-RDEPENDS_${PN} += "bash"
 
-inherit autotools systemd
+# There are many tools and scripts that need bash and perl.
+# lvm.sh requires: lvm2
+# ip.sh requires: ethtool iproute2 iputils-arping
+# fs.sh requires: e2fsprogs-e2fsck util-linux quota
+# netfs.sh requires: procps util-linux nfs-utils
+RDEPENDS_${PN} += "bash perl lvm2 \
+    ethtool iproute2 iputils-arping \
+    e2fsprogs-e2fsck util-linux quota \
+    procps nfs-utils \
+"
+
+inherit autotools systemd pkgconfig
 
 EXTRA_OECONF += "--disable-fatal-warnings \
                  --with-rsctmpdir=/var/run/heartbeat/rsctmp"
-- 
2.11.0

[meta-cgl][PATCH 2/4] resource-agents: fix install-sh not found

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Fix configure.ac to cope with new autoconf.
Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is
called as late as it was, ending up thinking that the am_aux_dir is pwd
at the start of the build. Move it up to under AC_INIT to fix that.

configure.ac calls AM_INIT_AUTOMAKE too late. The attached patch moves
it up to just after AC_INIT, fixing the FTBFS.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../resource-agents/fix-install-sh-not-found.patch | 60 ++++++++++++++++++++++
 .../resource-agents_3.9.7.bb                       |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch

diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch
new file mode 100644
index 0000000..102b797
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch
@@ -0,0 +1,60 @@
+configure.ac: fix install-sh not found
+
+Fix configure.ac to cope with new autoconf.
+Recent autoconfs generate a bad configure when AM_INIT_AUTOMAKE is
+called as late as it was, ending up thinking that the am_aux_dir is pwd
+at the start of the build. Move it up to under AC_INIT to fix that.
+
+Author: William Grant <wgrant@ubuntu.com>
+
+Upstream-Status: Pending
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724116
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ configure.ac | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e8e2a7b..f3c8b9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,13 +23,20 @@ AC_INIT([resource-agents],
+ 	m4_esyscmd([make/git-version-gen .tarball-version]),
+ 	[to_be_defined@foobar.org])
+ 
++AC_CONFIG_AUX_DIR(.)
++
++dnl
++dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
++dnl
++
++AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
++
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+ CRM_DTD_VERSION="1.0"
+ 
+ PKG_FEATURES=""
+ 
+-AC_CONFIG_AUX_DIR(.)
+ AC_CANONICAL_HOST
+ 
+ dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
+@@ -56,12 +63,6 @@ AC_ARG_WITH(pkg-name,
+     [  --with-pkg-name=name     Override package name (if you're a packager needing to pretend) ],
+     [ PACKAGE_NAME="$withval" ])
+ 
+-dnl 
+-dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
+-dnl
+-
+-AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
+-
+ AC_DEFINE_UNQUOTED(AGENTS_VERSION, "$PACKAGE_VERSION", Current agents version)
+ 
+ CC_IN_CONFIGURE=yes
+-- 
+1.8.1.2
+
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 2e8b8f1..2d2dd88 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
@@ -18,6 +18,7 @@ SRC_URI = "https://codeload.github.com/ClusterLabs/resource-agents/tar.gz/v${PV}
            file://01-disable-doc-build.patch \
            file://02-set-OCF_ROOT_DIR-to-libdir-ocf.patch \
            file://03-fix-header-defs-lookup.patch \
+           file://fix-install-sh-not-found.patch \
           "
 
 SRC_URI[md5sum] = "c59096b1bacc704e8a5a285f15729109"
-- 
2.11.0

[meta-cgl][PATCH 3/4] resource-agents: fix builds error when S != B

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

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 <jackie.huang@windriver.com>
---
 ...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 <jackie.huang@windriver.com>
+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 <jackie.huang@windriver.com>
+---
+ 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 $@.in | sed \
++	cat $(abs_srcdir)/$@.in | sed \
+ 		-e 's#@''LOGDIR@#${LOGDIR}#g' \
+ 	> $@.out
+ 	chmod +x $@.out
+-- 
+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

[meta-cgl][PATCH 4/4] resource-agents: update to version 4.0.1

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 .../{resource-agents_3.9.7.bb => resource-agents_4.0.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-cgl-common/recipes-cgl/cluster-resource-agents/{resource-agents_3.9.7.bb => resource-agents_4.0.1.bb} (96%)

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_4.0.1.bb
similarity index 96%
rename from meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_3.9.7.bb
rename to meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.0.1.bb
index 2f36b1b..2a9643b 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_4.0.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "https://codeload.github.com/ClusterLabs/resource-agents/tar.gz/v${PV}
            file://fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch \
           "
 
-SRC_URI[md5sum] = "c59096b1bacc704e8a5a285f15729109"
-SRC_URI[sha256sum] = "e5bd62658fbc236acb83b709f64b2cd9fae52aa4a420a44fed5eb667e928b152"
+SRC_URI[md5sum] = "8530431861e659d4ce2f04afcc4efc03"
+SRC_URI[sha256sum] = "863f83c724bad3a8bcff12b9c8712406c43e010041868826cad7b78fd8cfb9fb"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
-- 
2.11.0

Re: [meta-cgl][PATCH 0/4] resource-agents: update to 4.0.1 and several fixes

[Adrian Dudau]

On fre, 2017-06-02 at 16:21 +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> --
> The following changes since commit
> c0afa706e9cdb650c0e8bb79f503743632350b00:
> 
>   core-image-cgl: Remove ROOTFS_PKGMANAGE_BOOTSTRAP (2017-05-24
> 14:19:13 +0200)
> 
> are available in the git repository at:
> 
>   https://github.com/jackiehjm/meta-cgl.git jhuang0/up_resource-
> agents_170602_0
>   https://github.com//tree/jhuang0/up_resource-agents_170602_0
> 
> Jackie Huang (4):
>   resource-agents: fix dependencies
>   resource-agents: fix install-sh not found
>   resource-agents: fix builds error when S != B
>   resource-agents: update to version 4.0.1
> 
>  .../resource-agents/fix-install-sh-not-found.patch | 60
> ++++++++++++++++++++++
>  ...uilds-when-srcdir-and-builddir-are-sepera.patch | 39
> ++++++++++++++
>  ...ce-agents_3.9.7.bb => resource-agents_4.0.1.bb} | 20 ++++++--
>  3 files changed, 115 insertions(+), 4 deletions(-)
>  create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-
> agents/resource-agents/fix-install-sh-not-found.patch
>  create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-
> agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-
> sepera.patch
>  rename meta-cgl-common/recipes-cgl/cluster-resource-
> agents/{resource-agents_3.9.7.bb => resource-agents_4.0.1.bb} (82%)
> 
> -- 
> 2.11.0
> 

Same here, patchset is ok but you need to rebase on top of master
latest.

Best regards,
--Adrian

Re: [meta-cgl][PATCH 0/4] resource-agents: update to 4.0.1 and several fixes

[Huang, Jie (Jackie)]

> -----Original Message-----
> From: Adrian Dudau [mailto:Adrian.Dudau@enea.com]
> Sent: Thursday, June 08, 2017 22:32
> To: Huang, Jie (Jackie); yocto@yoctoproject.org
> Subject: Re: [yocto] [meta-cgl][PATCH 0/4] resource-agents: update to 4.0.1
> and several fixes
> 
> On fre, 2017-06-02 at 16:21 +0800, jackie.huang@windriver.com wrote:
> > From: Jackie Huang <jackie.huang@windriver.com>
> >
> > --
> > The following changes since commit
> > c0afa706e9cdb650c0e8bb79f503743632350b00:
> >
> >   core-image-cgl: Remove ROOTFS_PKGMANAGE_BOOTSTRAP (2017-05-24
> > 14:19:13 +0200)
> >
> > are available in the git repository at:
> >
> >   https://github.com/jackiehjm/meta-cgl.git jhuang0/up_resource-
> > agents_170602_0
> >   https://github.com//tree/jhuang0/up_resource-agents_170602_0
> >
> > Jackie Huang (4):
> >   resource-agents: fix dependencies
> >   resource-agents: fix install-sh not found
> >   resource-agents: fix builds error when S != B
> >   resource-agents: update to version 4.0.1
> >
> >  .../resource-agents/fix-install-sh-not-found.patch | 60
> > ++++++++++++++++++++++
> >  ...uilds-when-srcdir-and-builddir-are-sepera.patch | 39
> > ++++++++++++++
> >  ...ce-agents_3.9.7.bb => resource-agents_4.0.1.bb} | 20 ++++++--
> >  3 files changed, 115 insertions(+), 4 deletions(-)
> >  create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-
> > agents/resource-agents/fix-install-sh-not-found.patch
> >  create mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-
> > agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-
> > sepera.patch
> >  rename meta-cgl-common/recipes-cgl/cluster-resource-
> > agents/{resource-agents_3.9.7.bb => resource-agents_4.0.1.bb} (82%)
> >
> > --
> > 2.11.0
> >
> 
> Same here, patchset is ok but you need to rebase on top of master
> latest.

Rebased and re-sent as v2.

Thanks,
Jackie

> 
> Best regards,
> --Adrian