[yocto] [meta-security][PATCH] samhain-client: Erorr Fix

2016-03-06 Thread Li Xin
The Error is as following:
 # /usr/sbin/samhain -t init -p info
 ..
 Segmentation fault
 # echo $?
 139

Signed-off-by: Li Xin 
---
 recipes-security/samhain/samhain.inc | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes-security/samhain/samhain.inc 
b/recipes-security/samhain/samhain.inc
index 9525229..23bc8f5 100644
--- a/recipes-security/samhain/samhain.inc
+++ b/recipes-security/samhain/samhain.inc
@@ -50,7 +50,12 @@ do_configure_prepend_aarch64() {
 # recognized by Samhain's configure script and would invariably
 # throw back the error "unrecognized option: --oldincludedir=/usr/include"
 do_configure () {
-cd ${S}
+cat << EOF > ./config-site.${BP}
+ssp_cv_lib=no
+sh_cv_va_copy=yes
+EOF
+
+export CONFIG_SITE=./config-site.${BP}
./configure \
--build=${BUILD_SYS} \
--host=${HOST_SYS} \
-- 
1.8.4.2



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


Re: [yocto] [meta-cgl][PATCH 3/3] pacemaker: WARNING Fix

2015-12-17 Thread Li, Xin
Hi, Adrian

>
>I merged the patches as it's better to use a released version, but I never got 
>a
>fetch failure on the git repo. Maybe you have some network restrictions if you
>always get it?

I got it.
Maybe my network is not very ok. I will do some extra test.

Thanks & Regards,
Li

>
>--Adrian
>
>>
>> Signed-off-by: Li Xin 
>> ---
>>  meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb | 11
>> ++-
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
>> b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
>> index 1806fe1..d2e2395 100755
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
>> +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
>> @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM =
>"file://COPYING;md5=6adca3b36477cc77e04376f9a40df32c \
>> "
>>  DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb
>python-native"
>>
>> -SRC_URI = "git://github.com/ClusterLabs/pacemaker.git \
>> +SRC_URI =
>> +"https://github.com/ClusterLabs/${PN}/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 \ @@
>> -23,11 +23,12 @@ SRC_URI = "git://github.com/ClusterLabs/pacemaker.git \
>> file://volatiles \
>> file://tmpfiles \
>>"
>> -SRCREV = "6052cd16c2f455809f8088af76ce86483bf98353"
>> +SRC_URI[md5sum] = "d84a5173306727a981a4f87e36007595"
>> +SRC_URI[sha256sum] =
>"e963bc59a5d98a3e3441ea5cccb42aa67f9d7934b80c8818e19ae91c5da48331"
>>
>>  inherit autotools-brokensep pkgconfig systemd python-dir useradd
>>
>> -S="${WORKDIR}/git"
>> +S="${WORKDIR}/pacemaker-Pacemaker-${PV}"
>>
>>  EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \
>>   --disable-fatal-warnings \ @@ -65,7 +66,7 @@
>> FILES_${PN}-libs = "${libdir}/libcib.so.* \
>>  ${libdir}/libstonithd.so.* \
>>  ${libdir}/libtransitioner.so.* \
>> "
>> -RDEPENDS_${PN}-libs += "libqb"
>> +RDEPENDS_${PN}-libs += "libqb dbus-lib"
>>  FILES_${PN}-cluster-libs = "${libdir}/libcrmcluster.so.*"
>>  RDEPENDS_${PN}-cluster-libs += "libqb"
>>  FILES_${PN}-remote = "${sysconfdir}/init.d/pacemaker_remote \ @@
>> -83,7 +84,7 @@ FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug"
>>  RDEPENDS_${PN} = "bash python libqb"
>>
>>  SYSTEMD_PACKAGES += "${PN}-remote"
>> -SYSTEMD_SERVICE_${PN} += "pacemaker.service"
>> +SYSTEMD_SERVICE_${PN} += "pacemaker.service crm_mon.service"
>>  SYSTEMD_SERVICE_${PN}-remote += "pacemaker_remote.service"
>>
>>  USERADD_PACKAGES = "${PN}"
>> --
>> 1.8.4.2
>>
>>
>>
>
>
>



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH 2/3] cluster: Error Fix

2015-12-14 Thread Li Xin
collect2: error: ld returned 1 exit status
ld: cannot find crtn.o: No such file or directory
ld: cannot find crtendS.o: No such file or directory

Signed-off-by: Li Xin 
---
 meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb 
b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
index d85f2b6..1c6e353 100644
--- a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
@@ -33,6 +33,8 @@ do_configure () {
 --without_bindings \
 --without_group \
 --without_config \
+--without_common \
+--without_dlm \
 2>&1
 }
 
-- 
1.8.4.2



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH 3/3] pacemaker: WARNING Fix

2015-12-14 Thread Li Xin
* WARNING: QA Issue: pacemaker: Files/directories were installed but not 
shipped in any package:
  /lib/systemd/system/crm_mon.service
  Please set FILES such that these items are packaged.

* WARNING: QA Issue: pacemaker-libs rdepends on dbus-lib, but it isn't a build 
dependency? [build-deps]

* Also Modify SRC_URI,since original one is always do_fetch failed.

Signed-off-by: Li Xin 
---
 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
index 1806fe1..d2e2395 100755
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=6adca3b36477cc77e04376f9a40df32c \
"
 DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb 
python-native"
 
-SRC_URI = "git://github.com/ClusterLabs/pacemaker.git \
+SRC_URI = "https://github.com/ClusterLabs/${PN}/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 \
@@ -23,11 +23,12 @@ SRC_URI = "git://github.com/ClusterLabs/pacemaker.git \
file://volatiles \
file://tmpfiles \
   "
-SRCREV = "6052cd16c2f455809f8088af76ce86483bf98353"
+SRC_URI[md5sum] = "d84a5173306727a981a4f87e36007595"
+SRC_URI[sha256sum] = 
"e963bc59a5d98a3e3441ea5cccb42aa67f9d7934b80c8818e19ae91c5da48331"
 
 inherit autotools-brokensep pkgconfig systemd python-dir useradd
 
-S="${WORKDIR}/git"
+S="${WORKDIR}/pacemaker-Pacemaker-${PV}"
 
 EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \
  --disable-fatal-warnings \
@@ -65,7 +66,7 @@ FILES_${PN}-libs = "${libdir}/libcib.so.* \
 ${libdir}/libstonithd.so.* \
 ${libdir}/libtransitioner.so.* \
"
-RDEPENDS_${PN}-libs += "libqb"
+RDEPENDS_${PN}-libs += "libqb dbus-lib"
 FILES_${PN}-cluster-libs = "${libdir}/libcrmcluster.so.*"
 RDEPENDS_${PN}-cluster-libs += "libqb"
 FILES_${PN}-remote = "${sysconfdir}/init.d/pacemaker_remote \
@@ -83,7 +84,7 @@ FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug"
 RDEPENDS_${PN} = "bash python libqb"
 
 SYSTEMD_PACKAGES += "${PN}-remote"
-SYSTEMD_SERVICE_${PN} += "pacemaker.service"
+SYSTEMD_SERVICE_${PN} += "pacemaker.service crm_mon.service"
 SYSTEMD_SERVICE_${PN}-remote += "pacemaker_remote.service"
 
 USERADD_PACKAGES = "${PN}"
-- 
1.8.4.2



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH 1/3] cluster-glue: WARNING Fix

2015-12-14 Thread Li Xin
WARNING: QA Issue: cluster-glue: Files/directories were installed but not 
shipped in any package:
  /lib
  /lib/systemd
  /lib/systemd/system
  /lib/systemd/system/logd.service
Please set FILES such that these items are packaged.

Signed-off-by: Li Xin 
---
 meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
index be04469..9604bca 100644
--- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
@@ -83,6 +83,7 @@ FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* 
${sbindir} ${datadir}/clus
${libdir}/heartbeat/ipctransientclient \
${libdir}/heartbeat/ha_logd \
${libdir}/heartbeat/lrmd \
+   ${systemd_unitdir} \
"
 
 FILES_${PN}-dbg += "${libdir}/heartbeat/.debug/ \
-- 
1.8.4.2



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


Re: [yocto] [meta-security][PATCH] samhain: upgrade to 4.1.0

2015-11-01 Thread Li, Xin
Hi, Armin,

I got it.
Thanks a lot.

Regards,
Li

