[Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package
@ 2015-05-01 15:35 Romain Naour
  2015-05-01 15:35 ` [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages Romain Naour
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Romain Naour @ 2015-05-01 15:35 UTC (permalink / raw)
  To: buildroot

The openpowerlink2 package archive contains several cmake projects,
and each of them must be packaged separately in Buildroot.

"With version 2.0, the source code has been cleanly split into an
application-oriented user library and a time-critical stack driver."

This complicates the packaging but it help to refine the dependencies
compared to openpowerlink v1 build system.
(openpowerlink v1 require C++ only for the qt demo)

The generic openpowerlink2 package provide all sources files and
patches which are then used by other openpowerlink2-* packages
(sub-packages).
Doing this avoids patches duplication over all sub-packages.

All patches fixes several issues with the cmake build system.

For each sub-packages, the extract hook create a symlink to the
sources and the path to the cmake project is provided by *_SUBDIR
value.

There is one project for the EPL stack libraries wich provides:
 * an user space EPL stack to be linked into application
 * an user space EPL stack pcap daemon
 * an kernel space EPL library interface

There is two projects for EPL network driver:
 * pcap daemon driver
 * kernel module driver.

Note: On x86/x86_64 only few EPL ethernet driver are available for
the EPL kernel stack implementation:
 * Intel 82573
 * Intel 8255x
 * Intel I210
 * Realtek RTL-8111/8168 (new since V2.1.0)
 * Realtek RTL-8139

There are one project for each demo applications:
 * demo_cn_embedded
 * demo_mn_embedded
 * demo_cn_console
 * demo_mn_console
 * demo_mn_qt

Only demo_mn_console will be packaged in Buildroot for now.

This patch add the package for the stack libraries.

[1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
v2: add a patch to install the stack libraries to "lib" subdirectory
    remove -DCMAKE_INSTALL_PREFIX="/usr/lib" from OPENPOWERLINK2_STACK_CONF_OPTS
---
 package/Config.in                                  |   1 +
 ...a-better-regex-for-CMAKE_SYSTEM_PROCESSOR.patch | 153 +++++++++++++++++++++
 ...ink-demos-with-Debug-and-Release-librarie.patch | 116 ++++++++++++++++
 ...l-the-stack-libraries-to-lib-subdirectory.patch | 108 +++++++++++++++
 package/openpowerlink2/Config.in                   |  46 +++++++
 .../openpowerlink2/openpowerlink2-stack/Config.in  |  34 +++++
 .../openpowerlink2-stack/openpowerlink2-stack.mk   |  69 ++++++++++
 package/openpowerlink2/openpowerlink2.mk           |  17 +++
 8 files changed, 544 insertions(+)
 create mode 100644 package/openpowerlink2/0001-FIX-use-a-better-regex-for-CMAKE_SYSTEM_PROCESSOR.patch
 create mode 100644 package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
 create mode 100644 package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
 create mode 100644 package/openpowerlink2/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-stack/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
 create mode 100644 package/openpowerlink2/openpowerlink2.mk

diff --git a/package/Config.in b/package/Config.in
index afa145e..17b466f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -384,6 +384,7 @@ endif
 	source "package/open2300/Config.in"
 	source "package/openocd/Config.in"
 	source "package/openpowerlink/Config.in"
+	source "package/openpowerlink2/Config.in"
 	source "package/owl-linux/Config.in"
 	source "package/parted/Config.in"
 	source "package/pciutils/Config.in"
diff --git a/package/openpowerlink2/0001-FIX-use-a-better-regex-for-CMAKE_SYSTEM_PROCESSOR.patch b/package/openpowerlink2/0001-FIX-use-a-better-regex-for-CMAKE_SYSTEM_PROCESSOR.patch
new file mode 100644
index 0000000..62ae04b
--- /dev/null
+++ b/package/openpowerlink2/0001-FIX-use-a-better-regex-for-CMAKE_SYSTEM_PROCESSOR.patch
@@ -0,0 +1,153 @@
+From 7f48aa5b0790882b308013199a30be2e14f97b06 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Thu, 23 Apr 2015 14:34:08 +0200
+Subject: [PATCH] [FIX] use a better regex for CMAKE_SYSTEM_PROCESSOR
+
+According to CMake doc, CMAKE_SYSTEM_PROCESSOR is set to the
+output of the command "uname -p" (in fact it is the output of "uname
+-m"). This is only true for native compilation.
+
+In the case of cross-compilation, the CMake code does not set anything,
+it just expects the CMAKE_SYSTEM_* variables to be set in the
+toolchain file.
+
+Add a test matching the patern "^i.86$" and keep the old one "x86" for
+compatibility.
+By doing that, factorize this test using "^(i.86|x86(_64)?)$".
+
+Thanks to Samuel Martin [1]
+[1] http://lists.busybox.net/pipermail/buildroot/2014-November/112163.html
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ drivers/linux/drv_kernelmod_edrv/CMakeLists.txt         |    2 +-
+ stack/proj/linux/liboplkcn/CMakeLists.txt               |    2 +-
+ stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt |    2 +-
+ stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt   |    2 +-
+ stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt       |    2 +-
+ stack/proj/linux/liboplkmn/CMakeLists.txt               |    2 +-
+ stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt |    2 +-
+ stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt   |    2 +-
+ stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/linux/drv_kernelmod_edrv/CMakeLists.txt b/drivers/linux/drv_kernelmod_edrv/CMakeLists.txt
+index 2e0bc40..23c58f2 100644
+--- a/drivers/linux/drv_kernelmod_edrv/CMakeLists.txt
++++ b/drivers/linux/drv_kernelmod_edrv/CMakeLists.txt
+@@ -219,7 +219,7 @@ ELSE()
+     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${KERNEL_SOURCE_DIR}/timer/hrestimer-linuxkernel.c)
+ ENDIF()
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${COMMON_SOURCE_DIR}/ami/amix86.c)
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${COMMON_SOURCE_DIR}/ami/amile.c)
+diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt
+index 4fb6801..0badff7 100644
+--- a/stack/proj/linux/liboplkcn/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcn/CMakeLists.txt
+@@ -65,7 +65,7 @@ SET (LIB_SOURCES
+      ${MEMMAP_NULL_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
+index 823156e..8fa52b1 100644
+--- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
+@@ -58,7 +58,7 @@ SET (LIB_SOURCES
+      ${MEMMAP_NULL_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
+index b15b798..5fbe345 100644
+--- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
+@@ -58,7 +58,7 @@ SET (LIB_SOURCES
+      ${MEMMAP_NULL_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
+index bce75c4..c597747 100644
+--- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
+@@ -54,7 +54,7 @@ SET (LIB_SOURCES
+      ${CIRCBUF_POSIX_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt
+index d6228ee..fcc751e 100644
+--- a/stack/proj/linux/liboplkmn/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmn/CMakeLists.txt
+@@ -66,7 +66,7 @@ SET (LIB_SOURCES
+      ${MEMMAP_NULL_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
+index 94e5dc1..ba179cc 100644
+--- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
+@@ -59,7 +59,7 @@ SET (LIB_SOURCES
+      ${MEMMAP_NULL_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
+index fad7054..e01ff1d 100644
+--- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
+@@ -59,7 +59,7 @@ SET (LIB_SOURCES
+      ${MEMMAP_NULL_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
+index a08c23b..c46943f 100644
+--- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
+@@ -54,7 +54,7 @@ SET (LIB_SOURCES
+      ${CIRCBUF_POSIX_SOURCES}
+      )
+ 
+-IF((CMAKE_SYSTEM_PROCESSOR MATCHES x86*) OR (CMAKE_SYSTEM_PROCESSOR MATCHES i686))
++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_X86_SOURCES})
+ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES arm*)
+     SET(LIB_SOURCES ${LIB_SOURCES} ${ARCH_LE_SOURCES})
+-- 
+1.7.10.4
+
diff --git a/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch b/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
new file mode 100644
index 0000000..16602ac
--- /dev/null
+++ b/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
@@ -0,0 +1,116 @@
+From 545fc1d84a224093f7f79b5193aa3f7308f86b3a Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Wed, 17 Sep 2014 13:45:19 +0200
+Subject: [PATCH] [FIX] Don't link demos with Debug and Release libraries
+
+This is acutualy used by Visual Studio:
+
+"When you create a Visual Studio Solution on Windows by CMake,
+the solution contains both Release and Debug build configurations.
+You can switch between them in Visual Studio.
+Therefore, you need both release and debug libraries."
+
+This patch break the build for Windows.
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ apps/demo_cn_console/CMakeLists.txt  |    6 +++++-
+ apps/demo_cn_embedded/CMakeLists.txt |    6 +++++-
+ apps/demo_mn_console/CMakeLists.txt  |    6 +++++-
+ apps/demo_mn_embedded/CMakeLists.txt |    6 +++++-
+ apps/demo_mn_qt/CMakeLists.txt       |    6 +++++-
+ 5 files changed, 25 insertions(+), 5 deletions(-)
+
+diff --git a/apps/demo_cn_console/CMakeLists.txt b/apps/demo_cn_console/CMakeLists.txt
+index 2ba2bbd..4051bc8 100644
+--- a/apps/demo_cn_console/CMakeLists.txt
++++ b/apps/demo_cn_console/CMakeLists.txt
+@@ -105,8 +105,12 @@ SET_PROPERTY(TARGET demo_cn_console
+ 
+ ################################################################################
+ # Libraries to link
++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
++    TARGET_LINK_LIBRARIES(demo_cn_console debug ${OPLKLIB_DEBUG})
++ELSE ()
++    TARGET_LINK_LIBRARIES(demo_cn_console optimized ${OPLKLIB})
++ENDIF()
+ 
+-TARGET_LINK_LIBRARIES(demo_cn_console optimized ${OPLKLIB} debug ${OPLKLIB_DEBUG})
+ TARGET_LINK_LIBRARIES(demo_cn_console ${ARCH_LIBRARIES})
+ 
+ ################################################################################
+diff --git a/apps/demo_cn_embedded/CMakeLists.txt b/apps/demo_cn_embedded/CMakeLists.txt
+index 0115981..8ea5a20 100644
+--- a/apps/demo_cn_embedded/CMakeLists.txt
++++ b/apps/demo_cn_embedded/CMakeLists.txt
+@@ -93,8 +93,12 @@ SET_PROPERTY(TARGET ${EXECUTABLE_NAME}
+ 
+ ################################################################################
+ # Libraries to link
++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
++    TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} debug ${OPLKLIB_DEBUG})
++ELSE ()
++    TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB})
++ENDIF()
+ 
+-TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB} debug ${OPLKLIB_DEBUG})
+ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${ARCH_LIBRARIES})
+ 
+ ################################################################################
+diff --git a/apps/demo_mn_console/CMakeLists.txt b/apps/demo_mn_console/CMakeLists.txt
+index b517fbd..e232e87 100644
+--- a/apps/demo_mn_console/CMakeLists.txt
++++ b/apps/demo_mn_console/CMakeLists.txt
+@@ -116,8 +116,12 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/mnobd.cdc
+ 
+ ################################################################################
+ # Libraries to link
++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
++    TARGET_LINK_LIBRARIES(demo_mn_console debug ${OPLKLIB_DEBUG})
++ELSE ()
++    TARGET_LINK_LIBRARIES(demo_mn_console optimized ${OPLKLIB})
++ENDIF()
+ 
+-TARGET_LINK_LIBRARIES(demo_mn_console optimized ${OPLKLIB} debug ${OPLKLIB_DEBUG})
+ TARGET_LINK_LIBRARIES(demo_mn_console ${ARCH_LIBRARIES})
+ 
+ ################################################################################
+diff --git a/apps/demo_mn_embedded/CMakeLists.txt b/apps/demo_mn_embedded/CMakeLists.txt
+index 388c803..b5d8bd4 100644
+--- a/apps/demo_mn_embedded/CMakeLists.txt
++++ b/apps/demo_mn_embedded/CMakeLists.txt
+@@ -107,8 +107,12 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/mnobd.cdc
+ 
+ ################################################################################
+ # Libraries to link
++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
++    TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} debug ${OPLKLIB_DEBUG})
++ELSE ()
++    TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB})
++ENDIF()
+ 
+-TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB} debug ${OPLKLIB_DEBUG})
+ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${ARCH_LIBRARIES})
+ 
+ ################################################################################
+diff --git a/apps/demo_mn_qt/CMakeLists.txt b/apps/demo_mn_qt/CMakeLists.txt
+index f1abd28..1e06c14 100644
+--- a/apps/demo_mn_qt/CMakeLists.txt
++++ b/apps/demo_mn_qt/CMakeLists.txt
+@@ -152,8 +152,12 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/mnobd.cdc
+ 
+ ################################################################################
+ # Libraries to link
++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
++    TARGET_LINK_LIBRARIES(demo_mn_qt debug ${OPLKLIB_DEBUG})
++ELSE ()
++    TARGET_LINK_LIBRARIES(demo_mn_qt optimized ${OPLKLIB})
++ENDIF()
+ 
+-TARGET_LINK_LIBRARIES(demo_mn_qt optimized ${OPLKLIB} debug ${OPLKLIB_DEBUG})
+ TARGET_LINK_LIBRARIES(demo_mn_qt ${ARCH_LIBRARIES} ${QT_LIBRARIES})
+ 
+ ################################################################################
+-- 
+1.7.10.4
+
diff --git a/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch b/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
new file mode 100644
index 0000000..9d68288
--- /dev/null
+++ b/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
@@ -0,0 +1,108 @@
+From e322ca01613f6a51f1465711c2f890a372053a30 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Fri, 1 May 2015 12:19:34 +0200
+Subject: [PATCH] [FIX] install the stack libraries to "lib" subdirectory
+
+Using '.' to install the stack libraries is not correct since
+it will install them to /usr/ when CMAKE_INSTALL_PREFIX is set
+to "/usr/".
+
+ls /usr/liboplkmnapp-kernelintf.so
+
+Fix this by using ${CMAKE_INSTALL_PREFIX}/lib instead of '.'
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ stack/proj/linux/liboplkcn/CMakeLists.txt               | 2 +-
+ stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +-
+ stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt   | 2 +-
+ stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt       | 2 +-
+ stack/proj/linux/liboplkmn/CMakeLists.txt               | 2 +-
+ stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +-
+ stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt   | 2 +-
+ stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt       | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt
+index 0badff7..11e847e 100644
+--- a/stack/proj/linux/liboplkcn/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcn/CMakeLists.txt
+@@ -88,4 +88,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
+index 8fa52b1..fdab0d0 100644
+--- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
+@@ -81,4 +81,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
+index 5fbe345..ad7dfe8 100644
+--- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
+@@ -81,4 +81,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
+index c597747..167b441 100644
+--- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
++++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
+@@ -78,4 +78,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt
+index fcc751e..f707c05 100644
+--- a/stack/proj/linux/liboplkmn/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmn/CMakeLists.txt
+@@ -90,4 +90,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
+index ba179cc..4d23e2d 100644
+--- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt
+@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
+index e01ff1d..eda68eb 100644
+--- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt
+@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
+index c46943f..930660f 100644
+--- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
++++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
+@@ -78,4 +78,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})
+ SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")
+-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
++INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+-- 
+1.9.3
+
diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
new file mode 100644
index 0000000..8e61a7d
--- /dev/null
+++ b/package/openpowerlink2/Config.in
@@ -0,0 +1,46 @@
+comment "openpowerlink2 needs a toolchain w/ threads"
+	depends on BR2_i386 || BR2_x86_64
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+menuconfig BR2_PACKAGE_OPENPOWERLINK2
+	bool "openpowerlink2"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_i386 || BR2_x86_64
+	help
+	  openPOWERLINK2 is an Open Source Industrial Ethernet
+	  stack implementing the POWERLINK protocol for Managing Node
+	  (MN, POWERLINK Master) and Controlled Node (CN, POWERLINK Slave).
+
+	  It is provided by
+	  SYSTEC electronic (http://www.systec-electronic.com),
+	  B&R (http://www.br-automation.com) and
+	  Kalycito (http://www.kalycito.com).
+
+	  https://sourceforge.net/projects/openpowerlink/
+
+if BR2_PACKAGE_OPENPOWERLINK2
+
+choice
+	prompt "Select MN/CN mode"
+
+	config BR2_PACKAGE_OPENPOWERLINK2_MN
+	bool "MN"
+	help
+	  Enable Managing Node mode
+
+	config BR2_PACKAGE_OPENPOWERLINK2_CN
+	bool "CN"
+	help
+	  Enable Controlled Node mode
+
+endchoice
+
+source "package/openpowerlink2/openpowerlink2-stack/Config.in"
+
+config BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL
+	string "debug level for openpowerlink stack"
+	default "0xEC000000L"
+	help
+	  Debug level to be used for openPOWERLINK debugging functions.
+
+endif # BR2_PACKAGE_OPENPOWERLINK2
diff --git a/package/openpowerlink2/openpowerlink2-stack/Config.in b/package/openpowerlink2/openpowerlink2-stack/Config.in
new file mode 100644
index 0000000..c3ddf47
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-stack/Config.in
@@ -0,0 +1,34 @@
+
+choice
+	prompt "Select openPOWERLINK library type"
+
+config BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB
+	bool "the EPL stack is directly linked into application."
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  Compile a monolithic openPOWERLINK library. The library contains
+	  an Ethernet driver which is using the PCAP library for accessing
+	  the network.
+
+config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
+	bool "build EPL stack as linux userspace pcap daemon."
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  Compile openPOWERLINK application library which contains the
+	  interface to a Linux user space driver, and the Linux user space
+	  driver. It is used for implementing a multi-process solution
+	  where the openPOWERLINK kernel layer is running as a separate
+	  Linux user space daemon (e.g. a PCAP based user space daemon).
+
+config BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
+	bool "build EPL stack as linux kernelspace module."
+	depends on BR2_LINUX_KERNEL # openpowerlink-kernel-driver
+	help
+	  Compile openPOWERLINK application library which contains the
+	  interface to a Linux kernel space driver. It is used together
+	  with a Linux kernel module openPOWERLINK driver.
+
+comment "openpowerlink kernel stack needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
+
+endchoice
diff --git a/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk b/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
new file mode 100644
index 0000000..9fa2d63
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
@@ -0,0 +1,69 @@
+################################################################################
+#
+# openpowerlink2-stack
+#
+################################################################################
+
+OPENPOWERLINK2_STACK_VERSION = $(OPENPOWERLINK2_VERSION)
+
+OPENPOWERLINK2_STACK_LICENSE = $(OPENPOWERLINK2_LICENSE)
+OPENPOWERLINK2_STACK_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
+
+# We want to use the same archive for all sub-packages.
+OPENPOWERLINK2_STACK_SOURCE =
+OPENPOWERLINK2_STACK_DEPENDENCIES = openpowerlink2
+
+define OPENPOWERLINK2_STACK_SYMLINK_TO_SRC_HOOK
+	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_STACK_DIR)/src
+endef
+
+OPENPOWERLINK2_STACK_POST_EXTRACT_HOOKS += OPENPOWERLINK2_STACK_SYMLINK_TO_SRC_HOOK
+
+OPENPOWERLINK2_STACK_SUBDIR = src/stack
+
+OPENPOWERLINK2_STACK_INSTALL_STAGING = YES
+
+OPENPOWERLINK2_STACK_CONF_OPTS = -DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
+
+# All option are ON by default
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB),y)
+OPENPOWERLINK2_STACK_DEPENDENCIES += libpcap
+OPENPOWERLINK2_STACK_CONF_OPTS += \
+	-DCFG_COMPILE_LIB_MN=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
+	-DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \
+	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \
+	-DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \
+	-DCFG_COMPILE_LIB_CN=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
+	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
+	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
+	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB),y)
+OPENPOWERLINK2_STACK_DEPENDENCIES += libpcap
+OPENPOWERLINK2_STACK_CONF_OPTS += \
+	-DCFG_COMPILE_LIB_MN=OFF \
+	-DCFG_COMPILE_LIB_MNAPP_USERINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
+	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \
+	-DCFG_COMPILE_LIB_MNDRV_PCAP=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
+	-DCFG_COMPILE_LIB_CN=OFF \
+	-DCFG_COMPILE_LIB_CNAPP_USERINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
+	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
+	-DCFG_COMPILE_LIB_CNDRV_PCAP=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF)
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB),y)
+OPENPOWERLINK2_STACK_CONF_OPTS += \
+	-DCFG_COMPILE_LIB_MN=OFF \
+	-DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \
+	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
+	-DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \
+	-DCFG_COMPILE_LIB_CN=OFF \
+	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
+	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
+	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+OPENPOWERLINK2_STACK_CONF_OPTS += -DCFG_COMPILE_SHARED_LIBRARY=NO
+else
+OPENPOWERLINK2_STACK_CONF_OPTS += -DCFG_COMPILE_SHARED_LIBRARY=YES
+endif
+
+$(eval $(cmake-package))
diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
new file mode 100644
index 0000000..82c4277
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# openpowerlink2
+#
+################################################################################
+
+OPENPOWERLINK2_VERSION = V2.1.1
+OPENPOWERLINK2_SITE = http://git.code.sf.net/p/openpowerlink/openPOWERLINK2
+OPENPOWERLINK2_SITE_METHOD = git
+OPENPOWERLINK2_LICENSE = BSD-2c, GPLv2
+OPENPOWERLINK2_LICENSE_FILES = license.md
+
+# Just extract the archive
+
+$(eval $(generic-package))
+
+include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages
  2015-05-01 15:35 [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Romain Naour
@ 2015-05-01 15:35 ` Romain Naour
  2015-05-02 15:12   ` Arnout Vandecappelle
  2015-05-01 15:36 ` [Buildroot] [PATCH v2 3/3] package/openpowerlink2: add demo mn console application Romain Naour
  2015-05-02 14:53 ` [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Arnout Vandecappelle
  2 siblings, 1 reply; 9+ messages in thread
From: Romain Naour @ 2015-05-01 15:35 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
v2: s/BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER/BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS/
    The kernel module wasn't build due to a typo in the kconfig variable.
    rename openpowerlink2-pcap-drivers to openpowerlink2-pcap-daemon.
---
 package/openpowerlink2/Config.in                   |  1 +
 .../openpowerlink2-drivers/Config.in               |  3 ++
 .../openpowerlink2-drivers.mk                      |  2 +
 .../openpowerlink2-kernel-drivers/Config.in        | 33 +++++++++++++++
 .../openpowerlink2-kernel-drivers.mk               | 48 ++++++++++++++++++++++
 .../openpowerlink2-pcap-daemon/Config.in           | 12 ++++++
 .../openpowerlink2-pcap-daemon.mk                  | 34 +++++++++++++++
 .../openpowerlink2/openpowerlink2-stack/Config.in  |  2 +
 package/openpowerlink2/openpowerlink2.mk           |  1 +
 9 files changed, 136 insertions(+)
 create mode 100644 package/openpowerlink2/openpowerlink2-drivers/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
 create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
 create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk

diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
index 8e61a7d..c651031 100644
--- a/package/openpowerlink2/Config.in
+++ b/package/openpowerlink2/Config.in
@@ -35,6 +35,7 @@ choice
 
 endchoice
 
+source "package/openpowerlink2/openpowerlink2-drivers/Config.in"
 source "package/openpowerlink2/openpowerlink2-stack/Config.in"
 
 config BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL
diff --git a/package/openpowerlink2/openpowerlink2-drivers/Config.in b/package/openpowerlink2/openpowerlink2-drivers/Config.in
new file mode 100644
index 0000000..b9239ae
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-drivers/Config.in
@@ -0,0 +1,3 @@
+
+source "package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in"
+source "package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in"
diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
new file mode 100644
index 0000000..ab5cd1c
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
@@ -0,0 +1,2 @@
+
+include $(sort $(wildcard package/openpowerlink2/openpowerlink2-drivers/*/*.mk))
diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
new file mode 100644
index 0000000..461504c
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
@@ -0,0 +1,33 @@
+
+config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
+	bool "openpowerlink kernel stack"
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
+	help
+	  The openPOWERLINK stack is implemented as Linux kernel module.
+	  This solution provides the best performance, but is limited to
+	  the available openPOWERLINK network drivers.
+
+if BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
+
+choice
+	prompt "select Ethernet Powerlink Driver"
+
+config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_82573
+	bool "Intel 82573"
+
+config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_8255x
+	bool "Intel 8255x"
+
+config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_I210
+	bool "Intel I210"
+
+config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_RTL8111
+	bool "Realtek RTL-8111/8168"
+
+config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_RTL8139
+	bool "Realtek RTL-8139"
+
+endchoice
+
+endif # BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
new file mode 100644
index 0000000..a4470d8
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
@@ -0,0 +1,48 @@
+################################################################################
+#
+# openpowerlink2-kernel-drivers
+#
+################################################################################
+
+OPENPOWERLINK2_KERNEL_DRIVERS_VERSION = $(OPENPOWERLINK2_VERSION)
+
+OPENPOWERLINK2_KERNEL_DRIVERS_LICENSE = $(OPENPOWERLINK2_LICENSE)
+OPENPOWERLINK2_KERNEL_DRIVERS_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
+
+# We want to use the same archive for all sub-packages.
+OPENPOWERLINK2_KERNEL_DRIVERS_SOURCE =
+OPENPOWERLINK2_KERNEL_DRIVERS_DEPENDENCIES = linux openpowerlink2-stack
+
+define OPENPOWERLINK2_KERNEL_DRIVERS_SYMLINK_TO_SRC_HOOK
+	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_KERNEL_DRIVERS_DIR)/src
+endef
+
+OPENPOWERLINK2_KERNEL_DRIVERS_POST_EXTRACT_HOOKS += \
+	OPENPOWERLINK2_KERNEL_DRIVERS_SYMLINK_TO_SRC_HOOK
+
+OPENPOWERLINK2_KERNEL_DRIVERS_SUBDIR = src/drivers/linux/drv_kernelmod_edrv
+
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS = \
+	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL)) \
+	-DCFG_KERNEL_DIR=$(LINUX_DIR) \
+	-DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_MN),y)
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_OPLK_MN=ON
+else
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_OPLK_MN=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_82573),y)
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=82573
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_8255x),y)
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8255x
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_I210),y)
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=I210
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_RTL8139),y)
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8139
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_RTL8111),y)
+OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8111
+endif
+
+$(eval $(cmake-package))
diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
new file mode 100644
index 0000000..896152e
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
@@ -0,0 +1,12 @@
+
+config BR2_PACKAGE_OPENPOWERLINK2_PCAP_DAEMON
+	bool "openpowerlink userspace (PCAP) stack"
+	depends on BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  The Linux userspace implementation of the openPOWERLINK stack
+	  provides all functions for a software based POWERLINK solution
+	  running as Linux userspace application. The stack uses the
+	  libpcap library for accessing the network interface and is
+	  therefore totally independant of the used network card and
+	  driver.
diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
new file mode 100644
index 0000000..cc28d66
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# openpowerlink2-pcap-daemon
+#
+################################################################################
+
+OPENPOWERLINK2_PCAP_DAEMON_VERSION = $(OPENPOWERLINK2_VERSION)
+
+OPENPOWERLINK2_PCAP_DAEMON_LICENSE = $(OPENPOWERLINK2_LICENSE)
+OPENPOWERLINK2_PCAP_DAEMON_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
+
+# We want to use the same archive for all sub-packages.
+OPENPOWERLINK2_PCAP_DAEMON_SOURCE =
+OPENPOWERLINK2_PCAP_DAEMON_DEPENDENCIES = libpcap openpowerlink2-stack
+
+define OPENPOWERLINK2_PCAP_DAEMON_SYMLINK_TO_SRC_HOOK
+	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_PCAP_DAEMON_DIR)/src
+endef
+
+OPENPOWERLINK2_PCAP_DAEMON_POST_EXTRACT_HOOKS += \
+	OPENPOWERLINK2_PCAP_DAEMON_SYMLINK_TO_SRC_HOOK
+
+OPENPOWERLINK2_PCAP_DAEMON_SUBDIR = src/drivers/linux/drv_daemon_pcap
+
+OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS = \
+	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
+
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_MN),y)
+OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS += -DCFG_OPLK_MN=ON
+else
+OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS += -DCFG_OPLK_MN=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/package/openpowerlink2/openpowerlink2-stack/Config.in b/package/openpowerlink2/openpowerlink2-stack/Config.in
index c3ddf47..f73d8c8 100644
--- a/package/openpowerlink2/openpowerlink2-stack/Config.in
+++ b/package/openpowerlink2/openpowerlink2-stack/Config.in
@@ -13,6 +13,7 @@ config BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB
 config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
 	bool "build EPL stack as linux userspace pcap daemon."
 	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_OPENPOWERLINK2_PCAP_DAEMON
 	help
 	  Compile openPOWERLINK application library which contains the
 	  interface to a Linux user space driver, and the Linux user space
@@ -23,6 +24,7 @@ config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
 config BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
 	bool "build EPL stack as linux kernelspace module."
 	depends on BR2_LINUX_KERNEL # openpowerlink-kernel-driver
+	select BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
 	help
 	  Compile openPOWERLINK application library which contains the
 	  interface to a Linux kernel space driver. It is used together
diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
index 82c4277..144fa98 100644
--- a/package/openpowerlink2/openpowerlink2.mk
+++ b/package/openpowerlink2/openpowerlink2.mk
@@ -14,4 +14,5 @@ OPENPOWERLINK2_LICENSE_FILES = license.md
 
 $(eval $(generic-package))
 
+include package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
 include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 3/3] package/openpowerlink2: add demo mn console application
  2015-05-01 15:35 [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Romain Naour
  2015-05-01 15:35 ` [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages Romain Naour
@ 2015-05-01 15:36 ` Romain Naour
  2015-05-02 15:38   ` Arnout Vandecappelle
  2015-05-02 14:53 ` [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Arnout Vandecappelle
  2 siblings, 1 reply; 9+ messages in thread
From: Romain Naour @ 2015-05-01 15:36 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
v2: add missing -DCFG_DEBUG_LVL in CONF_OPTS
---
 package/openpowerlink2/Config.in                   |  1 +
 .../openpowerlink2/openpowerlink2-apps/Config.in   |  2 +
 .../openpowerlink2-apps-demo-mn-console/Config.in  |  5 +++
 .../openpowerlink2-apps-demo-mn-console.mk         | 45 ++++++++++++++++++++++
 .../openpowerlink2-apps/openpowerlink2-apps.mk     |  2 +
 package/openpowerlink2/openpowerlink2.mk           |  1 +
 6 files changed, 56 insertions(+)
 create mode 100644 package/openpowerlink2/openpowerlink2-apps/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in
 create mode 100644 package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk
 create mode 100644 package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk

diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
index c651031..e82e738 100644
--- a/package/openpowerlink2/Config.in
+++ b/package/openpowerlink2/Config.in
@@ -35,6 +35,7 @@ choice
 
 endchoice
 
+source "package/openpowerlink2/openpowerlink2-apps/Config.in"
 source "package/openpowerlink2/openpowerlink2-drivers/Config.in"
 source "package/openpowerlink2/openpowerlink2-stack/Config.in"
 
diff --git a/package/openpowerlink2/openpowerlink2-apps/Config.in b/package/openpowerlink2/openpowerlink2-apps/Config.in
new file mode 100644
index 0000000..6f10a6a
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-apps/Config.in
@@ -0,0 +1,2 @@
+
+source "package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in"
diff --git a/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in
new file mode 100644
index 0000000..dcf2605
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in
@@ -0,0 +1,5 @@
+
+config BR2_PACKAGE_OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE
+	bool "demo_mn_console"
+	help
+	  Managing Node console demo application
diff --git a/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk
new file mode 100644
index 0000000..23c17b5
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk
@@ -0,0 +1,45 @@
+################################################################################
+#
+# openpowerlink2-apps-demo-mn-console
+#
+################################################################################
+
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_VERSION = $(OPENPOWERLINK2_VERSION)
+
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_LICENSE = $(OPENPOWERLINK2_LICENSE)
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
+
+# We want to use the same archive for all sub-packages.
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SOURCE =
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_DEPENDENCIES = openpowerlink2-stack
+
+define OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SYMLINK_TO_SRC_HOOK
+	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_DIR)/src
+endef
+
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_POST_EXTRACT_HOOKS += \
+	OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SYMLINK_TO_SRC_HOOK
+
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SUBDIR = src/apps/demo_mn_console/
+
+# See apps/common/cmake/configure-linux.cmake for available options list.
+
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS = \
+	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
+	
+# PCAP is used for directlink or userspace daemon
+ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB),y)
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS += \
+	-DCFG_BUILD_KERNEL_STACK="Link to Application"
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB),y)
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS += \
+	-DCFG_BUILD_KERNEL_STACK="Linux Userspace Daemon" \
+	-DCFG_DEMO_MN_CONSOLE_USE_SYNCTHREAD=ON
+else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB),y)
+# kernel stack
+OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS += \
+	-DCFG_BUILD_KERNEL_STACK="Linux Kernel Module" \
+	-DCFG_DEMO_MN_CONSOLE_USE_SYNCTHREAD=ON
+endif
+
+$(eval $(cmake-package))
diff --git a/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
new file mode 100644
index 0000000..802dcbf
--- /dev/null
+++ b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
@@ -0,0 +1,2 @@
+
+include $(sort $(wildcard package/openpowerlink2/openpowerlink2-apps/*/*.mk))
diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
index 144fa98..ba0d418 100644
--- a/package/openpowerlink2/openpowerlink2.mk
+++ b/package/openpowerlink2/openpowerlink2.mk
@@ -14,5 +14,6 @@ OPENPOWERLINK2_LICENSE_FILES = license.md
 
 $(eval $(generic-package))
 
+include package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
 include package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
 include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package
  2015-05-01 15:35 [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Romain Naour
  2015-05-01 15:35 ` [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages Romain Naour
  2015-05-01 15:36 ` [Buildroot] [PATCH v2 3/3] package/openpowerlink2: add demo mn console application Romain Naour
@ 2015-05-02 14:53 ` Arnout Vandecappelle
  2015-05-06 12:20   ` Romain Naour
  2015-05-07 11:13   ` Romain Naour
  2 siblings, 2 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2015-05-02 14:53 UTC (permalink / raw)
  To: buildroot

On 01/05/15 17:35, Romain Naour wrote:
> The openpowerlink2 package archive contains several cmake projects,
> and each of them must be packaged separately in Buildroot.
> 
> "With version 2.0, the source code has been cleanly split into an
> application-oriented user library and a time-critical stack driver."

 Is the library's API also sufficiently different to warrant making it
powerlink2? It's difficult to evaluate for us since we don't have anything that
makes use of it in buildroot...

> 
> This complicates the packaging but it help to refine the dependencies
                                        helps

> compared to openpowerlink v1 build system.
> (openpowerlink v1 require C++ only for the qt demo)
                    requires

> 
> The generic openpowerlink2 package provide all sources files and
> patches which are then used by other openpowerlink2-* packages
> (sub-packages).
> Doing this avoids patches duplication over all sub-packages.
> 
> All patches fixes several issues with the cmake build system.
               fix

 What's the upstream status of these patches?

> 
> For each sub-packages, the extract hook create a symlink to the
                                          creates

> sources and the path to the cmake project is provided by *_SUBDIR
> value.

 Ouch, I really really don't like that. I'd much prefer to re-extract it from
the same source for each individual package - a bit like what we do with gcc.
The patches can be symlinked or applied with a hook (like is done for gcc).

> 
> There is one project for the EPL stack libraries wich provides:

 Perhaps explain what EPL is.

>  * an user space EPL stack to be linked into application
>  * an user space EPL stack pcap daemon
>  * an kernel space EPL library interface
> 
> There is two projects for EPL network driver:
        are               the

>  * pcap daemon driver
>  * kernel module driver.
> 
> Note: On x86/x86_64 only few EPL ethernet driver are available for
                           a                drivers

> the EPL kernel stack implementation:
>  * Intel 82573
>  * Intel 8255x
>  * Intel I210
>  * Realtek RTL-8111/8168 (new since V2.1.0)
>  * Realtek RTL-8139
> 
> There are one project for each demo applications:
        is                            application

>  * demo_cn_embedded
>  * demo_mn_embedded
>  * demo_cn_console
>  * demo_mn_console
>  * demo_mn_qt
> 
> Only demo_mn_console will be packaged in Buildroot for now.
> 
> This patch add the package for the stack libraries.
             adds

 This patch actually does two things: it adds the overall openpowerlink
infrastructure, and it adds the stack libraries. So it should be split into two
patches: one which adds the openpowerlink2 package, and one which adds the
openpowerlink2-stack package.

 Also, the policy is not to create more subdirectories. So openpowerlink2-stack
should appear directly under packages/.

> 
> [1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/
> 
[snip]
> diff --git a/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch b/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
> new file mode 100644
> index 0000000..16602ac
> --- /dev/null
> +++ b/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
> @@ -0,0 +1,116 @@
> +From 545fc1d84a224093f7f79b5193aa3f7308f86b3a Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@openwide.fr>
> +Date: Wed, 17 Sep 2014 13:45:19 +0200
> +Subject: [PATCH] [FIX] Don't link demos with Debug and Release libraries
> +
> +This is acutualy used by Visual Studio:
           actually

> +
> +"When you create a Visual Studio Solution on Windows by CMake,
> +the solution contains both Release and Debug build configurations.
> +You can switch between them in Visual Studio.
> +Therefore, you need both release and debug libraries."
> +
> +This patch break the build for Windows.

 I don't by that.

 Yes, you'll need to build both Release and Debug libraries. But you need to
link with only one of them.

 But in fact, that's exactly what TARGET_LINK_LIBRARIES does [1] - the libraries
after 'optimized' will be used in all configurations except Debug, and the
target after 'debug' will be used in the Debug configuration. So this patch is
doing what CMake should already do according to the documentation...
However, it turns out that CMake checks if ${OPLKLIB_DEBUG} exists even if we
don't need it because we're not in a Debug configuration.

 So, I think this patch should be acceptable upstream with an adapted commit
message:

[FIX] Don't link demos with Debug and Release libraries

TARGET_LINK_LIBRARIES() will link only with the 'debug' libraries in debug mode
and only with the 'optimized' libraries in any other mode, but CMake still
checks if the libraries that you don't link with exist. That makes it impossible
to release just an optimized library without debug library [1].

Therefore, this patch provides an alternative way to distinguish between debug
and optimized, with an explicit condition.

[1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/

> +
> +Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> +---
> + apps/demo_cn_console/CMakeLists.txt  |    6 +++++-
> + apps/demo_cn_embedded/CMakeLists.txt |    6 +++++-
> + apps/demo_mn_console/CMakeLists.txt  |    6 +++++-
> + apps/demo_mn_embedded/CMakeLists.txt |    6 +++++-
> + apps/demo_mn_qt/CMakeLists.txt       |    6 +++++-
> + 5 files changed, 25 insertions(+), 5 deletions(-)
> +
> +diff --git a/apps/demo_cn_console/CMakeLists.txt b/apps/demo_cn_console/CMakeLists.txt
> +index 2ba2bbd..4051bc8 100644
> +--- a/apps/demo_cn_console/CMakeLists.txt
> ++++ b/apps/demo_cn_console/CMakeLists.txt
> +@@ -105,8 +105,12 @@ SET_PROPERTY(TARGET demo_cn_console
> + 
> + ################################################################################
> + # Libraries to link
> ++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
> ++    TARGET_LINK_LIBRARIES(demo_cn_console debug ${OPLKLIB_DEBUG})

 The 'debug' part is now redundant.

> ++ELSE ()

 The coding style seems to be not to insert a space here.

> ++    TARGET_LINK_LIBRARIES(demo_cn_console optimized ${OPLKLIB})

 And here the optimized part.

> ++ENDIF()
> + 
[snip]

> diff --git a/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch b/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
> new file mode 100644
> index 0000000..9d68288
> --- /dev/null
> +++ b/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
> @@ -0,0 +1,108 @@
> +From e322ca01613f6a51f1465711c2f890a372053a30 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@openwide.fr>
> +Date: Fri, 1 May 2015 12:19:34 +0200
> +Subject: [PATCH] [FIX] install the stack libraries to "lib" subdirectory
> +
> +Using '.' to install the stack libraries is not correct since
> +it will install them to /usr/ when CMAKE_INSTALL_PREFIX is set

 CMAKE_INSTALL_PREFIX isn't needed here, CMake will add that automatically.

> +to "/usr/".
> +
> +ls /usr/liboplkmnapp-kernelintf.so
> +
> +Fix this by using ${CMAKE_INSTALL_PREFIX}/lib instead of '.'

 I guess there must be a reason why upstream does this crazy sh*t, so probably
this patch will be harder for them to accept...

[snip]
> diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
> new file mode 100644
> index 0000000..8e61a7d
> --- /dev/null
> +++ b/package/openpowerlink2/Config.in
> @@ -0,0 +1,46 @@
> +comment "openpowerlink2 needs a toolchain w/ threads"
> +	depends on BR2_i386 || BR2_x86_64
> +	depends on !BR2_TOOLCHAIN_HAS_THREADS

 Did you test with uClibc and/or musl?

> +
> +menuconfig BR2_PACKAGE_OPENPOWERLINK2
> +	bool "openpowerlink2"
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	depends on BR2_i386 || BR2_x86_64
> +	help
> +	  openPOWERLINK2 is an Open Source Industrial Ethernet
> +	  stack implementing the POWERLINK protocol for Managing Node
> +	  (MN, POWERLINK Master) and Controlled Node (CN, POWERLINK Slave).
> +
> +	  It is provided by
> +	  SYSTEC electronic (http://www.systec-electronic.com),
> +	  B&R (http://www.br-automation.com) and
> +	  Kalycito (http://www.kalycito.com).
> +
> +	  https://sourceforge.net/projects/openpowerlink/

 This refers to http://openpowerlink.sourceforge.net/web/ as the website.

> +
> +if BR2_PACKAGE_OPENPOWERLINK2
> +
> +choice
> +	prompt "Select MN/CN mode"
> +
> +	config BR2_PACKAGE_OPENPOWERLINK2_MN
> +	bool "MN"
> +	help
> +	  Enable Managing Node mode

 Perhaps add (Master) here.

> +
> +	config BR2_PACKAGE_OPENPOWERLINK2_CN
> +	bool "CN"
> +	help
> +	  Enable Controlled Node mode
> +
> +endchoice
> +
> +source "package/openpowerlink2/openpowerlink2-stack/Config.in"
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL
> +	string "debug level for openpowerlink stack"
> +	default "0xEC000000L"
> +	help
> +	  Debug level to be used for openPOWERLINK debugging functions.

 Maybe slightly more explanation what the bits mean? At least you should explain
that it has to be a hex number starting with 0x and ending with L.

 Why do you have this default?

> +
> +endif # BR2_PACKAGE_OPENPOWERLINK2
> diff --git a/package/openpowerlink2/openpowerlink2-stack/Config.in b/package/openpowerlink2/openpowerlink2-stack/Config.in
> new file mode 100644
> index 0000000..c3ddf47
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-stack/Config.in
> @@ -0,0 +1,34 @@
> +
> +choice
> +	prompt "Select openPOWERLINK library type"
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB
> +	bool "the EPL stack is directly linked into application."
> +	select BR2_PACKAGE_LIBPCAP
> +	help
> +	  Compile a monolithic openPOWERLINK library. The library contains
> +	  an Ethernet driver which is using the PCAP library for accessing
> +	  the network.

 Add "No kernel-side driver is needed."

 Or actually, replace driver with stack everywhere.

> +
> +config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
> +	bool "build EPL stack as linux userspace pcap daemon."
> +	select BR2_PACKAGE_LIBPCAP
> +	help
> +	  Compile openPOWERLINK application library which contains the
> +	  interface to a Linux user space driver, and the Linux user space

 I wouldn't call it driver, and there's no need to mention Linux so often.

> +	  driver. It is used for implementing a multi-process solution
> +	  where the openPOWERLINK kernel layer is running as a separate

 This 'kernel' is confusing, so just remove it.

> +	  Linux user space daemon (e.g. a PCAP based user space daemon).

 e.g. -> i.e.

 And add "No kernel-side stack is needed."

> +
> +config BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
> +	bool "build EPL stack as linux kernelspace module."
> +	depends on BR2_LINUX_KERNEL # openpowerlink-kernel-driver
> +	help
> +	  Compile openPOWERLINK application library which contains the
> +	  interface to a Linux kernel space driver. It is used together
> +	  with a Linux kernel module openPOWERLINK driver.

 It is used together with -> This will also build and install

 Also mention the name of that module.

> +
> +comment "openpowerlink kernel stack needs a Linux kernel to be built"
> +	depends on !BR2_LINUX_KERNEL
> +
> +endchoice
> diff --git a/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk b/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
> new file mode 100644
> index 0000000..9fa2d63
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
> @@ -0,0 +1,69 @@
> +################################################################################
> +#
> +# openpowerlink2-stack
> +#
> +################################################################################
> +
> +OPENPOWERLINK2_STACK_VERSION = $(OPENPOWERLINK2_VERSION)
> +
> +OPENPOWERLINK2_STACK_LICENSE = $(OPENPOWERLINK2_LICENSE)
> +OPENPOWERLINK2_STACK_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
> +
> +# We want to use the same archive for all sub-packages.
> +OPENPOWERLINK2_STACK_SOURCE =
> +OPENPOWERLINK2_STACK_DEPENDENCIES = openpowerlink2
> +
> +define OPENPOWERLINK2_STACK_SYMLINK_TO_SRC_HOOK
> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_STACK_DIR)/src
> +endef

 So here you can use the global _SOURCE and _SITE, and change this into

in the global .mk file:

define OPENPOWERLINK2_EXTRACT_CMDS
	$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
		$(TAR) -C $($(PKG)_DIR) $(TAR_OPTIONS) - $($(PKG)_TAR_OPTIONS)
endef

and in openpowerlink2-stack.mk:

OPENPOWERLINK2_STACK_EXTRACT_TAR_OPTIONS = src
OPENPOWERLINK2_STACK_EXTRACT_CMDS = $(OPENPOWERLINK2_EXTRACT_CMDS)

> +
> +OPENPOWERLINK2_STACK_POST_EXTRACT_HOOKS += OPENPOWERLINK2_STACK_SYMLINK_TO_SRC_HOOK
> +
> +OPENPOWERLINK2_STACK_SUBDIR = src/stack
> +
> +OPENPOWERLINK2_STACK_INSTALL_STAGING = YES
> +
> +OPENPOWERLINK2_STACK_CONF_OPTS = -DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))

 Add "" around this. And split the long line.

> +
> +# All option are ON by default

 So by default it would build the monolithic stack, the daemon, and the kernel
interface?

> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB),y)
> +OPENPOWERLINK2_STACK_DEPENDENCIES += libpcap
> +OPENPOWERLINK2_STACK_CONF_OPTS += \
> +	-DCFG_COMPILE_LIB_MN=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \
> +	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \
> +	-DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \
> +	-DCFG_COMPILE_LIB_CN=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
> +	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
> +	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB),y)
> +OPENPOWERLINK2_STACK_DEPENDENCIES += libpcap
> +OPENPOWERLINK2_STACK_CONF_OPTS += \
> +	-DCFG_COMPILE_LIB_MN=OFF \
> +	-DCFG_COMPILE_LIB_MNAPP_USERINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \
> +	-DCFG_COMPILE_LIB_MNDRV_PCAP=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_CN=OFF \
> +	-DCFG_COMPILE_LIB_CNAPP_USERINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
> +	-DCFG_COMPILE_LIB_CNDRV_PCAP=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF)
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB),y)
> +OPENPOWERLINK2_STACK_CONF_OPTS += \
> +	-DCFG_COMPILE_LIB_MN=OFF \
> +	-DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \
> +	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \
> +	-DCFG_COMPILE_LIB_CN=OFF \
> +	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
> +	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
> +	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF

 There is nothing here that refers to $(LINUX_DIR), so how is the module built?

