Re: [yocto] [meta-cgl][PATCH] pacemaker: update to 1.1.16

2017-06-19 Thread Huang, Jie (Jackie) 


> -Original Message-
> From: Adrian Dudau [mailto:adrian.du...@enea.com]
> Sent: Monday, June 19, 2017 16:28
> To: Huang, Jie (Jackie); yocto@yoctoproject.org
> Subject: Re: [yocto] [meta-cgl][PATCH] pacemaker: update to 1.1.16
> 
> On fre, 2017-06-09 at 10:59 +0800, jackie.hu...@windriver.com wrote:
> > From: Jackie Huang <jackie.hu...@windriver.com>
> >
> > * update the licenses and checksum
> > * fix PN -> BPN for multilib builds
> > * add PACKAGECONFIG for systemd and libsmtp
> > * add fix for libgnutls
> >
> > Signed-off-by: Jackie Huang <jackie.hu...@windriver.com>
> > ---
> >  ...006-pacemaker-do-not-use-libgnutls-config.patch | 29
> > ++
> >  .../{pacemaker_1.1.15.bb => pacemaker_1.1.16.bb}   | 22 +---
> > 
> >  2 files changed, 42 insertions(+), 9 deletions(-)
> >  create mode 100755 meta-cgl-common/recipes-
> > cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-
> > config.patch
> >  rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.15.bb =>
> > pacemaker_1.1.16.bb} (84%)
> >
> > diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-
> > pacemaker-do-not-use-libgnutls-config.patch b/meta-cgl-
> > common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-
> > libgnutls-config.patch
> > new file mode 100755
> > index 000..46e45df
> > --- /dev/null
> > +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-
> pacemaker-
> > do-not-use-libgnutls-config.patch
> > @@ -0,0 +1,29 @@
> > +commit bb26b7c290473af988aa9d4132ef55ca907091e6
> > +Author: Joe Slater <jsla...@windriver.com>
> > +Date:   Mon Mar 11 15:47:54 2013 -0700
> > +
> > +pacemaker: do not use libgnutls-config
> > +
> > +Do not try to use libgnutls-config when configuring.
> > +It has been deprecated and we do not supply it.  If a
> > +host version is found, bad things can happen.
> 
> This code patch needs an Upstream-Status tag.

Upstream-Status is added and v2 is sent.

Thanks,
Jackie

> 
> > +
> > +Signed-off-by: Joe Slater <jsla...@windriver.com>
> > +Signed-off-by: Jackie Huang <jackie.hu...@windriver.com>
> > +
> > +
> > +--- a/configure.ac
> >  b/configure.ac
> > +@@ -1427,9 +1427,9 @@ dnl 
> > + AC_CHECK_HEADERS(gnutls/gnutls.h)
> > + AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
> > +
> >
> 
> 
> 
> >  # Don't package some files
> >  find ${D} -name "*.pyo" -exec rm {} \;
> > --
> > 2.11.0
> >
> 
> Otherwise the patch looks good, so please send a v2 and I'll merge it.
> 
> Best regards,
> --Adrian
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-cgl][PATCH] pacemaker: update to 1.1.16

2017-06-19 Thread Adrian Dudau 
On fre, 2017-06-09 at 10:59 +0800, jackie.hu...@windriver.com wrote:
> From: Jackie Huang 
> 
> * update the licenses and checksum
> * fix PN -> BPN for multilib builds
> * add PACKAGECONFIG for systemd and libsmtp
> * add fix for libgnutls
> 
> Signed-off-by: Jackie Huang 
> ---
>  ...006-pacemaker-do-not-use-libgnutls-config.patch | 29
> ++
>  .../{pacemaker_1.1.15.bb => pacemaker_1.1.16.bb}   | 22 +---
> 
>  2 files changed, 42 insertions(+), 9 deletions(-)
>  create mode 100755 meta-cgl-common/recipes-
> cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-
> config.patch
>  rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.15.bb =>
> pacemaker_1.1.16.bb} (84%)
> 
> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-
> pacemaker-do-not-use-libgnutls-config.patch b/meta-cgl-
> common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-
> libgnutls-config.patch
> new file mode 100755
> index 000..46e45df
> --- /dev/null
> +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-
> do-not-use-libgnutls-config.patch
> @@ -0,0 +1,29 @@
> +commit bb26b7c290473af988aa9d4132ef55ca907091e6
> +Author: Joe Slater 
> +Date:   Mon Mar 11 15:47:54 2013 -0700
> +
> +pacemaker: do not use libgnutls-config
> +
> +Do not try to use libgnutls-config when configuring.
> +It has been deprecated and we do not supply it.  If a
> +host version is found, bad things can happen.

This code patch needs an Upstream-Status tag.

> +
> +Signed-off-by: Joe Slater 
> +Signed-off-by: Jackie Huang 
> +
> +
> +--- a/configure.ac
>  b/configure.ac
> +@@ -1427,9 +1427,9 @@ dnl 
> + AC_CHECK_HEADERS(gnutls/gnutls.h)
> + AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
> + 
> 