>-Original Message-
>From: akuster808 [mailto:akuster...@gmail.com]
>Sent: Saturday, October 31, 2015 2:42 AM
>To: Li, Xin/李 欣
>Cc: yocto@yoctoproject.org
>Subject: Re: [yocto] [meta-security][PATCH] samhain: upgrade to 4.1.0
>
>Li Xin,
>
>Master-next already has the 4.1.0 update. I have merged the additional fixes to
>master-next.
>
>thanks,
>Armin
>
>On 10/30/2015 02:37 AM, Li xin wrote:
>> From: Li Xin 
>>
>> Also fix an error when "samhain -t check" is executed.
>> The error is like this:
>> 'ERROR: msg=> database>, subroutine=, path=<(null)>'
>>
>> Signed-off-by: Li Xin 
>> ---
>>  .../samhain/{samhain-client_4.0.0.bb => samhain-client_4.1.0.bb}| 3 ++-
>>  .../samhain/{samhain-server_4.0.0.bb => samhain-server_4.1.0.bb}| 0
>>  recipes-security/samhain/samhain.inc
>| 6 +++---
>>  3 files changed, 5 insertions(+), 4 deletions(-)  rename
>> recipes-security/samhain/{samhain-client_4.0.0.bb =>
>> samhain-client_4.1.0.bb} (79%)  rename
>> recipes-security/samhain/{samhain-server_4.0.0.bb =>
>> samhain-server_4.1.0.bb} (100%)
>>
>> diff --git a/recipes-security/samhain/samhain-client_4.0.0.bb
>> b/recipes-security/samhain/samhain-client_4.1.0.bb
>> similarity index 79%
>> rename from recipes-security/samhain/samhain-client_4.0.0.bb
>> rename to recipes-security/samhain/samhain-client_4.1.0.bb
>> index c671b48..bb47449 100644
>> --- a/recipes-security/samhain/samhain-client_4.0.0.bb
>> +++ b/recipes-security/samhain/samhain-client_4.1.0.bb
>> @@ -8,7 +8,8 @@ EXTRA_OECONF += " \
>>  --with-logserver=${SAMHAIN_SERVER} \
>>  --with-port=${SAMHAIN_PORT} \
>>  --with-config-file=/etc/samhainrc \
>> ---with-data-file=/var/lib/samhain/samhain_file \
>> +--with-data-file=/var/samhain/samhain.data \
>> +--with-pid-file=/var/samhain/samhain.pid \
>>  "
>>
>>
>> diff --git a/recipes-security/samhain/samhain-server_4.0.0.bb
>> b/recipes-security/samhain/samhain-server_4.1.0.bb
>> similarity index 100%
>> rename from recipes-security/samhain/samhain-server_4.0.0.bb
>> rename to recipes-security/samhain/samhain-server_4.1.0.bb
>> diff --git a/recipes-security/samhain/samhain.inc
>> b/recipes-security/samhain/samhain.inc
>> index e33182f..dedcf76 100644
>> --- a/recipes-security/samhain/samhain.inc
>> +++ b/recipes-security/samhain/samhain.inc
>> @@ -8,9 +8,8 @@ SRC_URI =
>"http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
>> file://${INITSCRIPT_NAME}.init \
>> file://${INITSCRIPT_NAME}.default \
>>"
>> -
>> -SRC_URI[md5sum] = "2144383cc5452b9b80c7e4e4c991ad4a"
>> -SRC_URI[sha256sum] =
>"5a841708f78c6d9b4731970fa39151dff366885de08ecddc382e8c45a2c1b4e2"
>> +SRC_URI[md5sum] = "fcb59c6c8a1d30cc6ffc21557a0046d3"
>> +SRC_URI[sha256sum] =
>"a8e10454782a7f3bb5f709dd05cee695ffbd052afc709668a3e7c4b629771189"
>>
>>  S = "${WORKDIR}/samhain-${PV}"
>>
>> @@ -87,4 +86,5 @@ do_install_append () {
>>  install -d ${D}${docdir}/${PN}
>>  cp -r docs/* ${D}${docdir}/${PN}
>>  cp -r scripts ${D}${docdir}/${PN}
>> +install -d -m 755 ${D}/var/samhain
>>  }
>>
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-security][PATCH] samhain: upgrade to 4.1.0

2015-10-30 Thread Li xin
From: Li Xin 

Also fix an error when "samhain -t check" is executed.
The error is like this:
'ERROR: msg=,
subroutine=, path=<(null)>'

Signed-off-by: Li Xin 
---
 .../samhain/{samhain-client_4.0.0.bb => samhain-client_4.1.0.bb}| 3 ++-
 .../samhain/{samhain-server_4.0.0.bb => samhain-server_4.1.0.bb}| 0
 recipes-security/samhain/samhain.inc| 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename recipes-security/samhain/{samhain-client_4.0.0.bb => 
samhain-client_4.1.0.bb} (79%)
 rename recipes-security/samhain/{samhain-server_4.0.0.bb => 
samhain-server_4.1.0.bb} (100%)

diff --git a/recipes-security/samhain/samhain-client_4.0.0.bb 
b/recipes-security/samhain/samhain-client_4.1.0.bb
similarity index 79%
rename from recipes-security/samhain/samhain-client_4.0.0.bb
rename to recipes-security/samhain/samhain-client_4.1.0.bb
index c671b48..bb47449 100644
--- a/recipes-security/samhain/samhain-client_4.0.0.bb
+++ b/recipes-security/samhain/samhain-client_4.1.0.bb
@@ -8,7 +8,8 @@ EXTRA_OECONF += " \
 --with-logserver=${SAMHAIN_SERVER} \
 --with-port=${SAMHAIN_PORT} \
 --with-config-file=/etc/samhainrc \
---with-data-file=/var/lib/samhain/samhain_file \
+--with-data-file=/var/samhain/samhain.data \
+--with-pid-file=/var/samhain/samhain.pid \
 "
 
 
diff --git a/recipes-security/samhain/samhain-server_4.0.0.bb 
b/recipes-security/samhain/samhain-server_4.1.0.bb
similarity index 100%
rename from recipes-security/samhain/samhain-server_4.0.0.bb
rename to recipes-security/samhain/samhain-server_4.1.0.bb
diff --git a/recipes-security/samhain/samhain.inc 
b/recipes-security/samhain/samhain.inc
index e33182f..dedcf76 100644
--- a/recipes-security/samhain/samhain.inc
+++ b/recipes-security/samhain/samhain.inc
@@ -8,9 +8,8 @@ SRC_URI = 
"http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \
   file://${INITSCRIPT_NAME}.init \
   file://${INITSCRIPT_NAME}.default \
  "
-
-SRC_URI[md5sum] = "2144383cc5452b9b80c7e4e4c991ad4a"
-SRC_URI[sha256sum] = 
"5a841708f78c6d9b4731970fa39151dff366885de08ecddc382e8c45a2c1b4e2"
+SRC_URI[md5sum] = "fcb59c6c8a1d30cc6ffc21557a0046d3"
+SRC_URI[sha256sum] = 
"a8e10454782a7f3bb5f709dd05cee695ffbd052afc709668a3e7c4b629771189"
 
 S = "${WORKDIR}/samhain-${PV}"
 
@@ -87,4 +86,5 @@ do_install_append () {
install -d ${D}${docdir}/${PN}
cp -r docs/* ${D}${docdir}/${PN}
cp -r scripts ${D}${docdir}/${PN}
+install -d -m 755 ${D}/var/samhain
 }
-- 
1.8.4.2

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12

2015-08-24 Thread Li xin
* Add patch to aviod build Error and Warning.
  --0001-don-t-compile-doc-and-Error-Fix.patch
  --0001-ribcl.py.in-Warning-Fix.patch

* Dropped backported patch:
  --fix-const-cast.patch
  --glue-remove-getpid-check.patch
  --glue-repair-deprecated-glib-support.patch
  --glue-repair-libxml-support.patch

* Replace the hardcoded strings "/usr/lib" "/etc/" "/usr/sbin" "/usr/share"

Signed-off-by: Li Xin 
---
 .../0001-don-t-compile-doc-and-Error-Fix.patch |  75 +++
 .../0001-ribcl.py.in-Warning-Fix.patch |  34 +++
 .../cluster-glue/cluster-glue/fix-const-cast.patch | 103 -
 .../cluster-glue/glue-remove-getpid-check.patch|  31 ---
 .../glue-repair-deprecated-glib-support.patch  |  12 ---
 .../cluster-glue/glue-repair-libxml-support.patch  |  14 ---
 ...luster-glue_1.0.5.bb => cluster-glue_1.0.12.bb} |  76 ---
 7 files changed, 150 insertions(+), 195 deletions(-)
 create mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/fix-const-cast.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-remove-getpid-check.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-deprecated-glib-support.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-libxml-support.patch
 rename meta-cgl-common/recipes-cgl/cluster-glue/{cluster-glue_1.0.5.bb => 
cluster-glue_1.0.12.bb} (49%)

diff --git 
a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
new file mode 100644
index 000..dd762b8
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
@@ -0,0 +1,75 @@
+From 86924cbbd595cde81584d74f6c93bcc4a080fcdd Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Tue, 18 Aug 2015 17:43:29 +0900
+Subject: [PATCH] don't compile doc and Error Fix
+
+| help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
+| make[2]: *** [lrmadmin.8] Error 1
+
+| make[2]: a2x: Command not found
+| /usr/bin/xsltproc \
+|   --xinclude \
+|   
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl 
ha_logd.xml
+| make[2]: *** [hb_report.8] Error 127
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ Makefile.am   |  2 +-
+ configure.ac  |  6 ++
+ lrm/admin/Makefile.am | 14 +++---
+ 3 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 93dbaf6..2f4d03b 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 
DRF/config-h.in \
+ DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
+ 
+ SUBDIRS   = include $(LIBLTDL_DIR) replace lib lrm logd \
+-hb_report doc config
++hb_report config
+ 
+ install-exec-local:
+   $(INSTALL) -d $(DESTDIR)/$(HA_COREDIR)
+diff --git a/configure.ac b/configure.ac
+index 36bcf12..809fae6 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1437,3 +1437,9 @@ AC_MSG_RESULT([  CFLAGS   = ${CFLAGS}])
+ AC_MSG_RESULT([  Libraries= ${LIBS}])
+ AC_MSG_RESULT([  Stack Libraries  = ${CLUSTERLIBS}])
+ 
++if test "$TARGET_PYTHON"; then
++  TARGET_PYTHON=$TARGET_PYTHON
++else
++  TARGET_PYTHON=$PYTHON
++fi
++  AC_SUBST(TARGET_PYTHON)
+diff --git a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am
+index a92cd72..de525ea 100644
+--- a/lrm/admin/Makefile.am
 b/lrm/admin/Makefile.am
+@@ -31,10 +31,10 @@ lrmadmin_LDFLAGS   =   $(COMMONLIBS)
+ lrmadmin_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
+ lrmadmin_DEPENDENCIES = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
+ 
+-if BUILD_HELP
+-man8_MANS =   $(sbin_PROGRAMS:%=%.8)
+-%.8:  %
+-  echo Creating $@
+-  chmod a+x $<
+-  help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA 
project" $(top_builddir)/lrm/admin/$<
+-endif
++#if BUILD_HELP
++#man8_MANS =  $(sbin_PROGRAMS:%=%.8)
++#%.8: %
++# echo Creating $@
++# chmod a+x $<
++# help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA 
project" $(top_builddir)/lrm/admin/$<
++#endif
+-- 
+1.8.4.2
+
diff --git 
a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
new file mode 100644
index 000..31010d4
--- /dev/null

Re: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12

2015-08-23 Thread Li, Xin
Hi, Alex V.

I bitbake cluster-glue for x86, Arm, and Powerpc. But I can't produce the error.
Would you mind providing the error message for me?

Regards,
Li

>-Original Message-
>From: yocto-boun...@yoctoproject.org [mailto:yocto-boun...@yoctoproject.org]
>On Behalf Of Li, Xin
>Sent: Friday, August 21, 2015 10:51 AM
>To: Alexandru Vaduva; yocto@yoctoproject.org
>Subject: Re: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12
>
>Hi, Alex V.
>
>Thanks a lot.
>
>Indeed, the error does not occur on my system.
>I will do some extra test, and resend the patch.
>
>Regards,
>Li
>
>>-Original Message-
>>From: Alexandru Vaduva [mailto:alexandru.vad...@enea.com]
>>Sent: Thursday, August 20, 2015 10:51 PM
>>To: Li, Xin/李 欣; yocto@yoctoproject.org
>>Subject: RE: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5
>>-> 1.0.12
>>
>>Hello,
>>
>>Could you please take one more look on this since for me the build is
>>failing in the do_compile stage.
>>Due to this error I was not able to build the other two patches
>>heardbleat and pacemaker. :D
>>
>>Alex V.
>>
>>-Original Message-
>>From: yocto-boun...@yoctoproject.org
>>[mailto:yocto-boun...@yoctoproject.org]
>>On Behalf Of Li xin
>>Sent: Wednesday, August 19, 2015 8:04 AM
>>To: yocto@yoctoproject.org
>>Subject: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 ->
>>1.0.12
>>
>>* Add patch to aviod build Error and Warning.
>>  --0001-don-t-compile-doc-and-Error-Fix.patch
>>  --0001-ribcl.py.in-Warning-Fix.patch
>>
>>* Dropped backported patch:
>>  --fix-const-cast.patch
>>  --glue-remove-getpid-check.patch
>>  --glue-repair-deprecated-glib-support.patch
>>  --glue-repair-libxml-support.patch
>>
>>* Replace the hardcoded strings "/usr/lib" "/etc/" "/usr/sbin" "/usr/share"
>>
>>Signed-off-by: Li Xin 
>>---
>> .../0001-don-t-compile-doc-and-Error-Fix.patch |  50 ++
>> .../0001-ribcl.py.in-Warning-Fix.patch |  34 +++
>> .../cluster-glue/cluster-glue/fix-const-cast.patch | 103 
>> -
>> .../cluster-glue/glue-remove-getpid-check.patch|  31 ---
>> .../glue-repair-deprecated-glib-support.patch  |  12 ---
>> .../cluster-glue/glue-repair-libxml-support.patch  |  14
>>---  ...luster-glue_1.0.5.bb => cluster-glue_1.0.12.bb} |  76
>>---
>> 7 files changed, 125 insertions(+), 195 deletions(-)  create mode
>>100644
>>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compil
>>e-doc-and
>>-Error-Fix.patch
>> create mode 100644
>>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fi
>x.
>>patch
>> delete mode 100644
>>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/fix-const-cast.pa
>>tch
>> delete mode 100644
>>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-remove-getpi
>>d-check.p
>>atch
>> delete mode 100644
>>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-depre
>>cated-glib-
>>support.patch
>> delete mode 100644
>>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-libxm
>>l-support.p
>>atch
>> rename meta-cgl-common/recipes-cgl/cluster-glue/{cluster-glue_1.0.5.bb
>>=> cluster-glue_1.0.12.bb} (49%)
>>
>>diff --git
>>a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-comp
>>ile-doc-a
>>nd-Error-Fix.patch
>>b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-comp
>>ile-doc-a
>>nd-Error-Fix.patch
>>new file mode 100644
>>index 000..471b1e4
>>--- /dev/null
>>+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-
>>+++ c
>>+++ ompile-doc-and-Error-Fix.patch
>>@@ -0,0 +1,50 @@
>>+From b64b676f7abf896ca714341eb330099f2ff04213 Mon Sep 17 00:00:00 2001
>>+From: Li xin 
>>+Date: Tue, 18 Aug 2015 17:43:29 +0900
>>+Subject: [PATCH] don't compile doc and Error Fix
>>+
>>+| help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
>>+| make[2]: *** [lrmadmin.8] Error 1
>>+
>>+| make[2]: a2x: Command not found
>>+| /usr/bin/xsltproc \
>>+|   --xinclude \
>>+|
>>+| http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.
>>+| x
>>+| sl ha_logd.xml
>>+| make[2]: *** [hb_report.8] Error 127
>>+
>>+Upstream-Status: pending
>>+
>>+Signed-off-by: Li X

Re: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12

2015-08-20 Thread Li, Xin
Hi, Alex V.

Thanks a lot.

Indeed, the error does not occur on my system.
I will do some extra test, and resend the patch.

Regards,
Li

>-Original Message-
>From: Alexandru Vaduva [mailto:alexandru.vad...@enea.com]
>Sent: Thursday, August 20, 2015 10:51 PM
>To: Li, Xin/李 欣; yocto@yoctoproject.org
>Subject: RE: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12
>
>Hello,
>
>Could you please take one more look on this since for me the build is failing 
>in the
>do_compile stage.
>Due to this error I was not able to build the other two patches heardbleat and
>pacemaker. :D
>
>Alex V.
>
>-Original Message-
>From: yocto-boun...@yoctoproject.org [mailto:yocto-boun...@yoctoproject.org]
>On Behalf Of Li xin
>Sent: Wednesday, August 19, 2015 8:04 AM
>To: yocto@yoctoproject.org
>Subject: [yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12
>
>* Add patch to aviod build Error and Warning.
>  --0001-don-t-compile-doc-and-Error-Fix.patch
>  --0001-ribcl.py.in-Warning-Fix.patch
>
>* Dropped backported patch:
>  --fix-const-cast.patch
>  --glue-remove-getpid-check.patch
>  --glue-repair-deprecated-glib-support.patch
>  --glue-repair-libxml-support.patch
>
>* Replace the hardcoded strings "/usr/lib" "/etc/" "/usr/sbin" "/usr/share"
>
>Signed-off-by: Li Xin 
>---
> .../0001-don-t-compile-doc-and-Error-Fix.patch |  50 ++
> .../0001-ribcl.py.in-Warning-Fix.patch |  34 +++
> .../cluster-glue/cluster-glue/fix-const-cast.patch | 103 -
> .../cluster-glue/glue-remove-getpid-check.patch|  31 ---
> .../glue-repair-deprecated-glib-support.patch  |  12 ---
> .../cluster-glue/glue-repair-libxml-support.patch  |  14
>---  ...luster-glue_1.0.5.bb => cluster-glue_1.0.12.bb} |  76 ---
> 7 files changed, 125 insertions(+), 195 deletions(-)  create mode 100644
>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and
>-Error-Fix.patch
> create mode 100644
>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.
>patch
> delete mode 100644
>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/fix-const-cast.patch
> delete mode 100644
>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-remove-getpid-check.p
>atch
> delete mode 100644
>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-deprecated-glib-
>support.patch
> delete mode 100644
>meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-libxml-support.p
>atch
> rename meta-cgl-common/recipes-cgl/cluster-glue/{cluster-glue_1.0.5.bb =>
>cluster-glue_1.0.12.bb} (49%)
>
>diff --git
>a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-a
>nd-Error-Fix.patch
>b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-a
>nd-Error-Fix.patch
>new file mode 100644
>index 000..471b1e4
>--- /dev/null
>+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-c
>+++ ompile-doc-and-Error-Fix.patch
>@@ -0,0 +1,50 @@
>+From b64b676f7abf896ca714341eb330099f2ff04213 Mon Sep 17 00:00:00 2001
>+From: Li xin 
>+Date: Tue, 18 Aug 2015 17:43:29 +0900
>+Subject: [PATCH] don't compile doc and Error Fix
>+
>+| help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
>+| make[2]: *** [lrmadmin.8] Error 1
>+
>+| make[2]: a2x: Command not found
>+| /usr/bin/xsltproc \
>+|   --xinclude \
>+|
>+| http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.x
>+| sl ha_logd.xml
>+| make[2]: *** [hb_report.8] Error 127
>+
>+Upstream-Status: pending
>+
>+Signed-off-by: Li Xin 
>+---
>+ Makefile.am   | 2 +-
>+ configure.ac  | 6 ++
>+ lrm/admin/Makefile.am | 2 +-
>+ 3 files changed, 8 insertions(+), 2 deletions(-)
>+
>+diff --git a/Makefile.am b/Makefile.am
>+index 93dbaf6..2f4d03b 100644
>+--- a/Makefile.am
> b/Makefile.am
>+@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES= Makefile.in aclocal.m4 
>configure
>DRF/config-h.in \
>+DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
>+
>+ SUBDIRS  = include $(LIBLTDL_DIR) replace lib lrm logd \
>+-   hb_report doc config
>++   hb_report config
>+
>+ install-exec-local:
>+  $(INSTALL) -d $(DESTDIR)/$(HA_COREDIR) diff --git
>+a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am index a92cd72..ed938e0
>+100644
>+--- a/lrm/admin/Makefile.am
> b/lrm/admin/Makefile.am
>+@@ -36,5 +36,5 @@ man8_MANS = $(sbin_PROGRAMS:%=%.8)
>+ %.8: %
>+  echo Creating $@
>+ 

[yocto] [meta-cgl][PATCH v2] ocfs2-tools: upgrade 1.4.3 -> 1.6.4

2015-08-19 Thread Li xin
* Dropped backported 0001-ocfs2_controld-Makefile-fix-compile-error.patch.
* Update 0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch,since the 
context changed.
* Modify SRC_URI,since the original one is unstable.

Signed-off-by: Li Xin 
---
 ...ocfs2_controld-Makefile-fix-compile-error.patch | 62 --
 ...cfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch | 22 
 .../{ocfs2-tools_1.4.3.bb => ocfs2-tools_1.6.4.bb} | 15 +++---
 3 files changed, 8 insertions(+), 91 deletions(-)
 delete mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
 rename meta-cgl-common/recipes-cgl/ocfs2-tools/{ocfs2-tools_1.4.3.bb => 
ocfs2-tools_1.6.4.bb} (88%)

diff --git 
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
deleted file mode 100644
index c30f38f..000
--- 
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 865444fb9ecfe5b0050075f986a328701aa3d580 Mon Sep 17 00:00:00 2001
-From: Li xin 
-Date: Fri, 12 Dec 2014 16:11:43 +0900
-Subject: [PATCH 1/3] ocfs2_controld/Makefile: fix compile error
-
-ERROR: This autoconf log indicates errors, it looked at host
-include and/or library paths while determining system capabilities.
-
-Upstream-Status: pending
-
-Signed-off-by: Li Xin 

- ocfs2_controld/Makefile| 4 ++--
- ocfs2_controld/pacemaker.c | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/ocfs2_controld/Makefile b/ocfs2_controld/Makefile
-index 52aa493..b530d72 100644
 a/ocfs2_controld/Makefile
-+++ b/ocfs2_controld/Makefile
-@@ -17,7 +17,7 @@ SBIN_PROGRAMS += ocfs2_controld.pcmk
- PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ 
$(GLIB_CFLAGS)
- endif
- 
--INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
-+INCLUDES = -I/usr/include/libxml2 -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
- LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
- LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
- LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
-@@ -67,7 +67,7 @@ DIST_FILES = \
- ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS)
-   $(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \
-   $(OPENAIS_LIBS) $(COROSYNC_LIBS) \
--  $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd
-+  $(DLMCONTROL_LIBS) -lcrmcluster -lcrmcommon
- 
- ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS)
-   $(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \
-diff --git a/ocfs2_controld/pacemaker.c b/ocfs2_controld/pacemaker.c
-index 8df1052..1361b13 100644
 a/ocfs2_controld/pacemaker.c
-+++ b/ocfs2_controld/pacemaker.c
-@@ -22,6 +22,7 @@
- 
- #include 
- 
-+#include 
- #include 
- /* heartbeat support is irrelevant here */
- #undef SUPPORT_HEARTBEAT
-@@ -155,7 +156,7 @@ int setup_stack(void)
-   crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
- 
-   if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, 
&our_nodeid) == FALSE) {
--  log_error("Connection to our AIS plugin (%d) failed", 
CRM_SERVICE);
-+  log_error("Connection to our AIS plugin (%d) failed", 
PCMK_SERVICE);
-   return -1;
-   }
- 
--- 
-1.8.4.2
-
diff --git 
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
index 799eb45..f07cdab 100644
--- 
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
+++ 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
@@ -24,28 +24,6 @@ index 2140bb3..00add7b 100644
  {
de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
  }