> +endif
> +
> +ifeq ($(BR2_STATIC_LIBS),y)
> +OPENPOWERLINK2_STACK_CONF_OPTS += -DCFG_COMPILE_SHARED_LIBRARY=NO
> +else
> +OPENPOWERLINK2_STACK_CONF_OPTS += -DCFG_COMPILE_SHARED_LIBRARY=YES
> +endif
> +
> +$(eval $(cmake-package))
> diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
> new file mode 100644
> index 0000000..82c4277
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2.mk
> @@ -0,0 +1,17 @@
> +################################################################################
> +#
> +# openpowerlink2
> +#
> +################################################################################
> +
> +OPENPOWERLINK2_VERSION = V2.1.1
> +OPENPOWERLINK2_SITE = http://git.code.sf.net/p/openpowerlink/openPOWERLINK2
> +OPENPOWERLINK2_SITE_METHOD = git

 What's wrong with the tarball [2] ? It has the same contents. It is missing a
leading directory component but that's easily solved with custom extract commands.

 In that case, of course, add a hash file.


 Regards,
 Arnout

> +OPENPOWERLINK2_LICENSE = BSD-2c, GPLv2
> +OPENPOWERLINK2_LICENSE_FILES = license.md
> +
> +# Just extract the archive
> +
> +$(eval $(generic-package))
> +
> +include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
> 

