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

Fix conflict with mkbootimg and android-tools (#1557)

Browse source 
Alpine ships `mkbootimg` with the `android-tools` package now. This
conflicts with the `mkbootimg` fork from osm0sis (see #441).

Changes:
* Rename `mkbootimg` to `mkbootimg-osm0sis` (aport and binary name)
* `mkbootimg-osm0sis`: provides `mkbootimg` now (so we don't need to
  change all the device aports), update version to 2018.05.10
* Adjust our `mkinitfs` script to call `mkbootimg-osm0sis`
* Better aport description
* pkgrel_bump testcase: don't fail on deleted aport
This commit is contained in:
Oliver Smith 2018-06-17 21:26:34 +00:00 • committed by GitHub
parent b9d35f60e0
commit 3263bc4cb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pmb/helpers/pkgrel_bump.py
View file

@ -128,7 +128,7 @@ def auto_apkindex_package(args, arch, aport, apk, dry=False):
# (which means dynamic libraries that the package was linked
# against) and packages for which no aport exists.
if (depend.startswith("so:") or
not pmb.build.other.find_aport(args, depend)):
not pmb.build.other.find_aport(args, depend, False)):
missing.append(depend)
# Increase pkgrel