synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pmb.aportgen.device: replace mesa-dri-swrast with mesa-dri-gallium (MR 1917) 

The `mesa-dri-swrast` package was merged into `mesa-dri-gallium` in Alpine.
(See 298e20d04f)

The old alias might be removed in the future, so change the generated APKBUILDs
to depend on `mesa-dri-gallium` instead.
This commit is contained in:
Daniele Debernardi 2020-04-13 03:39:15 +02:00 committed by Minecrell
parent 9050010044
commit 9c2d951fc9
No known key found for this signature in database
GPG Key ID: B77CE638A6C2E562
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmb/aportgen/device.py
View File

@ -192,7 +192,7 @@ def generate_apkbuild(args, pkgname, name, arch, flash_method):
depends += " mkbootimg"
if flash_method == "0xffff":
depends += " uboot-tools"
depends += " mesa-dri-swrast"
depends += " mesa-dri-gallium"
# Whole APKBUILD
content = f"""\

6
test/test_aportgen_device_wizard.py
View File

@ -120,7 +120,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
assert apkbuild["pkgdesc"] == "Testsuite Testdevice"
assert apkbuild["depends"] == ["postmarketos-base",
"linux-testsuite-testdevice",
"mesa-dri-swrast"]
"mesa-dri-gallium"]
assert apkbuild_linux["pkgname"] == "linux-testsuite-testdevice"
assert apkbuild_linux["pkgdesc"] == "Testsuite Testdevice kernel fork"
@ -156,7 +156,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
assert apkbuild["depends"] == ["postmarketos-base",
"linux-testsuite-testdevice", "mkbootimg",
"mesa-dri-swrast"]
"mesa-dri-gallium"]
assert deviceinfo["flash_method"] == answers["Flash method"]
assert deviceinfo["generate_bootimg"] == "true"
@ -165,5 +165,5 @@ def test_aportgen_device_wizard(args, monkeypatch):
deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
assert apkbuild["depends"] == ["postmarketos-base",
"linux-testsuite-testdevice", "uboot-tools",
"mesa-dri-swrast"]
"mesa-dri-gallium"]
assert deviceinfo["generate_legacy_uboot_initfs"] == "true"