[meta-oe][dunfell][PATCH 1/3] uml-utilities: fix installed-vs-shipped with usrmerge

[meta-oe][dunfell][PATCH 1/3] uml-utilities: fix installed-vs-shipped with usrmerge

[Martin Jansa]

* fixes:
  ERROR: uml-utilities-20040406-r1 do_package: QA Issue: uml-utilities: Files/directories were installed but not shipped in any package:
    /usr/lib/uml/port-helper
  Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
  uml-utilities: 1 installed and not shipped files. [installed-vs-shipped]

* pass LIB_DIR instead of using default value from Makefile:
  $ grep LIB_DIR.*= tools/port-helper/Makefile
  LIB_DIR ?= /usr/lib/uml

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-extended/uml-utilities/uml-utilities_20040406.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
index ed19d1e41a..de1fc3a1fe 100644
--- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -16,12 +16,11 @@ PR = "r1"
 S = "${WORKDIR}/tools"
 
 do_compile() {
-    oe_runmake
+    oe_runmake LIB_DIR=${libdir}/uml
 }
 
 do_install() {
     oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}"
-FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug"
+FILES_${PN} += "${libdir}/uml"
-- 
2.30.2

[meta-oe][dunfell][PATCH 2/3] telepathy-glib: respect GI_DATA_ENABLED when enabling vala-bindings

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb
index 2b05c61a0d..4d4e841f62 100644
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb
+++ b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
 
 inherit autotools pkgconfig gettext gobject-introspection vala
 
-EXTRA_OECONF = "--enable-vala-bindings"
+# Respect GI_DATA_ENABLED value when enabling vala-bindings:
+# configure: error: GObject-Introspection must be enabled for Vala bindings
+EXTRA_OECONF = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-vala-bindings', '--disable-vala-bindings', d)}"
 
 FILES_${PN} += "${datadir}/telepathy \
                 ${datadir}/dbus-1"
-- 
2.30.2

[meta-oe][dunfell][PATCH 3/3] libyui: switch to libyui-old repo which still has this SRCREV

[Martin Jansa]

* 8459235919f592b1bc099ecf9a947cb6344b6fa5 doesn't exist in current repo:
  libyui$ git branch -a --contains 8459235919f592b1bc099ecf9a947cb6344b6fa5
  error: no such commit 8459235919f592b1bc099ecf9a947cb6344b6fa5

* there are no common commits in the new libyui repo, but luckily old
  repo is kept as
  https://github.com/libyui/libyui-old
  similarly libyui-ncurses now contains only README about being obsolete in:
  https://github.com/libyui/libyui-ncurses
  but at least it wasn't rewritten to have the new content

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
index 7c6f4c13d2..f3c112c3b8 100644
--- a/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
+++ b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
                    "
 
-SRC_URI = "git://github.com/libyui/libyui.git \
+SRC_URI = "git://github.com/libyui/libyui-old.git \
            file://0001-Fix-build-with-clang.patch \
            file://0001-Use-relative-install-paths-for-CMake.patch \
            "
-- 
2.30.2

Re: [oe] [meta-oe][dunfell][PATCH 3/3] libyui: switch to libyui-old repo which still has this SRCREV

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]

On Tue, Apr 06, 2021 at 08:43:27PM +0200, Martin Jansa via lists.openembedded.org wrote:
> * 8459235919f592b1bc099ecf9a947cb6344b6fa5 doesn't exist in current repo:
>   libyui$ git branch -a --contains 8459235919f592b1bc099ecf9a947cb6344b6fa5
>   error: no such commit 8459235919f592b1bc099ecf9a947cb6344b6fa5
> 
> * there are no common commits in the new libyui repo, but luckily old
>   repo is kept as
>   https://github.com/libyui/libyui-old
>   similarly libyui-ncurses now contains only README about being obsolete in:
>   https://github.com/libyui/libyui-ncurses
>   but at least it wasn't rewritten to have the new content
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
> index 7c6f4c13d2..f3c112c3b8 100644
> --- a/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
> +++ b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
>                      file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
>                     "
>  
> -SRC_URI = "git://github.com/libyui/libyui.git \
> +SRC_URI = "git://github.com/libyui/libyui-old.git \
>             file://0001-Fix-build-with-clang.patch \
>             file://0001-Use-relative-install-paths-for-CMake.patch \
>             "

Gentle ping for these 3 (and 3 hostapd fixes currently in
stable/dunfell-nut).

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [oe] [meta-oe][dunfell][PATCH 3/3] libyui: switch to libyui-old repo which still has this SRCREV

[Armin Kuster]

On 4/20/21 3:56 AM, Martin Jansa wrote:
> On Tue, Apr 06, 2021 at 08:43:27PM +0200, Martin Jansa via lists.openembedded.org wrote:
>> * 8459235919f592b1bc099ecf9a947cb6344b6fa5 doesn't exist in current repo:
>>   libyui$ git branch -a --contains 8459235919f592b1bc099ecf9a947cb6344b6fa5
>>   error: no such commit 8459235919f592b1bc099ecf9a947cb6344b6fa5
>>
>> * there are no common commits in the new libyui repo, but luckily old
>>   repo is kept as
>>   https://github.com/libyui/libyui-old
>>   similarly libyui-ncurses now contains only README about being obsolete in:
>>   https://github.com/libyui/libyui-ncurses
>>   but at least it wasn't rewritten to have the new content
>>
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>>  meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
>> index 7c6f4c13d2..f3c112c3b8 100644
>> --- a/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
>> +++ b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
>> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
>>                      file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
>>                     "
>>  
>> -SRC_URI = "git://github.com/libyui/libyui.git \
>> +SRC_URI = "git://github.com/libyui/libyui-old.git \
>>             file://0001-Fix-build-with-clang.patch \
>>             file://0001-Use-relative-install-paths-for-CMake.patch \
>>             "
> Gentle ping for these 3 (and 3 hostapd fixes currently in
> stable/dunfell-nut).
Noted. Thanks. Ill get to those once my current Gategarth builds finish.

-armin
>
> 
>