From 31347a7b884926de4fbc2a39eb432ea0d3c58cf7 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 7 Jan 2022 09:22:48 -0500 Subject: [PATCH] extensions: add layout for libdrm This is needed by AMD GPUs. --- snapcraft/internal/project_loader/_extensions/_flutter_meta.py | 3 ++- snapcraft/internal/project_loader/_extensions/gnome_3_28.py | 1 + snapcraft/internal/project_loader/_extensions/gnome_3_34.py | 1 + snapcraft/internal/project_loader/_extensions/gnome_3_38.py | 1 + tests/unit/project_loader/extensions/test_flutter.py | 3 ++- tests/unit/project_loader/extensions/test_gnome_3_28.py | 3 +++ tests/unit/project_loader/extensions/test_gnome_3_34.py | 3 +++ tests/unit/project_loader/extensions/test_gnome_3_38.py | 3 +++ 8 files changed, 16 insertions(+), 2 deletions(-) diff --git a/snapcraft/internal/project_loader/_extensions/_flutter_meta.py b/snapcraft/internal/project_loader/_extensions/_flutter_meta.py index 51b5bb2a10..5ba3efef9a 100644 --- a/snapcraft/internal/project_loader/_extensions/_flutter_meta.py +++ b/snapcraft/internal/project_loader/_extensions/_flutter_meta.py @@ -139,7 +139,8 @@ def __init__(self, *, extension_name: str, yaml_data: Dict[str, Any]) -> None: "layout": { "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" - } + }, + "/usr/share/libdrm": {"bind": "$SNAP/gnome-platform/usr/share/libdrm"}, }, } diff --git a/snapcraft/internal/project_loader/_extensions/gnome_3_28.py b/snapcraft/internal/project_loader/_extensions/gnome_3_28.py index d19c9f7563..fcd71535a6 100644 --- a/snapcraft/internal/project_loader/_extensions/gnome_3_28.py +++ b/snapcraft/internal/project_loader/_extensions/gnome_3_28.py @@ -102,6 +102,7 @@ def __init__(self, *, extension_name: str, yaml_data: Dict[str, Any]) -> None: "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" }, + "/usr/share/libdrm": {"bind": "$SNAP/gnome-platform/usr/share/libdrm"}, }, } diff --git a/snapcraft/internal/project_loader/_extensions/gnome_3_34.py b/snapcraft/internal/project_loader/_extensions/gnome_3_34.py index e1155942e0..48d866d589 100644 --- a/snapcraft/internal/project_loader/_extensions/gnome_3_34.py +++ b/snapcraft/internal/project_loader/_extensions/gnome_3_34.py @@ -105,6 +105,7 @@ def __init__(self, *, extension_name: str, yaml_data: Dict[str, Any]) -> None: "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" }, + "/usr/share/libdrm": {"bind": "$SNAP/gnome-platform/usr/share/libdrm"}, }, } diff --git a/snapcraft/internal/project_loader/_extensions/gnome_3_38.py b/snapcraft/internal/project_loader/_extensions/gnome_3_38.py index cbb87d1d4d..beac6b3e60 100644 --- a/snapcraft/internal/project_loader/_extensions/gnome_3_38.py +++ b/snapcraft/internal/project_loader/_extensions/gnome_3_38.py @@ -105,6 +105,7 @@ def __init__(self, *, extension_name: str, yaml_data: Dict[str, Any]) -> None: "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" }, + "/usr/share/libdrm": {"bind": "$SNAP/gnome-platform/usr/share/libdrm"}, }, } diff --git a/tests/unit/project_loader/extensions/test_flutter.py b/tests/unit/project_loader/extensions/test_flutter.py index da297a3f0e..8c07425be2 100644 --- a/tests/unit/project_loader/extensions/test_flutter.py +++ b/tests/unit/project_loader/extensions/test_flutter.py @@ -64,7 +64,8 @@ def test_extension(extension_class): "layout": { "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" - } + }, + "/usr/share/libdrm": {"bind": "$SNAP/gnome-platform/usr/share/libdrm"}, }, } diff --git a/tests/unit/project_loader/extensions/test_gnome_3_28.py b/tests/unit/project_loader/extensions/test_gnome_3_28.py index d91c9452df..717d1fe63f 100644 --- a/tests/unit/project_loader/extensions/test_gnome_3_28.py +++ b/tests/unit/project_loader/extensions/test_gnome_3_28.py @@ -72,6 +72,9 @@ def test_extension(self): "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" }, + "/usr/share/libdrm": { + "bind": "$SNAP/gnome-platform/usr/share/libdrm" + }, }, } ), diff --git a/tests/unit/project_loader/extensions/test_gnome_3_34.py b/tests/unit/project_loader/extensions/test_gnome_3_34.py index 7d07472167..f7c9d94292 100644 --- a/tests/unit/project_loader/extensions/test_gnome_3_34.py +++ b/tests/unit/project_loader/extensions/test_gnome_3_34.py @@ -75,6 +75,9 @@ def test_extension(self): "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" }, + "/usr/share/libdrm": { + "bind": "$SNAP/gnome-platform/usr/share/libdrm" + }, }, } ), diff --git a/tests/unit/project_loader/extensions/test_gnome_3_38.py b/tests/unit/project_loader/extensions/test_gnome_3_38.py index eb86b5dc03..2c287a040c 100644 --- a/tests/unit/project_loader/extensions/test_gnome_3_38.py +++ b/tests/unit/project_loader/extensions/test_gnome_3_38.py @@ -75,6 +75,9 @@ def test_extension(self): "/usr/share/xml/iso-codes": { "bind": "$SNAP/gnome-platform/usr/share/xml/iso-codes" }, + "/usr/share/libdrm": { + "bind": "$SNAP/gnome-platform/usr/share/libdrm" + }, }, } ),