mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 21:32:13 +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:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
a0cf9a307a
commit
62c5b16d46
@@ -355,7 +355,6 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <ross.burton@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
|
||||
RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>"
|
||||
RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>"
|
||||
|
||||
@@ -12,12 +12,12 @@ SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm libmodulemd"
|
||||
DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
|
||||
DEPENDS_append_class-native = " file-replacement-native"
|
||||
|
||||
inherit cmake pkgconfig bash-completion distutils3-base
|
||||
|
||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF"
|
||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
@@ -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,
|
||||
-)
|
||||
-
|
||||
@@ -1,26 +0,0 @@
|
||||
SUMMARY = "C Library for manipulating module metadata files"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
|
||||
|
||||
SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
|
||||
file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
|
||||
file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
|
||||
file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
|
||||
"
|
||||
|
||||
PV = "2.6.0"
|
||||
SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit meson gobject-introspection
|
||||
|
||||
EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true"
|
||||
|
||||
DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
GIR_MESON_OPTION = 'skip_introspection'
|
||||
GIR_MESON_ENABLE_FLAG = 'false'
|
||||
GIR_MESON_DISABLE_FLAG = 'true'
|
||||
Reference in New Issue
Block a user