From b1063a0136b1915a17c8db7d02c5da7e6c58b96c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 7 Feb 2016 17:56:56 +0100 Subject: 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/ Signed-off-by: Romain Naour [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"] Signed-off-by: Thomas Petazzoni --- ...a-better-regex-for-cmake-system-processor.patch | 89 ---------------------- 1 file changed, 89 deletions(-) delete mode 100644 package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch (limited to 'package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch') diff --git a/package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch b/package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch deleted file mode 100644 index 6fd1990af2..0000000000 --- a/package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 9fd3aef2f9bb7a2b05b6823281bb5c988fa25149 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 17 Nov 2014 23:27:05 +0100 -Subject: [PATCH 1/2] [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 ---- - Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt | 15 ++++----------- - .../X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt | 15 ++++----------- - 2 files changed, 8 insertions(+), 22 deletions(-) - -diff --git a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt -index 271ecdc..b49ef53 100644 ---- a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt -+++ b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt -@@ -154,21 +154,14 @@ SET(MODULE_SOURCE_FILES - ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/Objdict.c - ) - --IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) -+IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c) -- --ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL arm -- OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) -+ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l") - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c) -- --ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL i686 -- OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) -- SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c) -- --ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) -+ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - MESSAGE(FATAL_ERROR - "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).") --ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) -+ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - - SET(MODULE_FILE - ${MODULE_NAME}.ko -diff --git a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt -index 1b47c76..f534a4d 100644 ---- a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt -+++ b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt -@@ -171,21 +171,14 @@ ELSE(CFG_POWERLINK_EDRV STREQUAL "I210") - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/Target/X86/Linux/gnu/generic/TimerHighReskX86.c) - ENDIF(CFG_POWERLINK_EDRV STREQUAL "I210") - --IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) -+IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c) -- --ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL arm -- OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) -+ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l") - SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c) -- --ELSEIF ( CMAKE_SYSTEM_PROCESSOR STREQUAL i686 -- OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) -- SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c) -- --ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) -+ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - MESSAGE(FATAL_ERROR - "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).") --ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86) -+ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - - SET(MODULE_FILE - ${MODULE_NAME}.ko --- -1.9.3 - -- cgit v1.2.3