Applying: Fw: [yocto] [meta-cgl][PATCH] openais: upgrade to 1.1.4 error: patch failed: meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb:1 error: meta-cgl-common/recipes-cgl/openais/openais_1.1.3.bb: patch does not apply Patch failed at 0001 Fw: [yocto] [meta-cgl][PATCH] openais: upgrade to 1.1.4 The copy of the patch that failed is found in: /media/sdd1/fb/alvd/cgl-activities/temp/private/meta-cgl/.git/rebase-apply/patch There is a problem with this patch. Would you be able to help redo it? Thanks, Alex Vaduva From: Alexandru Vaduva [mailto:vaduvajanalexandru@yahoo.com] Sent: Monday, December 08, 2014 6:18 PM To: Alexandru Vaduva Subject: Fw: [yocto] [meta-cgl][PATCH] openais: upgrade to 1.1.4 On Monday, December 8, 2014 12:35 PM, Li xin > wrote: 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..0000000 --- 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://ftp@openais.org/downloads/openais-${PV}/openais-${PV}.tar.gz - -SRC_URI = " \ - ftp://ftp@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 0000000..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://ftp@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