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

[Adrian Dudau]

On mån, 2015-12-14 at 12:05 +0300, Li Xin wrote:
> * 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.

Hi Li,

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?

--Adrian

> 
> Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
> ---
>  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
> 
> 
>