[gnome-boxes] flatpak: Install {pci,usb}.ids files



commit 92944a482a574f05c33977e69942fc8e625edff8
Author: Fabiano FidĂȘncio <fidencio redhat com>
Date:   Tue Dec 3 22:57:45 2019 +0100

    flatpak: Install {pci,usb}.ids files
    
    Although pci.ids is part of freedesktop-sdk, usb.ids is not and must be
    installed by GNOME Boxes.
    
    In normal environments libosinfo would `wget` usb.ids without any issue.
    However, freedesktop-sdk doesn't have wget nor has internet access
    during the build.
    
    Signed-off-by: Fabiano FidĂȘncio <fidencio redhat com>

 build-aux/flatpak/org.gnome.Boxes.json | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index e463096e..f77ddf58 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -414,14 +414,13 @@
             ]
         },
         {
-            "name" : "libosinfo",
-            "buildsystem" : "meson",
+            "name" : "ids",
+            "buildsystem" : "simple",
+            "build-commands" : [
+                "install -Dm644 pci.ids /app/share/hwdata/pci.ids",
+                "install -Dm644 usb.ids /app/share/hwdata/usb.ids"
+            ],
             "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://releases.pagure.org/libosinfo/libosinfo-1.7.0.tar.xz";,
-                    "sha256": "2a3cdf851505af8d9988599c03a54613bf503042f0cf4982e895f4254a697693"
-                },
                 {
                     "type" : "file",
                     "path" : "pci.ids"
@@ -432,6 +431,17 @@
                 }
             ]
         },
+        {
+            "name" : "libosinfo",
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://releases.pagure.org/libosinfo/libosinfo-1.7.0.tar.xz";,
+                    "sha256": "2a3cdf851505af8d9988599c03a54613bf503042f0cf4982e895f4254a697693"
+                }
+            ]
+        },
         {
             "name" : "osinfo-db",
             "buildsystem" : "simple",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]