forked from Mirror/pmbootstrap
`pmbootstrap pkgrel_bump --auto` automatically increases the pkgrel for packages linking against libraries, which don't exist anymore (because the soname has been changed). The feature is explained in detail in The previous implementation did not detect soname breakage, when a subpackage linked against a certain library, but the main package did not (e.g. `qt5-qtbase-mysql` and `qt5-qtbase`). This was, because we iterated over the aports/* to find the packages to be checked. To fix this, we are iterating over the packages found in the APKINDEX files instead (of both the locally compiled packages and the downloaded index from the pmOS mirror). Details: * `pmb/helpers/pkgrel_bump.py`: * Rewrite `auto_apkindex_package()` to act upon a given parsed `aport` and `apk` (from the index) instead of finding the `apk` dict by itself (we need it earlier anyway). * Rewrite `auto()` to iterate over APKINDEX files instead of aports * Skip packages already found, so the `pkgrel` does not get increased multiple times when the same package was found in multipe index files. * Put the package name at the beginning of the log messages to make them more readable * testdata: Create a new `testsubpkg` aport, where only the subpackage links against `testlib` * Adjust testing code to test everything with `testsubpkg` as well. NOTE: This makes the command a bit slower, but we could improve performance again by smart caching of `pmb.parse.apkindex.depends()`. This could come in a future PR, the important part here is that the command is bug-free again with this fix.
165 lines
6.3 KiB
Python
165 lines
6.3 KiB
Python
"""
|
|
Copyright 2018 Oliver Smith
|
|
|
|
This file is part of pmbootstrap.
|
|
|
|
pmbootstrap is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
pmbootstrap is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
|
|
"""
|
|
import logging
|
|
import os
|
|
|
|
import pmb.build.other
|
|
import pmb.helpers.file
|
|
import pmb.helpers.repo
|
|
import pmb.parse
|
|
|
|
|
|
def package(args, pkgname, reason="", dry=False):
|
|
"""
|
|
Increase the pkgrel in the APKBUILD of a specific package.
|
|
|
|
:param pkgname: name of the package
|
|
:param reason: string to display as reason why it was increased
|
|
:param dry: don't modify the APKBUILD, just print the message
|
|
"""
|
|
# Current and new pkgrel
|
|
path = pmb.build.other.find_aport(args, pkgname) + "/APKBUILD"
|
|
apkbuild = pmb.parse.apkbuild(args, path)
|
|
pkgrel = int(apkbuild["pkgrel"])
|
|
pkgrel_new = pkgrel + 1
|
|
|
|
# Display the message, bail out in dry mode
|
|
logging.info("Increase '" + pkgname + "' pkgrel (" + str(pkgrel) + " -> " +
|
|
str(pkgrel_new) + ")" + reason)
|
|
if dry:
|
|
return
|
|
|
|
# Increase
|
|
old = "\npkgrel=" + str(pkgrel) + "\n"
|
|
new = "\npkgrel=" + str(pkgrel_new) + "\n"
|
|
pmb.helpers.file.replace(path, old, new)
|
|
|
|
# Verify
|
|
del(args.cache["apkbuild"][path])
|
|
apkbuild = pmb.parse.apkbuild(args, path)
|
|
if int(apkbuild["pkgrel"]) != pkgrel_new:
|
|
raise RuntimeError("Failed to bump pkgrel for package '" + pkgname +
|
|
"'. Make sure that there's a line with exactly the"
|
|
" string '" + old + "' and nothing else in: " +
|
|
path)
|
|
|
|
|
|
def auto_apkindex_files(args):
|
|
"""
|
|
Get the paths to the APKINDEX files, that need to be analyzed, sorted by
|
|
arch. Relevant are the local pmbootstrap generated APKINDEX as well as the
|
|
APKINDEX from the pmOS binary repo.
|
|
|
|
:returns: {"armhf": "...../APKINDEX.tar.gz", ...}
|
|
"""
|
|
pmb.helpers.repo.update(args)
|
|
ret = {}
|
|
for arch in pmb.config.build_device_architectures:
|
|
ret[arch] = []
|
|
local = args.work + "/packages/" + arch + "/APKINDEX.tar.gz"
|
|
if os.path.exists(local):
|
|
ret[arch].append(local)
|
|
|
|
if args.mirror_postmarketos:
|
|
path = (args.work + "/cache_apk_" + arch + "/APKINDEX." +
|
|
pmb.helpers.repo.hash(args.mirror_postmarketos) + ".tar.gz")
|
|
ret[arch].append(path)
|
|
return ret
|
|
|
|
|
|
def auto_apkindex_package(args, arch, aport, apk, dry=False):
|
|
"""
|
|
Bump the pkgrel of a specific package if it is outdated in the given
|
|
APKINDEX.
|
|
|
|
:param arch: the architecture, e.g. "armhf"
|
|
:param aport: parsed APKBUILD of the binary package's origin:
|
|
{"pkgname": ..., "pkgver": ..., "pkgrel": ..., ...}
|
|
:param apk: information about the binary package from the APKINDEX:
|
|
{"version": ..., "depends": [...], ...}
|
|
:param dry: don't modify the APKBUILD, just print the message
|
|
:returns: True when there was an APKBUILD that needed to be changed.
|
|
"""
|
|
version_aport = aport["pkgver"] + "-r" + aport["pkgrel"]
|
|
version_apk = apk["version"]
|
|
pkgname = aport["pkgname"]
|
|
|
|
# Skip when aport version != binary package version
|
|
compare = pmb.parse.version.compare(version_aport, version_apk)
|
|
if compare == -1:
|
|
logging.warning("{}: skipping, because the aport version {} is lower"
|
|
" than the binary version {}".format(pkgname,
|
|
version_aport,
|
|
version_apk))
|
|
return
|
|
if compare == 1:
|
|
logging.verbose("{}: skipping, because the aport version {} is higher"
|
|
" than the binary version {}".format(pkgname,
|
|
version_aport,
|
|
version_apk))
|
|
return
|
|
|
|
# Find missing depends
|
|
depends = apk["depends"]
|
|
logging.verbose("{}: checking depends: {}".format(pkgname,
|
|
", ".join(depends)))
|
|
missing = []
|
|
for depend in depends:
|
|
providers = pmb.parse.apkindex.providers(args, depend, arch,
|
|
must_exist=False)
|
|
if providers == {}:
|
|
# We're only interested in missing depends starting with "so:"
|
|
# (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)):
|
|
missing.append(depend)
|
|
|
|
# Increase pkgrel
|
|
if len(missing):
|
|
package(args, pkgname, reason=", missing depend(s): " +
|
|
", ".join(missing), dry=dry)
|
|
return True
|
|
|
|
|
|
def auto(args, dry=False):
|
|
"""
|
|
:returns: list of aport names, where the pkgrel needed to be changed
|
|
"""
|
|
ret = []
|
|
for arch, paths in auto_apkindex_files(args).items():
|
|
for path in paths:
|
|
logging.info("scan " + path)
|
|
index = pmb.parse.apkindex.parse(args, path, False)
|
|
for pkgname, apk in index.items():
|
|
origin = apk["origin"]
|
|
# Only increase once!
|
|
if origin in ret:
|
|
logging.verbose("{}: origin '{}' found again".format(pkgname,
|
|
origin))
|
|
continue
|
|
aport_path = pmb.build.other.find_aport(args, origin, False)
|
|
if not aport_path:
|
|
logging.warning("{}: origin '{}' aport not found".format(
|
|
pkgname, origin))
|
|
continue
|
|
aport = pmb.parse.apkbuild(args, aport_path + "/APKBUILD")
|
|
if auto_apkindex_package(args, arch, aport, apk, dry):
|
|
ret.append(pkgname)
|
|
return ret
|