Skip to content

Commit c8ef49d

Browse files
mmathesiussgallagher
authored andcommitted
Remove a few lingering StreamV3 vestiges
Signed-off-by: Merlin Mathesius <[email protected]>
1 parent 2000e88 commit c8ef49d

File tree

5 files changed

+0
-61
lines changed

5 files changed

+0
-61
lines changed

meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ if meson.version().version_compare('>=0.53')
198198

199199
summary({'Developer Build': get_option('developer_build'),
200200
'libmagic Support': magic_status,
201-
'Default Stream MD Version': default_stream_mdversion,
202201
'Custom Python': get_option('python_name'),
203202
'RPMIO Support': rpmio_status,
204203
'Generate Manpages': manpages_status,

meson_options.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ option('developer_build', type : 'boolean', value : true,
1717
option('verbose_tests', type : 'boolean', value : true,
1818
description : 'Tests that are run under the "debug" configuration will print all debug messages. Disable this option for valgrind checks, as it speeds it up substantially.')
1919

20-
option('default_stream_mdversion', type : 'integer', min : 2, max : 3, value : 2,
21-
description : 'The default module stream metadata version to use.')
22-
2320
option('libmagic', type : 'feature', value : 'enabled',
2421
description : 'Enables the use of libmagic to detect compression of YAML files.')
2522

modulemd/include/modulemd-2.0/modulemd-module-stream.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ typedef struct _ModulemdModule ModulemdModule;
5151
* metadata format.
5252
* @MD_MODULESTREAM_VERSION_TWO: Represents v2 of the #ModulemdModuleStream
5353
* metadata format.
54-
* @MD_MODULESTREAM_VERSION_THREE: Represents v3 of the #ModulemdModuleStream
55-
* metadata format. Since: 2.10
5654
* @MD_MODULESTREAM_VERSION_LATEST: Represents the highest-supported version of
5755
* the #ModulemdModuleStream metadata format.
5856
*

modulemd/include/private/modulemd-module-stream-private.h

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -383,59 +383,6 @@ modulemd_module_stream_includes_nevra (ModulemdModuleStream *self,
383383
const gchar *nevra_pattern);
384384

385385

386-
/**
387-
* modulemd_module_stream_expand_v2_to_v3_deps:
388-
* @v2_stream: (in): A pointer to a #ModulemdModuleStreamV2 object that is to
389-
* have its dependencies expanded.
390-
* @error: (out): A #GError that will return the reason for an expansion error.
391-
*
392-
* Stream V2 dependencies can be a list of #ModulemdDependencies, each of which
393-
* consists of a list of buildtime and runtime modules, each of which can have
394-
* multiple streams specified. Stream V3 dependencies are much simpler compared
395-
* to Stream V2, and have just a single list of buildtime modules and single
396-
* list of runtime modules. Additionally, each dependent module in Stream V3 can
397-
* specify only a single stream. Furthermore, Stream V2 dependencies treated
398-
* "platform" the same as any other module dependency, while Stream V3
399-
* dependencies have "platform" as a seperate property.
400-
*
401-
* This function takes the Stream V2 dependencies and expands them into a
402-
* #GPtrArray of #ModulemdBuildConfig objects representing the flattened
403-
* combinations of module:stream dependencies, explicitly extracting
404-
* "platform" from the list of dependent modules and using it to set the
405-
* seperate "platform" property.
406-
*
407-
* Returns: (transfer full): A #GPtrArray of #ModulemdBuildConfig objects
408-
* containing the fully stream expanded version of @v2_stream, else NULL
409-
* if an error occurred and @error will be set accordingly.
410-
*
411-
* Since: 2.10
412-
*/
413-
GPtrArray *
414-
modulemd_module_stream_expand_v2_to_v3_deps (ModulemdModuleStreamV2 *v2_stream,
415-
GError **error);
416-
417-
/**
418-
* modulemd_module_stream_upgrade_v2_to_v3_ext:
419-
* @from: (in): A pointer to a #ModulemdModuleStream object (must be
420-
* #ModulemdModuleStreamV2) that is to be upgraded to #ModulemdModuleStreamV3.
421-
* @error: (out): A #GError that will return the reason for an expansion error.
422-
*
423-
* This function takes @v2_stream and maps it into one or more
424-
* #ModulemdModuleStreamV3 objects representing the flattened combinations of
425-
* module:stream dependencies found in the #ModulemdModuleStreamV2 object,
426-
* along with explicitly setting the "platform" property. These
427-
* #ModulemdModuleStreamV3 objects are bundled together in a #ModulemdModule
428-
* object that is returned to the caller.
429-
*
430-
* Returns: (transfer full): A #ModulemdModule containing one or more #StreamV3
431-
* objects, else NULL if an error occured and @error will be set accordingly.
432-
*
433-
* Since: 2.10
434-
*/
435-
ModulemdModule *
436-
modulemd_module_stream_upgrade_v2_to_v3_ext (ModulemdModuleStreamV2 *from,
437-
GError **error);
438-
439386
/**
440387
* modulemd_module_stream_set_autogen_module_name:
441388
* @self: (in): A pointer to a #ModulemdModuleStream object

modulemd/meson.build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ skip_formatters = get_option('skip_formatters')
1717
skip_introspection = get_option('skip_introspection')
1818
developer_build = get_option('developer_build')
1919
verbose_tests = get_option('verbose_tests')
20-
default_stream_mdversion = get_option('default_stream_mdversion')
2120

2221
if not developer_build
2322
skip_formatters = true
@@ -169,7 +168,6 @@ enums = gnome.mkenums_simple ('modulemd-enums', sources : modulemd_hdrs)
169168

170169
cdata = configuration_data()
171170
cdata.set_quoted('LIBMODULEMD_VERSION', libmodulemd_version)
172-
cdata.set('DEFAULT_STREAM_MDVERSION', default_stream_mdversion)
173171
cdata.set('HAVE_RPMIO', rpm.found())
174172
cdata.set('HAVE_LIBMAGIC', magic.found())
175173
cdata.set('HAVE_GDATE_AUTOPTR', has_gdate_autoptr)

0 commit comments

Comments
 (0)