[1] http://www.cmake.org/cmake/help/v3.2/command/target_link_libraries.html
[2]
http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V2.1.1/openPOWERLINK-V2.1.1.tar.gz

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages
  2015-05-01 15:35 ` [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages Romain Naour
@ 2015-05-02 15:12   ` Arnout Vandecappelle
  2015-05-07 14:46     ` Romain Naour
  0 siblings, 1 reply; 9+ messages in thread
From: Arnout Vandecappelle @ 2015-05-02 15:12 UTC (permalink / raw)
  To: buildroot

On 01/05/15 17:35, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
> v2: s/BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER/BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS/
>     The kernel module wasn't build due to a typo in the kconfig variable.
>     rename openpowerlink2-pcap-drivers to openpowerlink2-pcap-daemon.
> ---
>  package/openpowerlink2/Config.in                   |  1 +
>  .../openpowerlink2-drivers/Config.in               |  3 ++
>  .../openpowerlink2-drivers.mk                      |  2 +
>  .../openpowerlink2-kernel-drivers/Config.in        | 33 +++++++++++++++
>  .../openpowerlink2-kernel-drivers.mk               | 48 ++++++++++++++++++++++
>  .../openpowerlink2-pcap-daemon/Config.in           | 12 ++++++
>  .../openpowerlink2-pcap-daemon.mk                  | 34 +++++++++++++++
>  .../openpowerlink2/openpowerlink2-stack/Config.in  |  2 +
>  package/openpowerlink2/openpowerlink2.mk           |  1 +

 Again, this should be split into one patch per package, and without subdirectory.

>  9 files changed, 136 insertions(+)
>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/Config.in
>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
> 
> diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
> index 8e61a7d..c651031 100644
> --- a/package/openpowerlink2/Config.in
> +++ b/package/openpowerlink2/Config.in
> @@ -35,6 +35,7 @@ choice
>  
>  endchoice
>  
> +source "package/openpowerlink2/openpowerlink2-drivers/Config.in"
>  source "package/openpowerlink2/openpowerlink2-stack/Config.in"

 It doesn't make sense to put the drivers before the stack, if you first have to
go to the stack to select the option that makes it possible to select drivers...
So IMHO this is a case were we can break alphabetical ordering.

>  
>  config BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL
> diff --git a/package/openpowerlink2/openpowerlink2-drivers/Config.in b/package/openpowerlink2/openpowerlink2-drivers/Config.in
> new file mode 100644
> index 0000000..b9239ae
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-drivers/Config.in
> @@ -0,0 +1,3 @@
> +
> +source "package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in"
> +source "package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in"

 This extra config file and non-package package isn't needed. So just make one
patch to add -kernel-drivers, and another patch to add -pcap-daemon.

> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
> new file mode 100644
> index 0000000..ab5cd1c
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
> @@ -0,0 +1,2 @@
> +
> +include $(sort $(wildcard package/openpowerlink2/openpowerlink2-drivers/*/*.mk))
> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
> new file mode 100644
> index 0000000..461504c
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
> @@ -0,0 +1,33 @@
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
> +	bool "openpowerlink kernel stack"
> +	depends on BR2_LINUX_KERNEL
> +	depends on BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB

 That can't be right, you have both a depends here and a select in
BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB. Kconfig should error on that.

> +	help
> +	  The openPOWERLINK stack is implemented as Linux kernel module.
> +	  This solution provides the best performance, but is limited to
> +	  the available openPOWERLINK network drivers.

 This sentence should go to the choice in the stack.

 Perhaps the help text should also mention that the user is responsible for
making sure that the 'normal' driver for the ethernet chip isn't enabled or loaded.

> +
> +if BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
> +
> +choice
> +	prompt "select Ethernet Powerlink Driver"

 Are they really mutually exclusive?

> +
> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_82573
> +	bool "Intel 82573"
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_8255x
> +	bool "Intel 8255x"
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_I210
> +	bool "Intel I210"
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_RTL8111
> +	bool "Realtek RTL-8111/8168"
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_RTL8139
> +	bool "Realtek RTL-8139"
> +
> +endchoice
> +
> +endif # BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
> new file mode 100644
> index 0000000..a4470d8
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
> @@ -0,0 +1,48 @@
> +################################################################################
> +#
> +# openpowerlink2-kernel-drivers
> +#
> +################################################################################
> +
> +OPENPOWERLINK2_KERNEL_DRIVERS_VERSION = $(OPENPOWERLINK2_VERSION)
> +
> +OPENPOWERLINK2_KERNEL_DRIVERS_LICENSE = $(OPENPOWERLINK2_LICENSE)
> +OPENPOWERLINK2_KERNEL_DRIVERS_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
> +
> +# We want to use the same archive for all sub-packages.
> +OPENPOWERLINK2_KERNEL_DRIVERS_SOURCE =
> +OPENPOWERLINK2_KERNEL_DRIVERS_DEPENDENCIES = linux openpowerlink2-stack
> +
> +define OPENPOWERLINK2_KERNEL_DRIVERS_SYMLINK_TO_SRC_HOOK
> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_KERNEL_DRIVERS_DIR)/src
> +endef
> +
> +OPENPOWERLINK2_KERNEL_DRIVERS_POST_EXTRACT_HOOKS += \
> +	OPENPOWERLINK2_KERNEL_DRIVERS_SYMLINK_TO_SRC_HOOK

 Same here for extracting instead of symlinking, but I guess here you need just
src/drivers/linux/drv_kernelmod_edrv.

> +
> +OPENPOWERLINK2_KERNEL_DRIVERS_SUBDIR = src/drivers/linux/drv_kernelmod_edrv
> +
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS = \
> +	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL)) \
> +	-DCFG_KERNEL_DIR=$(LINUX_DIR) \
> +	-DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
> +
> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_MN),y)
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_OPLK_MN=ON
> +else
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_OPLK_MN=OFF

 For consistency, it would be better to use the same $(if ...) construct that
you use in -stack.

 BTW, is there no corresponding option for CN?

> +endif
> +
> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_82573),y)
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=82573
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_8255x),y)
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8255x
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_I210),y)
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=I210
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_RTL8139),y)
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8139
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_RTL8111),y)
> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8111
> +endif
> +
> +$(eval $(cmake-package))
> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
> new file mode 100644
> index 0000000..896152e
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
> @@ -0,0 +1,12 @@
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_PCAP_DAEMON
> +	bool "openpowerlink userspace (PCAP) stack"
> +	depends on BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
> +	select BR2_PACKAGE_LIBPCAP
> +	help
> +	  The Linux userspace implementation of the openPOWERLINK stack
> +	  provides all functions for a software based POWERLINK solution
> +	  running as Linux userspace application. The stack uses the
> +	  libpcap library for accessing the network interface and is
> +	  therefore totally independant of the used network card and
                            independent

> +	  driver.
> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
> new file mode 100644
> index 0000000..cc28d66
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
> @@ -0,0 +1,34 @@
> +################################################################################
> +#
> +# openpowerlink2-pcap-daemon
> +#
> +################################################################################
> +
> +OPENPOWERLINK2_PCAP_DAEMON_VERSION = $(OPENPOWERLINK2_VERSION)
> +
> +OPENPOWERLINK2_PCAP_DAEMON_LICENSE = $(OPENPOWERLINK2_LICENSE)
> +OPENPOWERLINK2_PCAP_DAEMON_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
> +
> +# We want to use the same archive for all sub-packages.
> +OPENPOWERLINK2_PCAP_DAEMON_SOURCE =
> +OPENPOWERLINK2_PCAP_DAEMON_DEPENDENCIES = libpcap openpowerlink2-stack
> +
> +define OPENPOWERLINK2_PCAP_DAEMON_SYMLINK_TO_SRC_HOOK
> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_PCAP_DAEMON_DIR)/src
> +endef
> +
> +OPENPOWERLINK2_PCAP_DAEMON_POST_EXTRACT_HOOKS += \
> +	OPENPOWERLINK2_PCAP_DAEMON_SYMLINK_TO_SRC_HOOK
> +
> +OPENPOWERLINK2_PCAP_DAEMON_SUBDIR = src/drivers/linux/drv_daemon_pcap
> +
> +OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS = \
> +	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
> +
> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_MN),y)
> +OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS += -DCFG_OPLK_MN=ON
> +else
> +OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS += -DCFG_OPLK_MN=OFF
> +endif

 Same here about the $(if).

 Since it's used so often, perhaps it's better to define a global

OPENPOWERLINK2_MN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF)
OPENPOWERLINK2_CN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF)

> +
> +$(eval $(cmake-package))
> diff --git a/package/openpowerlink2/openpowerlink2-stack/Config.in b/package/openpowerlink2/openpowerlink2-stack/Config.in
> index c3ddf47..f73d8c8 100644
> --- a/package/openpowerlink2/openpowerlink2-stack/Config.in
> +++ b/package/openpowerlink2/openpowerlink2-stack/Config.in
> @@ -13,6 +13,7 @@ config BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB
>  config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
>  	bool "build EPL stack as linux userspace pcap daemon."
>  	select BR2_PACKAGE_LIBPCAP

 Does the -stack use LIBPCAP directly in this case? If not, this select
shouldn't be there.

 Regards,
 Arnout

> +	select BR2_PACKAGE_OPENPOWERLINK2_PCAP_DAEMON
>  	help
>  	  Compile openPOWERLINK application library which contains the
>  	  interface to a Linux user space driver, and the Linux user space
> @@ -23,6 +24,7 @@ config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
>  config BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
>  	bool "build EPL stack as linux kernelspace module."
>  	depends on BR2_LINUX_KERNEL # openpowerlink-kernel-driver
> +	select BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
>  	help
>  	  Compile openPOWERLINK application library which contains the
>  	  interface to a Linux kernel space driver. It is used together
> diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
> index 82c4277..144fa98 100644
> --- a/package/openpowerlink2/openpowerlink2.mk
> +++ b/package/openpowerlink2/openpowerlink2.mk
> @@ -14,4 +14,5 @@ OPENPOWERLINK2_LICENSE_FILES = license.md
>  
>  $(eval $(generic-package))
>  
> +include package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>  include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 3/3] package/openpowerlink2: add demo mn console application
  2015-05-01 15:36 ` [Buildroot] [PATCH v2 3/3] package/openpowerlink2: add demo mn console application Romain Naour