-diff --git a/mount.ocfs2/mount.ocfs2.c b/mount.ocfs2/mount.ocfs2.c
-index f820a30..3e5b362 100644
 a/mount.ocfs2/mount.ocfs2.c
-+++ b/mount.ocfs2/mount.ocfs2.c
-@@ -261,7 +261,7 @@ int main(int argc, char **argv)
-   char *extra = NULL;
-   int dev_ro = 0;
-   char *hbstr = NULL;
--  char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 
1] = "";
-+  char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 
1];
-   ocfs2_filesys *fs = NULL;
-   struct o2cb_cluster_desc cluster;
-   struct o2cb_region_desc desc;
-@@ -269,6 +269,8 @@ int main(int argc, char **argv)
-   int hb_started = 0;
-   struct stat statbuf;
- 
-+  stackstr[0] = '\0';
-+
-   initialize_ocfs_error_table();
-   initialize_o2dl_error_table();
-   initialize_o2cb_error_table(

[yocto] [meta-cgl][PATCH] upgrade ocfs2-tools

2015-08-19 Thread Li xin
1.4.4 is not the newest version, and 1.6.4 is.
Reference: https://oss.oracle.com/projects/ocfs2-tools/files/source/

Li xin (1):
  ocfs2-tools: upgrade 1.4.3 -> 1.6.4

 ...ocfs2_controld-Makefile-fix-compile-error.patch | 62 --
 ...cfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch | 22 
 .../{ocfs2-tools_1.4.3.bb => ocfs2-tools_1.6.4.bb} | 15 +++---
 3 files changed, 8 insertions(+), 91 deletions(-)
 delete mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
 rename meta-cgl-common/recipes-cgl/ocfs2-tools/{ocfs2-tools_1.4.3.bb => 
ocfs2-tools_1.6.4.bb} (88%)

-- 
1.8.4.2

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


Re: [yocto] [meta-cgl][PATCH] ocfs2-tools: upgrade 1.4.3 -> 1.4.4

2015-08-19 Thread Li, Xin

>> --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
>> +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.4.bb
>> @@ -20,9 +20,10 @@ SRC_URI = " \
>>  file://o2cb.service \
>>  file://ocfs2.service \
>>  "
>> -SRC_URI[md5sum] = "296f1242f4d00d188231d726d7a1d148"
>> -SRC_URI[sha256sum] =
>"a809f03c62e515a4c23e98c4b4c3f8150377af2cf44cd2a2ee56e175b0e4d0b3"
>> -S = "${WORKDIR}/ocfs2-tools-ocfs2-tools-1.4.3"
>> +SRC_URI[md5sum] = "4a17530629bfea5a7517d1db466e32e1"
>> +SRC_URI[sha256sum] =
>"a9956f296443360cf66a7bf8298bfd82c51a8e37e569674c0afb9cfa18f68af5"
>
>Don't use unstable github archives which are regenerated from time to time.

OK
I will modify the SRC_URI, and Patch V2 will be sent.

Thanks
>
>> +
>> +S = "${WORKDIR}/${PN}-${PN}-${PV}"
>>  inherit autotools-brokensep pkgconfig  DEPENDS = "corosync openais
>> cluster-glue pacemaker libxml2 linux-libc-headers e2fsprogs"
>>  RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs
>chkconfig glib-2.0"
>> --
>> 1.8.4.2
>>
>> --
>> ___
>> yocto mailing list
>> yocto@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>
>--
>Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH] ocfs2-tools: upgrade 1.4.3 -> 1.4.4

