libmodulemd: move from 1.x to 2.x version

New libdnf requires 2.x and is the only consumer in oe-core
(or elsewhere).

(From OE-Core rev: 2c518de672d8876ff96e49b498feb898a497e6a5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-04-25 19:28:01 +02:00
committed by Richard Purdie
parent 365f24bee1
commit e1ab20ea5a
5 changed files with 58 additions and 29 deletions

View File

@@ -0,0 +1,28 @@
From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 31 Mar 2020 16:06:39 +0200
Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
modulemd/meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modulemd/meson.build b/modulemd/meson.build
index 9ef1902..9f71e72 100644
--- a/modulemd/meson.build
+++ b/modulemd/meson.build
@@ -494,6 +494,7 @@ if with_docs
)
endif
+if with_manpages == 'enabled'
help2man_opts = [
'--no-info',
'--section=1',
@@ -506,3 +507,4 @@ custom_target(
],
install: true,
install_dir: join_paths(get_option('mandir'), 'man1'))
+endif

View File

@@ -0,0 +1,23 @@
From d7eeac90fe02ccf5c5e4334e41ec75fc33803643 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 31 Mar 2020 16:12:28 +0200
Subject: [PATCH] meson.build: do not install python gi bindings
These are unnecessary for oe-core, and the install location
is incorrectly determined using native python.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/meson.build b/meson.build
index a8b02b4..8ff737b 100644
--- a/meson.build
+++ b/meson.build
@@ -171,4 +171,3 @@ configure_file(
)
subdir('modulemd')
-subdir('bindings/python')