Hi Bian, [[oe] [PATCH 6/6] [meta-oe] Port corosync from openembedded and upgrade to 1.4.7] On 14.11.24 (Mon 14:45) Bian Naimeng wrote:
> Signed-off-by: Bian Naimeng <[email protected]> > --- > meta-oe/recipes-support/corosync/corosync_1.4.7.bb | 31 > ++++++++++++++++++++++ > .../corosync/files/config-site.corosync | 4 +++ > meta-oe/recipes-support/corosync/files/groff.patch | 12 +++++++++ > 3 files changed, 47 insertions(+) > create mode 100644 meta-oe/recipes-support/corosync/corosync_1.4.7.bb > create mode 100644 > meta-oe/recipes-support/corosync/files/config-site.corosync > create mode 100644 meta-oe/recipes-support/corosync/files/groff.patch This probably belongs in meta-networking (unless there's strong opinion it belongs somewhere else). Did you have a look at what has been done in meta-cgl (git://git.enea.com/linux/meta-cgl) with the recipe to see if there was anything useful there? I know meta-cgl isn't very well publicized yet, but it is in the layer index. If you haven't looked at what's there yet, it may be worth having a look to see if any of it can save you some time. For what it's worth, there does seem to be rather a lot more in meta-cgl and I think at least some of it still applies (eg. the volatiles file). > diff --git a/meta-oe/recipes-support/corosync/corosync_1.4.7.bb > b/meta-oe/recipes-support/corosync/corosync_1.4.7.bb > new file mode 100644 > index 0000000..a3b8864 > --- /dev/null > +++ b/meta-oe/recipes-support/corosync/corosync_1.4.7.bb > @@ -0,0 +1,31 @@ > +SUMMARY = "The Corosync Cluster Engine and Application Programming > Interfaces" > +DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, > several default \ > +APIs and libraries, default configuration files, and an init script." > +HOMEPAGE = "http://corosync.github.io/corosync/"; > + > +inherit autotools pkgconfig > + > +SRC_URI = > "http://build.clusterlabs.org/corosync/releases/${BPN}-${PV}.tar.gz \ > + file://config-site.corosync \ > + file://groff.patch \ > + " Please remove the tab before space above. > + > +SRC_URI[md5sum] = "da9b2cf0b55f08ac4cf7cd82ac2f977a" > +SRC_URI[sha256sum] = > "c1d005b2093e9a725abd1dfb2be936114b561c0b3145aca11f58c1a733a05af8" > + > +LICENSE = "BSD" I think this is actually a BSD-3-Clause license, isn't it? > +LIC_FILES_CHKSUM = "file://LICENSE;md5=25656171d1e4054c636a9893067f8c30" > + > +CONFIG_SITE = "${WORKDIR}/config-site.corosync" > + > +DEPENDS = "groff-native nss" > + > +EXTRA_OECONF += " --enable-nss " > +CFLAGS_append += " -fPIC " > + > +do_compile() { > + DESCPATH="${STAGING_DATADIR_NATIVE}/groff/`groff -v | awk > '{if(NR==1)print $4}'`/font" > + oe_runmake DESCPATH=${DESCPATH} > +} > + > +FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" > diff --git a/meta-oe/recipes-support/corosync/files/config-site.corosync > b/meta-oe/recipes-support/corosync/files/config-site.corosync > new file mode 100644 > index 0000000..3472dec > --- /dev/null > +++ b/meta-oe/recipes-support/corosync/files/config-site.corosync > @@ -0,0 +1,4 @@ > +ac_cv_func_fnmatch_works=yes > +ac_cv_func_malloc_0_nonnull=yes > +ac_cv_func_realloc_0_nonnull=yes > + > diff --git a/meta-oe/recipes-support/corosync/files/groff.patch > b/meta-oe/recipes-support/corosync/files/groff.patch Can you add a header to this patch please? Thanks. -J. > new file mode 100644 > index 0000000..da1378a > --- /dev/null > +++ b/meta-oe/recipes-support/corosync/files/groff.patch > @@ -0,0 +1,12 @@ > +diff -Nurp corosync-1.3.1.org/man/Makefile.am corosync-1.3.1/man/Makefile.am > +--- corosync-1.3.1.org/man/Makefile.am 2011-04-25 10:37:50.000000000 > +0800 > ++++ corosync-1.3.1/man/Makefile.am 2014-11-24 10:33:36.583426707 +0800 > +@@ -126,7 +126,7 @@ HTML_DOCS = $(dist_man_MANS:%=%.html) > + INDEX_HTML = index.html > + > + %.html: % > +- $(GROFF) -mandoc -Thtml $^ > $@ > ++ $(GROFF) -F $(DESCPATH) -mandoc -Thtml $^ > $@ > + > + install-data-local: > + $(INSTALL) -d $(DESTDIR)/${docdir}/html > -- > 1.9.1 > -- -Joe MacDonald. :wq
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