2015-08-19 Thread Li xin
Signed-off-by: Li Xin 
---
 .../ocfs2-tools/{ocfs2-tools_1.4.3.bb => ocfs2-tools_1.4.4.bb} | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-cgl-common/recipes-cgl/ocfs2-tools/{ocfs2-tools_1.4.3.bb => 
ocfs2-tools_1.4.4.bb} (94%)

diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.4.bb
similarity index 94%
rename from meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
rename to meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.4.bb
index 1296fd6..84da217 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.4.bb
@@ -20,9 +20,10 @@ SRC_URI = " \
 file://o2cb.service \
 file://ocfs2.service \
 "
-SRC_URI[md5sum] = "296f1242f4d00d188231d726d7a1d148"
-SRC_URI[sha256sum] = 
"a809f03c62e515a4c23e98c4b4c3f8150377af2cf44cd2a2ee56e175b0e4d0b3"
-S = "${WORKDIR}/ocfs2-tools-ocfs2-tools-1.4.3"
+SRC_URI[md5sum] = "4a17530629bfea5a7517d1db466e32e1"
+SRC_URI[sha256sum] = 
"a9956f296443360cf66a7bf8298bfd82c51a8e37e569674c0afb9cfa18f68af5"
+
+S = "${WORKDIR}/${PN}-${PN}-${PV}"
 inherit autotools-brokensep pkgconfig
 DEPENDS = "corosync openais cluster-glue pacemaker libxml2 linux-libc-headers 
e2fsprogs"
 RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs 
chkconfig glib-2.0"
-- 
1.8.4.2

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH v2] cluster-glue: upgrade 1.0.5 -> 1.0.12

2015-08-18 Thread Li xin
* Add patch to aviod build Error and Warning.
  --0001-don-t-compile-doc-and-Error-Fix.patch
  --0001-ribcl.py.in-Warning-Fix.patch

* Dropped backported patch:
  --fix-const-cast.patch
  --glue-remove-getpid-check.patch
  --glue-repair-deprecated-glib-support.patch
  --glue-repair-libxml-support.patch

* Replace the hardcoded strings "/usr/lib" "/etc/" "/usr/sbin" "/usr/share"

Signed-off-by: Li Xin 
---
 .../0001-don-t-compile-doc-and-Error-Fix.patch |  50 ++
 .../0001-ribcl.py.in-Warning-Fix.patch |  34 +++
 .../cluster-glue/cluster-glue/fix-const-cast.patch | 103 -
 .../cluster-glue/glue-remove-getpid-check.patch|  31 ---
 .../glue-repair-deprecated-glib-support.patch  |  12 ---
 .../cluster-glue/glue-repair-libxml-support.patch  |  14 ---
 ...luster-glue_1.0.5.bb => cluster-glue_1.0.12.bb} |  76 ---
 7 files changed, 125 insertions(+), 195 deletions(-)
 create mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/fix-const-cast.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-remove-getpid-check.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-deprecated-glib-support.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-libxml-support.patch
 rename meta-cgl-common/recipes-cgl/cluster-glue/{cluster-glue_1.0.5.bb => 
cluster-glue_1.0.12.bb} (49%)

diff --git 
a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
new file mode 100644
index 000..471b1e4
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
@@ -0,0 +1,50 @@
+From b64b676f7abf896ca714341eb330099f2ff04213 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Tue, 18 Aug 2015 17:43:29 +0900
+Subject: [PATCH] don't compile doc and Error Fix
+
+| help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
+| make[2]: *** [lrmadmin.8] Error 1
+
+| make[2]: a2x: Command not found
+| /usr/bin/xsltproc \
+|   --xinclude \
+|   
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl 
ha_logd.xml
+| make[2]: *** [hb_report.8] Error 127
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ Makefile.am   | 2 +-
+ configure.ac  | 6 ++
+ lrm/admin/Makefile.am | 2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 93dbaf6..2f4d03b 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 
DRF/config-h.in \
+ DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
+ 
+ SUBDIRS   = include $(LIBLTDL_DIR) replace lib lrm logd \
+-hb_report doc config
++hb_report config
+ 
+ install-exec-local:
+   $(INSTALL) -d $(DESTDIR)/$(HA_COREDIR)
+diff --git a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am
+index a92cd72..ed938e0 100644
+--- a/lrm/admin/Makefile.am
 b/lrm/admin/Makefile.am
+@@ -36,5 +36,5 @@ man8_MANS =  $(sbin_PROGRAMS:%=%.8)
+ %.8:  %
+   echo Creating $@
+   chmod a+x $<
+-  help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA 
project" $(top_builddir)/lrm/admin/$<
++  help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA 
project" /usr/sbin/$<
+ endif
+-- 
+1.8.4.2
+
diff --git 
a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
new file mode 100644
index 000..31010d4
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
@@ -0,0 +1,34 @@
+From a2c66927b75547cee1db1340a67449ded0812df3 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Wed, 19 Aug 2015 11:13:46 +0900
+Subject: [PATCH] ribcl.py.in: Warning Fix
+
+WARNING: QA Issue: 
/usr/lib/stonith/plugins/stonith2/ribcl.py_cluster-glue-plugin-stonith2-ribcl
+contained in package cluster-glue-plugin-stonith2-ribcl requires 
/usr/local/bin/python,
+but no providers found in its RDEPENDS [file-rdeps]
+
+Add target python handling
+Allow the build to specify a path for the python instead of reusing
+the PYTHON variable which can lead to inconsistencies if we are cross
+compiling.
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ lib/plugins/stonith/ribcl.py.in | 2 +-
+ 1 file ch

Re: [yocto] [meta-cgl][PATCH] cluster-glue: upgrade 1.0.5 -> 1.0.12

2015-08-18 Thread Li, Xin
Hi,Jagadeesh,

Thanks a lot.

Patch V2 will be sent.

Regards,
Li
From: Jagadeesh Krishnanjanappa [mailto:jkrishnanjana...@mvista.com]
Sent: Wednesday, August 19, 2015 11:16 AM
To: Li, Xin/李 欣
Cc: yocto@yoctoproject.org
Subject: Re: [yocto] [meta-cgl][PATCH] cluster-glue: upgrade 1.0.5 -> 1.0.12

Hi Li,

-FILES_${PN}-dbg += "/usr/lib/heartbeat/.debug/"
+FILES_${PN}-dbg += "/usr/lib/heartbeat/.debug/ \
+   "
+FILES_${PN}-plugin-compress = "/usr/lib/heartbeat/plugins/compress/*.so"
+FILES_${PN}-plugin-compress-staticdev = 
"/usr/lib/heartbeat/plugins/compress/*.*a"
+FILES_${PN}-plugin-compress-dbg = "/usr/lib/heartbeat/plugins/compress/.debug/"

 FILES_${PN}-plugin-test = "/usr/lib/heartbeat/plugins/test/test.so"
 FILES_${PN}-plugin-test-staticdev = "/usr/lib/heartbeat/plugins/test/test.*a"

It would be useful to replace the hardcoded strings such as "/usr/lib" to 
${libdir} , in order to avoid QA warnings/errors which arise while buidling
cluster-glue for multilib or if BASELIB is set to other than "lib"

Example:
-- snip --
ERROR: QA Issue: cluster-glue: Files/directories were installed but not shipped
in any package:
  /usr/lib64/libstonith.so.1.0.0
  /usr/lib64/libplumb.so.2
  /usr/lib64/libpils.so.2
  /usr/lib64/libplumb.so.2.0.0
  /usr/lib64/libpils.so.2.0.0
  /usr/lib64/liblrm.so.2
  /usr/lib64/libstonith.so.1
  /usr/lib64/libplumbgpl.so.2
  /usr/lib64/libplumbgpl.so.2.0.0
  /usr/lib64/liblrm.so.2.0.0
-- CUT --

Also, If bitbake fails to find these files not being provided by
any RPMs/DPKs, then we get below error during do_rootfs;

-- snip --
ERROR: Unable to install packages. Command 
'/opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/smart --log-level=warning 
--data-dir=/opt/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/smart
 install -y cluster-glue@core2_64 run-postinsts@all 
packagegroup-core-boot@qemux86_64' returned 1:
Loading cache...
Updating cache...    [100%]

Computing transaction...error: Can't install 
cluster-glue-1.0.5-r0@core2_64<mailto:cluster-glue-1.0.5-r0@core2_64>: no
package provides libstonith.so.1()(64bit)
-- CUT --

Regards,
Jagadeesh

___
yocto mailing list
yocto@yoctoproject.org<mailto:yocto@yoctoproject.org>
https://lists.yoctoproject.org/listinfo/yocto

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH] heartbeat: upgrade 3.0.5 -> 3.0.6

2015-08-18 Thread Li xin
* Update configure.in-Error-and-warning-fix.patch,
  since the contents has been changed.

* Dropped ucast.c-fix-compile-errors.patch,it it not needed anymore.

Signed-off-by: Li Xin 
---
 .../configure.in-Error-and-warning-fix.patch   | 58 +++---
 .../heartbeat/ucast.c-fix-compile-errors.patch | 26 --
 .../{heartbeat_3.0.5.bb => heartbeat_3.0.6.bb} | 11 ++--
 3 files changed, 34 insertions(+), 61 deletions(-)
 delete mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/ucast.c-fix-compile-errors.patch
 rename meta-cgl-common/recipes-cgl/heartbeat/{heartbeat_3.0.5.bb => 
heartbeat_3.0.6.bb} (93%)

diff --git 
a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
 
b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
index f133d2b..5176b1f 100644
--- 
a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
+++ 
b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
@@ -1,6 +1,6 @@
-From e7c7e6abcfce50732a2d87b362b7bc797801ade7 Mon Sep 17 00:00:00 2001
+From 94f1c2081c0c3c507f292ed386ed8ed107bccc80 Mon Sep 17 00:00:00 2001
 From: Li xin 
-Date: Tue, 9 Dec 2014 17:56:50 +0900
+Date: Thu, 30 Jul 2015 21:25:33 +0900
 Subject: [PATCH] configure.in: Error and warning fix
 
 the error is "fatal error: ac_nonexistent.h: No such file or directory"
@@ -11,14 +11,14 @@ Upstream-Status: pending
 
 Signed-off-by: Li Xin 
 ---
- configure.in | 58 +-
- 1 file changed, 17 insertions(+), 41 deletions(-)
+ configure.ac | 53 -
+ 1 file changed, 16 insertions(+), 37 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 22cfda0..92c06de 100644
 a/configure.in
-+++ b/configure.in
-@@ -328,14 +328,12 @@ AC_MSG_RESULT($LibDirSuffix)
+diff --git a/configure.ac b/configure.ac
+index ab09b45..6fdd3f2 100644
+--- a/configure.ac
 b/configure.ac
