[gnome-boxes/usb-pci-ids-update: 1/2] flatpak: Install pci.ids and usb.ids from the libosinfo module



commit c0f9d4eb776a767dc68383553906b1bf1ff61907
Author: Felipe Borges <felipeborges gnome org>
Date:   Wed Dec 4 10:21:53 2019 +0100

    flatpak: Install pci.ids and usb.ids from the libosinfo module
    
    Instead of adding a dedicated "ids" module.

 build-aux/flatpak/org.gnome.Boxes.json | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index b2add5de..559d589f 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -413,24 +413,6 @@
                 }
             ]
         },
-        {
-            "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" : "file",
-                    "path" : "pci.ids"
-                },
-                {
-                    "type" : "file",
-                    "path" : "usb.ids"
-                }
-            ]
-        },
         {
             "name" : "libosinfo",
             "buildsystem" : "meson",
@@ -438,11 +420,23 @@
                 "-Dwith-pci-ids-path=/app/share/hwdata/pci.ids",
                 "-Dwith-usb-ids-path=/app/share/hwdata/usb.ids"
             ],
+            "post-install" : [
+                "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"
+                },
+                {
+                    "type" : "file",
+                    "path" : "usb.ids"
                 }
             ]
         },


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