Re: [oe] [PATCH] rocksdb: Fix compile error for DEBUG_BUILD
On Wed, Jan 8, 2020 at 11:15 PM Robert Yang wrote: > > > > On 1/8/20 5:27 PM, Adrian Bunk wrote: > > On Wed, Jan 08, 2020 at 02:09:03PM +0800, Robert Yang wrote: > >> Fixed do_compile error when DEBUG_BUILD = "1": > >> db/write_thread.cc:183:14: error: 'state' may be used uninitialized in > >> this function [-Werror=maybe-uninitialized] > >> ... > > > > -Og warnings are not 100% reliable, and in general -Werror is > > problematic for distributions. > > > > Does building with -DFAIL_ON_WARNINGS=OFF fix this problem? > I think this should be used when we have warnings which we have no easy control over and no good fixes. > Yes, it works. > > I think that the correct way to fix it is initialize it rather than ignore the > error. Thats fine, Also submit this patch to rocksdb upstream as well. > > // Robert > > > > > cu > > Adrian > > > -- > ___ > 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] [PATCH] rocksdb: Fix compile error for DEBUG_BUILD
On 1/8/20 5:27 PM, Adrian Bunk wrote: On Wed, Jan 08, 2020 at 02:09:03PM +0800, Robert Yang wrote: Fixed do_compile error when DEBUG_BUILD = "1": db/write_thread.cc:183:14: error: 'state' may be used uninitialized in this function [-Werror=maybe-uninitialized] ... -Og warnings are not 100% reliable, and in general -Werror is problematic for distributions. Does building with -DFAIL_ON_WARNINGS=OFF fix this problem? Yes, it works. I think that the correct way to fix it is initialize it rather than ignore the error. // Robert cu Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH] adduser: set default shell with /sbin/nologin
From: Kai Kang
Shell nologin whether provided by shadow or util-linux is installed to
/sbin/nologin in oe-core. But the default shell of adduser is
/usr/sbin/nologin and will fail to create a new user.
Set the default shell with /sbin/nologin to fix the issue.
Signed-off-by: Kai Kang
---
.../recipes-perl/adduser/adduser_3.118.bb | 1 +
...-set-default-shell-with-sbin-nologin.patch | 34 +++
2 files changed, 35 insertions(+)
create mode 100644
meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch
diff --git a/meta-perl/recipes-perl/adduser/adduser_3.118.bb
b/meta-perl/recipes-perl/adduser/adduser_3.118.bb
index e695c5894..80cf14286 100644
--- a/meta-perl/recipes-perl/adduser/adduser_3.118.bb
+++ b/meta-perl/recipes-perl/adduser/adduser_3.118.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM =
"file://debian/copyright;md5=caed49ab166f22ef31bf1127f558d0ef
SRC_URI =
"https://launchpad.net/debian/+archive/primary/+sourcefiles/adduser/${PV}/${BPN}_${PV}.tar.xz
\
file://adduser-add-M-option-for-useradd.patch \
+ file://0001-adduser-set-default-shell-with-sbin-nologin.patch \
"
SRC_URI[md5sum] = "44ba2475ebdaafc9613236bdda321c97"
diff --git
a/meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch
b/meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch
new file mode 100644
index 0..91cc6bcba
--- /dev/null
+++
b/meta-perl/recipes-perl/adduser/files/0001-adduser-set-default-shell-with-sbin-nologin.patch
@@ -0,0 +1,34 @@
+From 75e949bf80bf5e3e5bd8f81b258095e662b705c4 Mon Sep 17 00:00:00 2001
+From: Kai Kang
+Date: Thu, 9 Jan 2020 13:51:28 +0800
+Subject: [PATCH] adduser: set default shell with /sbin/nologin
+
+Shell nologin whether provided by shadow or util-linux is installed to
+/sbin/nologin in oe-core. But the default shell of adduser is
+/usr/sbin/nologin and will fail to create a new user.
+
+Set the default shell with /sbin/nologin to fix the issue.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Kai Kang
+---
+ adduser | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/adduser b/adduser
+index 0f24cc9..ab554d0 100755
+--- a/adduser
b/adduser
+@@ -431,7 +431,7 @@ if ($action eq "addsysuser") {
+ printf gtx("Adding new user `%s' (UID %d) with group `%s'
...\n"),$new_name,$new_uid,$ingroup_name
+ if $verbose;
+ $home_dir = $special_home || ($new_name, $ingroup_name);
+-$shell = $special_shell || '/usr/sbin/nologin';
++$shell = $special_shell || '/sbin/nologin';
+ $undouser = $new_name;
+ my $useradd = ('useradd');
+ ($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s',
+--
+2.17.1
+
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/5] cmpi-bindings: Remove the patch to append 'm' suffix to libpython soname
This otherwise fails to build with py3.8
Signed-off-by: Khem Raj
Cc: Alexander Kanavin
---
...BI-suffix-to-the-python-library-name.patch | 27 ---
.../cmpi-bindings/cmpi-bindings_1.0.1.bb | 1 -
2 files changed, 28 deletions(-)
delete mode 100644
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
diff --git
a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
deleted file mode 100644
index b2a149b0f4..00
---
a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Mon, 16 May 2016 16:52:24 +0300
-Subject: [PATCH] Add 'm' suffix to the python library name.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin
- swig/python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
-index 128798b..391cef7 100644
a/swig/python/CMakeLists.txt
-+++ b/swig/python/CMakeLists.txt
-@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GENERIC_GNU
-DCMPI_VERSION=200)
- SET( NAME pyCmpiProvider )
- ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT})
- #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} )
--TARGET_LINK_LIBRARIES( ${NAME}
python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} )
-+TARGET_LINK_LIBRARIES( ${NAME}
python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}m )
- TARGET_LINK_LIBRARIES( ${NAME} pthread )
- TARGET_LINK_LIBRARIES( ${NAME} dl )
- TARGET_LINK_LIBRARIES( ${NAME} util )
---
-2.8.1
-
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
index 251c5d0f5a..6e387ae453 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
@@ -13,7 +13,6 @@ SRC_URI =
"git://github.com/kkaempf/cmpi-bindings.git;protocol=http \
file://0001-Modify-cmakelist.patch \
file://0001-Fix-error.patch \
file://0001-fix-the-build-error-when-python-3.0.patch \
- file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \
"
SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e"
--
2.24.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-filesystems][PATCH 4/5] smbnetfs: Update to latest 0.6.2 rev
Brings in fixes to build with latest xattr
Forward port configure.ac patch
Drop using gitpkgv
Signed-off-by: Khem Raj
Cc: Alexander Kanavin
---
.../smbnetfs/smbnetfs/configure.patch| 8 +++-
.../recipes-filesystems/smbnetfs/smbnetfs_git.bb | 9 -
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
index 55275669b1..f22b389b1c 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
@@ -1,9 +1,7 @@
-Index: git/configure.in
-===
git.orig/configure.ac 2014-06-18 16:06:16.040721349 +
-+++ git/configure.ac 2014-07-18 07:49:17.085552256 +
+--- a/configure.ac
b/configure.ac
@@ -1,5 +1,5 @@
- AC_INIT([SMBNetFS],[0.6.1])
+ AC_INIT([SMBNetFS],[0.6.2])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_HEADERS([src/config.h])
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
index ddb2cc805f..d94603b404 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
@@ -11,15 +11,14 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs;
DEPENDS = "fuse samba"
DEPENDS_append_libc-musl = " libexecinfo"
+inherit autotools pkgconfig features_check
+
# samba depends on libpam
-inherit features_check
REQUIRED_DISTRO_FEATURES = "pam"
-inherit autotools gitpkgv pkgconfig
-
-PKGV = "${GITPKGVTAG}"
+PV = "0.6.1+git${SRCPV}"
-SRCREV = "bc6b94b015fdaf7c4dab56ccb996eecea8bc4373"
+SRCREV = "a117eec8de7ed7249871da73dcc350283ce72069"
SRC_URI =
"git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \
file://configure.patch \
--
2.24.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/5] add sqlite-orm v1.5
From: hmenn
Signed-off-by: Khem Raj
---
.../sqlite-orm/sqlite-orm_1.5.bb | 22 +++
1 file changed, 22 insertions(+)
create mode 100644 meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
diff --git a/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
new file mode 100644
index 00..4a27e4b2a5
--- /dev/null
+++ b/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb
@@ -0,0 +1,22 @@
+SUMMARY = "SQLite ORM light header only library for modern C++"
+HOMEPAGE = "https://github.com/fnc12/sqlite_orm;
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5bf5ee8bb16d8e19359efe11bdc3f2"
+
+inherit cmake
+
+DEPENDS += "sqlite3"
+
+SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b"
+SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF"
+
+BBCLASSEXTEND = "native nativesdk"
+
+FILES_${PN}-dev += "${libdir}/cmake/${BPN}"
+
+# Header-only library
+RDEPENDS_${PN}-dev = ""
+RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
\ No newline at end of file
--
2.24.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH 3/5] python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version
Signed-off-by: Khem Raj
Cc: Alexander Kanavin
---
.../recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
index ceae6abd8c..a6dcef81de 100644
--- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_4.1.0.bb
@@ -23,5 +23,5 @@ RDEPENDS_${PN} += "\
BBCLASSEXTEND = "native nativesdk"
do_install_append() {
-chmod 0644
${D}${PYTHON_SITEPACKAGES_DIR}/jsonrpcserver-4.1.0-py3.7.egg-info/*
+chmod 0644
${D}${PYTHON_SITEPACKAGES_DIR}/jsonrpcserver-4.1.0-py${PYTHON_BASEVERSION}.egg-info/*
}
--
2.24.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/5] makedumpfile: Drop linking with libebl
This seems to be not needed as link succeeds without this library,
moreover this is static-only library in latest elfutils
Signed-off-by: Khem Raj
Cc: Alexander Kanavin
---
...ebl-from-required-libraries-during-l.patch | 34 +++
.../makedumpfile/makedumpfile_1.6.6.bb| 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch
diff --git
a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch
b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch
new file mode 100644
index 00..40956434de
--- /dev/null
+++
b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0003-build-Delete-libebl-from-required-libraries-during-l.patch
@@ -0,0 +1,34 @@
+From 460851c15e807d1a2515dfb985423f8a6624f4aa Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Wed, 8 Jan 2020 19:14:19 -0800
+Subject: [PATCH 3/3] build: Delete libebl from required libraries during link
+
+This is a static library from elfutils, which is not made available when
+static archives are disabled, this can result in link failures e.g.
+
+aarch64-yoe-linux-musl/9.2.0/ld: cannot find -lebl
+collect2: error: ld returned 1 exit status
+Makefile:93: recipe for target 'makedumpfile' failed
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 5dce589..c3a4054 100644
+--- a/Makefile
b/Makefile
+@@ -51,7 +51,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
+ SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c
arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c
+ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
+
+-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
++LIBS = -ldw -lbz2 -ldl -lelf -lz
+ ifneq ($(LINKTYPE), dynamic)
+ LIBS := $(LIBS)
+ endif
+--
+2.24.1
+
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb
b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb
index 9c357bf6e6..6924e39d60 100644
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb
+++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.6.bb
@@ -24,6 +24,7 @@ SRC_URI = "\
${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \
file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \
+file://0003-build-Delete-libebl-from-required-libraries-during-l.patch \
"
SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064"
SRC_URI[sha256sum] =
"d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324"
--
2.24.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
On Wed, Jan 8, 2020 at 9:11 AM Gianfranco Costamagna
wrote:
>
> - build failure with boost 1.71
> - bad installation of header files correct version on some OSes.
> - fix version minor number
>
> Signed-off-by: Gianfranco Costamagna
> Signed-off-by: Gianfranco Costamagna
> ---
> .../websocketpp/websocketpp-0.8.1/771.patch | 22 ++
> .../websocketpp/websocketpp-0.8.1/842.patch | 30 +++
> .../websocketpp/websocketpp-0.8.1/855.patch | 23 ++
> .../websocketpp/websocketpp_0.8.1.bb | 5
> 4 files changed, 80 insertions(+)
> create mode 100644
> meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> create mode 100644
> meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> create mode 100644
> meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
>
> diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> new file mode 100644
> index 0..bc65efb7d
> --- /dev/null
> +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
> @@ -0,0 +1,22 @@
> +From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?=
> +Date: Thu, 1 Nov 2018 20:58:10 +0100
> +Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1
> +
> +---
> + CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 2786aba9..2d13117b 100644
> +--- a/CMakeLists.txt
> b/CMakeLists.txt
> +@@ -24,7 +24,7 @@ endif ()
> + Project name and version
> + set (WEBSOCKETPP_MAJOR_VERSION 0)
> + set (WEBSOCKETPP_MINOR_VERSION 8)
> +-set (WEBSOCKETPP_PATCH_VERSION 0)
> ++set (WEBSOCKETPP_PATCH_VERSION 1)
> + set (WEBSOCKETPP_VERSION
> ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
> +
> + if(POLICY CMP0048)
> diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> new file mode 100644
> index 0..c3651e94a
> --- /dev/null
> +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
> @@ -0,0 +1,30 @@
> +From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001
> +From: Schrijvers Luc
> +Date: Wed, 18 Sep 2019 11:35:43 +0200
> +Subject: [PATCH] Fix "include" directory installation. the variable
> + INSTALL_INCLUDE_DIR already exists, and defaults to include if not
> + specificied otherwise. Using it allows people to customize the installation
> + from outside, fixing issues with other OS like Haiku
> +
> +Signed-off-by: Gianfranco Costamagna
> +Signed-off-by: Gianfranco Costamagna
> +---
> + cmake/CMakeHelpers.cmake | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
> +index 1478f4b..f603632 100644
> +--- a/cmake/CMakeHelpers.cmake
> b/cmake/CMakeHelpers.cmake
> +@@ -80,7 +80,7 @@ macro (final_target)
> + endif ()
> +
> + install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
> +- DESTINATION include/
> ++ DESTINATION ${INSTALL_INCLUDE_DIR}/
> + FILES_MATCHING PATTERN "*.hpp*")
> + endmacro ()
> +
> +--
> +2.17.1
> +
> diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> new file mode 100644
> index 0..e44a21c9f
> --- /dev/null
> +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
> @@ -0,0 +1,23 @@
> +From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
> +From: Gianfranco Costamagna
> +Date: Wed, 8 Jan 2020 17:59:48 +0100
> +Subject: [PATCH] Fix cmake find boost with version >= 1.71
> +
> +For some reasons "system;thread;random;unit_test_framework" was seen as a
> single module, because of the quotes.
> +---
> + CMakeLists.txt | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 2d13117b..9a46bc10 100644
> +--- a/CMakeLists.txt
> b/CMakeLists.txt
> +@@ -211,7 +211,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
> + set (Boost_USE_MULTITHREADED TRUE)
> + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0"
> "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
> +
> +-find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
> ++find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
> +
> + if (Boost_FOUND)
> + # Boost is a project wide global dependency.
> diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
> b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
> index 05f14d2f4..ba3b5a1b0 100644
> --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
> +++
[oe] [meta-oe][PATCH] websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
- build failure with boost 1.71
- bad installation of header files correct version on some OSes.
- fix version minor number
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../websocketpp/websocketpp-0.8.1/771.patch | 22 ++
.../websocketpp/websocketpp-0.8.1/842.patch | 30 +++
.../websocketpp/websocketpp-0.8.1/855.patch | 23 ++
.../websocketpp/websocketpp_0.8.1.bb | 5
4 files changed, 80 insertions(+)
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
create mode 100644
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
new file mode 100644
index 0..bc65efb7d
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/771.patch
@@ -0,0 +1,22 @@
+From 4bccfb04a264704ec9b80ba332ee1cf113ce7f1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?=
+Date: Thu, 1 Nov 2018 20:58:10 +0100
+Subject: [PATCH] Update version number in CMakeLists.txt to 0.8.1
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2786aba9..2d13117b 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif ()
+ Project name and version
+ set (WEBSOCKETPP_MAJOR_VERSION 0)
+ set (WEBSOCKETPP_MINOR_VERSION 8)
+-set (WEBSOCKETPP_PATCH_VERSION 0)
++set (WEBSOCKETPP_PATCH_VERSION 1)
+ set (WEBSOCKETPP_VERSION
${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
+
+ if(POLICY CMP0048)
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
new file mode 100644
index 0..c3651e94a
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/842.patch
@@ -0,0 +1,30 @@
+From 7f7e2be01b4fa6580ce27f668e61adf37853ad67 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc
+Date: Wed, 18 Sep 2019 11:35:43 +0200
+Subject: [PATCH] Fix "include" directory installation. the variable
+ INSTALL_INCLUDE_DIR already exists, and defaults to include if not
+ specificied otherwise. Using it allows people to customize the installation
+ from outside, fixing issues with other OS like Haiku
+
+Signed-off-by: Gianfranco Costamagna
+Signed-off-by: Gianfranco Costamagna
+---
+ cmake/CMakeHelpers.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/CMakeHelpers.cmake b/cmake/CMakeHelpers.cmake
+index 1478f4b..f603632 100644
+--- a/cmake/CMakeHelpers.cmake
b/cmake/CMakeHelpers.cmake
+@@ -80,7 +80,7 @@ macro (final_target)
+ endif ()
+
+ install (DIRECTORY ${CMAKE_SOURCE_DIR}/${TARGET_NAME}
+- DESTINATION include/
++ DESTINATION ${INSTALL_INCLUDE_DIR}/
+ FILES_MATCHING PATTERN "*.hpp*")
+ endmacro ()
+
+--
+2.17.1
+
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
new file mode 100644
index 0..e44a21c9f
--- /dev/null
+++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/855.patch
@@ -0,0 +1,23 @@
+From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Wed, 8 Jan 2020 17:59:48 +0100
+Subject: [PATCH] Fix cmake find boost with version >= 1.71
+
+For some reasons "system;thread;random;unit_test_framework" was seen as a
single module, because of the quotes.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d13117b..9a46bc10 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -211,7 +211,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
+ set (Boost_USE_MULTITHREADED TRUE)
+ set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0"
"1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+
+-find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
++find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS})
+
+ if (Boost_FOUND)
+ # Boost is a project wide global dependency.
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
index 05f14d2f4..ba3b5a1b0 100644
--- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
+++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb
@@ -9,8 +9,13 @@ SRC_URI =
"git://github.com/zaphoyd/websocketpp.git;protocol=https \
file://0001-Replace-make_shared-with-new-in-some-cases.patch \
file://0002-Fix-missed-entries-fix-testing.patch \
file://0001-cmake-Use-GNUInstallDirs.patch \
Re: [oe] [meta-oe][PATCH] vboxguestdrivers: update to version 6.0.14 and unblacklist
Hello, I'm submitting a revised patch that now seems to build fine.
thanks for the review!
Gianfranco
Il giorno mer 11 dic 2019 alle ore 05:20 Khem Raj ha
scritto:
> On Tue, Dec 10, 2019 at 2:54 PM Khem Raj wrote:
> >
> > Fails with clang http://errors.yoctoproject.org/Errors/Details/296908/
> > I guess it needs to use KERNEL_AR
> >
>
> It really is generic issue fails with gcc too
> http://errors.yoctoproject.org/Errors/Details/296946/
>
>
> > On Tue, Dec 10, 2019 at 1:39 AM Gianfranco Costamagna
> > wrote:
> > >
> > > ---
> > > ...oxguestdrivers_5.2.22.bb => vboxguestdrivers_6.0.14.bb} | 7
> ++-
> > > 1 file changed, 2 insertions(+), 5 deletions(-)
> > > rename meta-oe/recipes-support/vboxguestdrivers/{
> vboxguestdrivers_5.2.22.bb => vboxguestdrivers_6.0.14.bb} (92%)
> > >
> > > diff --git a/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_5.2.22.bb b/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_6.0.14.bb
> > > similarity index 92%
> > > rename from meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_5.2.22.bb
> > > rename to meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_6.0.14.bb
> > > index 0f8d7af3f..bd7339e1a 100644
> > > --- a/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_5.2.22.bb
> > > +++ b/meta-oe/recipes-support/vboxguestdrivers/
> vboxguestdrivers_6.0.14.bb
> > > @@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}"
> > > SRC_URI = "
> http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
> > > file://Makefile.utils \
> > > "
> > > -SRC_URI[md5sum] = "c9c2f162ac5f99d28d8c0ca43b19ed01"
> > > -SRC_URI[sha256sum] =
> "5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4"
> > > +SRC_URI[md5sum] = "2766d6f628dcd8f0bc216d0f8a2abc8e"
> > > +SRC_URI[sha256sum] =
> "5e12b14f0c38bf195d9592d76a9e0a128df2d38cd77c26ce5b5488397715dd0c"
> > >
> > > S = "${WORKDIR}/vbox_module"
> > >
> > > @@ -78,6 +78,3 @@ FILES_${PN} = "${base_sbindir}"
> > >
> > > # autoload if installed
> > > KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo"
> > > -
> > > -PNBLACKLIST[vboxguestdrivers] = "Needs forward porting to kernel 5.2+"
> > > -
> > > --
> > > 2.17.1
> > >
> > > --
> > > ___
> > > 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] vboxguestdrivers: update to version 6.1.0 and unblacklist
From: Gianfranco Costamagna
- Change oe_runmake call because the yocto one exposes AR/O and other
variables, not understood by KBUILD makefile.
- Add KBUILD_VERBOSE to add some build verbosity
- Add upstream patch to fix export of the module tarball.
Signed-off-by: Gianfranco Costamagna
Signed-off-by: Gianfranco Costamagna
---
.../vboxguestdrivers/export.patch | 77 +++
...rs_5.2.22.bb => vboxguestdrivers_6.1.0.bb} | 15 ++--
2 files changed, 84 insertions(+), 8 deletions(-)
create mode 100644
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch
rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.2.22.bb =>
vboxguestdrivers_6.1.0.bb} (87%)
diff --git
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch
new file mode 100644
index 0..bfba3332b
--- /dev/null
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/export.patch
@@ -0,0 +1,77 @@
+Index: src/VBox/Additions/linux/export_modules.sh
+===
+--- a/src/VBox/Additions/linux/export_modules.sh
b/src/VBox/Additions/linux/export_modules.sh
+@@ -46,7 +46,13 @@
+ VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d"
$PATH_ROOT/Version.kmk`
+ VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d"
$PATH_ROOT/Version.kmk`
+ VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d"
$PATH_ROOT/Version.kmk`
+-VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,,
*\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
++VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:=
\+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d'
$PATH_ROOT/Config.kmk`
++VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:=
\+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d'
$PATH_ROOT/Version.kmk`
++if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
++VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
++else
++VBOX_SVN_REV=$VBOX_SVN_VERSION_REV
++fi
+ VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
+ VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
+ VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
+Index: src/VBox/HostDrivers/linux/export_modules.sh
+===
+--- a/src/VBox/HostDrivers/linux/export_modules.sh
b/src/VBox/HostDrivers/linux/export_modules.sh
+@@ -100,12 +100,26 @@
+ VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d"
$PATH_ROOT/Version.kmk`
+ VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d"
$PATH_ROOT/Version.kmk`
+
VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
+-VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,,
*\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk` VBOX_PRODUCT=`sed -e 's/^
*VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
VBOX_C_YEAR=`date +%Y`
++VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d"
$PATH_ROOT/Version.kmk`
++VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:=
\+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d'
$PATH_ROOT/Config.kmk`
++VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:=
\+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d'
$PATH_ROOT/Version.kmk`
++if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
++VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
++else
++VBOX_SVN_REV=$VBOX_SVN_VERSION_REV
++fi
++VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
++VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
++VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d'
$PATH_ROOT/Config.kmk`
++VBOX_C_YEAR=`date +%Y`
++VBOX_WITH_PCI_PASSTHROUGH=`sed -e "s/^ *VBOX_WITH_PCI_PASSTHROUGH *=
*\(1\?\)/\1/;t;d" $PATH_ROOT/Config.kmk`
+
+ . $PATH_VBOXDRV/linux/files_vboxdrv
+ . $PATH_VBOXNET/linux/files_vboxnetflt
+ . $PATH_VBOXADP/linux/files_vboxnetadp
+-. $PATH_VBOXPCI/linux/files_vboxpci
++if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then
++. $PATH_VBOXPCI/linux/files_vboxpci
++fi
+
+ # Temporary path for creating the modules, will be removed later
+ rm -rf "$PATH_TMP"
+@@ -187,14 +201,16 @@
+
[oe] [meta-oe][PATCH] msgpack-c: upgrade 3.1.1 -> 3.2.1
Signed-off-by: Wang Mingyu
---
.../msgpack/{msgpack-c_3.1.1.bb => msgpack-c_3.2.1.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/msgpack/{msgpack-c_3.1.1.bb =>
msgpack-c_3.2.1.bb} (90%)
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb
b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb
similarity index 90%
rename from meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb
rename to meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb
index 90fd44e60..d410dc6e0 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb
@@ -11,8 +11,8 @@ PV .= "+git${SRCPV}"
SRC_URI = "git://github.com/msgpack/msgpack-c \
"
-# cpp-3.1.1
-SRCREV = "83a82e3eb512b18d4149cabb7eb43c7e8bc081af"
+# cpp-3.2.1
+SRCREV = "8085ab8721090a447cf98bb802d1406ad7afe420"
S = "${WORKDIR}/git"
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] cscope: upgrade 15.8b -> 15.9
Signed-off-by: Wang Mingyu
---
.../cscope/{cscope_15.8b.bb => cscope_15.9.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-devtools/cscope/{cscope_15.8b.bb => cscope_15.9.bb}
(83%)
diff --git a/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb
b/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
similarity index 83%
rename from meta-oe/recipes-devtools/cscope/cscope_15.8b.bb
rename to meta-oe/recipes-devtools/cscope/cscope_15.9.bb
index 199c31e15..99f3ba85d 100644
--- a/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb
+++ b/meta-oe/recipes-devtools/cscope/cscope_15.9.bb
@@ -18,7 +18,7 @@ inherit autotools
DEPENDS += "ncurses"
-SRC_URI =
"http://downloads.sourceforge.net/project/cscope/cscope/${PV}/${BP}.tar.gz;
+SRC_URI =
"http://downloads.sourceforge.net/project/cscope/cscope/v${PV}/${BP}.tar.gz;
-SRC_URI[md5sum] = "8f9409a238ee313a96f9f87fe0f3b176"
-SRC_URI[sha256sum] =
"4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af"
+SRC_URI[md5sum] = "16f3cce078b6c0e42299def4028eea6f"
+SRC_URI[sha256sum] =
"c5505ae075a871a9cd8d9801859b0ff1c09782075df281c72c23e72115d9f159"
--
2.17.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] rocksdb: Fix compile error for DEBUG_BUILD
On Wed, Jan 08, 2020 at 02:09:03PM +0800, Robert Yang wrote: > Fixed do_compile error when DEBUG_BUILD = "1": > db/write_thread.cc:183:14: error: 'state' may be used uninitialized in this > function [-Werror=maybe-uninitialized] >... -Og warnings are not 100% reliable, and in general -Werror is problematic for distributions. Does building with -DFAIL_ON_WARNINGS=OFF fix this problem? cu Adrian -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4
Khem, I got the subject line wrong originally - not sure if it's too late already... Cheers, Andre' On Wed, 2020-01-08 at 08:55 +, André Draszik wrote: > The version meta-oe is carrying is more than 4 years old, > from 2015, with numerous CVEs fixed and more than 2000 > commits since. > > The license checksum changed because it contains the > year (which is at 2019 now). > > Onigurama can now also be built using CMake, but for > now this recipe stays with using autotools as only > autotools builds support testing (which the next > patch adds support for). > > Signed-off-by: André Draszik > > --- > v2: > * fix typo in subject line > * fix SUMMARY > --- > .../onig/files/configure.patch| 13 -- > .../files/do-not-use-system-headers.patch | 44 --- > ...t-link-against-host-system-libraries.patch | 42 ++ > meta-oe/recipes-support/onig/onig_5.9.6.bb| 19 > meta-oe/recipes-support/onig/onig_6.9.4.bb| 22 ++ > 5 files changed, 64 insertions(+), 76 deletions(-) > delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch > delete mode 100644 > meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch > create mode 100644 > meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb > create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb > > diff --git a/meta-oe/recipes-support/onig/files/configure.patch > b/meta-oe/recipes-support/onig/files/configure.patch > deleted file mode 100644 > index 5fa700f19..0 > --- a/meta-oe/recipes-support/onig/files/configure.patch > +++ /dev/null > @@ -1,13 +0,0 @@ > -Index: onig-5.9.3/configure.in > -=== > onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.0 + > -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 + > -@@ -3,7 +3,7 @@ > - > - AC_CONFIG_MACRO_DIR([m4]) > - > --AM_INIT_AUTOMAKE > -+AM_INIT_AUTOMAKE([foreign]) > - AC_CONFIG_HEADER(config.h) > - > - > diff --git > a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch > b/meta-oe/recipes- > support/onig/files/do-not-use-system-headers.patch > deleted file mode 100644 > index b93602a26..0 > --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -Author: Marcin Juszkiewicz > - > -When build on host with older eglibc (Ubuntu 12.04) build fails with: > - > -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: > error: #error "Never use > directly; include instead." > - > -Signed-off-by: Marcin Juszkiewicz > - > -Upstream-Status: Inappropriate [embedded specific] > - > > - Makefile.am|2 +- > - sample/Makefile.am |2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > onig-5.9.3.orig/Makefile.am > -+++ onig-5.9.3/Makefile.am > -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample > - libname = libonig.la > - > - ACLOCAL_AMFLAGS = -I m4 > - #AM_CFLAGS = -DNOT_RUBY > - AM_CFLAGS = > --INCLUDES = -I$(top_srcdir) -I$(includedir) > -+INCLUDES = -I$(top_srcdir) > - > - SUBDIRS = . sample > - > - include_HEADERS = oniguruma.h oniggnu.h onigposix.h > - lib_LTLIBRARIES = $(libname) > onig-5.9.3.orig/sample/Makefile.am > -+++ onig-5.9.3/sample/Makefile.am > -@@ -1,10 +1,10 @@ > - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl > - > - libname = $(top_builddir)/libonig.la > - LDADD = $(libname) > --INCLUDES = -I$(top_srcdir) -I$(includedir) > -+INCLUDES = -I$(top_srcdir) > - > - encode_SOURCES = encode.c > - listcap_SOURCES = listcap.c > - names_SOURCES = names.c > - posix_SOURCES = posix.c > diff --git > a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > b/meta- > oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > new file mode 100644 > index 0..891592650 > --- /dev/null > +++ > b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch > @@ -0,0 +1,42 @@ > +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= > +Date: Mon, 6 Jan 2020 16:56:31 + > +Subject: [PATCH] build: don't link against (host) system libraries > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Upstream-Status: Inappropriate [OE specific] > +Signed-off-by: André Draszik > +--- > + sample/Makefile.am | 1 - > + test/Makefile.am | 1 - > + 2 files changed, 2 deletions(-) > + > +diff --git a/sample/Makefile.am b/sample/Makefile.am > +index 22a4989..e935bf0 100644 > +--- a/sample/Makefile.am > b/sample/Makefile.am > +@@ -3,7 +3,6 @@ > + lib_onig = ../src/libonig.la > + LDADD = $(lib_onig) > + > +-AM_LDFLAGS =
Re: [oe] [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
Khem,
I got the subject line wrong originally - not sure how that works with
patchwork.
Can you still pick this up please?
Cheers,
Andre'
On Wed, 2020-01-08 at 08:56 +, André Draszik wrote:
> All tests (with 3400 subtests) are passing (on musl+arm).
>
> Signed-off-by: André Draszik
>
> ---
> v3:
> * fix subject line
>
> v2:
> * remove useless line in run-ptest
> * update commit message
> ---
> ...rial-tests-automake-option-for-ptest.patch | 36 ++
> meta-oe/recipes-support/onig/onig/run-ptest | 47 +++
> meta-oe/recipes-support/onig/onig_6.9.4.bb| 12 -
> 3 files changed, 94 insertions(+), 1 deletion(-)
> create mode 100644
> meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
>
> diff --git
> a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> b/meta-
> oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> new file mode 100644
> index 0..587e5ac1b
> --- /dev/null
> +++
> b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
> @@ -0,0 +1,36 @@
> +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
> +Date: Mon, 6 Jan 2020 15:10:30 +
> +Subject: [PATCH] build: enable serial-tests automake option (for ptest)
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +For ptest, we need to be able to compile the tests without
> +running them.
> +
> +Enabling the serial-tests automake option will add
> +buildtest-TESTS and runtest-TESTS makefile targets, the
> +former being what we want.
> +
> +Signed-off-by: André Draszik
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index ac51e85..48e63ce 100644
> +--- a/configure.ac
> b/configure.ac
> +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
> +
> + AC_CONFIG_MACRO_DIR([m4])
> +
> +-AM_INIT_AUTOMAKE([-Wno-portability])
> ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
> + AC_CONFIG_HEADERS([src/config.h])
> +
> +
> +--
> +2.23.0.rc1
> +
> diff --git a/meta-oe/recipes-support/onig/onig/run-ptest
> b/meta-oe/recipes-support/onig/onig/run-ptest
> new file mode 100755
> index 0..2574d7efa
> --- /dev/null
> +++ b/meta-oe/recipes-support/onig/onig/run-ptest
> @@ -0,0 +1,47 @@
> +#!/bin/sh -eu
> +
> +my_cleanup() {
> +[ -n "${workdir:-}" ] && rm -rf "${workdir}"
> +}
> +
> +trap "my_cleanup" EXIT
> +for sig in INT TERM ; do
> +# We want sig to expand right here and now, as it's
> +# a loop variable, not when signalled. For $$ it
> +# doesn't matter.
> +# shellcheck disable=SC2064
> +trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$"
> ${sig}
> +done
> +
> +workdir=$(mktemp -d -t onig.ptest.XX)
> +status="${workdir}/failed"
> +touch "${status}"
> +
> +find tests/ -perm -111 -type f -exec sh -c '
> +workdir="${1}"
> +status="${2}"
> +t="${3}"
> +t_log="${workdir}/$(basename ${t}).log"
> +
> +res=0
> +./${t} > "${t_log}" 2>&1 \
> +|| res=$?
> +if [ $res -eq 0 ] ; then
> +echo "PASS: ${t}"
> +else
> +echo "FAIL: ${t}"
> +echo "$(basename ${t}): ${t_log}" >> "${status}"
> +fi
> +' _ "${workdir}" "${status}" {} \;
> +
> +if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
> +exec >&2
> +while IFS=': ' read -r t t_log ; do
> +printf "\n=\n"
> +printf "ERROR: %s:\n" "${t}"
> +printf -- "-\n"
> +cat "${t_log}"
> +done < "${status}"
> +fi
> +
> +[ $(stat -c '%s' "${status}") -eq 0 ]
> diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
> b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> index d873088fe..cfa86f04c 100644
> --- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
> +++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
> SRC_URI = "\
> https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \
> file://0001-build-don-t-link-against-host-system-libraries.patch \
> +file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \
> +file://run-ptest \
> "
>
> SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
> @@ -17,6 +19,14 @@ SRC_URI[sha256sum] =
> "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
>
> BINCONFIG = "${bindir}/onig-config"
>
> -inherit autotools binconfig-disabled
> +inherit autotools binconfig-disabled ptest
>
> BBCLASSEXTEND = "native"
> +
> +do_compile_ptest() {
> +oe_runmake -C test buildtest-TESTS
> +}
> +
> +do_install_ptest() {
> +install -Dm0755 -t ${D}${PTEST_PATH}/tests/
[oe] [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
All tests (with 3400 subtests) are passing (on musl+arm).
Signed-off-by: André Draszik
---
v3:
* fix subject line
v2:
* remove useless line in run-ptest
* update commit message
---
...rial-tests-automake-option-for-ptest.patch | 36 ++
meta-oe/recipes-support/onig/onig/run-ptest | 47 +++
meta-oe/recipes-support/onig/onig_6.9.4.bb| 12 -
3 files changed, 94 insertions(+), 1 deletion(-)
create mode 100644
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
diff --git
a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
new file mode 100644
index 0..587e5ac1b
--- /dev/null
+++
b/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch
@@ -0,0 +1,36 @@
+From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?=
+Date: Mon, 6 Jan 2020 15:10:30 +
+Subject: [PATCH] build: enable serial-tests automake option (for ptest)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For ptest, we need to be able to compile the tests without
+running them.
+
+Enabling the serial-tests automake option will add
+buildtest-TESTS and runtest-TESTS makefile targets, the
+former being what we want.
+
+Signed-off-by: André Draszik
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ac51e85..48e63ce 100644
+--- a/configure.ac
b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4)
+
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability serial-tests])
+ AC_CONFIG_HEADERS([src/config.h])
+
+
+--
+2.23.0.rc1
+
diff --git a/meta-oe/recipes-support/onig/onig/run-ptest
b/meta-oe/recipes-support/onig/onig/run-ptest
new file mode 100755
index 0..2574d7efa
--- /dev/null
+++ b/meta-oe/recipes-support/onig/onig/run-ptest
@@ -0,0 +1,47 @@
+#!/bin/sh -eu
+
+my_cleanup() {
+[ -n "${workdir:-}" ] && rm -rf "${workdir}"
+}
+
+trap "my_cleanup" EXIT
+for sig in INT TERM ; do
+# We want sig to expand right here and now, as it's
+# a loop variable, not when signalled. For $$ it
+# doesn't matter.
+# shellcheck disable=SC2064
+trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig}
+done
+
+workdir=$(mktemp -d -t onig.ptest.XX)
+status="${workdir}/failed"
+touch "${status}"
+
+find tests/ -perm -111 -type f -exec sh -c '
+workdir="${1}"
+status="${2}"
+t="${3}"
+t_log="${workdir}/$(basename ${t}).log"
+
+res=0
+./${t} > "${t_log}" 2>&1 \
+|| res=$?
+if [ $res -eq 0 ] ; then
+echo "PASS: ${t}"
+else
+echo "FAIL: ${t}"
+echo "$(basename ${t}): ${t_log}" >> "${status}"
+fi
+' _ "${workdir}" "${status}" {} \;
+
+if [ $(stat -c '%s' "${status}") -ne 0 ] ; then
+exec >&2
+while IFS=': ' read -r t t_log ; do
+printf "\n=\n"
+printf "ERROR: %s:\n" "${t}"
+printf -- "-\n"
+cat "${t_log}"
+done < "${status}"
+fi
+
+[ $(stat -c '%s' "${status}") -eq 0 ]
diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb
b/meta-oe/recipes-support/onig/onig_6.9.4.bb
index d873088fe..cfa86f04c 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.4.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.4.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b"
SRC_URI = "\
https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \
file://0001-build-don-t-link-against-host-system-libraries.patch \
+file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \
+file://run-ptest \
"
SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] =
"4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f
BINCONFIG = "${bindir}/onig-config"
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled ptest
BBCLASSEXTEND = "native"
+
+do_compile_ptest() {
+oe_runmake -C test buildtest-TESTS
+}
+
+do_install_ptest() {
+install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/*
+}
--
2.23.0.rc1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4
The version meta-oe is carrying is more than 4 years old, from 2015, with numerous CVEs fixed and more than 2000 commits since. The license checksum changed because it contains the year (which is at 2019 now). Onigurama can now also be built using CMake, but for now this recipe stays with using autotools as only autotools builds support testing (which the next patch adds support for). Signed-off-by: André Draszik --- v2: * fix typo in subject line * fix SUMMARY --- .../onig/files/configure.patch| 13 -- .../files/do-not-use-system-headers.patch | 44 --- ...t-link-against-host-system-libraries.patch | 42 ++ meta-oe/recipes-support/onig/onig_5.9.6.bb| 19 meta-oe/recipes-support/onig/onig_6.9.4.bb| 22 ++ 5 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch deleted file mode 100644 index 5fa700f19..0 --- a/meta-oe/recipes-support/onig/files/configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=== onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.0 + -+++ onig-5.9.3/configure.in2014-07-18 08:02:52.701574484 + -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - - diff --git a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted file mode 100644 index b93602a26..0 --- a/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -Author: Marcin Juszkiewicz - -When build on host with older eglibc (Ubuntu 12.04) build fails with: - -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use directly; include instead." - -Signed-off-by: Marcin Juszkiewicz - -Upstream-Status: Inappropriate [embedded specific] - - Makefile.am|2 +- - sample/Makefile.am |2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - onig-5.9.3.orig/Makefile.am -+++ onig-5.9.3/Makefile.am -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample - libname = libonig.la - - ACLOCAL_AMFLAGS = -I m4 - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - - include_HEADERS = oniguruma.h oniggnu.h onigposix.h - lib_LTLIBRARIES = $(libname) onig-5.9.3.orig/sample/Makefile.am -+++ onig-5.9.3/sample/Makefile.am -@@ -1,10 +1,10 @@ - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl - - libname = $(top_builddir)/libonig.la - LDADD = $(libname) --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - encode_SOURCES = encode.c - listcap_SOURCES = listcap.c - names_SOURCES = names.c - posix_SOURCES = posix.c diff --git a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file mode 100644 index 0..891592650 --- /dev/null +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch @@ -0,0 +1,42 @@ +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Mon, 6 Jan 2020 16:56:31 + +Subject: [PATCH] build: don't link against (host) system libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik +--- + sample/Makefile.am | 1 - + test/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 22a4989..e935bf0 100644 +--- a/sample/Makefile.am b/sample/Makefile.am +@@ -3,7 +3,6 @@ + lib_onig = ../src/libonig.la + LDADD = $(lib_onig) + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CPPFLAGS = -I$(top_srcdir)/src + + if ENABLE_POSIX_API +diff --git a/test/Makefile.am b/test/Makefile.am +index 4d62568..b7a2105 100644 +--- a/test/Makefile.am b/test/Makefile.am +@@ -1,7 +1,6 @@ + ## Makefile.am for Oniguruma + lib_onig = ../src/libonig.la + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CFLAGS = -Wall -Wno-invalid-source-encoding + AM_CPPFLAGS = -I$(top_srcdir)/src + +-- +2.23.0.rc1 + diff --git
