mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

opensaf: Upgrade to 5.18.09

Browse Source 
Degrade certain Werror into warnings to get it building with
gcc >= 8

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-12-20 15:08:06 -08:00
parent 79ab090e2f
commit 2552c8e916
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch
+6 -6
View File
@@ -1,4 +1,4 @@
From ae7178a78aba2e5766b70191617113487fd7ad0b Mon Sep 17 00:00:00 2001 From 88661a60629894353512c53ed32f2b901f64149c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 16 Apr 2018 18:29:17 -0700 Date: Mon, 16 Apr 2018 18:29:17 -0700
Subject: [PATCH] Fix string overflow in snprintf Subject: [PATCH] Fix string overflow in snprintf
@@ -53,7 +53,7 @@ index 81e521e..d53cc48 100644
TRACE_ENTER(); TRACE_ENTER();
diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc
index 45cdce8..6761bcf 100644 index c30ea14..098f17a 100644
--- a/src/smf/smfd/SmfUpgradeCampaign.cc --- a/src/smf/smfd/SmfUpgradeCampaign.cc
+++ b/src/smf/smfd/SmfUpgradeCampaign.cc +++ b/src/smf/smfd/SmfUpgradeCampaign.cc
@@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { @@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) {
@@ -66,11 +66,11 @@ index 45cdce8..6761bcf 100644
/* Read the SmfCampRestartInfo object smfCampRestartCnt attr */ /* Read the SmfCampRestartInfo object smfCampRestartCnt attr */
std::string obj = "smfRestartInfo=info," + std::string obj = "smfRestartInfo=info," +
@@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { @@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) {
attrsmfCampRestartCnt.setName("smfCampRestartCnt"); attrsmfCampRestartCnt.SetAttributeName("smfCampRestartCnt");
attrsmfCampRestartCnt.setType("SA_IMM_ATTR_SAUINT32T"); attrsmfCampRestartCnt.SetAttributeType("SA_IMM_ATTR_SAUINT32T");
char buf[5]; char buf[5];
- snprintf(buf, 4, "%d", curCnt); - snprintf(buf, 4, "%d", curCnt);
+ snprintf(buf, 4, "%hd", curCnt); + snprintf(buf, 4, "%hd", curCnt);
attrsmfCampRestartCnt.addValue(buf); attrsmfCampRestartCnt.AddAttributeValue(buf);
imoCampRestartInfo.addValue(attrsmfCampRestartCnt); imoCampRestartInfo.AddValue(attrsmfCampRestartCnt);
meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb → meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb
+4 -3
View File
@@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
file://0001-Fix-string-overflow-in-snprintf.patch \ file://0001-Fix-string-overflow-in-snprintf.patch \
file://0008-check-for-size-before-using-strncpy.patch \ file://0008-check-for-size-before-using-strncpy.patch \
" "
SRC_URI[md5sum] = "21836e43b13ad33bed9bd0ed391e5a6e" SRC_URI[md5sum] = "45044fde0b35eac057a5fa05c27b8040"
SRC_URI[sha256sum] = "e55dc2645487fb22938e8386b99eef6eb7aff43a246ce3e92488daf6ee46247a" SRC_URI[sha256sum] = "230a0ea628ba278170a913746c39b2c8cd529d7dc25326b2e17b5c095cf94025"
inherit autotools useradd systemd pkgconfig inherit autotools useradd systemd pkgconfig
@@ -48,7 +48,8 @@ PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
PKGLIBDIR="${libdir}" 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" LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed"
do_install_append() { do_install_append() {