+@@ -328,8 +328,7 @@ AC_MSG_RESULT($LibDirSuffix)
  case $libdir in
*/*${LibDirSuffix}) : Cool ;;
*)  : Uh Oh... 
@@ -26,16 +26,9 @@ index 22cfda0..92c06de 100644
 -  AC_MSG_WARN([Overriding libdir to: $libdir]);;
 +  AC_MSG_WARN([Prevent overriding]);;
  esac
- case $libexecdir in
-   */$LibDirSuffix): Cool ;;
-   *)  : Uh Oh... 
--  libexecdir=`dirname $libexecdir`/$LibDirSuffix
--  AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
-+  AC_MSG_WARN([Prevent overriding]);;
- esac
- 
  for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
-@@ -385,15 +383,8 @@ then
+   includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
+@@ -378,15 +377,8 @@ then
sleep $SNOOZING
  fi
  
@@ -47,26 +40,31 @@ index 22cfda0..92c06de 100644
 -   AC_MSG_FAILURE(Core development headers were not found)
 -fi
 -
--CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
+-CPPFLAGS="$CPPFLAGS -I${prefix}/include/heartbeat"
 +GLUE_HEADER=heartbeat/glue_config.h
 +CFLAGS="$CFLAGS -I${STAGING_DIR_TARGET}${prefix}/include/heartbeat"
  AC_CHECK_HEADERS(glue_config.h)
  if test "$ac_cv_header_glue_config_h" != "yes";  then
 AC_MSG_FAILURE(Core development headers were not found)
-@@ -417,10 +408,10 @@ HA_NOARCHDATAHBDIR="$HA_DATADIR/${HB_PKG}"
- AC_SUBST(HA_NOARCHDATAHBDIR)
+@@ -411,7 +403,7 @@ AC_SUBST(HA_NOARCHDATAHBDIR)
  AC_DEFINE_UNQUOTED(HA_NOARCHDATAHBDIR,"$HA_NOARCHDATAHBDIR", $HB_PKG noarch 
data directory)
  
+ 
 -HA_LIBHBDIR=`extract_header_define $GLUE_HEADER HA_LIBHBDIR`
 +HA_LIBHBDIR='/usr/lib/heartbeat'
  AC_SUBST(HA_LIBHBDIR)
+ if test x"$HA_LIBHBDIR" = x ; then
+ # see rhbz#805147 and
+@@ -430,7 +422,7 @@ AC_SUBST(CRM_DAEMON_DIR)
+ CRM_DAEMON_DIR="$libexecdir/pacemaker"
+ AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", pacemaker daemon 
directory)
  
 -HA_VARRUNDIR=`extract_header_define $GLUE_HEADER HA_VARRUNDIR`
 +HA_VARRUNDIR='/var/run'
  AC_SUBST(HA_VARRUNDIR)
  
  HA_VARRUNHBDIR="$HA_VARRUNDIR/${HB_PKG}"
-@@ -432,10 +423,10 @@ AC_SUBST(HA_VARRUNHBRSCDIR)
+@@ -442,10 +434,10 @@ AC_SUBST(HA_VARRUNHBRSCDIR)
  HA_VARLIBDIR="${localstatedir}/lib"
  AC_SUBST(HA_VARLIBDIR)
  
@@ -79,7 +77,7 @@ index 22cfda0..92c06de 100644
  AC_SUBST(HA_COREDIR)
  
  base_includedir="${includedir}"
-@@ -1740,10 +1731,10 @@ then
+@@ -1780,10 +1772,10 @@ then
IP2UTIL=/sbin/ip
  fi
  
@@ -92,9 +90,9 @@ index 22cfda0..92c06de 100644
  AC_SUBST(HA_APIGROUP)
  
  if
-@@ -1988,24 +1979,9 @@ AC_CHECK_HEADERS(evs.h, , [openais_installed="no"],)
- AC_CHECK_LIB(evs, evs_initialize , , [openais_installed="no"])
- AM_CONDITIONAL(BUILD_OPENAIS_MODULE, test "x${openais_installed}" = "xyes")
+@@ -2022,24 +201

[yocto] [meta-cgl][PATCH] cluster-glue: upgrade 1.0.5 -> 1.0.12

2015-08-18 Thread Li xin
* Add patch to aviod build Error and Warning.
  --0001-don-t-compile-doc-and-Error-Fix.patch
  --0001-ribcl.py.in-Warning-Fix.patch

* Dropped backported patch:
  --fix-const-cast.patch
  --glue-remove-getpid-check.patch
  --glue-repair-deprecated-glib-support.patch
  --glue-repair-libxml-support.patch

Signed-off-by: Li Xin 
---
 .../0001-don-t-compile-doc-and-Error-Fix.patch |  50 ++
 .../0001-ribcl.py.in-Warning-Fix.patch |  34 +++
 .../cluster-glue/cluster-glue/fix-const-cast.patch | 103 -
 .../cluster-glue/glue-remove-getpid-check.patch|  31 ---
 .../glue-repair-deprecated-glib-support.patch  |  12 ---
 .../cluster-glue/glue-repair-libxml-support.patch  |  14 ---
 ...luster-glue_1.0.5.bb => cluster-glue_1.0.12.bb} |  26 --
 7 files changed, 100 insertions(+), 170 deletions(-)
 create mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/fix-const-cast.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-remove-getpid-check.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-deprecated-glib-support.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/glue-repair-libxml-support.patch
 rename meta-cgl-common/recipes-cgl/cluster-glue/{cluster-glue_1.0.5.bb => 
cluster-glue_1.0.12.bb} (83%)

diff --git 
a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
new file mode 100644
index 000..471b1e4
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch
@@ -0,0 +1,50 @@
+From b64b676f7abf896ca714341eb330099f2ff04213 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Tue, 18 Aug 2015 17:43:29 +0900
+Subject: [PATCH] don't compile doc and Error Fix
+
+| help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
+| make[2]: *** [lrmadmin.8] Error 1
+
+| make[2]: a2x: Command not found
+| /usr/bin/xsltproc \
+|   --xinclude \
+|   
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl 
ha_logd.xml
+| make[2]: *** [hb_report.8] Error 127
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ Makefile.am   | 2 +-
+ configure.ac  | 6 ++
+ lrm/admin/Makefile.am | 2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 93dbaf6..2f4d03b 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure 
DRF/config-h.in \
+ DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
+ 
+ SUBDIRS   = include $(LIBLTDL_DIR) replace lib lrm logd \
+-hb_report doc config
++hb_report config
+ 
+ install-exec-local:
+   $(INSTALL) -d $(DESTDIR)/$(HA_COREDIR)
+diff --git a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am
+index a92cd72..ed938e0 100644
+--- a/lrm/admin/Makefile.am
 b/lrm/admin/Makefile.am
+@@ -36,5 +36,5 @@ man8_MANS =  $(sbin_PROGRAMS:%=%.8)
+ %.8:  %
+   echo Creating $@
+   chmod a+x $<
+-  help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA 
project" $(top_builddir)/lrm/admin/$<
++  help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA 
project" /usr/sbin/$<
+ endif
+-- 
+1.8.4.2
+
diff --git 
a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
new file mode 100644
index 000..31010d4
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch
@@ -0,0 +1,34 @@
+From a2c66927b75547cee1db1340a67449ded0812df3 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Wed, 19 Aug 2015 11:13:46 +0900
+Subject: [PATCH] ribcl.py.in: Warning Fix
+
+WARNING: QA Issue: 
/usr/lib/stonith/plugins/stonith2/ribcl.py_cluster-glue-plugin-stonith2-ribcl
+contained in package cluster-glue-plugin-stonith2-ribcl requires 
/usr/local/bin/python,
+but no providers found in its RDEPENDS [file-rdeps]
+
+Add target python handling
+Allow the build to specify a path for the python instead of reusing
+the PYTHON variable which can lead to inconsistencies if we are cross
+compiling.
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ lib/plugins/stonith/ribcl.py.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/plugins/stonith/ribcl.py.in b/lib/plugins/stonith/ribcl.py.in
+index 

[yocto] [meta-cgl][PATCH] pacemaker: upgrade 1.1.12 -> 1.1.13

2015-08-18 Thread Li xin
* update 0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
* Modify SRC_URI
* Warning Fix:
  WARNING: QA Issue: pacemaker: Files/directories were installed but not 
shipped in any package:
  /usr/lib/python2.7
  /usr/lib/python2.7/site-packages
  /usr/lib/python2.7/site-packages/cts
  /usr/lib/python2.7/site-packages/cts/watcher.py

Signed-off-by: Li Xin 
---
 ...earch-header-from-STAGING_INCDIR-to-walka.patch | 41 +-
 .../{pacemaker_1.1.12.bb => pacemaker_1.1.13.bb}   |  9 +++--
 2 files changed, 21 insertions(+), 29 deletions(-)
 rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.12.bb => 
pacemaker_1.1.13.bb} (92%)

diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
index 7e5f499..0831fda 100755
--- 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
+++ 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
@@ -1,8 +1,8 @@
-From 1fef2f6adaef3c56649adce4aca1b0ef2214c13b Mon Sep 17 00:00:00 2001
-From: Bian Naimeng 
-Date: Fri, 3 Jul 2015 15:55:52 +0900
-Subject: [PATCH 2/2] pacemaker: search header from STAGING_INCDIR to
- walkaround error
+From 6bb056aa8359e33f9b6f8974e2cc8b518ca9fe96 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Tue, 18 Aug 2015 12:34:32 +0900
+Subject: [PATCH] pacemaker: search header from STAGING_INCDIR to walkaround
+ error
 
  ** -I/usr/include/ is unsafe for cross-compilation
 
@@ -11,35 +11,28 @@ Subject: [PATCH 2/2] pacemaker: search header from 
STAGING_INCDIR to
  ** This autoconf log indicates errors, it looked at host include and/or 
library paths
  ** while determining system capabilities
 
+Upstream-Status: pending
+
 Signed-off-by: Bian Naimeng 
+Signed-off-by: Li Xin 
 ---
- configure.ac | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 25af918..4dee123 100644
+index 08b4611..6fcd1aa 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -451,7 +451,8 @@ case "$host_os" in
-   ;;
- *linux*)
-   AC_DEFINE_UNQUOTED(ON_LINUX, 1, Compiling for Linux platform)
--  CFLAGS="$CFLAGS -I${prefix}/include"
-+  CFLAGS="$CFLAGS -I${STAGING_INCDIR}"
-+  CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
-   ;;
- darwin*)
-   AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform)
-@@ -461,7 +462,8 @@ darwin*)
- esac
+@@ -463,7 +463,8 @@ esac
  
  dnl Eventually remove this
--CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
-+CFLAGS="$CFLAGS -I${STAGING_INCDIR}/heartbeat"
-+CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
+ if test "$cross_compiling" != "yes"; then
+-   CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
++   CFLAGS="$CFLAGS -I${STAGING_INCDIR}/heartbeat"
++   CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
+ fi
  
  AC_SUBST(INIT_EXT)
- AC_MSG_NOTICE(Host CPU: $host_cpu)
 -- 
 1.8.4.2
 
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.12.bb 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
similarity index 92%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.12.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
index 8c6e998..1806fe1 100755
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.12.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=6adca3b36477cc77e04376f9a40df32c \
"
 DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb 
python-native"
 
-SRC_URI = 
"https://codeload.github.com/ClusterLabs/${BPN}/tar.gz/Pacemaker-1.1.12;downloadfilename=${BPN}-${PV}.tar.gz
 \
+SRC_URI = "git://github.com/ClusterLabs/pacemaker.git \
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 \
@@ -23,13 +23,11 @@ SRC_URI = 
"https://codeload.github.com/ClusterLabs/${BPN}/tar.gz/Pacemaker-1.1.1
file://volatiles \
file://tmpfiles \
   "
