Skip to contentSkip to conversation

package/openpowerlink: bump to v2.2.2

PATCH New Romain Naour 2 participants 2 messages Feb 7, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/openpowerlink: bump to v2.2.2

From [1]
With version 2.0, the source code has been cleanly split into an application-oriented user library and a time-critical stack driver. The latter may be moved to a dedicated communication processor or into a kernel module to deliver enhanced performance while still keeping the API in user space.

This new version break the API used in the v1.x but this is a complete rewrite of the Powerlink EPSG DS 301 implementation. The v1.x is deprecated anyway.

The new build system has been split in several CMake projects which makes it difficult to package with the Buildroot CMake infra. So add a top level CMakeLists.txt to build each openpowerlink component without having to package each of them in a separate Buildroot packages. Also we need to fix the build system to support the top level CMake build.

[1] http://sourceforge.net/projects/openpowerlink/

---
v8: remove the custom extract cmds and set STRIP_COMPONENTS to 0 (Thomas)
s/DRIVERS/DRIVER/
Fixes some typos
Remove BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL option
Ref: http://lists.busybox.net/pipermail/buildroot/2016-February/152158.html
v7: Improve commit log
update Config.legacy
add a sha256 hash
add a comment about extract cmds
v6: bump to v2.2.2.
Keep C++ dependency since CMake still check it even if
it's not used by the openpowerlink stack :(
v5: bump to v2.2.1 and remove upstream patches
There is no change in the packaging
v4: Add a top level CMakeLists.txt to be able to squash all
openpowerlink packages into one and fixes the build
system accordingly
Add legacy handling
v3: Add patch info about patches status
bump to v2.2.0
remove old openpowerlink stack (v1.8.5)
Rename openpowerlin2 to openpowerlink
fix build with musl toolchains
v2: switch to tar.gz archive
add hash file
merge openpowerlink2 and openpowerlink2-stack
Add a new patch to install headers files
add OPENPOWERLINK2_*_ONOFF

---
 Config.in.legacy                                   |  24 +++
 ...l-the-stack-libraries-to-lib-subdirectory.patch | 133 ++++++++++++++++
 ...a-better-regex-for-cmake-system-processor.patch |  89 -----------
 ...0002-FIX-cmake-install-oplk-headers-files.patch |  32 ++++
 ...-fix-user-space-stack-enable-shared-build.patch |  54 -------
 ...se-CMAKE_CURRENT_SOURCE_DIR-instead-of-CM.patch | 154 +++++++++++++++++++
 ...ROJECT_NAME-instead-of-CMAKE_PROJECT_NAME.patch | 125 +++++++++++++++
 .../0005-FIX-Add-top-level-CMakeLists.txt.patch    | 170 +++++++++++++++++++++
 package/openpowerlink/Config.in                    | 117 +++++++-------
 package/openpowerlink/openpowerlink.hash           |   5 +
 package/openpowerlink/openpowerlink.mk             | 135 +++++++++++-----
 11 files changed, 793 insertions(+), 245 deletions(-)
 create mode 100644 package/openpowerlink/0001-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
 delete mode 100644 package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch
 create mode 100644 package/openpowerlink/0002-FIX-cmake-install-oplk-headers-files.patch
 delete mode 100644 package/openpowerlink/0002-fix-user-space-stack-enable-shared-build.patch
 create mode 100644 package/openpowerlink/0003-FIX-cmake-use-CMAKE_CURRENT_SOURCE_DIR-instead-of-CM.patch
 create mode 100644 package/openpowerlink/0004-FIX-Use-PROJECT_NAME-instead-of-CMAKE_PROJECT_NAME.patch
 create mode 100644 package/openpowerlink/0005-FIX-Add-top-level-CMakeLists.txt.patch
 create mode 100644 package/openpowerlink/openpowerlink.hash
Config.in.legacy +24 -0
index b38cf90..ec6f26e 100644
@@ -145,6 +145,30 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2016.02"
 
