From e2d69c9f9cb27233b69bc6ed42c3ec99280818e7 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 21 Dec 2016 16:42:34 +0800 Subject: opensaf: 5.0.0 -> 5.1.0 1)Upgrade opensaf from 5.0.0 to 5.1.0. 2)Modify meta_oe_security_flags.inc to fix error: / | collect2: error: ld returned 1 exit status | Makefile:542: recipe for target 'librda.la' failed | make[6]: *** [librda.la] Error 1 \ Signed-off-by: Huang Qiyu Signed-off-by: Martin Jansa --- .../recipes-daemons/opensaf/opensaf_5.0.0.bb | 69 ---------------------- .../recipes-daemons/opensaf/opensaf_5.1.0.bb | 69 ++++++++++++++++++++++ .../conf/distro/include/meta_oe_security_flags.inc | 1 + 3 files changed, 70 insertions(+), 69 deletions(-) delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb deleted file mode 100644 index 6ceb225e9d..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" -DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ -middleware consistent with Service Availability Forum (SA Forum) \ -specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ -established by leading Communications and Enterprise Computing Companies to \ -facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ -code base in commercial products. \ -The OpenSAF project was launched in mid 2007 and has been under development by \ -an informal group of supporters of the OpenSAF initiative. The OpenSAF \ -Foundation was founded on January 22nd 2008 with Emerson Network Power, \ -Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." -HOMEPAGE = "http://www.opensaf.org" -SECTION = "admin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" - -DEPENDS = "libxml2 python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://install-samples-from-srcdir.patch \ - file://0001-plmcd-error-fix.patch \ - " - -SRC_URI[md5sum] = "94cd1a4c0406e6a45bb04c003f8690e7" -SRC_URI[sha256sum] = "4b4188a0f3d0ed1ed0e3d77de27c45e2c96b437401de08e7df2ed9ecd54bb999" - -inherit autotools useradd systemd pkgconfig - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-f -r opensaf" -USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" - -SYSTEMD_SERVICE_${PN} += "opensafd.service plmcboot.service plmcd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -PACKAGECONFIG[systemd] = "--enable-systemd-daemon" -PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03 --enable-ais-plm,,openhpi" - -EXTRA_OECONF += " --libdir=${libdir}/opensaf " -EXTRA_OEMAKE += " -Wl,-rpath,${libdir}/opensaf " - -PKGLIBDIR="${libdir}/opensaf/opensaf" - -do_configure_prepend () { - ( cd ${S}; autoreconf -f -i -s ) -} - -do_install_append() { - rm -fr "${D}${localstatedir}/lock" - rm -fr "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ - ${D}${systemd_unitdir}/system - install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system - - if [ ! -d "${D}${sysconfdir}/init.d" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ - fi -} - -FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" - -INSANE_SKIP_${PN} = "dev-so" - -RDEPENDS_${PN} += "bash python" - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb new file mode 100644 index 0000000000..be903a0366 --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.1.0.bb @@ -0,0 +1,69 @@ +SUMMARY = "OpenSAF is an open source implementation of the SAF AIS specification" +DESCRIPTION = "OpenSAF is an open source project established to develop a base platform \ +middleware consistent with Service Availability Forum (SA Forum) \ +specifications, under the LGPLv2.1 license. The OpenSAF Foundation was \ +established by leading Communications and Enterprise Computing Companies to \ +facilitate the OpenSAF Project and to accelerate the adoption of the OpenSAF \ +code base in commercial products. \ +The OpenSAF project was launched in mid 2007 and has been under development by \ +an informal group of supporters of the OpenSAF initiative. The OpenSAF \ +Foundation was founded on January 22nd 2008 with Emerson Network Power, \ +Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." +HOMEPAGE = "http://www.opensaf.org" +SECTION = "admin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" + +DEPENDS = "libxml2 python" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://install-samples-from-srcdir.patch \ + file://0001-plmcd-error-fix.patch \ + " + +SRC_URI[md5sum] = "821391311c73bc2f2dc5a7d867f732e0" +SRC_URI[sha256sum] = "f687c883a0d50517c33cb445d9177a9e2b07f5bb077bcc0235ffc0fc99af5cb6" + +inherit autotools useradd systemd pkgconfig + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "-f -r opensaf" +USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" + +SYSTEMD_SERVICE_${PN} += "opensafd.service plmcboot.service plmcd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +PACKAGECONFIG[systemd] = "--enable-systemd-daemon" +PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03 --enable-ais-plm,,openhpi" + +EXTRA_OECONF += " --libdir=${libdir}/opensaf " +EXTRA_OEMAKE += " -Wl,-rpath,${libdir}/opensaf " + +PKGLIBDIR="${libdir}/opensaf/opensaf" + +do_configure_prepend () { + ( cd ${S}; autoreconf -f -i -s ) +} + +do_install_append() { + rm -fr "${D}${localstatedir}/lock" + rm -fr "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ + ${D}${systemd_unitdir}/system + install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system + + if [ ! -d "${D}${sysconfdir}/init.d" ]; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ + fi +} + +FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service" +FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP_${PN} = "dev-so" + +RDEPENDS_${PN} += "bash python" + diff --git a/meta-oe/conf/distro/include/meta_oe_security_flags.inc b/meta-oe/conf/distro/include/meta_oe_security_flags.inc index 815fb16c75..01ee4d455c 100644 --- a/meta-oe/conf/distro/include/meta_oe_security_flags.inc +++ b/meta-oe/conf/distro/include/meta_oe_security_flags.inc @@ -25,3 +25,4 @@ SECURITY_CFLAGS_pn-libvdpau = "${SECURITY_NO_PIE_CFLAGS}" #| make[1]: *** [Makefile:675: libluajit.so] Error 1 SECURITY_CFLAGS_pn-luajit = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-opensaf = "${SECURITY_NO_PIE_CFLAGS}" -- cgit 1.2.3-korg