-
-SRC_URI[md5sum] = "c5c28013efb08441ab74a12034d9e9b4"
-SRC_URI[sha256sum] = 
"f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c"
+SRCREV = "6052cd16c2f455809f8088af76ce86483bf98353"
 
 inherit autotools-brokensep pkgconfig systemd python-dir useradd
 
-S="${WORKD

Re: [yocto] USBmount and systemd-udev namespace conflict

2014-12-15 Thread Li, Xin
Hi,

This is my way to use udev to automount a usb driver, perhaps it can help you.


1.   Add udev rules.

root # cat /etc/udev/rules.d/10-udevtest.rules

KERNEL=="sda",ACTION=="add",OWNER:="udev",GROUP:="udevs"

2.   Add user and group.

root # useradd udev

root # groupadd udevs

3.   start the udev  service

 root # systemctl start systemd-udevd.service

root # ps aux | grep udev

root 21927  0.3  0.0  26140  1388 ?Ss   22:51   0:00 
/lib/systemd/systemd-udevd

4.   insert usb driver

5.   check

root # ls /dev/sda -al

brw-rw 1 udev udevs 8, 0 Sep 15 03:13 /dev/sda
-
Best regards,
Li

From: yocto-boun...@yoctoproject.org [mailto:yocto-boun...@yoctoproject.org] On 
Behalf Of Francois P. Gallichand
Sent: Tuesday, December 16, 2014 3:34 AM
To: yocto@yoctoproject.org
Subject: [yocto] USBmount and systemd-udev namespace conflict

Hello,

I need to automount a usb drive when it is plugged in. I found that the 
necessary udev rules are in the udev-extraconf package so I added that to my 
build. I tried it but it does not really work since when I insert the key, it 
is in fact mounted by udev but since the mount namespace of udev is private and 
not the same one as the shell I want to check if the key is mounted, I don’t 
see it. Is there a way to tell udev to mount using a global namespace so it can 
be seen be everybody?

Thanks.

François Gallichand
Engineer - Software Group
ABB Group
Analytical Business
(418)877-2944 x268

[ABB logo]

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH] ocfs2-tools: add new recipe

2014-12-12 Thread Li xin
Programs to manage the Ocfs2 cluster file system, including
mkfs.ocfs2,tunefs.ocfs2 and fsck.ocfs2

Signed-off-by: Li Xin 
---
 ...ocfs2_controld-Makefile-fix-compile-error.patch |  62 +++
 ...cfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch |  51 +++
 ...-vendor-common-o2cb.ocf-add-new-conf-file.patch | 478 +
 .../ocfs2-tools/ocfs2-tools/cluster.conf.sample|  10 +
 .../ocfs2-tools/ocfs2-tools/o2cb.service   |  12 +
 .../ocfs2-tools/ocfs2-tools/ocfs2.service  |  13 +
 .../recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb   |  77 
 7 files changed, 703 insertions(+)
 create mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/cluster.conf.sample
 create mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/o2cb.service
 create mode 100644 
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2.service
 create mode 100644 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.4.3.bb

diff --git 
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
new file mode 100644
index 000..c30f38f
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-ocfs2_controld-Makefile-fix-compile-error.patch
@@ -0,0 +1,62 @@
+From 865444fb9ecfe5b0050075f986a328701aa3d580 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Fri, 12 Dec 2014 16:11:43 +0900
+Subject: [PATCH 1/3] ocfs2_controld/Makefile: fix compile error
+
+ERROR: This autoconf log indicates errors, it looked at host
+include and/or library paths while determining system capabilities.
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ ocfs2_controld/Makefile| 4 ++--
+ ocfs2_controld/pacemaker.c | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/ocfs2_controld/Makefile b/ocfs2_controld/Makefile
+index 52aa493..b530d72 100644
+--- a/ocfs2_controld/Makefile
 b/ocfs2_controld/Makefile
+@@ -17,7 +17,7 @@ SBIN_PROGRAMS += ocfs2_controld.pcmk
+ PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ 
$(GLIB_CFLAGS)
+ endif
+ 
+-INCLUDES = -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
++INCLUDES = -I/usr/include/libxml2 -I$(TOPDIR)/include -I. $(PCMK_INCLUDES)
+ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
+ LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
+ LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+@@ -67,7 +67,7 @@ DIST_FILES = \
+ ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS)
+   $(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \
+   $(OPENAIS_LIBS) $(COROSYNC_LIBS) \
+-  $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd
++  $(DLMCONTROL_LIBS) -lcrmcluster -lcrmcommon
+ 
+ ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS)
+   $(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \
+diff --git a/ocfs2_controld/pacemaker.c b/ocfs2_controld/pacemaker.c
+index 8df1052..1361b13 100644
+--- a/ocfs2_controld/pacemaker.c
 b/ocfs2_controld/pacemaker.c
+@@ -22,6 +22,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ /* heartbeat support is irrelevant here */
+ #undef SUPPORT_HEARTBEAT
+@@ -155,7 +156,7 @@ int setup_stack(void)
+   crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
+ 
+   if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, 
&our_nodeid) == FALSE) {
+-  log_error("Connection to our AIS plugin (%d) failed", 
CRM_SERVICE);
++  log_error("Connection to our AIS plugin (%d) failed", 
PCMK_SERVICE);
+   return -1;
+   }
+ 
+-- 
+1.8.4.2
+
diff --git 
a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
new file mode 100644
index 000..799eb45
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0002-ocfs2_fs.h-mount.ocfs2.c-fix-compile-error.patch
@@ -0,0 +1,51 @@
+From 507f5cf55e25fd12d138cc28eb061c7e0b8615b8 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Fri, 12 Dec 2014 16:14:10 +0900
+Subject: [PATCH 2/3] ocfs2_fs.h mount.ocfs2.c: fix compile error
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ include/ocfs2-kernel/ocfs2_fs.h | 2 +-
+ mount.ocfs2/mount.ocfs2.c   | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/ocfs2-kernel/ocfs2_fs.h b/include/ocfs2-kernel/ocfs2_fs.h
+index 2140bb

[yocto] [meta-cgl][PATCH 2/2] pacemaker: upgrade to version 1.1.4

2014-12-11 Thread Li xin
Signed-off-by: Li Xin 
---
 .../pacemaker/files/kill-stack-protector.patch |  12 --
 .../pacemaker-remove-ptest-functionality.patch |  29 -
 .../recipes-cgl/pacemaker/files/volatiles  |   5 -
 .../pacemaker-1.0.9.1/fix-header-defs-lookup.patch |  16 ---
 .../pacemaker-dont-use-help2man.patch  |  16 ---
 .../pacemaker-remove-native-includes.patch |  22 
 .../pacemaker/0001-configure.ac-error-fix.patch|  59 ++
 .../pacemaker/0002-Makefile.am-error-fix.patch | 130 +
 .../recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb |  83 -
 .../recipes-cgl/pacemaker/pacemaker_1.1.4.bb   |  84 +
 10 files changed, 273 insertions(+), 183 deletions(-)
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/files/kill-stack-protector.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/files/pacemaker-remove-ptest-functionality.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-configure.ac-error-fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-Makefile.am-error-fix.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
 create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.4.bb

diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/files/kill-stack-protector.patch 
b/meta-cgl-common/recipes-cgl/pacemaker/files/kill-stack-protector.patch
deleted file mode 100644
index a9f5b83..000
--- a/meta-cgl-common/recipes-cgl/pacemaker/files/kill-stack-protector.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Pacemaker-1-0-Pacemaker-1.0.8/configure.ac
-===
 Pacemaker-1-0-Pacemaker-1.0.8.orig/configure.ac2010-05-06 
13:43:17.0 +0400
-+++ Pacemaker-1-0-Pacemaker-1.0.8/configure.ac 2010-05-06 13:43:20.0 
+0400
-@@ -1302,7 +1302,6 @@
- 
-   # We had to eliminate -Wnested-externs because of libtool changes
- EXTRA_FLAGS="-fgnu89-inline
--  -fstack-protector-all
-   -Wall
-   -Waggregate-return
-   -Wbad-function-cast 
diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/files/pacemaker-remove-ptest-functionality.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/files/pacemaker-remove-ptest-functionality.patch
deleted file mode 100644
index fee2e02..000
--- 
a/meta-cgl-common/recipes-cgl/pacemaker/files/pacemaker-remove-ptest-functionality.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur a/pengine/Makefile.am b/pengine/Makefile.am
 a/pengine/Makefile.am  2014-07-23 13:24:08.887745910 +0200
