mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 06:49:32 +02:00
libmodulemd: remove the recipe
Version 2 of the recipe is not actually required by anything; the lidmodulemd dependency in createrepo-c is optional, and the libmodulemd feature is not used in YP. (From OE-Core rev: e5bf0814f565458c1c13d305dfc80a70a060555e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
a0cf9a307a
commit
62c5b16d46
@@ -1,22 +0,0 @@
|
||||
From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 6 Nov 2018 13:41:29 +0100
|
||||
Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
spec_tmpl.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/spec_tmpl.sh b/spec_tmpl.sh
|
||||
index 14e895a..fc80fc6 100755
|
||||
--- a/spec_tmpl.sh
|
||||
+++ b/spec_tmpl.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/sh
|
||||
+#!/bin/sh
|
||||
|
||||
version=$1
|
||||
libmodulemd_v1_version=$2
|
||||
@@ -1,28 +0,0 @@
|
||||
From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 21 May 2019 17:59:26 +0200
|
||||
Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
|
||||
pkgconfig
|
||||
|
||||
Otherwise there would be '-lmodulemd' which resolves
|
||||
to v2 version if both v2 and v1 are present in the sysroot.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
modulemd/v1/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
|
||||
index 4d54e69..9144ca2 100644
|
||||
--- a/modulemd/v1/meson.build
|
||||
+++ b/modulemd/v1/meson.build
|
||||
@@ -325,7 +325,7 @@ configure_file(
|
||||
)
|
||||
|
||||
pkg.generate(
|
||||
- libraries : modulemd_v1_lib,
|
||||
+ libraries : '-l:libmodulemd.so.1',
|
||||
subdirs : v1_header_path,
|
||||
version : libmodulemd_v1_version,
|
||||
name : 'modulemd',
|
||||
@@ -1,71 +0,0 @@
|
||||
From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 6 Nov 2018 13:43:00 +0100
|
||||
Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python
|
||||
bindings
|
||||
|
||||
All of these really need a configuration option.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
meson.build | 3 +--
|
||||
modulemd/v1/meson.build | 8 --------
|
||||
modulemd/v2/meson.build | 12 ------------
|
||||
3 files changed, 1 insertion(+), 22 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5a0cd3d..f51b16e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -52,7 +52,6 @@ gnome = import('gnome')
|
||||
pkg = import('pkgconfig')
|
||||
gobject = dependency('gobject-2.0')
|
||||
yaml = dependency('yaml-0.1')
|
||||
-gtkdoc = dependency('gtk-doc')
|
||||
|
||||
sh = find_program('sh')
|
||||
sed = find_program('sed')
|
||||
@@ -127,4 +126,4 @@ configure_file(
|
||||
)
|
||||
|
||||
subdir('modulemd')
|
||||
-subdir('bindings/python')
|
||||
+
|
||||
diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
|
||||
index ddc95a1..e85fafd 100644
|
||||
--- a/modulemd/v1/meson.build
|
||||
+++ b/modulemd/v1/meson.build
|
||||
@@ -356,11 +356,3 @@ configure_file(
|
||||
configuration : xcdata
|
||||
)
|
||||
|
||||
-gnome.gtkdoc(
|
||||
- 'modulemd-1.0',
|
||||
- install_dir: 'modulemd-1.0',
|
||||
- src_dir : './modulemd/v1',
|
||||
- main_xml : 'modulemd-v1-docs.xml',
|
||||
- install : true,
|
||||
-)
|
||||
-
|
||||
diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
|
||||
index 93c7fbd..0d9ed24 100644
|
||||
--- a/modulemd/v2/meson.build
|
||||
+++ b/modulemd/v2/meson.build
|
||||
@@ -285,15 +285,3 @@ configure_file(
|
||||
configuration : xcdata
|
||||
)
|
||||
|
||||
-gnome.gtkdoc(
|
||||
- 'modulemd-2.0',
|
||||
- install_dir: 'modulemd-2.0',
|
||||
- src_dir : './modulemd/v2',
|
||||
- main_xml : 'modulemd-v2-docs.xml',
|
||||
- gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'),
|
||||
- dependencies : [
|
||||
- modulemd_v2_dep,
|
||||
- ],
|
||||
- install : true,
|
||||
-)
|
||||
-
|
||||
Reference in New Issue
Block a user