mirror of
git://git.yoctoproject.org/poky
synced 2026-09-26 12:36:27 +00:00
b2e64adf18
This was motivated by remembering that both xserver-xorg and xorgxrdp need to ignore the xorg-driver-abi test in do_package_qa because the logic to generate the required dependencies is contained in xorg-driver-common.inc, so can't be reused easily by the xserver (which ships the modesetting driver) or xorgxrdp (which ships drivers and more). Merge both the RPROVIDES (xserver) and RDEPENDS (driver) functions into a single xserver-abi.inc to ensure that their logic remains in sync. Generalise the names: instead of hardcoding 'input' and 'video' extract the ABI names from the pkg-config file directly. This means 'input' is now 'xinput' and 'video' is now 'videodrv', also 'ansic' and 'extension' are new ABIs exposed. Rewrite the RDEPENDS generation so that it is more flexible, and can be used from inside the xserver-xorg recipe to generate RDEPENDS for the modesetting driver. This means that recipe can remove the INSANE_SKIP. There's an argument that this new .inc file could be a bbclass, I'm undecided on this myself right now and this patch is essentially a rationalisation of the existing code. (From OE-Core rev: f40b36fb089f6ccd4fb25373ed4cb57fae78a79f) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
49 lines
2.0 KiB
PHP
49 lines
2.0 KiB
PHP
# Add runtime provides for the ABI versions, so that drivers can depend on the
|
|
# relevant version. This should be called from PACKAGEFUNCS.
|
|
python add_xorg_abi_provides() {
|
|
import subprocess
|
|
|
|
pn = d.getVar("PN")
|
|
mlprefix = d.getVar("MLPREFIX") or ""
|
|
|
|
# Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going
|
|
# into the new package, not the staged ones.
|
|
newenv = dict(os.environ)
|
|
newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/:") + newenv["PKG_CONFIG_PATH"]
|
|
|
|
# Get the list of ABIs that the pc file declares
|
|
cmd = ("pkg-config", "--print-variables", "xorg-server")
|
|
output = subprocess.run(cmd, check=True, capture_output=True, text=True, env=newenv).stdout
|
|
abis = [var for var in output.splitlines() if var.startswith("abi_")]
|
|
|
|
# Set RPROVIDES for those ABIs with the major version
|
|
for abi in abis:
|
|
cmd = ("pkg-config", "--variable", abi, "xorg-server")
|
|
version = subprocess.run(cmd, check=True, capture_output=True, text=True, env=newenv).stdout
|
|
major = version.split(".")[0]
|
|
|
|
provides = " %sxorg-%s-%s" % (mlprefix, abi.replace("_", "-"), major)
|
|
d.appendVar("RPROVIDES:" + pn, provides)
|
|
}
|
|
|
|
# Add the specified ABI dependency to the specified package.
|
|
# If package is not set then PN is used.
|
|
# This should be called via a shim function in PACKAGEFUNCS.
|
|
def _add_xorg_abi_depends(d, abi, package=None):
|
|
import subprocess
|
|
|
|
if not package:
|
|
package = d.getVar("PN")
|
|
|
|
# Set PKG_CONFIG_PATH to cater for the case where xserver is
|
|
# itself providing drivers.
|
|
newenv = dict(os.environ)
|
|
newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/:") + newenv["PKG_CONFIG_PATH"]
|
|
|
|
mlprefix = d.getVar("MLPREFIX") or ""
|
|
cmd = ("pkg-config", "xorg-server", "--variable=abi_%s" % abi)
|
|
output = subprocess.run(cmd, text=True, capture_output=True, check=True, env=newenv).stdout
|
|
abi = "%sxorg-abi-%s-%s" % (mlprefix, abi, output.split(".")[0])
|
|
|
|
d.appendVar('RDEPENDS:' + package, ' ' + abi)
|