+config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
+	bool "openpowerlink debug option has been removed"
+	select BR2_LEGACY
+	help
+	  This option depends on BR2_ENABLE_DEBUG which should not be used
+	  by packages anymore.
+
+config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE
+	bool "openpowerlink package has been updated"
+	select BR2_LEGACY
+	select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB
+	help
+	  openpowerlink kernel modules are built if the
+	  kernel stack library is selected.
+
+config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP
+	bool "openpowerlink package has been updated"
+	select BR2_LEGACY
+	select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB
+	help
+	  The user space support has been split in two part:
+	  - a monolitic user space library
+	  - a user spae deamon driver
+
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "using the linux headers version for the kernel has been removed"
 	select BR2_LEGACY
package/openpowerlink/0001-FIX-install-the-stack-libraries-to-lib-subdirectory.patch new file +133 -0

133 lines not on this page · raw message

package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch deleted +0 -89

89 lines not on this page · raw message

package/openpowerlink/0002-FIX-cmake-install-oplk-headers-files.patch new file +32 -0
new file mode 100644
index 0000000..e64a6c4
@@ -0,0 +1,32 @@
+From c904fb6ce3c29e77d51d8bcbbbdd48b8d22c754b Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Mon, 4 May 2015 11:47:05 +0200
+Subject: [PATCH] [FIX] cmake: install oplk headers files
+
+In order to be able to link a third party application
+with openpowerlink libraries, we need to install the
+oplk headers files related to openpowerlink stack.
+
+Install all headers file from STACK_INCLUDE_DIR/oplk.
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ stack/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/stack/CMakeLists.txt b/stack/CMakeLists.txt
+index 9ff13f4..f4614cd 100644
+--- a/stack/CMakeLists.txt
++++ b/stack/CMakeLists.txt
+@@ -103,3 +103,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU
+ ELSE()
+     MESSAGE(FATAL_ERROR "Unknown Platform and processor combination ${CMAKE_SYSTEM_NAME} and ${CMAKE_SYSTEM_PROCESSOR}!!")
+ ENDIF()
++
++################################################################################
++# Install oplk headers files
++################################################################################
++INSTALL(DIRECTORY ${STACK_INCLUDE_DIR}/oplk DESTINATION "include")
+-- 
+2.4.3
+
package/openpowerlink/0002-fix-user-space-stack-enable-shared-build.patch deleted +0 -54

54 lines not on this page · raw message

package/openpowerlink/0003-FIX-cmake-use-CMAKE_CURRENT_SOURCE_DIR-instead-of-CM.patch new file +154 -0

154 lines not on this page · raw message

package/openpowerlink/0004-FIX-Use-PROJECT_NAME-instead-of-CMAKE_PROJECT_NAME.patch new file +125 -0

125 lines not on this page · raw message

package/openpowerlink/0005-FIX-Add-top-level-CMakeLists.txt.patch new file +170 -0

170 lines not on this page · raw message

package/openpowerlink/Config.in +55 -62

166 lines not on this page · raw message

package/openpowerlink/openpowerlink.hash new file +5 -0
new file mode 100644
index 0000000..6b28be8
@@ -0,0 +1,5 @@
+# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.2.2/
+md5	d7f2b08d332b36fed5427ebc5ec118f2	openPOWERLINK_V2.2.2.tar.gz
+sha1	f565c6a8e10ba320325d120f6030158f4c4278f8	openPOWERLINK_V2.2.2.tar.gz
+# sha256 locally computed
+sha256	4de00eaf8af1ff3877bfa2e878a59989873406845fc8031bd6fc58cb1f7cf7e7	openPOWERLINK_V2.2.2.tar.gz
package/openpowerlink/openpowerlink.mk +95 -40

162 lines not on this page · raw message

Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 package/openpowerlink: bump to v2.2.2

Dear Romain Naour,

Quoted 63 lines · Romain Naour