>  # Don't package some files
>  find ${D} -name "*.pyo" -exec rm {} \;
> -- 
> 2.11.0
> 

Otherwise the patch looks good, so please send a v2 and I'll merge it.

Best regards,
--Adrian
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-cgl][PATCH] pacemaker: update to 1.1.16

2017-06-08 Thread jackie.huang 
From: Jackie Huang 

* update the licenses and checksum
* fix PN -> BPN for multilib builds
* add PACKAGECONFIG for systemd and libsmtp
* add fix for libgnutls

Signed-off-by: Jackie Huang 
---
 ...006-pacemaker-do-not-use-libgnutls-config.patch | 29 ++
 .../{pacemaker_1.1.15.bb => pacemaker_1.1.16.bb}   | 22 +---
 2 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100755 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
 rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.15.bb => 
pacemaker_1.1.16.bb} (84%)

diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
new file mode 100755
index 000..46e45df
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch
@@ -0,0 +1,29 @@
+commit bb26b7c290473af988aa9d4132ef55ca907091e6
+Author: Joe Slater 
+Date:   Mon Mar 11 15:47:54 2013 -0700
+
+pacemaker: do not use libgnutls-config
+
+Do not try to use libgnutls-config when configuring.
+It has been deprecated and we do not supply it.  If a
+host version is found, bad things can happen.
+
+Signed-off-by: Joe Slater 
+Signed-off-by: Jackie Huang 
+
+
+--- a/configure.ac
 b/configure.ac
+@@ -1427,9 +1427,9 @@ dnl 
+ AC_CHECK_HEADERS(gnutls/gnutls.h)
+ AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+ 
+-dnl GNUTLS library: Attempt to determine by 'libgnutls-config' program.
+-dnl If no 'libgnutls-config', try traditional autoconf means.
+-AC_PATH_PROGS(LIBGNUTLS_CONFIG, libgnutls-config)
++dnl libgnutls-config has been deprecated, so we use pkg-config
++
++LIBGNUTLS_CONFIG="pkg-config gnutls"
+ 
+ if test -n "$LIBGNUTLS_CONFIG"; then
+   AC_MSG_CHECKING(for gnutls header flags)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
similarity index 84%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
index 7dfbc26..cc1dd3d 100755
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.16.bb
@@ -8,29 +8,33 @@ when related resources fail and can be configured to 
periodically \
 check resource health."
 HOMEPAGE = "http://www.clusterlabs.org;
 
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6adca3b36477cc77e04376f9a40df32c \
-file://COPYING.LIB;md5=243b725d71bb5df4a1e5920b344b86ad \
-   "
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=19a64afd3a35d044a80579d7aafc30ff"
+
 DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb 
python-native"
 
-SRC_URI = "https://github.com/ClusterLabs/${PN}/archive/Pacemaker-${PV}.zip \
+SRC_URI = "https://github.com/ClusterLabs/${BPN}/archive/Pacemaker-${PV}.zip \
file://0001-pacemaker-fix-xml-config.patch \

file://0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch \
file://0003-pacemaker-fix-header-defs-lookup.patch \
file://0004-pacemaker-do-not-build-help.patch \

file://0005-pacemaker-do-not-execute-target-program-while-cross-.patch \
+   file://0006-pacemaker-do-not-use-libgnutls-config.patch \
file://fix_missing_qb_array.patch \
file://volatiles \
file://tmpfiles \
   "
-SRC_URI[md5sum] = "def7902672872a6f43581b694eb34a4b"
-SRC_URI[sha256sum] = 
"0191037508b73a364c157892258bab72184384ebb854ff5233e84941fe014f5e"
+SRC_URI[md5sum] = "6f60f733823d31acbef4556fb749c457"
+SRC_URI[sha256sum] = 
"2642264b27c584eff5747a2a34c7f2bff13d52741e4e5cc70f14b2b6cd1fe7d5"
 
 inherit autotools-brokensep pkgconfig systemd python-dir useradd
 
 S="${WORKDIR}/pacemaker-Pacemaker-${PV}"
 
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
+PACKAGECONFIG[libesmtp] = "--with-esmtp=yes,--with-esmtp=no,libesmtp"
+
 EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \
  --disable-fatal-warnings \
  --with-ais \
@@ -41,9 +45,9 @@ EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \
 do_install_append() {
 install -d ${D}${sysconfdir}/default
 install -d ${D}${sysconfdir}/default/volatiles
-install -m 0644 ${WORKDIR}/volatiles 
${D}${sysconfdir}/default/volatiles/06_${PN}
+install -m 0644 ${WORKDIR}/volatiles 
${D}${sysconfdir}/default/volatiles/06_${BPN}
 install -d ${D}${sysconfdir}/tmpfiles.d
-install