Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

pmb.config: do not prompt for nonfree fw/userland (MR 2255)

Browse source 
This drops the prompt for using non-free firmware in images. The logic
for searching/installing non-free fw subpackages for devices is kept,
and will always be installed. This is to support the many device
packages in pmaports that still have nonfree-firmware subpackages. Going
forward, device packages can list firmware in `depends=` (for required
fw) or `pmb_recommends` (for optional fw).

nonfree-userland wasn't used in pmaports as far as I could find.
This commit is contained in:
Clayton Craft 2024-02-13 10:07:13 -08:00
parent 0bed6a0437
commit aa594b76fa
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
5 changed files with 19 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/test_install.py
View file

@ -30,8 +30,6 @@ def test_get_nonfree_packages(args):
func = pmb.install._install.get_nonfree_packages
# Device without any non-free subpackages
args.nonfree_firmware = True
args.nonfree_userland = True
assert func(args, "lg-mako") == []
# Device with non-free firmware and userland
@ -43,10 +41,6 @@ def test_get_nonfree_packages(args):
device = "nonfree-userland"
assert func(args, device) == ["device-" + device + "-nonfree-userland"]
# Device with non-free userland (but user disabled it init)
args.nonfree_userland = False
assert func(args, device) == []
def test_get_recommends(args):
args.aports = pmb_test.const.testdata + "/pmb_recommends"