[oe] [meta-oe] [PATCH] renderdoc: add new recipe
RenderDoc is a MIT licensed stand-alone multi-platform graphics
debugger that allows easy frame by frame capture and detailed
introspection of any applications using Vulkan, OpenGL, OpenGL ES,
and others.
Signed-off-by: Adrian Ratiu
---
...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
...eLists.txt-remove-flag-unsupported-b.patch | 48
.../renderdoc/renderdoc_1.4.bb| 29 ++
3 files changed, 134 insertions(+)
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
new file mode 100644
index 0..e96dedfc3
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
@@ -0,0 +1,57 @@
+From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Tue, 24 Sep 2019 16:07:18 +0300
+Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
+
+Renderdoc's attempt to cross compile an xxd replacement by directly
+calling a host cross-compiler breaks under OE's recipe specific
+sysroots protection because this is not a native recipe, so we just
+use xxd-native instead.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+---
+ renderdoc/CMakeLists.txt | 23 +--
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 5cb7440a4..453a034ba 100644
+--- a/renderdoc/CMakeLists.txt
b/renderdoc/CMakeLists.txt
+@@ -370,26 +370,6 @@ set(data
+ set(data_objects)
+
+ if(UNIX)
+-# If we're cross-compiling, include-bin will get built for the target and
we
+-# then can't execute it. Instead, we force calling c++ (which we can
safely
+-# assume is present) directly to build the binary
+-
+-if(CMAKE_CROSSCOMPILING)
+-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to
compile a .cpp into an executable. Default is just c++")
+-
+-add_custom_command(OUTPUT
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp
-o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-DEPENDS 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-else()
+-add_executable(include-bin 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE $)
+-set(INCLUDE_BIN_DEP include-bin)
+-endif()
+-
+ foreach(res ${data})
+ set(in ${res})
+ set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -399,8 +379,7 @@ if(UNIX)
+ add_custom_command(OUTPUT ${out_src}
+ WORKING_DIRECTORY ${working_dir}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
+-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
+-DEPENDS ${INCLUDE_BIN_DEP}
++COMMAND xxd -i ${in} ${out_src}
+ DEPENDS ${res})
+
+ list(APPEND data_objects ${out_src})
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
new file mode 100644
index 0..8cfac3b0e
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
@@ -0,0 +1,48 @@
+From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Wed, 25 Sep 2019 19:31:14 +0300
+Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC
+
+-Wno-unknown-warning is not supported by GCC, only by Clang so we
+remove it because newer GCC versions like 9.2.0 will complain, older
+versions would just ignore it.
+
+Upstream-Status: Pending [https://github.com/baldurk/renderdoc/pull/1530]
+
+Signed-off-by: Adrian Ratiu
+
+---
+ qrenderdoc/CMakeLists.txt | 2 +-
+ renderdoc/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
+index 9fd65b2d3..d52dd274e 100644
+--- a/qrenderdoc/CMakeLists.txt
b/q
Re: [oe] [meta-oe] [PATCH] renderdoc: add new recipe
Hello,
On Thu, 26 Sep 2019, Khem Raj wrote:
https://errors.yoctoproject.org/Errors/Details/272045/
Is using COMPATIBLE_MACHINE to stop the recipe from being built on
mips an acceptable solution? Something like:
COMPATIBLE_MACHINE_mipsarch = "(^$)"
On Thu, Sep 26, 2019 at 1:02 AM Adrian Ratiu wrote:
RenderDoc is a MIT licensed stand-alone multi-platform graphics
debugger that allows easy frame by frame capture and detailed
introspection of any applications using Vulkan, OpenGL, OpenGL ES,
and others.
Signed-off-by: Adrian Ratiu
---
...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
...eLists.txt-remove-flag-unsupported-b.patch | 48
.../renderdoc/renderdoc_1.4.bb| 29 ++
3 files changed, 134 insertions(+)
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
new file mode 100644
index 0..e96dedfc3
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
@@ -0,0 +1,57 @@
+From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Tue, 24 Sep 2019 16:07:18 +0300
+Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
+
+Renderdoc's attempt to cross compile an xxd replacement by directly
+calling a host cross-compiler breaks under OE's recipe specific
+sysroots protection because this is not a native recipe, so we just
+use xxd-native instead.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+---
+ renderdoc/CMakeLists.txt | 23 +--
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 5cb7440a4..453a034ba 100644
+--- a/renderdoc/CMakeLists.txt
b/renderdoc/CMakeLists.txt
+@@ -370,26 +370,6 @@ set(data
+ set(data_objects)
+
+ if(UNIX)
+-# If we're cross-compiling, include-bin will get built for the target and
we
+-# then can't execute it. Instead, we force calling c++ (which we can
safely
+-# assume is present) directly to build the binary
+-
+-if(CMAKE_CROSSCOMPILING)
+-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a
.cpp into an executable. Default is just c++")
+-
+-add_custom_command(OUTPUT
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp
-o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-DEPENDS 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-else()
+-add_executable(include-bin 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE $)
+-set(INCLUDE_BIN_DEP include-bin)
+-endif()
+-
+ foreach(res ${data})
+ set(in ${res})
+ set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -399,8 +379,7 @@ if(UNIX)
+ add_custom_command(OUTPUT ${out_src}
+ WORKING_DIRECTORY ${working_dir}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
+-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
+-DEPENDS ${INCLUDE_BIN_DEP}
++COMMAND xxd -i ${in} ${out_src}
+ DEPENDS ${res})
+
+ list(APPEND data_objects ${out_src})
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
new file mode 100644
index 0..8cfac3b0e
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
@@ -0,0 +1,48 @@
+From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Wed, 25 Sep 2019 19:31:14 +0300
+Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC
+
+-Wno-unknown-warning is not supported by GCC, only by Clang so we
+remove it because newer GCC versions like 9.2.0 will complain, older
+versions would just ignore it.
+
+Upstream-Status: Pending [https://github.com
Re: [oe] [meta-oe] [PATCH] renderdoc: add new recipe
On Thu, 26 Sep 2019, Khem Raj wrote:
On Thu, Sep 26, 2019 at 8:10 AM Adrian Ratiu
wrote:
Hello,
On Thu, 26 Sep 2019, Khem Raj wrote:
> https://errors.yoctoproject.org/Errors/Details/272045/
Is using COMPATIBLE_MACHINE to stop the recipe from being built
on mips an acceptable solution? Something like:
COMPATIBLE_MACHINE_mipsarch = "(^$)"
I think we need to understand the whole set of arches it
supports just doing mips will fix one of the CI builds
Agreed. I'm on it, expect a v2 by the end of the week. Thank you!
>
> On Thu, Sep 26, 2019 at 1:02 AM Adrian Ratiu
wrote:
>>
>> RenderDoc is a MIT licensed stand-alone multi-platform graphics
>> debugger that allows easy frame by frame capture and detailed
>> introspection of any applications using Vulkan, OpenGL, OpenGL ES,
>> and others.
>>
>> Signed-off-by: Adrian Ratiu
>> ---
>> ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
>> ...eLists.txt-remove-flag-unsupported-b.patch | 48
>> .../renderdoc/renderdoc_1.4.bb| 29 ++
>> 3 files changed, 134 insertions(+)
>> create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>> create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
>> create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
>>
>> diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>> new file mode 100644
>> index 0..e96dedfc3
>> --- /dev/null
>> +++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>> @@ -0,0 +1,57 @@
>> +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
>> +From: Adrian Ratiu
>> +Date: Tue, 24 Sep 2019 16:07:18 +0300
>> +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
>> +
>> +Renderdoc's attempt to cross compile an xxd replacement by directly
>> +calling a host cross-compiler breaks under OE's recipe specific
>> +sysroots protection because this is not a native recipe, so we just
>> +use xxd-native instead.
>> +
>> +Upstream-Status: Inappropriate [embedded-specific]
>> +
>> +---
>> + renderdoc/CMakeLists.txt | 23 +--
>> + 1 file changed, 1 insertion(+), 22 deletions(-)
>> +
>> +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
>> +index 5cb7440a4..453a034ba 100644
>> +--- a/renderdoc/CMakeLists.txt
>> b/renderdoc/CMakeLists.txt
>> +@@ -370,26 +370,6 @@ set(data
>> + set(data_objects)
>> +
>> + if(UNIX)
>> +-# If we're cross-compiling, include-bin will get built for the target
and we
>> +-# then can't execute it. Instead, we force calling c++ (which we can
safely
>> +-# assume is present) directly to build the binary
>> +-
>> +-if(CMAKE_CROSSCOMPILING)
>> +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to
compile a .cpp into an executable. Default is just c++")
>> +-
>> +-add_custom_command(OUTPUT
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
>> +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>> +-COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
>> +-COMMAND ${HOST_NATIVE_CPP_COMPILER}
3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
>> +-DEPENDS 3rdparty/include-bin/main.cpp)
>> +-set(INCLUDE_BIN_EXE
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
>> +-set(INCLUDE_BIN_DEP
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
>> +-else()
>> +-add_executable(include-bin 3rdparty/include-bin/main.cpp)
>> +-set(INCLUDE_BIN_EXE $)
>> +-set(INCLUDE_BIN_DEP include-bin)
>> +-endif()
>> +-
>> + foreach(res ${data})
>> + set(in ${res})
>> + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
>> +@@ -399,8 +379,7 @@ if(UNIX)
>> + add_custom_command(OUTPUT ${out_src}
>> + WORKING_DIRECTORY ${working_dir}
>> + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
>> +-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
>> +-DEPENDS ${INCLUDE_BIN_DEP}
>> ++
[oe] [meta-oe][PATCH v2] renderdoc: add new recipe
RenderDoc is a MIT licensed stand-alone multi-platform graphics
debugger that allows easy frame by frame capture and detailed
introspection of any applications using Vulkan, OpenGL, OpenGL ES,
and others.
Signed-off-by: Adrian Ratiu
---
Changes since v1:
- Add COMPATIBLE_MACHINE assignemnts to avoid CI failures on
unsupported architectures
- Add libc test because recipe is only buildable with glibc,
tested against musl
- Minor whitespace fixes
...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
...eLists.txt-remove-flag-unsupported-b.patch | 48
.../renderdoc/renderdoc_1.4.bb| 41 +
3 files changed, 146 insertions(+)
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
new file mode 100644
index 0..e96dedfc3
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
@@ -0,0 +1,57 @@
+From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Tue, 24 Sep 2019 16:07:18 +0300
+Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
+
+Renderdoc's attempt to cross compile an xxd replacement by directly
+calling a host cross-compiler breaks under OE's recipe specific
+sysroots protection because this is not a native recipe, so we just
+use xxd-native instead.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+---
+ renderdoc/CMakeLists.txt | 23 +--
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 5cb7440a4..453a034ba 100644
+--- a/renderdoc/CMakeLists.txt
b/renderdoc/CMakeLists.txt
+@@ -370,26 +370,6 @@ set(data
+ set(data_objects)
+
+ if(UNIX)
+-# If we're cross-compiling, include-bin will get built for the target and
we
+-# then can't execute it. Instead, we force calling c++ (which we can
safely
+-# assume is present) directly to build the binary
+-
+-if(CMAKE_CROSSCOMPILING)
+-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to
compile a .cpp into an executable. Default is just c++")
+-
+-add_custom_command(OUTPUT
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp
-o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-DEPENDS 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-else()
+-add_executable(include-bin 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE $)
+-set(INCLUDE_BIN_DEP include-bin)
+-endif()
+-
+ foreach(res ${data})
+ set(in ${res})
+ set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -399,8 +379,7 @@ if(UNIX)
+ add_custom_command(OUTPUT ${out_src}
+ WORKING_DIRECTORY ${working_dir}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
+-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
+-DEPENDS ${INCLUDE_BIN_DEP}
++COMMAND xxd -i ${in} ${out_src}
+ DEPENDS ${res})
+
+ list(APPEND data_objects ${out_src})
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
new file mode 100644
index 0..8cfac3b0e
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
@@ -0,0 +1,48 @@
+From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Wed, 25 Sep 2019 19:31:14 +0300
+Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC
+
+-Wno-unknown-warning is not supported by GCC, only by Clang so we
+remove it because newer GCC versions like 9.2.0 will complain, older
+versions would just ignore it.
+
+Upstream-Status: Pending [https://github.com/baldurk/renderdoc/pull/1530]
+
+Signed-off-by: Adrian Ratiu
+
+---
+ qrenderdoc/CMakeLists.txt | 2
[oe] [meta-oe][PATCH v3] renderdoc: add new recipe
RenderDoc is a MIT licensed stand-alone multi-platform graphics
debugger that allows easy frame by frame capture and detailed
introspection of any applications using Vulkan, OpenGL, OpenGL ES,
and others.
Signed-off-by: Adrian Ratiu
---
Changes since v2:
- Replace the multiple COMPATIBLE_MACHINE assignments with a single
COMPATIBLE_HOST regexp
Changes since v1:
- Add COMPATIBLE_MACHINE assignemnts to avoid CI failures on
unsupported architectures
- Add libc test because recipe is only buildable with glibc,
tested against musl
- Minor whitespace fixes
...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
...eLists.txt-remove-flag-unsupported-b.patch | 48
.../renderdoc/renderdoc_1.4.bb| 37
3 files changed, 142 insertions(+)
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
new file mode 100644
index 0..e96dedfc3
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
@@ -0,0 +1,57 @@
+From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Tue, 24 Sep 2019 16:07:18 +0300
+Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
+
+Renderdoc's attempt to cross compile an xxd replacement by directly
+calling a host cross-compiler breaks under OE's recipe specific
+sysroots protection because this is not a native recipe, so we just
+use xxd-native instead.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+---
+ renderdoc/CMakeLists.txt | 23 +--
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 5cb7440a4..453a034ba 100644
+--- a/renderdoc/CMakeLists.txt
b/renderdoc/CMakeLists.txt
+@@ -370,26 +370,6 @@ set(data
+ set(data_objects)
+
+ if(UNIX)
+-# If we're cross-compiling, include-bin will get built for the target and
we
+-# then can't execute it. Instead, we force calling c++ (which we can
safely
+-# assume is present) directly to build the binary
+-
+-if(CMAKE_CROSSCOMPILING)
+-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to
compile a .cpp into an executable. Default is just c++")
+-
+-add_custom_command(OUTPUT
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp
-o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-DEPENDS 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-else()
+-add_executable(include-bin 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE $)
+-set(INCLUDE_BIN_DEP include-bin)
+-endif()
+-
+ foreach(res ${data})
+ set(in ${res})
+ set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -399,8 +379,7 @@ if(UNIX)
+ add_custom_command(OUTPUT ${out_src}
+ WORKING_DIRECTORY ${working_dir}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
+-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
+-DEPENDS ${INCLUDE_BIN_DEP}
++COMMAND xxd -i ${in} ${out_src}
+ DEPENDS ${res})
+
+ list(APPEND data_objects ${out_src})
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
new file mode 100644
index 0..8cfac3b0e
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
@@ -0,0 +1,48 @@
+From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Wed, 25 Sep 2019 19:31:14 +0300
+Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by GCC
+
+-Wno-unknown-warning is not supported by GCC, only by Clang so we
+remove it because newer GCC versions like 9.2.0 will complain, older
+versions would just ignore it.
+
+Upstream-Status: Pendi
Re: [oe] [meta-oe][PATCH v3] renderdoc: add new recipe
On Sat, 28 Sep 2019, Khem Raj wrote:
> On Fri, Sep 27, 2019 at 9:56 AM Adrian Ratiu
> wrote:
>>
>> RenderDoc is a MIT licensed stand-alone multi-platform graphics
>> debugger that allows easy frame by frame capture and detailed
>> introspection of any applications using Vulkan, OpenGL, OpenGL ES,
>> and others.
>>
>> Signed-off-by: Adrian Ratiu
>> ---
>>
>> Changes since v2:
>> - Replace the multiple COMPATIBLE_MACHINE assignments with a single
>> COMPATIBLE_HOST regexp
>>
>> Changes since v1:
>> - Add COMPATIBLE_MACHINE assignemnts to avoid CI failures on
>> unsupported architectures
>> - Add libc test because recipe is only buildable with glibc,
>> tested against musl
>> - Minor whitespace fixes
>>
>> ...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
>> ...eLists.txt-remove-flag-unsupported-b.patch | 48
>> .../renderdoc/renderdoc_1.4.bb| 37
>> 3 files changed, 142 insertions(+)
>> create mode 100644
>> meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>> create mode 100644
>> meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
>> create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
>>
>> diff --git
>> a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>>
>> b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>> new file mode 100644
>> index 0..e96dedfc3
>> --- /dev/null
>> +++
>> b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
>> @@ -0,0 +1,57 @@
>> +From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
>> +From: Adrian Ratiu
>> +Date: Tue, 24 Sep 2019 16:07:18 +0300
>> +Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
>> +
>> +Renderdoc's attempt to cross compile an xxd replacement by directly
>> +calling a host cross-compiler breaks under OE's recipe specific
>> +sysroots protection because this is not a native recipe, so we just
>> +use xxd-native instead.
>> +
>> +Upstream-Status: Inappropriate [embedded-specific]
>> +
>> +---
>> + renderdoc/CMakeLists.txt | 23 +--
>> + 1 file changed, 1 insertion(+), 22 deletions(-)
>> +
>> +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
>> +index 5cb7440a4..453a034ba 100644
>> +--- a/renderdoc/CMakeLists.txt
>> b/renderdoc/CMakeLists.txt
>> +@@ -370,26 +370,6 @@ set(data
>> + set(data_objects)
>> +
>> + if(UNIX)
>> +-# If we're cross-compiling, include-bin will get built for the target
>> and we
>> +-# then can't execute it. Instead, we force calling c++ (which we can
>> safely
>> +-# assume is present) directly to build the binary
>> +-
>> +-if(CMAKE_CROSSCOMPILING)
>> +-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to
>> compile a .cpp into an executable. Default is just c++")
>> +-
>> +-add_custom_command(OUTPUT
>> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
>> +-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
>> +-COMMAND ${CMAKE_COMMAND} -E make_directory
>> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
>> +-COMMAND ${HOST_NATIVE_CPP_COMPILER}
>> 3rdparty/include-bin/main.cpp -o
>> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
>> +-DEPENDS 3rdparty/include-bin/main.cpp)
>> +-set(INCLUDE_BIN_EXE
>> "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
>> +-set(INCLUDE_BIN_DEP
>> "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
>> +-else()
>> +-add_executable(include-bin 3rdparty/include-bin/main.cpp)
>> +-set(INCLUDE_BIN_EXE $)
>> +-set(INCLUDE_BIN_DEP include-bin)
>> +-endif()
>> +-
>> + foreach(res ${data})
>> + set(in ${res})
>> + set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
>> +@@ -399,8 +379,7 @@ if(UNIX)
>> + add_custom_command(OUTPUT ${out_src}
>> + WORKING_DIRECTORY ${working_dir}
>> + COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
>> +-COMMAND ${INCLUDE_BIN_EXE} ${in}
Re: [oe] [meta-oe][PATCH v3] renderdoc: add new recipe
On Sun, 29 Sep 2019, Adrian Bunk wrote: > On Sat, Sep 28, 2019 at 12:48:10PM -0700, Khem Raj wrote: >> On Fri, Sep 27, 2019 at 9:56 AM Adrian Ratiu >> wrote: >>... >> > --- /dev/null >> > +++ >> > b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch >> > @@ -0,0 +1,48 @@ >> > +From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 2001 >> > +From: Adrian Ratiu >> > +Date: Wed, 25 Sep 2019 19:31:14 +0300 >> > +Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag unsupported by >> > GCC >> > + >> > +-Wno-unknown-warning is not supported by GCC, only by Clang so we >> > +remove it because newer GCC versions like 9.2.0 will complain, older >> > +versions would just ignore it. >> > + >> > +Upstream-Status: Pending [https://github.com/baldurk/renderdoc/pull/1530] >> > + >> >> gcc9 does support -Wno-unknown-warning perhaps you want >> -Wno-error=unknown-warning >>... >> > +TARGET_CFLAGS += "-Wno-error=deprecated-copy" >> > + >> >> this option is GCC specific mark it >> TARGET_CFLAGS_append_toolchain-gcc >>... > > Using -Wno-error always could solve both problems, > and would also avoid similar problems in the future. That's a good idea, however I can't pass directly -Wno-error in the recipe because of how the top-level CMakelists.txt is written: it always *appends* -Werror to the flags, so it overwrites our -Wno-error. A better solution which has the same effect is to use -DCMAKE_BUILD_TYPE=Release which prevents -Werror being appended at all in the top-level CMakelists.txt (there is no other effect than this!) Thanks! Will send an updatet v4 soon. > > cu > Adrian > > -- > >"Is there not promise of rain?" Ling Tan asked suddenly out > of the darkness. There had been need of rain for many days. >"Only a promise," Lao Er said. >Pearl S. Buck - Dragon Seed -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH v4] renderdoc: add new recipe
RenderDoc is a MIT licensed stand-alone multi-platform graphics
debugger that allows easy frame by frame capture and detailed
introspection of any applications using Vulkan, OpenGL, OpenGL ES,
and others.
Signed-off-by: Adrian Ratiu
---
Changes since v3:
- Dropped 0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch
- Added -DCMAKE_BUILD_TYPE=Release which has the only effect of not
appending -Werror in CMakelists.txt at the end of the recipe flags
Changes since v2:
- Replace the multiple COMPATIBLE_MACHINE assignments with a single
COMPATIBLE_HOST regexp
Changes since v1:
- Add COMPATIBLE_MACHINE assignemnts to avoid CI failures on
unsupported architectures
- Add libc test because recipe is only buildable with glibc,
tested against musl
- Minor whitespace fixes
...d-instead-of-cross-compiling-shim-bi.patch | 57 +++
.../renderdoc/renderdoc_1.4.bb| 35
2 files changed, 92 insertions(+)
create mode 100644
meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
create mode 100644 meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
diff --git
a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
new file mode 100644
index 0..e96dedfc3
--- /dev/null
+++
b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch
@@ -0,0 +1,57 @@
+From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu
+Date: Tue, 24 Sep 2019 16:07:18 +0300
+Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary
+
+Renderdoc's attempt to cross compile an xxd replacement by directly
+calling a host cross-compiler breaks under OE's recipe specific
+sysroots protection because this is not a native recipe, so we just
+use xxd-native instead.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+---
+ renderdoc/CMakeLists.txt | 23 +--
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index 5cb7440a4..453a034ba 100644
+--- a/renderdoc/CMakeLists.txt
b/renderdoc/CMakeLists.txt
+@@ -370,26 +370,6 @@ set(data
+ set(data_objects)
+
+ if(UNIX)
+-# If we're cross-compiling, include-bin will get built for the target and
we
+-# then can't execute it. Instead, we force calling c++ (which we can
safely
+-# assume is present) directly to build the binary
+-
+-if(CMAKE_CROSSCOMPILING)
+-set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to
compile a .cpp into an executable. Default is just c++")
+-
+-add_custom_command(OUTPUT
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+-COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp
-o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
+-DEPENDS 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
+-else()
+-add_executable(include-bin 3rdparty/include-bin/main.cpp)
+-set(INCLUDE_BIN_EXE $)
+-set(INCLUDE_BIN_DEP include-bin)
+-endif()
+-
+ foreach(res ${data})
+ set(in ${res})
+ set(working_dir ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -399,8 +379,7 @@ if(UNIX)
+ add_custom_command(OUTPUT ${out_src}
+ WORKING_DIRECTORY ${working_dir}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
+-COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
+-DEPENDS ${INCLUDE_BIN_DEP}
++COMMAND xxd -i ${in} ${out_src}
+ DEPENDS ${res})
+
+ list(APPEND data_objects ${out_src})
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
new file mode 100644
index 0..b6e0c92f6
--- /dev/null
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
@@ -0,0 +1,35 @@
+SUMMARY = "RenderDoc recipe providing renderdoccmd"
+DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger"
+HOMEPAGE = "https://github.com/baldurk/renderdoc";
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9753b1b4fba3261c27d1ce5c1acef667"
+
+SRCREV = "214d85228538e71cc63a0d7fa11dd75b1d56cc81"
+SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
+
file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim
Re: [oe] [meta-oe][PATCH v3] renderdoc: add new recipe
Hi On Fri, 04 Oct 2019, Martin Jansa wrote: > This should have x11 in REQUIRED_DISTRO_FEATURES to fix: > > ERROR: Nothing PROVIDES 'libxcb' (but > meta-oe/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb DEPENDS on or > otherwise requires it) > libxcb was skipped: missing required distro feature 'x11' (not in > DISTRO_FEATURES) > ERROR: Required build target 'meta-world-pkgdata' has no buildable > providers. > Missing or unbuildable dependency chain was: ['meta-world-pkgdata', > 'renderdoc', 'libxcb'] v4 of this patch was merged into master. I will send a new patch to add the change you suggest. Thank you! > > On Sun, Sep 29, 2019 at 7:46 PM Adrian Ratiu > wrote: > >> On Sun, 29 Sep 2019, Adrian Bunk wrote: >> > On Sat, Sep 28, 2019 at 12:48:10PM -0700, Khem Raj wrote: >> >> On Fri, Sep 27, 2019 at 9:56 AM Adrian Ratiu < >> adrian.ra...@collabora.com> wrote: >> >>... >> >> > --- /dev/null >> >> > +++ >> b/meta-oe/recipes-graphics/renderdoc/renderdoc/0002-q-renderdoc-CMakeLists.txt-remove-flag-unsupported-b.patch >> >> > @@ -0,0 +1,48 @@ >> >> > +From 40511a6f4dc6311c8cf7f2954d1202ede55881ff Mon Sep 17 00:00:00 >> 2001 >> >> > +From: Adrian Ratiu >> >> > +Date: Wed, 25 Sep 2019 19:31:14 +0300 >> >> > +Subject: [PATCH] (q)renderdoc/CMakeLists.txt: remove flag >> unsupported by GCC >> >> > + >> >> > +-Wno-unknown-warning is not supported by GCC, only by Clang so we >> >> > +remove it because newer GCC versions like 9.2.0 will complain, older >> >> > +versions would just ignore it. >> >> > + >> >> > +Upstream-Status: Pending [ >> https://github.com/baldurk/renderdoc/pull/1530] >> >> > + >> >> >> >> gcc9 does support -Wno-unknown-warning perhaps you want >> >> -Wno-error=unknown-warning >> >>... >> >> > +TARGET_CFLAGS += "-Wno-error=deprecated-copy" >> >> > + >> >> >> >> this option is GCC specific mark it >> >> TARGET_CFLAGS_append_toolchain-gcc >> >>... >> > >> > Using -Wno-error always could solve both problems, >> > and would also avoid similar problems in the future. >> >> That's a good idea, however I can't pass directly -Wno-error in the >> recipe because of how the top-level CMakelists.txt is written: it always >> *appends* -Werror to the flags, so it overwrites our -Wno-error. >> >> A better solution which has the same effect is to use >> -DCMAKE_BUILD_TYPE=Release which prevents -Werror being appended at all >> in the top-level CMakelists.txt (there is no other effect than this!) >> >> Thanks! Will send an updatet v4 soon. >> >> > >> > cu >> > Adrian >> > >> > -- >> > >> >"Is there not promise of rain?" Ling Tan asked suddenly out >> > of the darkness. There had been need of rain for many days. >> >"Only a promise," Lao Er said. >> >Pearl S. Buck - Dragon Seed >> -- >> ___ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH] renderdoc: add x11 to REQUIRED_DISTRO_FEATURES
This recipe depends on having x11 enabled so we add it to fix:
ERROR: Nothing PROVIDES 'libxcb' (but
meta-oe/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
DEPENDS on or otherwise requires it)
libxcb was skipped: missing required distro feature 'x11' (not in
DISTRO_FEATURES)
Signed-off-by: Adrian Ratiu
---
meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
index b6e0c92f6..dd5e4058c 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
@@ -10,6 +10,8 @@ SRC_URI =
"git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \
"
S = "${WORKDIR}/git"
+REQUIRED_DISTRO_FEATURES = "x11"
+
DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native"
RDEPENDS_${PN} = "libxcb xcb-util-keysyms"
--
2.23.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH v2] renderdoc: add x11 to REQUIRED_DISTRO_FEATURES
This recipe depends on having x11 enabled so we add it to fix:
ERROR: Nothing PROVIDES 'libxcb' (but
meta-oe/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
DEPENDS on or otherwise requires it)
libxcb was skipped: missing required distro feature 'x11' (not in
DISTRO_FEATURES)
Signed-off-by: Adrian Ratiu
---
Changes since v1:
- Added inherit distro_features_check otherwise the
REQUIRED_DISTRO_FEATURES var no-ops (oops!)
meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
index b6e0c92f6..c7e872409 100644
--- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
+++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb
@@ -14,7 +14,9 @@ DEPENDS += "virtual/libx11 virtual/libgl libxcb
xcb-util-keysyms vim-native"
RDEPENDS_${PN} = "libxcb xcb-util-keysyms"
-inherit cmake python3native
+inherit cmake python3native distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
python __anonymous () {
# only works on glibc systems
--
2.23.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] vim: Compile and provide xxd in package vim-xxd
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/vim/vim_7.4.481.bb | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/vim/vim_7.4.481.bb
b/meta-oe/recipes-support/vim/vim_7.4.481.bb
index 2ece53b..fcd036b 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.481.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.481.bb
@@ -59,6 +59,11 @@ EXTRA_OECONF = " \
STRIP=/bin/true \
"
+do_compile_append() {
+cd "${S}/xxd"
+make
+}
+
do_install() {
autotools_do_install
@@ -70,17 +75,20 @@ do_install() {
# Install example vimrc from runtime files
install -m 0644 ../runtime/vimrc_example.vim ${D}/${datadir}/${BPN}/vimrc
+install -m 0755 xxd/xxd ${D}${bindir}/xxd
+
# we use --with-features=big as default
mv ${D}${bindir}/${BPN} ${D}${bindir}/${BPN}.${BPN}
}
PARALLEL_MAKEINST = ""
-PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc"
+PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc
${PN}-xxd"
FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"
FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
+FILES_${PN}-xxd = "${bindir}/xxd"
FILES_${PN}-data = "${datadir}/${BPN}"
FILES_${PN}-common = " \
${datadir}/${BPN}/${VIMDIR}/*.vim \
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] vim: Compile and provide xxd in package vim-xxd
On 28.09.2015 19:07, Khem Raj wrote:
On Sep 28, 2015, at 4:44 AM, Ioan-Adrian Ratiu wrote:
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/vim/vim_7.4.481.bb | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/vim/vim_7.4.481.bb
b/meta-oe/recipes-support/vim/vim_7.4.481.bb
index 2ece53b..fcd036b 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.481.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.481.bb
@@ -59,6 +59,11 @@ EXTRA_OECONF = " \
STRIP=/bin/true \
"
+do_compile_append() {
+cd "${S}/xxd"
+make
why not oe_runmake ?
I did some more research and indeed oe_runmake should be used and the
default oe_runmake call already compiles xxd when calling the top level
Makefile so there's no need for do_compile_append altogether.
The same goes for the install append.
The only thing needed to be done is simply package xxd. I'll rewrite and
resubmit.
Thank you,
Adrian
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] vim: provide the xxd tool (package vim-xxd)
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/vim/vim_7.4.481.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/vim/vim_7.4.481.bb
b/meta-oe/recipes-support/vim/vim_7.4.481.bb
index 2ece53b..44e6571 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.481.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.481.bb
@@ -76,11 +76,12 @@ do_install() {
PARALLEL_MAKEINST = ""
-PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc"
+PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc
${PN}-xxd"
FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"
FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
+FILES_${PN}-xxd = "${bindir}/xxd"
FILES_${PN}-data = "${datadir}/${BPN}"
FILES_${PN}-common = " \
${datadir}/${BPN}/${VIMDIR}/*.vim \
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] vim: provide the xxd tool (package vim-xxd)
On 29.09.2015 14:22, Martin Jansa wrote:
On Tue, Sep 29, 2015 at 01:15:22PM +0300, Ioan-Adrian Ratiu wrote:
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/vim/vim_7.4.481.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/vim/vim_7.4.481.bb
b/meta-oe/recipes-support/vim/vim_7.4.481.bb
index 2ece53b..44e6571 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.481.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.481.bb
@@ -76,11 +76,12 @@ do_install() {
PARALLEL_MAKEINST = ""
-PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc"
+PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc
${PN}-xxd"
FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax"
FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc"
FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor"
FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc"
+FILES_${PN}-xxd = "${bindir}/xxd"
So it was already included in some other package (probably main vim
package)?
Yes, it is as you say, included in the main package.
If you think it's a good idea to leave it there, then we can simply
ignore these patches.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meta-oe: recipes-graphics: add libvncserver recipe
Signed-off-by: Ioan-Adrian Ratiu
---
.../libvncserver/libvncserver_0.9.10.bb | 20
1 file changed, 20 insertions(+)
create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
new file mode 100644
index 000..841506a
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
+HOMEPAGE = "https://libvnc.github.io";
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+DEPENDS += "zlib jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
+RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
+
+inherit autotools pkgconfig
+
+SRC_URI =
"https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.10.tar.gz";
+
+SRC_URI[md5sum] = "e1b888fae717b06896f8aec100163d27"
+SRC_URI[sha256sum] =
"ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7"
+
+S = "${WORKDIR}/${PN}-LibVNCServer-${PV}"
+
+EXTRA_OEMAKE_append=" SUBDIRS='libvncserver' "
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meta-oe: recipes-devtools: add debootstrap recipe
debootstrap is a tool which will install a Debian base system into a
subdirectory of another, already installed system.
Signed-off-by: Ioan-Adrian Ratiu
---
.../debootstrap/debootstrap/devices.tar.gz | Bin 0 -> 767 bytes
.../debootstrap/debootstrap_1.0.67.bb | 25 +
2 files changed, 25 insertions(+)
create mode 100644
meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz
create mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz
b/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz
new file mode 100644
index
..20eaba3ad22b1e47f6037dea2a0db73eb262ab25
GIT binary patch
literal 767
zcmZwCeNfAB0LSqWmeAtza1IGwl2gu8?#%BF38A~LDZsnQ25NgZhQuh6w=YnJPhSA_*FtCl6pGAjtjwtw&-whEU0bhh3G^$714fW_S;+>2E{qdMet5KqIYj-)Lh{ukV$_
zD-qv-6PR!mNf>EIju8bM+wUlXaeX>{w5fqC(vwYIM%YP3Nz{E|{P|jsdH%sk4P>d6
z99tZDjmGg>x;G+se=71kWJV?;eQaSbjz6~ywz=xO7g~sNLygAH)b_DMpIhQ>F2C92
z@^5pwT0UmVSF%J!UAN~K2h++Jn0TAmU^Ra>SRx?iNz?vkqmVH2CW<%&Xb>2vW)(Ul
z^f6INMqwv&Hq$aEo36eUfubL%Y9ta(Ynh#`rY^1O0Eac*A@wmAt-Wj}oy8WM!yyhs
zu40fd4Ox4-na6gfyw*XgcwG89Ot6k;)}}*LinC#_$RY=MFFN4Gofwq*NT-hpM&9RP
zpAP#fO_I0{JZeXnl!gb%sYKBgmHXh|8PfU4EWVCo)7==jgBQy&T1V$q+kL6!FnUF%
zo(j|^dWhAlDp_bW6aGm)^+riUD={L7BiiioTiyj&UE09`UmU1%V&#rLi34eKTF8|i
lg`pYfzz_{`no;0}G-+Dtic5)C{)_x|f?q~cv>;m`_yZJ@!>9lN
literal 0
HcmV?d1
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
new file mode 100644
index 000..3169e80
--- /dev/null
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Install a Debian system into a subdirectory"
+HOMEPAGE = "https://wiki.debian.org/Debootstrap";
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "debootstrap-custom-license"
+LIC_FILES_CHKSUM =
"file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608"
+
+inherit autotools pkgconfig
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI = "\
+
http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_1.0.67.tar.gz
\
+file://devices.tar.gz;unpack=0 \
+"
+
+SRC_URI[md5sum] = "eacabfe2e45415af60b1d74c3a23418a"
+SRC_URI[sha256sum] =
"0a12e0a2bbff185d47711a716b1f2734856100e8784361203e834fed0cffa51b"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_install_prepend() {
+cp ${WORKDIR}/devices.tar.gz ${S}
+cd "${S}"
+}
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meta-oe: recipes-devtools: add libubox recipe
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-devtools/libubox/libubox_git.bb | 30 +
1 file changed, 30 insertions(+)
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..4b9c3bc
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "libubox-custom-license"
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+PR = "r0"
+
+DEPENDS = "json-c"
+RDEPENDS_${PN} = "json-c"
+
+SRC_URI =
"git://git.openwrt.org/project/libubox.git;protocol=git;branch=master"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
+
+INSANE_SKIP_libubox += "dev-deps"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meta-oe: recipes-connectivity: add relayd recipe
relayd is a daemon to relay and dynamically redirect incoming
connections to a target host.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-connectivity/relayd/relayd_git.bb | 18 ++
1 file changed, 18 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/relayd/relayd_git.bb
diff --git a/meta-oe/recipes-connectivity/relayd/relayd_git.bb
b/meta-oe/recipes-connectivity/relayd/relayd_git.bb
new file mode 100644
index 000..15fba0c
--- /dev/null
+++ b/meta-oe/recipes-connectivity/relayd/relayd_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Layer 3 relay daemon"
+SECTION = "console/network"
+LICENSE = "relayd-custom-license"
+LIC_FILES_CHKSUM =
"file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2"
+PR = "r0"
+
+DEPENDS = "libubox"
+RDEPENDS_${PN} = "libubox"
+
+SRC_URI = "git://nbd.name/relayd.git;protocol=git;branch=master"
+
+SRCREV = "2970ff60bac6b70ecb682779d5c776dc559dc0b9"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+INSANE_SKIP_relayd += "dev-deps"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] meta-oe: recipes-connectivity: add relayd recipe
On 30.09.2015 12:38, Martin Jansa wrote: Why not meta-networking? Don't use INSANE_SKIP, this should be fixed, drop PR, is RDEPENDS really needed? Drop protocol and branch from the SRC_URI (default values). Thank you for the feedback. I'll apply these changes and resubmit. I'll also modify the libubox patch with these suggestions. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] meta-networking: recipes-connectivity: add relayd recipe
relayd is a daemon to relay and dynamically redirect incoming
connections to a target host.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-networking/recipes-connectivity/relayd/relayd_git.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/relayd/relayd_git.bb
diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb
b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
new file mode 100644
index 000..9ca04c4
--- /dev/null
+++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Layer 3 relay daemon"
+SECTION = "console/network"
+LICENSE = "relayd-custom-license"
+LIC_FILES_CHKSUM =
"file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2"
+
+DEPENDS = "libubox"
+
+SRC_URI = "git://nbd.name/relayd.git"
+
+SRCREV = "2970ff60bac6b70ecb682779d5c776dc559dc0b9"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V2] meta-networking: recipes-connectivity: add relayd recipe
relayd is a daemon to relay and dynamically redirect incoming
connections to a target host.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-networking/recipes-connectivity/relayd/relayd_git.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/relayd/relayd_git.bb
diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb
b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
new file mode 100644
index 000..9ca04c4
--- /dev/null
+++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Layer 3 relay daemon"
+SECTION = "console/network"
+LICENSE = "relayd-custom-license"
+LIC_FILES_CHKSUM =
"file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2"
+
+DEPENDS = "libubox"
+
+SRC_URI = "git://nbd.name/relayd.git"
+
+SRCREV = "2970ff60bac6b70ecb682779d5c776dc559dc0b9"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V2] meta-oe: recipes-devtools: add libubox recipe
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-devtools/libubox/libubox_git.bb | 32 +
1 file changed, 32 insertions(+)
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..4be3ac1
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "libubox-custom-license"
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-staticdev"
+
+DEPENDS = "json-c"
+
+SRC_URI = "git://git.openwrt.org/project/libubox.git"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
+
+FILES_${PN} += "\
+${libdir}/libubox.so \
+${libdir}/libblobmsg_json.so \
+"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH V2] meta-oe: recipes-devtools: add libubox recipe
On 30.09.2015 18:24, Khem Raj wrote:
On Sep 30, 2015, at 4:15 AM, Ioan-Adrian Ratiu wrote:
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-devtools/libubox/libubox_git.bb | 32 +
1 file changed, 32 insertions(+)
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..4be3ac1
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "libubox-custom-license”
where is the license file ?
There is no global license file, only the license headers specified per
files, of which I tried to list all the unique ones in the
LIC_FILES_CHKSUM. I'm still at a loss what to put in the LICENSE
variable. Any suggestions?
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-staticdev”
why override default PACKAGES ?
This is related with the issue below, please see my explanation there.
+
+DEPENDS = "json-c"
+
+SRC_URI = "git://git.openwrt.org/project/libubox.git"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
+
+FILES_${PN} += "\
+${libdir}/libubox.so \
+${libdir}/libblobmsg_json.so \
can they be versioned ?
My initial problem in patch v1 was that I was getting this dev-deps
error (I used INSANE_SKIP to suppress it):
ERROR: QA Issue: libubox rdepends on libubox-dev [dev-deps]
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
Martin J. told me to fix the issue properly for these recipes.
Now, in v2, I've made it go away by reordering ${PN} in front of
${PN}-dev in PACKAGES and explicitly adding these files to FILES_${PN}.
If I use the default PACKAGES variable, or do not add the libraries to
FILES_${PN}, that error reappears.
I don't have a level of knowledge-depth of the OE packaging mechanism to
fully understand what is happening here and I couldn't find more info in
the docs... So any help on this is very much appreciated :)
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH V2] meta-oe: recipes-devtools: add libubox recipe
On 01.10.2015 14:21, Martin Jansa wrote:
On Thu, Oct 01, 2015 at 12:18:32PM +0300, Ioan-Adrian Ratiu wrote:
On 30.09.2015 18:24, Khem Raj wrote:
On Sep 30, 2015, at 4:15 AM, Ioan-Adrian Ratiu wrote:
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-devtools/libubox/libubox_git.bb | 32 +
1 file changed, 32 insertions(+)
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..4be3ac1
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "libubox-custom-license”
where is the license file ?
There is no global license file, only the license headers specified per
files, of which I tried to list all the unique ones in the
LIC_FILES_CHKSUM. I'm still at a loss what to put in the LICENSE
variable. Any suggestions?
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-staticdev”
why override default PACKAGES ?
This is related with the issue below, please see my explanation there.
+
+DEPENDS = "json-c"
+
+SRC_URI = "git://git.openwrt.org/project/libubox.git"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
+
+FILES_${PN} += "\
+${libdir}/libubox.so \
+${libdir}/libblobmsg_json.so \
can they be versioned ?
My initial problem in patch v1 was that I was getting this dev-deps
error (I used INSANE_SKIP to suppress it):
ERROR: QA Issue: libubox rdepends on libubox-dev [dev-deps]
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
Martin J. told me to fix the issue properly for these recipes.
Now, in v2, I've made it go away by reordering ${PN} in front of
${PN}-dev in PACKAGES and explicitly adding these files to FILES_${PN}.
If I use the default PACKAGES variable, or do not add the libraries to
FILES_${PN}, that error reappears.
I don't have a level of knowledge-depth of the OE packaging mechanism to
fully understand what is happening here and I couldn't find more info in
the docs... So any help on this is very much appreciated :)
I'm surprised that there are still many people confused by this and that
the docs aren't clear enough.
I'm not tech. writer, but I would explain it like this:
Packaging rules:
1) Each installed file (in ${D} directory), should be packaged in exactly
one package. If it matches in multiple FILES_ patterns, then first
package wins (see bellow), if it isn't matched in any FILES_
variable, then it's not packaged at all and QA warning
installed-not-packaged is shown.
2) Files are "moved" to packages in order of PACKAGES variable, so if
FILES_ has more generic pattern than FILES_ then pkg1 needs
to be _after_ pkg2 in PACKAGES variable or pkg1 will get all files and
pkg2 none.
To apply this on your problem, if you really want to move all .so files
to PN (normally they are symlinks to versioned .so.X.Y.Z and really
belong to PN-dev). Typical exception to this rule are some .so modules
loaded by the application itself instead of normal shlib loader.
You have 2 options (first one is better)
1) restrict FILES_${PN}-dev to prevent it from "eating" these .so. I
prefer to set FILES_SOLIBSDEV instead of redefinition of whole
FILES_${PN}-dev
2) change order of PACKAGES by re-defining it in the recipe - harder to
introduce new global PACKAGES
Thank you very much for clarifying this. I will rewrite and resubmit.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH V2] meta-oe: recipes-devtools: add libubox recipe
On 30.09.2015 18:24, Khem Raj wrote:
On Sep 30, 2015, at 4:15 AM, Ioan-Adrian Ratiu wrote:
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-devtools/libubox/libubox_git.bb | 32 +
1 file changed, 32 insertions(+)
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..4be3ac1
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "libubox-custom-license”
where is the license file ?
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-staticdev”
why override default PACKAGES ?
+
+DEPENDS = "json-c"
+
+SRC_URI = "git://git.openwrt.org/project/libubox.git"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
+
+FILES_${PN} += "\
+${libdir}/libubox.so \
+${libdir}/libblobmsg_json.so \
can they be versioned ?
Sorry I got carried into the packaging discussion and forgot to answer
this one. The answer is no. AFAIK this means that I have to tweak the
packaging to include them in FILES_${PN}.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V3] meta-oe: recipes-devtools: add libubox recipe
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
.../libubox/libubox/0001-version-libraries.patch | 28
meta-oe/recipes-devtools/libubox/libubox_git.bb| 30 ++
2 files changed, 58 insertions(+)
create mode 100644
meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git
a/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
b/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
new file mode 100644
index 000..02117fa
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57804cf..1aa7f27 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -18,6 +18,7 @@ ENDIF()
+ SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c
ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c
base64.c)
+
+ ADD_LIBRARY(ubox SHARED ${SOURCES})
++SET_TARGET_PROPERTIES(ubox PROPERTIES VERSION 1.0.1 SOVERSION 1)
+ ADD_LIBRARY(ubox-static STATIC ${SOURCES})
+ SET_TARGET_PROPERTIES(ubox-static PROPERTIES OUTPUT_NAME ubox)
+
+@@ -46,6 +47,7 @@ find_library(json NAMES json-c)
+ IF(EXISTS ${json})
+ ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
+ TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})
++ SET_TARGET_PROPERTIES(blobmsg_json PROPERTIES VERSION 1.0.1 SOVERSION 1)
+
+ ADD_LIBRARY(blobmsg_json-static STATIC blobmsg_json.c)
+ SET_TARGET_PROPERTIES(blobmsg_json-static
+@@ -55,6 +57,7 @@ IF(EXISTS ${json})
+ TARGET_LINK_LIBRARIES(jshn blobmsg_json ${json})
+
+ ADD_LIBRARY(json_script SHARED json_script.c)
++ SET_TARGET_PROPERTIES(json_script PROPERTIES VERSION 1.0.1 SOVERSION 1)
+ TARGET_LINK_LIBRARIES(json_script ubox)
+
+ INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..d16bbcf
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI = "\
+git://git.openwrt.org/project/libubox.git \
+file://0001-version-libraries.patch \
+"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+DEPENDS = "json-c"
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V3] meta-networking: recipes-connectivity: add relayd recipe
relayd is a daemon to relay and dynamically redirect incoming
connections to a target host.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-networking/recipes-connectivity/relayd/relayd_git.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/relayd/relayd_git.bb
diff --git a/meta-networking/recipes-connectivity/relayd/relayd_git.bb
b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
new file mode 100644
index 000..aab2ab5
--- /dev/null
+++ b/meta-networking/recipes-connectivity/relayd/relayd_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Layer 3 relay daemon"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM =
"file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2"
+
+DEPENDS = "libubox"
+
+SRC_URI = "git://nbd.name/relayd.git"
+
+SRCREV = "2970ff60bac6b70ecb682779d5c776dc559dc0b9"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH V4] meta-oe: recipes-devtools: add libubox recipe
libubox contains C utility functions used by OpenWrt projects
Signed-off-by: Ioan-Adrian Ratiu
---
.../libubox/libubox/0001-version-libraries.patch | 28 ++
meta-oe/recipes-devtools/libubox/libubox_git.bb| 28 ++
2 files changed, 56 insertions(+)
create mode 100644
meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
create mode 100644 meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git
a/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
b/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
new file mode 100644
index 000..02117fa
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57804cf..1aa7f27 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -18,6 +18,7 @@ ENDIF()
+ SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c
ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c
base64.c)
+
+ ADD_LIBRARY(ubox SHARED ${SOURCES})
++SET_TARGET_PROPERTIES(ubox PROPERTIES VERSION 1.0.1 SOVERSION 1)
+ ADD_LIBRARY(ubox-static STATIC ${SOURCES})
+ SET_TARGET_PROPERTIES(ubox-static PROPERTIES OUTPUT_NAME ubox)
+
+@@ -46,6 +47,7 @@ find_library(json NAMES json-c)
+ IF(EXISTS ${json})
+ ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
+ TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})
++ SET_TARGET_PROPERTIES(blobmsg_json PROPERTIES VERSION 1.0.1 SOVERSION 1)
+
+ ADD_LIBRARY(blobmsg_json-static STATIC blobmsg_json.c)
+ SET_TARGET_PROPERTIES(blobmsg_json-static
+@@ -55,6 +57,7 @@ IF(EXISTS ${json})
+ TARGET_LINK_LIBRARIES(jshn blobmsg_json ${json})
+
+ ADD_LIBRARY(json_script SHARED json_script.c)
++ SET_TARGET_PROPERTIES(json_script PROPERTIES VERSION 1.0.1 SOVERSION 1)
+ TARGET_LINK_LIBRARIES(json_script ubox)
+
+ INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb
b/meta-oe/recipes-devtools/libubox/libubox_git.bb
new file mode 100644
index 000..3e886b7
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "C utility functions for OpenWrt"
+SECTION = "libs"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "\
+file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \
+file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \
+file://base64.c;endline=61;md5=51fdff010d45b0086ac0a6e035693dc0 \
+file://blobmsg.c;endline=15;md5=7ed64c1570e8c9b46c4fc6fbd16c489e \
+file://list.h;endline=28;md5=2d5f5475fbd0f08741354c5a99c2e983 \
+file://md5.h;endline=39;md5=048bf9f68963c207a0c2b3a94c9d2aaa \
+file://md5.c;endline=51;md5=0a448eea0bcbc89e3c7e6608f2d119a0 \
+file://usock.h;endline=18;md5=f0dfdc8de858e66d66d74036611bba14 \
+"
+
+SRC_URI = "\
+git://git.openwrt.org/project/libubox.git \
+file://0001-version-libraries.patch \
+"
+
+SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+DEPENDS = "json-c"
+
+EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_LUA=OFF"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-security][PATCH] clamav: Update source mirror
The source archive was deleted from the debian mirror; get it from
launchpad for now
Signed-off-by: Ioan-Adrian Ratiu
---
recipes-security/clamav/clamav_0.98.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-security/clamav/clamav_0.98.5.bb
b/recipes-security/clamav/clamav_0.98.5.bb
index 08604a7..8820461 100644
--- a/recipes-security/clamav/clamav_0.98.5.bb
+++ b/recipes-security/clamav/clamav_0.98.5.bb
@@ -7,7 +7,7 @@ DEPENDS = "libtool db openssl zlib ncurses bzip2 libmspack"
LIC_FILES_CHKSUM =
"file://COPYING.LGPL;beginline=2;endline=3;md5=4b89c05acc71195e9a06edfa2fa7d092"
-SRC_URI =
"${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}+dfsg.orig.tar.xz;name=archive \
+SRC_URI =
"https://launchpad.net/debian/+archive/primary/+files/clamav_0.98.5%2Bdfsg.orig.tar.xz;name=archive
\
file://0001-Change-paths-in-sample-conf-file-to-match-Debian.patch \
file://0002-Add-an-additional-n-after-the-number-in-the-pidfile.patch \
file://0003-unit_tests-increment-test-timeout-from-40secs-to-5mi.patch \
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] meta-oe: recipes-graphics: add libvncserver recipe
Signed-off-by: Ioan-Adrian Ratiu
---
.../libvncserver/libvncserver_0.9.10.bb | 19 +++
1 file changed, 19 insertions(+)
create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
new file mode 100644
index 000..afa303c
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
+HOMEPAGE = "https://libvnc.github.io";
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+DEPENDS += "zlib jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
+RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
+
+RCONFLICTS_${PN} = "x11vnc"
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/LibVNC/libvncserver.git;tag=LibVNCServer-0.9.10"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE_append=" SUBDIRS='libvncserver' "
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] meta-oe: recipes-graphics: add libvncserver recipe
On 13.10.2015 13:53, Martin Jansa wrote:
On Fri, Oct 09, 2015 at 09:58:07AM +0300, Ioan-Adrian Ratiu wrote:
Signed-off-by: Ioan-Adrian Ratiu
---
.../libvncserver/libvncserver_0.9.10.bb | 19 +++
1 file changed, 19 insertions(+)
create mode 100644
meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
new file mode 100644
index 000..afa303c
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
+HOMEPAGE = "https://libvnc.github.io";
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+DEPENDS += "zlib jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
+RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
+
+RCONFLICTS_${PN} = "x11vnc"
This isn't enough to resolve conflicts with x11vnc in sysroot, this only
prevent installing both packages in the same image.
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/LibVNC/libvncserver.git;tag=LibVNCServer-0.9.10"
Set SRCREV matching with this tag, otherwise bitbake will always use git
ls-remote to convert tag name to git SHA, which won't work for builds
from premirror (possibly without access to network)
This is easy to fix, however the above x11vnc conflict is not and I have
to check with upstream developers which might take awhile.
Is it ok to blacklist libvncserver in patch v3 in order to not break
x11vnc until this is solved?
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE_append=" SUBDIRS='libvncserver' "
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] meta-oe: recipes-graphics: add libvncserver recipe
On 13.10.2015 16:08, Martin Jansa wrote:
On Tue, Oct 13, 2015 at 03:40:20PM +0300, Ioan-Adrian Ratiu wrote:
On 13.10.2015 13:53, Martin Jansa wrote:
On Fri, Oct 09, 2015 at 09:58:07AM +0300, Ioan-Adrian Ratiu wrote:
Signed-off-by: Ioan-Adrian Ratiu
---
.../libvncserver/libvncserver_0.9.10.bb | 19
+++
1 file changed, 19 insertions(+)
create mode 100644
meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
new file mode 100644
index 000..afa303c
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
Use SUMMARY for such short description.
+HOMEPAGE = "https://libvnc.github.io";
+SECTION = "libs"
+PRIORITY = "optional"
Drop PRIORITY, we don't use it anywhere.
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+DEPENDS += "zlib jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
+RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
+
+RCONFLICTS_${PN} = "x11vnc"
This isn't enough to resolve conflicts with x11vnc in sysroot, this only
prevent installing both packages in the same image.
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/LibVNC/libvncserver.git;tag=LibVNCServer-0.9.10"
Set SRCREV matching with this tag, otherwise bitbake will always use git
ls-remote to convert tag name to git SHA, which won't work for builds
from premirror (possibly without access to network)
This is easy to fix, however the above x11vnc conflict is not and I have
to check with upstream developers which might take awhile.
Is it ok to blacklist libvncserver in patch v3 in order to not break
x11vnc until this is solved?
I don't want to introduce more blacklisted recipes in meta-oe, so this
won't be merged until it's resolved.
This makes sense; it's no rush to get it merged.
Again, thank you for the feedback.
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE_append=" SUBDIRS='libvncserver' "
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] meta-oe: recipes-graphics: add libvncserver recipe
On 13.10.2015 16:08, Martin Jansa wrote:
On Tue, Oct 13, 2015 at 03:40:20PM +0300, Ioan-Adrian Ratiu wrote:
On 13.10.2015 13:53, Martin Jansa wrote:
On Fri, Oct 09, 2015 at 09:58:07AM +0300, Ioan-Adrian Ratiu wrote:
Signed-off-by: Ioan-Adrian Ratiu
---
.../libvncserver/libvncserver_0.9.10.bb | 19
+++
1 file changed, 19 insertions(+)
create mode 100644
meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
new file mode 100644
index 000..afa303c
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
Use SUMMARY for such short description.
+HOMEPAGE = "https://libvnc.github.io";
+SECTION = "libs"
+PRIORITY = "optional"
Drop PRIORITY, we don't use it anywhere.
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+DEPENDS += "zlib jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
+RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
+
+RCONFLICTS_${PN} = "x11vnc"
This isn't enough to resolve conflicts with x11vnc in sysroot, this only
prevent installing both packages in the same image.
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/LibVNC/libvncserver.git;tag=LibVNCServer-0.9.10"
Set SRCREV matching with this tag, otherwise bitbake will always use git
ls-remote to convert tag name to git SHA, which won't work for builds
from premirror (possibly without access to network)
This is easy to fix, however the above x11vnc conflict is not and I have
to check with upstream developers which might take awhile.
Is it ok to blacklist libvncserver in patch v3 in order to not break
x11vnc until this is solved?
I don't want to introduce more blacklisted recipes in meta-oe, so this
won't be merged until it's resolved.
Quick question: Fixing this involves adding a PACKAGECONFIG dependency
inside x11vnc on libvncserver. x11vnc is in the openembedded-core layer.
Should I move libvncserver to oe-core, move x11vnc in meta-oe or should
I just let them reside in separate layers even though there is this
dependency?
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE_append=" SUBDIRS='libvncserver' "
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] meta-oe: recipes-graphics: add libvncserver recipe
On 14.10.2015 17:16, Martin Jansa wrote:
On Wed, Oct 14, 2015 at 05:06:07PM +0300, Ioan-Adrian Ratiu wrote:
On 13.10.2015 16:08, Martin Jansa wrote:
On Tue, Oct 13, 2015 at 03:40:20PM +0300, Ioan-Adrian Ratiu wrote:
On 13.10.2015 13:53, Martin Jansa wrote:
On Fri, Oct 09, 2015 at 09:58:07AM +0300, Ioan-Adrian Ratiu wrote:
Signed-off-by: Ioan-Adrian Ratiu
---
.../libvncserver/libvncserver_0.9.10.bb | 19
+++
1 file changed, 19 insertions(+)
create mode 100644
meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
new file mode 100644
index 000..afa303c
--- /dev/null
+++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
Use SUMMARY for such short description.
+HOMEPAGE = "https://libvnc.github.io";
+SECTION = "libs"
+PRIORITY = "optional"
Drop PRIORITY, we don't use it anywhere.
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+
+DEPENDS += "zlib jpeg libpng gtk+ libgcrypt nettle gnutls gmp"
+RDEPENDS_${PN} += "libpng gtk+ libgcrypt"
+
+RCONFLICTS_${PN} = "x11vnc"
This isn't enough to resolve conflicts with x11vnc in sysroot, this only
prevent installing both packages in the same image.
+
+inherit autotools pkgconfig
+
+SRC_URI = "git://github.com/LibVNC/libvncserver.git;tag=LibVNCServer-0.9.10"
Set SRCREV matching with this tag, otherwise bitbake will always use git
ls-remote to convert tag name to git SHA, which won't work for builds
from premirror (possibly without access to network)
This is easy to fix, however the above x11vnc conflict is not and I have
to check with upstream developers which might take awhile.
Is it ok to blacklist libvncserver in patch v3 in order to not break
x11vnc until this is solved?
I don't want to introduce more blacklisted recipes in meta-oe, so this
won't be merged until it's resolved.
Quick question: Fixing this involves adding a PACKAGECONFIG dependency
inside x11vnc on libvncserver. x11vnc is in the openembedded-core layer.
If such PACKAGECONFIG can be disabled by default, then it's ok.
Should I move libvncserver to oe-core, move x11vnc in meta-oe or should
I just let them reside in separate layers even though there is this
dependency?
oe-core (x11vnc) cannot by default depend on meta-oe (libvncserver), it
can be optional dependency, but without looking at the code my guess is
that this won't fix the issue.
Is the PACKAGECONFIG about using external libvncserver instead of
building own version inside x11vnc recipe? If my guess is right, then
oe-core will need to build own and meta-oe will need to remove such
PACKAGECONFIG in order to unblock building separate libvncserver.
If that's the case then moving libvncserver to oe-core or x11vnc to
meta-oe would be easier way forward.
Yes, this is correct (x11vnc's configured --with-system-libvncserver)
Adding oe-core ML for their opinion.
Regards,
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE_append=" SUBDIRS='libvncserver' "
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/3] meta-oe: recipes-graphics: add libvncserver recipe
Signed-off-by: Ioan-Adrian Ratiu --- .../0001-remove-webclients-build.patch | 28 ++ .../libvncserver/0002-common-add-sha1.patch| 524 + .../libvncserver/libvncserver_0.9.10.bb| 24 + 3 files changed, 576 insertions(+) create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch new file mode 100644 index 000..8f4365c --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile.am b/Makefile.am +index 5c2a94d..f98038a 100644 +--- a/Makefile.am b/Makefile.am +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS=libvncserver examples libvncclient webclients client_examples test +-DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test ++SUBDIRS=libvncserver examples libvncclient client_examples test ++DIST_SUBDIRS=libvncserver examples libvncclient client_examples test + EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake + + bin_SCRIPTS = libvncserver-config +diff --git a/configure.ac b/configure.ac +index ca9f3b3..9b464cf 100644 +--- a/configure.ac b/configure.ac +@@ -600,9 +600,6 @@ AC_CONFIG_FILES([Makefile + libvncserver/Makefile + examples/Makefile + examples/android/Makefile +- webclients/Makefile +- webclients/java-applet/Makefile +- webclients/java-applet/ssl/Makefile + libvncclient/Makefile + client_examples/Makefile + test/Makefile diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch new file mode 100644 index 000..8b70d2f --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch @@ -0,0 +1,524 @@ +diff --git a/common/sha1.c b/common/sha1.c +new file mode 100644 +index 000..988b188 +--- /dev/null b/common/sha1.c +@@ -0,0 +1,411 @@ ++/* ++ * Copyright (C) The Internet Society (2001). All Rights Reserved. ++ * ++ * This document and translations of it may be copied and furnished to ++ * others, and derivative works that comment on or otherwise explain it ++ * or assist in its implementation may be prepared, copied, published ++ * and distributed, in whole or in part, without restriction of any ++ * kind, provided that the above copyright notice and this paragraph are ++ * included on all such copies and derivative works. However, this ++ * document itself may not be modified in any way, such as by removing ++ * the copyright notice or references to the Internet Society or other ++ * Internet organizations, except as needed for the purpose of ++ * developing Internet standards in which case the procedures for ++ * copyrights defined in the Internet Standards process must be ++ * followed, or as required to translate it into languages other than ++ * English. ++ * ++ * The limited permissions granted above are perpetual and will not be ++ * revoked by the Internet Society or its successors or assigns. ++ * ++ * This document and the information contained herein is provided on an ++ * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING ++ * TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING ++ * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION ++ * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF ++ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. ++ */ ++ ++/* ++ * sha1.c ++ * ++ * Description: ++ * This file implements the Secure Hashing Algorithm 1 as ++ * defined in FIPS PUB 180-1 published April 17, 1995. ++ * ++ * The SHA-1, produces a 160-bit message digest for a given ++ * data stream. It should take about 2**n steps to find a ++ * message with the same digest as a given message and ++ * 2**(n/2) to find any two messages with the same digest, ++ * when n is the digest size in bits. Therefore, this ++ * algorithm can serve as a means of providing a ++ * "fingerprint" for a message. ++ * ++ * Portability Issues: ++ * SHA-1 is defined in terms of 32-bit "words". This code ++ * uses (included via "sha1.h" to define 32 and 8 ++ * bit unsigned integer types. If your C compiler does not ++ * support 32 bit unsigned integers, this code is not ++ * appropriate. ++ * ++ * Caveats: ++ * SHA-1 is designed to work with messages less than 2^64 bits ++ * long. Although SHA-1
[oe] [meta-oe][PATCH 3/3] x11vnc: use external libvncserver
By default x11vnc compiles its dependency libvncserver from sources
included in its own source tree. We override this behaviour to use
the externally provided libvncserver from a separate recipe.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index ec0241f..7e92965 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -14,12 +14,13 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
SRC_URI[sha256sum] =
"f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
-DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr
libxdamage libxtst"
+DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr
libxdamage libxtst libtasn1 p11-kit"
inherit autotools-brokensep distro_features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'avahi', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'avahi', '', d)} libvncserver"
PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
+PACKAGECONFIG[libvncserver] =
"--with-system-libvncserver,--without-system-libvncserver,libvncserver"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/3] x11vnc: move recipe from oe-core
x11vnc will be configured to use the external libvncserver which is
added to meta-oe. Since oe-core recipes should not depend on meta-oe
recipes, we move x11vnc to meta-oe.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-graphics/x11vnc/files/endian-fix.patch | 24 +
.../x11vnc/files/starting-fix.patch| 25 ++
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 25 ++
3 files changed, 74 insertions(+)
create mode 100644 meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
create mode 100644 meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
create mode 100644 meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
diff --git a/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
b/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
new file mode 100644
index 000..f2a538b
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
@@ -0,0 +1,24 @@
+libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN
+
+since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is
+automatically set for different arch, it is better to use WORDS_BIGENDIAN
+instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
+
+Signed-off-by: Yu Ke
+
+Upstream-Status: Pending
+
+diff --git a/libvncserver/main.c b/libvncserver/main.c
+index b6bd930..8bbb7bf 100644
+--- a/libvncserver/main.c
b/libvncserver/main.c
+@@ -47,7 +47,7 @@ static MUTEX(extMutex);
+
+ static int rfbEnableLogging=1;
+
+-#ifdef LIBVNCSERVER_WORDS_BIGENDIAN
++#ifdef WORDS_BIGENDIAN
+ char rfbEndianTest = (1==0);
+ #else
+ char rfbEndianTest = (1==1);
+
diff --git a/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
b/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
new file mode 100644
index 000..f62e405
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
@@ -0,0 +1,25 @@
+"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
+Removing these 2 parameters makes x11vnc works well on poky sato image.
+
+Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock,
+Scroll_Lock keysyms received from viewers, in order to leave the lock state on
+the server side unchanged. Yet, the keys will appear correctly.
+
+Signed-off-by: Zhai Edwin
+Signed-off-by: Laurentiu Palcu
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
+===
+--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.0
+0800
x11vnc-0.9.12/x11vnc/x11vnc.desktop2011-03-03 10:35:20.0
+0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=X11VNC Server
+ Comment=Share this desktop by VNC
+-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o
%%HOME/.x11vnc.log.%%VNCDISPLAY
++Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o
%%HOME/.x11vnc.log.%%VNCDISPLAY
+ Icon=computer
+ Terminal=false
+ Type=Application
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
new file mode 100644
index 000..ec0241f
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Exports your X session on-the-fly via VNC"
+HOMEPAGE = "http://www.karlrunge.com/x11vnc/";
+
+SECTION = "x11/utils"
+AUTHOR = "Karl Runge"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
+
file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
+ file://starting-fix.patch \
+ file://endian-fix.patch "
+
+SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
+SRC_URI[sha256sum] =
"f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
+
+DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr
libxdamage libxtst"
+
+inherit autotools-brokensep distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'avahi', '', d)}"
+PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
+PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/1] snort: fix m4 causes out of memory during configure [ LIN8-299 ]
On Fri, 23 Oct 2015 18:07:35 +0800
Zhiquan Li wrote:
> Issue: LIN8-299
>
> There is an incorrect m4_define() in configure.in which will result in an
> infinite recursion, and it doesn't make sense, since snort 2.9.7 it has been
> commented out. We follow this solution to fix it.
>
> Upstream-Status: Backport
>
> (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151023
>
> Signed-off-by: Zhiquan Li
> ---
> .../snort/snort/m4-oom-during-configure.patch | 21
> +
> .../recipes-connectivity/snort/snort_2.9.6.0.bb | 16 +++-
> 2 files changed, 24 insertions(+), 13 deletions(-)
> create mode 100644
> meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
>
> diff --git
> a/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
>
> b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
> new file mode 100644
> index 000..2250611
> --- /dev/null
> +++
> b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
> @@ -0,0 +1,21 @@
> +Upstream-Status: Backport
> +
> +There is an incorrect m4_define() in configure.in which will result in an
> +infinite recursion, and it doesn't make sense, since snort 2.9.7 it has been
> +commented out. We follow this solution to fix it.
> +
Doesn't it make more sense to upgrade the snort recipe to >2.9.7 than
backporting this fix?
> +Signed-off-by: Zhiquan Li
> +
> +--- a/configure.in 2015-10-22 13:58:50.743367251 +0800
> b/configure.in 2015-10-22 13:59:13.855366117 +0800
> +@@ -1100,8 +1100,8 @@
> + # Define PKG_CHECK_MODULES if it doesnt already exist.
> + #file_ This prevents './configure' from erroring on machines that dont have
> + # 'pkgconfig' installed.
> +-m4_ifdef([PKG_CHECK_MODULES],[], [m4_define([PKG_CHECK_MODULES],
> +- [echo "PKG_CHECK_MODULES not defined"])])
> ++#m4_ifdef([PKG_CHECK_MODULES],[], [m4_define([PKG_CHECK_MODULES],
> ++# [echo "PKG_CHECK_MODULES not defined"])])
> +
> + if test "x$enable_rzb_saac" = "xyes"; then
> + AC_CHECK_PROG(PKG_CONFIG,pkg-config,yes)
> diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> b/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> index 66653c6..65dc524 100644
> --- a/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> @@ -6,19 +6,6 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5"
>
> DEPENDS = "libpcap libpcre daq libdnet util-linux"
>
> -# Blacklist:
> -#
> -# http://errors.yoctoproject.org/Errors/Details/8936/
> -#
> -# snort failure is again very nasty, because it's m4 which eats all
> -# available memory and swap before it's killed by OOM killer.
> -#
> -# Luckily it always picked m4
> -#
> -# [Wed Feb 18 19:00:51 2015] Out of memory: Kill process 28522 (m4) score
> 961 or sacrifice child
> -# [Wed Feb 18 19:10:51 2015] Out of memory: Kill process 45228 (m4) score
> 958 or sacrifice child
> -# ...
> -PNBLACKLIST[snort] ?= "BROKEN: autotools processing causes OOM condition on
> configure"
>
> SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \
> file://snort.init \
> @@ -26,6 +13,7 @@ SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \
> file://disable-dap-address-space-id.patch \
> file://0001-libpcap-search-sysroot-for-headers.patch \
> file://not-hardcoded-libdir.patch \
> +file://m4-oom-during-configure.patch \
> "
>
> SRC_URI[tarball.md5sum] = "18111f6de3989ca89add36077a7c2659"
> @@ -45,6 +33,8 @@ EXTRA_OECONF = " \
> --disable-static-daq \
> --with-dnet-includes=${STAGING_INCDIR} \
> --with-dnet-libraries=${STAGING_LIBDIR} \
> + --with-libpcre-includes=${STAGING_INCDIR} \
> + --with-libpcre-libraries=${STAGING_INCDIR} \
> "
>
> # if you want to disable it, you need to patch configure.in first
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/1] snort: fix m4 causes out of memory during configure [ LIN8-299 ]
On Tue, 27 Oct 2015 09:54:07 +
"Li, Zhiquan" wrote:
> I need to evaluate the possibility to upgrade the snort recipe to >2.9.7,
> because upgrade to > 2.9.7, some patches will not work anymore and the daq
> recipe also need to be upgraded to 2.0.4 at least. The side-effect is
> uncertainty.
>
What exactly do you mean by "patches will not work anymore"?.
Do you mean thy do not apply on >2.9.7? AFAIK two of those
patches are not needed in 2.9.7.6 (fixed upstream), the others
just need refreshing.
________
> From: Ioan-Adrian Ratiu [adrian.ra...@ni.com]
> Sent: Monday, October 26, 2015 6:49 PM
> To: Li, Zhiquan
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH 1/1] snort: fix m4 causes out of memory during
> configure [ LIN8-299 ]
>
> On Fri, 23 Oct 2015 18:07:35 +0800
> Zhiquan Li wrote:
>
> > Issue: LIN8-299
> >
> > There is an incorrect m4_define() in configure.in which will result in an
> > infinite recursion, and it doesn't make sense, since snort 2.9.7 it has been
> > commented out. We follow this solution to fix it.
> >
> > Upstream-Status: Backport
> >
> > (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151023
> >
> > Signed-off-by: Zhiquan Li
> > ---
> > .../snort/snort/m4-oom-during-configure.patch | 21
> > +
> > .../recipes-connectivity/snort/snort_2.9.6.0.bb | 16 +++-
> > 2 files changed, 24 insertions(+), 13 deletions(-)
> > create mode 100644
> > meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
> >
> > diff --git
> > a/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
> >
> > b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
> > new file mode 100644
> > index 000..2250611
> > --- /dev/null
> > +++
> > b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch
> > @@ -0,0 +1,21 @@
> > +Upstream-Status: Backport
> > +
> > +There is an incorrect m4_define() in configure.in which will result in an
> > +infinite recursion, and it doesn't make sense, since snort 2.9.7 it has
> > been
> > +commented out. We follow this solution to fix it.
> > +
>
> Doesn't it make more sense to upgrade the snort recipe to >2.9.7 than
> backporting this fix?
>
> > +Signed-off-by: Zhiquan Li
> > +
> > +--- a/configure.in 2015-10-22 13:58:50.743367251 +0800
> > b/configure.in 2015-10-22 13:59:13.855366117 +0800
> > +@@ -1100,8 +1100,8 @@
> > + # Define PKG_CHECK_MODULES if it doesnt already exist.
> > + #file_ This prevents './configure' from erroring on machines that dont
> > have
> > + # 'pkgconfig' installed.
> > +-m4_ifdef([PKG_CHECK_MODULES],[], [m4_define([PKG_CHECK_MODULES],
> > +- [echo "PKG_CHECK_MODULES not defined"])])
> > ++#m4_ifdef([PKG_CHECK_MODULES],[], [m4_define([PKG_CHECK_MODULES],
> > ++# [echo "PKG_CHECK_MODULES not defined"])])
> > +
> > + if test "x$enable_rzb_saac" = "xyes"; then
> > + AC_CHECK_PROG(PKG_CONFIG,pkg-config,yes)
> > diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> > b/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> > index 66653c6..65dc524 100644
> > --- a/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> > +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.6.0.bb
> > @@ -6,19 +6,6 @@ LIC_FILES_CHKSUM =
> > "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5"
> >
> > DEPENDS = "libpcap libpcre daq libdnet util-linux"
> >
> > -# Blacklist:
> > -#
> > -# http://errors.yoctoproject.org/Errors/Details/8936/
> > -#
> > -# snort failure is again very nasty, because it's m4 which eats all
> > -# available memory and swap before it's killed by OOM killer.
> > -#
> > -# Luckily it always picked m4
> > -#
> > -# [Wed Feb 18 19:00:51 2015] Out of memory: Kill process 28522 (m4) score
> > 961 or sacrifice child
> > -# [Wed Feb 18 19:10:51 2015] Out of memory: Kill process 45228 (m4) score
> > 958 or sacrifice child
> > -# ...
> > -PNBLACKLIST[snort] ?= "BROKEN: autotools processing causes OOM condition
> > on configure"
> >
> > SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \
> > file://snort.init \
> > @@ -26,6 +13,7 @@ SRC_URI = " ${GENTOO_MI
Re: [oe] [PATCH 1/1] snort: fix m4 causes out of memory during configure [ LIN8-299 ]
On Thu, 29 Oct 2015 09:41:52 +0800 Zhiquan Li wrote: > > > On 2015.10.27 18:49, Ioan-Adrian Ratiu wrote: > > On Tue, 27 Oct 2015 09:54:07 + > > "Li, Zhiquan" wrote: > > > >> I need to evaluate the possibility to upgrade the snort recipe to > >> >2.9.7, because upgrade to > 2.9.7, some patches will not work > >> >anymore and the daq recipe also need to be upgraded to 2.0.4 at > >> >least. The side-effect is uncertainty. > >> > > What exactly do you mean by "patches will not work anymore"?. > > Do you mean thy do not apply on >2.9.7? AFAIK two of those > > patches are not needed in 2.9.7.6 (fixed upstream), the others > > just need refreshing. > I've tried to upgrade snort from 2.9.6.0 to 2.9.7.5, as its > dependency I also upgrade daq recipe from 2.0.2 to 2.0.6, and > accordingly update the patches: > * add 2 new patches for snort to solve the cross compile issues. > * discard a snort patch since it is not needed. > * refresh the patch for daq new version. > Please see the attachment for the changes. > > Unfortunately , it was failed when packaging debug files, the rpm > debugedit complain: canonicalization unexpectedly shrank by one > character. At a glance it is a bug of debugedit, please see: > http://sourceforge.net/p/snort/mailman/message/34130268/ > Redhat hasn't resolved this bug: > https://bugzilla.redhat.com/show_bug.cgi?id=304121 > > So, the options are: > * Fix rpm debugedit bug and update it to OE > * Take the workaround that skip the snort debug package > * Backport the fix from snort upstream > IMO anything rpm-based is fundamentally broken and not worth fixing because of these kind of long-standing bugs. You spend tons of time fixing one, then just hit another that was also ignored for +8 years. I don't think we should skip the debug package entirely because ipks and debs should be fine. If it is possible to skip only rpm-debug pkgs then this would be the best way to go IMO. Not upgrading the package and backporting fixes only to avoid this rpm bug should be the last option. @Martin and @Khem, do you have any suggestions? Than you, Adrian > > > >> From: Ioan-Adrian Ratiu [adrian.ra...@ni.com] > >> Sent: Monday, October 26, 2015 6:49 PM > >> To: Li, Zhiquan > >> Cc: openembedded-devel@lists.openembedded.org > >> Subject: Re: [oe] [PATCH 1/1] snort: fix m4 causes out of memory > >> during configure [ LIN8-299 ] > >> > >> On Fri, 23 Oct 2015 18:07:35 +0800 > >> Zhiquan Li wrote: > >> > >>> Issue: LIN8-299 > >>> > >>> There is an incorrect m4_define() in configure.in which will > >>> result in an infinite recursion, and it doesn't make sense, since > >>> snort 2.9.7 it has been commented out. We follow this solution to > >>> fix it. > >>> > >>> Upstream-Status: Backport > >>> > >>> (LOCAL REV: NOT UPSTREAM) -- Sent to oe-devel on 20151023 > >>> > >>> Signed-off-by: Zhiquan Li > >>> --- > >>> .../snort/snort/m4-oom-during-configure.patch | 21 > >>> + .../recipes-connectivity/snort/snort_2.9.6.0.bb > >>> | 16 +++- 2 files changed, 24 insertions(+), 13 > >>> deletions(-) create mode 100644 > >>> meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch > >>> > >>> diff --git > >>> a/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch > >>> b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch > >>> new file mode 100644 index 000..2250611 --- /dev/null > >>> +++ > >>> b/meta-networking/recipes-connectivity/snort/snort/m4-oom-during-configure.patch > >>> @@ -0,0 +1,21 @@ +Upstream-Status: Backport > >>> + > >>> +There is an incorrect m4_define() in configure.in which will > >>> result in an +infinite recursion, and it doesn't make sense, > >>> since snort 2.9.7 it has been +commented out. We follow this > >>> solution to fix it. + > >> Doesn't it make more sense to upgrade the snort recipe to >2.9.7 > >> than backporting this fix? > >> > >>> +Signed-off-by: Zhiquan Li > >>> + > >>> +--- a/configure.in 2015-10-22 13:58:50.743367251 +0800 > >>> b/configure.in 2015-10-22 13:59:13.855366117 +0800 > >>> +@@ -1100,8 +1100,8 @@ > >>> +
Re: [oe] [PATCH 1/1] snort: fix m4 causes out of memory during configure [ LIN8-299 ]
On Mon, 16 Nov 2015 10:39:15 +0800 Zhiquan Li wrote: > > > On 2015.10.29 19:11, Martin Jansa wrote: > > On Thu, Oct 29, 2015 at 11:04:02AM +0200, Ioan-Adrian Ratiu wrote: > >> On Thu, 29 Oct 2015 09:41:52 +0800 > >> Zhiquan Li wrote: > >> > >>> > >>> On 2015.10.27 18:49, Ioan-Adrian Ratiu wrote: > >>>> On Tue, 27 Oct 2015 09:54:07 + > >>>> "Li, Zhiquan" wrote: > >>>> > >>>>> I need to evaluate the possibility to upgrade the snort recipe to > >>>>>> 2.9.7, because upgrade to > 2.9.7, some patches will not work > >>>>>> anymore and the daq recipe also need to be upgraded to 2.0.4 at > >>>>>> least. The side-effect is uncertainty. > >>>> What exactly do you mean by "patches will not work anymore"?. > >>>> Do you mean thy do not apply on >2.9.7? AFAIK two of those > >>>> patches are not needed in 2.9.7.6 (fixed upstream), the others > >>>> just need refreshing. > >>> I've tried to upgrade snort from 2.9.6.0 to 2.9.7.5, as its > >>> dependency I also upgrade daq recipe from 2.0.2 to 2.0.6, and > >>> accordingly update the patches: > >>> * add 2 new patches for snort to solve the cross compile issues. > >>> * discard a snort patch since it is not needed. > >>> * refresh the patch for daq new version. > >>> Please see the attachment for the changes. > >>> > >>> Unfortunately , it was failed when packaging debug files, the rpm > >>> debugedit complain: canonicalization unexpectedly shrank by one > >>> character. At a glance it is a bug of debugedit, please see: > >>> http://sourceforge.net/p/snort/mailman/message/34130268/ > >>> Redhat hasn't resolved this bug: > >>> https://bugzilla.redhat.com/show_bug.cgi?id=304121 > >>> > >>> So, the options are: > >>> * Fix rpm debugedit bug and update it to OE > >>> * Take the workaround that skip the snort debug package > >>> * Backport the fix from snort upstream > >>> > >> IMO anything rpm-based is fundamentally broken and not worth fixing > >> because of these kind of long-standing bugs. You spend tons of time > >> fixing one, then just hit another that was also ignored for +8 years. > >> > >> I don't think we should skip the debug package entirely because ipks > >> and debs should be fine. If it is possible to skip only rpm-debug pkgs > >> then this would be the best way to go IMO. > >> > >> Not upgrading the package and backporting fixes only to avoid this rpm > >> bug should be the last option. > >> > >> @Martin and @Khem, do you have any suggestions? > > I've already merged this change to master-next and I plan to merge it to > > master and jethro soon (when jenkins builds are finished). > > > > It's good incremental step (fixes the root cause why it was > > blacklisted), upgrade to newer version is also good, but can be separate > > and only for master branch (as jethro is almost closed now). > > > > "canonicalization unexpectedly shrank by one character" is something we > > have to fix from time to time, but it's always doable in the component > > source (usually double slash in one of the paths), so it's not 8+ years > > kind of issue. > > > > Regards, > Many thanks, Martin! > > I saw your fix for "canonicalization unexpectedly shrank by one > character" issue: > http://lists.openembedded.org/pipermail/openembedded-core/2013-October/084960.html > > Some redundant '/' were sneakingly inserted into snort binary and lead > to the rpm debugedit error finally. > I've submitted a new patch so that snort can be upgraded to 2.9.7+: > http://lists.openembedded.org/pipermail/openembedded-devel/2015-November/104661.html > Very nice! Thank you for doing the upgrade. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][RESEND PATCH 1/3] meta-oe: recipes-graphics: add libvncserver recipe
Signed-off-by: Ioan-Adrian Ratiu --- .../0001-remove-webclients-build.patch | 28 ++ .../libvncserver/0002-common-add-sha1.patch| 524 + .../libvncserver/libvncserver_0.9.10.bb| 24 + 3 files changed, 576 insertions(+) create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch create mode 100644 meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.10.bb diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch new file mode 100644 index 000..8f4365c --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver/0001-remove-webclients-build.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile.am b/Makefile.am +index 5c2a94d..f98038a 100644 +--- a/Makefile.am b/Makefile.am +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS=libvncserver examples libvncclient webclients client_examples test +-DIST_SUBDIRS=libvncserver examples libvncclient webclients client_examples test ++SUBDIRS=libvncserver examples libvncclient client_examples test ++DIST_SUBDIRS=libvncserver examples libvncclient client_examples test + EXTRA_DIST = CMakeLists.txt rfb/rfbint.h.cmake rfb/rfbconfig.h.cmake + + bin_SCRIPTS = libvncserver-config +diff --git a/configure.ac b/configure.ac +index ca9f3b3..9b464cf 100644 +--- a/configure.ac b/configure.ac +@@ -600,9 +600,6 @@ AC_CONFIG_FILES([Makefile + libvncserver/Makefile + examples/Makefile + examples/android/Makefile +- webclients/Makefile +- webclients/java-applet/Makefile +- webclients/java-applet/ssl/Makefile + libvncclient/Makefile + client_examples/Makefile + test/Makefile diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch new file mode 100644 index 000..8b70d2f --- /dev/null +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver/0002-common-add-sha1.patch @@ -0,0 +1,524 @@ +diff --git a/common/sha1.c b/common/sha1.c +new file mode 100644 +index 000..988b188 +--- /dev/null b/common/sha1.c +@@ -0,0 +1,411 @@ ++/* ++ * Copyright (C) The Internet Society (2001). All Rights Reserved. ++ * ++ * This document and translations of it may be copied and furnished to ++ * others, and derivative works that comment on or otherwise explain it ++ * or assist in its implementation may be prepared, copied, published ++ * and distributed, in whole or in part, without restriction of any ++ * kind, provided that the above copyright notice and this paragraph are ++ * included on all such copies and derivative works. However, this ++ * document itself may not be modified in any way, such as by removing ++ * the copyright notice or references to the Internet Society or other ++ * Internet organizations, except as needed for the purpose of ++ * developing Internet standards in which case the procedures for ++ * copyrights defined in the Internet Standards process must be ++ * followed, or as required to translate it into languages other than ++ * English. ++ * ++ * The limited permissions granted above are perpetual and will not be ++ * revoked by the Internet Society or its successors or assigns. ++ * ++ * This document and the information contained herein is provided on an ++ * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING ++ * TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING ++ * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION ++ * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF ++ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. ++ */ ++ ++/* ++ * sha1.c ++ * ++ * Description: ++ * This file implements the Secure Hashing Algorithm 1 as ++ * defined in FIPS PUB 180-1 published April 17, 1995. ++ * ++ * The SHA-1, produces a 160-bit message digest for a given ++ * data stream. It should take about 2**n steps to find a ++ * message with the same digest as a given message and ++ * 2**(n/2) to find any two messages with the same digest, ++ * when n is the digest size in bits. Therefore, this ++ * algorithm can serve as a means of providing a ++ * "fingerprint" for a message. ++ * ++ * Portability Issues: ++ * SHA-1 is defined in terms of 32-bit "words". This code ++ * uses (included via "sha1.h" to define 32 and 8 ++ * bit unsigned integer types. If your C compiler does not ++ * support 32 bit unsigned integers, this code is not ++ * appropriate. ++ * ++ * Caveats: ++ * SHA-1 is designed to work with messages less than 2^64 bits ++ * long. Although SHA-1
[oe] [meta-oe][RESEND PATCH 2/3] x11vnc: move recipe from oe-core
x11vnc will be configured to use the external libvncserver which is
added to meta-oe. Since oe-core recipes should not depend on meta-oe
recipes, we move x11vnc to meta-oe.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-graphics/x11vnc/files/endian-fix.patch | 24 +
.../x11vnc/files/starting-fix.patch| 25 ++
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 25 ++
3 files changed, 74 insertions(+)
create mode 100644 meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
create mode 100644 meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
create mode 100644 meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
diff --git a/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
b/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
new file mode 100644
index 000..f2a538b
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
@@ -0,0 +1,24 @@
+libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN
+
+since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is
+automatically set for different arch, it is better to use WORDS_BIGENDIAN
+instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
+
+Signed-off-by: Yu Ke
+
+Upstream-Status: Pending
+
+diff --git a/libvncserver/main.c b/libvncserver/main.c
+index b6bd930..8bbb7bf 100644
+--- a/libvncserver/main.c
b/libvncserver/main.c
+@@ -47,7 +47,7 @@ static MUTEX(extMutex);
+
+ static int rfbEnableLogging=1;
+
+-#ifdef LIBVNCSERVER_WORDS_BIGENDIAN
++#ifdef WORDS_BIGENDIAN
+ char rfbEndianTest = (1==0);
+ #else
+ char rfbEndianTest = (1==1);
+
diff --git a/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
b/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
new file mode 100644
index 000..f62e405
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
@@ -0,0 +1,25 @@
+"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start.
+Removing these 2 parameters makes x11vnc works well on poky sato image.
+
+Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock,
+Scroll_Lock keysyms received from viewers, in order to leave the lock state on
+the server side unchanged. Yet, the keys will appear correctly.
+
+Signed-off-by: Zhai Edwin
+Signed-off-by: Laurentiu Palcu
+
+Upstream-Status: Inappropriate [configuration]
+
+Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
+===
+--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.0
+0800
x11vnc-0.9.12/x11vnc/x11vnc.desktop2011-03-03 10:35:20.0
+0800
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=X11VNC Server
+ Comment=Share this desktop by VNC
+-Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o
%%HOME/.x11vnc.log.%%VNCDISPLAY
++Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o
%%HOME/.x11vnc.log.%%VNCDISPLAY
+ Icon=computer
+ Terminal=false
+ Type=Application
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
new file mode 100644
index 000..ec0241f
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Exports your X session on-the-fly via VNC"
+HOMEPAGE = "http://www.karlrunge.com/x11vnc/";
+
+SECTION = "x11/utils"
+AUTHOR = "Karl Runge"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
+
file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
+ file://starting-fix.patch \
+ file://endian-fix.patch "
+
+SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
+SRC_URI[sha256sum] =
"f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
+
+DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr
libxdamage libxtst"
+
+inherit autotools-brokensep distro_features_check
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'avahi', '', d)}"
+PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
+PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][RESEND PATCH 3/3] x11vnc: use external libvncserver
By default x11vnc compiles its dependency libvncserver from sources
included in its own source tree. We override this behaviour to use
the externally provided libvncserver from a separate recipe.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index ec0241f..7e92965 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -14,12 +14,13 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
SRC_URI[sha256sum] =
"f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"
-DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr
libxdamage libxtst"
+DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr
libxdamage libxtst libtasn1 p11-kit"
inherit autotools-brokensep distro_features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'avahi', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf',
'avahi', '', d)} libvncserver"
PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
+PACKAGECONFIG[libvncserver] =
"--with-system-libvncserver,--without-system-libvncserver,libvncserver"
--
2.1.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-xfce][PATCH 1/1] xfwm4: add patch to fix touch event handling
Patch sent upstream, pending acceptance
Signed-off-by: Ioan-Adrian Ratiu
---
...handling-of-touch-events-on-window-border.patch | 42 ++
meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb | 6 +++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644
meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
diff --git
a/meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
b/meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
new file mode 100644
index 000..e01aac5
--- /dev/null
+++
b/meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
@@ -0,0 +1,42 @@
+From cb966e51ea51088a1d4fd5914fc7f917684e0b51 Mon Sep 17 00:00:00 2001
+From: Ioan-Adrian Ratiu
+Date: Thu, 28 Jan 2016 11:43:01 +0200
+Subject: [PATCH] events: fix handling of touch events on window borders
+
+When the Xorg server translates touch events into ButtonPress/ButtonRelease
+events, the subwindow in the XEvent structure is set to zero. This change adds
+a querry to determine the subwindow for the event in case it is missing.
+
+Original patch & discussion at [1].
+
+Upstream-Status: Pending acceptance
+
+[1]
http://xfce.10915.n7.nabble.com/Re-Xfwm-window-borders-do-not-respond-to-touch-screen-td42357.html
+
+Signed-off-by: Gratian Crisan
+Signed-off-by: Ioan-Adrian Ratiu
+---
+ src/events.c | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/events.c b/src/events.c
+index 8aa0f0a..0565594 100644
+--- a/src/events.c
b/src/events.c
+@@ -917,6 +917,13 @@ handleButtonPress (DisplayInfo *display_info,
XButtonEvent * ev)
+ {
+ state = ev->state & MODIFIER_MASK;
+ win = ev->subwindow;
++if (!win) {
++Window root_ret;
++int rx,ry,wx,wy;
++unsigned int mask_ret;
++XQueryPointer(display_info->dpy, ev->window,
++ &root_ret, &win, &rx, &ry, &wx, &wy, &mask_ret);
++}
+ screen_info = c->screen_info;
+
+ if ((ev->button == Button1) && (state) && (state ==
screen_info->params->easy_click))
+--
+2.7.0
+
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
index 41daa00..aa4b290 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
@@ -6,7 +6,11 @@ DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui
xfconf libwnck dbu
inherit xfce update-alternatives
-SRC_URI +=
"file://0001-don-t-block-display-events-when-time-is-set-backward.patch"
+SRC_URI += " \
+file://0001-don-t-block-display-events-when-time-is-set-backward.patch \
+file://0001-events-fix-handling-of-touch-events-on-window-border.patch \
+"
+
SRC_URI[md5sum] = "197ef087ca6a263627f1bea6d5a79d6f"
SRC_URI[sha256sum] =
"f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"
--
2.7.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce][PATCH 1/1] xfwm4: add patch to fix touch event handling
On Thu, 28 Jan 2016 12:52:06 +0100
Andreas Müller wrote:
> On Thu, Jan 28, 2016 at 11:54 AM, Ioan-Adrian Ratiu
> wrote:
> > Patch sent upstream, pending acceptance
> >
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > ...handling-of-touch-events-on-window-border.patch | 42
> > ++
> > meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb | 6 +++-
> > 2 files changed, 47 insertions(+), 1 deletion(-)
> > create mode 100644
> > meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
> >
> > diff --git
> > a/meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
> >
> > b/meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
> > new file mode 100644
> > index 000..e01aac5
> > --- /dev/null
> > +++
> > b/meta-xfce/recipes-xfce/xfwm4/files/0001-events-fix-handling-of-touch-events-on-window-border.patch
> > @@ -0,0 +1,42 @@
> > +From cb966e51ea51088a1d4fd5914fc7f917684e0b51 Mon Sep 17 00:00:00 2001
> > +From: Ioan-Adrian Ratiu
> > +Date: Thu, 28 Jan 2016 11:43:01 +0200
> > +Subject: [PATCH] events: fix handling of touch events on window borders
> > +
> > +When the Xorg server translates touch events into ButtonPress/ButtonRelease
> > +events, the subwindow in the XEvent structure is set to zero. This change
> > adds
> > +a querry to determine the subwindow for the event in case it is missing.
> > +
> > +Original patch & discussion at [1].
> > +
> > +Upstream-Status: Pending acceptance
> > +
> > +[1]
> > http://xfce.10915.n7.nabble.com/Re-Xfwm-window-borders-do-not-respond-to-touch-screen-td42357.html
> > +
> > +Signed-off-by: Gratian Crisan
> > +Signed-off-by: Ioan-Adrian Ratiu
> > +---
> > + src/events.c | 7 +++
> > + 1 file changed, 7 insertions(+)
> > +
> > +diff --git a/src/events.c b/src/events.c
> > +index 8aa0f0a..0565594 100644
> > +--- a/src/events.c
> > b/src/events.c
> > +@@ -917,6 +917,13 @@ handleButtonPress (DisplayInfo *display_info,
> > XButtonEvent * ev)
> > + {
> > + state = ev->state & MODIFIER_MASK;
> > + win = ev->subwindow;
> > ++if (!win) {
> > ++Window root_ret;
> > ++int rx,ry,wx,wy;
> > ++unsigned int mask_ret;
> > ++XQueryPointer(display_info->dpy, ev->window,
> > ++ &root_ret, &win, &rx, &ry, &wx, &wy,
> > &mask_ret);
> > ++}
> > + screen_info = c->screen_info;
> > +
> > + if ((ev->button == Button1) && (state) && (state ==
> > screen_info->params->easy_click))
> > +--
> > +2.7.0
> > +
> > diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
> > b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
> > index 41daa00..aa4b290 100644
> > --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
> > +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb
> > @@ -6,7 +6,11 @@ DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util
> > libxfce4ui xfconf libwnck dbu
> >
> > inherit xfce update-alternatives
> >
> > -SRC_URI +=
> > "file://0001-don-t-block-display-events-when-time-is-set-backward.patch"
> > +SRC_URI += " \
> > +file://0001-don-t-block-display-events-when-time-is-set-backward.patch
> > \
> > +file://0001-events-fix-handling-of-touch-events-on-window-border.patch
> > \
> > +"
> > +
> > SRC_URI[md5sum] = "197ef087ca6a263627f1bea6d5a79d6f"
> > SRC_URI[sha256sum] =
> > "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"
> >
> > --
> > 2.7.0
> >
> I've checked the thread you point to: I am using xfce for touch
> screens and can resize windows, maximize them, move around and close
> them all with touch. What kind of error is fixed?
Thank you for challenging this, it helped bring more light on the issue.
It is a workaround the bug [1] in xserver which was fixed. More details here [2]
I did not knew this untill I asked on the xfwm bugzilla.
So instead of "fixing" it here, we should try to backport that fix to OE or
verify
if it's not contained in OE's xserver already since it's working for you :)
[1] http://cgit.freedesktop.org/xorg/xserver/commit/?id=24b943132f
[2] https://bugzilla.xfce.org/show_bug.cgi?id=12427
>
> Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce][PATCH 1/1] xfwm4: add patch to fix touch event handling
On Thu, 28 Jan 2016 15:01:04 +0100 Andreas Müller wrote: > On Thu, Jan 28, 2016 at 2:29 PM, Ioan-Adrian Ratiu > wrote: > >> I've checked the thread you point to: I am using xfce for touch > >> screens and can resize windows, maximize them, move around and close > >> them all with touch. What kind of error is fixed? > > > > Thank you for challenging this, it helped bring more light on the issue. > > It is a workaround the bug [1] in xserver which was fixed. More details > > here [2] > > I did not knew this untill I asked on the xfwm bugzilla. > > > > So instead of "fixing" it here, we should try to backport that fix to OE or > > verify > > if it's not contained in OE's xserver already since it's working for you :) > > > > [1] http://cgit.freedesktop.org/xorg/xserver/commit/?id=24b943132f > This is the correct fix and - I checked in source - is included in > xserver-xorg 1.17.2. That version is shipped with jethro I am working > with currently. Don't know when it came in (for elder oe-core > releases) but master and jethro don't need to fix. Superb! I was going to look into it tommorow morning at the earliest, I'm pretty caught up now. Thank you for verifying this. > > Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-xfce][PATCH 1/1] xfwm4: add patch to fix touch event handling
On Thu, 28 Jan 2016 15:01:04 +0100 Andreas Müller wrote: > On Thu, Jan 28, 2016 at 2:29 PM, Ioan-Adrian Ratiu > wrote: > >> I've checked the thread you point to: I am using xfce for touch > >> screens and can resize windows, maximize them, move around and close > >> them all with touch. What kind of error is fixed? > > > > Thank you for challenging this, it helped bring more light on the issue. > > It is a workaround the bug [1] in xserver which was fixed. More details > > here [2] > > I did not knew this untill I asked on the xfwm bugzilla. > > > > So instead of "fixing" it here, we should try to backport that fix to OE or > > verify > > if it's not contained in OE's xserver already since it's working for you :) > > > > [1] http://cgit.freedesktop.org/xorg/xserver/commit/?id=24b943132f > This is the correct fix and - I checked in source - is included in > xserver-xorg 1.17.2. That version is shipped with jethro I am working > with currently. Don't know when it came in (for elder oe-core > releases) but master and jethro don't need to fix. > > Andreas By the way I just realized you're probably the same person to whom I've sent a pull request on github this morning *nod* *nod* (your email name and his github username are the same) How small is this world :) -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/1] start-stop-daemon: Upgrade 1.16.0.2 -> 1.17.25
Signed-off-by: Ioan-Adrian Ratiu
Signed-off-by: Brad Mouring
---
...stop-daemon-Accept-SIG-prefixed-signal-na.patch | 39 ++
.../start-stop-daemon_1.16.0.2.bb | 32 --
.../start-stop-daemon/start-stop-daemon_1.17.25.bb | 36
3 files changed, 75 insertions(+), 32 deletions(-)
create mode 100644
meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
delete mode 100644
meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
create mode 100644
meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
diff --git
a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
new file mode 100644
index 000..e988efd
--- /dev/null
+++
b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
@@ -0,0 +1,39 @@
+From 685645a20e39cf2ab7db8d1f5e3666a4228abca8 Mon Sep 17 00:00:00 2001
+From: Ioan-Adrian Ratiu
+Date: Wed, 8 Jul 2015 09:44:57 +0300
+Subject: [PATCH 1/1] dpkg start-stop-daemon: Accept SIG prefixed signal names
+
+---
+ utils/start-stop-daemon.c | 9 +
+ 1 file changed, 9 insertions(+)
+
+diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
+index 6aebe9b..e805082 100644
+--- a/utils/start-stop-daemon.c
b/utils/start-stop-daemon.c
+@@ -18,6 +18,9 @@
+ * and Andreas Schuldei
+ *
+ * Changes by Ian Jackson: added --retry (and associated rearrangements).
++ *
++ * Changes by Haris Okanovic to support 'SIG'
++ * prefixed signal names placed in public domain as well.
+ */
+
+ #include
+@@ -661,6 +664,12 @@ parse_signal(const char *sig_str, int *sig_num)
+ if (parse_unsigned(sig_str, 10, sig_num) == 0)
+ return 0;
+
++/* Skip over optional "SIG" prefix */
++if (strncmp(sig_str, "SIG", 3) == 0) {
++warning("Using deprecated signal name %s. Drop the 'SIG'
prefix.\n", sig_str);
++sig_str += 3;
++}
++
+ for (i = 0; i < array_count(siglist); i++) {
+ if (strcmp(sig_str, siglist[i].name) == 0) {
+ *sig_num = siglist[i].signal;
+--
+2.1.4
+
diff --git
a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
deleted file mode 100644
index efdd6b7..000
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \
-package"
-LICENSE = "PD"
-LIC_FILES_CHKSUM =
"file://utils/start-stop-daemon.c;md5=a963623e4588f70122865aaa7a370ce4"
-# start-stop-daemon is usually shipped by dpkg
-DEPENDS = "ncurses"
-RCONFLICTS_${PN} = "dpkg"
-
-PNBLACKLIST[start-stop-daemon] ?= "BROKEN: fails because of gettext, partial
fix is available here http://patchwork.openembedded.org/patch/89867/";
-
-SRC_URI = "http://sources.openembedded.org/dpkg_${PV}.tar.bz2";
-SRC_URI[md5sum] = "d211a84f38987771a49ad1c0f144334a"
-SRC_URI[sha256sum] =
"2a3d4ba83c743b3f004533fdd52372cb7b22f5c1da2042d0a31bbcc2b54c0ea5"
-
-inherit autotools gettext pkgconfig
-
-S = "${WORKDIR}/dpkg-${PV}"
-
-EXTRA_OECONF = " \
---with-start-stop-daemon \
---without-bz2 \
---without-install-info \
---without-selinux \
---without-update-alternatives \
-"
-
-do_install_append () {
-# remove everything that is not related to start-stop-daemon, since there
-# is no explicit rule for only installing ssd
-find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \;
-find ${D} -depth -type d -empty -exec rmdir {} \;
-}
diff --git
a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
new file mode 100644
index 000..5ee4472
--- /dev/null
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \
+package"
+LICENSE = "PD"
+LIC_FILES_CHKSUM =
"file://utils/start-stop-daemon.c;endline=21;md5=8fbd0497a7d0b01e99820bffcb58e9ad"
+# start-stop-daemon is usually shipped by dpkg
+DEPENDS = "ncurses"
+RCONFLICTS_${PN} = "dpkg"
+
+SRC_URI = " \
+${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \
+file://0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch \
+"
+
+SRC_URI[md
[oe] [meta-oe][PATCH 2/2] apache2: enable openldap support
Signed-off-by: Ioan-Adrian Ratiu
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
index 8ca6d00..d20ac09 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Apache HTTP Server is a powerful, efficient,
and \
extensible web server."
SUMMARY = "Apache HTTP Server"
HOMEPAGE = "http://httpd.apache.org/";
-DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
+DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util
openldap"
SECTION = "net"
LICENSE = "Apache-2.0"
@@ -44,6 +44,8 @@ EXTRA_OECONF = "--enable-ssl \
--with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
--enable-info \
--enable-rewrite \
+--enable-ldap \
+--enable-authnz-ldap \
--with-dbm=sdbm \
--with-berkeley-db=no \
--localstatedir=/var/${BPN} \
--
2.7.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] openldap: enable native build
This is required by the apr-util & apache2 recipes to enable
ldap support without breaking the build (nothing provides -native)
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/openldap/openldap_2.4.43.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
index c4a52b1..148d5a8 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
@@ -222,3 +222,5 @@ python populate_packages_prepend () {
packages.append(metapkg)
d.setVar('PACKAGES', ' '.join(packages))
}
+
+BBCLASSEXTEND = "native"
--
2.7.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/2] apache2: add openldap support to PACKAGECONFIG
This config option is disabled by default
Signed-off-by: Ioan-Adrian Ratiu
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
index 8ca6d00..597afe6 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
@@ -59,6 +59,7 @@ EXTRA_OECONF = "--enable-ssl \
PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux',
'', d)}"
PACKAGECONFIG[selinux] =
"--enable-selinux,--disable-selinux,libselinux,libselinux"
+PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap
--disable-authnz-ldap,openldap"
do_install_append() {
install -d ${D}/${sysconfdir}/init.d
--
2.7.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 1/2] openldap: enable native build
This is required by the apr-util & apache2 recipes to enable
ldap support without breaking the build (nothing provides -native)
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/openldap/openldap_2.4.43.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
index c4a52b1..148d5a8 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
@@ -222,3 +222,5 @@ python populate_packages_prepend () {
packages.append(metapkg)
d.setVar('PACKAGES', ' '.join(packages))
}
+
+BBCLASSEXTEND = "native"
--
2.7.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/1] xterm: make xft PACKAGECONFIG depend on freetype-native
meta-cloud-services enables this dependency unconditionally. Add it
here in the PACKAGECONFIG and we can remove it from there entirely.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-graphics/xorg-app/xterm_320.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_320.bb
b/meta-oe/recipes-graphics/xorg-app/xterm_320.bb
index f67d890..f2abc3c 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_320.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_320.bb
@@ -10,7 +10,7 @@ SRC_URI[md5sum] = "0d7f0e6390d132ae59876b3870e5783d"
SRC_URI[sha256sum] =
"a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7"
PACKAGECONFIG ?= ""
-PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig"
+PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig
freetype-native"
EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
--x-libraries=${STAGING_LIBDIR} \
--
2.7.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [OE-core][PATCH v6 0/4] IPK signing for the gpg_sign module
This patch series extends the gpg_sign module to support ipk signing. v6 implements Markus' feedback. The most notable change is the sign_ipk and detach_sign merger, as they were almost identical in functionality. This also meant a refactoring for detach_sign and a bug fix for the STDIN file descriptor introduced in gpg > 2.1. Technically that STDIN bug is a feature (meh) of gpg >2.1 which breaks existing behaviour so we have to work around it i.e. check the gpg version and use the loopback interface. This means that gpg-agent to which gpg >2.1 always connects needs to be running permanently. Ioan-Adrian Ratiu (4): gpg_sign: add local ipk package signing functionality gpg_sign: detach_sign: fix gpg > 2.1 STDIN file descriptor gpg_sign: export_pubkey: add signature type support package_manager: sign IPK package feeds meta/classes/package_ipk.bbclass | 5 +++ meta/classes/sign_ipk.bbclass | 52 meta/classes/sign_package_feed.bbclass | 12 +- meta/lib/oe/gpg_sign.py| 74 +++--- meta/lib/oe/package_manager.py | 17 +++- 5 files changed, 143 insertions(+), 17 deletions(-) create mode 100644 meta/classes/sign_ipk.bbclass -- 2.7.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [OE-core][PATCH v6 1/4] gpg_sign: add local ipk package signing functionality
Implement ipk signing inside the sign_ipk bbclass using the gpg_sign
module and configure signing similar to how rpm does it. sign_ipk uses
gpg_sign's detach_sign because its functionality is identical to package
feed signing.
IPK signing process is a bit different from rpm:
- Signatures are stored outside ipk files; opkg connects to a feed
server and downloads them to verify a package.
- Signatures are of two types (both supported by opkg): binary or
ascii armoured. By default we sign using ascii armoured.
- Public keys are stored on targets to verify ipks using the
opkg-keyrings recipe.
Signed-off-by: Ioan-Adrian Ratiu
---
meta/classes/package_ipk.bbclass | 5
meta/classes/sign_ipk.bbclass| 52
meta/lib/oe/gpg_sign.py | 50 --
3 files changed, 94 insertions(+), 13 deletions(-)
create mode 100644 meta/classes/sign_ipk.bbclass
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 51bee28..f64837a 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -246,6 +246,11 @@ python do_package_ipk () {
bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("opkg-build execution failed")
+if d.getVar('IPK_SIGN_PACKAGES', True) == '1':
+ipkver = "%s-%s" % (d.getVar('PKGV'), d.getVar('PKGR'))
+ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver,
d.getVar('PACKAGE_ARCH', True))
+sign_ipk(d, ipk_to_sign)
+
cleanupcontrol(root)
bb.utils.unlockfile(lf)
diff --git a/meta/classes/sign_ipk.bbclass b/meta/classes/sign_ipk.bbclass
new file mode 100644
index 000..a481f6d
--- /dev/null
+++ b/meta/classes/sign_ipk.bbclass
@@ -0,0 +1,52 @@
+# Class for generating signed IPK packages.
+#
+# Configuration variables used by this class:
+# IPK_GPG_PASSPHRASE_FILE
+# Path to a file containing the passphrase of the signing key.
+# IPK_GPG_NAME
+# Name of the key to sign with.
+# IPK_GPG_BACKEND
+# Optional variable for specifying the backend to use for signing.
+# Currently the only available option is 'local', i.e. local signing
+# on the build host.
+# IPK_GPG_SIGNATURE_TYPE
+# Optional variable for specifying the type of gpg signatures, can
be:
+# 1. Ascii armored (ASC), default if not set
+# 2. Binary (BIN)
+# GPG_BIN
+# Optional variable for specifying the gpg binary/wrapper to use for
+# signing.
+# GPG_PATH
+# Optional variable for specifying the gnupg "home" directory:
+#
+
+inherit sanity
+
+IPK_SIGN_PACKAGES = '1'
+IPK_GPG_BACKEND ?= 'local'
+IPK_GPG_SIGNATURE_TYPE ?= 'ASC'
+
+python () {
+# Check configuration
+for var in ('IPK_GPG_NAME', 'IPK_GPG_PASSPHRASE_FILE'):
+if not d.getVar(var, True):
+raise_sanity_error("You need to define %s in the config" % var, d)
+
+sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE", True)
+if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
+raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use
either ASC or BIN" % sigtype)
+}
+
+def sign_ipk(d, ipk_to_sign):
+from oe.gpg_sign import get_signer
+
+bb.debug(1, 'Signing ipk: %s' % ipk_to_sign)
+
+signer = get_signer(d, d.getVar('IPK_GPG_BACKEND', True))
+sig_type = d.getVar('IPK_GPG_SIGNATURE_TYPE', True)
+is_ascii_sig = (sig_type.upper() != "BIN")
+
+signer.detach_sign(ipk_to_sign,
+ d.getVar('IPK_GPG_NAME', True),
+ d.getVar('IPK_GPG_PASSPHRASE_FILE', True),
+ armor=is_ascii_sig)
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index ada1b2f..ef47d1a 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -1,5 +1,6 @@
"""Helper module for GPG signing"""
import os
+import sys
import bb
import oe.utils
@@ -50,6 +51,7 @@ class LocalSigner(object):
bb.error('rpmsign failed: %s' % proc.before.strip())
raise bb.build.FuncFailed("Failed to sign RPM packages")
+
def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None,
armor=True):
"""Create a detached signature of a file"""
import subprocess
@@ -57,23 +59,45 @@ class LocalSigner(object):
if passphrase_file and passphrase:
raise Exception("You should use either passphrase_file of
passphrase, not both")
-cmd = [self.gpg_bin, '--detach-sign', '--batch
[oe] [OE-core][PATCH v6 4/4] package_manager: sign IPK package feeds
Create gpg signed ipk package feeds using the gpg backend if configured.
Signed-off-by: Ioan-Adrian Ratiu
---
meta/classes/sign_package_feed.bbclass | 12 +++-
meta/lib/oe/package_manager.py | 17 +++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sign_package_feed.bbclass
b/meta/classes/sign_package_feed.bbclass
index 63ca02f..85c37f3 100644
--- a/meta/classes/sign_package_feed.bbclass
+++ b/meta/classes/sign_package_feed.bbclass
@@ -10,6 +10,12 @@
# Optional variable for specifying the backend to use for signing.
# Currently the only available option is 'local', i.e. local signing
# on the build host.
+# PACKAGE_FEED_GPG_SIGNATURE_TYPE
+# Optional variable for specifying the type of gpg signature, can be:
+# 1. Ascii armored (ASC), default if not set
+# 2. Binary (BIN)
+# This variable is only available for IPK feeds. It is ignored on
+# other packaging backends.
# GPG_BIN
# Optional variable for specifying the gpg binary/wrapper to use for
# signing.
@@ -20,7 +26,7 @@ inherit sanity
PACKAGE_FEED_SIGN = '1'
PACKAGE_FEED_GPG_BACKEND ?= 'local'
-
+PACKAGE_FEED_GPG_SIGNATURE_TYPE ?= 'ASC'
python () {
# Check sanity of configuration
@@ -28,6 +34,10 @@ python () {
if not d.getVar(var, True):
raise_sanity_error("You need to define %s in the config" % var, d)
+sigtype = d.getVar("PACKAGE_FEED_GPG_SIGNATURE_TYPE", True)
+if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
+raise_sanity_error("Bad value for PACKAGE_FEED_GPG_SIGNATURE_TYPE
(%s), use either ASC or BIN" % sigtype)
+
# Set expected location of the public key
d.setVar('PACKAGE_FEED_GPG_PUBKEY',
os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False),
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index b30a4da..606ba24 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -163,11 +163,16 @@ class OpkgIndexer(Indexer):
"MULTILIB_ARCHS"]
opkg_index_cmd = bb.utils.which(os.getenv('PATH'), "opkg-make-index")
+if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1':
+signer = get_signer(self.d,
self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True))
+else:
+signer = None
if not os.path.exists(os.path.join(self.deploy_dir, "Packages")):
open(os.path.join(self.deploy_dir, "Packages"), "w").close()
index_cmds = []
+index_sign_files = []
for arch_var in arch_vars:
archs = self.d.getVar(arch_var, True)
if archs is None:
@@ -186,6 +191,8 @@ class OpkgIndexer(Indexer):
index_cmds.append('%s -r %s -p %s -m %s' %
(opkg_index_cmd, pkgs_file, pkgs_file,
pkgs_dir))
+index_sign_files.append(pkgs_file)
+
if len(index_cmds) == 0:
bb.note("There are no packages in %s!" % self.deploy_dir)
return
@@ -193,9 +200,15 @@ class OpkgIndexer(Indexer):
result = oe.utils.multiprocess_exec(index_cmds, create_index)
if result:
bb.fatal('%s' % ('\n'.join(result)))
-if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1':
-raise NotImplementedError('Package feed signing not implementd for
ipk')
+if signer:
+feed_sig_type = self.d.getVar('PACKAGE_FEED_GPG_SIGNATURE_TYPE',
True)
+is_ascii_sig = (feed_sig_type.upper() != "BIN")
+for f in index_sign_files:
+signer.detach_sign(f,
+ self.d.getVar('PACKAGE_FEED_GPG_NAME',
True),
+
self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True),
+ armor=is_ascii_sig)
class DpkgIndexer(Indexer):
--
2.7.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [OE-core][PATCH v6 2/4] gpg_sign: detach_sign: fix gpg > 2.1 STDIN file descriptor
Starting from v2.1 passing passwords directly to gpg does not work
anymore [1], instead a loopback interface must be used otherwise
gpg >2.1 will error out with:
"gpg: signing failed: Inappropriate ioctl for device"
gpg <2.1 does not work with the new --pinentry-mode arg and gives an
invalid option error, so we detect what is the running version of gpg
and pass it accordingly.
[1] https://wiki.archlinux.org/index.php/GnuPG#Unattended_passphrase
Signed-off-by: Ioan-Adrian Ratiu
---
meta/lib/oe/gpg_sign.py | 20
1 file changed, 20 insertions(+)
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index ef47d1a..9f6b0f0 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -66,6 +66,12 @@ class LocalSigner(object):
if armor:
cmd += ['--armor']
+#gpg > 2.1 supports password pipes only through the loopback interface
+#gpg < 2.1 errors out if given unknown parameters
+gpg_ver = self.get_gpg_version()
+if gpg_ver > 2.1:
+cmd += ['--pinentry-mode', 'loopback']
+
try:
keypipe = os.pipe()
@@ -99,6 +105,20 @@ class LocalSigner(object):
raise Exception("Failed to sign '%s'" % input_file)
+def get_gpg_version(self):
+"""Return the gpg version"""
+import subprocess
+
+job = subprocess.Popen([self.gpg_bin, "--version"],
stdout=subprocess.PIPE)
+(stdout, _) = job.communicate()
+
+if job.returncode:
+raise bb.build.FuncFailed("Could not get gpg version (is %s
installed?)" %
+ self.gpg_bin)
+
+return stdout.split()[2]
+
+
def verify(self, sig_file):
"""Verify signature"""
cmd = self.gpg_bin + " --verify "
--
2.7.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [OE-core][PATCH v6 3/4] gpg_sign: export_pubkey: add signature type support
Add support for multiple types of signatures (binary or ascii)
in export_pubkey(). There is no change in behaviour for the function,
the previous implicit default is the new parameter "armor" default.
Signed-off-by: Ioan-Adrian Ratiu
---
meta/lib/oe/gpg_sign.py | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index 9f6b0f0..9b3864a 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -13,12 +13,14 @@ class LocalSigner(object):
self.gpg_path = d.getVar('GPG_PATH', True)
self.rpm_bin = bb.utils.which(os.getenv('PATH'), "rpm")
-def export_pubkey(self, output_file, keyid):
+def export_pubkey(self, output_file, keyid, armor=True):
"""Export GPG public key to a file"""
-cmd = '%s --batch --yes --export --armor -o %s ' % \
+cmd = '%s --batch --yes --export -o %s ' % \
(self.gpg_bin, output_file)
if self.gpg_path:
cmd += "--homedir %s " % self.gpg_path
+if armor:
+cmd += "--armor "
cmd += keyid
status, output = oe.utils.getstatusoutput(cmd)
if status:
--
2.7.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core][PATCH v6 1/4] gpg_sign: add local ipk package signing functionality
Hello
On Mon, 22 Feb 2016 15:33:43 +0200
Markus Lehtonen wrote:
> On Fri, 2016-02-19 at 17:43 +0200, Ioan-Adrian Ratiu wrote:
> > Implement ipk signing inside the sign_ipk bbclass using the gpg_sign
> > module and configure signing similar to how rpm does it. sign_ipk
> > uses
> > gpg_sign's detach_sign because its functionality is identical to
> > package
> > feed signing.
> >
> > IPK signing process is a bit different from rpm:
> > - Signatures are stored outside ipk files; opkg connects to a
> > feed
> > server and downloads them to verify a package.
> > - Signatures are of two types (both supported by opkg): binary or
> > ascii armoured. By default we sign using ascii armoured.
> > - Public keys are stored on targets to verify ipks using the
> > opkg-keyrings recipe.
> >
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > meta/classes/package_ipk.bbclass | 5
> > meta/classes/sign_ipk.bbclass| 52
> >
> > meta/lib/oe/gpg_sign.py | 50 --
> >
> > 3 files changed, 94 insertions(+), 13 deletions(-)
> > create mode 100644 meta/classes/sign_ipk.bbclass
> >
> > diff --git a/meta/classes/package_ipk.bbclass
> > b/meta/classes/package_ipk.bbclass
> > index 51bee28..f64837a 100644
> > --- a/meta/classes/package_ipk.bbclass
> > +++ b/meta/classes/package_ipk.bbclass
> > @@ -246,6 +246,11 @@ python do_package_ipk () {
> > bb.utils.unlockfile(lf)
> > raise bb.build.FuncFailed("opkg-build execution failed")
> >
> > +if d.getVar('IPK_SIGN_PACKAGES', True) == '1':
> > +ipkver = "%s-%s" % (d.getVar('PKGV'), d.getVar('PKGR'))
> > +ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname,
> > ipkver, d.getVar('PACKAGE_ARCH', True))
> > +sign_ipk(d, ipk_to_sign)
> > +
> > cleanupcontrol(root)
> > bb.utils.unlockfile(lf)
> >
> > diff --git a/meta/classes/sign_ipk.bbclass
> > b/meta/classes/sign_ipk.bbclass
> > new file mode 100644
> > index 000..a481f6d
> > --- /dev/null
> > +++ b/meta/classes/sign_ipk.bbclass
> > @@ -0,0 +1,52 @@
> > +# Class for generating signed IPK packages.
> > +#
> > +# Configuration variables used by this class:
> > +# IPK_GPG_PASSPHRASE_FILE
> > +# Path to a file containing the passphrase of the signing
> > key.
> > +# IPK_GPG_NAME
> > +# Name of the key to sign with.
> > +# IPK_GPG_BACKEND
> > +# Optional variable for specifying the backend to use for
> > signing.
> > +# Currently the only available option is 'local', i.e.
> > local signing
> > +# on the build host.
> > +# IPK_GPG_SIGNATURE_TYPE
> > +# Optional variable for specifying the type of gpg
> > signatures, can be:
> > +# 1. Ascii armored (ASC), default if not set
> > +# 2. Binary (BIN)
> > +# GPG_BIN
> > +# Optional variable for specifying the gpg binary/wrapper
> > to use for
> > +# signing.
> > +# GPG_PATH
> > +# Optional variable for specifying the gnupg "home"
> > directory:
> > +#
> > +
> > +inherit sanity
> > +
> > +IPK_SIGN_PACKAGES = '1'
> > +IPK_GPG_BACKEND ?= 'local'
> > +IPK_GPG_SIGNATURE_TYPE ?= 'ASC'
> > +
> > +python () {
> > +# Check configuration
> > +for var in ('IPK_GPG_NAME', 'IPK_GPG_PASSPHRASE_FILE'):
> > +if not d.getVar(var, True):
> > +raise_sanity_error("You need to define %s in the config"
> > % var, d)
> > +
> > +sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE", True)
> > +if sigtype.upper() != "ASC" and sigtype.upper() != "BIN":
> > +raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE
> > (%s), use either ASC or BIN" % sigtype)
> > +}
> > +
> > +def sign_ipk(d, ipk_to_sign):
> > +from oe.gpg_sign import get_signer
> > +
> > +bb.debug(1, 'Signing ipk: %s' % ipk_to_sign)
> > +
> > +signer = get_signer(d, d.getVar('IPK_GPG_BACKEND', True))
> > +sig_type = d.getVar('IPK_GPG_SIGNATURE_TYPE', True)
> > +is_ascii_sig = (sig_type.upper() != "BIN")
>
[oe] [meta-oe][PATCH v2] ttf-pt-sans: add recipe
PT Sans is an open source licensed font released in 2010 by ParaType.
The ParaTypeFFL-1.3 license file has been submitted to OE-core.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | 39 ++
1 file changed, 39 insertions(+)
create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
new file mode 100644
index 000..dcfa080
--- /dev/null
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
@@ -0,0 +1,39 @@
+SUMMARY = "PT Sans Fonts"
+DESCRIPTION = "The PT Sans TTF font set"
+HOMEPAGE = "http://www.paratype.com/public/";
+
+SECTION = "x11/fonts"
+
+LICENSE = "ParaTypeFFL-1.3"
+LIC_FILES_CHKSUM =
"file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d"
+
+inherit fontcache
+
+# Downloading from fedora because upstream doesn't version its zip file
+# and causes hash build failures
+SRC_URI =
"http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip";
+
+SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
+SRC_URI[sha256sum] =
"0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
+
+do_install () {
+ install -d ${D}${datadir}/fonts/X11/TTF/
+ cd ..
+ for i in *.ttf; do
+ install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i}
+ done
+}
+
+FILES_${PN} += "${datadir}"
+
+pkg_postinst_${PN} () {
+set -x
+for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
+mkfontdir $fontdir
+mkfontscale $fontdir
+done
+for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
+mkfontdir $fontdir
+mkfontscale $fontdir
+done
+}
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] ttf-pt-sans: add recipe
PT Sans is an open source licensed font released in 2010 by ParaType.
The ParaTypeFFL-1.3 license file has been submitted to OE-core.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | 44 ++
1 file changed, 44 insertions(+)
create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
new file mode 100644
index 000..b7f4548
--- /dev/null
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
@@ -0,0 +1,44 @@
+SUMMARY = "PT Sans Fonts"
+DESCRIPTION = "The PT Sans TTF font set"
+HOMEPAGE = "http://www.paratype.com/public/";
+
+SECTION = "x11/fonts"
+
+LICENSE = "ParaTypeFFL-1.3"
+LIC_FILES_CHKSUM =
"file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d"
+
+inherit allarch fontcache
+
+RDEPENDS_${PN} = "fontconfig-utils"
+
+FONT_PACKAGES = "${PN}"
+
+# Downloading from fedora because upstream doesn't version its zip file
+# and causes hash build failures
+SRC_URI =
"http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip";
+
+SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
+SRC_URI[sha256sum] =
"0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
+
+do_install () {
+ install -d ${D}${datadir}/fonts/X11/TTF/
+ cd ..
+ for i in *.ttf; do
+ install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i}
+ done
+}
+
+FILES_${PN} += "${datadir}"
+
+pkg_postinst_${PN} () {
+set -x
+for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
+mkfontdir $fontdir
+mkfontscale $fontdir
+done
+for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
+mkfontdir $fontdir
+mkfontscale $fontdir
+done
+}
+
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/2] apache-websocket: Add recipe
From: Haris Okanovic
The apache-websocket module is an Apache 2.x server module that may be
used to process requests using the WebSocket protocol (RFC 6455) by an
Apache 2.x server. The module consists of a plugin architecture for
handling WebSocket messaging.
Signed-off-by: Haris Okanovic
Signed-off-by: Ioan-Adrian Ratiu
---
.../apache-mod/apache-websocket_git.bb | 32 ++
1 file changed, 32 insertions(+)
create mode 100644
meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
new file mode 100644
index 000..2cfc1f3
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Websocket module for Apache web server"
+DESCRIPTION = "Process requests using the WebSocket protocol (RFC 6455)"
+HOMEPAGE = "https://github.com/jchampio/${PN}/";
+SECTION = "net"
+LICENSE = "Apache-2.0"
+
+inherit autotools-brokensep pkgconfig
+
+DEPENDS = "apache2 apache2-native"
+RDEPENDS_${PN} += "apache2"
+
+# Original (github.com/disconnect/apache-websocket) is dead since 2012, the
+# fork contains patches from the modules ML and fixes CVE compliance issues
+SRC_URI = "git://github.com/jchampio/apache-websocket.git"
+
+SRCREV = "f5230d8c520dccf8631da94bf90c23f3c1100dcc"
+
+PV = "0.1.1"
+
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+
+EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl"
+
+do_install() {
+install -d ${D}${libdir}/apache2/modules/
+install ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules/
+}
+
+FILES_${PN} += " ${libdir}/apache2/modules/* "
+FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* "
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 2/2] apache-websocket: Add recipe
From: Haris Okanovic
The apache-websocket module is an Apache 2.x server module that may be
used to process requests using the WebSocket protocol (RFC 6455) by an
Apache 2.x server. The module consists of a plugin architecture for
handling WebSocket messaging.
Signed-off-by: Haris Okanovic
Signed-off-by: Ioan-Adrian Ratiu
---
.../apache-mod/apache-websocket_git.bb | 33 ++
1 file changed, 33 insertions(+)
create mode 100644
meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
new file mode 100644
index 000..da33115
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Websocket module for Apache web server"
+DESCRIPTION = "Process requests using the WebSocket protocol (RFC 6455)"
+HOMEPAGE = "https://github.com/jchampio/${PN}/";
+SECTION = "net"
+LICENSE = "Apache-2.0"
+
+inherit autotools-brokensep pkgconfig
+
+DEPENDS = "apache2 apache2-native"
+RDEPENDS_${PN} += "apache2"
+
+# Original (github.com/disconnect/apache-websocket) is dead since 2012, the
+# fork contains patches from the modules ML and fixes CVE compliance issues
+SRC_URI = "git://github.com/jchampio/apache-websocket.git"
+
+SRCREV = "f5230d8c520dccf8631da94bf90c23f3c1100dcc"
+
+PV = "0.1.1"
+
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+
+EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl \
+
LIBTOOL=${STAGING_DIR_TARGET}${bindir_crossscripts}/${HOST_SYS}-libtool"
+
+do_install() {
+install -d ${D}${libdir}/apache2/modules/
+install ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules/
+}
+
+FILES_${PN} += " ${libdir}/apache2/modules/* "
+FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* "
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] openldap: control ipv6 support via DISTRO_FEATURES
From: Richard Tollerton
Explicitly disable ipv6 support if the distro does not include it.
Signed-off-by: Richard Tollerton
---
meta-oe/recipes-support/openldap/openldap_2.4.43.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
index 9670f1a..8618365 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.43.bb
@@ -53,6 +53,7 @@ EXTRA_OECONF += "--enable-dynamic"
PACKAGECONFIG ??= "gnutls modules \
ldap meta monitor null passwd shell proxycache dnssrv \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',
d)} \
"
#--with-tls with TLS/SSL support auto|openssl|gnutls [auto]
PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt"
@@ -60,6 +61,7 @@ PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl"
PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl"
PACKAGECONFIG[modules] = "lt_cv_dlopen_self=yes
--enable-modules,--disable-modules,libtool"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
# SLAPD options
#
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] apache2: stage apachectl
Some apache module recipes like the newly introduced apache-websocket
also need apachectl at build in the sysroot besides apxs.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
index 597afe6..53d0564 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
@@ -113,6 +113,8 @@ SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
apache_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+install -d ${SYSROOT_DESTDIR}${sbindir}/
+install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}/
sed -i 's!my $installbuilddir = .*!my $installbuilddir =
"${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
sed -i 's!my $libtool = .*!my $libtool =
"${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] apache-websocket: Add recipe
From: Haris Okanovic
The apache-websocket module is an Apache 2.x server module that may be
used to process requests using the WebSocket protocol (RFC 6455) by an
Apache 2.x server. The module consists of a plugin architecture for
handling WebSocket messaging.
Signed-off-by: Haris Okanovic
Signed-off-by: Ioan-Adrian Ratiu
---
.../apache-mod/apache-websocket_git.bb | 32 ++
1 file changed, 32 insertions(+)
create mode 100644
meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
new file mode 100644
index 000..e2bd097
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Websocket module for Apache web server"
+DESCRIPTION = "Process requests using the WebSocket protocol (RFC 6455)"
+HOMEPAGE = "https://github.com/jchampio/${PN}/";
+SECTION = "net"
+LICENSE = "Apache-2.0"
+
+inherit autotools-brokensep pkgconfig
+
+DEPENDS = "apache2 apache2-native"
+RDEPENDS_${PN} += "apache2"
+
+# Original (github.com/disconnect/apache-websocket) is dead since 2012, the
+# fork contains patches from the modules ML and fixes CVE compliance issues
+SRC_URI = "git://github.com/jchampio/apache-websocket.git"
+
+SRCREV = "f5230d8c520dccf8631da94bf90c23f3c1100dcc"
+
+PV = "1.1.1"
+
+S = "${WORKDIR}/git"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+
+EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl"
+
+do_install() {
+install -d ${D}${libdir}/apache2/modules/
+install ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules/
+}
+
+FILES_${PN} += " ${libdir}/apache2/modules/* "
+FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* "
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 1/2] apache2: stage apachectl
Some apache module recipes like the newly introduced apache-websocket
also need apachectl at build in the sysroot besides apxs.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
index 597afe6..53d0564 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
@@ -113,6 +113,8 @@ SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
apache_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+install -d ${SYSROOT_DESTDIR}${sbindir}/
+install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}/
sed -i 's!my $installbuilddir = .*!my $installbuilddir =
"${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
sed -i 's!my $libtool = .*!my $libtool =
"${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 1/2] apache2: stage apachectl
Some apache module recipes like the newly introduced apache-websocket
also need apachectl at build in the sysroot besides apxs.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
index 597afe6..53d0564 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.18.bb
@@ -113,6 +113,8 @@ SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess"
apache_sysroot_preprocess () {
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+install -d ${SYSROOT_DESTDIR}${sbindir}/
+install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}/
sed -i 's!my $installbuilddir = .*!my $installbuilddir =
"${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
sed -i 's!my $libtool = .*!my $libtool =
"${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] ttf-pt-sans: add recipe
On Fri, 18 Mar 2016 14:34:10 +0100
Martin Jansa wrote:
> On Fri, Mar 18, 2016 at 02:59:04PM +0200, Ioan-Adrian Ratiu wrote:
> > PT Sans is an open source licensed font released in 2010 by ParaType.
> > The ParaTypeFFL-1.3 license file has been submitted to OE-core.
> >
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > .../recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | 44
> > ++
> > 1 file changed, 44 insertions(+)
> > create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> >
> > diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > new file mode 100644
> > index 000..b7f4548
> > --- /dev/null
> > +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > @@ -0,0 +1,44 @@
> > +SUMMARY = "PT Sans Fonts"
> > +DESCRIPTION = "The PT Sans TTF font set"
> > +HOMEPAGE = "http://www.paratype.com/public/";
> > +
> > +SECTION = "x11/fonts"
> > +
> > +LICENSE = "ParaTypeFFL-1.3"
> > +LIC_FILES_CHKSUM =
> > "file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d"
> > +
> > +inherit allarch fontcache
>
> This cannot be allarch when it depends on TUNE_PKGARCH fontconfig, see
> layer.conf and send v2.
>
> > +RDEPENDS_${PN} = "fontconfig-utils"
>
> This is already added by fontcache.bbclass.
>
> > +
> > +FONT_PACKAGES = "${PN}"
>
> This is the default, why do you assign it here?
Ah sorry I thought I removed this but it was in another version. I'll fix these
issues and send v2.
Thank you
>
> > +
> > +# Downloading from fedora because upstream doesn't version its zip file
> > +# and causes hash build failures
> > +SRC_URI =
> > "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip";
> > +
> > +SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
> > +SRC_URI[sha256sum] =
> > "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
> > +
> > +do_install () {
> > + install -d ${D}${datadir}/fonts/X11/TTF/
> > + cd ..
> > + for i in *.ttf; do
> > + install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i}
> > + done
> > +}
> > +
> > +FILES_${PN} += "${datadir}"
> > +
> > +pkg_postinst_${PN} () {
> > +set -x
> > +for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
> > +mkfontdir $fontdir
> > +mkfontscale $fontdir
> > +done
> > +for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
> > +mkfontdir $fontdir
> > +mkfontscale $fontdir
> > +done
> > +}
> > +
> > --
> > 2.7.3
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 2/2] apache-websocket: Add recipe
On Fri, 18 Mar 2016 12:49:48 +0100
Martin Jansa wrote:
> On Fri, Mar 18, 2016 at 10:40:56AM +0200, Ioan-Adrian Ratiu wrote:
> > Hello
> >
> > On Thu, 17 Mar 2016 22:41:18 +0100
> > Martin Jansa wrote:
> >
> > > On Thu, Mar 17, 2016 at 05:54:35PM +0200, Ioan-Adrian Ratiu wrote:
> > > > From: Haris Okanovic
> > > >
> > > > The apache-websocket module is an Apache 2.x server module that may be
> > > > used to process requests using the WebSocket protocol (RFC 6455) by an
> > > > Apache 2.x server. The module consists of a plugin architecture for
> > > > handling WebSocket messaging.
> > >
> > > does v2 fix hits?
> > >
> > > | checking for libtool... no
> > > | configure: error: could not find an installed libtool
> > > | NOTE: The following config.log files may provide further information.
> > > | NOTE:
> > > /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/apache-websocket/1.1.1-r0/git/config.log
> > >
> > > ?
> >
> > v2 fixes just the version number for apache-websocket. I'm not seeing that
> > error on my machine:
> >
> > (...)
> > checking for apachectl...
> > /media/adi/ssd/nilrt-master/build/tmp-glibc/sysroots/x64/usr/sbin/apachectl
> > checking for httpd...
> > /media/adi/ssd/nilrt-master/build/tmp-glibc/sysroots/x86_64-linux/usr/bin/httpd
> > checking for libtool... /usr/bin/libtool
>
> That build machine doesn't even have /usr/bin/libtool, you should use
> libtool provided by libtool-cross recipe.
Ok. I'll make some time today to fix this and send v3.
>
> > checking for the httpd modules directory... /usr/lib/apache2/modules
> > (...)
> >
> > Is there some kind of host contamination going on here?
> >
> > >
> > > >
> > > > Signed-off-by: Haris Okanovic
> > > > Signed-off-by: Ioan-Adrian Ratiu
> > > > ---
> > > > .../apache-mod/apache-websocket_git.bb | 32
> > > > ++
> > > > 1 file changed, 32 insertions(+)
> > > > create mode 100644
> > > > meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > > >
> > > > diff --git
> > > > a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > > > b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > > > new file mode 100644
> > > > index 000..2cfc1f3
> > > > --- /dev/null
> > > > +++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > > > @@ -0,0 +1,32 @@
> > > > +SUMMARY = "Websocket module for Apache web server"
> > > > +DESCRIPTION = "Process requests using the WebSocket protocol (RFC
> > > > 6455)"
> > > > +HOMEPAGE = "https://github.com/jchampio/${PN}/";
> > > > +SECTION = "net"
> > > > +LICENSE = "Apache-2.0"
> > > > +
> > > > +inherit autotools-brokensep pkgconfig
> > > > +
> > > > +DEPENDS = "apache2 apache2-native"
> > > > +RDEPENDS_${PN} += "apache2"
> > > > +
> > > > +# Original (github.com/disconnect/apache-websocket) is dead since
> > > > 2012, the
> > > > +# fork contains patches from the modules ML and fixes CVE compliance
> > > > issues
> > > > +SRC_URI = "git://github.com/jchampio/apache-websocket.git"
> > > > +
> > > > +SRCREV = "f5230d8c520dccf8631da94bf90c23f3c1100dcc"
> > > > +
> > > > +PV = "0.1.1"
> > > > +
> > > > +S = "${WORKDIR}/git"
> > > > +
> > > > +LIC_FILES_CHKSUM =
> > > > "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
> > > > +
> > > > +EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl"
> > > > +
> > > > +do_install() {
> > > > +install -d ${D}${libdir}/apache2/modules/
> > > > +install ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules/
> > > > +}
> > > > +
> > > > +FILES_${PN} += " ${libdir}/apache2/modules/* "
> > > > +FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* "
> > > > --
> > > > 2.7.3
> > > >
> > >
> >
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 2/2] apache-websocket: Add recipe
Hello
On Thu, 17 Mar 2016 22:41:18 +0100
Martin Jansa wrote:
> On Thu, Mar 17, 2016 at 05:54:35PM +0200, Ioan-Adrian Ratiu wrote:
> > From: Haris Okanovic
> >
> > The apache-websocket module is an Apache 2.x server module that may be
> > used to process requests using the WebSocket protocol (RFC 6455) by an
> > Apache 2.x server. The module consists of a plugin architecture for
> > handling WebSocket messaging.
>
> does v2 fix hits?
>
> | checking for libtool... no
> | configure: error: could not find an installed libtool
> | NOTE: The following config.log files may provide further information.
> | NOTE:
> /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/apache-websocket/1.1.1-r0/git/config.log
>
> ?
v2 fixes just the version number for apache-websocket. I'm not seeing that
error on my machine:
(...)
checking for apachectl...
/media/adi/ssd/nilrt-master/build/tmp-glibc/sysroots/x64/usr/sbin/apachectl
checking for httpd...
/media/adi/ssd/nilrt-master/build/tmp-glibc/sysroots/x86_64-linux/usr/bin/httpd
checking for libtool... /usr/bin/libtool
checking for the httpd modules directory... /usr/lib/apache2/modules
(...)
Is there some kind of host contamination going on here?
>
> >
> > Signed-off-by: Haris Okanovic
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > .../apache-mod/apache-websocket_git.bb | 32
> > ++
> > 1 file changed, 32 insertions(+)
> > create mode 100644
> > meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> >
> > diff --git
> > a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > new file mode 100644
> > index 000..2cfc1f3
> > --- /dev/null
> > +++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
> > @@ -0,0 +1,32 @@
> > +SUMMARY = "Websocket module for Apache web server"
> > +DESCRIPTION = "Process requests using the WebSocket protocol (RFC 6455)"
> > +HOMEPAGE = "https://github.com/jchampio/${PN}/";
> > +SECTION = "net"
> > +LICENSE = "Apache-2.0"
> > +
> > +inherit autotools-brokensep pkgconfig
> > +
> > +DEPENDS = "apache2 apache2-native"
> > +RDEPENDS_${PN} += "apache2"
> > +
> > +# Original (github.com/disconnect/apache-websocket) is dead since 2012, the
> > +# fork contains patches from the modules ML and fixes CVE compliance issues
> > +SRC_URI = "git://github.com/jchampio/apache-websocket.git"
> > +
> > +SRCREV = "f5230d8c520dccf8631da94bf90c23f3c1100dcc"
> > +
> > +PV = "0.1.1"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
> > +
> > +EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl"
> > +
> > +do_install() {
> > +install -d ${D}${libdir}/apache2/modules/
> > +install ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules/
> > +}
> > +
> > +FILES_${PN} += " ${libdir}/apache2/modules/* "
> > +FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* "
> > --
> > 2.7.3
> >
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] ttf-pt-sans: add recipe
On Fri, 18 Mar 2016 17:04:31 +0100
Martin Jansa wrote:
> On Fri, Mar 18, 2016 at 05:06:34PM +0200, Ioan-Adrian Ratiu wrote:
> > PT Sans is an open source licensed font released in 2010 by ParaType.
> > The ParaTypeFFL-1.3 license file has been submitted to OE-core.
> >
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > .../recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | 39
> > ++
> > 1 file changed, 39 insertions(+)
> > create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> >
> > diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > new file mode 100644
> > index 000..dcfa080
> > --- /dev/null
> > +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > @@ -0,0 +1,39 @@
> > +SUMMARY = "PT Sans Fonts"
> > +DESCRIPTION = "The PT Sans TTF font set"
> > +HOMEPAGE = "http://www.paratype.com/public/";
> > +
> > +SECTION = "x11/fonts"
> > +
> > +LICENSE = "ParaTypeFFL-1.3"
> > +LIC_FILES_CHKSUM =
> > "file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d"
> > +
> > +inherit fontcache
>
> Still missing layer.conf additions.
I am not sure I understand what are these layer.conf additions.
Do I need to add the recipe to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS? (i doubt it
since I'm not using ttf.inc)
>
> Use 4 spaces for indentation.
>
> > +# Downloading from fedora because upstream doesn't version its zip file
> > +# and causes hash build failures
> > +SRC_URI =
> > "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip";
> > +
> > +SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
> > +SRC_URI[sha256sum] =
> > "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
> > +
> > +do_install () {
> > + install -d ${D}${datadir}/fonts/X11/TTF/
> > + cd ..
> > + for i in *.ttf; do
> > + install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i}
> > + done
> > +}
> > +
> > +FILES_${PN} += "${datadir}"
> > +
> > +pkg_postinst_${PN} () {
> > +set -x
> > +for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
> > +mkfontdir $fontdir
> > +mkfontscale $fontdir
> > +done
> > +for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
> > +mkfontdir $fontdir
> > +mkfontscale $fontdir
> > +done
> > +}
> > --
> > 2.7.3
> >
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] ttf-pt-sans: add recipe
On Mon, 21 Mar 2016 10:59:52 +0100
Martin Jansa wrote:
> On Mon, Mar 21, 2016 at 10:57:27AM +0100, Martin Jansa wrote:
> > On Mon, Mar 21, 2016 at 11:01:04AM +0200, Ioan-Adrian Ratiu wrote:
> > > On Fri, 18 Mar 2016 17:04:31 +0100
> > > Martin Jansa wrote:
> > >
> > > > On Fri, Mar 18, 2016 at 05:06:34PM +0200, Ioan-Adrian Ratiu wrote:
> > > > > PT Sans is an open source licensed font released in 2010 by ParaType.
> > > > > The ParaTypeFFL-1.3 license file has been submitted to OE-core.
> > > > >
> > > > > Signed-off-by: Ioan-Adrian Ratiu
> > > > > ---
> > > > > .../recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | 39
> > > > > ++
> > > > > 1 file changed, 39 insertions(+)
> > > > > create mode 100644
> > > > > meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > > > >
> > > > > diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > > > > b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > > > > new file mode 100644
> > > > > index 000..dcfa080
> > > > > --- /dev/null
> > > > > +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
> > > > > @@ -0,0 +1,39 @@
> > > > > +SUMMARY = "PT Sans Fonts"
> > > > > +DESCRIPTION = "The PT Sans TTF font set"
> > > > > +HOMEPAGE = "http://www.paratype.com/public/";
> > > > > +
> > > > > +SECTION = "x11/fonts"
> > > > > +
> > > > > +LICENSE = "ParaTypeFFL-1.3"
> > > > > +LIC_FILES_CHKSUM =
> > > > > "file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d"
> > > > > +
> > > > > +inherit fontcache
> > > >
> > > > Still missing layer.conf additions.
> > >
> > > I am not sure I understand what are these layer.conf additions.
> > > Do I need to add the recipe to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS? (i doubt
> > > it since I'm not using ttf.inc)
> >
> > Yes, fontconfig-utils dependency is added by fontcache.bbclass which
> > you're using.
>
> Ahh now I see that you've dropped allarch inherit in v2.
> So it will work without SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS.
>
> But you can still "optimise" it by returning allarch and adding
> SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
Yes, I'll do that. Thank you!
>
> > > > Use 4 spaces for indentation.
> > > >
> > > > > +# Downloading from fedora because upstream doesn't version its zip
> > > > > file
> > > > > +# and causes hash build failures
> > > > > +SRC_URI =
> > > > > "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip";
> > > > > +
> > > > > +SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
> > > > > +SRC_URI[sha256sum] =
> > > > > "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
> > > > > +
> > > > > +do_install () {
> > > > > + install -d ${D}${datadir}/fonts/X11/TTF/
> > > > > + cd ..
> > > > > + for i in *.ttf; do
> > > > > + install -m 0644 $i
> > > > > ${D}${prefix}/share/fonts/X11/TTF/${i}
> > > > > + done
> > > > > +}
> > > > > +
> > > > > +FILES_${PN} += "${datadir}"
> > > > > +
> > > > > +pkg_postinst_${PN} () {
> > > > > +set -x
> > > > > +for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
> > > > > +mkfontdir $fontdir
> > > > > +mkfontscale $fontdir
> > > > > +done
> > > > > +for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
> > > > > +mkfontdir $fontdir
> > > > > +mkfontscale $fontdir
> > > > > +done
> > > > > +}
> > > > > --
> > > > > 2.7.3
> > > > >
> > > >
> > >
> >
> > --
> > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
>
>
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 1/2] ttf-pt-sans: add recipe
PT Sans is an open source licensed font released in 2010 by ParaType.
The ParaTypeFFL-1.3 license file has been submitted to OE-core.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | 39 ++
1 file changed, 39 insertions(+)
create mode 100644 meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
new file mode 100644
index 000..ac60a36
--- /dev/null
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
@@ -0,0 +1,39 @@
+SUMMARY = "PT Sans Fonts"
+DESCRIPTION = "The PT Sans TTF font set"
+HOMEPAGE = "http://www.paratype.com/public/";
+
+SECTION = "x11/fonts"
+
+LICENSE = "ParaTypeFFL-1.3"
+LIC_FILES_CHKSUM =
"file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d"
+
+inherit allarch fontcache
+
+# Downloading from fedora because upstream doesn't version its zip file
+# and causes hash build failures
+SRC_URI =
"http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans.zip/c3f5a0e20a75cf628387510a720924a7/PTSans.zip";
+
+SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7"
+SRC_URI[sha256sum] =
"0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e"
+
+do_install () {
+install -d ${D}${datadir}/fonts/X11/TTF/
+cd ..
+for i in *.ttf; do
+install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i}
+done
+}
+
+FILES_${PN} += "${datadir}"
+
+pkg_postinst_${PN} () {
+set -x
+for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
+mkfontdir $fontdir
+mkfontscale $fontdir
+done
+for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
+mkfontdir $fontdir
+mkfontscale $fontdir
+done
+}
--
2.7.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v3 2/2] meta-oe: layer.conf: Add ttf-pt-sans to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS
Signed-off-by: Ioan-Adrian Ratiu --- meta-oe/conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 7237964..87f11f0 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -58,6 +58,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-hunkyfonts->fontconfig \ ttf-inconsolata->fontconfig \ ttf-liberation->fontconfig \ + ttf-pt-sans->fontconfig \ ttf-mplus->fontconfig \ ttf-sazanami->fontconfig \ ttf-tlwg->fontconfig \ -- 2.7.3 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] ti-wifi-utils: add recipe
This recipe is for a TI WiFi calibrator utility [1]. The firmware from
this project is already shipped inside linux-firmware so we do not
package it in this recipe.
[1] http://linuxwireless.sipsolutions.net/en/users/Drivers/wl12xx/#Calibration
Signed-off-by: James Minor
Signed-off-by: Ioan-Adrian Ratiu
---
.../ti-wifi-utils/ti-wifi-utils_git.bb | 24 ++
1 file changed, 24 insertions(+)
create mode 100644
meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
diff --git a/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
new file mode 100644
index 000..fcae729
--- /dev/null
+++ b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
@@ -0,0 +1,24 @@
+SUMMARY = "The calibrator and other useful utilities for TI wireless solution
based on wl12xx driver"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
+
+DEPENDS = "libnl"
+
+PV = "0.1+gitr${SRCPV}"
+
+SRCREV = "b03d9ce6362e6d22d6929f2736409af3b0fd3c88"
+SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;branch=r5-jb"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} \
+CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" \
+CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3 -DCONFIG_LIBNL20"
NLVER=3 \
+LDFLAGS="${LDFLAGS} ${TOOLCHAIN_OPTIONS}" \
+'
+
+#only install the calibrator utility, firmware is already within linux-firmware
+do_install() {
+install -d ${D}${bindir}
+install -m 0755 calibrator ${D}${bindir}/
+}
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] openconnect: add recipe
openconnect is a FOSS VPN client designed to work with Cisco AnyConnect
and Pulse Connect Secure (Juniper SSL).
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-connectivity/openconnect/openconnect_git.bb | 16
1 file changed, 16 insertions(+)
create mode 100644
meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
diff --git
a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
new file mode 100644
index 000..241de30
--- /dev/null
+++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Open client for Cisco AnyConnect VPN"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
+
+DEPENDS = "vpnc libxml2 gnutls"
+
+PV = "7.06"
+
+SRCREV = "35542d52202672b8c12ecc63867432128244013a"
+SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += "--disable-static"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] ti-wifi-utils: add recipe
Hello
On Fri, 1 Apr 2016 13:36:08 +0200
Martin Jansa wrote:
> On Tue, Mar 22, 2016 at 11:57:16AM +0200, Ioan-Adrian Ratiu wrote:
> > This recipe is for a TI WiFi calibrator utility [1]. The firmware from
> > this project is already shipped inside linux-firmware so we do not
> > package it in this recipe.
> >
> > [1]
> > http://linuxwireless.sipsolutions.net/en/users/Drivers/wl12xx/#Calibration
> >
> > Signed-off-by: James Minor
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > .../ti-wifi-utils/ti-wifi-utils_git.bb | 24
> > ++
> > 1 file changed, 24 insertions(+)
> > create mode 100644
> > meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> >
> > diff --git
> > a/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > new file mode 100644
> > index 000..fcae729
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > @@ -0,0 +1,24 @@
> > +SUMMARY = "The calibrator and other useful utilities for TI wireless
> > solution based on wl12xx driver"
> > +LICENSE = "BSD-3-Clause"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
> > +
> > +DEPENDS = "libnl"
> > +
> > +PV = "0.1+gitr${SRCPV}"
> > +
> > +SRCREV = "b03d9ce6362e6d22d6929f2736409af3b0fd3c88"
> > +SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;branch=r5-jb"
> > +
> > +S = "${WORKDIR}/git"
> > +
> > +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} \
> > +CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" \
>
> This doesn't respect all flags usually available in $CC variable, why
> haven't you used $CC?
>
> Maybe it's other part of Makefiles which is using CROSS_COMPILE instead
> of CC, but currently it's failing e.g. for hardfloat builds with
> typical:
>
> ../SYSROOT/MACHINE/usr/include/gnu/stubs.h:7:29: fatal error:
> gnu/stubs-soft.h: No such file or directory
>
> because the build doesn't have correct -mfloat-abi parameter
>
> | arm-DISTRO-linux-gnueabi-gcc --sysroot=/SYSROOTS/MACHINE -O2 -pipe -g
> -feliminate-unused-debug-types
> -fdebug-prefix-map=TMPDIRwork/MACHINE-DISTRO-linux-gnueabi/ti-wifi-utils/0.1+gitrAUTOINC+b03d9ce636-r0=/usr/src/debug/ti-wifi-utils/0.1+gitrAUTOINC+b03d9ce636-r0
> -fdebug-prefix-map=TMPDIRsysroots/x86_64-linux=
> -fdebug-prefix-map=/SYSROOTS/MACHINE= -I/SYSROOTS/MACHINE/usr/include/libnl3
> -DCONFIG_LIBNL20 -c -o misc_cmds.o misc_cmds.c
>
Since this is already in master, I'll submit another patch to fix this and use
$CC properly.
Thank you,
Ionel
> > +CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3
> > -DCONFIG_LIBNL20" NLVER=3 \
> > +LDFLAGS="${LDFLAGS} ${TOOLCHAIN_OPTIONS}" \
> > +'
> > +
> > +#only install the calibrator utility, firmware is already within
> > linux-firmware
> > +do_install() {
> > +install -d ${D}${bindir}
> > +install -m 0755 calibrator ${D}${bindir}/
> > +}
> > --
> > 2.7.4
> >
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] ti-wifi-utils: fix CC variable flags
Use bitbake's provided $CC variable instead of the custom one because
bitbake $CC usually is a superset and includes flags to correctly build
for things like hard-fload ABI's (-mfloat-abi).
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
index fcae729..58b40fb 100644
--- a/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
+++ b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
@@ -11,8 +11,7 @@ SRC_URI =
"git://github.com/TI-OpenLink/ti-utils.git;branch=r5-jb"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} \
-CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" \
+EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}" \
CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3 -DCONFIG_LIBNL20"
NLVER=3 \
LDFLAGS="${LDFLAGS} ${TOOLCHAIN_OPTIONS}" \
'
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 1/2] vpnc: stage vpnc-script
The vpn connection handling script is used during building openconnect
so we need to stage it.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
index 0670c5e..ccb4494 100644
--- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
@@ -24,6 +24,13 @@ do_install () {
install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf
}
+SYSROOT_PREPROCESS_FUNCS += "vpnc_sysroot_preprocess"
+
+vpnc_sysroot_preprocess () {
+install -d ${SYSROOT_DESTDIR}${sysconfdir}/vpnc
+install -m 755 ${D}${sysconfdir}/vpnc/vpnc-script
${SYSROOT_DESTDIR}${sysconfdir}/vpnc
+}
+
CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf"
RDEPENDS_${PN} = "perl-module-io-file"
RRECOMMENDS_${PN} = "kernel-module-tun"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2 2/2] openconnect: add recipe
openconnect is a FOSS VPN client designed to work with Cisco AnyConnect
and Pulse Connect Secure (Juniper SSL).
Signed-off-by: Ioan-Adrian Ratiu
---
.../openconnect/openconnect_git.bb | 18 ++
1 file changed, 18 insertions(+)
create mode 100644
meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
diff --git
a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
new file mode 100644
index 000..0a8b875
--- /dev/null
+++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Open client for Cisco AnyConnect VPN"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
+
+DEPENDS = "vpnc libxml2 gnutls"
+RDEPENDS_${PN} = "vpnc"
+
+PV = "7.06"
+
+SRCREV = "35542d52202672b8c12ecc63867432128244013a"
+SRC_URI = "git://git.infradead.org/users/dwmw2/openconnect.git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF +=
"--with-vpnc-script=${SYSROOT_DESTDIR}${sysconfdir}/vpnc/vpnc-script \
+ --disable-static"
--
2.7.4
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] ti-wifi-utils: add recipe
Hello
On Fri, 1 Apr 2016 15:53:41 -0400
Denys Dmytriyenko wrote:
> On Fri, Apr 01, 2016 at 01:36:08PM +0200, Martin Jansa wrote:
> > On Tue, Mar 22, 2016 at 11:57:16AM +0200, Ioan-Adrian Ratiu wrote:
> > > This recipe is for a TI WiFi calibrator utility [1]. The firmware from
> > > this project is already shipped inside linux-firmware so we do not
> > > package it in this recipe.
> > >
> > > [1]
> > > http://linuxwireless.sipsolutions.net/en/users/Drivers/wl12xx/#Calibration
> > >
> > > Signed-off-by: James Minor
> > > Signed-off-by: Ioan-Adrian Ratiu
> > > ---
> > > .../ti-wifi-utils/ti-wifi-utils_git.bb | 24
> > > ++
> > > 1 file changed, 24 insertions(+)
> > > create mode 100644
> > > meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > >
> > > diff --git
> > > a/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > > b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > > new file mode 100644
> > > index 000..fcae729
> > > --- /dev/null
> > > +++ b/meta-oe/recipes-connectivity/ti-wifi-utils/ti-wifi-utils_git.bb
> > > @@ -0,0 +1,24 @@
> > > +SUMMARY = "The calibrator and other useful utilities for TI wireless
> > > solution based on wl12xx driver"
> > > +LICENSE = "BSD-3-Clause"
> > > +LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
> > > +
> > > +DEPENDS = "libnl"
> > > +
> > > +PV = "0.1+gitr${SRCPV}"
> > > +
> > > +SRCREV = "b03d9ce6362e6d22d6929f2736409af3b0fd3c88"
> > > +SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;branch=r5-jb"
> > > +
> > > +S = "${WORKDIR}/git"
> > > +
> > > +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} \
> > > +CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" \
>
> Reinventing the wheel much?
>
> http://layers.openembedded.org/layerindex/branch/master/recipes/?q=ti-wifi-utils
>
Yes, it is a duplicate. How about keeping the recipe in meta-oe to make it
usable without adding arago distributions layers?
Thank you,
Ioan-Adrian
>
> > This doesn't respect all flags usually available in $CC variable, why
> > haven't you used $CC?
> >
> > Maybe it's other part of Makefiles which is using CROSS_COMPILE instead
> > of CC, but currently it's failing e.g. for hardfloat builds with
> > typical:
> >
> > ../SYSROOT/MACHINE/usr/include/gnu/stubs.h:7:29: fatal error:
> > gnu/stubs-soft.h: No such file or directory
> >
> > because the build doesn't have correct -mfloat-abi parameter
> >
> > | arm-DISTRO-linux-gnueabi-gcc --sysroot=/SYSROOTS/MACHINE -O2 -pipe -g
> > -feliminate-unused-debug-types
> > -fdebug-prefix-map=TMPDIRwork/MACHINE-DISTRO-linux-gnueabi/ti-wifi-utils/0.1+gitrAUTOINC+b03d9ce636-r0=/usr/src/debug/ti-wifi-utils/0.1+gitrAUTOINC+b03d9ce636-r0
> > -fdebug-prefix-map=TMPDIRsysroots/x86_64-linux=
> > -fdebug-prefix-map=/SYSROOTS/MACHINE=
> > -I/SYSROOTS/MACHINE/usr/include/libnl3 -DCONFIG_LIBNL20 -c -o misc_cmds.o
> > misc_cmds.c
> >
> > > +CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3
> > > -DCONFIG_LIBNL20" NLVER=3 \
> > > +LDFLAGS="${LDFLAGS} ${TOOLCHAIN_OPTIONS}" \
> > > +'
> > > +
> > > +#only install the calibrator utility, firmware is already within
> > > linux-firmware
> > > +do_install() {
> > > +install -d ${D}${bindir}
> > > +install -m 0755 calibrator ${D}${bindir}/
> > > +}
> > > --
> > > 2.7.4
> > >
> >
> > --
> > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
>
>
>
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] ti-wifi-utils: add recipe
On Mon, 11 Apr 2016 14:11:08 -0400 Denys Dmytriyenko wrote: > Resending again, since my previous reply got truncated when sending to the > list: > > On Thu, Apr 07, 2016 at 11:50:10AM -0700, Denys Dmytriyenko wrote: > > > http://layers.openembedded.org/layerindex/branch/master/recipes/?q=ti-wifi-utils > > > > > > Yes, it is a duplicate. How about keeping the recipe in meta-oe to make > > > it usable without adding arago distributions layers? > > > > Well, it is currently NOT in the distribution layer, but rather in the > > application layer... But I guess I'm fine submitting the latest version to > > meta-oe, once I'm back from ELC. That would be really awesome. Thank you! Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] openconnect: add missing dependencies
They were autodetected and triggered QA warnings
Signed-off-by: Ioan-Adrian Ratiu
---
meta-networking/recipes-connectivity/openconnect/openconnect_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
index 0a8b875..6d3c252 100644
--- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
+++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Open client for Cisco AnyConnect VPN"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
-DEPENDS = "vpnc libxml2 gnutls"
+DEPENDS = "vpnc libxml2 gnutls lz4 krb5 libproxy pcsc-lite"
RDEPENDS_${PN} = "vpnc"
PV = "7.06"
--
2.8.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] syslog-ng.inc: fix prerm script & class includes
The order of class includes is very important because it's the order in
which classes are evaluated. Both update-rc.d and update-alternatives
write to the prerm script, so the class order decides the script code
ordering. As they are now, prerm is:
#!/bin/sh
update-alternatives --remove syslog-init /etc/init.d/syslog.syslog-ng
if [ -z "$D" ]; then
/etc/init.d/syslog stop
fi
This causes errors because when syslog-ng is the only alternative it is
removed and then the script tries to stop it (No such file or directory)
but even if there are other alternatives, the script tries to stop
something other than syslog-ng which was removed.
By reversing the include order, prerm gets generated correctly and it
tries to stop syslog-ng before removing it:
if [ -z "$D" ]; then
/etc/init.d/syslog stop
fi
update-alternatives --remove syslog-init /etc/init.d/syslog.syslog-ng
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 382dc5e..4e0f697 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -22,7 +22,7 @@ SRC_URI =
"http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source
file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \
"
-inherit autotools systemd pkgconfig update-rc.d update-alternatives
+inherit autotools systemd pkgconfig update-alternatives update-rc.d
EXTRA_OECONF = " \
--enable-dynamic-linking \
--
2.8.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] openconnect: add missing dependencies
Hi Robert
On Fri, 6 May 2016 10:04:06 +0800
Robert Yang wrote:
> Hi Ioan,
>
> Is it possible to use PACKAGECONFIG to add these dependencies conditionally ?
Sure. I'll make some time to write & send another patch to make deps conditional
on PACKAGECONFIG.
Thanks,
Ioan-Adrian
>
> On 04/27/2016 08:49 PM, Ioan-Adrian Ratiu wrote:
> > They were autodetected and triggered QA warnings
> >
> > Signed-off-by: Ioan-Adrian Ratiu
> > ---
> > meta-networking/recipes-connectivity/openconnect/openconnect_git.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git
> > a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> > b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> > index 0a8b875..6d3c252 100644
> > --- a/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> > +++ b/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
> > @@ -2,7 +2,7 @@ SUMMARY = "Open client for Cisco AnyConnect VPN"
> > LICENSE = "LGPLv2.1"
> > LIC_FILES_CHKSUM =
> > "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad"
> >
> > -DEPENDS = "vpnc libxml2 gnutls"
> > +DEPENDS = "vpnc libxml2 gnutls lz4 krb5 libproxy pcsc-lite"
> > RDEPENDS_${PN} = "vpnc"
> >
> > PV = "7.06"
> >
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] gnulib: bump git revision
The revision currently used is quite ancient (beginning of 2014) and we
need bugfixes commited since then. Rather than backport patches it's
cleaner to uprev.
Signed-off-by: Ioan-Adrian Ratiu
---
meta-oe/recipes-support/gnulib/gnulib_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/gnulib/gnulib_git.bb
b/meta-oe/recipes-support/gnulib/gnulib_git.bb
index 766e41a..5b2ed49 100644
--- a/meta-oe/recipes-support/gnulib/gnulib_git.bb
+++ b/meta-oe/recipes-support/gnulib/gnulib_git.bb
@@ -11,7 +11,7 @@ SECTION = "devel"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=e4cf3810f33a067ea7ccd2cd889fed21"
-SRCREV = "24379a9217fa4bd62685795010fd90ced9e3"
+SRCREV = "b6b3ed1fa4c6de12908a9f01d1689f156c3cd441"
SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \
"
S = "${WORKDIR}/git"
--
2.8.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python-pyconnman: rdepend on connman
Having pyconnman installed without connman is useless, so make sure
it's pulled at runtime. Connman can also be installed via a 'base'
image packagegroup, but let's also add it to rdepend to be safe.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
b/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
index 6eeab7e47..4d76cc536 100644
---
a/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
+++
b/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
@@ -11,4 +11,4 @@ PYPI_PACKAGE = "pyconnman"
inherit pypi setuptools
-RDEPENDS_${PN} = "python-dbus python-pprint"
\ No newline at end of file
+RDEPENDS_${PN} = "connman python-dbus python-pprint"
--
2.11.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] apache-websocket: add depend on pbzip2-native
This fixes the build failure:
ERROR: apache-websocket-0.1.1-r0 do_install_source: Failed to
archive (...) /bin/sh: pbzip2: command not found
Signed-off-by: Ioan-Adrian Ratiu
---
meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
index da33115aa..0beb3ed04 100644
--- a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
+++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
@@ -6,7 +6,7 @@ LICENSE = "Apache-2.0"
inherit autotools-brokensep pkgconfig
-DEPENDS = "apache2 apache2-native"
+DEPENDS = "apache2 apache2-native pbzip2-native"
RDEPENDS_${PN} += "apache2"
# Original (github.com/disconnect/apache-websocket) is dead since 2012, the
--
2.11.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libblockdev: cleanup/fix PACKAGECONFIG/dependencies
It only makes sense to rdepend on lvm2 if lvm is enabled by the
configuration and the nss and volume-key dependencies are only needed
if --with-escrow is configured. These dependencies are quite big so
it's good to have a way to disable them.
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-extended/libblockdev/libblockdev_2.18.bb | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb
b/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb
index 4dbd04cd7..a58871f0c 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.18.bb
@@ -12,8 +12,6 @@ inherit autotools python3native gobject-introspection
DEPENDS += " \
cryptsetup \
-nss \
-volume-key \
libbytesize \
btrfs-tools \
"
@@ -26,16 +24,12 @@ SRC_URI = " \
S = "${WORKDIR}/git"
-RDEPENDS_${PN} += " \
-lvm2 \
-"
-
FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
-PACKAGECONFIG ??= "python3 lvm dm kmod parted fs"
+PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow"
PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2"
-PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools"
+PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
PACKAGECONFIG[dm] = "--with-dm, --without-dm"
PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid"
PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd, kmod"
@@ -44,6 +38,7 @@ PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux"
PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm"
PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo"
+PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key"
export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 2/3] python3-pytest-helpers-namespace: add recipe
From: Alejandro del Castillo
Signed-off-by: Alejandro del Castillo
Signed-off-by: Ioan-Adrian Ratiu
---
.../python/python-pytest-helpers-namespace.inc| 10 ++
.../python-pytest-helpers-namespace_2016.7.10.bb | 11 ++-
.../python3-pytest-helpers-namespace_2016.7.10.bb | 7 +++
3 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644
meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
create mode 100644
meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
diff --git
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
new file mode 100644
index 0..a69867d91
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
however, provide a helpers namespace in pytest which enables you to register
helper functions in your conftest.py to be used within your tests without
having to import them."
+HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
+
+SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
+SRC_URI[sha256sum] =
"d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
+
+inherit pypi
diff --git
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
index afca48702..2b6ee8550 100644
---
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
+++
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
however, provide a helpers namespace in pytest which enables you to register
helper functions in your conftest.py to be used within your tests without
having to import them."
-HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace";
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
+require python-pytest-helpers-namespace.inc
-SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
-SRC_URI[sha256sum] =
"d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
-
-inherit pypi setuptools
+inherit setuptools
RDEPENDS_${PN} += " \
python-pytest \
diff --git
a/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
new file mode 100644
index 0..f03f5d415
--- /dev/null
+++
b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
@@ -0,0 +1,7 @@
+require python-pytest-helpers-namespace.inc
+
+inherit setuptools3
+
+RDEPENDS_${PN} += " \
+python3-pytest \
+"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 1/3] python3-pyconnman: add recipe
From: Alejandro del Castillo
Signed-off-by: Alejandro del Castillo
Signed-off-by: Ioan-Adrian Ratiu
---
.../python-pyconnman/python-pyconnman.inc | 12
.../python-pyconnman/python-pyconnman_0.1.0.bb | 13 +++--
.../python-pyconnman/python3-pyconnman_0.1.0.bb | 5 +
3 files changed, 20 insertions(+), 10 deletions(-)
create mode 100644
meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc
create mode 100644
meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
diff --git
a/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc
b/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc
new file mode 100644
index 0..beb2baf83
--- /dev/null
+++ b/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python-based Network Connectivity Management"
+HOMEPAGE = "https://pypi.python.org/pypi/pyconnman/";
+LICENSE = "Apache-2.0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI[md5sum] = "b7fa82034b1c0e1fb1b518ffe3bb4fc0"
+SRC_URI[sha256sum] =
"46c64c0692063fd0c9fb0216d49f7884bec9fa9760d8473db4b1e2f8162fab4a"
+
+inherit pypi
+
+RDEPENDS_${PN} = "connman"
diff --git
a/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
b/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
index 77b5e4dcf..3c12db944 100644
---
a/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
+++
b/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
@@ -1,12 +1,5 @@
-DESCRIPTION = "Python-based Network Connectivity Management"
-HOMEPAGE = "https://pypi.python.org/pypi/pyconnman/";
-LICENSE = "Apache-2.0"
+require python-pyconnman.inc
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+inherit setuptools
-SRC_URI[md5sum] = "b7fa82034b1c0e1fb1b518ffe3bb4fc0"
-SRC_URI[sha256sum] =
"46c64c0692063fd0c9fb0216d49f7884bec9fa9760d8473db4b1e2f8162fab4a"
-
-inherit pypi setuptools
-
-RDEPENDS_${PN} = "connman python-dbus python-pprint"
+RDEPENDS_${PN} += "python-dbus python-pprint"
diff --git
a/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
new file mode 100644
index 0..e0f3fdd75
--- /dev/null
+++
b/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.1.0.bb
@@ -0,0 +1,5 @@
+require python-pyconnman.inc
+
+inherit setuptools3
+
+RDEPENDS_${PN} += "python3-dbus python3-pprint"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 3/3] python3-pytest-tempdir: add recipe
From: Alejandro del Castillo
Signed-off-by: Alejandro del Castillo
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-devtools/python/python-pytest-tempdir.inc | 10 ++
.../python/python-pytest-tempdir_2016.8.20.bb | 11 ++-
.../python/python3-pytest-tempdir_2016.8.20.bb| 7 +++
3 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644
meta-python/recipes-devtools/python/python-pytest-tempdir.inc
create mode 100644
meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
diff --git a/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
b/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
new file mode 100644
index 0..196f6d644
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Adds support for a predictable and repeatable temporary
directory."
+HOMEPAGE = "https://github.com/saltstack/pytest-tempdir";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8751a9cf4a70be4f02697a9b89e686ce"
+
+SRC_URI[md5sum] = "f87f2583f5f8aaca7203d57ada3948b5"
+SRC_URI[sha256sum] =
"65ff815966ea6dfc07ca1b43747c9888a6d883971170e67b16290f9f50d434ea"
+
+inherit pypi
diff --git
a/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
b/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
index 74030dcf5..8a9b83e3d 100644
--- a/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
+++ b/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Adds support for a predictable and repeatable temporary
directory."
-HOMEPAGE = "https://github.com/saltstack/pytest-tempdir";
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8751a9cf4a70be4f02697a9b89e686ce"
+require python-pytest-tempdir.inc
-SRC_URI[md5sum] = "f87f2583f5f8aaca7203d57ada3948b5"
-SRC_URI[sha256sum] =
"65ff815966ea6dfc07ca1b43747c9888a6d883971170e67b16290f9f50d434ea"
-
-inherit pypi setuptools
+inherit setuptools
RDEPENDS_${PN} += " \
python-pytest \
diff --git
a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
new file mode 100644
index 0..02e821563
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
@@ -0,0 +1,7 @@
+require python-pytest-tempdir.inc
+
+inherit setuptools3
+
+RDEPENDS_${PN} += " \
+python3-pytest \
+"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-python][PATCH 2/3] python3-pytest-helpers-namespace: add recipe
On Mon, 27 Aug 2018, Khem Raj wrote:
> this patch seems to need python-pytest-helpers-namespace recipe
> and it does not exist. have you tested these patches on master
Yes, tested the series on master but I forgot to cherry-pick the commit
adding the python2 recipe right before sending (perhaps I should
cherry-pick a range next time instead of going through each commit manually).
The commit adding the initial p2 python-pytest-helpers-namespace was done
earlier and by someone else than the p3 recipe. Do you want me to squash
them together instead of sending them separately?
> On Mon, Aug 27, 2018 at 5:32 AM Ioan-Adrian Ratiu wrote:
>>
>> From: Alejandro del Castillo
>>
>> Signed-off-by: Alejandro del Castillo
>> Signed-off-by: Ioan-Adrian Ratiu
>> ---
>> .../python/python-pytest-helpers-namespace.inc| 10 ++
>> .../python-pytest-helpers-namespace_2016.7.10.bb | 11 ++-
>> .../python3-pytest-helpers-namespace_2016.7.10.bb | 7 +++
>> 3 files changed, 19 insertions(+), 9 deletions(-)
>> create mode 100644
>> meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
>> create mode 100644
>> meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
>>
>> diff --git
>> a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
>> b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
>> new file mode 100644
>> index 0..a69867d91
>> --- /dev/null
>> +++ b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
>> @@ -0,0 +1,10 @@
>> +DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
>> however, provide a helpers namespace in pytest which enables you to register
>> helper functions in your conftest.py to be used within your tests without
>> having to import them."
>> +HOMEPAGE =
>> "https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_saltstack_pytest-2Dhelpers-2Dnamespace&d=DwIBaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=W74ODSSr60HRrFxzES0jR9ErEDIY0z3NTj08MFJVXQw&s=WFg4fgnvlpFzm8uQU1eEL1mn2d55j6iZhsog43LOoPA&e=";
>> +SECTION = "devel/python"
>> +LICENSE = "Apache-2.0"
>> +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
>> +
>> +SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
>> +SRC_URI[sha256sum] =
>> "d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
>> +
>> +inherit pypi
>> diff --git
>> a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
>>
>> b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
>> index afca48702..2b6ee8550 100644
>> ---
>> a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
>> +++
>> b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
>> @@ -1,13 +1,6 @@
>> -DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
>> however, provide a helpers namespace in pytest which enables you to register
>> helper functions in your conftest.py to be used within your tests without
>> having to import them."
>> -HOMEPAGE =
>> "https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_saltstack_pytest-2Dhelpers-2Dnamespace&d=DwIBaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=W74ODSSr60HRrFxzES0jR9ErEDIY0z3NTj08MFJVXQw&s=WFg4fgnvlpFzm8uQU1eEL1mn2d55j6iZhsog43LOoPA&e=";
>> -SECTION = "devel/python"
>> -LICENSE = "Apache-2.0"
>> -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
>> +require python-pytest-helpers-namespace.inc
>>
>> -SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
>> -SRC_URI[sha256sum] =
>> "d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
>> -
>> -inherit pypi setuptools
>> +inherit setuptools
>>
>> RDEPENDS_${PN} += " \
>> python-pytest \
>> diff --git
>> a/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
>>
>> b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
>> new file mode 100644
>> index 0..f03f5d415
>> --- /dev/null
>> +++
>> b/meta-python/recipes-devtools/python/python3-py
[oe] [meta-python][PATCH 4/4] python3-pytest-helpers-namespace: add recipe
From: Alejandro del Castillo
Signed-off-by: Alejandro del Castillo
Signed-off-by: Ioan-Adrian Ratiu
---
.../python/python-pytest-helpers-namespace.inc| 10 ++
.../python-pytest-helpers-namespace_2016.7.10.bb | 11 ++-
.../python3-pytest-helpers-namespace_2016.7.10.bb | 7 +++
3 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644
meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
create mode 100644
meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
diff --git
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
new file mode 100644
index 0..a69867d91
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
however, provide a helpers namespace in pytest which enables you to register
helper functions in your conftest.py to be used within your tests without
having to import them."
+HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
+
+SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
+SRC_URI[sha256sum] =
"d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
+
+inherit pypi
diff --git
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
index afca48702..2b6ee8550 100644
---
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
+++
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
however, provide a helpers namespace in pytest which enables you to register
helper functions in your conftest.py to be used within your tests without
having to import them."
-HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace";
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
+require python-pytest-helpers-namespace.inc
-SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
-SRC_URI[sha256sum] =
"d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
-
-inherit pypi setuptools
+inherit setuptools
RDEPENDS_${PN} += " \
python-pytest \
diff --git
a/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
new file mode 100644
index 0..f03f5d415
--- /dev/null
+++
b/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2016.7.10.bb
@@ -0,0 +1,7 @@
+require python-pytest-helpers-namespace.inc
+
+inherit setuptools3
+
+RDEPENDS_${PN} += " \
+python3-pytest \
+"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 2/4] python3-pytest-tempdir: add recipe
From: Alejandro del Castillo
Signed-off-by: Alejandro del Castillo
Signed-off-by: Ioan-Adrian Ratiu
---
.../recipes-devtools/python/python-pytest-tempdir.inc | 10 ++
.../python/python-pytest-tempdir_2016.8.20.bb | 11 ++-
.../python/python3-pytest-tempdir_2016.8.20.bb| 7 +++
3 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644
meta-python/recipes-devtools/python/python-pytest-tempdir.inc
create mode 100644
meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
diff --git a/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
b/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
new file mode 100644
index 0..196f6d644
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pytest-tempdir.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "Adds support for a predictable and repeatable temporary
directory."
+HOMEPAGE = "https://github.com/saltstack/pytest-tempdir";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8751a9cf4a70be4f02697a9b89e686ce"
+
+SRC_URI[md5sum] = "f87f2583f5f8aaca7203d57ada3948b5"
+SRC_URI[sha256sum] =
"65ff815966ea6dfc07ca1b43747c9888a6d883971170e67b16290f9f50d434ea"
+
+inherit pypi
diff --git
a/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
b/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
index 74030dcf5..8a9b83e3d 100644
--- a/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
+++ b/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "Adds support for a predictable and repeatable temporary
directory."
-HOMEPAGE = "https://github.com/saltstack/pytest-tempdir";
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8751a9cf4a70be4f02697a9b89e686ce"
+require python-pytest-tempdir.inc
-SRC_URI[md5sum] = "f87f2583f5f8aaca7203d57ada3948b5"
-SRC_URI[sha256sum] =
"65ff815966ea6dfc07ca1b43747c9888a6d883971170e67b16290f9f50d434ea"
-
-inherit pypi setuptools
+inherit setuptools
RDEPENDS_${PN} += " \
python-pytest \
diff --git
a/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
new file mode 100644
index 0..02e821563
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pytest-tempdir_2016.8.20.bb
@@ -0,0 +1,7 @@
+require python-pytest-tempdir.inc
+
+inherit setuptools3
+
+RDEPENDS_${PN} += " \
+python3-pytest \
+"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 3/4] python-pytest-helpers-namespace: add recipe
From: Sergey Kizunov
This plugin does not provide any helpers to pytest, it does, however,
provide a helpers namespace in pytest which enables you to register
helper functions in your conftest.py to be used within your tests
without having to import them.
Signed-off-by: Sergey Kizunov
---
.../python-pytest-helpers-namespace_2016.7.10.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644
meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
diff --git
a/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
new file mode 100644
index 0..afca48702
--- /dev/null
+++
b/meta-python/recipes-devtools/python/python-pytest-helpers-namespace_2016.7.10.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "This plugin does not provide any helpers to pytest, it does,
however, provide a helpers namespace in pytest which enables you to register
helper functions in your conftest.py to be used within your tests without
having to import them."
+HOMEPAGE = "https://github.com/saltstack/pytest-helpers-namespace";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=71fac4dfeee99c39c51f617e9486237c"
+
+SRC_URI[md5sum] = "80fe3e515f640b1459709b539f6b857e"
+SRC_URI[sha256sum] =
"d8bdb017c0f7271699c08850b6b12e1ce9e52913cbd4461b5febd21082a29113"
+
+inherit pypi setuptools
+
+RDEPENDS_${PN} += " \
+python-pytest \
+"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 1/4] python-pytest-tempdir: add recipe
From: Sergey Kizunov
Adds support for a predictable and repeatable temporary directory.
Signed-off-by: Sergey Kizunov
---
.../python/python-pytest-tempdir_2016.8.20.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644
meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
diff --git
a/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
b/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
new file mode 100644
index 0..74030dcf5
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pytest-tempdir_2016.8.20.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Adds support for a predictable and repeatable temporary
directory."
+HOMEPAGE = "https://github.com/saltstack/pytest-tempdir";
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=8751a9cf4a70be4f02697a9b89e686ce"
+
+SRC_URI[md5sum] = "f87f2583f5f8aaca7203d57ada3948b5"
+SRC_URI[sha256sum] =
"65ff815966ea6dfc07ca1b43747c9888a6d883971170e67b16290f9f50d434ea"
+
+inherit pypi setuptools
+
+RDEPENDS_${PN} += " \
+python-pytest \
+"
--
2.18.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
