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

pmb: Look for device/* files in device/*/... instead (!1879)

Browse source 
In the future, device ports will be located in a subdirectory
below device/... (e.g. device/testing/device-...).
Replace all occurrences of device/* with a glob that checks the
subdirectories instead.

Note: To ensure that this always works properly we should also add some
checks that all devices are indeed located under one of the supported
subdirectories (i.e. testing/community/main).

Change the glob for pmaports to <aports>/**/APKBUILD.
This allows using subdirectories for organization outside of device/
as well.
This commit is contained in:
Minecrell 2020-02-26 12:13:26 +01:00 • committed by Oliver Smith
parent c399ff81a1
commit fb8de5a553
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
20 changed files with 62 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/test_pkgrel_bump.py
View file

@ -77,11 +77,11 @@ def setup_work(args, tmpdir):
pmb.helpers.run.user(args, ["ln", "-s", path, tmpdir + "/"])
# Copy testdata and selected device aport
for folder in ["device", "main"]:
for folder in ["device/testing", "main"]:
pmb.helpers.run.user(args, ["mkdir", "-p", args.aports, tmpdir +
"/_aports/" + folder])
pmb.helpers.run.user(args, ["cp", "-r", args.aports + "/device/device-" +
args.device, tmpdir + "/_aports/device"])
pmb.helpers.run.user(args, ["cp", "-r", args.aports + "/device/testing/device-" +
args.device, tmpdir + "/_aports/device/testing"])
for pkgname in ["testlib", "testapp", "testsubpkg"]:
pmb.helpers.run.user(args, ["cp", "-r",
"test/testdata/pkgrel_bump/aports/" + pkgname,