@ 2015-05-02 15:38   ` Arnout Vandecappelle
  0 siblings, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2015-05-02 15:38 UTC (permalink / raw)
  To: buildroot

On 01/05/15 17:36, Romain Naour wrote:
> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
> ---
> v2: add missing -DCFG_DEBUG_LVL in CONF_OPTS
> ---
>  package/openpowerlink2/Config.in                   |  1 +
>  .../openpowerlink2/openpowerlink2-apps/Config.in   |  2 +
>  .../openpowerlink2-apps-demo-mn-console/Config.in  |  5 +++
>  .../openpowerlink2-apps-demo-mn-console.mk         | 45 ++++++++++++++++++++++
>  .../openpowerlink2-apps/openpowerlink2-apps.mk     |  2 +
>  package/openpowerlink2/openpowerlink2.mk           |  1 +
>  6 files changed, 56 insertions(+)
>  create mode 100644 package/openpowerlink2/openpowerlink2-apps/Config.in
>  create mode 100644 package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in
>  create mode 100644 package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk
>  create mode 100644 package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
> 
> diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
> index c651031..e82e738 100644
> --- a/package/openpowerlink2/Config.in
> +++ b/package/openpowerlink2/Config.in
> @@ -35,6 +35,7 @@ choice
>  
>  endchoice
>  
> +source "package/openpowerlink2/openpowerlink2-apps/Config.in"
>  source "package/openpowerlink2/openpowerlink2-drivers/Config.in"
>  source "package/openpowerlink2/openpowerlink2-stack/Config.in"

 Actually, shouldn't the _DEBUG_LEVEL option come before the sourcing of the
other packages?

>  
> diff --git a/package/openpowerlink2/openpowerlink2-apps/Config.in b/package/openpowerlink2/openpowerlink2-apps/Config.in
> new file mode 100644
> index 0000000..6f10a6a
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-apps/Config.in
> @@ -0,0 +1,2 @@
> +
> +source "package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in"
> diff --git a/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in
> new file mode 100644
> index 0000000..dcf2605
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/Config.in
> @@ -0,0 +1,5 @@
> +
> +config BR2_PACKAGE_OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE
> +	bool "demo_mn_console"

 Shouldn't this depend on BR2_PACKAGE_OPENPOWERLINK2_MN and either select or
depend on the stack?

> +	help
> +	  Managing Node console demo application
> diff --git a/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk
> new file mode 100644
> index 0000000..23c17b5
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps-demo-mn-console/openpowerlink2-apps-demo-mn-console.mk
> @@ -0,0 +1,45 @@
> +################################################################################
> +#
> +# openpowerlink2-apps-demo-mn-console
> +#
> +################################################################################
> +
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_VERSION = $(OPENPOWERLINK2_VERSION)
> +
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_LICENSE = $(OPENPOWERLINK2_LICENSE)
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
> +
> +# We want to use the same archive for all sub-packages.
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SOURCE =
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_DEPENDENCIES = openpowerlink2-stack
> +
> +define OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SYMLINK_TO_SRC_HOOK
> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_DIR)/src
> +endef
> +
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_POST_EXTRACT_HOOKS += \
> +	OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SYMLINK_TO_SRC_HOOK
> +
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_SUBDIR = src/apps/demo_mn_console/
> +
> +# See apps/common/cmake/configure-linux.cmake for available options list.
> +
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS = \
> +	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
> +	
> +# PCAP is used for directlink or userspace daemon

 Why is this here?

> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB),y)
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS += \
> +	-DCFG_BUILD_KERNEL_STACK="Link to Application"
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB),y)
> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS += \
> +	-DCFG_BUILD_KERNEL_STACK="Linux Userspace Daemon" \
> +	-DCFG_DEMO_MN_CONSOLE_USE_SYNCTHREAD=ON
> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB),y)
> +# kernel stack

 Well, yes, obviously...



 Regards,
 Arnout

> +OPENPOWERLINK2_APPS_DEMO_MN_CONSOLE_CONF_OPTS += \
> +	-DCFG_BUILD_KERNEL_STACK="Linux Kernel Module" \
> +	-DCFG_DEMO_MN_CONSOLE_USE_SYNCTHREAD=ON
> +endif
> +
> +$(eval $(cmake-package))
> diff --git a/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
> new file mode 100644
> index 0000000..802dcbf
> --- /dev/null
> +++ b/package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
> @@ -0,0 +1,2 @@
> +
> +include $(sort $(wildcard package/openpowerlink2/openpowerlink2-apps/*/*.mk))
> diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
> index 144fa98..ba0d418 100644
> --- a/package/openpowerlink2/openpowerlink2.mk
> +++ b/package/openpowerlink2/openpowerlink2.mk
> @@ -14,5 +14,6 @@ OPENPOWERLINK2_LICENSE_FILES = license.md
>  
>  $(eval $(generic-package))
>  
> +include package/openpowerlink2/openpowerlink2-apps/openpowerlink2-apps.mk
>  include package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>  include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package
  2015-05-02 14:53 ` [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Arnout Vandecappelle
@ 2015-05-06 12:20   ` Romain Naour
  2015-05-07 11:13   ` Romain Naour
  1 sibling, 0 replies; 9+ messages in thread
From: Romain Naour @ 2015-05-06 12:20 UTC (permalink / raw)
  To: buildroot

Hi Arnout,

Le 02/05/2015 16:53, Arnout Vandecappelle a ?crit :
> On 01/05/15 17:35, Romain Naour wrote:
>> The openpowerlink2 package archive contains several cmake projects,
>> and each of them must be packaged separately in Buildroot.
>>
>> "With version 2.0, the source code has been cleanly split into an
>> application-oriented user library and a time-critical stack driver."
> 
>  Is the library's API also sufficiently different to warrant making it
> powerlink2? It's difficult to evaluate for us since we don't have anything that
> makes use of it in buildroot...

No, it's a complete rewrite of the powerlink stack, so the API has changed.
Example: EPLApiInitialize() became oplk_init().
And some openpowerlink variable type has changed...

> 
>>
>> This complicates the packaging but it help to refine the dependencies
>                                         helps
> 
>> compared to openpowerlink v1 build system.
>> (openpowerlink v1 require C++ only for the qt demo)
>                     requires
> 
>>
>> The generic openpowerlink2 package provide all sources files and
>> patches which are then used by other openpowerlink2-* packages
>> (sub-packages).
>> Doing this avoids patches duplication over all sub-packages.
>>
>> All patches fixes several issues with the cmake build system.
>                fix
> 
>  What's the upstream status of these patches?
> 
>>
>> For each sub-packages, the extract hook create a symlink to the
>                                           creates
> 
>> sources and the path to the cmake project is provided by *_SUBDIR
>> value.
> 
>  Ouch, I really really don't like that. I'd much prefer to re-extract it from
> the same source for each individual package - a bit like what we do with gcc.
> The patches can be symlinked or applied with a hook (like is done for gcc).

Ok, I'll try with a hook then. But it seems that the build system is not really
sysroot aware, I'm expecting some build issue with the demo apps.

> 
>>
>> There is one project for the EPL stack libraries wich provides:
> 
>  Perhaps explain what EPL is.

EPL means Ethernet PowerLink but it seems that upstream use opkl now.

> 
>>  * an user space EPL stack to be linked into application
>>  * an user space EPL stack pcap daemon
>>  * an kernel space EPL library interface
>>
>> There is two projects for EPL network driver:
>         are               the
> 
>>  * pcap daemon driver
>>  * kernel module driver.
>>
>> Note: On x86/x86_64 only few EPL ethernet driver are available for
>                            a                drivers
> 
>> the EPL kernel stack implementation:
>>  * Intel 82573
>>  * Intel 8255x
>>  * Intel I210
>>  * Realtek RTL-8111/8168 (new since V2.1.0)
>>  * Realtek RTL-8139
>>
>> There are one project for each demo applications:
>         is                            application
> 
>>  * demo_cn_embedded
>>  * demo_mn_embedded
>>  * demo_cn_console
>>  * demo_mn_console
>>  * demo_mn_qt
>>
>> Only demo_mn_console will be packaged in Buildroot for now.
>>
>> This patch add the package for the stack libraries.
>              adds
> 
>  This patch actually does two things: it adds the overall openpowerlink
> infrastructure, and it adds the stack libraries. So it should be split into two
> patches: one which adds the openpowerlink2 package, and one which adds the
> openpowerlink2-stack package.

I'll try to merge openpowerlink2 and openpowerlink2-stack into the same
Buildroot's package to simplify thanks to the apply-patch hook.

> 
>  Also, the policy is not to create more subdirectories. So openpowerlink2-stack
> should appear directly under packages/.

OK.

> 
>>
>> [1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/
>>
> [snip]
>> diff --git a/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch b/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
>> new file mode 100644
>> index 0000000..16602ac
>> --- /dev/null
>> +++ b/package/openpowerlink2/0002-FIX-Don-t-link-demos-with-Debug-and-Release-librarie.patch
>> @@ -0,0 +1,116 @@
>> +From 545fc1d84a224093f7f79b5193aa3f7308f86b3a Mon Sep 17 00:00:00 2001
>> +From: Romain Naour <romain.naour@openwide.fr>
>> +Date: Wed, 17 Sep 2014 13:45:19 +0200
>> +Subject: [PATCH] [FIX] Don't link demos with Debug and Release libraries
>> +
>> +This is acutualy used by Visual Studio:
>            actually
> 
>> +
>> +"When you create a Visual Studio Solution on Windows by CMake,
>> +the solution contains both Release and Debug build configurations.
>> +You can switch between them in Visual Studio.
>> +Therefore, you need both release and debug libraries."
>> +
>> +This patch break the build for Windows.
> 
>  I don't by that.
> 
>  Yes, you'll need to build both Release and Debug libraries. But you need to
> link with only one of them.
> 
>  But in fact, that's exactly what TARGET_LINK_LIBRARIES does [1] - the libraries
> after 'optimized' will be used in all configurations except Debug, and the
> target after 'debug' will be used in the Debug configuration. So this patch is
> doing what CMake should already do according to the documentation...
> However, it turns out that CMake checks if ${OPLKLIB_DEBUG} exists even if we
> don't need it because we're not in a Debug configuration.

Since I reported this issue, a note has been added to the documentation:
doc/build-stack.md but the issue hasn't be fixed...

> 
>  So, I think this patch should be acceptable upstream with an adapted commit
> message:
> 
> [FIX] Don't link demos with Debug and Release libraries
> 
> TARGET_LINK_LIBRARIES() will link only with the 'debug' libraries in debug mode
> and only with the 'optimized' libraries in any other mode, but CMake still
> checks if the libraries that you don't link with exist. That makes it impossible
> to release just an optimized library without debug library [1].
> 
> Therefore, this patch provides an alternative way to distinguish between debug
> and optimized, with an explicit condition.
> 
> [1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/

Thanks, commit log updated :)

>> +
>> +Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> +---
>> + apps/demo_cn_console/CMakeLists.txt  |    6 +++++-
>> + apps/demo_cn_embedded/CMakeLists.txt |    6 +++++-
>> + apps/demo_mn_console/CMakeLists.txt  |    6 +++++-
>> + apps/demo_mn_embedded/CMakeLists.txt |    6 +++++-
>> + apps/demo_mn_qt/CMakeLists.txt       |    6 +++++-
>> + 5 files changed, 25 insertions(+), 5 deletions(-)
>> +
>> +diff --git a/apps/demo_cn_console/CMakeLists.txt b/apps/demo_cn_console/CMakeLists.txt
>> +index 2ba2bbd..4051bc8 100644
>> +--- a/apps/demo_cn_console/CMakeLists.txt
>> ++++ b/apps/demo_cn_console/CMakeLists.txt
>> +@@ -105,8 +105,12 @@ SET_PROPERTY(TARGET demo_cn_console
>> + 
>> + ################################################################################
>> + # Libraries to link
>> ++IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
>> ++    TARGET_LINK_LIBRARIES(demo_cn_console debug ${OPLKLIB_DEBUG})
> 
>  The 'debug' part is now redundant.
> 
>> ++ELSE ()
> 
>  The coding style seems to be not to insert a space here.
> 
>> ++    TARGET_LINK_LIBRARIES(demo_cn_console optimized ${OPLKLIB})
> 
>  And here the optimized part.

Yes indeed.

> 
>> ++ENDIF()
>> + 
> [snip]
> 
>> diff --git a/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch b/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
>> new file mode 100644
>> index 0000000..9d68288
>> --- /dev/null
>> +++ b/package/openpowerlink2/0003-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
>> @@ -0,0 +1,108 @@
>> +From e322ca01613f6a51f1465711c2f890a372053a30 Mon Sep 17 00:00:00 2001
>> +From: Romain Naour <romain.naour@openwide.fr>
>> +Date: Fri, 1 May 2015 12:19:34 +0200
>> +Subject: [PATCH] [FIX] install the stack libraries to "lib" subdirectory
>> +
>> +Using '.' to install the stack libraries is not correct since
>> +it will install them to /usr/ when CMAKE_INSTALL_PREFIX is set
> 
>  CMAKE_INSTALL_PREFIX isn't needed here, CMake will add that automatically.
> 
>> +to "/usr/".
>> +
>> +ls /usr/liboplkmnapp-kernelintf.so
>> +
>> +Fix this by using ${CMAKE_INSTALL_PREFIX}/lib instead of '.'
> 
>  I guess there must be a reason why upstream does this crazy sh*t, so probably
> this patch will be harder for them to accept...
> 
> [snip]
>> diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
>> new file mode 100644
>> index 0000000..8e61a7d
>> --- /dev/null
>> +++ b/package/openpowerlink2/Config.in
>> @@ -0,0 +1,46 @@
>> +comment "openpowerlink2 needs a toolchain w/ threads"
>> +	depends on BR2_i386 || BR2_x86_64
>> +	depends on !BR2_TOOLCHAIN_HAS_THREADS
> 
>  Did you test with uClibc and/or musl?

No, only with a glibc toolchain, you know my cs ia32 toolchain 2014.11
sgxx-glibc ;-)
Ok, I'll try just with a test build.

> 
>> +
>> +menuconfig BR2_PACKAGE_OPENPOWERLINK2
>> +	bool "openpowerlink2"
>> +	depends on BR2_TOOLCHAIN_HAS_THREADS
>> +	depends on BR2_i386 || BR2_x86_64
>> +	help
>> +	  openPOWERLINK2 is an Open Source Industrial Ethernet
>> +	  stack implementing the POWERLINK protocol for Managing Node
>> +	  (MN, POWERLINK Master) and Controlled Node (CN, POWERLINK Slave).
>> +
>> +	  It is provided by
>> +	  SYSTEC electronic (http://www.systec-electronic.com),
>> +	  B&R (http://www.br-automation.com) and
>> +	  Kalycito (http://www.kalycito.com).
>> +
>> +	  https://sourceforge.net/projects/openpowerlink/
> 
>  This refers to http://openpowerlink.sourceforge.net/web/ as the website.

Ok

> 
>> +
>> +if BR2_PACKAGE_OPENPOWERLINK2
>> +
>> +choice
>> +	prompt "Select MN/CN mode"
>> +
>> +	config BR2_PACKAGE_OPENPOWERLINK2_MN
>> +	bool "MN"
>> +	help
>> +	  Enable Managing Node mode
> 
>  Perhaps add (Master) here.

ok

> 
>> +
>> +	config BR2_PACKAGE_OPENPOWERLINK2_CN
>> +	bool "CN"
>> +	help
>> +	  Enable Controlled Node mode

I also added (slave) here.

>> +
>> +endchoice
>> +
>> +source "package/openpowerlink2/openpowerlink2-stack/Config.in"
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL
>> +	string "debug level for openpowerlink stack"
>> +	default "0xEC000000L"
>> +	help
>> +	  Debug level to be used for openPOWERLINK debugging functions.
> 
>  Maybe slightly more explanation what the bits mean? At least you should explain
> that it has to be a hex number starting with 0x and ending with L.
> 
>  Why do you have this default?

Well, it's the default value I found in stack/CMakeLists.txt.
I added a link to the header file where the bit field is defined (oplk/debug.h).
I'm not sure that L is really necessary.

> 
>> +
>> +endif # BR2_PACKAGE_OPENPOWERLINK2
>> diff --git a/package/openpowerlink2/openpowerlink2-stack/Config.in b/package/openpowerlink2/openpowerlink2-stack/Config.in
>> new file mode 100644
>> index 0000000..c3ddf47
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-stack/Config.in
>> @@ -0,0 +1,34 @@
>> +
>> +choice
>> +	prompt "Select openPOWERLINK library type"
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB
>> +	bool "the EPL stack is directly linked into application."
>> +	select BR2_PACKAGE_LIBPCAP
>> +	help
>> +	  Compile a monolithic openPOWERLINK library. The library contains
>> +	  an Ethernet driver which is using the PCAP library for accessing
>> +	  the network.
> 
>  Add "No kernel-side driver is needed."
> 
>  Or actually, replace driver with stack everywhere.

They use "Linux user space driver" for PCAP Ethernet driver. I'm trying to
follow to documentation found in build-stack.md. So, I want to avoid another
terminology here.

> 
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
>> +	bool "build EPL stack as linux userspace pcap daemon."
>> +	select BR2_PACKAGE_LIBPCAP
>> +	help
>> +	  Compile openPOWERLINK application library which contains the
>> +	  interface to a Linux user space driver, and the Linux user space
> 
>  I wouldn't call it driver, and there's no need to mention Linux so often.

So, I may reword entirely the help text without borrowing the text from
build-stack.md.

> 
>> +	  driver. It is used for implementing a multi-process solution
>> +	  where the openPOWERLINK kernel layer is running as a separate
> 
>  This 'kernel' is confusing, so just remove it.
> 
>> +	  Linux user space daemon (e.g. a PCAP based user space daemon).
> 
>  e.g. -> i.e.
> 
>  And add "No kernel-side stack is needed."
> 
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
>> +	bool "build EPL stack as linux kernelspace module."
>> +	depends on BR2_LINUX_KERNEL # openpowerlink-kernel-driver
>> +	help
>> +	  Compile openPOWERLINK application library which contains the
>> +	  interface to a Linux kernel space driver. It is used together
>> +	  with a Linux kernel module openPOWERLINK driver.
> 
>  It is used together with -> This will also build and install
> 
>  Also mention the name of that module.
> 
>> +
>> +comment "openpowerlink kernel stack needs a Linux kernel to be built"
>> +	depends on !BR2_LINUX_KERNEL
>> +
>> +endchoice
>> diff --git a/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk b/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
>> new file mode 100644
>> index 0000000..9fa2d63
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
>> @@ -0,0 +1,69 @@
>> +################################################################################
>> +#
>> +# openpowerlink2-stack
>> +#
>> +################################################################################
>> +
>> +OPENPOWERLINK2_STACK_VERSION = $(OPENPOWERLINK2_VERSION)
>> +
>> +OPENPOWERLINK2_STACK_LICENSE = $(OPENPOWERLINK2_LICENSE)
>> +OPENPOWERLINK2_STACK_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
>> +
>> +# We want to use the same archive for all sub-packages.
>> +OPENPOWERLINK2_STACK_SOURCE =
>> +OPENPOWERLINK2_STACK_DEPENDENCIES = openpowerlink2
>> +
>> +define OPENPOWERLINK2_STACK_SYMLINK_TO_SRC_HOOK
>> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_STACK_DIR)/src
>> +endef
> 
>  So here you can use the global _SOURCE and _SITE, and change this into
> 
> in the global .mk file:
> 
> define OPENPOWERLINK2_EXTRACT_CMDS
> 	$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
> 		$(TAR) -C $($(PKG)_DIR) $(TAR_OPTIONS) - $($(PKG)_TAR_OPTIONS)
> endef
> 
> and in openpowerlink2-stack.mk:
> 
> OPENPOWERLINK2_STACK_EXTRACT_TAR_OPTIONS = src
> OPENPOWERLINK2_STACK_EXTRACT_CMDS = $(OPENPOWERLINK2_EXTRACT_CMDS)
> 
>> +
>> +OPENPOWERLINK2_STACK_POST_EXTRACT_HOOKS += OPENPOWERLINK2_STACK_SYMLINK_TO_SRC_HOOK
>> +
>> +OPENPOWERLINK2_STACK_SUBDIR = src/stack
>> +
>> +OPENPOWERLINK2_STACK_INSTALL_STAGING = YES
>> +
>> +OPENPOWERLINK2_STACK_CONF_OPTS = -DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
> 
>  Add "" around this. And split the long line.
> 
>> +
>> +# All option are ON by default
> 
>  So by default it would build the monolithic stack, the daemon, and the kernel
> interface?

Yes, all libraries are build since all options are ON in
stack/cmake/options-linux.cmake.
But you can use only one of them at run time.
Also disabling monolithic stack and daemon remove the pcap dependency and
disabling the kernel interface remove the linux dependency.
Actually, I only use the kernel interface.

> 
>> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB),y)
>> +OPENPOWERLINK2_STACK_DEPENDENCIES += libpcap
>> +OPENPOWERLINK2_STACK_CONF_OPTS += \
>> +	-DCFG_COMPILE_LIB_MN=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \
>> +	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \
>> +	-DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \
>> +	-DCFG_COMPILE_LIB_CN=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
>> +	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
>> +	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF
>> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB),y)
>> +OPENPOWERLINK2_STACK_DEPENDENCIES += libpcap
>> +OPENPOWERLINK2_STACK_CONF_OPTS += \
>> +	-DCFG_COMPILE_LIB_MN=OFF \
>> +	-DCFG_COMPILE_LIB_MNAPP_USERINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \
>> +	-DCFG_COMPILE_LIB_MNDRV_PCAP=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_CN=OFF \
>> +	-DCFG_COMPILE_LIB_CNAPP_USERINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
>> +	-DCFG_COMPILE_LIB_CNDRV_PCAP=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF)
>> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB),y)
>> +OPENPOWERLINK2_STACK_CONF_OPTS += \
>> +	-DCFG_COMPILE_LIB_MN=OFF \
>> +	-DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \
>> +	-DCFG_COMPILE_LIB_MNAPP_KERNELINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \
>> +	-DCFG_COMPILE_LIB_CN=OFF \
>> +	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
>> +	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=$(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF) \
>> +	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF
> 
>  There is nothing here that refers to $(LINUX_DIR), so how is the module built?
There is a separate cmake project to build the module. Here we only build a
library interface to the kernel module. So there is no need to add $(LINUX_DIR)
here.

