diff --git a/pmb/build/other.py b/pmb/build/other.py index 49a47bdf39a1fd4793cdc1c313234dbe70031b87..bcc31547f265adeb76c48379a285203434ff65ce 100644 --- a/pmb/build/other.py +++ b/pmb/build/other.py @@ -58,7 +58,8 @@ def find_aport(args, package, must_exist=True): # Search in subpackages for path_current in glob.glob(args.aports + "/*/*/APKBUILD"): apkbuild = pmb.parse.apkbuild(args, path_current) - if package in apkbuild["subpackages"]: + if (package in apkbuild["subpackages"] or + package in apkbuild["provides"]): ret = os.path.dirname(path_current) break diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index d3ff6211e18aaba02fac7278948c95c45bbd4753..ca97ad36816319ae42823bd765b8be835e9ab592 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -191,6 +191,7 @@ apkbuild_attributes = { "pkgdesc": {"array": False}, "pkgrel": {"array": False}, "pkgver": {"array": False}, + "provides": {"array": True}, "subpackages": {"array": True}, # cross-compilers diff --git a/pmb/parse/bootimg.py b/pmb/parse/bootimg.py index 63e272b0b3e64744b71dd3eb7dc6f2b133093e16..2c934f0aeab66d74838cc78f34ceda62924ac1ed 100644 --- a/pmb/parse/bootimg.py +++ b/pmb/parse/bootimg.py @@ -27,7 +27,7 @@ def bootimg(args, path): logging.info("NOTE: You will be prompted for your sudo password, so we can set" " up a chroot to extract and analyze your boot.img file") - pmb.chroot.apk.install(args, ["file", "mkbootimg"]) + pmb.chroot.apk.install(args, ["file", "unpackbootimg"]) temp_path = pmb.chroot.other.tempfolder(args, "/tmp/bootimg_parser") bootimg_path = args.work + "/chroot_native" + temp_path + "/boot.img"