Skip to contentSkip to conversation

xorg-driver: remove redundant DEPENDS on xorgproto

PATCH New Ross Burton 1 participant 2 messages Nov 22, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xorg-driver: remove redundant DEPENDS on xorgproto

xorg-driver-common already has this dependency.

---
 meta/recipes-graphics/xorg-driver/xorg-driver-input.inc | 2 --
 meta/recipes-graphics/xorg-driver/xorg-driver-video.inc | 2 --
 2 files changed, 4 deletions(-)
meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +0 -2
index 934c3d75c12..4efb90278c5 100644
@@ -1,7 +1,5 @@
 require xorg-driver-common.inc
 
-DEPENDS += "xorgproto"
-
 python add_xorg_abi_depends() {
     _add_xorg_abi_depends(d, "input")
 }
meta/recipes-graphics/xorg-driver/xorg-driver-video.inc +0 -2
index 2938ef11616..c9365d8954a 100644
@@ -1,7 +1,5 @@
 require xorg-driver-common.inc
 
-DEPENDS =+ "xorgproto"
-
 python add_xorg_abi_depends() {
     _add_xorg_abi_depends(d, "video")
 }
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 xserver-xorg: rewrite ABI dependency generation

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.

---
 .../xorg-driver/xorg-driver-common.inc        | 18 +------
 .../xorg-driver/xorg-driver-input.inc         |  2 +-
 .../xorg-driver/xorg-driver-video.inc         |  2 +-
 .../xorg-xserver/xserver-abi.inc              | 48 +++++++++++++++++++
 .../xorg-xserver/xserver-xorg.inc             | 32 +++----------
 5 files changed, 58 insertions(+), 44 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-abi.inc
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +2 -16
index 38848676f41..dd964d466d0 100644
@@ -20,20 +20,6 @@ inherit_defer ${XORGBUILDCLASS}
 # depends on virtual/xserver
 REQUIRED_DISTRO_FEATURES = "x11"
 
-# Function to add the relevant ABI dependency to drivers, which should be called
-# from a PACKAGEFUNC.
-def _add_xorg_abi_depends(d, name):
-    # Map of ABI names exposed in the dependencies to pkg-config variables
-    abis = {
-      "video": "abi_videodrv",
-      "input": "abi_xinput"
-    }
-
-    output = os.popen("pkg-config xorg-server --variable=%s" % abis[name]).read()
-    mlprefix = d.getVar('MLPREFIX') or ''
-    abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0])
-
-    pn = d.getVar("PN")
-    d.appendVar('RDEPENDS:' + pn, ' ' + abi)
-
 SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}"
+
+require recipes-graphics/xorg-xserver/xserver-abi.inc
meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +1 -1
index 4efb90278c5..269a78931e3 100644
@@ -1,7 +1,7 @@
 require xorg-driver-common.inc
 
 python add_xorg_abi_depends() {
-    _add_xorg_abi_depends(d, "input")
+    _add_xorg_abi_depends(d, "xinput")
 }
 PACKAGEFUNCS =+ "add_xorg_abi_depends"
 
meta/recipes-graphics/xorg-driver/xorg-driver-video.inc +1 -1
index c9365d8954a..18441210c2e 100644
@@ -1,6 +1,6 @@
 require xorg-driver-common.inc
 
 python add_xorg_abi_depends() {
-    _add_xorg_abi_depends(d, "video")
+    _add_xorg_abi_depends(d, "videodrv")
 }
 PACKAGEFUNCS =+ "add_xorg_abi_depends"
meta/recipes-graphics/xorg-xserver/xserver-abi.inc new file +48 -0

48 lines not on this page · raw message

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +6 -26
index e2754426cf1..3eb0de7b353 100644
@@ -79,7 +79,6 @@ PACKAGES =+ "${PN}-sdl \
              xf86-video-modesetting"
 
 SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
-INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
 
 XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
 RDEPENDS:${PN} += "${XSERVER_RDEPENDS}"
@@ -149,31 +148,12 @@ do_install:append () {
         sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
 }
 
-# Add runtime provides for the ABI versions of the video and input subsystems,
-# so that drivers can depend on the relevant version.
-python populate_packages:prepend() {
-    import subprocess
-
-    # 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/")
-
-    def get_abi(name):
-        abis = {
-          "video": "abi_videodrv",
-          "input": "abi_xinput"
-        }
-        p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
-                             shell=True, env=newenv, stdout=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        output = stdout.decode("utf-8").split(".")[0]
-        mlprefix = d.getVar('MLPREFIX') or ''
-        return "%sxorg-abi-%s-%s" % (mlprefix, name, output)
-
-    pn = d.getVar("PN")
-    d.appendVar("RPROVIDES:" + pn, " " + get_abi("input"))
-    d.appendVar("RPROVIDES:" + pn, " " + get_abi("video"))
+require xserver-abi.inc
+
+python add_xorg_abi_depends() {
+    _add_xorg_abi_depends(d, "videodrv", d.expand("${MLPREFIX}xf86-video-modesetting"))
 }
 
+PACKAGEFUNCS =+ "add_xorg_abi_provides add_xorg_abi_depends"
+
 CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', 'unpatched', 'not-applicable-config: specific to Xvfb', d)}"
Signature · 1 line
2.34.1