> 
>> +endif
>> +
>> +ifeq ($(BR2_STATIC_LIBS),y)
>> +OPENPOWERLINK2_STACK_CONF_OPTS += -DCFG_COMPILE_SHARED_LIBRARY=NO
>> +else
>> +OPENPOWERLINK2_STACK_CONF_OPTS += -DCFG_COMPILE_SHARED_LIBRARY=YES
>> +endif
>> +
>> +$(eval $(cmake-package))
>> diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
>> new file mode 100644
>> index 0000000..82c4277
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2.mk
>> @@ -0,0 +1,17 @@
>> +################################################################################
>> +#
>> +# openpowerlink2
>> +#
>> +################################################################################
>> +
>> +OPENPOWERLINK2_VERSION = V2.1.1
>> +OPENPOWERLINK2_SITE = http://git.code.sf.net/p/openpowerlink/openPOWERLINK2
>> +OPENPOWERLINK2_SITE_METHOD = git
> 
>  What's wrong with the tarball [2] ? It has the same contents. It is missing a
> leading directory component but that's easily solved with custom extract commands.

In the past, I had an issue with the zip archive:
http://git.buildroot.net/buildroot/commit/?id=8dda4eb3bd65fdf9eff0422e0e974e0a1d012015
This is why the git repository was used...
Ok I'll try to use the tar.gz archive.