-+++ b/pengine/Makefile.am  2014-07-23 13:28:22.704843745 +0200
-@@ -42,12 +42,9 @@
- 
- ## binary progs
- halib_PROGRAMS= pengine
--sbin_PROGRAMS = ptest
- 
- if BUILD_HELP
--man8_MANS =   ptest.8
--%.8:  %
--  help2man --output $@ --no-info --section 8 --name "Part of the 
Pacemaker cluster resource manager" $(top_builddir)/pengine/$<
-+## removed the ptest functionality
- endif
- 
- ## SOURCES
-@@ -64,11 +61,6 @@
- # libcib for get_object_root()
- # $(top_builddir)/lib/hbclient/libhbclient.la
- 
--ptest_SOURCES = ptest.c 
--ptest_LDADD   = $(COMMONLIBS) \
--  $(top_builddir)/lib/cib/libcib.la   \
--  $(top_builddir)/lib/transition/libtransitioner.la
--
- install-exec-local:
-   $(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
-   -chown $(CRM_DAEMON_USER) $(DESTDIR)/$(PE_STATE_DIR)
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles 
b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
deleted file mode 100644
index 9ad1434..000
--- a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
+++ /dev/null
@@ -1,5 +0,0 @@
-d hacluster haclient 0750 /var/lib/heartbeat/crm none
-d hacluster haclient 0755 /var/lib/pengine none
-d hacluster haclient 0755 /var/run/heartbeat none
-d hacluster haclient 0755 /var/run/heartbeat/rsctmp none
-d hacluster haclient 0755 /var/run/crm none
diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch
deleted file mode 100644
index 02ce26e..000
--- 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: Pacemaker-1-0-Pacemaker-

[yocto] [meta-cgl][PATCH 1/2] heartbeat: add new recipe

2014-12-11 Thread Li xin
Messaging and membership subsystem for High-Availability Linux.

Signed-off-by: Li Xin 
---
 .../Makefile.am-not-chgrp-in-cross-compile.patch   |  41 ++
 .../configure.in-Error-and-warning-fix.patch   | 157 +
 ...beat-init.d-heartbeat.in-modify-parameter.patch |  27 
 .../heartbeat/heartbeat/heartbeat.service  |  10 ++
 .../membership-ccm-Makefile.am-fix-warning.patch   |  30 
 .../heartbeat/ucast.c-fix-compile-errors.patch |  26 
 .../recipes-cgl/heartbeat/heartbeat_3.0.5.bb   | 123 
 7 files changed, 414 insertions(+)
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/Makefile.am-not-chgrp-in-cross-compile.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat-init.d-heartbeat.in-modify-parameter.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat.service
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/membership-ccm-Makefile.am-fix-warning.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/ucast.c-fix-compile-errors.patch
 create mode 100644 meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb

diff --git 
a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/Makefile.am-not-chgrp-in-cross-compile.patch
 
b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/Makefile.am-not-chgrp-in-cross-compile.patch
new file mode 100644
index 000..4980c18
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/Makefile.am-not-chgrp-in-cross-compile.patch
@@ -0,0 +1,41 @@
+From 772da3c3bbb3eeca6f2ef92715c350f6bf0f8515 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Tue, 9 Dec 2014 18:36:16 +0900
+Subject: [PATCH 2/2] Makefile.am: not chgrp in cross compile
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ membership/ccm/Makefile.am | 2 --
+ tools/Makefile.am  | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/membership/ccm/Makefile.am b/membership/ccm/Makefile.am
+index 2a89de1..1b69c9c 100644
+--- a/membership/ccm/Makefile.am
 b/membership/ccm/Makefile.am
+@@ -108,8 +108,6 @@ clmtest_LDADD  = libclm.la libccmclient.la \
+ # additional installations not covered normally
+ install-exec-local:
+   $(mkinstalldirs) $(DESTDIR)$(ccmdir)
+-  -chgrp $(apigid) $(DESTDIR)/$(ccmdir)
+-  -chown $(ccmuid) $(DESTDIR)/$(ccmdir)
+   chmod 750 $(DESTDIR)/$(ccmdir)
+ 
+ 
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 4e57de7..05d1253 100644
+--- a/tools/Makefile.am
 b/tools/Makefile.am
+@@ -47,7 +47,6 @@ cl_respawn_LDADD = -lplumb   \
+ $(top_builddir)/replace/libreplace.la
+ 
+ install-data-hook:# install-exec-hook doesn't work (!)
+-  -chgrp $(apigid) $(DESTDIR)/$(habindir)/cl_status
+   -chmod g+s,a-w $(DESTDIR)/$(habindir)/cl_status
+ 
+ .PHONY: install-exec-hook
+-- 
+1.8.4.2
+
diff --git 
a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
 
b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
new file mode 100644
index 000..f133d2b
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
@@ -0,0 +1,157 @@
+From e7c7e6abcfce50732a2d87b362b7bc797801ade7 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Tue, 9 Dec 2014 17:56:50 +0900
+Subject: [PATCH] configure.in: Error and warning fix
+
+the error is "fatal error: ac_nonexistent.h: No such file or directory"
+the warning is "The compile log indicates that host include and/or
+library paths were used"
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ configure.in | 58 +-
+ 1 file changed, 17 insertions(+), 41 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 22cfda0..92c06de 100644
+--- a/configure.in
 b/configure.in
+@@ -328,14 +328,12 @@ AC_MSG_RESULT($LibDirSuffix)
+ case $libdir in
+   */*${LibDirSuffix}) : Cool ;;
+   *)  : Uh Oh... 
+-  libdir=`dirname $libdir`/$LibDirSuffix
+-  AC_MSG_WARN([Overriding libdir to: $libdir]);;
++  AC_MSG_WARN([Prevent overriding]);;
+ esac
+ case $libexecdir in
+   */$LibDirSuffix): Cool ;;
+   *)  : Uh Oh... 
+-  libexecdir=`dirname $libexecdir`/$LibDirSuffix
+-  AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
++  AC_MSG_WARN([Prevent overriding]);;
+ esac
+ 
+ for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
+@@ -385,15 +383,8 @@ then
+   sleep $SNOOZING
+ fi
+ 
+-AC_CHECK_HEADERS(heartbeat/glue_config.h)
+-GLUE_HEADER=none
+-if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
+-   GLUE_HEADER=heartbeat/glue_config.h
+-else
+-   AC_MSG_FAILURE(

[yocto] [meta-cgl][PATCH 0/2] pacemaker: upgrade to 1.1.4

2014-12-11 Thread Li xin
patch-1/2 is pacemaker's new depends.
patch-2/2 is upgrade pacemaker to 1.1.4.

Signed-off-by: Li Xin 
Li xin (2):
  heartbeat: add new recipe
  pacemaker: upgrade to version 1.1.4

 .../Makefile.am-not-chgrp-in-cross-compile.patch   |  41 ++
 .../configure.in-Error-and-warning-fix.patch   | 157 +
 ...beat-init.d-heartbeat.in-modify-parameter.patch |  27 
 .../heartbeat/heartbeat/heartbeat.service  |  10 ++
 .../membership-ccm-Makefile.am-fix-warning.patch   |  30 
 .../heartbeat/ucast.c-fix-compile-errors.patch |  26 
 .../recipes-cgl/heartbeat/heartbeat_3.0.5.bb   | 123 
 .../pacemaker/files/kill-stack-protector.patch |  12 --
 .../pacemaker-remove-ptest-functionality.patch |  29 
 .../recipes-cgl/pacemaker/files/volatiles  |   5 -
 .../pacemaker-1.0.9.1/fix-header-defs-lookup.patch |  16 ---
 .../pacemaker-dont-use-help2man.patch  |  16 ---
 .../pacemaker-remove-native-includes.patch |  22 ---
 .../pacemaker/0001-configure.ac-error-fix.patch|  59 
 .../pacemaker/0002-Makefile.am-error-fix.patch | 130 +
 .../recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb |  83 ---
 .../recipes-cgl/pacemaker/pacemaker_1.1.4.bb   |  84 +++
 17 files changed, 687 insertions(+), 183 deletions(-)
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/Makefile.am-not-chgrp-in-cross-compile.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/configure.in-Error-and-warning-fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat-init.d-heartbeat.in-modify-parameter.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/heartbeat.service
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/membership-ccm-Makefile.am-fix-warning.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/heartbeat/heartbeat/ucast.c-fix-compile-errors.patch
 create mode 100644 meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.5.bb
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/files/kill-stack-protector.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/files/pacemaker-remove-ptest-functionality.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/fix-header-defs-lookup.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-dont-use-help2man.patch
 delete mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker-1.0.9.1/pacemaker-remove-native-includes.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-configure.ac-error-fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-Makefile.am-error-fix.patch
 delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.0.9.1.bb
 create mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.4.bb

-- 
1.8.4.2

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH] samhain: add new recipe

2014-12-10 Thread Li xin
Samhain is an open source file integrity and intrusion detection
system for Unix that uses cryptographic checksums of files to
detect modifications, and allows you to trace: what changes have
occured in your system, when these changes have occured, and who
was logged into the system at the respective time.

Signed-off-by: Li Xin 
---
 .../samhain/0001-Makefile.in-error-fix.patch   | 31 
 .../samhain/samhain/config-site.samhain-3.1.3  |  2 +
 .../recipes-cgl/samhain/samhain_3.1.3.bb   | 58 ++
 3 files changed, 91 insertions(+)
 create mode 100644 
meta-cgl-common/recipes-cgl/samhain/samhain/0001-Makefile.in-error-fix.patch
 create mode 100644 
meta-cgl-common/recipes-cgl/samhain/samhain/config-site.samhain-3.1.3
 create mode 100644 meta-cgl-common/recipes-cgl/samhain/samhain_3.1.3.bb

diff --git 
a/meta-cgl-common/recipes-cgl/samhain/samhain/0001-Makefile.in-error-fix.patch 
b/meta-cgl-common/recipes-cgl/samhain/samhain/0001-Makefile.in-error-fix.patch
new file mode 100644
index 000..cd646f6
--- /dev/null
+++ 
b/meta-cgl-common/recipes-cgl/samhain/samhain/0001-Makefile.in-error-fix.patch
@@ -0,0 +1,31 @@
+From a9ce38c56bf7072f292d685a48b912e6e59260a6 Mon Sep 17 00:00:00 2001
+From: Li xin 
+Date: Wed, 10 Dec 2014 14:45:28 +0900
+Subject: [PATCH] Makefile.in: error fix
+
+error:File '/usr/sbin/samhain' from samhain was already stripped,
+this will prevent future debugging!
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin 
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b1904d9..000de49 100644
+--- a/Makefile.in
 b/Makefile.in
+@@ -54,7 +54,7 @@ selectconfig = @selectconfig@
+ top_builddir = .
+ 
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL@ -s -m 700
++INSTALL_PROGRAM = @INSTALL@ -m 700
+ INSTALL_SHELL = @INSTALL@ -m 700
+ INSTALL_DATA = @INSTALL@ -m 600
+ INSTALL_MAN = @INSTALL@ -m 644
+-- 
+1.8.4.2
+
diff --git 
a/meta-cgl-common/recipes-cgl/samhain/samhain/config-site.samhain-3.1.3 
b/meta-cgl-common/recipes-cgl/samhain/samhain/config-site.samhain-3.1.3
new file mode 100644
index 000..2ce3769
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/samhain/samhain/config-site.samhain-3.1.3
@@ -0,0 +1,2 @@
+ssp_cv_lib=no
+sh_cv_va_copy=yes
diff --git a/meta-cgl-common/recipes-cgl/samhain/samhain_3.1.3.bb 
b/meta-cgl-common/recipes-cgl/samhain/samhain_3.1.3.bb
new file mode 100644
index 000..22c8577
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/samhain/samhain_3.1.3.bb
@@ -0,0 +1,58 @@
+SUMMARY = "File Integrity and Intrusion Detection System"
+DESCRIPTION = "Samhain is an open source file integrity and intrusion 
detection \
+system for Unix that uses cryptographic checksums of files to \
+detect modifications, and allows you to trace: what changes have \
+occured in your system, when these changes have occured, and who \
+was logged into the system at the respective time."
+
+HOMEPAGE = "http://la-samhna.de/samhain/";
+SECTION = "Filesystem"
+
+SRC_URI = 
"http://la-samhna.de/samhain/samhain-current.tar.gz;extract=samhain-3.1.3.tar.gz
 \
+   file://0001-Makefile.in-error-fix.patch"
+SRC_URI[md5sum] = "64572a4dbfdc8065d6e9f7ca0eab0a34"
+SRC_URI[sha256sum] = 
"c234afaf9ba3c6b7d240858b74423f935185de66e996405b3016ec4a288a7e1e"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
+
+DEPENDS = "libpthread-stubs acl zlib attr"
+inherit autotools-brokensep pkgconfig
+
+do_unpack2() {
+cd ${WORKDIR}
+tar zxvf ${PN}-${PV}.tar.gz
+}
+
+S = "${WORKDIR}/${BP}"
+
+addtask unpack2 after do_unpack before do_patch
+do_configure() {
+export CONFIG_SITE=./config-site.${BP}
+./configure \
+--host=${HOST_SYS} \
+--build=${BUILD_SYS} \
+--prefix=${prefix} \
+--sbindir=${sbindir} \
+--mandir=${mandir} \
+--sysconfdir=${sysconfdir} \
+--localstatedir=${localstatedir} \
+--with-config-file=/etc/samhain/samhainrc \
+--with-state-dir=/var/samhain \
+--with-html-file=/var/samhain/samhain.html \
+--with-data-file=/var/samhain/samhain.data \
+--with-pid-file=/var/samhain/samhain.pid \
+--with-log-file=/var/samhain/samhain.log \
+--enable-login-watch \
+--disable-khide \
+--enable-suidcheck \
+--with-trusted=0
+}
+
+do_install() {
+install -d -m 755 ${D}/var/samhain
+install -d  ${D}/${mandir}
+oe_runmake DESTDIR=${D} install-program install-man install-data
+chmod -R a+r ${D}/${mandir}
+install -d ${D}/etc/samhain
+install -c -m 644  samhainrc.linux ${D}/etc/samhain/samhainrc
+}
-- 
1.8.4.2

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] [meta-cgl][PATCH] openais: upgrade to 1.1.4

2014-12-08 Thread Li xin
Signed-off-by: Li Xin 
---
 meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb | 18 --
 meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb | 16 
 2 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb
 create mode 100644 meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb

