* [zeus 00/17] Patch review
@ 2020-01-03 2:48 Armin Kuster
2020-01-03 2:48 ` [zeus 01/17] grpc: Define libdir and cmakedir in terms of multilib Armin Kuster
` (17 more replies)
0 siblings, 18 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:48 UTC (permalink / raw)
To: openembedded-devel
Please have comments back by Saturday.
The following changes since commit fbe4cf8d56eea586c096621e7c913b24bd99c9c6:
gtkwave: add the libtirpc dependence and config (2019-12-17 21:57:51 -0800)
are available in the Git repository at:
https://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
Adrian Bunk (3):
networkmanager: Upgrade 1.18.2 -> 1.18.4
gpsd: Backport a memory leak fix
libqmi: Upgrade 1.24.0 -> 1.24.2
Changqing Li (1):
xfce-dusk-gtk3: correct invalid SRC_URI
Hongxu Jia (1):
python-more-itertools: downgrade 7.2.0 -> 5.0.0
Kai Kang (1):
fltk: fix build error when enable package config examples
Khem Raj (9):
grpc: Define libdir and cmakedir in terms of multilib
tinyalsa: fix installation libdir path to match multilibs
libqb: Add --enable-nosection-fallback with mips64/clang
x11vnc: Fix build for 32bit arches with 64bit time_t
evtest: Fix build for 32bit arches with 64bit time_t
lirc: Fix build for 32bit arches with 64bit time_t
utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit
time_t
directfb: Fix build for 32bit arches with 64bit time_t
ruli: Fix install step and build samples too
Stefan Agner (1):
networkmanager: do not deploy unnecessary udev rule file
zhangxiao (1):
syslog-ng: Fix multilib header conflict - syslog-ng-config.h
.../recipes-multimedia/tinyalsa/tinyalsa.bb | 4 +-
...L_-path-instead-of-hardcoding-bin-li.patch | 46 +++++
...ger_1.18.2.bb => networkmanager_1.18.4.bb} | 9 +-
.../recipes-devtools/grpc/grpc_1.24.1.bb | 4 +-
...-Fix-build-with-format-string-checks.patch | 29 ++-
...ake-space-for-flags-from-environment.patch | 95 +++++++++
...v-Mark-prev_addr_list_size-as-unused.patch | 35 ++++
.../recipes-support/ruli/files/Makefile.patch | 122 ------------
.../recipes-support/ruli/ruli_0.36.bb | 23 ++-
.../{libqmi_1.24.0.bb => libqmi_1.24.2.bb} | 4 +-
...ld-on-32bit-arches-with-64bit-time_t.patch | 40 ++++
.../recipes-connectivity/lirc/lirc_0.9.4d.bb | 1 +
meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +-
.../recipes-graphics/directfb/directfb.inc | 3 +-
...ld-on-32bit-arches-with-64bit-time_t.patch | 139 +++++++++++++
...ld-on-32bit-arches-with-64bit-time_t.patch | 111 +++++++++++
.../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 5 +-
.../0001-gps_shm_close-Free-privdata.patch | 37 ++++
meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 1 +
meta-oe/recipes-support/fltk/fltk.bb | 7 +-
...-when-enable-package-config-examples.patch | 182 ++++++++++++++++++
.../recipes-support/syslog-ng/syslog-ng.inc | 4 +-
...ld-on-32bit-arches-with-64bit-time_t.patch | 76 ++++++++
.../utouch/utouch-evemu_git.bb | 4 +-
...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++
...tat.h-for-fixing-build-issue-on-musl.patch | 0
.../remove-man-page-creation.patch | 0
.../utouch/utouch-frame_git.bb | 1 +
...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++
meta-oe/recipes-test/evtest/evtest_1.34.bb | 6 +-
.../python/python-more-itertools.inc | 3 -
.../python/python-more-itertools_5.0.0.bb | 7 +
.../python/python-more-itertools_7.2.0.bb | 2 -
.../python/python3-more-itertools_7.2.0.bb | 3 +
.../xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb | 2 +-
35 files changed, 935 insertions(+), 158 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} (94%)
create mode 100644 meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
create mode 100644 meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch
delete mode 100644 meta-networking/recipes-support/ruli/files/Makefile.patch
rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.0.bb => libqmi_1.24.2.bb} (85%)
create mode 100644 meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
create mode 100644 meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
create mode 100644 meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
create mode 100644 meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
create mode 100644 meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
create mode 100644 meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
rename meta-oe/recipes-support/utouch/{files => utouch-frame}/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch (100%)
rename meta-oe/recipes-support/utouch/{files => utouch-frame}/remove-man-page-creation.patch (100%)
create mode 100644 meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
create mode 100644 meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb
delete mode 100644 meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb
--
2.17.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [zeus 01/17] grpc: Define libdir and cmakedir in terms of multilib
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
@ 2020-01-03 2:48 ` Armin Kuster
2020-01-03 2:48 ` [zeus 02/17] tinyalsa: fix installation libdir path to match multilibs Armin Kuster
` (16 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:48 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
This helps in avoiding packaging errors seen with distros enabling
multilib
Fixes
ERROR: grpc-1.24.3-r0 do_package: QA Issue: grpc: Files/directories were installed but not shipped in any package:
/usr/lib/libgrpc++.so.1.24.3
...
/usr/lib/cmake
/usr/lib/cmake/grpc
/usr/lib/cmake/grpc/gRPCConfigVersion.cmake
/usr/lib/cmake/grpc/gRPCConfig.cmake
/usr/lib/cmake/grpc/gRPCTargets-noconfig.cmake
/usr/lib/cmake/grpc/gRPCTargets.cmake
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or de
lete them within do_install.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e18d8c957034908f27350e6ffcae2a3d05a4387b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
index 5cfa3aa82e2..8d54dbeff81 100644
--- a/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
+++ b/meta-networking/recipes-devtools/grpc/grpc_1.24.1.bb
@@ -36,6 +36,8 @@ EXTRA_OECMAKE = " \
-DgRPC_INSTALL=ON \
-DCMAKE_CROSSCOMPILING=ON \
-DBUILD_SHARED_LIBS=ON \
+ -DgRPC_INSTALL_LIBDIR=${baselib} \
+ -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \
"
do_configure_prepend_mipsarch() {
@@ -44,6 +46,6 @@ do_configure_prepend_mipsarch() {
BBCLASSEXTEND = "native nativesdk"
-SYSROOT_DIRS_BLACKLIST_append_class-target = "${libdir}/cmake/grpc"
+SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc"
FILES_${PN}-dev += "${bindir}"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 02/17] tinyalsa: fix installation libdir path to match multilibs
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
2020-01-03 2:48 ` [zeus 01/17] grpc: Define libdir and cmakedir in terms of multilib Armin Kuster
@ 2020-01-03 2:48 ` Armin Kuster
2020-01-03 2:49 ` [zeus 03/17] libqb: Add --enable-nosection-fallback with mips64/clang Armin Kuster
` (15 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:48 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Fixes
ERROR: tinyalsa-1.1.1+gitAUTOINC+8449529c7e-r0 do_package: QA Issue: tinyalsa: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libtinyalsa.a
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@googlemail.com>
Acked-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d9f3e6dbed8e5d96f2069280f0a566af89afb2fa)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-multimedia/tinyalsa/tinyalsa.bb | 4 +-
...L_-path-instead-of-hardcoding-bin-li.patch | 46 +++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb
index 8b86f824303..062096892ee 100644
--- a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb
+++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb
@@ -7,7 +7,9 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b"
SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5"
-SRC_URI = "git://github.com/tinyalsa/tinyalsa"
+SRC_URI = "git://github.com/tinyalsa/tinyalsa \
+ file://0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch \
+ "
PV = "1.1.1+git${SRCPV}"
S = "${WORKDIR}/git"
diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
new file mode 100644
index 00000000000..6f9c39996bf
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
@@ -0,0 +1,46 @@
+From fe4f3c2a37a81201f463ff962364f014f50c9896 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 16 Dec 2019 22:58:41 -0800
+Subject: [PATCH] Use CMAKE_INSTALL_<path> instead of hardcoding bin/lib/
+ install paths
+
+Helps fix build/packaging issues on machines where default libdir is not
+lib but say lib64
+
+Upstream-Status: Submitted [https://github.com/tinyalsa/tinyalsa/pull/143]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cb31c58..1cc4a85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,12 +41,20 @@ add_util("tinymix" "utils/tinymix.c")
+ install(FILES ${HDRS}
+ DESTINATION "include/tinyalsa")
+
++if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
++ set(CMAKE_INSTALL_LIBDIR lib)
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_BINDIR)
++ set(CMAKE_INSTALL_BINDIR bin)
++endif()
++
+ install(TARGETS "tinyalsa"
+ "tinyplay"
+ "tinycap"
+ "tinymix"
+ "tinypcminfo"
+- RUNTIME DESTINATION "bin"
+- ARCHIVE DESTINATION "lib"
+- LIBRARY DESTINATION "lib")
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+--
+2.24.1
+
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 03/17] libqb: Add --enable-nosection-fallback with mips64/clang
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
2020-01-03 2:48 ` [zeus 01/17] grpc: Define libdir and cmakedir in terms of multilib Armin Kuster
2020-01-03 2:48 ` [zeus 02/17] tinyalsa: fix installation libdir path to match multilibs Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 04/17] xfce-dusk-gtk3: correct invalid SRC_URI Armin Kuster
` (14 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Same issue happens with clang/mips64 so extend the gold fix to cover for
this case
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit dd69fafd7f2c51fb69df66dbeae7f5a4b092580c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb
index b205186e0b2..82503a168b5 100644
--- a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb
+++ b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb
@@ -22,9 +22,13 @@ S = "${WORKDIR}/git"
# WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: error: conftest.ld: SECTIONS seen after other input files; try -T/--script
# WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791
# collect2: error: ld returned 1 exit status
-EXTRA_OECONF_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' --enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}"
+NOSECTION_FALLBACK_toolchain-clang_mips64 = "--enable-nosection-fallback"
+
+EXTRA_OECONF += "${NOSECTION_FALLBACK}"
CFLAGS += "-pthread -D_REENTRANT"
+
do_configure_prepend() {
( cd ${S}
${S}/autogen.sh )
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 04/17] xfce-dusk-gtk3: correct invalid SRC_URI
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (2 preceding siblings ...)
2020-01-03 2:49 ` [zeus 03/17] libqb: Add --enable-nosection-fallback with mips64/clang Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 05/17] fltk: fix build error when enable package config examples Armin Kuster
` (13 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Changqing Li <changqing.li@windriver.com>
original SRC_URI is invalid now, and current upstream address
is such a long address(see below), and this package has not been
updated since 2011, so use http://sources.openembedded.org/.
https://dllb2.pling.com/api/files/download/id/1460766718/s/938c137c59bf7f1a6a6cc100c940feafd6904dc6478d5f96d09f3a631f9708e559055433db9e97654b196881fecbae445f094347befba0a5e477e961a73a7434/t/1576230019/c/a3f98e1fd43cfd072d46d7bedf6646191f5a020476297e0da678723a0078b9b8d284736bb34c4e876389b4e518777dc6a23c8666bb6bd42ceb1b893c9c264cce/lt/download/141404-xfce_dusk_gtk3-1_3.tar.gz
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Acked-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f5ec79e25957a9231ba52fd09825ab8da68dc5e7)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb b/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
index b05c7485295..89dab4923f4 100644
--- a/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
+++ b/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a"
inherit allarch
-SRC_URI = "http://xfce-look.org/CONTENT/content-files/141404-xfce_dusk_gtk3-1_3.tar.gz;subdir=${BPN}-${PV}"
+SRC_URI = "http://sources.openembedded.org/141404-xfce_dusk_gtk3-1_3.tar.gz;subdir=${BPN}-${PV}"
SRC_URI[md5sum] = "b3ad37ad8173b14ec090e60a80e65d8f"
SRC_URI[sha256sum] = "bfa8a88607d1a1da5bd0b9e4e075767c54400a3c5a0fae88b619ed71532f30b4"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 05/17] fltk: fix build error when enable package config examples
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (3 preceding siblings ...)
2020-01-03 2:49 ` [zeus 04/17] xfce-dusk-gtk3: correct invalid SRC_URI Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 06/17] syslog-ng: Fix multilib header conflict - syslog-ng-config.h Armin Kuster
` (12 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Kai Kang <kai.kang@windriver.com>
Backport patch to fix fltk build error when enable package config
'examples'. Drop the useless parts such as .gitignore and Makefile
from the patch.
fltk-native is also required by package config 'examples'.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit bbecc5dfc4d6da8ff3b4606d7cd24eeb2df0a7bc)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/fltk/fltk.bb | 7 +-
...-when-enable-package-config-examples.patch | 182 ++++++++++++++++++
2 files changed, 187 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb
index ec9e04bed62..0f30acc3a11 100644
--- a/meta-oe/recipes-support/fltk/fltk.bb
+++ b/meta-oe/recipes-support/fltk/fltk.bb
@@ -5,7 +5,10 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
inherit distro_features_check binconfig lib_package gtk-icon-cache mime
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI += "file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch"
+SRC_URI += " \
+ file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \
+ file://0004-Fix-build-error-when-enable-package-config-examples.patch \
+"
EXTRA_OECMAKE = " \
-DOPTION_BUILD_SHARED_LIBS=ON \
@@ -17,7 +20,7 @@ EXTRA_OECMAKE = " \
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
-PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,"
+PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native"
PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo"
PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl"
PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama"
diff --git a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch b/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
new file mode 100644
index 00000000000..974c02fe619
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
@@ -0,0 +1,182 @@
+Fix build error when enable package config examples.
+
+Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd]
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+
+From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001
+From: Albrecht Schlosser <albrechts.fltk@online.de>
+Date: Wed, 8 Feb 2017 02:06:52 +0000
+Subject: [PATCH] Rename test/help demo program to test/help_dialog.
+
+This change avoids a name conflict with CMake's auto-generated target 'help'
+for "Unix Makefiles", "Ninja", and supposedly other generators as well.
+
+
+git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
+---
+ CMake/macros.cmake | 5 -----
+ documentation/src/examples.dox | 8 +++----
+ test/CMakeLists.txt | 27 +++++++++++++++++++----
+ test/demo.menu | 2 +-
+ test/{help.cxx => help_dialog.cxx} | 6 ++---
+ test/{help-test.html => help_dialog.html} | 0
+ 6 files changed, 31 insertions(+), 17 deletions(-)
+ rename test/{help.cxx => help_dialog.cxx} (88%)
+ rename test/{help-test.html => help_dialog.html} (100%)
+
+diff --git a/CMake/macros.cmake b/CMake/macros.cmake
+index 5b0d0fa..7134fcb 100644
+--- a/CMake/macros.cmake
++++ b/CMake/macros.cmake
+@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
+
+ set (tname ${NAME}) # target name
+
+- # rename reserved target name "help" (CMake 2.8.12 and later)
+- if (${tname} MATCHES "^help$")
+- set (tname "test_help")
+- endif (${tname} MATCHES "^help$")
+-
+ foreach(src ${SOURCES})
+ if ("${src}" MATCHES "\\.fl$")
+ list(APPEND flsrcs ${src})
+diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox
+index 5105b7b..7961b02 100644
+--- a/documentation/src/examples.dox
++++ b/documentation/src/examples.dox
+@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below.
+ </tr>
+ <tr>
+ <td> \ref examples_hello </td>
+-<td> \ref examples_help </td>
++<td> \ref examples_help_dialog </td>
+ <td> \ref examples_iconize </td>
+ <td> \ref examples_image </td>
+ <td> \ref examples_inactive </td>
+@@ -326,13 +326,13 @@ easily under FLTK.
+ tiny demo shows how little is needed to get a functioning application
+ running with FLTK. Quite impressive, I'd say.
+
+-\subsection examples_help help
++\subsection examples_help_dialog help_dialog
+
+ \par
+-\c help displays the built-in FLTK help browser. The
++\c help_dialog displays the built-in FLTK help browser. The
+ Fl_Help_Dialog understands a subset of html and renders
+ various image formats. This widget makes it easy to provide help
+-pages to the user without depending on the operating system's
++pages to the user without depending on the operating system's
+ html browser.
+
+ \subsection examples_iconize iconize
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 22ec9ab..4caffa5 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,3 +1,22 @@
++#
++# "$Id$"
++#
++# CMakeLists.txt used to build test and demo apps by the CMake build system
++#
++# Copyright 2004-2017 by Bill Spitzak and others.
++#
++# This library is free software. Distribution and use rights are outlined in
++# the file "COPYING" which should have been included with this file. If this
++# file is missing or damaged, see the license at:
++#
++# http://www.fltk.org/COPYING.php
++#
++# Please report all bugs and problems on the following page:
++#
++# http://www.fltk.org/str.php
++#
++#######################################################################
++
+ set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples)
+
+ #######################################################################
+@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images")
+ CREATE_EXAMPLE(fonts fonts.cxx fltk)
+ CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
+ CREATE_EXAMPLE(hello hello.cxx fltk)
+-CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
++CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images")
+ CREATE_EXAMPLE(icon icon.cxx fltk)
+ CREATE_EXAMPLE(iconize iconize.cxx fltk)
+ CREATE_EXAMPLE(image image.cxx fltk)
+@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO)
+ # Note: this is incomplete as of 11 Feb 2015
+ # Todo: currently all files are copied, but some of them need configuration:
+ # - demo.menu: fluid can't be started (wrong path)
+-# - demo.menu: help (help-test.html) can't find its images (not copied)
++# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied)
+ # - maybe more ...
+
+ # prepare for a "better" test file installation path
+@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY)
+
+ # use target directory only to avoid redundancy
+ configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY)
+-configure_file(help-test.html ${TESTFILE_PATH} COPYONLY)
++configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY)
+ configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY)
+ configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY)
+ if(APPLE AND NOT OPTION_APPLE_X11)
+ configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY)
+ configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY)
+- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY)
++ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY)
+ endif(APPLE AND NOT OPTION_APPLE_X11)
+diff --git a/test/demo.menu b/test/demo.menu
+index 337a71c..97e522a 100644
+--- a/test/demo.menu
++++ b/test/demo.menu
+@@ -77,7 +77,7 @@
+ @o:Font Tests...:@of
+ @of:Fonts:fonts
+ @of:UTF-8:utf8
+- @o:HelpDialog:help
++ @o:HelpDialog:help_dialog
+ @o:Input Choice:input_choice
+ @o:Preferences:preferences
+ @o:Threading:threads
+diff --git a/test/help.cxx b/test/help_dialog.cxx
+similarity index 88%
+rename from test/help.cxx
+rename to test/help_dialog.cxx
+index f5c51d6..7866641 100644
+--- a/test/help.cxx
++++ b/test/help_dialog.cxx
+@@ -3,7 +3,7 @@
+ //
+ // Fl_Help_Dialog test program.
+ //
+-// Copyright 1999-2010 by Easy Software Products.
++// Copyright 2011-2017 by Bill Spitzak and others.
+ //
+ // This library is free software. Distribution and use rights are outlined in
+ // the file "COPYING" which should have been included with this file. If this
+@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments
+ strcpy(buf, argv[0]);
+ char *slash = strrchr(buf, '/');
+ if (slash)
+- strcpy(slash, "/../Resources/help-test.html");
++ strcpy(slash, "/../Resources/help_dialog.html");
+ help->load(buf);
+
+ #else
+
+ if (argc <= 1)
+- help->load("help-test.html");
++ help->load("help_dialog.html");
+ else
+ help->load(argv[1]);
+
+diff --git a/test/help-test.html b/test/help_dialog.html
+similarity index 100%
+rename from test/help-test.html
+rename to test/help_dialog.html
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 06/17] syslog-ng: Fix multilib header conflict - syslog-ng-config.h
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (4 preceding siblings ...)
2020-01-03 2:49 ` [zeus 05/17] fltk: fix build error when enable package config examples Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 07/17] x11vnc: Fix build for 32bit arches with 64bit time_t Armin Kuster
` (11 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: zhangxiao <xiao.zhang@windriver.com>
Header file conflict between 32-bit and 64-bit versions.
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b6c9a83e3622a82d990c926a5e8686f9be19502f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 4 +++-
1 file changed, 3 insertions(+), 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 b00cb91ee14..737c5e8bc3e 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -25,7 +25,7 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
-inherit autotools gettext systemd pkgconfig update-rc.d
+inherit autotools gettext systemd pkgconfig update-rc.d multilib_header
EXTRA_OECONF = " \
--enable-dynamic-linking \
@@ -98,6 +98,8 @@ do_install_append() {
else
install ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf
fi
+
+ oe_multilib_header syslog-ng/syslog-ng-config.h
}
FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 07/17] x11vnc: Fix build for 32bit arches with 64bit time_t
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (5 preceding siblings ...)
2020-01-03 2:49 ` [zeus 06/17] syslog-ng: Fix multilib header conflict - syslog-ng-config.h Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 08/17] evtest: " Armin Kuster
` (10 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit aa86b55286e74e5a6d779a14c526561a091cd21e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ld-on-32bit-arches-with-64bit-time_t.patch | 111 ++++++++++++++++++
.../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 5 +-
2 files changed, 114 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff --git a/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000000..d44445fa9f5
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,111 @@
+From 8ab672ccc67b64058cffac2cd19a0d3b75d5aa25 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 11:43:32 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Submitted [https://github.com/LibVNC/x11vnc/pull/117]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/uinput.c | 28 ++++++++++++++++++++++++----
+ 1 file changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/src/uinput.c b/src/uinput.c
+index 28fbad3..343b7c5 100644
+--- a/src/uinput.c
++++ b/src/uinput.c
+@@ -54,6 +54,11 @@ so, delete this exception statement from your version.
+ #include <linux/input.h>
+ #include <linux/uinput.h>
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #if !defined(EV_SYN) || !defined(SYN_REPORT)
+ #undef UINPUT_OK
+ #endif
+@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) {
+ static void ptr_move(int dx, int dy) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tval;
+ int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
+
+ if (injectable && strchr(injectable, 'M') == NULL) {
+@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) {
+
+ if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
+
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tval, NULL);
++ ev.input_event_sec = tval.tv_sec;
++ ev.input_event_usec = tval.tv_usec;
+ ev.type = EV_REL;
+ ev.code = REL_Y;
+ ev.value = dy;
+@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) {
+ static void ptr_abs(int x, int y, int p) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tval;
+ int x0, y0;
+ int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
+
+@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) {
+
+ if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
+
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tval, NULL);
++ ev.input_event_sec = tval.tv_sec;
++ ev.input_event_usec = tval.tv_usec;
+ ev.type = EV_ABS;
+ ev.code = ABS_Y;
+ ev.value = y;
+@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;}
+ static void button_click(int down, int btn) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tval;
+ int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
+
+ if (injectable && strchr(injectable, 'B') == NULL) {
+@@ -959,7 +971,12 @@ static void button_click(int down, int btn) {
+ if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
+
+ memset(&ev, 0, sizeof(ev));
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tval, NULL);
++ gettimeofday(&tval, NULL);
++ ev.input_event_sec = tval.tv_sec;
++ ev.input_event_usec = tval.tv_usec;
++ ev.input_event_sec = tval.tv_sec;
++ ev.input_event_usec = tval.tv_usec;
+ ev.type = EV_KEY;
+ ev.value = down;
+
+@@ -1230,6 +1247,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) {
+ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tval;
+ int scancode;
+ allowed_input_t input;
+ int d = direct_key_fd < 0 ? fd : direct_key_fd;
+@@ -1253,7 +1271,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
+
+ memset(&ev, 0, sizeof(ev));
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tval, NULL);
++ ev.input_event_sec = tval.tv_sec;
++ ev.input_event_usec = tval.tv_usec;
+ ev.type = EV_KEY;
+ ev.code = (unsigned char) scancode;
+ ev.value = down;
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
index e4a0321357b..af01fb0fd84 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb
@@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRCREV = "4ca006fed80410bd9b061a1519bd5d9366bb0bc8"
SRC_URI = "git://github.com/LibVNC/x11vnc \
file://starting-fix.patch \
- file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \
-"
+ file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \
+ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+ "
S = "${WORKDIR}/git"
DEPENDS = "\
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 08/17] evtest: Fix build for 32bit arches with 64bit time_t
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (6 preceding siblings ...)
2020-01-03 2:49 ` [zeus 07/17] x11vnc: Fix build for 32bit arches with 64bit time_t Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 09/17] lirc: " Armin Kuster
` (9 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 64f07ba8528cda14ad552e492dfd2e7f054fbb08)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ld-on-32bit-arches-with-64bit-time_t.patch | 41 +++++++++++++++++++
meta-oe/recipes-test/evtest/evtest_1.34.bb | 6 ++-
2 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff --git a/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000000..706322d5653
--- /dev/null
+++ b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,41 @@
+From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 11:58:58 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ evtest.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/evtest.c b/evtest.c
+index 548c203..93063cd 100644
+--- a/evtest.c
++++ b/evtest.c
+@@ -61,6 +61,11 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #define BITS_PER_LONG (sizeof(long) * 8)
+ #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
+ #define OFF(x) ((x)%BITS_PER_LONG)
+@@ -1140,7 +1145,7 @@ static int print_events(int fd)
+ type = ev[i].type;
+ code = ev[i].code;
+
+- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
++ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec);
+
+ if (type == EV_SYN) {
+ if (code == SYN_MT_REPORT)
diff --git a/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-oe/recipes-test/evtest/evtest_1.34.bb
index 3b6dc61408c..a3a23c89516 100644
--- a/meta-oe/recipes-test/evtest/evtest_1.34.bb
+++ b/meta-oe/recipes-test/evtest/evtest_1.34.bb
@@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libxml2"
SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69"
-SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git \
- file://add_missing_limits_h_include.patch"
+SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \
+ file://add_missing_limits_h_include.patch \
+ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+ "
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 09/17] lirc: Fix build for 32bit arches with 64bit time_t
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (7 preceding siblings ...)
2020-01-03 2:49 ` [zeus 08/17] evtest: " Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 10/17] utouch-evemu, utouch-frame: " Armin Kuster
` (8 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 049a2a371fd29e61a4ae1a79a6bd4064f12120dd)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ld-on-32bit-arches-with-64bit-time_t.patch | 40 +++++++++++++++++++
.../recipes-connectivity/lirc/lirc_0.9.4d.bb | 1 +
2 files changed, 41 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000000..0e38f7d8ece
--- /dev/null
+++ b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,40 @@
+From 50a48a7bd8d65a165ce2aac4ba0c1e02bded04aa Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 12:21:31 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ plugins/devinput.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/devinput.c b/plugins/devinput.c
+index d4d733a..feb4a61 100644
+--- a/plugins/devinput.c
++++ b/plugins/devinput.c
+@@ -34,6 +34,11 @@
+ #include <linux/uinput.h>
+ #include <sys/stat.h>
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #ifndef EV_SYN
+ /* previous name */
+ #define EV_SYN EV_RST
+@@ -459,7 +464,7 @@ char* devinput_rec(struct ir_remote* remotes)
+ return 0;
+ }
+
+- log_trace("time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type,
++ log_trace("time %ld.%06ld type %d code %d value %d", event.input_event_sec, event.input_event_usec, event.type,
+ event.code, event.value);
+
+ value = (unsigned)event.value;
diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
index b13163debb6..606caee8928 100644
--- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
+++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \
file://pollfd.patch \
+ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
file://lircd.service \
file://lircd.init \
file://lircexec.init \
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 10/17] utouch-evemu, utouch-frame: Fix build for 32bit arches with 64bit time_t
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (8 preceding siblings ...)
2020-01-03 2:49 ` [zeus 09/17] lirc: " Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 11/17] directfb: " Armin Kuster
` (7 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Move patches from files/ directory into PN folders to avoid conflicts
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 91f8512c8e97068876f9a4053775c7881e8b32d4)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ld-on-32bit-arches-with-64bit-time_t.patch | 76 +++++++++++++++++++
.../utouch/utouch-evemu_git.bb | 4 +-
...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++++++++
...tat.h-for-fixing-build-issue-on-musl.patch | 0
.../remove-man-page-creation.patch | 0
.../utouch/utouch-frame_git.bb | 1 +
6 files changed, 121 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
create mode 100644 meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
rename meta-oe/recipes-support/utouch/{files => utouch-frame}/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch (100%)
rename meta-oe/recipes-support/utouch/{files => utouch-frame}/remove-man-page-creation.patch (100%)
diff --git a/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000000..71bf5726994
--- /dev/null
+++ b/meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,76 @@
+From 60987a1df8eb8c9196222375574dcd7bc0ad2daa Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 20:23:27 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/evemu-impl.h | 5 +++++
+ src/evemu.c | 16 +++++++++-------
+ 2 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/src/evemu-impl.h b/src/evemu-impl.h
+index acf2976..c08d861 100644
+--- a/src/evemu-impl.h
++++ b/src/evemu-impl.h
+@@ -21,6 +21,11 @@
+ #include <evemu.h>
+ #include <linux/uinput.h>
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #define EVPLAY_NBITS KEY_CNT
+ #define EVPLAY_NBYTES ((EVPLAY_NBITS + 7) / 8)
+
+diff --git a/src/evemu.c b/src/evemu.c
+index 21187af..160c915 100644
+--- a/src/evemu.c
++++ b/src/evemu.c
+@@ -363,7 +363,7 @@ int evemu_read(struct evemu_device *dev, FILE *fp)
+ int evemu_write_event(FILE *fp, const struct input_event *ev)
+ {
+ return fprintf(fp, "E: %lu.%06u %04x %04x %d\n",
+- ev->time.tv_sec, (unsigned)ev->time.tv_usec,
++ ev->input_event_sec, (unsigned)ev->input_event_usec,
+ ev->type, ev->code, ev->value);
+ }
+
+@@ -391,8 +391,8 @@ int evemu_read_event(FILE *fp, struct input_event *ev)
+ int value;
+ int ret = fscanf(fp, "E: %lu.%06u %04x %04x %d\n",
+ &sec, &usec, &type, &code, &value);
+- ev->time.tv_sec = sec;
+- ev->time.tv_usec = usec;
++ ev->input_event_sec = sec;
++ ev->input_event_usec = usec;
+ ev->type = type;
+ ev->code = code;
+ ev->value = value;
+@@ -411,12 +411,14 @@ int evemu_read_event_realtime(FILE *fp, struct input_event *ev,
+
+ if (evtime) {
+ if (!evtime->tv_sec)
+- *evtime = ev->time;
+- usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec);
+- usec += ev->time.tv_usec - evtime->tv_usec;
++ evtime->tv_sec = ev->input_event_sec;
++ evtime->tv_usec = ev->input_event_usec;
++ usec = 1000000L * (ev->input_event_sec - evtime->tv_sec);
++ usec += ev->input_event_usec - evtime->tv_usec;
+ if (usec > 500) {
+ usleep(usec);
+- *evtime = ev->time;
++ evtime->tv_sec = ev->input_event_sec;
++ evtime->tv_usec = ev->input_event_usec;
+ }
+ }
+
diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
index 1dd5a86d505..41d1cbfd978 100644
--- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
inherit autotools
-SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http"
+SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http \
+ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+ "
SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24"
PV = "1.0.5+git${SRCPV}"
diff --git a/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000000..d405d43f140
--- /dev/null
+++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,41 @@
+From 895b6996e232700fb2a428838feaef418cc64b70 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 22:52:13 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/frame-mtdev.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/frame-mtdev.c b/src/frame-mtdev.c
+index c0f15d8..42ad380 100644
+--- a/src/frame-mtdev.c
++++ b/src/frame-mtdev.c
+@@ -25,6 +25,11 @@
+ #include <errno.h>
+ #include <math.h>
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ static int is_pointer(const struct evemu_device *dev)
+ {
+ return evemu_has_event(dev, EV_REL, REL_X) ||
+@@ -200,7 +205,7 @@ static int handle_abs_event(utouch_frame_handle fh,
+ static utouch_frame_time_t get_evtime_ms(const struct input_event *syn)
+ {
+ static const utouch_frame_time_t ms = 1000;
+- return syn->time.tv_usec / ms + syn->time.tv_sec * ms;
++ return syn->input_event_usec / ms + syn->input_event_sec * ms;
+ }
+
+ const struct utouch_frame *
diff --git a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch
similarity index 100%
rename from meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch
rename to meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch
diff --git a/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch b/meta-oe/recipes-support/utouch/utouch-frame/remove-man-page-creation.patch
similarity index 100%
rename from meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch
rename to meta-oe/recipes-support/utouch/utouch-frame/remove-man-page-creation.patch
diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
index 39d46af8e94..1ebebfa9f5e 100644
--- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
@@ -12,6 +12,7 @@ inherit autotools pkgconfig
SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \
file://remove-man-page-creation.patch \
file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \
+ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
"
SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 11/17] directfb: Fix build for 32bit arches with 64bit time_t
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (9 preceding siblings ...)
2020-01-03 2:49 ` [zeus 10/17] utouch-evemu, utouch-frame: " Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 12/17] ruli: Fix install step and build samples too Armin Kuster
` (6 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 310047ec9f2667ae1a98a55aa14edb87cd1e1e6c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-graphics/directfb/directfb.inc | 3 +-
...ld-on-32bit-arches-with-64bit-time_t.patch | 139 ++++++++++++++++++
2 files changed, 141 insertions(+), 1 deletion(-)
create mode 100644 meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc
index 96aa31117f2..65fd89e6fef 100644
--- a/meta-oe/recipes-graphics/directfb/directfb.inc
+++ b/meta-oe/recipes-graphics/directfb/directfb.inc
@@ -21,7 +21,8 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g
file://use-PTHREAD_MUTEX_RECURSIVE.patch \
file://fix-client-gfx_state-initialisation.patch \
file://fix-tslib-version-check.patch \
- "
+ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
+ "
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
new file mode 100644
index 00000000000..2f766465e1c
--- /dev/null
+++ b/meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -0,0 +1,139 @@
+From 0b66557f2e924023b12006b58d8e86149c745aed Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 30 Nov 2019 20:34:33 -0800
+Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
+
+time element is deprecated on new input_event structure in kernel's
+input.h [1]
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ inputdrivers/linux_input/linux_input.c | 36 ++++++++++++++++++--------
+ 1 file changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c
+index 7e9a6ad..03deebc 100644
+--- a/inputdrivers/linux_input/linux_input.c
++++ b/inputdrivers/linux_input/linux_input.c
+@@ -42,6 +42,11 @@ typedef unsigned long kernel_ulong_t;
+
+ #include <linux/input.h>
+
++#ifndef input_event_sec
++#define input_event_sec time.tv_sec
++#define input_event_usec time.tv_usec
++#endif
++
+ #ifndef KEY_OK
+ /* Linux kernel 2.5.42+ defines additional keys in linux/input.h */
+ #include "input_fake.h"
+@@ -754,7 +759,8 @@ translate_event( const LinuxInputData *data,
+ DFBInputEvent *devt )
+ {
+ devt->flags = DIEF_TIMESTAMP;
+- devt->timestamp = levt->time;
++ devt->timestamp.tv_sec = levt->input_event_sec;
++ devt->timestamp.tv_usec = levt->input_event_usec;
+
+ switch (levt->type) {
+ case EV_KEY:
+@@ -2139,7 +2145,8 @@ touchpad_translate( struct touchpad_fsm_state *state,
+ int abs, rel;
+
+ devt->flags = DIEF_TIMESTAMP | (dfb_config->linux_input_touch_abs ? DIEF_AXISABS : DIEF_AXISREL);
+- devt->timestamp = levt->time;
++ devt->timestamp.tv_sec = levt->input_event_sec;
++ devt->timestamp.tv_usec = levt->input_event_usec;
+ devt->type = DIET_AXISMOTION;
+
+ switch (levt->code) {
+@@ -2204,7 +2211,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ DFBInputEvent *devt )
+ {
+ struct timeval timeout = { 0, 125000 };
+-
++ struct timeval tval;
+ /* select() timeout? */
+ if (!levt) {
+ /* Check if button release is due. */
+@@ -2223,6 +2230,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ return 0;
+ }
+
++ tval.tv_sec = levt->input_event_sec;
++ tval.tv_usec = levt->input_event_usec;
+ /* More or less ignore these events for now */
+ if ((levt->type == EV_SYN && levt->code == SYN_REPORT) ||
+ (levt->type == EV_ABS && levt->code == ABS_PRESSURE) ||
+@@ -2233,7 +2242,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+
+ /* Check if button release is due. */
+ if (state->fsm_state == TOUCHPAD_FSM_DRAG_START &&
+- timeout_passed( &state->timeout, &levt->time )) {
++ timeout_passed( &state->timeout, &tval )) {
+ devt->flags = DIEF_TIMESTAMP;
+ devt->timestamp = state->timeout; /* timeout of levt->time? */
+ devt->type = DIET_BUTTONRELEASE;
+@@ -2255,7 +2264,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ case TOUCHPAD_FSM_START:
+ if (touchpad_finger_landing( levt )) {
+ state->fsm_state = TOUCHPAD_FSM_MAIN;
+- state->timeout = levt->time;
++ state->timeout.tv_sec = levt->input_event_sec;
++ state->timeout.tv_usec = levt->input_event_usec;
+ timeout_add( &state->timeout, &timeout );
+ }
+ return 0;
+@@ -2268,15 +2278,17 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ }
+ }
+ else if (touchpad_finger_leaving( levt )) {
+- if (!timeout_passed( &state->timeout, &levt->time )) {
++ if (!timeout_passed( &state->timeout, &tval )) {
+ devt->flags = DIEF_TIMESTAMP;
+- devt->timestamp = levt->time;
++ devt->timestamp.tv_sec = levt->input_event_sec;
++ devt->timestamp.tv_usec = levt->input_event_usec;
+ devt->type = DIET_BUTTONPRESS;
+ devt->button = DIBI_FIRST;
+
+ touchpad_fsm_init( state );
+ state->fsm_state = TOUCHPAD_FSM_DRAG_START;
+- state->timeout = levt->time;
++ state->timeout.tv_sec = levt->input_event_sec;
++ state->timeout.tv_usec = levt->input_event_usec;
+ timeout_add( &state->timeout, &timeout );
+ return 1;
+ }
+@@ -2287,7 +2299,7 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ return 0;
+
+ case TOUCHPAD_FSM_DRAG_START:
+- if (timeout_passed( &state->timeout, &levt->time )){
++ if (timeout_passed( &state->timeout, &tval )){
+ devt->flags = DIEF_TIMESTAMP;
+ devt->timestamp = state->timeout; /* timeout of levt->time? */
+ devt->type = DIET_BUTTONRELEASE;
+@@ -2299,7 +2311,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ else {
+ if (touchpad_finger_landing( levt )) {
+ state->fsm_state = TOUCHPAD_FSM_DRAG_MAIN;
+- state->timeout = levt->time;
++ state->timeout.tv_sec = levt->input_event_sec;
++ state->timeout.tv_usec = levt->input_event_usec;
+ timeout_add( &state->timeout, &timeout );
+ }
+ }
+@@ -2314,7 +2327,8 @@ touchpad_fsm( struct touchpad_fsm_state *state,
+ }
+ else if (touchpad_finger_leaving( levt )) {
+ devt->flags = DIEF_TIMESTAMP;
+- devt->timestamp = levt->time;
++ devt->timestamp.tv_sec = levt->input_event_sec;
++ devt->timestamp.tv_usec = levt->input_event_usec;
+ devt->type = DIET_BUTTONRELEASE;
+ devt->button = DIBI_FIRST;
+
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 12/17] ruli: Fix install step and build samples too
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (10 preceding siblings ...)
2020-01-03 2:49 ` [zeus 11/17] directfb: " Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 13/17] networkmanager: Upgrade 1.18.2 -> 1.18.4 Armin Kuster
` (5 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Khem Raj <raj.khem@gmail.com>
do_install never executed as a result it was empty install
Create ruli-bin package for utilities, so libraries can be packages
granularily
Drop the makefile patch which is no longer needed, set the make
variables to get the needed bits set
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f4e6224b340fba198639bdd4585a81efdf15303e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...-Fix-build-with-format-string-checks.patch | 29 ++++-
...ake-space-for-flags-from-environment.patch | 95 ++++++++++++++
...v-Mark-prev_addr_list_size-as-unused.patch | 35 +++++
.../recipes-support/ruli/files/Makefile.patch | 122 ------------------
.../recipes-support/ruli/ruli_0.36.bb | 23 +++-
5 files changed, 169 insertions(+), 135 deletions(-)
create mode 100644 meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
create mode 100644 meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch
delete mode 100644 meta-networking/recipes-support/ruli/files/Makefile.patch
diff --git a/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch b/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch
index f8eb3ae67a4..8ca26b51bbb 100644
--- a/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch
+++ b/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch
@@ -15,11 +15,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
src/ruli_addr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/ruli_addr.c b/src/ruli_addr.c
-index 00d5d0d..f1eabae 100644
--- a/src/ruli_addr.c
+++ b/src/ruli_addr.c
-@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli_addr *addr, int family)
+@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli
{
switch (family) {
case PF_INET:
@@ -28,6 +26,25 @@ index 00d5d0d..f1eabae 100644
case PF_INET6:
return ruli_inet6_print(out, &addr->ipv6);
---
-2.13.1
-
+--- a/sample/getaddrinfo.c
++++ b/sample/getaddrinfo.c
+@@ -174,7 +174,7 @@ static void solve(const char *fullname)
+
+ for (ai = ai_res; ai; ai = ai->ai_next) {
+
+- printf(fullname);
++ printf("%s", fullname);
+
+ switch (ai->ai_family) {
+ case PF_INET:
+--- a/sample/ruli-getaddrinfo.c
++++ b/sample/ruli-getaddrinfo.c
+@@ -176,7 +176,7 @@ static void solve(const char *fullname)
+
+ for (ai = ai_res; ai; ai = ai->ai_next) {
+
+- printf(fullname);
++ printf("%s", fullname);
+
+ switch (ai->ai_family) {
+ case PF_INET:
diff --git a/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
new file mode 100644
index 00000000000..c3ca07a3903
--- /dev/null
+++ b/meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
@@ -0,0 +1,95 @@
+From bb19a2c7e5b3142d70d3e13c2d8a92a63f2b840a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 20 Nov 2019 22:12:52 -0800
+Subject: [PATCH] Make space for flags from environment
+
+Add force option to ln cmd, so do_install can be rerun in same directory
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ sample/Makefile | 20 ++++++++++----------
+ src/Makefile | 8 ++++----
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/sample/Makefile b/sample/Makefile
+index 15cafd9..d83641f 100644
+--- a/sample/Makefile
++++ b/sample/Makefile
+@@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS)
+ SOLARIS_LIBS = -lresolv -lnsl -lsocket
+ endif
+
+-CC = gcc
+-CFLAGS = -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR)
+-LDFLAGS = -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS)
++CC ?= gcc
++CFLAGS += -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR)
++LDFLAGS += -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS)
+ UNRULI_LINK = $(CC) $(ARCH) $(LDFLAGS) -o $@ $^ $(SOLARIS_LIBS)
+ LINK = $(UNRULI_LINK) -lruli -loop
+
+@@ -65,13 +65,13 @@ install: $(TARGETS)
+ mkdir -p $(INSTALL_BIN_DIR) $(INSTALL_MAN1_DIR)
+ cp $(TARGETS) $(INSTALL_BIN_DIR)
+ cp ../doc/man/*.1 $(INSTALL_MAN1_DIR)
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 smtpsearch.1
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 httpsearch.1
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_srvsearch.1
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_smtpsearch.1
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_httpsearch.1
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 ruli-getaddrinfo.1
+- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 getaddrinfo.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 smtpsearch.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 httpsearch.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_srvsearch.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_smtpsearch.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_httpsearch.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 ruli-getaddrinfo.1
++ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 getaddrinfo.1
+
+ %.o: %.c
+ $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $<
+diff --git a/src/Makefile b/src/Makefile
+index 9b56b5e..39a5ea1 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -45,7 +45,7 @@ endif
+
+ WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \
+ -Wcast-align -Wwrite-strings -Wredundant-decls
+-CC = gcc
++CC ?= gcc
+
+ # gcc-specific options (not valid for g++)
+ ifeq ($(CC),gcc)
+@@ -58,7 +58,7 @@ SHARED = -fPIC
+ FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \
+ $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR)
+ SOFT_CFLAGS = $(WARN) $(FLAGS)
+-CFLAGS = $(WARN) -Werror $(FLAGS)
++CFLAGS += $(WARN) -Werror $(FLAGS)
+ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
+ ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \
+ ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \
+@@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
+ ruli_getaddrinfo.o
+ SHAREDOBJ = $(LIBOBJ:%.o=%.os)
+ SONAME = libruli.so.4
+-LDFLAGS = -L$(OOP_LIB_DIR)
++LDFLAGS += -L$(OOP_LIB_DIR)
+
+ COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c
+ SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c
+@@ -95,7 +95,7 @@ install: ruli
+ cp $(SONAME) libruli.a $(INSTALL_LIB_DIR)
+ cp *.h $(INSTALL_INCLUDE_DIR)
+ cp ../doc/man/*.3 $(INSTALL_MAN3_DIR)
+- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so
++ cd $(INSTALL_LIB_DIR) && ln -sf $(SONAME) libruli.so
+ @echo
+ @echo "REMINDER:"
+ @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:"
+--
+2.24.0
+
diff --git a/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch b/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch
new file mode 100644
index 00000000000..213006a677b
--- /dev/null
+++ b/meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch
@@ -0,0 +1,35 @@
+From 895ae26e36c4498677ad0b2695a6e5af05548a29 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 20 Nov 2019 22:02:43 -0800
+Subject: [PATCH] ruli_srv: Mark prev_addr_list_size as unused
+
+This ensures that compiler does not trip on building it
+
+ruli_srv.c:157:20: error: variable 'prev_addr_list_size' set but not used [-Werror=unused-but-set-variable]
+| int prev_addr_list_size;
+| ^~~~~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+
+Upstream-Status: Inappropriate [Workaround]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/ruli_srv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ruli_srv.c b/src/ruli_srv.c
+index 45c70c7..ff82349 100644
+--- a/src/ruli_srv.c
++++ b/src/ruli_srv.c
+@@ -154,7 +154,7 @@ static void *on_walk_answer(ruli_host_t *host_qry, void *qry_arg)
+ walk_t *walk_qry = (walk_t *) qry_arg;
+ ruli_srv_t *srv_qry = walk_qry->srv_query;
+ ruli_srv_entry_t *srv_entry;
+- int prev_addr_list_size;
++ __attribute__((unused)) int prev_addr_list_size;
+
+ assert(ruli_host_answer_code(host_qry) != RULI_SRV_CODE_VOID);
+
+--
+2.24.0
+
diff --git a/meta-networking/recipes-support/ruli/files/Makefile.patch b/meta-networking/recipes-support/ruli/files/Makefile.patch
deleted file mode 100644
index 60789a3d56f..00000000000
--- a/meta-networking/recipes-support/ruli/files/Makefile.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Naur patch.org/ruli-0.36/Makefile patch.new/ruli-0.36/Makefile
---- ruli-0.36/Makefile 2015-09-10 15:14:13.952262350 -0400
-+++ ruli-0.36/Makefile 2015-09-10 15:14:38.628261620 -0400
-@@ -7,17 +7,17 @@
- .PHONY: default
- default:
- $(MAKE) -C src
-- $(MAKE) -C sample
-+# $(MAKE) -C sample
-
- .PHONY: clean
- clean:
- $(MAKE) -C src clean
-- $(MAKE) -C sample clean
-+# $(MAKE) -C sample clean
-
- .PHONY: install
- install:
- $(MAKE) -C src install
-- $(MAKE) -C sample install
-+# $(MAKE) -C sample install
-
- .PHONY: dpkg
- dpkg:
-
-=====================================================================
-
-diff -Naur patch.org/git/src/Makefile patch.new/git/src/Makefile
---- ruli-0.36/src/Makefile 2005-06-13 12:34:53.000000000 -0400
-+++ ruli-0.36/src/Makefile 2015-09-11 09:46:06.290287347 -0400
-@@ -18,9 +18,9 @@
- #
- # Debian packaging likes this: OOP_BASE_DIR = /usr
- #
--OOP_BASE_DIR = /usr/local/oop
--OOP_INCLUDE_DIR = $(OOP_BASE_DIR)/include
--OOP_LIB_DIR = $(OOP_BASE_DIR)/lib
-+#OOP_BASE_DIR = /usr/local/oop
-+OOP_INCLUDE_DIR = ${PKG_CONFIG_SYSROOT_DIR}/$(includedir)/
-+#OOP_LIB_DIR = $(OOP_BASE_DIR)/lib
-
- #
- # INSTALL_BASE_DIR indicates where RULI
-@@ -30,11 +30,11 @@
- #
- # Debian packaging likes this: INSTALL_BASE_DIR = $(DESTDIR)/usr
- #
--INSTALL_BASE_DIR = ../install/ruli
--INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include
--INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib
--INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man
--INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3
-+#INSTALL_BASE_DIR = ../install/ruli
-+#INSTALL_INCLUDE_DIR = $(INSTALL_BASE_DIR)/include
-+#INSTALL_LIB_DIR = $(INSTALL_BASE_DIR)/lib
-+#INSTALL_MAN_DIR = $(INSTALL_BASE_DIR)/share/man
-+#INSTALL_MAN3_DIR = $(INSTALL_MAN_DIR)/man3
-
- # SunOS, Linux
- PLATFORM=$(shell uname)
-@@ -45,7 +45,7 @@
-
- WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \
- -Wcast-align -Wwrite-strings -Wredundant-decls
--CC = gcc
-+#CC = gcc
-
- # gcc-specific options (not valid for g++)
- ifeq ($(CC),gcc)
-@@ -58,7 +58,7 @@
- FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \
- $(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR)
- SOFT_CFLAGS = $(WARN) $(FLAGS)
--CFLAGS = $(WARN) -Werror $(FLAGS)
-+CFLAGS = $(WARN) $(FLAGS)
- LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
- ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \
- ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \
-@@ -66,7 +66,7 @@
- ruli_getaddrinfo.o
- SHAREDOBJ = $(LIBOBJ:%.o=%.os)
- SONAME = libruli.so.4
--LDFLAGS = -L$(OOP_LIB_DIR)
-+#LDFLAGS = -L$(OOP_LIB_DIR)
-
- COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c
- SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c
-@@ -89,19 +89,19 @@
- strip: ruli
- strip $(SONAME) libruli.a
-
--.PHONY: install
--install: ruli
-- mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR)
-- cp $(SONAME) libruli.a $(INSTALL_LIB_DIR)
-- cp *.h $(INSTALL_INCLUDE_DIR)
-- cp ../doc/man/*.3 $(INSTALL_MAN3_DIR)
-- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so
-- @echo
-- @echo "REMINDER:"
-- @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:"
-- @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf"
-- @echo "# ldconfig"
-- @echo
-+#.PHONY: install
-+#install: ruli
-+# mkdir -p $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_MAN3_DIR)
-+# cp $(SONAME) libruli.a $(INSTALL_LIB_DIR)
-+# cp *.h $(INSTALL_INCLUDE_DIR)
-+# cp ../doc/man/*.3 $(INSTALL_MAN3_DIR)
-+# cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so
-+# @echo
-+# @echo "REMINDER:"
-+# @echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:"
-+# @echo "# echo $(INSTALL_LIB_DIR) >> /etc/ld.so.conf"
-+# @echo "# ldconfig"
-+# @echo
-
- .PHONY: ruli
- ruli: $(SONAME) libruli.a
-
-
diff --git a/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-networking/recipes-support/ruli/ruli_0.36.bb
index 885796d2a59..b82a3d08e84 100644
--- a/meta-networking/recipes-support/ruli/ruli_0.36.bb
+++ b/meta-networking/recipes-support/ruli/ruli_0.36.bb
@@ -8,18 +8,27 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
DEPENDS = "liboop"
SRC_URI = "http://download.savannah.gnu.org/releases/ruli/ruli_${PV}.orig.tar.gz \
- file://Makefile.patch \
file://0001-Fix-build-with-format-string-checks.patch \
file://0001-src-ruli_addr.c-Add-missing-format-string.patch \
+ file://0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch \
+ file://0001-Make-space-for-flags-from-environment.patch \
"
SRC_URI[md5sum] = "e73fbfdeadddb68a703a70cea5271468"
SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a3999dbfa"
-do_install1() {
- install -d ${D}${includedir}/ruli
- install -d ${D}${libdir}
- install -m 0644 ${S}/src/ruli*.h ${D}${includedir}/ruli
- install -m 0644 ${S}/src/libruli.so ${D}${libdir}
- install -m 0644 ${S}/src/libruli.so.4 ${D}${libdir}
+B = "${S}"
+
+EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" INSTALL_BASE_DIR="${D}${exec_prefix}"'
+
+do_configure() {
+ touch configure-stamp
+}
+
+do_install() {
+ oe_runmake install
}
+
+PACKAGES =+ "${PN}-bin"
+
+FILES_${PN} =+ "${bindir}"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 13/17] networkmanager: Upgrade 1.18.2 -> 1.18.4
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (11 preceding siblings ...)
2020-01-03 2:49 ` [zeus 12/17] ruli: Fix install step and build samples too Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 14/17] networkmanager: do not deploy unnecessary udev rule file Armin Kuster
` (4 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1db745db41e31c61448743842104d92a61e7ddfb)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} (97%)
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
similarity index 97%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
index 0d6e1a0b0d2..085807c4ce9 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
@@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
file://musl/0002-Fix-build-with-musl.patch \
"
-SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9"
-SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3"
+SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
+SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
S = "${WORKDIR}/NetworkManager-${PV}"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 14/17] networkmanager: do not deploy unnecessary udev rule file
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (12 preceding siblings ...)
2020-01-03 2:49 ` [zeus 13/17] networkmanager: Upgrade 1.18.2 -> 1.18.4 Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 15/17] gpsd: Backport a memory leak fix Armin Kuster
` (3 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Stefan Agner <stefan.agner@toradex.com>
The 84-nm-drivers.rules is not required for systemd-udevd versions
v210 and later. The file has been split into a separate file so
distributions with a new enough systemd version can drop it. See
also:
https://github.com/NetworkManager/NetworkManager/commit/1e0375826252abf9aab2aef273a2a24cd08c9f42
I noticed this while investigating into a warning show during
bootup:
/usr/lib/udev/rules.d/84-nm-drivers.rules:10 Invalid value "/bin/sh -c
'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}" for PROGRAM
(char 24: invalid substitution type), ignoring, but please fix it.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 82ecc0e69fe3920360d1ba8bd1b5e6ede164de42)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../networkmanager/networkmanager_1.18.4.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
index 085807c4ce9..27508c4d938 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
@@ -141,8 +141,11 @@ do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run
- # For read-only filesystem, do not create links during bootup
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ # For read-only filesystem, do not create links during bootup
ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager
+
+ # systemd v210 and newer do not need this rule file
+ rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules
fi
}
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 15/17] gpsd: Backport a memory leak fix
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (13 preceding siblings ...)
2020-01-03 2:49 ` [zeus 14/17] networkmanager: do not deploy unnecessary udev rule file Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 16/17] python-more-itertools: downgrade 7.2.0 -> 5.0.0 Armin Kuster
` (2 subsequent siblings)
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../0001-gps_shm_close-Free-privdata.patch | 37 +++++++++++++++++++
meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
new file mode 100644
index 00000000000..9b38015800c
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
@@ -0,0 +1,37 @@
+From 2a4b3bcde0d73a3a4a6644d5f944ac9d16023ba9 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@stusta.de>
+Date: Mon, 21 Oct 2019 13:53:25 +0300
+Subject: gps_shm_close: Free privdata
+
+Previously every open/close cycle leaked privdata.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Gary E. Miller <gem@rellim.com>
+
+Upstream-Status: Backport
+---
+ libgps_shm.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libgps_shm.c b/libgps_shm.c
+index d93972bba..12bb3760b 100644
+--- a/libgps_shm.c
++++ b/libgps_shm.c
+@@ -163,8 +163,12 @@ int gps_shm_read(struct gps_data_t *gpsdata)
+
+ void gps_shm_close(struct gps_data_t *gpsdata)
+ {
+- if (PRIVATE(gpsdata) && PRIVATE(gpsdata)->shmseg != NULL)
+- (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg);
++ if (PRIVATE(gpsdata)) {
++ if (PRIVATE(gpsdata)->shmseg != NULL)
++ (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg);
++ free(PRIVATE(gpsdata));
++ gpsdata->privdata = NULL;
++ }
+ }
+
+ int gps_shm_mainloop(struct gps_data_t *gpsdata, int timeout,
+--
+2.20.1
+
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb
index a28d59dce13..054af40829e 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb
@@ -9,6 +9,7 @@ EXTRANATIVEPATH += "chrpath-native"
SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
+ file://0001-gps_shm_close-Free-privdata.patch \
"
SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b"
SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 16/17] python-more-itertools: downgrade 7.2.0 -> 5.0.0
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (14 preceding siblings ...)
2020-01-03 2:49 ` [zeus 15/17] gpsd: Backport a memory leak fix Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 2:49 ` [zeus 17/17] libqmi: Upgrade 1.24.0 -> 1.24.2 Armin Kuster
2020-01-03 3:38 ` [zeus 00/17] Patch review Khem Raj
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Hongxu Jia <hongxu.jia@windriver.com>
Python 2.7 is no longer supported. The 5.0.0 release will be the last
version targeting Python 2.7. [1]
[1] https://github.com/erikrose/more-itertools/commit/560b045b430e8292c18cf5283de4fdc3e13e56f7
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-devtools/python/python-more-itertools.inc | 3 ---
.../recipes-devtools/python/python-more-itertools_5.0.0.bb | 7 +++++++
.../recipes-devtools/python/python-more-itertools_7.2.0.bb | 2 --
.../python/python3-more-itertools_7.2.0.bb | 3 +++
4 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb
delete mode 100644 meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb
diff --git a/meta-python/recipes-devtools/python/python-more-itertools.inc b/meta-python/recipes-devtools/python/python-more-itertools.inc
index 8d814a6f032..33095b3d387 100644
--- a/meta-python/recipes-devtools/python/python-more-itertools.inc
+++ b/meta-python/recipes-devtools/python/python-more-itertools.inc
@@ -2,6 +2,3 @@ DESCRIPTION = "More routines for operating on iterables, beyond itertools"
HOMEPAGE = "https://github.com/erikrose/more-itertools"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5"
-
-SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4"
-SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"
diff --git a/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb b/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb
new file mode 100644
index 00000000000..6c44df40a3a
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb
@@ -0,0 +1,7 @@
+inherit pypi setuptools
+require python-more-itertools.inc
+
+SRC_URI[md5sum] = "f2ea58aa336ce6c13b7b225b3bbe305d"
+SRC_URI[sha256sum] = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"
+
+PE = "1"
diff --git a/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb b/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb
deleted file mode 100644
index 0702aad4efb..00000000000
--- a/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit pypi setuptools
-require python-more-itertools.inc
diff --git a/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb b/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb
index 28ddf88fb85..06d45ce5453 100644
--- a/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb
+++ b/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb
@@ -1,2 +1,5 @@
inherit pypi setuptools3
require python-more-itertools.inc
+
+SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4"
+SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [zeus 17/17] libqmi: Upgrade 1.24.0 -> 1.24.2
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (15 preceding siblings ...)
2020-01-03 2:49 ` [zeus 16/17] python-more-itertools: downgrade 7.2.0 -> 5.0.0 Armin Kuster
@ 2020-01-03 2:49 ` Armin Kuster
2020-01-03 3:38 ` [zeus 00/17] Patch review Khem Raj
17 siblings, 0 replies; 21+ messages in thread
From: Armin Kuster @ 2020-01-03 2:49 UTC (permalink / raw)
To: openembedded-devel
From: Adrian Bunk <bunk@stusta.de>
This is a bugfix release on the 1.24 stable branch.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../libqmi/{libqmi_1.24.0.bb => libqmi_1.24.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.0.bb => libqmi_1.24.2.bb} (85%)
diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.0.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.2.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.24.0.bb
rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.24.2.bb
index 9b89e1dd8e3..35a58d2f1d4 100644
--- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.0.bb
+++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.2.bb
@@ -14,8 +14,8 @@ inherit autotools pkgconfig bash-completion
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "4b181c0a8b933226ce3dce09565fe8f8"
-SRC_URI[sha256sum] = "aeb69f90c273467cce246176cba0967c6413f1995a976992770a597c4fe28c79"
+SRC_URI[md5sum] = "e49c419112d708b5301af7ccc2c090ff"
+SRC_URI[sha256sum] = "4ae4e476f960dbc0d04b1c0368776eb78edffd4421f3e4c074bb2bfb6375b282"
PACKAGECONFIG ??= "udev mbim"
PACKAGECONFIG[udev] = ",--without-udev,libgudev"
--
2.17.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [zeus 00/17] Patch review
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
` (16 preceding siblings ...)
2020-01-03 2:49 ` [zeus 17/17] libqmi: Upgrade 1.24.0 -> 1.24.2 Armin Kuster
@ 2020-01-03 3:38 ` Khem Raj
2020-01-03 8:49 ` Adrian Bunk
2020-01-03 18:08 ` akuster808
17 siblings, 2 replies; 21+ messages in thread
From: Khem Raj @ 2020-01-03 3:38 UTC (permalink / raw)
To: Armin Kuster; +Cc: openembeded-devel
On Thu, Jan 2, 2020 at 6:49 PM Armin Kuster <akuster808@gmail.com> wrote:
>
> Please have comments back by Saturday.
>
> The following changes since commit fbe4cf8d56eea586c096621e7c913b24bd99c9c6:
>
> gtkwave: add the libtirpc dependence and config (2019-12-17 21:57:51 -0800)
>
> are available in the Git repository at:
>
> https://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
> http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
>
> Adrian Bunk (3):
> networkmanager: Upgrade 1.18.2 -> 1.18.4
> gpsd: Backport a memory leak fix
> libqmi: Upgrade 1.24.0 -> 1.24.2
>
> Changqing Li (1):
> xfce-dusk-gtk3: correct invalid SRC_URI
>
> Hongxu Jia (1):
> python-more-itertools: downgrade 7.2.0 -> 5.0.0
>
> Kai Kang (1):
> fltk: fix build error when enable package config examples
>
> Khem Raj (9):
> grpc: Define libdir and cmakedir in terms of multilib
> tinyalsa: fix installation libdir path to match multilibs
> libqb: Add --enable-nosection-fallback with mips64/clang
> x11vnc: Fix build for 32bit arches with 64bit time_t
> evtest: Fix build for 32bit arches with 64bit time_t
> lirc: Fix build for 32bit arches with 64bit time_t
> utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit
> time_t
> directfb: Fix build for 32bit arches with 64bit time_t
> ruli: Fix install step and build samples too
>
64bit time_t fixes are not necessary but are not hurtful either, since the
C libraries in zeus do not have the needed bits to enable 64bit time_t
so unless someone else has issues with it, I am fine to bring them to zeus
> Stefan Agner (1):
> networkmanager: do not deploy unnecessary udev rule file
>
> zhangxiao (1):
> syslog-ng: Fix multilib header conflict - syslog-ng-config.h
>
> .../recipes-multimedia/tinyalsa/tinyalsa.bb | 4 +-
> ...L_-path-instead-of-hardcoding-bin-li.patch | 46 +++++
> ...ger_1.18.2.bb => networkmanager_1.18.4.bb} | 9 +-
> .../recipes-devtools/grpc/grpc_1.24.1.bb | 4 +-
> ...-Fix-build-with-format-string-checks.patch | 29 ++-
> ...ake-space-for-flags-from-environment.patch | 95 +++++++++
> ...v-Mark-prev_addr_list_size-as-unused.patch | 35 ++++
> .../recipes-support/ruli/files/Makefile.patch | 122 ------------
> .../recipes-support/ruli/ruli_0.36.bb | 23 ++-
> .../{libqmi_1.24.0.bb => libqmi_1.24.2.bb} | 4 +-
> ...ld-on-32bit-arches-with-64bit-time_t.patch | 40 ++++
> .../recipes-connectivity/lirc/lirc_0.9.4d.bb | 1 +
> meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +-
> .../recipes-graphics/directfb/directfb.inc | 3 +-
> ...ld-on-32bit-arches-with-64bit-time_t.patch | 139 +++++++++++++
> ...ld-on-32bit-arches-with-64bit-time_t.patch | 111 +++++++++++
> .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 5 +-
> .../0001-gps_shm_close-Free-privdata.patch | 37 ++++
> meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 1 +
> meta-oe/recipes-support/fltk/fltk.bb | 7 +-
> ...-when-enable-package-config-examples.patch | 182 ++++++++++++++++++
> .../recipes-support/syslog-ng/syslog-ng.inc | 4 +-
> ...ld-on-32bit-arches-with-64bit-time_t.patch | 76 ++++++++
> .../utouch/utouch-evemu_git.bb | 4 +-
> ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++
> ...tat.h-for-fixing-build-issue-on-musl.patch | 0
> .../remove-man-page-creation.patch | 0
> .../utouch/utouch-frame_git.bb | 1 +
> ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++
> meta-oe/recipes-test/evtest/evtest_1.34.bb | 6 +-
> .../python/python-more-itertools.inc | 3 -
> .../python/python-more-itertools_5.0.0.bb | 7 +
> .../python/python-more-itertools_7.2.0.bb | 2 -
> .../python/python3-more-itertools_7.2.0.bb | 3 +
> .../xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb | 2 +-
> 35 files changed, 935 insertions(+), 158 deletions(-)
> create mode 100644 meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
> rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} (94%)
> create mode 100644 meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
> create mode 100644 meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch
> delete mode 100644 meta-networking/recipes-support/ruli/files/Makefile.patch
> rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.0.bb => libqmi_1.24.2.bb} (85%)
> create mode 100644 meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
> create mode 100644 meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
> create mode 100644 meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
> create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
> create mode 100644 meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
> create mode 100644 meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
> create mode 100644 meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
> rename meta-oe/recipes-support/utouch/{files => utouch-frame}/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch (100%)
> rename meta-oe/recipes-support/utouch/{files => utouch-frame}/remove-man-page-creation.patch (100%)
> create mode 100644 meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
> create mode 100644 meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb
> delete mode 100644 meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [zeus 00/17] Patch review
2020-01-03 3:38 ` [zeus 00/17] Patch review Khem Raj
@ 2020-01-03 8:49 ` Adrian Bunk
2020-01-03 18:08 ` akuster808
1 sibling, 0 replies; 21+ messages in thread
From: Adrian Bunk @ 2020-01-03 8:49 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On Thu, Jan 02, 2020 at 07:38:38PM -0800, Khem Raj wrote:
> On Thu, Jan 2, 2020 at 6:49 PM Armin Kuster <akuster808@gmail.com> wrote:
>...
> > Khem Raj (9):
> > grpc: Define libdir and cmakedir in terms of multilib
> > tinyalsa: fix installation libdir path to match multilibs
> > libqb: Add --enable-nosection-fallback with mips64/clang
> > x11vnc: Fix build for 32bit arches with 64bit time_t
> > evtest: Fix build for 32bit arches with 64bit time_t
> > lirc: Fix build for 32bit arches with 64bit time_t
> > utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit
> > time_t
> > directfb: Fix build for 32bit arches with 64bit time_t
> > ruli: Fix install step and build samples too
> >
>
> 64bit time_t fixes are not necessary but are not hurtful either, since the
> C libraries in zeus do not have the needed bits to enable 64bit time_t
> so unless someone else has issues with it, I am fine to bring them to zeus
>...
There are zero benefits and a non-zero regression risk if backporting them,
I would recommend against adding them to zeus.
cu
Adrian
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [zeus 00/17] Patch review
2020-01-03 3:38 ` [zeus 00/17] Patch review Khem Raj
2020-01-03 8:49 ` Adrian Bunk
@ 2020-01-03 18:08 ` akuster808
1 sibling, 0 replies; 21+ messages in thread
From: akuster808 @ 2020-01-03 18:08 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On 1/2/20 7:38 PM, Khem Raj wrote:
> On Thu, Jan 2, 2020 at 6:49 PM Armin Kuster <akuster808@gmail.com> wrote:
>> Please have comments back by Saturday.
>>
>> The following changes since commit fbe4cf8d56eea586c096621e7c913b24bd99c9c6:
>>
>> gtkwave: add the libtirpc dependence and config (2019-12-17 21:57:51 -0800)
>>
>> are available in the Git repository at:
>>
>> https://git.openembedded.org/meta-openembedded-contrib stable/zeus-nut
>> http://cgit.openembedded.org/meta-openembedded-contrib/log/?h=stable/zeus-nut
>>
>> Adrian Bunk (3):
>> networkmanager: Upgrade 1.18.2 -> 1.18.4
>> gpsd: Backport a memory leak fix
>> libqmi: Upgrade 1.24.0 -> 1.24.2
>>
>> Changqing Li (1):
>> xfce-dusk-gtk3: correct invalid SRC_URI
>>
>> Hongxu Jia (1):
>> python-more-itertools: downgrade 7.2.0 -> 5.0.0
>>
>> Kai Kang (1):
>> fltk: fix build error when enable package config examples
>>
>> Khem Raj (9):
>> grpc: Define libdir and cmakedir in terms of multilib
>> tinyalsa: fix installation libdir path to match multilibs
>> libqb: Add --enable-nosection-fallback with mips64/clang
>> x11vnc: Fix build for 32bit arches with 64bit time_t
>> evtest: Fix build for 32bit arches with 64bit time_t
>> lirc: Fix build for 32bit arches with 64bit time_t
>> utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit
>> time_t
>> directfb: Fix build for 32bit arches with 64bit time_t
>> ruli: Fix install step and build samples too
>>
> 64bit time_t fixes are not necessary but are not hurtful either, since the
> C libraries in zeus do not have the needed bits to enable 64bit time_t
> so unless someone else has issues with it, I am fine to bring them to zeus
will drop the 64bit time_t changes.
- armin
>
>> Stefan Agner (1):
>> networkmanager: do not deploy unnecessary udev rule file
>>
>> zhangxiao (1):
>> syslog-ng: Fix multilib header conflict - syslog-ng-config.h
>>
>> .../recipes-multimedia/tinyalsa/tinyalsa.bb | 4 +-
>> ...L_-path-instead-of-hardcoding-bin-li.patch | 46 +++++
>> ...ger_1.18.2.bb => networkmanager_1.18.4.bb} | 9 +-
>> .../recipes-devtools/grpc/grpc_1.24.1.bb | 4 +-
>> ...-Fix-build-with-format-string-checks.patch | 29 ++-
>> ...ake-space-for-flags-from-environment.patch | 95 +++++++++
>> ...v-Mark-prev_addr_list_size-as-unused.patch | 35 ++++
>> .../recipes-support/ruli/files/Makefile.patch | 122 ------------
>> .../recipes-support/ruli/ruli_0.36.bb | 23 ++-
>> .../{libqmi_1.24.0.bb => libqmi_1.24.2.bb} | 4 +-
>> ...ld-on-32bit-arches-with-64bit-time_t.patch | 40 ++++
>> .../recipes-connectivity/lirc/lirc_0.9.4d.bb | 1 +
>> meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 6 +-
>> .../recipes-graphics/directfb/directfb.inc | 3 +-
>> ...ld-on-32bit-arches-with-64bit-time_t.patch | 139 +++++++++++++
>> ...ld-on-32bit-arches-with-64bit-time_t.patch | 111 +++++++++++
>> .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 5 +-
>> .../0001-gps_shm_close-Free-privdata.patch | 37 ++++
>> meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 1 +
>> meta-oe/recipes-support/fltk/fltk.bb | 7 +-
>> ...-when-enable-package-config-examples.patch | 182 ++++++++++++++++++
>> .../recipes-support/syslog-ng/syslog-ng.inc | 4 +-
>> ...ld-on-32bit-arches-with-64bit-time_t.patch | 76 ++++++++
>> .../utouch/utouch-evemu_git.bb | 4 +-
>> ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++
>> ...tat.h-for-fixing-build-issue-on-musl.patch | 0
>> .../remove-man-page-creation.patch | 0
>> .../utouch/utouch-frame_git.bb | 1 +
>> ...ld-on-32bit-arches-with-64bit-time_t.patch | 41 ++++
>> meta-oe/recipes-test/evtest/evtest_1.34.bb | 6 +-
>> .../python/python-more-itertools.inc | 3 -
>> .../python/python-more-itertools_5.0.0.bb | 7 +
>> .../python/python-more-itertools_7.2.0.bb | 2 -
>> .../python/python3-more-itertools_7.2.0.bb | 3 +
>> .../xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb | 2 +-
>> 35 files changed, 935 insertions(+), 158 deletions(-)
>> create mode 100644 meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch
>> rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} (94%)
>> create mode 100644 meta-networking/recipes-support/ruli/files/0001-Make-space-for-flags-from-environment.patch
>> create mode 100644 meta-networking/recipes-support/ruli/files/0001-ruli_srv-Mark-prev_addr_list_size-as-unused.patch
>> delete mode 100644 meta-networking/recipes-support/ruli/files/Makefile.patch
>> rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.0.bb => libqmi_1.24.2.bb} (85%)
>> create mode 100644 meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
>> create mode 100644 meta-oe/recipes-graphics/directfb/directfb/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
>> create mode 100644 meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
>> create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch
>> create mode 100644 meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
>> create mode 100644 meta-oe/recipes-support/utouch/utouch-evemu/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
>> create mode 100644 meta-oe/recipes-support/utouch/utouch-frame/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
>> rename meta-oe/recipes-support/utouch/{files => utouch-frame}/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch (100%)
>> rename meta-oe/recipes-support/utouch/{files => utouch-frame}/remove-man-page-creation.patch (100%)
>> create mode 100644 meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
>> create mode 100644 meta-python/recipes-devtools/python/python-more-itertools_5.0.0.bb
>> delete mode 100644 meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb
>>
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2020-01-03 18:08 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-03 2:48 [zeus 00/17] Patch review Armin Kuster
2020-01-03 2:48 ` [zeus 01/17] grpc: Define libdir and cmakedir in terms of multilib Armin Kuster
2020-01-03 2:48 ` [zeus 02/17] tinyalsa: fix installation libdir path to match multilibs Armin Kuster
2020-01-03 2:49 ` [zeus 03/17] libqb: Add --enable-nosection-fallback with mips64/clang Armin Kuster
2020-01-03 2:49 ` [zeus 04/17] xfce-dusk-gtk3: correct invalid SRC_URI Armin Kuster
2020-01-03 2:49 ` [zeus 05/17] fltk: fix build error when enable package config examples Armin Kuster
2020-01-03 2:49 ` [zeus 06/17] syslog-ng: Fix multilib header conflict - syslog-ng-config.h Armin Kuster
2020-01-03 2:49 ` [zeus 07/17] x11vnc: Fix build for 32bit arches with 64bit time_t Armin Kuster
2020-01-03 2:49 ` [zeus 08/17] evtest: " Armin Kuster
2020-01-03 2:49 ` [zeus 09/17] lirc: " Armin Kuster
2020-01-03 2:49 ` [zeus 10/17] utouch-evemu, utouch-frame: " Armin Kuster
2020-01-03 2:49 ` [zeus 11/17] directfb: " Armin Kuster
2020-01-03 2:49 ` [zeus 12/17] ruli: Fix install step and build samples too Armin Kuster
2020-01-03 2:49 ` [zeus 13/17] networkmanager: Upgrade 1.18.2 -> 1.18.4 Armin Kuster
2020-01-03 2:49 ` [zeus 14/17] networkmanager: do not deploy unnecessary udev rule file Armin Kuster
2020-01-03 2:49 ` [zeus 15/17] gpsd: Backport a memory leak fix Armin Kuster
2020-01-03 2:49 ` [zeus 16/17] python-more-itertools: downgrade 7.2.0 -> 5.0.0 Armin Kuster
2020-01-03 2:49 ` [zeus 17/17] libqmi: Upgrade 1.24.0 -> 1.24.2 Armin Kuster
2020-01-03 3:38 ` [zeus 00/17] Patch review Khem Raj
2020-01-03 8:49 ` Adrian Bunk
2020-01-03 18:08 ` akuster808
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.