> 
>  In that case, of course, add a hash file.
Sure.

Thanks for your review.

Best regards,
Romain
> 
> 
>  Regards,
>  Arnout
> 
>> +OPENPOWERLINK2_LICENSE = BSD-2c, GPLv2
>> +OPENPOWERLINK2_LICENSE_FILES = license.md
>> +
>> +# Just extract the archive
>> +
>> +$(eval $(generic-package))
>> +
>> +include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
>>
> 
> [1] http://www.cmake.org/cmake/help/v3.2/command/target_link_libraries.html
> [2]
> http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/V2.1.1/openPOWERLINK-V2.1.1.tar.gz
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package
  2015-05-02 14:53 ` [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Arnout Vandecappelle
  2015-05-06 12:20   ` Romain Naour
@ 2015-05-07 11:13   ` Romain Naour
  1 sibling, 0 replies; 9+ messages in thread
From: Romain Naour @ 2015-05-07 11:13 UTC (permalink / raw)
  To: buildroot

Hi Arnout,

I'm working on the v2 but I have an issue when all sub-package are in package/.

When I use $(OPENPOWERLINK2_VERSION) to share the same version, it is empty:
OPENPOWERLINK2_KERNEL_DRIVERS_VERSION = $(OPENPOWERLINK2_VERSION)

I think it's due to "include $(sort $(wildcard package/*/*.mk))" in the
Buildroot's main Makefile.

So I moved again to openpowerlink2/ package directory and add this line at the
end of openpowerlink2.mk:

include $(wildcard package/openpowerlink2/*/*.mk)

So, when we want to share the same variable to several packages, all *.mk of
these packages needs to be included in a specific order.

Actually, I'm using the efl packaging as a reference.

I uploaded my working branch on github:
https://github.com/RomainNaour/buildroot/tree/eplv2

What do you think ?

Best regards,
Romain

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages
  2015-05-02 15:12   ` Arnout Vandecappelle