diff --git a/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb 
b/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb
deleted file mode 100644
index 2a03b9a..000
--- a/meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Implementation of the Service Availability Forum Application 
Interface Specification (AIS)"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4cb00dd52a063edbece6ae248a2ba663"
-DEPENDS = "cluster-glue corosync"
-
-#  ftp://f...@openais.org/downloads/openais-${PV}/openais-${PV}.tar.gz
-
-SRC_URI = " \
-   ftp://f...@tux.rainside.sk/gentoo/distfiles/openais-${PV}.tar.gz \
-   file://fix-lcrso-linkage.patch \
-file://build-cleanup-configure-ac.patch \
-   "
-SRC_URI[md5sum] = "13d8d590f806fb396d750b086c6c0b78"
-SRC_URI[sha256sum] = 
"eeef58dd2df3eb16ba68b3fbdc6f0d4dfb537443f1c091ec6f0431594f2f00b6"
-
-inherit autotools pkgconfig
-
-FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug"
diff --git a/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb 
b/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
new file mode 100644
index 000..23d704d
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Implementation of the Service Availability Forum Application 
Interface Specification (AIS)"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4cb00dd52a063edbece6ae248a2ba663"
+DEPENDS = "cluster-glue corosync"
+
+SRC_URI = "ftp://f...@tux.rainside.sk/gentoo/distfiles/${BP}.tar.gz \
+file://fix-lcrso-linkage.patch \
+file://build-cleanup-configure-ac.patch \
+   "
+SRC_URI[md5sum] = "e500ad3c49fdc45d8653f864e80ed82c"
+SRC_URI[sha256sum] = 
"974b4959f3c401c16156dab31e65a6d45bbf84dd85a88c2a362712e738c06934"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = '--with-initddir=/etc/init.d'
+FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug"
-- 
1.8.4.2

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


[yocto] Luajit Compile Error

2014-10-29 Thread Li, Xin
Hi,

I include luajit package from the meta-embedded and compile it.
My build system is CentOS(64 bit).
when I compile for the target(64 bit),It is OK,with no errors.
But when I compile for the target(32 bit),it has the following errors.

If you know the solution, please help me!

Thank you&Best regards
Li Xin

--
$ cat tmp/work/i586-poky-linux/luajit/2.0.3-r0/temp/log.do_compile
DEBUG: Executing shell function do_compile
NOTE: make -j 10 CROSS=i586-poky-linux- TARGET_CFLAGS= 
--sysroot=/yocto/work001/fnst/lixin/poky/build.x86/tmp/sysroots/qemux86  -m32 
-march=i586 TARGET_LDFLAGS= 
--sysroot=/yocto/work001/fnst/lixin/poky/build.x86/tmp/sysroots/qemux86 
TARGET_SHLDFLAGS= 
--sysroot=/yocto/work001/fnst/lixin/poky/build.x86/tmp/sysroots/qemux86 
HOST_CC=gcc  -m32
 Building LuaJIT 2.0.3 
make -C src
make[1]: Entering directory 
`/yocto/work001/fnst/lixin/poky/build.x86/tmp/work/i586-poky-linux/luajit/2.0.3-r0/LuaJIT-2.0.3/src'
BUILDVM   lj_vm.s
Error: pointer size mismatch in cross-build.
BUILDVM   lj_ffdef.h
Try: make HOST_CC="gcc -m32" CROSS=...

BUILDVM   lj_bcdef.h
make[1]: *** [lj_vm.s] Error 1
make[1]: *** Waiting for unfinished jobsError: pointer size mismatch in 
cross-build.
Try: make HOST_CC="gcc -m32" CROSS=...


make[1]: *** [lj_ffdef.h] Error 1
Error: pointer size mismatch in cross-build.
Try: make HOST_CC="gcc -m32" CROSS=...

make[1]: *** [lj_bcdef.h] Error 1
make[1]: Leaving directory 
`/yocto/work001/fnst/lixin/poky/build.x86/tmp/work/i586-poky-linux/luajit/2.0.3-r0/LuaJIT-2.0.3/src'
make: *** [default] Error 2
ERROR: oe_runmake failed



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


Re: [yocto] Luajit Compile Error

2014-10-28 Thread Li, Xin
Hi,

Indeed,there is a luajit recipe in meta-oe.
You can have a look at: http://layers.openembedded.org/layerindex/recipe/4918/.

Best Regards,
Li Xin


From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Tuesday, October 28, 2014 3:48 PM
To: neil...@emerson.com
Cc: Li, Xin/李 欣; yocto@yoctoproject.org
Subject: Re: [yocto] Luajit Compile Error

Hi,

It's probably a good idea to put this somewhere public, like a new layer on eg 
github, or add it to meta-oe.  Before then, I've some comments on your recipe:

On 28 October 2014 01:40, mailto:neil...@emerson.com>> 
wrote:
FILESEXTRAPATHS_prepend  := "${THISDIR}/${PN}:"
#FILESPATH := "${THISDIR}/${PN}"

You don't need to do this.

FILES_${PN} += "/usr/share/* \
/usr/include/* \
/usr/share/lua/* \
/usr/share/luajit-2.0.2/* \
/usr/share/man/* \
/usr/share/lua/5.1/* \
/usr/lib/* \
/usr/bin/*"

Don't put headers into $PN.  The default FILES_${PN} covers most of those paths 
too.

S = "${WORKDIR}/${PN}-${PV}"

This is the default value.

PARALLEL_MAKEINST="PREFIX=${D}/usr"
PARALLEL_MAKE="'PREFIX=${D}' 'CROSS=${TARGET_SYS}-'  'TARGET_SYS=Linux' "

PARALLEL_MAKE* are specifically for parallelism arguments to make (_MAKE for 
build time, _MAKEINST for make install time).  Set all of these in EXTRA_OEMAKE 
and it will get added passed automatically when you call oe_runmake.  Does it 
really need different values for PREFIX at build and install time?

Ross
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto


Re: [yocto] Luajit Compile Error

2014-10-26 Thread Li, Xin
Hi,

I also build the package luajit ,but it has the following errors.
Can someone help me?

Thanks.

---
[lixin@ubinux-yocto-15 temp]$ cat log.do_compile.14752
DEBUG: Executing shell function do_compile
NOTE: make -j 10 CROSS=i586-poky-linux- TARGET_CFLAGS= 
--sysroot=/yocto/work001/fnst/lixin/poky/build.x86/tmp/sysroots/qemux86  -m32 
-march=i586 TARGET_LDFLAGS= 
--sysroot=/yocto/work001/fnst/lixin/poky/build.x86/tmp/sysroots/qemux86 
TARGET_SHLDFLAGS= 
--sysroot=/yocto/work001/fnst/lixin/poky/build.x86/tmp/sysroots/qemux86 
HOST_CC=gcc  -m32
 Building LuaJIT 2.0.3 
make -C src
make[1]: Entering directory 
`/yocto/work001/fnst/lixin/poky/build.x86/tmp/work/i586-poky-linux/luajit/2.0.3-r0/LuaJIT-2.0.3/src'
BUILDVM   lj_vm.s
BUILDVM   lj_ffdef.h
BUILDVM   lj_bcdef.h
Error: pointer size mismatch in cross-build.
Try: make HOST_CC="gcc -m32" CROSS=...

make[1]: *** [lj_vm.s] Error 1
Error: pointer size mismatch in cross-build.
Try: make HOST_CC="gcc -m32" CROSS=...

make[1]: *** Waiting for unfinished jobs
make[1]: *** [lj_ffdef.h] Error 1
Error: pointer size mismatch in cross-build.
Try: make HOST_CC="gcc -m32" CROSS=...

make[1]: *** [lj_bcdef.h] Error 1
make[1]: Leaving directory 
`/yocto/work001/fnst/lixin/poky/build.x86/tmp/work/i586-poky-linux/luajit/2.0.3-r0/LuaJIT-2.0.3/src'
make: *** [default] Error 2
ERROR: oe_runmake failed
WARNING: 
/yocto/work001/fnst/lixin/poky/build.x86/tmp/work/i586-poky-linux/luajit/2.0.3-r0/temp/run.do_compile.14752:1
 exit 1 from
  exit 1
ERROR: Function failed: do_compile (log file is located at 
/yocto/work001/fnst/lixin/poky/build.x86/tmp/work/i586-poky-linux/luajit/2.0.3-r0/temp/log.do_compile.14752)
[lixin@ubinux-yocto-15 temp]$
--





> -Original Message-
> From: yocto-boun...@yoctoproject.org [mailto:yocto-boun...@yoctoproject.org]
> On Behalf Of Albert K
> Sent: Monday, September 29, 2014 1:34 PM
> To: Khem Raj
> Cc: yocto@yoctoproject.org
> Subject: Re: [yocto] Luajit Compile Error
> 
> Dear Sir,
> 
> Thanks a million.   Adding the gcc-multilib to the build host did the
> trick.  Works like a charm.  Thanks again.
> 
> On Mon, Sep 29, 2014 at 12:57 PM, Khem Raj  wrote:
> > On Sun, Sep 28, 2014 at 7:22 PM, Albert K  wrote:
> >> Dear all,
> >>
> >> I am getting error when i include luajit package from the
> >> meta-embedded and this is build from the core-image-minimal
> >> layer(yocto daisy).  Can someone help to point me the right direction
> >> for fixing the compile error as show below?  Thanks.
> >>
> >
> > its expecting 32bit gcc to be available on your build host. So install
> > gcc-multilib on build machine and it should go on.
> >
> >>
> >> yocto@ubuntu-yocto:/yocto/poky/build/tmp/work/i586-poky-linux/luajit/
> >> 2.0.2-r0/temp$
> >> cat log.do_compile.16806
> >> DEBUG: Executing shell function do_compile
> >> NOTE: make -j 4 CROSS=i586-poky-linux- TARGET_CFLAGS=
> >> --sysroot=/yocto/poky/build/tmp/sysroots/qemux86 TARGET_LDFLAGS=
> >> --sysroot=/yocto/poky/build/tmp/sysroots/qemux86 TARGET_SHLDFLAGS=
> >> --sysroot=/yocto/poky/build/tmp/sysroots/qemux86 HOST_CC=gcc  -m32
> >>  Building LuaJIT 2.0.2  make -C src
> >> make[1]: Entering directory
> >> `/yocto/poky/build/tmp/work/i586-poky-linux/luajit/2.0.2-r0/LuaJIT-2.0.2/src'
> >> HOSTCChost/minilua.o
> >> HOSTCChost/buildvm_asm.o
> >> HOSTCChost/buildvm_peobj.o
> >> HOSTCChost/buildvm_lib.o
> >> In file included from host/buildvm_peobj.c:9:0:
> >> host/buildvm.h:9:23: fatal error: sys/types.h: No such file or
> >> directory  #include 
> >>^
> >> In file included from host/buildvm_asm.c:6:0:
> >> host/buildvm.h:9:23: fatal error: sys/types.h: No such file or
> >> directory  #include 
> >>^
> >> compilation terminated.
> >> In file included from host/buildvm_lib.c:6:0:
> >> host/buildvm.h:9:23: fatal error: sys/types.h: No such file or
> >> directory  #include 
> >>^
> >> compilation terminated.
> >> compilation terminated.
> >> make[1]: *** [host/buildvm_asm.o] Error 1
> >> make[1]: *** Waiting for unfinished jobs
> >> make[1]: *** [host/buildvm_peobj.o] Error 1
> >> make[1]: *** [host/buildvm_lib.o] Error 1 In file included from
> >> /usr/include/limits.h:25:0,
> >>  from
> >> /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h:168,
> >>  from
> >> /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/syslimits.h:7,
> >>  from
> >> /usr/lib/gcc/x86_64-linux-gnu/4.8/include-fixed/limits.h:34,
> >>  from host/minilua.c:32:
> >> /usr/include/features.h:374:25: fatal error: sys/cdefs.h: No such
> >> file or directory  #  include 
> >>  ^
> >> compilation terminated.
> >> make[1]: *** [host/minilua.o] Error 1
> >> make[1]: Leaving directory
> >> `/yocto/