* [PATCH 02/17] libinput: update 1.15.2 -> 1.15.5
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 03/17] glib-2.0: update 2.62.4 -> 2.64.2 Alexander Kanavin
` (15 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.15.2.bb => libinput_1.15.5.bb} (92%)
diff --git a/meta/recipes-graphics/wayland/libinput_1.15.2.bb b/meta/recipes-graphics/wayland/libinput_1.15.5.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/libinput_1.15.2.bb
rename to meta/recipes-graphics/wayland/libinput_1.15.5.bb
index 31652cc342..799e1d20dd 100644
--- a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.15.5.bb
@@ -16,8 +16,8 @@ SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
file://run-ptest \
file://determinism.patch \
"
-SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
-SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747"
+SRC_URI[md5sum] = "c9a1b15bb932eaf22f840efe4c3f84eb"
+SRC_URI[sha256sum] = "a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97"
UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 03/17] glib-2.0: update 2.62.4 -> 2.64.2
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
2020-05-03 16:25 ` [PATCH 02/17] libinput: update 1.15.2 -> 1.15.5 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 04/17] glib-networking: update to 2.64.2 Alexander Kanavin
` (14 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Add a couple of missing ptest dependencies.
Drop backports.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-Do-not-ignore-return-value-of-write.patch | 6 +-
...t-write-bindir-into-pkg-config-files.patch | 10 +-
...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 7 +-
...-gio-querymodules-as-libexec_PROGRAM.patch | 6 +-
...ng-about-deprecated-paths-in-schemas.patch | 11 +-
...-correctly-when-building-with-mingw3.patch | 22 ++--
| 3 +-
...on-Run-atomics-test-on-clang-as-well.patch | 10 +-
...dcode-python-path-into-various-tools.patch | 14 +--
...-GSource-iterator-if-iteration-can-m.patch | 43 -------
...-memory-leaks-and-memory-corruption-.patch | 109 ------------------
...e-mutex-unlocking-in-destructor-righ.patch | 36 ------
...ble-more-tests-while-cross-compiling.patch | 32 ++---
.../glib-2.0/glib-2.0/relocate-modules.patch | 10 +-
...{glib-2.0_2.62.4.bb => glib-2.0_2.64.2.bb} | 7 +-
meta/recipes-core/glib-2.0/glib.inc | 6 +-
16 files changed, 68 insertions(+), 264 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.62.4.bb => glib-2.0_2.64.2.bb} (83%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
index 0ebf138d60..f3a0069633 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
@@ -1,4 +1,4 @@
-From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001
+From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 16 Apr 2016 13:28:59 -0700
Subject: [PATCH] Do not ignore return value of write()
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/glib/tests/unix.c b/glib/tests/unix.c
-index 9d55a6c..a07f945 100644
+index 7639d06..f941141 100644
--- a/glib/tests/unix.c
+++ b/glib/tests/unix.c
-@@ -32,14 +32,15 @@ test_pipe (void)
+@@ -33,14 +33,15 @@ test_pipe (void)
GError *error = NULL;
int pipefd[2];
char buf[1024];
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
index edac4c9f75..5fe3aa898e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
+From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -16,13 +16,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gio/meson.build b/gio/meson.build
-index 71e88c4..8ce3987 100644
+index 532b086..98468a3 100644
--- a/gio/meson.build
+++ b/gio/meson.build
-@@ -831,14 +831,14 @@ pkg.generate(libgio,
+@@ -820,14 +820,14 @@ pkg.generate(libgio,
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
- 'giomoduledir=' + giomodulesdir,
+ 'giomoduledir=' + pkgconfig_giomodulesdir,
- 'gio=' + join_paths('${bindir}', 'gio'),
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@@ -43,7 +43,7 @@ index 71e88c4..8ce3987 100644
install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0',
diff --git a/glib/meson.build b/glib/meson.build
-index 91a48f1..978fb73 100644
+index aaf5f00..1e0992b 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -375,9 +375,9 @@ pkg.generate(libglib,
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
index d8cf269bb8..16f2d31496 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -1,4 +1,4 @@
-From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
+From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 15 Mar 2014 22:42:29 -0700
Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
@@ -9,7 +9,7 @@ based systems therefore lets set DATADIRNAME to "share".
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-%% original patch: uclibc_musl_translation.patch
+
---
m4macros/glib-gettext.m4 | 4 ++++
1 file changed, 4 insertions(+)
@@ -29,6 +29,3 @@ index df6fbf0..47db864 100644
*)
CATOBJEXT=.mo
DATADIRNAME=lib
---
-2.17.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index a3d71f2b7a..597864d9ac 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
-From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001
+From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 22 Mar 2016 15:14:58 +0200
Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific]
1 file changed, 1 insertion(+)
diff --git a/gio/meson.build b/gio/meson.build
-index 4e5e021..90a741a 100644
+index 2ef60ed..532b086 100644
--- a/gio/meson.build
+++ b/gio/meson.build
-@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
link_args : noseh_link_args,
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 67ca6240bc..6fd93526ce 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -1,7 +1,7 @@
-From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001
+From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 12 Jun 2015 17:08:46 +0300
-Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas
+Subject: [PATCH] Remove the warning about deprecated paths in schemas
Some schemas in gsettings-desktop-schemas (such as proxy and locale)
are still using deprecated paths, as of 3.16.1. This causes warning
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 13 deletions(-)
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index b8de090..130f89b 100644
+index 7888120..7acbd5b 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
-@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state,
+@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
return;
}
@@ -38,6 +38,3 @@ index b8de090..130f89b 100644
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
---
-2.14.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
index b02169e09b..d075cd3f23 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
@@ -1,4 +1,4 @@
-From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
+From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 95aafc1..9025eb2 100644
+index dab65d2..e8bb2ee 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -13,7 +13,7 @@ test_c_args = [
+@@ -12,7 +12,7 @@ test_c_args = [
'-UG_DISABLE_ASSERT',
]
@@ -26,7 +26,7 @@ index 95aafc1..9025eb2 100644
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
endif
-@@ -120,7 +120,7 @@ if dbus1_dep.found()
+@@ -132,7 +132,7 @@ else
endif
# Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 95aafc1..9025eb2 100644
gio_tests += {
'file' : {},
'gdbus-peer' : {
-@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
+@@ -384,7 +384,7 @@ if host_machine.system() != 'windows'
endif # unix
# Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 95aafc1..9025eb2 100644
gio_tests += {'win32-streams' : {}}
endif
-@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
+@@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
}
endif
@@ -54,10 +54,10 @@ index 95aafc1..9025eb2 100644
'gdbus-example-unix-fd-client' : {
'install' : false,
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index c47133f..cad975f 100644
+index 3dedafc..94605e6 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
+@@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD')
}
endif
@@ -67,7 +67,7 @@ index c47133f..cad975f 100644
glib_tests += {
'gpoll' : {
diff --git a/meson.build b/meson.build
-index 717d1bc..2a3beb8 100644
+index e1b4b79..afb6eaa 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,9 @@ else
@@ -81,10 +81,10 @@ index 717d1bc..2a3beb8 100644
glib_version = meson.project_version()
glib_api_version = '2.0'
diff --git a/tests/meson.build b/tests/meson.build
-index ce30442..5710f2c 100644
+index 6741f8f..12fdc90 100644
--- a/tests/meson.build
+++ b/tests/meson.build
-@@ -66,7 +66,7 @@ test_extra_programs = {
+@@ -73,7 +73,7 @@ test_extra_programs = {
'unicode-collate' : {},
}
--git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
index 3dfef176fd..d33fdd4d8b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
@@ -1,4 +1,4 @@
-From 730803f2bc3f2f1a74f4db809a224066e7eae114 Mon Sep 17 00:00:00 2001
+From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 8 Jan 2020 18:22:46 +0100
Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@@ -8,6 +8,7 @@ not cross-compatible (hardcodes ld and objcopy).
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
gio/tests/resources.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
index 833ad2540e..44482dd2b7 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
@@ -1,4 +1,4 @@
-From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001
+From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 12 Oct 2019 17:46:26 -0700
Subject: [PATCH] meson: Run atomics test on clang as well
@@ -9,15 +9,16 @@ Fixes
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 9731de4..c678931 100644
+index afb6eaa..6aa70f5 100644
--- a/meson.build
+++ b/meson.build
-@@ -1634,7 +1634,7 @@ atomicdefine = '''
+@@ -1692,7 +1692,7 @@ atomicdefine = '''
# We know that we can always use real ("lock free") atomic operations with MSVC
if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
have_atomic_lock_free = true
@@ -26,6 +27,3 @@ index 9731de4..c678931 100644
# Old gcc release may provide
# __sync_bool_compare_and_swap but doesn't define
# __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
---
-2.23.0
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
index 872340df96..1c645f3a9a 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -1,10 +1,11 @@
-From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001
+From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 3 Oct 2017 10:45:55 +0300
-Subject: [PATCH 10/10] Do not hardcode python path into various tools
+Subject: [PATCH] Do not hardcode python path into various tools
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
gobject/glib-genmarshal.in | 2 +-
@@ -12,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
-index 8050981..e693ef3 100755
+index 67d3675..4e92a7a 100755
--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
@@ -1,4 +1,4 @@
@@ -22,7 +23,7 @@ index 8050981..e693ef3 100755
# GDBus - GLib D-Bus Library
#
diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
-index 09e8408..b2f9d99 100755
+index 7380f24..c8abeaa 100755
--- a/gobject/glib-genmarshal.in
+++ b/gobject/glib-genmarshal.in
@@ -1,4 +1,4 @@
@@ -32,7 +33,7 @@ index 09e8408..b2f9d99 100755
# pylint: disable=too-many-lines, missing-docstring, invalid-name
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
-index d4bfd11..051fce4 100755
+index 91ad779..3ebef62 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -1,4 +1,4 @@
@@ -41,6 +42,3 @@ index d4bfd11..051fce4 100755
# If the code below looks horrible and unpythonic, do not panic.
#
---
-2.14.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch b/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch
deleted file mode 100644
index 37b77d567c..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ef2be42998e3fc10299055a5a01f7c791538174c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 3 Feb 2020 15:38:28 +0200
-Subject: [PATCH] GMainContext - Fix GSource iterator if iteration can modify
- the list
-
-We first have to ref the next source and then unref the previous one.
-This might be the last reference to the previous source, and freeing the
-previous source might unref and free the next one which would then leave
-use with a dangling pointer here.
-
-Fixes https://gitlab.gnome.org/GNOME/glib/issues/2031
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/b06c48de7554607ff3fb58d6c0510cfa5088e909]
-
----
- glib/gmain.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index af979c8..a9a287d 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -969,13 +969,17 @@ g_source_iter_next (GSourceIter *iter, GSource **source)
- * GSourceList to be removed from source_lists (if iter->source is
- * the only source in its list, and it is destroyed), so we have to
- * keep it reffed until after we advance iter->current_list, above.
-+ *
-+ * Also we first have to ref the next source before unreffing the
-+ * previous one as unreffing the previous source can potentially
-+ * free the next one.
- */
-+ if (next_source && iter->may_modify)
-+ g_source_ref (next_source);
-
- if (iter->source && iter->may_modify)
- g_source_unref_internal (iter->source, iter->context, TRUE);
- iter->source = next_source;
-- if (iter->source && iter->may_modify)
-- g_source_ref (iter->source);
-
- *source = iter->source;
- return *source != NULL;
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch
deleted file mode 100644
index cf97d9d3db..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 611430a32a46d0dc806a829161e2dccf9c0196a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Mon, 3 Feb 2020 15:35:51 +0200
-Subject: [PATCH] GMainContext - Fix memory leaks and memory corruption when
- freeing sources while freeing a context
-
-Instead of destroying sources directly while freeing the context, and
-potentially freeing them if this was the last reference to them, collect
-new references of all sources in a separate list before and at the same
-time invalidate their context so that they can't access it anymore. Only
-once all sources have their context invalidated, destroy them while
-still keeping a reference to them. Once all sources are destroyed we get
-rid of the additional references and free them if nothing else keeps a
-reference to them anymore.
-
-This fixes a regression introduced by 26056558be in 2012.
-
-The previous code that invalidated the context of each source and then
-destroyed it before going to the next source without keeping an
-additional reference caused memory leaks or memory corruption depending
-on the order of the sources in the sources lists.
-
-If a source was destroyed it might happen that this was the last
-reference to this source, and it would then be freed. This would cause
-the finalize function to be called, which might destroy and unref
-another source and potentially free it. This other source would then
-either
-- go through the normal free logic and change the intern linked list
- between the sources, while other sources that are unreffed as part of
- the main context freeing would not. As such the list would be in an
- inconsistent state and we might dereference freed memory.
-- go through the normal destroy and free logic but because the context
- pointer was already invalidated it would simply mark the source as
- destroyed without actually removing it from the context. This would
- then cause a memory leak because the reference owned by the context is
- not freed.
-
-Fixes https://github.com/gtk-rs/glib/issues/583 while still keeping
-https://bugzilla.gnome.org/show_bug.cgi?id=661767 fixes.
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/aa20167d419c649f34fed06a9463890b41b1eba0]
-
----
- glib/gmain.c | 35 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index a9a287d..10ba2f8 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -538,6 +538,7 @@ g_main_context_unref (GMainContext *context)
- GSourceIter iter;
- GSource *source;
- GList *sl_iter;
-+ GSList *s_iter, *remaining_sources = NULL;
- GSourceList *list;
- guint i;
-
-@@ -557,10 +558,30 @@ g_main_context_unref (GMainContext *context)
-
- /* g_source_iter_next() assumes the context is locked. */
- LOCK_CONTEXT (context);
-- g_source_iter_init (&iter, context, TRUE);
-+
-+ /* First collect all remaining sources from the sources lists and store a
-+ * new reference in a separate list. Also set the context of the sources
-+ * to NULL so that they can't access a partially destroyed context anymore.
-+ *
-+ * We have to do this first so that we have a strong reference to all
-+ * sources and destroying them below does not also free them, and so that
-+ * none of the sources can access the context from their finalize/dispose
-+ * functions. */
-+ g_source_iter_init (&iter, context, FALSE);
- while (g_source_iter_next (&iter, &source))
- {
- source->context = NULL;
-+ remaining_sources = g_slist_prepend (remaining_sources, g_source_ref (source));
-+ }
-+ g_source_iter_clear (&iter);
-+
-+ /* Next destroy all sources. As we still hold a reference to all of them,
-+ * this won't cause any of them to be freed yet and especially prevents any
-+ * source that unrefs another source from its finalize function to be freed.
-+ */
-+ for (s_iter = remaining_sources; s_iter; s_iter = s_iter->next)
-+ {
-+ source = s_iter->data;
- g_source_destroy_internal (source, context, TRUE);
- }
- UNLOCK_CONTEXT (context);
-@@ -585,6 +606,18 @@ g_main_context_unref (GMainContext *context)
- g_cond_clear (&context->cond);
-
- g_free (context);
-+
-+ /* And now finally get rid of our references to the sources. This will cause
-+ * them to be freed unless something else still has a reference to them. Due
-+ * to setting the context pointers in the sources to NULL above, this won't
-+ * ever access the context or the internal linked list inside the GSource.
-+ * We already removed the sources completely from the context above. */
-+ for (s_iter = remaining_sources; s_iter; s_iter = s_iter->next)
-+ {
-+ source = s_iter->data;
-+ g_source_unref_internal (source, NULL, FALSE);
-+ }
-+ g_slist_free (remaining_sources);
- }
-
- /* Helper function used by mainloop/overflow test.
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch b/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch
deleted file mode 100644
index 4c9e9f5182..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3e9d85f1b75e2b1096d9643563d7d17380752fc7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
-Date: Tue, 11 Feb 2020 09:34:38 +0200
-Subject: [PATCH] GMainContext - Move mutex unlocking in destructor right
- before freeing the mutex
-
-This does not have any behaviour changes but is cleaner. The mutex is
-only unlocked now after all operations on the context are done and right
-before freeing the mutex and the context itself.
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/730a75fc8e8271c38fbd5363d1f77a00876b9ddc]
-
----
- glib/gmain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/glib/gmain.c b/glib/gmain.c
-index 10ba2f8..b1df470 100644
---- a/glib/gmain.c
-+++ b/glib/gmain.c
-@@ -584,7 +584,6 @@ g_main_context_unref (GMainContext *context)
- source = s_iter->data;
- g_source_destroy_internal (source, context, TRUE);
- }
-- UNLOCK_CONTEXT (context);
-
- for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next)
- {
-@@ -595,6 +594,7 @@ g_main_context_unref (GMainContext *context)
-
- g_hash_table_destroy (context->sources);
-
-+ UNLOCK_CONTEXT (context);
- g_mutex_clear (&context->mutex);
-
- g_ptr_array_free (context->pending_dispatches, TRUE);
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
index 48899ce852..41ecfa1df8 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
@@ -1,4 +1,4 @@
-From 0061d66057dfd7e7267772df60b36474fb180eed Mon Sep 17 00:00:00 2001
+From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 9 Nov 2015 11:07:27 +0200
Subject: [PATCH] Enable more tests while cross-compiling
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
-index 382dfcc..c171717 100644
+index 788cf97..dab65d2 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -191,7 +191,7 @@ if host_machine.system() != 'windows'
+@@ -203,7 +203,7 @@ if host_machine.system() != 'windows'
# Test programs that need to bring up a session bus (requires dbus-daemon)
have_dbus_daemon = find_program('dbus-daemon', required : false).found()
@@ -27,8 +27,8 @@ index 382dfcc..c171717 100644
annotate_args = [
'--annotate', 'org.project.Bar', 'Key1', 'Value1',
'--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
-@@ -465,12 +465,12 @@ if installed_tests_enabled
- install_data('static-link.py', install_dir : installed_tests_execdir)
+@@ -548,12 +548,12 @@ if installed_tests_enabled
+ endforeach
endif
-if not meson.is_cross_build() or meson.has_exe_wrapper()
@@ -42,7 +42,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate-source',
-@@ -494,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_gresource = custom_target('test.gresource',
input : 'test.gresource.xml',
output : 'test.gresource',
@@ -51,7 +51,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -505,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources2_c = custom_target('test_resources2.c',
input : 'test3.gresource.xml',
output : 'test_resources2.c',
@@ -60,7 +60,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate',
-@@ -516,7 +516,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources2_h = custom_target('test_resources2.h',
input : 'test3.gresource.xml',
output : 'test_resources2.h',
@@ -69,7 +69,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate',
-@@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
input : 'test2.gresource.xml',
depends : big_test_resource,
output : 'test_resources.c',
@@ -78,7 +78,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -539,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
digit_test_resources_c = custom_target('digit_test_resources.c',
input : '111_digit_test.gresource.xml',
output : 'digit_test_resources.c',
@@ -87,7 +87,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -550,7 +550,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
digit_test_resources_h = custom_target('digit_test_resources.h',
input : '111_digit_test.gresource.xml',
output : 'digit_test_resources.h',
@@ -96,11 +96,11 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--generate',
-@@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
- # LLVM once that support is in a stable release.
- objcopy = find_program('objcopy', required : false)
+@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
-- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found()
+ ld = find_program('ld', required : false)
+
+- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+ if not meson.is_cross_build()
test_gresource_binary = custom_target('test5.gresource',
input : 'test5.gresource.xml',
@@ -110,7 +110,7 @@ index 382dfcc..c171717 100644
'--target=@OUTPUT@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
-@@ -595,7 +595,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary_c = custom_target('test_resources_binary.c',
input : 'test5.gresource.xml',
output : 'test_resources_binary.c',
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index fc320dcab8..fe87482ae2 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From 8c623acdbea3ecc2812bbaafcfc892758fa978da Mon Sep 17 00:00:00 2001
+From 2a715765c6ceb2e8b4cc42e060aee75016111d1a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
@@ -19,11 +19,11 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gio/giomodule.c b/gio/giomodule.c
-index 1007abd..5380982 100644
+index c420260..a023745 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -44,6 +44,8 @@
- #include "gnetworkmonitor.h"
+@@ -47,6 +47,8 @@
+ #include "gmemorymonitordbus.h"
#ifdef G_OS_WIN32
#include "gregistrysettingsbackend.h"
+#else
@@ -32,7 +32,7 @@ index 1007abd..5380982 100644
#include <glib/gstdio.h>
@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
- #endif
+ NULL);
g_free (install_dir);
#else
- module_dir = g_strdup (GIO_MODULE_DIR);
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb
similarity index 83%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb
index d496235003..1a8e9d659e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.64.2.bb
@@ -16,15 +16,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
- file://0011-GMainContext-Fix-GSource-iterator-if-iteration-can-m.patch \
- file://0012-GMainContext-Fix-memory-leaks-and-memory-corruption-.patch \
- file://0013-GMainContext-Move-mutex-unlocking-in-destructor-righ.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"
-SRC_URI[md5sum] = "d52234ecba128932bed90bbc3553bfe5"
-SRC_URI[sha256sum] = "4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc"
+SRC_URI[md5sum] = "78b6bda8664763a09bd12d864c0ba46c"
+SRC_URI[sha256sum] = "9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 7ebed0e5fd..fb84db83c2 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -30,6 +30,8 @@ LEAD_SONAME = "libglib-2.0.*"
inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages features_check
+DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
+
GTKDOC_MESON_OPTION = "gtk_doc"
# This avoids the need to depend on target python3, which in case of mingw is not even possible.
@@ -42,7 +44,7 @@ PACKAGECONFIG ??= "system-pcre libmount \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
# To use the system pcre it must be configured with --enable-unicode-properties
PACKAGECONFIG[system-pcre] = "-Dinternal_pcre=false,-Dinternal_pcre=true,libpcre"
-PACKAGECONFIG[libmount] = "-Dlibmount=true,-Dlibmount=false,util-linux"
+PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux"
PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
# libelf is auto-detected without a configuration option
PACKAGECONFIG[libelf] = ",,elfutils"
@@ -168,6 +170,8 @@ RDEPENDS_${PN}-ptest += "\
${PN}-locale-th \
python3-core \
python3-modules \
+ python3-dbusmock \
+ ${PN}-codegen \
"
RDEPENDS_${PN}-ptest_append_libc-glibc = "\
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 04/17] glib-networking: update to 2.64.2
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
2020-05-03 16:25 ` [PATCH 02/17] libinput: update 1.15.2 -> 1.15.5 Alexander Kanavin
2020-05-03 16:25 ` [PATCH 03/17] glib-2.0: update 2.62.4 -> 2.64.2 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 05/17] gptfdisk: update to 1.0.5 Alexander Kanavin
` (13 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{glib-networking_2.62.3.bb => glib-networking_2.64.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.62.3.bb => glib-networking_2.64.2.bb} (88%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb b/meta/recipes-core/glib-networking/glib-networking_2.64.2.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.62.3.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.64.2.bb
index e9596ce1a4..8300d20e0c 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.64.2.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "a758ca62bd54982a798b39c744cbf783"
-SRC_URI[archive.sha256sum] = "8ca1f86f23a76b5c7640624f7d5490705c78e81375e1741c9a1c41ce7f8f7ff7"
+SRC_URI[archive.md5sum] = "7f8c7ffe2616be4ef4232f2574353dab"
+SRC_URI[archive.sha256sum] = "45def0715c551f9b0b41a4e4f730ac95f3d5d4f3de8162260fbf9421cff695a7"
PACKAGECONFIG ??= "gnutls"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 05/17] gptfdisk: update to 1.0.5
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (2 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 04/17] glib-networking: update to 2.64.2 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 06/17] clutter-1.0: update to 1.26.4 Alexander Kanavin
` (12 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Add a patch to correctly include curses header.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...gptcurses-correctly-include-curses.h.patch | 27 +++++++++++++++++++
.../{gptfdisk_1.0.4.bb => gptfdisk_1.0.5.bb} | 8 +++---
2 files changed, 32 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
rename meta/recipes-devtools/fdisk/{gptfdisk_1.0.4.bb => gptfdisk_1.0.5.bb} (78%)
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
new file mode 100644
index 0000000000..67689e838a
--- /dev/null
+++ b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch
@@ -0,0 +1,27 @@
+From 607b0bed5e8a5f5c3754cd6ffcf499d8134c37f9 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 30 Mar 2020 17:11:19 +0200
+Subject: [PATCH] gptcurses: correctly include curses.h
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ gptcurses.cc | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/gptcurses.cc b/gptcurses.cc
+index 1b18cf2..4ebfde1 100644
+--- a/gptcurses.cc
++++ b/gptcurses.cc
+@@ -23,11 +23,7 @@
+ #include <iostream>
+ #include <string>
+ #include <sstream>
+-#ifdef __APPLE__
+ #include <ncurses.h>
+-#else
+-#include <ncursesw/ncurses.h>
+-#endif
+ #include "gptcurses.h"
+ #include "support.h"
+
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb
similarity index 78%
rename from meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb
rename to meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb
index b043c96543..c7850f03ca 100644
--- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.4.bb
+++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.5.bb
@@ -6,9 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
DEPENDS = "util-linux"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz"
-SRC_URI[md5sum] = "5ecc3c44913bb6b53d3708d1ac7ac295"
-SRC_URI[sha256sum] = "b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
+ file://0001-gptcurses-correctly-include-curses.h.patch \
+ "
+SRC_URI[md5sum] = "58dac67c85e46ca87b587231549aefe6"
+SRC_URI[sha256sum] = "0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 06/17] clutter-1.0: update to 1.26.4
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (3 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 05/17] gptfdisk: update to 1.0.5 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 07/17] diffoscope: update to 143 Alexander Kanavin
` (11 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 2 +-
.../run-installed-tests-with-tap-output.patch | 16 +++++++---------
...utter-1.0_1.26.2.bb => clutter-1.0_1.26.4.bb} | 4 ++--
3 files changed, 10 insertions(+), 12 deletions(-)
rename meta/recipes-graphics/clutter/{clutter-1.0_1.26.2.bb => clutter-1.0_1.26.4.bb} (67%)
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index e0ac819e4c..80472178be 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES ?= "opengl"
DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
PACKAGE_BEFORE_PN += "${PN}-examples"
-AUTOTOOLS_AUXDIR = "${S}/build"
+AUTOTOOLS_AUXDIR = "${S}/build-aux"
EDEPENDS_X11 = "virtual/libx11 libxi libxfixes"
EDEPENDS_GLX = "virtual/libgl"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
index f5c18c5828..fef82eaf92 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
+++ b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
@@ -1,4 +1,4 @@
-From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001
+From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 27 Apr 2015 20:12:33 +0300
Subject: [PATCH] Run installed tests with tap output
@@ -9,14 +9,15 @@ gnome-desktop-testing-runner properly interprets the results.
Upstream-Status: Pending
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
+
---
- build/autotools/glib-tap.mk | 3 ++-
+ build-aux/autotools/glib-tap.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk
-index 7c5f82b..844e17e 100644
---- a/build/autotools/glib-tap.mk
-+++ b/build/autotools/glib-tap.mk
+diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk
+index a4f0dad..51cfa31 100644
+--- a/build-aux/autotools/glib-tap.mk
++++ b/build-aux/autotools/glib-tap.mk
@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
%.test: %$(EXEEXT) Makefile
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
@@ -27,6 +28,3 @@ index 7c5f82b..844e17e 100644
mv $@.tmp $@)
CLEANFILES += $(installed_test_meta_DATA)
---
-2.1.4
-
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb
similarity index 67%
rename from meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb
rename to meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb
index 48b050198a..ee549fbdd5 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb
@@ -2,8 +2,8 @@ require clutter-1.0.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-SRC_URI[archive.md5sum] = "a03482cbacf735eca8c996f210a21ee5"
-SRC_URI[archive.sha256sum] = "e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56"
+SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2"
+SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6"
SRC_URI += "file://install-examples.patch \
file://run-installed-tests-with-tap-output.patch \
file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 07/17] diffoscope: update to 143
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (4 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 06/17] clutter-1.0: update to 1.26.4 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 08/17] avahi: merge avahi-ui into the main recipe Alexander Kanavin
` (10 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../diffoscope/{diffoscope_136.bb => diffoscope_143.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/diffoscope/{diffoscope_136.bb => diffoscope_143.bb} (75%)
diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb b/meta/recipes-support/diffoscope/diffoscope_143.bb
similarity index 75%
rename from meta/recipes-support/diffoscope/diffoscope_136.bb
rename to meta/recipes-support/diffoscope/diffoscope_143.bb
index 3e3e1dfc00..4ba3832d10 100644
--- a/meta/recipes-support/diffoscope/diffoscope_136.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_143.bb
@@ -7,8 +7,8 @@ PYPI_PACKAGE = "diffoscope"
inherit pypi setuptools3
-SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73"
-SRC_URI[sha256sum] = "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15"
+SRC_URI[md5sum] = "a86cf8467a5dec99832d5c082928f937"
+SRC_URI[sha256sum] = "a1fb4dd97af92bb8ce275d1caf465971726919e28efe5f043bd3ea9afb50574a"
RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 08/17] avahi: merge avahi-ui into the main recipe
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (5 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 07/17] diffoscope: update to 143 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-04 21:01 ` [OE-core] " Khem Raj
2020-05-03 16:25 ` [PATCH 09/17] avahi: update to 0.8 Alexander Kanavin
` (9 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
The split was building the same code twice, awkward to maintain,
and causing issues with upgrades.
Disabling the gtk bits can be easily done through the standard
PACKAGECONFIG mechanism when needed.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/distro/include/maintainers.inc | 1 -
.../avahi/avahi-ui_0.7.bb | 54 ----------
meta/recipes-connectivity/avahi/avahi.inc | 86 ----------------
meta/recipes-connectivity/avahi/avahi_0.7.bb | 98 ++++++++++++++++++-
4 files changed, 95 insertions(+), 144 deletions(-)
delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
delete mode 100644 meta/recipes-connectivity/avahi/avahi.inc
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 340cda3300..54b3c5678c 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -57,7 +57,6 @@ RECIPE_MAINTAINER_pn-autoconf = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-automake = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
-RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
deleted file mode 100644
index 1510a0ef4f..0000000000
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-require avahi.inc
-
-inherit features_check
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-
-DEPENDS += "avahi"
-
-AVAHI_GTK = "gtk3"
-
-S = "${WORKDIR}/avahi-${PV}"
-
-PACKAGES += "${PN}-utils avahi-discover"
-
-FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
-FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
-FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
- ${datadir}/avahi/interfaces/avahi-discover.ui \
- ${bindir}/avahi-discover-standalone \
- "
-
-do_install_append () {
- rm ${D}${sysconfdir} -rf
- if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
- if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then
- rm ${D}${nonarch_base_libdir} -rf
- fi
- else
- rm ${D}${base_libdir} -rf
- fi
- rm ${D}${systemd_unitdir} -rf
- # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
- # but not ${base_libdir} here. And the /lib may not exist
- # whithout systemd.
- [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
- rm ${D}${bindir}/avahi-b*
- rm ${D}${bindir}/avahi-p*
- rm ${D}${bindir}/avahi-r*
- rm ${D}${bindir}/avahi-s*
- rm ${D}${includedir}/avahi-c* -rf
- rm ${D}${includedir}/avahi-g* -rf
- rm ${D}${libdir}/libavahi-c*
- rm ${D}${libdir}/libavahi-g*
- rm ${D}${libdir}/pkgconfig/avahi-c*
- rm ${D}${libdir}/pkgconfig/avahi-g*
- rm ${D}${sbindir} -rf
- rm ${D}${datadir}/avahi/a*
- rm ${D}${datadir}/locale/ -rf
- rm ${D}${datadir}/dbus* -rf
- rm ${D}${mandir}/man1/a*
- rm ${D}${mandir}/man5 -rf
- rm ${D}${mandir}/man8 -rf
- rm ${D}${libdir}/girepository-1.0/ -rf
- rm ${D}${datadir}/gir-1.0/ -rf
-}
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
deleted file mode 100644
index 94fe6a16b6..0000000000
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-SUMMARY = "Avahi IPv4LL network address configuration daemon"
-DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
-allows programs to publish and discover services and hosts running on a local network \
-with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
-IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
-configuration from the link-local 169.254.0.0/16 range without the need for a central \
-server.'
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://avahi.org"
-BUGTRACKER = "https://github.com/lathiat/avahi/issues"
-SECTION = "network"
-
-# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
-# python scripts are under GPLv2+
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
- file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
- file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
- file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
-
-SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
- file://fix-CVE-2017-6519.patch \
- "
-
-UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
-SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
-SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
-
-DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
-
-# For gtk related PACKAGECONFIGs: gtk, gtk3
-AVAHI_GTK ?= ""
-
-PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
-PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
-PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
-PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
-PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
-
-inherit autotools pkgconfig gettext gobject-introspection
-
-EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
- --disable-stack-protector \
- --disable-gdbm \
- --disable-mono \
- --disable-monodoc \
- --disable-qt3 \
- --disable-qt4 \
- --disable-python \
- --disable-doxygen-doc \
- --enable-manpages \
- ${EXTRA_OECONF_SYSVINIT} \
- ${EXTRA_OECONF_SYSTEMD} \
- "
-
-# The distro choice determines what init scripts are installed
-EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
-EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
-
-do_configure_prepend() {
- sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
-
- # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
- rm "${S}/common/introspection.m4" || true
-}
-
-do_compile_prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
-}
-
-RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
-
-do_install() {
- autotools_do_install
- rm -rf ${D}/run
- rm -rf ${D}${datadir}/dbus-1/interfaces
- test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
- rm -rf ${D}${libdir}/avahi
-}
-
-PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
-
-FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
-
-RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb
index 24523c7f81..b25cffa3cd 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
@@ -1,4 +1,89 @@
-require avahi.inc
+SUMMARY = "Avahi IPv4LL network address configuration daemon"
+DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
+allows programs to publish and discover services and hosts running on a local network \
+with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
+IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
+configuration from the link-local 169.254.0.0/16 range without the need for a central \
+server.'
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
+HOMEPAGE = "http://avahi.org"
+BUGTRACKER = "https://github.com/lathiat/avahi/issues"
+SECTION = "network"
+
+# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
+# python scripts are under GPLv2+
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+ file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
+ file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
+ file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
+ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
+
+SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
+ file://fix-CVE-2017-6519.patch \
+ "
+
+UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
+SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
+SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
+
+DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
+
+# For gtk related PACKAGECONFIGs: gtk, gtk3
+AVAHI_GTK ?= "gtk3"
+
+PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
+PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
+PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
+PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
+
+inherit autotools pkgconfig gettext gobject-introspection
+
+EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
+ --disable-stack-protector \
+ --disable-gdbm \
+ --disable-mono \
+ --disable-monodoc \
+ --disable-qt3 \
+ --disable-qt4 \
+ --disable-python \
+ --disable-doxygen-doc \
+ --enable-manpages \
+ ${EXTRA_OECONF_SYSVINIT} \
+ ${EXTRA_OECONF_SYSTEMD} \
+ "
+
+# The distro choice determines what init scripts are installed
+EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
+EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
+
+do_configure_prepend() {
+ sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
+
+ # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
+ rm "${S}/common/introspection.m4" || true
+}
+
+do_compile_prepend() {
+ export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
+}
+
+RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
+
+do_install() {
+ autotools_do_install
+ rm -rf ${D}/run
+ rm -rf ${D}${datadir}/dbus-1/interfaces
+ test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
+ rm -rf ${D}${libdir}/avahi
+}
+
+PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
+
+FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
+
+RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
SRC_URI += "file://00avahi-autoipd \
file://99avahi-autoipd \
@@ -8,7 +93,13 @@ SRC_URI += "file://00avahi-autoipd \
inherit update-rc.d systemd useradd
-PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
+PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
+
+FILES_avahi-ui = "${libdir}/libavahi-ui*.so.*"
+FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
+ ${datadir}/avahi/interfaces/avahi-discover.ui \
+ ${bindir}/avahi-discover-standalone \
+ "
LICENSE_libavahi-gobject = "LGPLv2.1+"
LICENSE_avahi-daemon = "LGPLv2.1+"
@@ -46,7 +137,7 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
${sysconfdir}/init.d/avahi-dnsconfd"
FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib"
-FILES_avahi-utils = "${bindir}/avahi-*"
+FILES_avahi-utils = "${bindir}/avahi-* ${bindir}/b* ${datadir}/applications/b*"
RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})"
RDEPENDS_${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
@@ -89,3 +180,4 @@ if [ -z "$D" ]; then
killall -q -HUP dbus-daemon || true
fi
}
+
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 08/17] avahi: merge avahi-ui into the main recipe
2020-05-03 16:25 ` [PATCH 08/17] avahi: merge avahi-ui into the main recipe Alexander Kanavin
@ 2020-05-04 21:01 ` Khem Raj
2020-05-05 11:09 ` Alexander Kanavin
0 siblings, 1 reply; 25+ messages in thread
From: Khem Raj @ 2020-05-04 21:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Alexander Kanavin
remmina from meta-oe depends on avahi-ui so anyway its fixable by
changing the dependency but then it fails to find needed gtk3 support,
please take a look
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/331
On Sun, May 3, 2020 at 9:26 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>
> The split was building the same code twice, awkward to maintain,
> and causing issues with upgrades.
>
> Disabling the gtk bits can be easily done through the standard
> PACKAGECONFIG mechanism when needed.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/conf/distro/include/maintainers.inc | 1 -
> .../avahi/avahi-ui_0.7.bb | 54 ----------
> meta/recipes-connectivity/avahi/avahi.inc | 86 ----------------
> meta/recipes-connectivity/avahi/avahi_0.7.bb | 98 ++++++++++++++++++-
> 4 files changed, 95 insertions(+), 144 deletions(-)
> delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> delete mode 100644 meta/recipes-connectivity/avahi/avahi.inc
>
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index 340cda3300..54b3c5678c 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -57,7 +57,6 @@ RECIPE_MAINTAINER_pn-autoconf = "Robert Yang <liezhi.yang@windriver.com>"
> RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>"
> RECIPE_MAINTAINER_pn-automake = "Robert Yang <liezhi.yang@windriver.com>"
> RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
> -RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>"
> RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>"
> RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
> RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
> diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> deleted file mode 100644
> index 1510a0ef4f..0000000000
> --- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -require avahi.inc
> -
> -inherit features_check
> -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> -
> -DEPENDS += "avahi"
> -
> -AVAHI_GTK = "gtk3"
> -
> -S = "${WORKDIR}/avahi-${PV}"
> -
> -PACKAGES += "${PN}-utils avahi-discover"
> -
> -FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
> -FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
> -FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
> - ${datadir}/avahi/interfaces/avahi-discover.ui \
> - ${bindir}/avahi-discover-standalone \
> - "
> -
> -do_install_append () {
> - rm ${D}${sysconfdir} -rf
> - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
> - if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then
> - rm ${D}${nonarch_base_libdir} -rf
> - fi
> - else
> - rm ${D}${base_libdir} -rf
> - fi
> - rm ${D}${systemd_unitdir} -rf
> - # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
> - # but not ${base_libdir} here. And the /lib may not exist
> - # whithout systemd.
> - [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
> - rm ${D}${bindir}/avahi-b*
> - rm ${D}${bindir}/avahi-p*
> - rm ${D}${bindir}/avahi-r*
> - rm ${D}${bindir}/avahi-s*
> - rm ${D}${includedir}/avahi-c* -rf
> - rm ${D}${includedir}/avahi-g* -rf
> - rm ${D}${libdir}/libavahi-c*
> - rm ${D}${libdir}/libavahi-g*
> - rm ${D}${libdir}/pkgconfig/avahi-c*
> - rm ${D}${libdir}/pkgconfig/avahi-g*
> - rm ${D}${sbindir} -rf
> - rm ${D}${datadir}/avahi/a*
> - rm ${D}${datadir}/locale/ -rf
> - rm ${D}${datadir}/dbus* -rf
> - rm ${D}${mandir}/man1/a*
> - rm ${D}${mandir}/man5 -rf
> - rm ${D}${mandir}/man8 -rf
> - rm ${D}${libdir}/girepository-1.0/ -rf
> - rm ${D}${datadir}/gir-1.0/ -rf
> -}
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> deleted file mode 100644
> index 94fe6a16b6..0000000000
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -SUMMARY = "Avahi IPv4LL network address configuration daemon"
> -DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
> -allows programs to publish and discover services and hosts running on a local network \
> -with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
> -IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
> -configuration from the link-local 169.254.0.0/16 range without the need for a central \
> -server.'
> -AUTHOR = "Lennart Poettering <lennart@poettering.net>"
> -HOMEPAGE = "http://avahi.org"
> -BUGTRACKER = "https://github.com/lathiat/avahi/issues"
> -SECTION = "network"
> -
> -# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
> -# python scripts are under GPLv2+
> -LICENSE = "GPLv2+ & LGPLv2.1+"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
> - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
> - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
> - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
> -
> -SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
> - file://fix-CVE-2017-6519.patch \
> - "
> -
> -UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
> -SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
> -SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
> -
> -DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
> -
> -# For gtk related PACKAGECONFIGs: gtk, gtk3
> -AVAHI_GTK ?= ""
> -
> -PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
> -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> -PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
> -PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
> -PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
> -
> -inherit autotools pkgconfig gettext gobject-introspection
> -
> -EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
> - --disable-stack-protector \
> - --disable-gdbm \
> - --disable-mono \
> - --disable-monodoc \
> - --disable-qt3 \
> - --disable-qt4 \
> - --disable-python \
> - --disable-doxygen-doc \
> - --enable-manpages \
> - ${EXTRA_OECONF_SYSVINIT} \
> - ${EXTRA_OECONF_SYSTEMD} \
> - "
> -
> -# The distro choice determines what init scripts are installed
> -EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
> -EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
> -
> -do_configure_prepend() {
> - sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
> -
> - # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
> - rm "${S}/common/introspection.m4" || true
> -}
> -
> -do_compile_prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
> -}
> -
> -RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
> -
> -do_install() {
> - autotools_do_install
> - rm -rf ${D}/run
> - rm -rf ${D}${datadir}/dbus-1/interfaces
> - test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
> - rm -rf ${D}${libdir}/avahi
> -}
> -
> -PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
> -
> -FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
> -
> -RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> index 24523c7f81..b25cffa3cd 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> @@ -1,4 +1,89 @@
> -require avahi.inc
> +SUMMARY = "Avahi IPv4LL network address configuration daemon"
> +DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
> +allows programs to publish and discover services and hosts running on a local network \
> +with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
> +IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
> +configuration from the link-local 169.254.0.0/16 range without the need for a central \
> +server.'
> +AUTHOR = "Lennart Poettering <lennart@poettering.net>"
> +HOMEPAGE = "http://avahi.org"
> +BUGTRACKER = "https://github.com/lathiat/avahi/issues"
> +SECTION = "network"
> +
> +# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
> +# python scripts are under GPLv2+
> +LICENSE = "GPLv2+ & LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
> + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
> + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
> + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
> +
> +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
> + file://fix-CVE-2017-6519.patch \
> + "
> +
> +UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
> +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
> +SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
> +
> +DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
> +
> +# For gtk related PACKAGECONFIGs: gtk, gtk3
> +AVAHI_GTK ?= "gtk3"
> +
> +PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
> +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
> +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
> +PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
> +
> +inherit autotools pkgconfig gettext gobject-introspection
> +
> +EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
> + --disable-stack-protector \
> + --disable-gdbm \
> + --disable-mono \
> + --disable-monodoc \
> + --disable-qt3 \
> + --disable-qt4 \
> + --disable-python \
> + --disable-doxygen-doc \
> + --enable-manpages \
> + ${EXTRA_OECONF_SYSVINIT} \
> + ${EXTRA_OECONF_SYSTEMD} \
> + "
> +
> +# The distro choice determines what init scripts are installed
> +EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
> +EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
> +
> +do_configure_prepend() {
> + sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
> +
> + # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
> + rm "${S}/common/introspection.m4" || true
> +}
> +
> +do_compile_prepend() {
> + export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
> +}
> +
> +RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
> +
> +do_install() {
> + autotools_do_install
> + rm -rf ${D}/run
> + rm -rf ${D}${datadir}/dbus-1/interfaces
> + test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
> + rm -rf ${D}${libdir}/avahi
> +}
> +
> +PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
> +
> +FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
> +
> +RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
>
> SRC_URI += "file://00avahi-autoipd \
> file://99avahi-autoipd \
> @@ -8,7 +93,13 @@ SRC_URI += "file://00avahi-autoipd \
>
> inherit update-rc.d systemd useradd
>
> -PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
> +PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
> +
> +FILES_avahi-ui = "${libdir}/libavahi-ui*.so.*"
> +FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
> + ${datadir}/avahi/interfaces/avahi-discover.ui \
> + ${bindir}/avahi-discover-standalone \
> + "
>
> LICENSE_libavahi-gobject = "LGPLv2.1+"
> LICENSE_avahi-daemon = "LGPLv2.1+"
> @@ -46,7 +137,7 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
> ${sysconfdir}/init.d/avahi-dnsconfd"
> FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
> FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib"
> -FILES_avahi-utils = "${bindir}/avahi-*"
> +FILES_avahi-utils = "${bindir}/avahi-* ${bindir}/b* ${datadir}/applications/b*"
>
> RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})"
> RDEPENDS_${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
> @@ -89,3 +180,4 @@ if [ -z "$D" ]; then
> killall -q -HUP dbus-daemon || true
> fi
> }
> +
> --
> 2.26.1
>
>
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 08/17] avahi: merge avahi-ui into the main recipe
2020-05-04 21:01 ` [OE-core] " Khem Raj
@ 2020-05-05 11:09 ` Alexander Kanavin
2020-05-05 18:45 ` Khem Raj
0 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-05 11:09 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 15705 bytes --]
This isn't going to work if you're building remmina against poky master, as
the avahi merge patch is not yet there :)
Alex
On Mon, 4 May 2020 at 23:01, Khem Raj <raj.khem@gmail.com> wrote:
> remmina from meta-oe depends on avahi-ui so anyway its fixable by
> changing the dependency but then it fails to find needed gtk3 support,
> please take a look
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/331
>
> On Sun, May 3, 2020 at 9:26 AM Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
> >
> > The split was building the same code twice, awkward to maintain,
> > and causing issues with upgrades.
> >
> > Disabling the gtk bits can be easily done through the standard
> > PACKAGECONFIG mechanism when needed.
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > meta/conf/distro/include/maintainers.inc | 1 -
> > .../avahi/avahi-ui_0.7.bb | 54 ----------
> > meta/recipes-connectivity/avahi/avahi.inc | 86 ----------------
> > meta/recipes-connectivity/avahi/avahi_0.7.bb | 98 ++++++++++++++++++-
> > 4 files changed, 95 insertions(+), 144 deletions(-)
> > delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> > delete mode 100644 meta/recipes-connectivity/avahi/avahi.inc
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> > index 340cda3300..54b3c5678c 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -57,7 +57,6 @@ RECIPE_MAINTAINER_pn-autoconf = "Robert Yang <
> liezhi.yang@windriver.com>"
> > RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang <
> liezhi.yang@windriver.com>"
> > RECIPE_MAINTAINER_pn-automake = "Robert Yang <liezhi.yang@windriver.com
> >"
> > RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
> > -RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>"
> > RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <
> alex.kanavin@gmail.com>"
> > RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <
> alex.kanavin@gmail.com>"
> > RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
> > diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> > deleted file mode 100644
> > index 1510a0ef4f..0000000000
> > --- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
> > +++ /dev/null
> > @@ -1,54 +0,0 @@
> > -require avahi.inc
> > -
> > -inherit features_check
> > -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> > -
> > -DEPENDS += "avahi"
> > -
> > -AVAHI_GTK = "gtk3"
> > -
> > -S = "${WORKDIR}/avahi-${PV}"
> > -
> > -PACKAGES += "${PN}-utils avahi-discover"
> > -
> > -FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
> > -FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
> > -FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
> > - ${datadir}/avahi/interfaces/avahi-discover.ui \
> > - ${bindir}/avahi-discover-standalone \
> > - "
> > -
> > -do_install_append () {
> > - rm ${D}${sysconfdir} -rf
> > - if
> ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
> > - if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then
> > - rm ${D}${nonarch_base_libdir} -rf
> > - fi
> > - else
> > - rm ${D}${base_libdir} -rf
> > - fi
> > - rm ${D}${systemd_unitdir} -rf
> > - # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
> > - # but not ${base_libdir} here. And the /lib may not exist
> > - # whithout systemd.
> > - [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
> > - rm ${D}${bindir}/avahi-b*
> > - rm ${D}${bindir}/avahi-p*
> > - rm ${D}${bindir}/avahi-r*
> > - rm ${D}${bindir}/avahi-s*
> > - rm ${D}${includedir}/avahi-c* -rf
> > - rm ${D}${includedir}/avahi-g* -rf
> > - rm ${D}${libdir}/libavahi-c*
> > - rm ${D}${libdir}/libavahi-g*
> > - rm ${D}${libdir}/pkgconfig/avahi-c*
> > - rm ${D}${libdir}/pkgconfig/avahi-g*
> > - rm ${D}${sbindir} -rf
> > - rm ${D}${datadir}/avahi/a*
> > - rm ${D}${datadir}/locale/ -rf
> > - rm ${D}${datadir}/dbus* -rf
> > - rm ${D}${mandir}/man1/a*
> > - rm ${D}${mandir}/man5 -rf
> > - rm ${D}${mandir}/man8 -rf
> > - rm ${D}${libdir}/girepository-1.0/ -rf
> > - rm ${D}${datadir}/gir-1.0/ -rf
> > -}
> > diff --git a/meta/recipes-connectivity/avahi/avahi.inc
> b/meta/recipes-connectivity/avahi/avahi.inc
> > deleted file mode 100644
> > index 94fe6a16b6..0000000000
> > --- a/meta/recipes-connectivity/avahi/avahi.inc
> > +++ /dev/null
> > @@ -1,86 +0,0 @@
> > -SUMMARY = "Avahi IPv4LL network address configuration daemon"
> > -DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS
> Service Discovery. It \
> > -allows programs to publish and discover services and hosts running on a
> local network \
> > -with no specific configuration. This tool implements IPv4LL, "Dynamic
> Configuration of \
> > -IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP
> address \
> > -configuration from the link-local 169.254.0.0/16 range without the
> need for a central \
> > -server.'
> > -AUTHOR = "Lennart Poettering <lennart@poettering.net>"
> > -HOMEPAGE = "http://avahi.org"
> > -BUGTRACKER = "https://github.com/lathiat/avahi/issues"
> > -SECTION = "network"
> > -
> > -# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
> > -# python scripts are under GPLv2+
> > -LICENSE = "GPLv2+ & LGPLv2.1+"
> > -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1
> \
> > -
> file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d
> \
> > -
> file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
> > -
> file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
> > -
> file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
> > -
> > -SRC_URI = "
> https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz
> \
> > - file://fix-CVE-2017-6519.patch \
> > - "
> > -
> > -UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
> > -SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
> > -SRC_URI[sha256sum] =
> "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
> > -
> > -DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
> > -
> > -# For gtk related PACKAGECONFIGs: gtk, gtk3
> > -AVAHI_GTK ?= ""
> > -
> > -PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
> > -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> > -PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
> > -PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
> > -PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd
> --enable-dbus,,dbus"
> > -
> > -inherit autotools pkgconfig gettext gobject-introspection
> > -
> > -EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
> > - --disable-stack-protector \
> > - --disable-gdbm \
> > - --disable-mono \
> > - --disable-monodoc \
> > - --disable-qt3 \
> > - --disable-qt4 \
> > - --disable-python \
> > - --disable-doxygen-doc \
> > - --enable-manpages \
> > - ${EXTRA_OECONF_SYSVINIT} \
> > - ${EXTRA_OECONF_SYSTEMD} \
> > - "
> > -
> > -# The distro choice determines what init scripts are installed
> > -EXTRA_OECONF_SYSVINIT =
> "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
> > -EXTRA_OECONF_SYSTEMD =
> "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
> > -
> > -do_configure_prepend() {
> > - sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/
> configure.ac
> > -
> > - # This m4 file will get in the way of our introspection.m4 with
> special cross-compilation fixes
> > - rm "${S}/common/introspection.m4" || true
> > -}
> > -
> > -do_compile_prepend() {
> > - export
> GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
> > -}
> > -
> > -RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
> > -
> > -do_install() {
> > - autotools_do_install
> > - rm -rf ${D}/run
> > - rm -rf ${D}${datadir}/dbus-1/interfaces
> > - test -d ${D}${datadir}/dbus-1 && rmdir
> --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
> > - rm -rf ${D}${libdir}/avahi
> > -}
> > -
> > -PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd",
> "libavahi-compat-libdnssd", "", d)}"
> > -
> > -FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
> > -
> > -RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
> > diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb
> b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> > index 24523c7f81..b25cffa3cd 100644
> > --- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
> > +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> > @@ -1,4 +1,89 @@
> > -require avahi.inc
> > +SUMMARY = "Avahi IPv4LL network address configuration daemon"
> > +DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS
> Service Discovery. It \
> > +allows programs to publish and discover services and hosts running on a
> local network \
> > +with no specific configuration. This tool implements IPv4LL, "Dynamic
> Configuration of \
> > +IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP
> address \
> > +configuration from the link-local 169.254.0.0/16 range without the
> need for a central \
> > +server.'
> > +AUTHOR = "Lennart Poettering <lennart@poettering.net>"
> > +HOMEPAGE = "http://avahi.org"
> > +BUGTRACKER = "https://github.com/lathiat/avahi/issues"
> > +SECTION = "network"
> > +
> > +# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
> > +# python scripts are under GPLv2+
> > +LICENSE = "GPLv2+ & LGPLv2.1+"
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1
> \
> > +
> file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d
> \
> > +
> file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
> > +
> file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
> > +
> file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
> > +
> > +SRC_URI = "
> https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz
> \
> > + file://fix-CVE-2017-6519.patch \
> > + "
> > +
> > +UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
> > +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
> > +SRC_URI[sha256sum] =
> "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
> > +
> > +DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
> > +
> > +# For gtk related PACKAGECONFIGs: gtk, gtk3
> > +AVAHI_GTK ?= "gtk3"
> > +
> > +PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
> > +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> > +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
> > +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
> > +PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd
> --enable-dbus,,dbus"
> > +
> > +inherit autotools pkgconfig gettext gobject-introspection
> > +
> > +EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
> > + --disable-stack-protector \
> > + --disable-gdbm \
> > + --disable-mono \
> > + --disable-monodoc \
> > + --disable-qt3 \
> > + --disable-qt4 \
> > + --disable-python \
> > + --disable-doxygen-doc \
> > + --enable-manpages \
> > + ${EXTRA_OECONF_SYSVINIT} \
> > + ${EXTRA_OECONF_SYSTEMD} \
> > + "
> > +
> > +# The distro choice determines what init scripts are installed
> > +EXTRA_OECONF_SYSVINIT =
> "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
> > +EXTRA_OECONF_SYSTEMD =
> "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
> > +
> > +do_configure_prepend() {
> > + sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/
> configure.ac
> > +
> > + # This m4 file will get in the way of our introspection.m4 with
> special cross-compilation fixes
> > + rm "${S}/common/introspection.m4" || true
> > +}
> > +
> > +do_compile_prepend() {
> > + export
> GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
> > +}
> > +
> > +RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
> > +
> > +do_install() {
> > + autotools_do_install
> > + rm -rf ${D}/run
> > + rm -rf ${D}${datadir}/dbus-1/interfaces
> > + test -d ${D}${datadir}/dbus-1 && rmdir
> --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
> > + rm -rf ${D}${libdir}/avahi
> > +}
> > +
> > +PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd",
> "libavahi-compat-libdnssd", "", d)}"
> > +
> > +FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
> > +
> > +RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
> >
> > SRC_URI += "file://00avahi-autoipd \
> > file://99avahi-autoipd \
> > @@ -8,7 +93,13 @@ SRC_URI += "file://00avahi-autoipd \
> >
> > inherit update-rc.d systemd useradd
> >
> > -PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common
> libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd
> avahi-utils"
> > +PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common
> libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd
> avahi-utils avahi-discover avahi-ui"
> > +
> > +FILES_avahi-ui = "${libdir}/libavahi-ui*.so.*"
> > +FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
> > + ${datadir}/avahi/interfaces/avahi-discover.ui \
> > + ${bindir}/avahi-discover-standalone \
> > + "
> >
> > LICENSE_libavahi-gobject = "LGPLv2.1+"
> > LICENSE_avahi-daemon = "LGPLv2.1+"
> > @@ -46,7 +137,7 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
> > ${sysconfdir}/init.d/avahi-dnsconfd"
> > FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
> > FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*
> ${libdir}/girepository-1.0/Avahi*.typelib"
> > -FILES_avahi-utils = "${bindir}/avahi-*"
> > +FILES_avahi-utils = "${bindir}/avahi-* ${bindir}/b*
> ${datadir}/applications/b*"
> >
> > RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (=
> ${EXTENDPKGV})"
> > RDEPENDS_${PN}-dev += "${@["", " libavahi-client (=
> ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
> > @@ -89,3 +180,4 @@ if [ -z "$D" ]; then
> > killall -q -HUP dbus-daemon || true
> > fi
> > }
> > +
> > --
> > 2.26.1
> >
> >
>
[-- Attachment #2: Type: text/html, Size: 22008 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 08/17] avahi: merge avahi-ui into the main recipe
2020-05-05 11:09 ` Alexander Kanavin
@ 2020-05-05 18:45 ` Khem Raj
0 siblings, 0 replies; 25+ messages in thread
From: Khem Raj @ 2020-05-05 18:45 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Tue, May 5, 2020 at 4:09 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>
> This isn't going to work if you're building remmina against poky master, as the avahi merge patch is not yet there :)
>
Yes I was building with master-next and carrying a local change for.
remmina as well where I think master-next got rebased
> Alex
>
> On Mon, 4 May 2020 at 23:01, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> remmina from meta-oe depends on avahi-ui so anyway its fixable by
>> changing the dependency but then it fails to find needed gtk3 support,
>> please take a look
>>
>> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/331
>>
>> On Sun, May 3, 2020 at 9:26 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>> >
>> > The split was building the same code twice, awkward to maintain,
>> > and causing issues with upgrades.
>> >
>> > Disabling the gtk bits can be easily done through the standard
>> > PACKAGECONFIG mechanism when needed.
>> >
>> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> > ---
>> > meta/conf/distro/include/maintainers.inc | 1 -
>> > .../avahi/avahi-ui_0.7.bb | 54 ----------
>> > meta/recipes-connectivity/avahi/avahi.inc | 86 ----------------
>> > meta/recipes-connectivity/avahi/avahi_0.7.bb | 98 ++++++++++++++++++-
>> > 4 files changed, 95 insertions(+), 144 deletions(-)
>> > delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
>> > delete mode 100644 meta/recipes-connectivity/avahi/avahi.inc
>> >
>> > diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
>> > index 340cda3300..54b3c5678c 100644
>> > --- a/meta/conf/distro/include/maintainers.inc
>> > +++ b/meta/conf/distro/include/maintainers.inc
>> > @@ -57,7 +57,6 @@ RECIPE_MAINTAINER_pn-autoconf = "Robert Yang <liezhi.yang@windriver.com>"
>> > RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang <liezhi.yang@windriver.com>"
>> > RECIPE_MAINTAINER_pn-automake = "Robert Yang <liezhi.yang@windriver.com>"
>> > RECIPE_MAINTAINER_pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
>> > -RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao <yi.zhao@windriver.com>"
>> > RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>"
>> > RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
>> > RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
>> > diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
>> > deleted file mode 100644
>> > index 1510a0ef4f..0000000000
>> > --- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
>> > +++ /dev/null
>> > @@ -1,54 +0,0 @@
>> > -require avahi.inc
>> > -
>> > -inherit features_check
>> > -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>> > -
>> > -DEPENDS += "avahi"
>> > -
>> > -AVAHI_GTK = "gtk3"
>> > -
>> > -S = "${WORKDIR}/avahi-${PV}"
>> > -
>> > -PACKAGES += "${PN}-utils avahi-discover"
>> > -
>> > -FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
>> > -FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
>> > -FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
>> > - ${datadir}/avahi/interfaces/avahi-discover.ui \
>> > - ${bindir}/avahi-discover-standalone \
>> > - "
>> > -
>> > -do_install_append () {
>> > - rm ${D}${sysconfdir} -rf
>> > - if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
>> > - if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then
>> > - rm ${D}${nonarch_base_libdir} -rf
>> > - fi
>> > - else
>> > - rm ${D}${base_libdir} -rf
>> > - fi
>> > - rm ${D}${systemd_unitdir} -rf
>> > - # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
>> > - # but not ${base_libdir} here. And the /lib may not exist
>> > - # whithout systemd.
>> > - [ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
>> > - rm ${D}${bindir}/avahi-b*
>> > - rm ${D}${bindir}/avahi-p*
>> > - rm ${D}${bindir}/avahi-r*
>> > - rm ${D}${bindir}/avahi-s*
>> > - rm ${D}${includedir}/avahi-c* -rf
>> > - rm ${D}${includedir}/avahi-g* -rf
>> > - rm ${D}${libdir}/libavahi-c*
>> > - rm ${D}${libdir}/libavahi-g*
>> > - rm ${D}${libdir}/pkgconfig/avahi-c*
>> > - rm ${D}${libdir}/pkgconfig/avahi-g*
>> > - rm ${D}${sbindir} -rf
>> > - rm ${D}${datadir}/avahi/a*
>> > - rm ${D}${datadir}/locale/ -rf
>> > - rm ${D}${datadir}/dbus* -rf
>> > - rm ${D}${mandir}/man1/a*
>> > - rm ${D}${mandir}/man5 -rf
>> > - rm ${D}${mandir}/man8 -rf
>> > - rm ${D}${libdir}/girepository-1.0/ -rf
>> > - rm ${D}${datadir}/gir-1.0/ -rf
>> > -}
>> > diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
>> > deleted file mode 100644
>> > index 94fe6a16b6..0000000000
>> > --- a/meta/recipes-connectivity/avahi/avahi.inc
>> > +++ /dev/null
>> > @@ -1,86 +0,0 @@
>> > -SUMMARY = "Avahi IPv4LL network address configuration daemon"
>> > -DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
>> > -allows programs to publish and discover services and hosts running on a local network \
>> > -with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
>> > -IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
>> > -configuration from the link-local 169.254.0.0/16 range without the need for a central \
>> > -server.'
>> > -AUTHOR = "Lennart Poettering <lennart@poettering.net>"
>> > -HOMEPAGE = "http://avahi.org"
>> > -BUGTRACKER = "https://github.com/lathiat/avahi/issues"
>> > -SECTION = "network"
>> > -
>> > -# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
>> > -# python scripts are under GPLv2+
>> > -LICENSE = "GPLv2+ & LGPLv2.1+"
>> > -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>> > - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
>> > - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
>> > - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
>> > - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
>> > -
>> > -SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
>> > - file://fix-CVE-2017-6519.patch \
>> > - "
>> > -
>> > -UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
>> > -SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
>> > -SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
>> > -
>> > -DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
>> > -
>> > -# For gtk related PACKAGECONFIGs: gtk, gtk3
>> > -AVAHI_GTK ?= ""
>> > -
>> > -PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
>> > -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
>> > -PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
>> > -PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
>> > -PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
>> > -
>> > -inherit autotools pkgconfig gettext gobject-introspection
>> > -
>> > -EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
>> > - --disable-stack-protector \
>> > - --disable-gdbm \
>> > - --disable-mono \
>> > - --disable-monodoc \
>> > - --disable-qt3 \
>> > - --disable-qt4 \
>> > - --disable-python \
>> > - --disable-doxygen-doc \
>> > - --enable-manpages \
>> > - ${EXTRA_OECONF_SYSVINIT} \
>> > - ${EXTRA_OECONF_SYSTEMD} \
>> > - "
>> > -
>> > -# The distro choice determines what init scripts are installed
>> > -EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
>> > -EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
>> > -
>> > -do_configure_prepend() {
>> > - sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
>> > -
>> > - # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
>> > - rm "${S}/common/introspection.m4" || true
>> > -}
>> > -
>> > -do_compile_prepend() {
>> > - export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
>> > -}
>> > -
>> > -RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
>> > -
>> > -do_install() {
>> > - autotools_do_install
>> > - rm -rf ${D}/run
>> > - rm -rf ${D}${datadir}/dbus-1/interfaces
>> > - test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
>> > - rm -rf ${D}${libdir}/avahi
>> > -}
>> > -
>> > -PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
>> > -
>> > -FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
>> > -
>> > -RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
>> > diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb
>> > index 24523c7f81..b25cffa3cd 100644
>> > --- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
>> > +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
>> > @@ -1,4 +1,89 @@
>> > -require avahi.inc
>> > +SUMMARY = "Avahi IPv4LL network address configuration daemon"
>> > +DESCRIPTION = 'Avahi is a fully LGPL framework for Multicast DNS Service Discovery. It \
>> > +allows programs to publish and discover services and hosts running on a local network \
>> > +with no specific configuration. This tool implements IPv4LL, "Dynamic Configuration of \
>> > +IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address \
>> > +configuration from the link-local 169.254.0.0/16 range without the need for a central \
>> > +server.'
>> > +AUTHOR = "Lennart Poettering <lennart@poettering.net>"
>> > +HOMEPAGE = "http://avahi.org"
>> > +BUGTRACKER = "https://github.com/lathiat/avahi/issues"
>> > +SECTION = "network"
>> > +
>> > +# major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and
>> > +# python scripts are under GPLv2+
>> > +LICENSE = "GPLv2+ & LGPLv2.1+"
>> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>> > + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
>> > + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \
>> > + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
>> > + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
>> > +
>> > +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
>> > + file://fix-CVE-2017-6519.patch \
>> > + "
>> > +
>> > +UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
>> > +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
>> > +SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
>> > +
>> > +DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
>> > +
>> > +# For gtk related PACKAGECONFIGs: gtk, gtk3
>> > +AVAHI_GTK ?= "gtk3"
>> > +
>> > +PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
>> > +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
>> > +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
>> > +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
>> > +PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
>> > +
>> > +inherit autotools pkgconfig gettext gobject-introspection
>> > +
>> > +EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
>> > + --disable-stack-protector \
>> > + --disable-gdbm \
>> > + --disable-mono \
>> > + --disable-monodoc \
>> > + --disable-qt3 \
>> > + --disable-qt4 \
>> > + --disable-python \
>> > + --disable-doxygen-doc \
>> > + --enable-manpages \
>> > + ${EXTRA_OECONF_SYSVINIT} \
>> > + ${EXTRA_OECONF_SYSTEMD} \
>> > + "
>> > +
>> > +# The distro choice determines what init scripts are installed
>> > +EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
>> > +EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
>> > +
>> > +do_configure_prepend() {
>> > + sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
>> > +
>> > + # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
>> > + rm "${S}/common/introspection.m4" || true
>> > +}
>> > +
>> > +do_compile_prepend() {
>> > + export GIR_EXTRA_LIBS_PATH="${B}/avahi-gobject/.libs:${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs"
>> > +}
>> > +
>> > +RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
>> > +
>> > +do_install() {
>> > + autotools_do_install
>> > + rm -rf ${D}/run
>> > + rm -rf ${D}${datadir}/dbus-1/interfaces
>> > + test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
>> > + rm -rf ${D}${libdir}/avahi
>> > +}
>> > +
>> > +PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
>> > +
>> > +FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
>> > +
>> > +RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
>> >
>> > SRC_URI += "file://00avahi-autoipd \
>> > file://99avahi-autoipd \
>> > @@ -8,7 +93,13 @@ SRC_URI += "file://00avahi-autoipd \
>> >
>> > inherit update-rc.d systemd useradd
>> >
>> > -PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
>> > +PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
>> > +
>> > +FILES_avahi-ui = "${libdir}/libavahi-ui*.so.*"
>> > +FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
>> > + ${datadir}/avahi/interfaces/avahi-discover.ui \
>> > + ${bindir}/avahi-discover-standalone \
>> > + "
>> >
>> > LICENSE_libavahi-gobject = "LGPLv2.1+"
>> > LICENSE_avahi-daemon = "LGPLv2.1+"
>> > @@ -46,7 +137,7 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
>> > ${sysconfdir}/init.d/avahi-dnsconfd"
>> > FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
>> > FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib"
>> > -FILES_avahi-utils = "${bindir}/avahi-*"
>> > +FILES_avahi-utils = "${bindir}/avahi-* ${bindir}/b* ${datadir}/applications/b*"
>> >
>> > RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV})"
>> > RDEPENDS_${PN}-dev += "${@["", " libavahi-client (= ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
>> > @@ -89,3 +180,4 @@ if [ -z "$D" ]; then
>> > killall -q -HUP dbus-daemon || true
>> > fi
>> > }
>> > +
>> > --
>> > 2.26.1
>> >
>> >
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 09/17] avahi: update to 0.8
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (6 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 08/17] avahi: merge avahi-ui into the main recipe Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 10/17] git: update to 2.26.2 Alexander Kanavin
` (8 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../avahi/{avahi_0.7.bb => avahi_0.8.bb} | 20 ++++----
.../avahi/files/fix-CVE-2017-6519.patch | 48 -------------------
2 files changed, 9 insertions(+), 59 deletions(-)
rename meta/recipes-connectivity/avahi/{avahi_0.7.bb => avahi_0.8.bb} (95%)
delete mode 100644 meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
similarity index 95%
rename from meta/recipes-connectivity/avahi/avahi_0.7.bb
rename to meta/recipes-connectivity/avahi/avahi_0.8.bb
index b25cffa3cd..f4924fa1cb 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -20,12 +20,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
- file://fix-CVE-2017-6519.patch \
+ file://00avahi-autoipd \
+ file://99avahi-autoipd \
+ file://initscript.patch \
+ file://0001-Fix-opening-etc-resolv.conf-error.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
-SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
-SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
+SRC_URI[md5sum] = "229c6aa30674fc43c202b22c5f8c2be7"
+SRC_URI[sha256sum] = "060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda"
DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
@@ -37,12 +40,15 @@ PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
+PACKAGECONFIG[libevent] = "--enable-libevent,--disable-libevent,libevent"
+PACKAGECONFIG[qt5] = "--enable-qt5,--disable-qt5,qtbase"
inherit autotools pkgconfig gettext gobject-introspection
EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
--disable-stack-protector \
--disable-gdbm \
+ --disable-dbm \
--disable-mono \
--disable-monodoc \
--disable-qt3 \
@@ -59,8 +65,6 @@ EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--wi
EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
do_configure_prepend() {
- sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
-
# This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
rm "${S}/common/introspection.m4" || true
}
@@ -85,12 +89,6 @@ FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
-SRC_URI += "file://00avahi-autoipd \
- file://99avahi-autoipd \
- file://initscript.patch \
- file://0001-Fix-opening-etc-resolv.conf-error.patch \
- "
-
inherit update-rc.d systemd useradd
PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
diff --git a/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch b/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
deleted file mode 100644
index 7461fe193d..0000000000
--- a/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/e111def]
-
-CVE: CVE-2017-6519
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
-From: Trent Lloyd <trent@lloyd.id.au>
-Date: Sat, 22 Dec 2018 09:06:07 +0800
-Subject: [PATCH] Drop legacy unicast queries from address not on local link
-
-When handling legacy unicast queries, ensure that the source IP is
-inside a subnet on the local link, otherwise drop the packet.
-
-Fixes #145
-Fixes #203
-CVE-2017-6519
-CVE-2018-1000845
----
- avahi-core/server.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index a2cb19a8..a2580e38 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
-
- if (avahi_dns_packet_is_query(p)) {
- int legacy_unicast = 0;
-+ char t[AVAHI_ADDRESS_STR_MAX];
-
- /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
- * AR section completely here, so far. Until the day we add
-@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
- legacy_unicast = 1;
- }
-
-+ if (!is_mdns_mcast_address(dst_address) &&
-+ !avahi_interface_address_on_link(i, src_address)) {
-+
-+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
-+ return;
-+ }
-+
- if (legacy_unicast)
- reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
-
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 10/17] git: update to 2.26.2
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (7 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 09/17] avahi: update to 0.8 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 11/17] wpe: update to 1.6.0 Alexander Kanavin
` (7 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Disable iconv, as configure.ac attempts to run a
cross-compiled test program otherwise.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/git/git.inc | 1 +
meta/recipes-devtools/git/git_2.24.1.bb | 11 -----------
meta/recipes-devtools/git/git_2.26.2.bb | 10 ++++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_2.24.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.26.2.bb
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 4131c98977..544e23c844 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -21,6 +21,7 @@ PACKAGECONFIG[svn] = ""
EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
--without-tcltk \
+ --without-iconv \
"
EXTRA_OECONF_append_class-nativesdk = " --with-gitconfig=/etc/gitconfig "
diff --git a/meta/recipes-devtools/git/git_2.24.1.bb b/meta/recipes-devtools/git/git_2.24.1.bb
deleted file mode 100644
index daea31eab2..0000000000
--- a/meta/recipes-devtools/git/git_2.24.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
- ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "166bde96adbbc11c8843d4f8f4f9811b"
-SRC_URI[tarball.sha256sum] = "ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02"
-SRC_URI[manpages.md5sum] = "31c2272a8979022497ba3d4202df145d"
-SRC_URI[manpages.sha256sum] = "9a7ae3a093bea39770eb96ca3e5b40bff7af0b9f6123f089d7821d0e5b8e1230"
diff --git a/meta/recipes-devtools/git/git_2.26.2.bb b/meta/recipes-devtools/git/git_2.26.2.bb
new file mode 100644
index 0000000000..ae7aa267bf
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.26.2.bb
@@ -0,0 +1,10 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.sha256sum] = "e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121"
+SRC_URI[manpages.sha256sum] = "b3c6cfc980f3c593d0cd0c63e0c97d6f1cafe7b72321fc3a94948758b9529c5b"
+
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 11/17] wpe: update to 1.6.0
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (8 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 10/17] git: update to 2.26.2 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 12/17] vte: update to 0.60.2 Alexander Kanavin
` (6 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../recipes-sato/webkit/{libwpe_1.4.0.1.bb => libwpe_1.6.0.bb} | 3 ++-
.../{wpebackend-fdo_1.4.1.bb => wpebackend-fdo_1.6.0.bb} | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
rename meta/recipes-sato/webkit/{libwpe_1.4.0.1.bb => libwpe_1.6.0.bb} (82%)
rename meta/recipes-sato/webkit/{wpebackend-fdo_1.4.1.bb => wpebackend-fdo_1.6.0.bb} (78%)
diff --git a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb b/meta/recipes-sato/webkit/libwpe_1.6.0.bb
similarity index 82%
rename from meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
rename to meta/recipes-sato/webkit/libwpe_1.6.0.bb
index 12499ff281..09c74089c9 100644
--- a/meta/recipes-sato/webkit/libwpe_1.4.0.1.bb
+++ b/meta/recipes-sato/webkit/libwpe_1.6.0.bb
@@ -13,5 +13,6 @@ inherit cmake features_check
REQUIRED_DISTRO_FEATURES = "opengl"
+SRC_URI[md5sum] = "6e8a2c279dcc3617db5ec7ac4c03d628"
SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "09849dfb34877354f34f318e138971cf22e677b2179e1f0a8ea00ab0b7bd8e9b"
+SRC_URI[sha256sum] = "3587c6b8a807f4bb76b268ba74ca82c6b395b90235db41ad8252224456193c90"
diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.6.0.bb
similarity index 78%
rename from meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
rename to meta/recipes-sato/webkit/wpebackend-fdo_1.6.0.bb
index cd2f7fabda..3b1dbf1e09 100644
--- a/meta/recipes-sato/webkit/wpebackend-fdo_1.4.1.bb
+++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.6.0.bb
@@ -12,6 +12,7 @@ inherit cmake features_check
REQUIRED_DISTRO_FEATURES = "opengl"
+SRC_URI[md5sum] = "456afeed22f6749f7b2a97c11660835d"
SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "6249a0b7cbfa662206a8d2fa24e2c574e75c681ad0e93468091f1dc68ddb299d"
+SRC_URI[sha256sum] = "7f5bd7b9d8f97b1655f4dcd39fad92719d0fb3985b251da5802df13aaa09f567"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 12/17] vte: update to 0.60.2
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (9 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 11/17] wpe: update to 1.6.0 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 13/17] libnotify: update to 0.7.9 Alexander Kanavin
` (5 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-support/vte/{vte_0.58.3.bb => vte_0.60.2.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/vte/{vte_0.58.3.bb => vte_0.60.2.bb} (89%)
diff --git a/meta/recipes-support/vte/vte_0.58.3.bb b/meta/recipes-support/vte/vte_0.60.2.bb
similarity index 89%
rename from meta/recipes-support/vte/vte_0.58.3.bb
rename to meta/recipes-support/vte/vte_0.60.2.bb
index 41dc2e77c9..3891ff8165 100644
--- a/meta/recipes-support/vte/vte_0.58.3.bb
+++ b/meta/recipes-support/vte/vte_0.60.2.bb
@@ -20,8 +20,8 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros
SRC_URI += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \
file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
"
-SRC_URI[archive.md5sum] = "f59eb0784a361c0939c03d4566255916"
-SRC_URI[archive.sha256sum] = "22dcb54ac2ad1a56ab0a745e16ccfeb383f0b5860b5bfa1784561216f98d4975"
+SRC_URI[archive.md5sum] = "1a0b5395915d2f3c88484511b38cc584"
+SRC_URI[archive.sha256sum] = "35a0280e3f12feeb3096da05699191373c47a4a20c55cb7081e828e6015f8ca5"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -44,6 +44,7 @@ FILES_${PN}-dev += "${datadir}/vala/vapi/*"
PACKAGECONFIG ??= "gnutls"
PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
+PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
# vala requires gir
PACKAGECONFIG_remove_class-native = "vala"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 13/17] libnotify: update to 0.7.9
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (10 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 12/17] vte: update to 0.60.2 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 14/17] connman: update to 1.38 Alexander Kanavin
` (4 subsequent siblings)
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Convert to meson build, disable manpages as I couldn't figure
out what is needed exactly to build them.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../{libnotify_0.7.8.bb => libnotify_0.7.9.bb} | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/libnotify/{libnotify_0.7.8.bb => libnotify_0.7.9.bb} (68%)
diff --git a/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb b/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb
similarity index 68%
rename from meta/recipes-gnome/libnotify/libnotify_0.7.8.bb
rename to meta/recipes-gnome/libnotify/libnotify_0.7.9.bb
index 0306b04f4e..29a28272e1 100644
--- a/meta/recipes-gnome/libnotify/libnotify_0.7.8.bb
+++ b/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb
@@ -7,12 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "dbus gtk+3 glib-2.0"
+GNOMEBASEBUILDCLASS = "meson"
+GTKDOC_MESON_OPTION = "gtk_doc"
+GIR_MESON_ENABLE_FLAG = "enabled"
+GIR_MESON_DISABLE_FLAG = "disabled"
inherit gnomebase gtk-doc features_check gobject-introspection
# depends on gtk+3
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-SRC_URI[archive.md5sum] = "babb4b07b5f21bef42a386d3d7019599"
-SRC_URI[archive.sha256sum] = "69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c"
+SRC_URI[archive.md5sum] = "ccd9c53364174cc8d13e18a1988faa76"
+SRC_URI[archive.sha256sum] = "66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761"
+
+EXTRA_OEMESON = "-Dman=false"
# there were times, we had two versions of libnotify (oe-core libnotify:0.6.x /
# meta-gnome libnotify3: 0.7.x)
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 14/17] connman: update to 1.38
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (11 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 13/17] libnotify: update to 0.7.9 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-06 7:59 ` [OE-core] " Alejandro Hernandez
2020-05-03 16:25 ` [PATCH 15/17] libcap: update to 2.33 Alexander Kanavin
` (3 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Drop a patch merged upstream.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-connectivity/connman/connman.inc | 1 +
...-gweb-fix-segfault-with-musl-v1.1.21.patch | 34 -------------------
...ve-musl-does-not-implement-res_ninit.patch | 20 +++++------
.../connman/connman_1.37.bb | 17 ----------
.../connman/connman_1.38.bb | 16 +++++++++
5 files changed, 26 insertions(+), 62 deletions(-)
delete mode 100644 meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
delete mode 100644 meta/recipes-connectivity/connman/connman_1.37.bb
create mode 100644 meta/recipes-connectivity/connman/connman_1.38.bb
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index d3eeb3be1c..b60178cefc 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -53,6 +53,7 @@ PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-mo
PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
+PACKAGECONFIG[wireguard] = "--enable-wireguard,--disable-wireguard,libmnl"
INITSCRIPT_NAME = "connman"
INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
diff --git a/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch b/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
deleted file mode 100644
index 30f1432cd3..0000000000
--- a/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f0a8c69971b30ea7ca255bb885fdd1179fa5d298 Mon Sep 17 00:00:00 2001
-From: Nicola Lunghi <nick83ola@gmail.com>
-Date: Thu, 23 May 2019 07:55:25 +0100
-Subject: [PATCH] gweb: fix segfault with musl v1.1.21
-
-In musl > v1.1.21 freeaddrinfo() implementation changed and
-was causing a segmentation fault on recent Yocto using musl.
-
-See this commit:
-
- https://git.musl-libc.org/cgit/musl/commit/src/network/freeaddrinfo.c?id=d1395c43c019aec6b855cf3c656bf47c8a719e7f
-
-Upstream-Status: Submitted
----
- gweb/gweb.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gweb/gweb.c b/gweb/gweb.c
-index 393afe0a..12fcb1d8 100644
---- a/gweb/gweb.c
-+++ b/gweb/gweb.c
-@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
- addr = NULL;
-
- result = getaddrinfo(host, NULL, &hints, &addr);
-- freeaddrinfo(addr);
-+ if(!result)
-+ freeaddrinfo(addr);
-
- return result == 0;
- }
---
-2.19.1
-
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
index 639ccfa2a2..942b9c97b6 100644
--- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
@@ -1,7 +1,7 @@
-From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001
+From c7734e1547db967eccf242fe4b9e8a30b9ff141c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 6 Apr 2015 23:02:21 -0700
-Subject: [PATCH 2/3] resolve: musl does not implement res_ninit
+Subject: [PATCH] resolve: musl does not implement res_ninit
ported from
http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
@@ -9,12 +9,13 @@ http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
---
- gweb/gresolv.c | 33 ++++++++++++---------------------
- 1 file changed, 12 insertions(+), 21 deletions(-)
+ gweb/gresolv.c | 34 +++++++++++++---------------------
+ 1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/gweb/gresolv.c b/gweb/gresolv.c
-index 5cf7a9a..3ad8e70 100644
+index 38a554e..a9e8740 100644
--- a/gweb/gresolv.c
+++ b/gweb/gresolv.c
@@ -36,6 +36,7 @@
@@ -25,7 +26,7 @@ index 5cf7a9a..3ad8e70 100644
#include "gresolv.h"
-@@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index)
+@@ -877,8 +878,6 @@ GResolv *g_resolv_new(int index)
resolv->index = index;
resolv->nameserver_list = NULL;
@@ -34,7 +35,7 @@ index 5cf7a9a..3ad8e70 100644
return resolv;
}
-@@ -916,8 +914,6 @@ void g_resolv_unref(GResolv *resolv)
+@@ -918,8 +917,6 @@ void g_resolv_unref(GResolv *resolv)
flush_nameservers(resolv);
@@ -43,7 +44,7 @@ index 5cf7a9a..3ad8e70 100644
g_free(resolv);
}
-@@ -1020,24 +1016,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
+@@ -1022,24 +1019,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname,
debug(resolv, "hostname %s", hostname);
if (!resolv->nameserver_list) {
@@ -80,6 +81,3 @@ index 5cf7a9a..3ad8e70 100644
}
if (!resolv->nameserver_list)
---
-2.5.1
-
diff --git a/meta/recipes-connectivity/connman/connman_1.37.bb b/meta/recipes-connectivity/connman/connman_1.37.bb
deleted file mode 100644
index 00852bf0d6..0000000000
--- a/meta/recipes-connectivity/connman/connman_1.37.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require connman.inc
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
- file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
- file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
- file://0001-gweb-fix-segfault-with-musl-v1.1.21.patch \
- file://connman \
- file://no-version-scripts.patch \
-"
-
-SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
-
-SRC_URI[md5sum] = "75012084f14fb63a84b116e66c6e94fb"
-SRC_URI[sha256sum] = "6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16"
-
-RRECOMMENDS_${PN} = "connman-conf"
-RCONFLICTS_${PN} = "networkmanager"
diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
new file mode 100644
index 0000000000..027c41e9af
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.38.bb
@@ -0,0 +1,16 @@
+require connman.inc
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+ file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
+ file://connman \
+ file://no-version-scripts.patch \
+ "
+
+SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
+
+SRC_URI[md5sum] = "1ed8745354c7254bdfd4def54833ee94"
+SRC_URI[sha256sum] = "cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b"
+
+RRECOMMENDS_${PN} = "connman-conf"
+RCONFLICTS_${PN} = "networkmanager"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 14/17] connman: update to 1.38
2020-05-03 16:25 ` [PATCH 14/17] connman: update to 1.38 Alexander Kanavin
@ 2020-05-06 7:59 ` Alejandro Hernandez
0 siblings, 0 replies; 25+ messages in thread
From: Alejandro Hernandez @ 2020-05-06 7:59 UTC (permalink / raw)
To: OE-core; +Cc: Alexander Kanavin
[-- Attachment #1: Type: text/plain, Size: 8332 bytes --]
Hey Alex,
Pretty sure this is causing:
ERROR: connman-1.38-r0 do_package: QA Issue: connman: Files/directories
were installed but not shipped in any package:
/usr/lib/connman/scripts/vpn-script
Please set FILES such that these items are packaged. Alternatively if they
are unneeded, avoid installing them or delete them within do_install.
connman: 1 installed and not shipped files. [installed-vs-shipped]
Which probably slipped because the PACKAGECONFIG isn't enabled by default,
I can submit a patch but will have to wait till tomorrow.
Cheers,
Alejandro
On Sun, 3 May 2020 at 10:26, Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> Drop a patch merged upstream.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/recipes-connectivity/connman/connman.inc | 1 +
> ...-gweb-fix-segfault-with-musl-v1.1.21.patch | 34 -------------------
> ...ve-musl-does-not-implement-res_ninit.patch | 20 +++++------
> .../connman/connman_1.37.bb | 17 ----------
> .../connman/connman_1.38.bb | 16 +++++++++
> 5 files changed, 26 insertions(+), 62 deletions(-)
> delete mode 100644
> meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
> delete mode 100644 meta/recipes-connectivity/connman/connman_1.37.bb
> create mode 100644 meta/recipes-connectivity/connman/connman_1.38.bb
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc
> b/meta/recipes-connectivity/connman/connman.inc
> index d3eeb3be1c..b60178cefc 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -53,6 +53,7 @@ PACKAGECONFIG[nftables] = "--with-firewall=nftables
> ,,libmnl libnftnl,,kernel-mo
> PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
> PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
> PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
> +PACKAGECONFIG[wireguard] = "--enable-wireguard,--disable-wireguard,libmnl"
>
> INITSCRIPT_NAME = "connman"
> INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
> diff --git
> a/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
> b/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
> deleted file mode 100644
> index 30f1432cd3..0000000000
> ---
> a/meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From f0a8c69971b30ea7ca255bb885fdd1179fa5d298 Mon Sep 17 00:00:00 2001
> -From: Nicola Lunghi <nick83ola@gmail.com>
> -Date: Thu, 23 May 2019 07:55:25 +0100
> -Subject: [PATCH] gweb: fix segfault with musl v1.1.21
> -
> -In musl > v1.1.21 freeaddrinfo() implementation changed and
> -was causing a segmentation fault on recent Yocto using musl.
> -
> -See this commit:
> -
> -
> https://git.musl-libc.org/cgit/musl/commit/src/network/freeaddrinfo.c?id=d1395c43c019aec6b855cf3c656bf47c8a719e7f
> -
> -Upstream-Status: Submitted
> ----
> - gweb/gweb.c | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/gweb/gweb.c b/gweb/gweb.c
> -index 393afe0a..12fcb1d8 100644
> ---- a/gweb/gweb.c
> -+++ b/gweb/gweb.c
> -@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
> - addr = NULL;
> -
> - result = getaddrinfo(host, NULL, &hints, &addr);
> -- freeaddrinfo(addr);
> -+ if(!result)
> -+ freeaddrinfo(addr);
> -
> - return result == 0;
> - }
> ---
> -2.19.1
> -
> diff --git
> a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> index 639ccfa2a2..942b9c97b6 100644
> ---
> a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> +++
> b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
> @@ -1,7 +1,7 @@
> -From 10b0d16d04b811b1ccd1f9b0cfe757bce8d876a1 Mon Sep 17 00:00:00 2001
> +From c7734e1547db967eccf242fe4b9e8a30b9ff141c Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Mon, 6 Apr 2015 23:02:21 -0700
> -Subject: [PATCH 2/3] resolve: musl does not implement res_ninit
> +Subject: [PATCH] resolve: musl does not implement res_ninit
>
> ported from
>
> http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
> @@ -9,12 +9,13 @@
> http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch
> Upstream-Status: Pending
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> ---
> - gweb/gresolv.c | 33 ++++++++++++---------------------
> - 1 file changed, 12 insertions(+), 21 deletions(-)
> + gweb/gresolv.c | 34 +++++++++++++---------------------
> + 1 file changed, 13 insertions(+), 21 deletions(-)
>
> diff --git a/gweb/gresolv.c b/gweb/gresolv.c
> -index 5cf7a9a..3ad8e70 100644
> +index 38a554e..a9e8740 100644
> --- a/gweb/gresolv.c
> +++ b/gweb/gresolv.c
> @@ -36,6 +36,7 @@
> @@ -25,7 +26,7 @@ index 5cf7a9a..3ad8e70 100644
>
> #include "gresolv.h"
>
> -@@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index)
> +@@ -877,8 +878,6 @@ GResolv *g_resolv_new(int index)
> resolv->index = index;
> resolv->nameserver_list = NULL;
>
> @@ -34,7 +35,7 @@ index 5cf7a9a..3ad8e70 100644
> return resolv;
> }
>
> -@@ -916,8 +914,6 @@ void g_resolv_unref(GResolv *resolv)
> +@@ -918,8 +917,6 @@ void g_resolv_unref(GResolv *resolv)
>
> flush_nameservers(resolv);
>
> @@ -43,7 +44,7 @@ index 5cf7a9a..3ad8e70 100644
> g_free(resolv);
> }
>
> -@@ -1020,24 +1016,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv,
> const char *hostname,
> +@@ -1022,24 +1019,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv,
> const char *hostname,
> debug(resolv, "hostname %s", hostname);
>
> if (!resolv->nameserver_list) {
> @@ -80,6 +81,3 @@ index 5cf7a9a..3ad8e70 100644
> }
>
> if (!resolv->nameserver_list)
> ---
> -2.5.1
> -
> diff --git a/meta/recipes-connectivity/connman/connman_1.37.bb
> b/meta/recipes-connectivity/connman/connman_1.37.bb
> deleted file mode 100644
> index 00852bf0d6..0000000000
> --- a/meta/recipes-connectivity/connman/connman_1.37.bb
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -require connman.inc
> -
> -SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
> -
> file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
> -
> file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
> - file://0001-gweb-fix-segfault-with-musl-v1.1.21.patch \
> - file://connman \
> - file://no-version-scripts.patch \
> -"
> -
> -SRC_URI_append_libc-musl = "
> file://0002-resolve-musl-does-not-implement-res_ninit.patch"
> -
> -SRC_URI[md5sum] = "75012084f14fb63a84b116e66c6e94fb"
> -SRC_URI[sha256sum] =
> "6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16"
> -
> -RRECOMMENDS_${PN} = "connman-conf"
> -RCONFLICTS_${PN} = "networkmanager"
> diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb
> b/meta/recipes-connectivity/connman/connman_1.38.bb
> new file mode 100644
> index 0000000000..027c41e9af
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman_1.38.bb
> @@ -0,0 +1,16 @@
> +require connman.inc
> +
> +SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
> +
> file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
> +
> file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
> + file://connman \
> + file://no-version-scripts.patch \
> + "
> +
> +SRC_URI_append_libc-musl = "
> file://0002-resolve-musl-does-not-implement-res_ninit.patch"
> +
> +SRC_URI[md5sum] = "1ed8745354c7254bdfd4def54833ee94"
> +SRC_URI[sha256sum] =
> "cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b"
> +
> +RRECOMMENDS_${PN} = "connman-conf"
> +RCONFLICTS_${PN} = "networkmanager"
> --
> 2.26.1
>
>
>
[-- Attachment #2: Type: text/html, Size: 13766 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 15/17] libcap: update to 2.33
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (12 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 14/17] connman: update to 1.38 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-04 8:41 ` [OE-core] " Richard Purdie
2020-05-03 16:25 ` [PATCH 16/17] xkeyboard-config: update to 2.29 Alexander Kanavin
` (2 subsequent siblings)
16 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-tests-do-not-statically-link-a-test.patch | 9 +++----
...hread_yield-with-standard-sched_yiel.patch | 24 +++++++++++++++++++
.../libcap/{libcap_2.32.bb => libcap_2.33.bb} | 5 ++--
3 files changed, 32 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
rename meta/recipes-support/libcap/{libcap_2.32.bb => libcap_2.33.bb} (90%)
diff --git a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
index e568cc47c5..5a0b25758c 100644
--- a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
+++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
@@ -1,4 +1,4 @@
-From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001
+From 99ff8da92cc1bdf150fecd1ecd0fa50794be0259 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 15 Jan 2020 17:16:28 +0100
Subject: [PATCH] tests: do not statically link a test
@@ -7,12 +7,13 @@ This fails on e.g. centos 7
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
---
tests/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
-index 7162cf0..6af47af 100644
+index f9cec56..dcd654f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS)
@@ -22,5 +23,5 @@ index 7162cf0..6af47af 100644
- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create
- clean:
- rm -f psx_test psx_test_wrap libcap_psx_test
+ run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
+ sudo ./libcap_launch_test
diff --git a/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch b/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
new file mode 100644
index 0000000000..848ceb2c0c
--- /dev/null
+++ b/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
@@ -0,0 +1,24 @@
+From a2c4cdb05d0e382101b13944c09c4375e8d7de5f Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 31 Mar 2020 13:39:28 +0200
+Subject: [PATCH] psx.c: replace pthread_yield() with standard sched_yield()
+
+This was causing failures when building with musl C library in
+particular.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+diff --git a/libcap/psx.c b/libcap/psx.c
+index 04d250f..7e4ac10 100644
+--- a/libcap/psx.c
++++ b/libcap/psx.c
+@@ -533,7 +533,7 @@ long int __psx_syscall(long int syscall_nr, ...) {
+ if (!waiting) {
+ break;
+ }
+- pthread_yield();
++ sched_yield();
+ }
+
+ errno = restore_errno;
diff --git a/meta/recipes-support/libcap/libcap_2.32.bb b/meta/recipes-support/libcap/libcap_2.33.bb
similarity index 90%
rename from meta/recipes-support/libcap/libcap_2.32.bb
rename to meta/recipes-support/libcap/libcap_2.33.bb
index d78a58f7d2..bec492ca5f 100644
--- a/meta/recipes-support/libcap/libcap_2.32.bb
+++ b/meta/recipes-support/libcap/libcap_2.33.bb
@@ -11,9 +11,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
file://0002-tests-do-not-run-target-executables.patch \
file://0001-tests-do-not-statically-link-a-test.patch \
+ file://0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch \
"
-SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9"
-SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be"
+SRC_URI[md5sum] = "dcc6220b4a9bf260050b20c07edcddf4"
+SRC_URI[sha256sum] = "08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 15/17] libcap: update to 2.33
2020-05-03 16:25 ` [PATCH 15/17] libcap: update to 2.33 Alexander Kanavin
@ 2020-05-04 8:41 ` Richard Purdie
0 siblings, 0 replies; 25+ messages in thread
From: Richard Purdie @ 2020-05-04 8:41 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
On Sun, 2020-05-03 at 18:25 +0200, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> ...-tests-do-not-statically-link-a-test.patch | 9 +++----
> ...hread_yield-with-standard-sched_yiel.patch | 24 +++++++++++++++++++
> .../libcap/{libcap_2.32.bb => libcap_2.33.bb} | 5 ++--
> 3 files changed, 32 insertions(+), 6 deletions(-)
> create mode 100644 meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
> rename meta/recipes-support/libcap/{libcap_2.32.bb => libcap_2.33.bb} (90%)
>
> diff --git a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
> index e568cc47c5..5a0b25758c 100644
> --- a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
> +++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
> @@ -1,4 +1,4 @@
> -From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001
> +From 99ff8da92cc1bdf150fecd1ecd0fa50794be0259 Mon Sep 17 00:00:00 2001
> From: Alexander Kanavin <alex.kanavin@gmail.com>
> Date: Wed, 15 Jan 2020 17:16:28 +0100
> Subject: [PATCH] tests: do not statically link a test
> @@ -7,12 +7,13 @@ This fails on e.g. centos 7
>
> Upstream-Status: Inappropriate [oe-core specific]
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
libcap-native build failure:
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/905
Cheers,
Richard
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 16/17] xkeyboard-config: update to 2.29
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (13 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 15/17] libcap: update to 2.33 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-03 16:25 ` [PATCH 17/17] gcr: update to 3.36.0 Alexander Kanavin
2020-05-05 9:42 ` [OE-core] [PATCH 01/17] libinput: add ptest Richard Purdie
16 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../0001-fix-python3-support.patch | 34 +++++++++++++++++++
...onfig_2.28.bb => xkeyboard-config_2.29.bb} | 8 +++--
2 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch
rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.28.bb => xkeyboard-config_2.29.bb} (81%)
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch
new file mode 100644
index 0000000000..f723f70332
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch
@@ -0,0 +1,34 @@
+From 168ac446cdd9a1b59d6b708360a9556515ba56b9 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Sun, 16 Feb 2020 09:41:43 +0000
+Subject: [PATCH] fix python3 support
+
+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ rules/compat/map-variants.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py
+index ebbfec9..979ba43 100755
+--- a/rules/compat/map-variants.py
++++ b/rules/compat/map-variants.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+
+ import argparse
+ import re
+@@ -12,8 +12,8 @@ class Layout(object):
+ assert variant is None
+ # parse a layout(variant) string
+ match = re.match(r'([^(]+)\(([^)]+)\)', layout)
+- self.layout = match[1]
+- self.variant = match[2]
++ self.layout = match.groups()[0]
++ self.variant = match.groups()[1]
+
+ def __str__(self):
+ if self.variant:
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb
index 7a3d694bd6..598b584787 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.28.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb
@@ -12,9 +12,11 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi
LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
-SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "5a968ab77846ff85a04242410b2a61de"
-SRC_URI[sha256sum] = "69adb25b0fc64e4075f8ec0eab8d869892419f474f91fb69db1713de2062bdce"
+SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \
+ file://0001-fix-python3-support.patch \
+ "
+SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d"
+SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802"
SECTION = "x11/libs"
DEPENDS = "util-macros libxslt-native"
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 17/17] gcr: update to 3.36.0
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (14 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 16/17] xkeyboard-config: update to 2.29 Alexander Kanavin
@ 2020-05-03 16:25 ` Alexander Kanavin
2020-05-11 18:35 ` [OE-core] " Richard Purdie
2020-05-05 9:42 ` [OE-core] [PATCH 01/17] libinput: add ptest Richard Purdie
16 siblings, 1 reply; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-03 16:25 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
Convert to meson build.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../gcr/{gcr_3.34.0.bb => gcr_3.36.0.bb} | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
rename meta/recipes-gnome/gcr/{gcr_3.34.0.bb => gcr_3.36.0.bb} (75%)
diff --git a/meta/recipes-gnome/gcr/gcr_3.34.0.bb b/meta/recipes-gnome/gcr/gcr_3.36.0.bb
similarity index 75%
rename from meta/recipes-gnome/gcr/gcr_3.34.0.bb
rename to meta/recipes-gnome/gcr/gcr_3.36.0.bb
index 9853b3f416..4fe3b2fff3 100644
--- a/meta/recipes-gnome/gcr/gcr_3.34.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.36.0.bb
@@ -11,12 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
+GNOMEBASEBUILDCLASS = "meson"
+GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
# depends on gtk+3, but also x11 through gtk+-x11
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[archive.md5sum] = "4af28919fb1dd36d93603e8230283b6f"
-SRC_URI[archive.sha256sum] = "29df50974a90987af694c0fb8926a6b366e68cacd8abd813817cfe1eb5d54524"
+SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61"
+SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601"
FILES_${PN} += " \
${datadir}/dbus-1 \
@@ -27,9 +29,3 @@ FILES_${PN} += " \
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
ARM_INSTRUCTION_SET_armv6 = "arm"
-
-# These files may be out of date or missing our fixes
-# libgcrypt.m4 in particular is calling into libgcrypt-config
-do_configure_prepend() {
- rm -f ${S}/build/m4/*
-}
--
2.26.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 01/17] libinput: add ptest
2020-05-03 16:25 [PATCH 01/17] libinput: add ptest Alexander Kanavin
` (15 preceding siblings ...)
2020-05-03 16:25 ` [PATCH 17/17] gcr: update to 3.36.0 Alexander Kanavin
@ 2020-05-05 9:42 ` Richard Purdie
2020-05-05 11:58 ` Alexander Kanavin
16 siblings, 1 reply; 25+ messages in thread
From: Richard Purdie @ 2020-05-05 9:42 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
On Sun, 2020-05-03 at 18:25 +0200, Alexander Kanavin wrote:
> The test takes about 17 minutes, and fully passes.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> meta/conf/distro/include/ptest-packagelists.inc | 1 +
> meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++
> meta/recipes-graphics/wayland/libinput_1.15.2.bb | 14 +++++++++++---
> 3 files changed, 21 insertions(+), 3 deletions(-)
> create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
>
> diff --git a/meta/conf/distro/include/ptest-packagelists.inc
> b/meta/conf/distro/include/ptest-packagelists.inc
> index c13ff724b1..ab44757a11 100644
> --- a/meta/conf/distro/include/ptest-packagelists.inc
> +++ b/meta/conf/distro/include/ptest-packagelists.inc
> @@ -72,6 +72,7 @@ PTESTS_SLOW = "\
> glib-2.0-ptest \
> gstreamer1.0-ptest \
> libevent-ptest \
> + libinput-ptest \
> lttng-tools-ptest \
> openssh-ptest \
> openssl-ptest \
> diff --git a/meta/recipes-graphics/wayland/libinput/run-ptest
> b/meta/recipes-graphics/wayland/libinput/run-ptest
> new file mode 100644
> index 0000000000..5a84c568b9
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/libinput/run-ptest
> @@ -0,0 +1,9 @@
> +#!/bin/sh
> +
> +/usr/libexec/libinput/libinput-test-suite
> +if [ $? -eq 0 ]; then
> + echo 'PASS: libinput-test-suite'
> +else
> + echo 'FAIL: libinput-test-suite'
> +fi
> +
> diff --git a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> index 810532774e..31652cc342 100644
> --- a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> +++ b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> @@ -10,9 +10,10 @@ SECTION = "libs"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
>
> -DEPENDS = "libevdev udev mtdev"
> +DEPENDS = "libevdev udev mtdev libcheck"
>
> SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
> + file://run-ptest \
> file://determinism.patch \
> "
> SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
> @@ -20,7 +21,13 @@ SRC_URI[sha256sum] =
> "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834
>
> UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
>
> -inherit meson pkgconfig lib_package
> +inherit meson pkgconfig lib_package ptest
> +
> +# Patch out build directory, otherwise it leaks into ptest binary
> +do_configure_append() {
> + sed -i -e "s,${WORKDIR},,g" config.h
> + sed -i -e "s,${WORKDIR},,g" litest-config.h
> +}
>
Nearly :)
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1869
(I think its failing when ptests aren't enabled)
Cheers,
Richard
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [OE-core] [PATCH 01/17] libinput: add ptest
2020-05-05 9:42 ` [OE-core] [PATCH 01/17] libinput: add ptest Richard Purdie
@ 2020-05-05 11:58 ` Alexander Kanavin
0 siblings, 0 replies; 25+ messages in thread
From: Alexander Kanavin @ 2020-05-05 11:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3219 bytes --]
Thanks, I fixed this and other reported issues, so will re-send once what's
left of the last batch makes it into master:)
Alex
On Tue, 5 May 2020 at 11:43, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> On Sun, 2020-05-03 at 18:25 +0200, Alexander Kanavin wrote:
> > The test takes about 17 minutes, and fully passes.
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> > meta/conf/distro/include/ptest-packagelists.inc | 1 +
> > meta/recipes-graphics/wayland/libinput/run-ptest | 9 +++++++++
> > meta/recipes-graphics/wayland/libinput_1.15.2.bb | 14 +++++++++++---
> > 3 files changed, 21 insertions(+), 3 deletions(-)
> > create mode 100644 meta/recipes-graphics/wayland/libinput/run-ptest
> >
> > diff --git a/meta/conf/distro/include/ptest-packagelists.inc
> > b/meta/conf/distro/include/ptest-packagelists.inc
> > index c13ff724b1..ab44757a11 100644
> > --- a/meta/conf/distro/include/ptest-packagelists.inc
> > +++ b/meta/conf/distro/include/ptest-packagelists.inc
> > @@ -72,6 +72,7 @@ PTESTS_SLOW = "\
> > glib-2.0-ptest \
> > gstreamer1.0-ptest \
> > libevent-ptest \
> > + libinput-ptest \
> > lttng-tools-ptest \
> > openssh-ptest \
> > openssl-ptest \
> > diff --git a/meta/recipes-graphics/wayland/libinput/run-ptest
> > b/meta/recipes-graphics/wayland/libinput/run-ptest
> > new file mode 100644
> > index 0000000000..5a84c568b9
> > --- /dev/null
> > +++ b/meta/recipes-graphics/wayland/libinput/run-ptest
> > @@ -0,0 +1,9 @@
> > +#!/bin/sh
> > +
> > +/usr/libexec/libinput/libinput-test-suite
> > +if [ $? -eq 0 ]; then
> > + echo 'PASS: libinput-test-suite'
> > +else
> > + echo 'FAIL: libinput-test-suite'
> > +fi
> > +
> > diff --git a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> > b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> > index 810532774e..31652cc342 100644
> > --- a/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> > +++ b/meta/recipes-graphics/wayland/libinput_1.15.2.bb
> > @@ -10,9 +10,10 @@ SECTION = "libs"
> > LICENSE = "MIT"
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
> >
> > -DEPENDS = "libevdev udev mtdev"
> > +DEPENDS = "libevdev udev mtdev libcheck"
> >
> > SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
> > + file://run-ptest \
> > file://determinism.patch \
> > "
> > SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
> > @@ -20,7 +21,13 @@ SRC_URI[sha256sum] =
> > "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834
> >
> > UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
> >
> > -inherit meson pkgconfig lib_package
> > +inherit meson pkgconfig lib_package ptest
> > +
> > +# Patch out build directory, otherwise it leaks into ptest binary
> > +do_configure_append() {
> > + sed -i -e "s,${WORKDIR},,g" config.h
> > + sed -i -e "s,${WORKDIR},,g" litest-config.h
> > +}
> >
>
> Nearly :)
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1869
>
> (I think its failing when ptests aren't enabled)
>
> Cheers,
>
> Richard
>
>
>
[-- Attachment #2: Type: text/html, Size: 4802 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread