diff options
| author | Richard Hughes <richard@hughsie.com> | 2015-08-10 13:54:49 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2015-08-10 18:04:19 +0100 |
| commit | 93f1a4b5ab2e6d80d66027cd80edef4dabe45b24 (patch) | |
| tree | 3bcd724792e600fb629fc605ed166b0f9eb08e74 /libappstream-glib/as-provide.c | |
| parent | 4695568085f77599355804fa79dfb9ae7e12a182 (diff) | |
| download | appstream-glib-93f1a4b5ab2e6d80d66027cd80edef4dabe45b24.tar.gz | |
Add support for the flashed firmware provide kind
This allows us to have an ID that isn't tied to the GUID, and also allows us to
have one component that targets more than one ESRT GUID. This requires changing
the matching logic better, but should match what makes it into AppStream 0.9
Diffstat (limited to 'libappstream-glib/as-provide.c')
| -rw-r--r-- | libappstream-glib/as-provide.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/libappstream-glib/as-provide.c b/libappstream-glib/as-provide.c index 0a97257..27b1aec 100644 --- a/libappstream-glib/as-provide.c +++ b/libappstream-glib/as-provide.c @@ -103,8 +103,10 @@ as_provide_kind_from_string (const gchar *kind) return AS_PROVIDE_KIND_FONT; if (g_strcmp0 (kind, "modalias") == 0) return AS_PROVIDE_KIND_MODALIAS; - if (g_strcmp0 (kind, "firmware") == 0) - return AS_PROVIDE_KIND_FIRMWARE; + if (g_strcmp0 (kind, "firmware-runtime") == 0) + return AS_PROVIDE_KIND_FIRMWARE_RUNTIME; + if (g_strcmp0 (kind, "firmware-flashed") == 0) + return AS_PROVIDE_KIND_FIRMWARE_FLASHED; if (g_strcmp0 (kind, "python2") == 0) return AS_PROVIDE_KIND_PYTHON2; if (g_strcmp0 (kind, "python3") == 0) @@ -137,8 +139,10 @@ as_provide_kind_to_string (AsProvideKind kind) return "font"; if (kind == AS_PROVIDE_KIND_MODALIAS) return "modalias"; - if (kind == AS_PROVIDE_KIND_FIRMWARE) - return "firmware"; + if (kind == AS_PROVIDE_KIND_FIRMWARE_RUNTIME) + return "firmware-runtime"; + if (kind == AS_PROVIDE_KIND_FIRMWARE_FLASHED) + return "firmware-flashed"; if (kind == AS_PROVIDE_KIND_PYTHON2) return "python2"; if (kind == AS_PROVIDE_KIND_PYTHON3) @@ -252,6 +256,20 @@ as_provide_node_insert (AsProvide *provide, GNode *parent, AsNodeContext *ctx) "type", "system", NULL); break; + case AS_PROVIDE_KIND_FIRMWARE_FLASHED: + n = as_node_insert (parent, "firmware", + priv->value, + AS_NODE_INSERT_FLAG_NONE, + "type", "flashed", + NULL); + break; + case AS_PROVIDE_KIND_FIRMWARE_RUNTIME: + n = as_node_insert (parent, "firmware", + priv->value, + AS_NODE_INSERT_FLAG_NONE, + "type", "runtime", + NULL); + break; default: n = as_node_insert (parent, as_provide_kind_to_string (priv->kind), priv->value, @@ -300,14 +318,20 @@ as_provide_node_parse (AsProvide *provide, GNode *node, AsNodeContext *ctx, GError **error) { AsProvidePrivate *priv = GET_PRIVATE (provide); + const gchar *tmp; if (g_strcmp0 (as_node_get_name (node), "dbus") == 0) { - const gchar *tmp; tmp = as_node_get_attribute (node, "type"); if (g_strcmp0 (tmp, "system") == 0) priv->kind = AS_PROVIDE_KIND_DBUS_SYSTEM; - else if (g_strcmp0 (tmp, "session") == 0) + else priv->kind = AS_PROVIDE_KIND_DBUS_SESSION; + } else if (g_strcmp0 (as_node_get_name (node), "firmware") == 0) { + tmp = as_node_get_attribute (node, "type"); + if (g_strcmp0 (tmp, "flashed") == 0) + priv->kind = AS_PROVIDE_KIND_FIRMWARE_FLASHED; + else + priv->kind = AS_PROVIDE_KIND_FIRMWARE_RUNTIME; } else { priv->kind = as_provide_kind_from_string (as_node_get_name (node)); } |