From [1]
With version 2.0, the source code has been cleanly split into an application-oriented user library and a time-critical stack driver. The latter may be moved to a dedicated communication processor or into a kernel module to deliver enhanced performance while still keeping the API in user space.

This new version break the API used in the v1.x but this is a complete rewrite of the Powerlink EPSG DS 301 implementation. The v1.x is deprecated anyway.

The new build system has been split in several CMake projects which makes it difficult to package with the Buildroot CMake infra. So add a top level CMakeLists.txt to build each openpowerlink component without having to package each of them in a separate Buildroot packages. Also we need to fix the build system to support the top level CMake build.

[1] http://sourceforge.net/projects/openpowerlink/

---
v8: remove the custom extract cmds and set STRIP_COMPONENTS to 0 (Thomas)
s/DRIVERS/DRIVER/
Fixes some typos
Remove BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL option
Ref: http://lists.busybox.net/pipermail/buildroot/2016-February/152158.html
v7: Improve commit log
update Config.legacy
add a sha256 hash
add a comment about extract cmds
v6: bump to v2.2.2.
Keep C++ dependency since CMake still check it even if
it's not used by the openpowerlink stack :(
v5: bump to v2.2.1 and remove upstream patches
There is no change in the packaging
v4: Add a top level CMakeLists.txt to be able to squash all
openpowerlink packages into one and fixes the build
system accordingly
Add legacy handling
v3: Add patch info about patches status
bump to v2.2.0
remove old openpowerlink stack (v1.8.5)
Rename openpowerlin2 to openpowerlink
fix build with musl toolchains
v2: switch to tar.gz archive
add hash file
merge openpowerlink2 and openpowerlink2-stack
Add a new patch to install headers files
add OPENPOWERLINK2_*_ONOFF

---
 Config.in.legacy                                   |  24 +++
 ...l-the-stack-libraries-to-lib-subdirectory.patch | 133 ++++++++++++++++
 ...a-better-regex-for-cmake-system-processor.patch |  89 -----------
 ...0002-FIX-cmake-install-oplk-headers-files.patch |  32 ++++
 ...-fix-user-space-stack-enable-shared-build.patch |  54 -------
 ...se-CMAKE_CURRENT_SOURCE_DIR-instead-of-CM.patch | 154 +++++++++++++++++++
 ...ROJECT_NAME-instead-of-CMAKE_PROJECT_NAME.patch | 125 +++++++++++++++
 .../0005-FIX-Add-top-level-CMakeLists.txt.patch    | 170 +++++++++++++++++++++
 package/openpowerlink/Config.in                    | 117 +++++++-------
 package/openpowerlink/openpowerlink.hash           |   5 +
 package/openpowerlink/openpowerlink.mk             | 135 +++++++++++-----
 11 files changed, 793 insertions(+), 245 deletions(-)
Quoted 8 lines
 create mode 100644 package/openpowerlink/0001-FIX-install-the-stack-libraries-to-lib-subdirectory.patch
 delete mode 100644 package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch
 create mode 100644 package/openpowerlink/0002-FIX-cmake-install-oplk-headers-files.patch
 delete mode 100644 package/openpowerlink/0002-fix-user-space-stack-enable-shared-build.patch
 create mode 100644 package/openpowerlink/0003-FIX-cmake-use-CMAKE_CURRENT_SOURCE_DIR-instead-of-CM.patch
 create mode 100644 package/openpowerlink/0004-FIX-Use-PROJECT_NAME-instead-of-CMAKE_PROJECT_NAME.patch
 create mode 100644 package/openpowerlink/0005-FIX-Add-top-level-CMakeLists.txt.patch
 create mode 100644 package/openpowerlink/openpowerlink.hash

I've applied, with some additional changes:

[Thomas:
- rename patches to not contain the [FIX] part in their title.
- rewrap Config.in help text
- rename "openPOWERLINK stack type" to "stack type"
- rename ""openpowerlink demos" to "demos"]

Also, the demo gets installed directly under /usr, which is somewhat weird, but can be fixed later.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com