diff options
3 files changed, 140 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libdnf/libmodulemd/0001-modulemd-disable-clang-format-and-missing-dependenci.patch b/meta/recipes-devtools/libdnf/libmodulemd/0001-modulemd-disable-clang-format-and-missing-dependenci.patch new file mode 100644 index 00000000000..2340393060d --- /dev/null +++ b/meta/recipes-devtools/libdnf/libmodulemd/0001-modulemd-disable-clang-format-and-missing-dependenci.patch @@ -0,0 +1,87 @@ +From f8ecf86d5c63cbb4eb568620a49b277d38dcc135 Mon Sep 17 00:00:00 2001 +From: Tim Orling <ticotimo@gmail.com> +Date: Thu, 11 Oct 2018 18:27:31 -0700 +Subject: [PATCH] modulemd: disable clang-format and missing dependencies + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Tim Orling <ticotimo@gmail.com> +--- + modulemd/meson.build | 52 ++++++++++++++++++++++---------------------- + 1 file changed, 26 insertions(+), 26 deletions(-) + +diff --git a/modulemd/meson.build b/modulemd/meson.build +index c7d42e8..bcafbf8 100644 +--- a/modulemd/meson.build ++++ b/modulemd/meson.build +@@ -14,22 +14,22 @@ test_dirty_git = get_option('test_dirty_git') + + python3 = pymod.find_python() + +-clang_format = find_program('clang-format', required: developer_build) +-if not clang_format.found() +- clang_format = disabler() +-endif ++#clang_format = find_program('clang-format', required: developer_build) ++#if not clang_format.found() ++# clang_format = disabler() ++#endif + +-autopep8 = find_program('python3-autopep8', 'autopep8', +- required : developer_build) +-if not autopep8.found() +- autopep8 = disabler() +-endif ++#autopep8 = find_program('python3-autopep8', 'autopep8', ++# required : developer_build) ++#if not autopep8.found() ++# autopep8 = disabler() ++#endif + +-valgrind = find_program('valgrind', required: developer_build) ++#valgrind = find_program('valgrind', required: developer_build) + +-if not valgrind.found() +- valgrind = disabler() +-endif ++#if not valgrind.found() ++# valgrind = disabler() ++#endif + + build_api_v1 = get_option('build_api_v1') + +@@ -118,21 +118,21 @@ libmodulemd_version = meson.project_version() + libmodulemd_version_array = libmodulemd_version.split('.') + + # Fake test to ensure that all sources and headers are formatted properly +-clang_args = [ '-i' ] +-test('clang_format', clang_format, +- args : clang_args + +- modulemd_v1_srcs + +- modulemd_v1_hdrs + +- modulemd_priv_hdrs + +- test_v1_srcs) ++#clang_args = [ '-i' ] ++#test('clang_format', clang_format, ++# args : clang_args + ++# modulemd_v1_srcs + ++# modulemd_v1_hdrs + ++# modulemd_priv_hdrs + ++# test_v1_srcs) + + # Fake test to ensure that the python tests are formatted according to PEP8 +-autopep8_args = [ '--in-place', '-a', '-a' ] +-autopep8_scripts = [ files('v1/tests/test-modulemd-python.py', +- 'common/tests/test-dirty.py', +- 'v1/tests/test-valgrind.py') ] +-test('autopep8', autopep8, +- args: autopep8_args + autopep8_scripts) ++#autopep8_args = [ '--in-place', '-a', '-a' ] ++#autopep8_scripts = [ files('v1/tests/test-modulemd-python.py', ++# 'common/tests/test-dirty.py', ++# 'v1/tests/test-valgrind.py') ] ++#test('autopep8', autopep8, ++# args: autopep8_args + autopep8_scripts) + + + # Fake test to ensure that the autoformatters didn't end up making changes diff --git a/meta/recipes-devtools/libdnf/libmodulemd/0002-modulemd-v1-meson.build-disable-valgrind-dependency.patch b/meta/recipes-devtools/libdnf/libmodulemd/0002-modulemd-v1-meson.build-disable-valgrind-dependency.patch new file mode 100644 index 00000000000..ba21ee1e46b --- /dev/null +++ b/meta/recipes-devtools/libdnf/libmodulemd/0002-modulemd-v1-meson.build-disable-valgrind-dependency.patch @@ -0,0 +1,35 @@ +From a12d17024a8056fc0f870d02f91701d7f44163c1 Mon Sep 17 00:00:00 2001 +From: Tim Orling <ticotimo@gmail.com> +Date: Thu, 11 Oct 2018 19:04:00 -0700 +Subject: [PATCH] modulemd/v1/meson.build: disable valgrind dependency + +Signed-off-by: Tim Orling <ticotimo@gmail.com> +--- + modulemd/v1/meson.build | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build +index 6a22a1d..a3fcb7d 100644 +--- a/modulemd/v1/meson.build ++++ b/modulemd/v1/meson.build +@@ -270,13 +270,13 @@ test ('test_v1_import_headers', import_header_script, + env : test_env, + args : modulemd_v1_hdrs) + +-if valgrind.found() +- modulemd_valgrind_scripts = files('tests/test-valgrind.py') +- test ('test_v1_valgrind', python3, +- env : test_env, +- args : modulemd_valgrind_scripts, +- timeout : 300) +-endif ++#if valgrind.found() ++# modulemd_valgrind_scripts = files('tests/test-valgrind.py') ++# test ('test_v1_valgrind', python3, ++# env : test_env, ++# args : modulemd_valgrind_scripts, ++# timeout : 300) ++#endif + + gnome.generate_gir( + modulemd_v1_lib, diff --git a/meta/recipes-devtools/libdnf/libmodulemd_1.6.4.bb b/meta/recipes-devtools/libdnf/libmodulemd_1.6.4.bb new file mode 100644 index 00000000000..b49b40614fa --- /dev/null +++ b/meta/recipes-devtools/libdnf/libmodulemd_1.6.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "C Library for manipulating module metadata files" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" + +SRC_URI = "https://github.com/fedora-modularity/libmodulemd/releases/download/libmodulemd-${PV}/modulemd-${PV}.tar.xz \ + file://0001-modulemd-disable-clang-format-and-missing-dependenci.patch \ + file://0002-modulemd-v1-meson.build-disable-valgrind-dependency.patch \ + " +SRC_URI[md5sum] = "2df1ca0493223609f30de549a239f3c5" +SRC_URI[sha256sum] = "c1461c8a591c8a0111adc242bbb2b8cf01e43185fb5d2273238680ddb92a18f0" + +S = "${WORKDIR}/modulemd-${PV}" + +DEPENDS = "gtk-doc libyaml" + +inherit gobject-introspection meson pkgconfig + +BBCLASSEXTEND = "native nativesdk" |