@ 2015-05-07 14:46     ` Romain Naour
  0 siblings, 0 replies; 9+ messages in thread
From: Romain Naour @ 2015-05-07 14:46 UTC (permalink / raw)
  To: buildroot

Hi Arnout,

Le 02/05/2015 17:12, Arnout Vandecappelle a ?crit :
> On 01/05/15 17:35, Romain Naour wrote:
>> Signed-off-by: Romain Naour <romain.naour@openwide.fr>
>> ---
>> v2: s/BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER/BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS/
>>     The kernel module wasn't build due to a typo in the kconfig variable.
>>     rename openpowerlink2-pcap-drivers to openpowerlink2-pcap-daemon.
>> ---
>>  package/openpowerlink2/Config.in                   |  1 +
>>  .../openpowerlink2-drivers/Config.in               |  3 ++
>>  .../openpowerlink2-drivers.mk                      |  2 +
>>  .../openpowerlink2-kernel-drivers/Config.in        | 33 +++++++++++++++
>>  .../openpowerlink2-kernel-drivers.mk               | 48 ++++++++++++++++++++++
>>  .../openpowerlink2-pcap-daemon/Config.in           | 12 ++++++
>>  .../openpowerlink2-pcap-daemon.mk                  | 34 +++++++++++++++
>>  .../openpowerlink2/openpowerlink2-stack/Config.in  |  2 +
>>  package/openpowerlink2/openpowerlink2.mk           |  1 +
> 
>  Again, this should be split into one patch per package, and without subdirectory.
> 
>>  9 files changed, 136 insertions(+)
>>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/Config.in
>>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
>>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
>>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
>>  create mode 100644 package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
>>
>> diff --git a/package/openpowerlink2/Config.in b/package/openpowerlink2/Config.in
>> index 8e61a7d..c651031 100644
>> --- a/package/openpowerlink2/Config.in
>> +++ b/package/openpowerlink2/Config.in
>> @@ -35,6 +35,7 @@ choice
>>  
>>  endchoice
>>  
>> +source "package/openpowerlink2/openpowerlink2-drivers/Config.in"
>>  source "package/openpowerlink2/openpowerlink2-stack/Config.in"
> 
>  It doesn't make sense to put the drivers before the stack, if you first have to
> go to the stack to select the option that makes it possible to select drivers...
> So IMHO this is a case were we can break alphabetical ordering.

ok

> 
>>  
>>  config BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL
>> diff --git a/package/openpowerlink2/openpowerlink2-drivers/Config.in b/package/openpowerlink2/openpowerlink2-drivers/Config.in
>> new file mode 100644
>> index 0000000..b9239ae
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-drivers/Config.in
>> @@ -0,0 +1,3 @@
>> +
>> +source "package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in"
>> +source "package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in"
> 
>  This extra config file and non-package package isn't needed. So just make one
> patch to add -kernel-drivers, and another patch to add -pcap-daemon.

ok

> 
>> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>> new file mode 100644
>> index 0000000..ab5cd1c
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>> @@ -0,0 +1,2 @@
>> +
>> +include $(sort $(wildcard package/openpowerlink2/openpowerlink2-drivers/*/*.mk))
>> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
>> new file mode 100644
>> index 0000000..461504c
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/Config.in
>> @@ -0,0 +1,33 @@
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
>> +	bool "openpowerlink kernel stack"
>> +	depends on BR2_LINUX_KERNEL
>> +	depends on BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
> 
>  That can't be right, you have both a depends here and a select in
> BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB. Kconfig should error on that.

BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB already depends on
BR2_LINUX_KERNEL. In fact, I anticipated the fact that it will select
BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS and added BR2_LINUX_KERNEL as a
reverse dependency.

> 
>> +	help
>> +	  The openPOWERLINK stack is implemented as Linux kernel module.
>> +	  This solution provides the best performance, but is limited to
>> +	  the available openPOWERLINK network drivers.
> 
>  This sentence should go to the choice in the stack.
ok

> 
>  Perhaps the help text should also mention that the user is responsible for
> making sure that the 'normal' driver for the ethernet chip isn't enabled or loaded.

The openpowerlink's kernel modules should be loaded by using a little script
plkload which unbind the 'normal' kernel's modules.

> 
>> +
>> +if BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
>> +
>> +choice
>> +	prompt "select Ethernet Powerlink Driver"
> 
>  Are they really mutually exclusive?

Yes, cmake set a string to select one by one the module to be build.

SET(CFG_POWERLINK_EDRV "82573" CACHE STRING
        "Valid drivers are 8139, 82573, 8255x, i210, 8111, emacps")
SET_PROPERTY(CACHE CFG_POWERLINK_EDRV PROPERTY STRINGS 8139 82573 8255x i210
8111 emacps)

So, I can't build several openpowerlink driver without modify the config...
Actually, you can't run several instance of the openpowerlink stack on the same
machine.
> 
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_82573
>> +	bool "Intel 82573"
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_8255x
>> +	bool "Intel 8255x"
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_I210
>> +	bool "Intel I210"
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_RTL8111
>> +	bool "Realtek RTL-8111/8168"
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVER_RTL8139
>> +	bool "Realtek RTL-8139"
>> +
>> +endchoice
>> +
>> +endif # BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
>> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
>> new file mode 100644
>> index 0000000..a4470d8
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-kernel-drivers/openpowerlink2-kernel-drivers.mk
>> @@ -0,0 +1,48 @@
>> +################################################################################
>> +#
>> +# openpowerlink2-kernel-drivers
>> +#
>> +################################################################################
>> +
>> +OPENPOWERLINK2_KERNEL_DRIVERS_VERSION = $(OPENPOWERLINK2_VERSION)
>> +
>> +OPENPOWERLINK2_KERNEL_DRIVERS_LICENSE = $(OPENPOWERLINK2_LICENSE)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
>> +
>> +# We want to use the same archive for all sub-packages.
>> +OPENPOWERLINK2_KERNEL_DRIVERS_SOURCE =
>> +OPENPOWERLINK2_KERNEL_DRIVERS_DEPENDENCIES = linux openpowerlink2-stack
>> +
>> +define OPENPOWERLINK2_KERNEL_DRIVERS_SYMLINK_TO_SRC_HOOK
>> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_KERNEL_DRIVERS_DIR)/src
>> +endef
>> +
>> +OPENPOWERLINK2_KERNEL_DRIVERS_POST_EXTRACT_HOOKS += \
>> +	OPENPOWERLINK2_KERNEL_DRIVERS_SYMLINK_TO_SRC_HOOK
> 
>  Same here for extracting instead of symlinking, but I guess here you need just
> src/drivers/linux/drv_kernelmod_edrv.

Exactly.

> 
>> +
>> +OPENPOWERLINK2_KERNEL_DRIVERS_SUBDIR = src/drivers/linux/drv_kernelmod_edrv
>> +
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS = \
>> +	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL)) \
>> +	-DCFG_KERNEL_DIR=$(LINUX_DIR) \
>> +	-DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
>> +
>> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_MN),y)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_OPLK_MN=ON
>> +else
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_OPLK_MN=OFF
> 
>  For consistency, it would be better to use the same $(if ...) construct that
> you use in -stack.

Ha yes, thanks I forgot to made the change here.

> 
>  BTW, is there no corresponding option for CN?

No, because the MN capacities is a superset of CN capacities, so if MN is
disabled it mean that the CN mode is enabled.

> 
>> +endif
>> +
>> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_82573),y)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=82573
>> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_8255x),y)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8255x
>> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_I210),y)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=I210
>> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_RTL8139),y)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8139
>> +else ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS_RTL8111),y)
>> +OPENPOWERLINK2_KERNEL_DRIVERS_CONF_OPTS += -DCFG_POWERLINK_EDRV=8111
>> +endif
>> +
>> +$(eval $(cmake-package))
>> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
>> new file mode 100644
>> index 0000000..896152e
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/Config.in
>> @@ -0,0 +1,12 @@
>> +
>> +config BR2_PACKAGE_OPENPOWERLINK2_PCAP_DAEMON
>> +	bool "openpowerlink userspace (PCAP) stack"
>> +	depends on BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
>> +	select BR2_PACKAGE_LIBPCAP
>> +	help
>> +	  The Linux userspace implementation of the openPOWERLINK stack
>> +	  provides all functions for a software based POWERLINK solution
>> +	  running as Linux userspace application. The stack uses the
>> +	  libpcap library for accessing the network interface and is
>> +	  therefore totally independant of the used network card and
>                             independent
> 
>> +	  driver.
>> diff --git a/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
>> new file mode 100644
>> index 0000000..cc28d66
>> --- /dev/null
>> +++ b/package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-pcap-daemon/openpowerlink2-pcap-daemon.mk
>> @@ -0,0 +1,34 @@
>> +################################################################################
>> +#
>> +# openpowerlink2-pcap-daemon
>> +#
>> +################################################################################
>> +
>> +OPENPOWERLINK2_PCAP_DAEMON_VERSION = $(OPENPOWERLINK2_VERSION)
>> +
>> +OPENPOWERLINK2_PCAP_DAEMON_LICENSE = $(OPENPOWERLINK2_LICENSE)
>> +OPENPOWERLINK2_PCAP_DAEMON_LICENSE_FILES = $(OPENPOWERLINK2_LICENSE_FILES)
>> +
>> +# We want to use the same archive for all sub-packages.
>> +OPENPOWERLINK2_PCAP_DAEMON_SOURCE =
>> +OPENPOWERLINK2_PCAP_DAEMON_DEPENDENCIES = libpcap openpowerlink2-stack
>> +
>> +define OPENPOWERLINK2_PCAP_DAEMON_SYMLINK_TO_SRC_HOOK
>> +	ln -s $(OPENPOWERLINK2_DIR) $(OPENPOWERLINK2_PCAP_DAEMON_DIR)/src
>> +endef
>> +
>> +OPENPOWERLINK2_PCAP_DAEMON_POST_EXTRACT_HOOKS += \
>> +	OPENPOWERLINK2_PCAP_DAEMON_SYMLINK_TO_SRC_HOOK
>> +
>> +OPENPOWERLINK2_PCAP_DAEMON_SUBDIR = src/drivers/linux/drv_daemon_pcap
>> +
>> +OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS = \
>> +	-DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK2_DEBUG_LEVEL))
>> +
>> +ifeq ($(BR2_PACKAGE_OPENPOWERLINK2_MN),y)
>> +OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS += -DCFG_OPLK_MN=ON
>> +else
>> +OPENPOWERLINK2_PCAP_DAEMON_CONF_OPTS += -DCFG_OPLK_MN=OFF
>> +endif
> 
>  Same here about the $(if).
> 
>  Since it's used so often, perhaps it's better to define a global
> 
> OPENPOWERLINK2_MN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK2_MN),ON,OFF)
> OPENPOWERLINK2_CN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK2_CN),ON,OFF)

Ok, I'll try that.

> 
>> +
>> +$(eval $(cmake-package))
>> diff --git a/package/openpowerlink2/openpowerlink2-stack/Config.in b/package/openpowerlink2/openpowerlink2-stack/Config.in
>> index c3ddf47..f73d8c8 100644
>> --- a/package/openpowerlink2/openpowerlink2-stack/Config.in
>> +++ b/package/openpowerlink2/openpowerlink2-stack/Config.in
>> @@ -13,6 +13,7 @@ config BR2_PACKAGE_OPENPOWERLINK2_STACK_MONOLITHIC_USER_STACK_LIB
>>  config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
>>  	bool "build EPL stack as linux userspace pcap daemon."
>>  	select BR2_PACKAGE_LIBPCAP
> 
>  Does the -stack use LIBPCAP directly in this case? If not, this select
> shouldn't be there.

libpcap is needed here since src/kernel/edrv/edrv-pcap_linux.c which is used to
build the library is included.

Thanks you for your review.

Best regards,
Romain

> 
>  Regards,
>  Arnout
> 
>> +	select BR2_PACKAGE_OPENPOWERLINK2_PCAP_DAEMON
>>  	help
>>  	  Compile openPOWERLINK application library which contains the
>>  	  interface to a Linux user space driver, and the Linux user space
>> @@ -23,6 +24,7 @@ config BR2_PACKAGE_OPENPOWERLINK2_STACK_USERSPACE_DAEMON_LIB
>>  config BR2_PACKAGE_OPENPOWERLINK2_STACK_KERNEL_STACK_LIB
>>  	bool "build EPL stack as linux kernelspace module."
>>  	depends on BR2_LINUX_KERNEL # openpowerlink-kernel-driver
>> +	select BR2_PACKAGE_OPENPOWERLINK2_KERNEL_DRIVERS
>>  	help
>>  	  Compile openPOWERLINK application library which contains the
>>  	  interface to a Linux kernel space driver. It is used together
>> diff --git a/package/openpowerlink2/openpowerlink2.mk b/package/openpowerlink2/openpowerlink2.mk
>> index 82c4277..144fa98 100644
>> --- a/package/openpowerlink2/openpowerlink2.mk
>> +++ b/package/openpowerlink2/openpowerlink2.mk
>> @@ -14,4 +14,5 @@ OPENPOWERLINK2_LICENSE_FILES = license.md
>>  
>>  $(eval $(generic-package))
>>  
>> +include package/openpowerlink2/openpowerlink2-drivers/openpowerlink2-drivers.mk
>>  include package/openpowerlink2/openpowerlink2-stack/openpowerlink2-stack.mk
>>
> 
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-05-07 14:46 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-01 15:35 [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Romain Naour
2015-05-01 15:35 ` [Buildroot] [PATCH v2 2/3] package/openpowerlink2: add drivers packages Romain Naour
2015-05-02 15:12   ` Arnout Vandecappelle
2015-05-07 14:46     ` Romain Naour
2015-05-01 15:36 ` [Buildroot] [PATCH v2 3/3] package/openpowerlink2: add demo mn console application Romain Naour
2015-05-02 15:38   ` Arnout Vandecappelle
2015-05-02 14:53 ` [Buildroot] [PATCH v2 1/3] package/openpowerlink2: new package Arnout Vandecappelle
2015-05-06 12:20   ` Romain Naour
2015-05-07 11:13   ` Romain Naour

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox