* [Buildroot] [PATCH 2/3] package/openpowerlink: link demos applications with PCIe library interface
2016-06-08 21:21 [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash Romain Naour
@ 2016-06-08 21:21 ` Romain Naour
2016-06-08 21:21 ` [Buildroot] [PATCH 3/3] package/openpowerlink: fix uClibc build Romain Naour
2016-06-08 21:25 ` [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Romain Naour @ 2016-06-08 21:21 UTC (permalink / raw)
To: buildroot
In commit f1bc98f396778c9fd8c884527787eb538212f398 the CFG_BUILD_KERNEL_STACK
option wasn't set when the PCIe library interface is selected.
The build fail since the default choice "Link to Application" (which require
libpcap) is used.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
package/openpowerlink/openpowerlink.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
index 53c636c..4d27d5a 100644
--- a/package/openpowerlink/openpowerlink.mk
+++ b/package/openpowerlink/openpowerlink.mk
@@ -131,6 +131,9 @@ OPENPOWERLINK_CONF_OPTS += \
else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB),y)
OPENPOWERLINK_CONF_OPTS += \
-DCFG_BUILD_KERNEL_STACK="Linux Kernel Module"
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB),y)
+OPENPOWERLINK_CONF_OPTS += \
+ -DCFG_BUILD_KERNEL_STACK="Kernel stack on PCIe card"
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_CONSOLE),y)
--
2.5.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] package/openpowerlink: fix uClibc build
2016-06-08 21:21 [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash Romain Naour
2016-06-08 21:21 ` [Buildroot] [PATCH 2/3] package/openpowerlink: link demos applications with PCIe library interface Romain Naour
@ 2016-06-08 21:21 ` Romain Naour
2016-06-08 21:25 ` [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Romain Naour @ 2016-06-08 21:21 UTC (permalink / raw)
To: buildroot
In the demo application code, va_list type is used in eventlogstring.h
so stdarg.h must be included to define it.
This problem occurs with a uClibc-ng based toolchain.
Fixes:
http://autobuild.buildroot.net/results/a9e/a9e7615a19922706039bf97ccb94bcf5b99330b2
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
...apps-include-stdarg.h-in-eventlogstring.h.patch | 61 ++++++++++++++++++++++
1 file changed, 61 insertions(+)
create mode 100644 package/openpowerlink/0007-apps-include-stdarg.h-in-eventlogstring.h.patch
diff --git a/package/openpowerlink/0007-apps-include-stdarg.h-in-eventlogstring.h.patch b/package/openpowerlink/0007-apps-include-stdarg.h-in-eventlogstring.h.patch
new file mode 100644
index 0000000..70e44c2
--- /dev/null
+++ b/package/openpowerlink/0007-apps-include-stdarg.h-in-eventlogstring.h.patch
@@ -0,0 +1,61 @@
+From 533f40e097b8d08e1dfeb03e2484a4369fad778f Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Wed, 8 Jun 2016 13:13:36 +0200
+Subject: [PATCH] [FIX] apps: include stdarg.h in eventlogstring.h
+
+va_list type is used in eventlogstring.h so it must include stdarg.h to define
+it.
+
+Upstream status: Pending
+https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/127
+
+Fixes:
+http://autobuild.buildroot.net/results/a9e/a9e7615a19922706039bf97ccb94bcf5b99330b2/build-end.log
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ apps/common/src/eventlog/eventlog.c | 1 -
+ apps/common/src/eventlog/eventlogstring.c | 1 -
+ apps/common/src/eventlog/eventlogstring.h | 2 ++
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/apps/common/src/eventlog/eventlog.c b/apps/common/src/eventlog/eventlog.c
+index f2193e2..eba1101 100644
+--- a/apps/common/src/eventlog/eventlog.c
++++ b/apps/common/src/eventlog/eventlog.c
+@@ -47,7 +47,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //------------------------------------------------------------------------------
+
+ #include <stdio.h>
+-#include <stdarg.h>
+ #include <time.h>
+
+ #include <oplk/debugstr.h>
+diff --git a/apps/common/src/eventlog/eventlogstring.c b/apps/common/src/eventlog/eventlogstring.c
+index 9fb677b..a55a1a4 100644
+--- a/apps/common/src/eventlog/eventlogstring.c
++++ b/apps/common/src/eventlog/eventlogstring.c
+@@ -47,7 +47,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "eventlogstring.h"
+
+ #include <stdio.h>
+-#include <stdarg.h>
+ #include <time.h>
+
+ #include <oplk/debugstr.h>
+diff --git a/apps/common/src/eventlog/eventlogstring.h b/apps/common/src/eventlog/eventlogstring.h
+index 2c291a6..3a5f2fa 100644
+--- a/apps/common/src/eventlog/eventlogstring.h
++++ b/apps/common/src/eventlog/eventlogstring.h
+@@ -41,6 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //------------------------------------------------------------------------------
+ // includes
+ //------------------------------------------------------------------------------
++#include <stdarg.h>
++
+ #include <oplk/oplk.h>
+ #include <oplk/nmt.h>
+
+--
+2.5.5
+
--
2.5.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash
2016-06-08 21:21 [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash Romain Naour
2016-06-08 21:21 ` [Buildroot] [PATCH 2/3] package/openpowerlink: link demos applications with PCIe library interface Romain Naour
2016-06-08 21:21 ` [Buildroot] [PATCH 3/3] package/openpowerlink: fix uClibc build Romain Naour
@ 2016-06-08 21:25 ` Thomas Petazzoni
2016-06-08 21:29 ` Romain Naour
2 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2016-06-08 21:25 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 8 Jun 2016 23:21:57 +0200, Romain Naour wrote:
> While bumping to v2.4.0, the sha256 was commented by mistake
> and the hash was for v2.3.2 archive.
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> package/openpowerlink/openpowerlink.hash | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
All three patches applied, thanks! There was a typo in the title of
this patch, which I fixed when applying.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash
2016-06-08 21:25 ` [Buildroot] [PATCH 1/3] pckage/openpowerlink: fix sha256 hash Thomas Petazzoni
@ 2016-06-08 21:29 ` Romain Naour
0 siblings, 0 replies; 5+ messages in thread
From: Romain Naour @ 2016-06-08 21:29 UTC (permalink / raw)
To: buildroot
Hi Thomas,
Le 08/06/2016 ? 23:25, Thomas Petazzoni a ?crit :
> Hello,
>
> On Wed, 8 Jun 2016 23:21:57 +0200, Romain Naour wrote:
>> While bumping to v2.4.0, the sha256 was commented by mistake
>> and the hash was for v2.3.2 archive.
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>> package/openpowerlink/openpowerlink.hash | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> All three patches applied, thanks! There was a typo in the title of
> this patch, which I fixed when applying.
Thanks, I'm working with upstream for the next bug fix release (2.4.1) to
upstream most of the patches.
Patch 5 and 6 are already upstream.
Best regards,
Romain
>
> Thomas
>
^ permalink raw reply [flat|nested] 5+ messages in thread