From 7ada285f29217201abfa7de3e7376af11320480b Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Sun, 19 May 2019 22:12:33 +0200 Subject: opensaf: update to 5.19.03 Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- ...1-Catch-std-ifstream-failure-by-reference.patch | 67 -------------- .../0001-Fix-string-overflow-in-snprintf.patch | 76 ---------------- .../0002-Fix-format-truncation-errors.patch | 100 --------------------- .../0008-check-for-size-before-using-strncpy.patch | 33 ------- .../recipes-daemons/opensaf/opensaf_5.19.01.bb | 75 ---------------- .../recipes-daemons/opensaf/opensaf_5.19.03.bb | 71 +++++++++++++++ 6 files changed, 71 insertions(+), 351 deletions(-) delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch delete mode 100644 meta-networking/recipes-daemons/opensaf/opensaf_5.19.01.bb create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf_5.19.03.bb diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch deleted file mode 100644 index 30fdb8bf14..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 38c5343f84799fc5041575f3ec808f7476b6eea3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Apr 2018 14:33:35 -0700 -Subject: [PATCH] Catch std::ifstream::failure by reference - -Fixes -error: catching polymorphic type 'class std::ios_base::failure' by value -[-Werror=catch-value=] - } catch (std::ofstream::failure) { - ^~~~~~~ - -Signed-off-by: Khem Raj - ---- - src/base/conf.cc | 4 ++-- - src/dtm/dtmnd/dtm_main.cc | 2 +- - src/dtm/dtmnd/multicast.cc | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/base/conf.cc b/src/base/conf.cc -index d5755a1..4820357 100644 ---- a/src/base/conf.cc -+++ b/src/base/conf.cc -@@ -189,7 +189,7 @@ std::string Conf::ReadFile(const std::string& path_name, - try { - str.open(path_name); - str >> contents; -- } catch (std::ifstream::failure) { -+ } catch (std::ifstream::failure& e) { - contents.clear(); - } - return (str.fail() || contents.empty()) ? default_contents : contents; -@@ -203,7 +203,7 @@ void Conf::WriteFileAtomically(const std::string& path_name, - try { - str.open(tmp_file, std::ofstream::out | std::ofstream::trunc); - str << contents << std::endl; -- } catch (std::ofstream::failure) { -+ } catch (std::ofstream::failure& e) { - success = false; - } - str.close(); -diff --git a/src/dtm/dtmnd/dtm_main.cc b/src/dtm/dtmnd/dtm_main.cc -index 585e11e..5cf6ad7 100644 ---- a/src/dtm/dtmnd/dtm_main.cc -+++ b/src/dtm/dtmnd/dtm_main.cc -@@ -367,7 +367,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) { - try { - str.open(PKGLOCALSTATEDIR "/node_id", std::ofstream::out); - str << std::hex << node_id << std::endl; -- } catch (std::ofstream::failure) { -+ } catch (std::ofstream::failure& e) { - } - str.close(); - } -diff --git a/src/dtm/dtmnd/multicast.cc b/src/dtm/dtmnd/multicast.cc -index cadc002..7c25fea 100644 ---- a/src/dtm/dtmnd/multicast.cc -+++ b/src/dtm/dtmnd/multicast.cc -@@ -199,7 +199,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) { - } - } - } -- } catch (std::ifstream::failure) { -+ } catch (std::ifstream::failure& e) { - LOG_ER("Caught std::ifstream::failure when reading file '%s', peers=%zu", - path_name.c_str(), static_cast(peers_.size())); - peers_.clear(); diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch deleted file mode 100644 index 93c75777fe..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 88661a60629894353512c53ed32f2b901f64149c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Apr 2018 18:29:17 -0700 -Subject: [PATCH] Fix string overflow in snprintf - -Fixes errors like -error: '%s' dir -ective output may be truncated writing up to 255 bytes into a region of size 32 [-Werror=forma -t-truncation=] - snprintf(reinterpret_cast(Healthy.key), sizeof(Healthy.key), "%s", - ^~~~ - hlth_str); - ~~~~~~~~ - -Signed-off-by: Khem Raj - ---- - src/log/logd/lgs_util.cc | 4 ++-- - src/rde/rded/rde_amf.cc | 2 +- - src/smf/smfd/SmfUpgradeCampaign.cc | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/log/logd/lgs_util.cc b/src/log/logd/lgs_util.cc -index ac93d5a..cce80f3 100644 ---- a/src/log/logd/lgs_util.cc -+++ b/src/log/logd/lgs_util.cc -@@ -200,12 +200,12 @@ char *lgs_get_time(time_t *time_in) { - - stringSize = 5 * sizeof(char); - snprintf(srcString, (size_t)stringSize, "%d", -- (timeStampData->tm_year + START_YEAR)); -+ (timeStampData->tm_year + START_YEAR) & 0x4dU); - - strncpy(timeStampString, srcString, stringSize); - - stringSize = 3 * sizeof(char); -- snprintf(srcString, (size_t)stringSize, "%02d", (timeStampData->tm_mon + 1)); -+ snprintf(srcString, (size_t)stringSize, "%02d", (timeStampData->tm_mon + 1) & 0x2dU); - - strncat(timeStampString, srcString, stringSize); - -diff --git a/src/rde/rded/rde_amf.cc b/src/rde/rded/rde_amf.cc -index 81e521e..d53cc48 100644 ---- a/src/rde/rded/rde_amf.cc -+++ b/src/rde/rded/rde_amf.cc -@@ -102,7 +102,7 @@ static uint32_t rde_amf_healthcheck_start(RDE_AMF_CB *rde_amf_cb) { - SaAmfHealthcheckKeyT Healthy; - SaNameT SaCompName; - char *phlth_ptr; -- char hlth_str[256]; -+ char hlth_str[32]; - - TRACE_ENTER(); - -diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc -index c30ea14..098f17a 100644 ---- a/src/smf/smfd/SmfUpgradeCampaign.cc -+++ b/src/smf/smfd/SmfUpgradeCampaign.cc -@@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { - TRACE_ENTER(); - SaAisErrorT rc = SA_AIS_OK; - SaImmAttrValuesT_2 **attributes; -- int curCnt = 0; -+ short int curCnt = 0; - - /* Read the SmfCampRestartInfo object smfCampRestartCnt attr */ - std::string obj = "smfRestartInfo=info," + -@@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { - attrsmfCampRestartCnt.SetAttributeName("smfCampRestartCnt"); - attrsmfCampRestartCnt.SetAttributeType("SA_IMM_ATTR_SAUINT32T"); - char buf[5]; -- snprintf(buf, 4, "%d", curCnt); -+ snprintf(buf, 4, "%hd", curCnt); - attrsmfCampRestartCnt.AddAttributeValue(buf); - imoCampRestartInfo.AddValue(attrsmfCampRestartCnt); - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch deleted file mode 100644 index f98e28da9c..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch +++ /dev/null @@ -1,100 +0,0 @@ -From c5034fe42df8923bcefc10e163151997d70b6241 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Apr 2018 14:56:47 -0700 -Subject: [PATCH] Fix format-truncation errors - -Fixes errors with gcc8 eg. -error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 0 and 254 [-Werror=format-truncation=] - -Signed-off-by: Khem Raj - ---- - src/base/daemon.c | 4 ++-- - src/mds/mds_c_db.c | 8 ++++---- - src/mds/mds_core.h | 4 ++-- - src/mds/mds_dt2c.h | 2 +- - 4 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/base/daemon.c b/src/base/daemon.c -index 361dd8d..4001b73 100644 ---- a/src/base/daemon.c -+++ b/src/base/daemon.c -@@ -95,11 +95,11 @@ static int __create_pidfile(const char *pidfile) - { - FILE *file = NULL; - int fd, rc = 0; -- char pidfiletmp[NAME_MAX] = {0}; -+ char pidfiletmp[NAME_MAX+12] = {0}; - pid_t pid; - - pid = getpid(); -- snprintf(pidfiletmp, NAME_MAX, "%s.%u.tmp", pidfile, pid); -+ snprintf(pidfiletmp, NAME_MAX+12, "%s.%u.tmp", pidfile, pid); - - /* open the file and associate a stream with it */ - if (((fd = open(pidfiletmp, O_RDWR | O_CREAT, 0644)) == -1) || -diff --git a/src/mds/mds_c_db.c b/src/mds/mds_c_db.c -index e6b95cd..3d4a222 100644 ---- a/src/mds/mds_c_db.c -+++ b/src/mds/mds_c_db.c -@@ -124,10 +124,10 @@ void get_adest_details(MDS_DEST adest, char *adest_details) - } - - if (remote == true) -- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, -+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, - "", ncs_node_id, process_name); - else -- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, -+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, - "", ncs_node_id, process_name); - - m_MDS_LOG_DBG("MDS:DB: adest_details: %s ", adest_details); -@@ -207,10 +207,10 @@ void get_subtn_adest_details(MDS_PWE_HDL pwe_hdl, MDS_SVC_ID svc_id, - } - - if (remote == true) -- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, -+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, - "", ncs_node_id, process_name); - else -- snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN, -+ snprintf(adest_details, MDS_MAX_PROCESS_NAME_LEN+24, - "", ncs_node_id, process_name); - done: - m_MDS_LOG_DBG("MDS:DB: adest_details: %s ", adest_details); -diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h -index 37696d4..7f5225d 100644 ---- a/src/mds/mds_core.h -+++ b/src/mds/mds_core.h -@@ -163,7 +163,7 @@ typedef struct mds_subscription_results_info { - uint32_t msg_snd_cnt; /* Message send count to this destination */ - uint32_t msg_rcv_cnt; /* Message rcv count from this destination */ - char sub_adest_details -- [MDS_MAX_PROCESS_NAME_LEN]; /* */ -+ [MDS_MAX_PROCESS_NAME_LEN+24]; /* */ - - } MDS_SUBSCRIPTION_RESULTS_INFO; - -@@ -194,7 +194,7 @@ typedef struct mds_subscription_info { - count is grater than ZERO bcast (multi-unicast) */ - uint32_t prev_ver_sub_count; - char sub_adest_details -- [MDS_MAX_PROCESS_NAME_LEN]; /* */ -+ [MDS_MAX_PROCESS_NAME_LEN+24]; /* */ - - } MDS_SUBSCRIPTION_INFO; - -diff --git a/src/mds/mds_dt2c.h b/src/mds/mds_dt2c.h -index 012999c..006b722 100644 ---- a/src/mds/mds_dt2c.h -+++ b/src/mds/mds_dt2c.h -@@ -143,7 +143,7 @@ typedef struct mdtm_send_req { - */ - MDS_DEST adest; /* MDTM to do local/remote routing, destination adest */ - char sub_adest_details -- [MDS_MAX_PROCESS_NAME_LEN]; /* */ -+ [MDS_MAX_PROCESS_NAME_LEN+24]; /* */ - MDS_SEND_PRIORITY_TYPE pri; - MDS_CLIENT_MSG_FORMAT_VER - msg_fmt_ver; /* message format version specification */ diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch deleted file mode 100644 index 497bb07d8d..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 29510dd81e3a5e96151afdb0702863cbfd640766 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 22 Jun 2018 18:58:59 -0700 -Subject: [PATCH] check for size before using strncpy - -ensures that size is never execeding the string length -that execPath can hold - -Fixes -error: '__builtin___strncpy_chk' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/imm/immnd/immnd_proc.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/imm/immnd/immnd_proc.c b/src/imm/immnd/immnd_proc.c -index 015932a..c8f115e 100644 ---- a/src/imm/immnd/immnd_proc.c -+++ b/src/imm/immnd/immnd_proc.c -@@ -1902,6 +1902,10 @@ static int immnd_forkPbe(IMMND_CB *cb) - LOG_ER("Pathname too long: %u max is 1023", newLen); - return -1; - } -+ if (execDirLen > 1023 || execDirLen < 0) { -+ LOG_ER("Execdir name too long: %u max is 1023", execDirLen); -+ return -1; -+ } - - strncpy(execPath, cb->mProgName, execDirLen); - execPath[execDirLen] = 0; diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.19.01.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.19.01.bb deleted file mode 100644 index 3e4d33e005..0000000000 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.19.01.bb +++ /dev/null @@ -1,75 +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" -TOOLCHAIN = "gcc" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ - file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ - file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ - file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ - file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ - file://0001-Catch-std-ifstream-failure-by-reference.patch \ - file://0002-Fix-format-truncation-errors.patch \ - file://0001-Fix-string-overflow-in-snprintf.patch \ - file://0008-check-for-size-before-using-strncpy.patch \ - " -SRC_URI[md5sum] = "d9f44f778e23cf739085f74c5ff793b1" -SRC_URI[sha256sum] = "5713fbe21c557c9a992af6805bc44521f2cf6cf950ae873036d9a81c73364b60" - -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" -SYSTEMD_AUTO_ENABLE = "disable" - -PACKAGECONFIG[systemd] = ",,systemd" -PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" -PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" - -PKGLIBDIR="${libdir}" -CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" -CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" -LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" - -do_install_append() { - cp -av --no-preserve=ownership ${B}/lib/.libs/*.so* ${D}${libdir} - rm -fr "${D}${localstatedir}/lock" - rm -fr "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" - 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} += "${systemd_unitdir}/system/*.service" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" - -INSANE_SKIP_${PN} = "dev-so" - -RDEPENDS_${PN} += "bash python" - -# http://errors.yoctoproject.org/Errors/Details/186970/ -EXCLUDE_FROM_WORLD_libc-musl = "1" diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.19.03.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.19.03.bb new file mode 100644 index 0000000000..0cccebdfcd --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.19.03.bb @@ -0,0 +1,71 @@ +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" +TOOLCHAIN = "gcc" + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ + file://0001-configure-Pass-linker-specific-options-with-Wl.patch \ + file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ + file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ + file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ + " +SRC_URI[md5sum] = "4dd1497ccd82d275735853bf0db5c510" +SRC_URI[sha256sum] = "de42c8dd850990716ca494ca598165cc7a23b5b7f2bc21af5d71a3d971ddd595" + +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" +SYSTEMD_AUTO_ENABLE = "disable" + +PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03,,openhpi" +PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" + +PKGLIBDIR="${libdir}" +CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" +CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" +LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" + +do_install_append() { + cp -av --no-preserve=ownership ${B}/lib/.libs/*.so* ${D}${libdir} + rm -fr "${D}${localstatedir}/lock" + rm -fr "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir --ignore-fail-on-non-empty "${D}${datadir}/java" + 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} += "${systemd_unitdir}/system/*.service" +FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP_${PN} = "dev-so" + +RDEPENDS_${PN} += "bash python" + +# http://errors.yoctoproject.org/Errors/Details/186970/ +EXCLUDE_FROM_WORLD_libc-musl = "1" -- cgit v1.2.3-54-g00ecf