1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-24 21:15:10 +03:00

Let new and most old devices depend on mesa dri swrast (#1086)

* Devices: depend on mesa-dri-swrast (where it makes sense)
* Device wizard: add mesa-dri-swrast by default
* Closes #1013.
This commit is contained in:
Oliver Smith 2018-01-06 14:08:10 +00:00 committed by GitHub
parent ea3fdfbab7
commit 9fb0147d37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 90 additions and 97 deletions

View file

@ -113,7 +113,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
assert apkbuild["pkgname"] == "device-testsuite-testdevice"
assert apkbuild["pkgdesc"] == "Testsuite Testdevice"
assert apkbuild["depends"] == ["linux-testsuite-testdevice"]
assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mesa-dri-swrast"]
assert apkbuild_linux["pkgname"] == "linux-testsuite-testdevice"
assert apkbuild_linux["pkgdesc"] == "Testsuite Testdevice kernel fork"
@ -146,12 +146,12 @@ def test_aportgen_device_wizard(args, monkeypatch):
answers["Flash method"] = "fastboot"
answers["Path"] = ""
deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mkbootimg"]
assert apkbuild["depends"] == ["linux-testsuite-testdevice", "mkbootimg", "mesa-dri-swrast"]
assert deviceinfo["flash_method"] == answers["Flash method"]
assert deviceinfo["generate_bootimg"] == "true"
# 0xffff (legacy uboot initfs)
answers["Flash method"] = "0xffff"
deviceinfo, apkbuild, apkbuild_linux = generate(args, monkeypatch, answers)
assert apkbuild["depends"] == ["linux-testsuite-testdevice", "uboot-tools"]
assert apkbuild["depends"] == ["linux-testsuite-testdevice", "uboot-tools", "mesa-dri-swrast"]
assert deviceinfo["generate_legacy_uboot_initfs"] == "true"