diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-graphics/xorg-driver | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver')
6 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb index 5688eb4767..3b5af3fae9 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb | |||
@@ -8,4 +8,4 @@ DEPENDS += "libinput" | |||
8 | 8 | ||
9 | SRC_URI[sha256sum] = "e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16" | 9 | SRC_URI[sha256sum] = "e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16" |
10 | 10 | ||
11 | FILES_${PN} += "${datadir}/X11/xorg.conf.d" | 11 | FILES:${PN} += "${datadir}/X11/xorg.conf.d" |
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb index 92a1b25ebe..5e740037d9 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb | |||
@@ -9,13 +9,13 @@ standard 'mouse' driver if a VMware virtual machine is not detected." | |||
9 | SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" | 9 | SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" |
10 | SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" | 10 | SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" |
11 | 11 | ||
12 | RDEPENDS_${PN} += "xf86-input-mouse" | 12 | RDEPENDS:${PN} += "xf86-input-mouse" |
13 | 13 | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc" |
15 | 15 | ||
16 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 16 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
17 | 17 | ||
18 | do_install_append () { | 18 | do_install:append () { |
19 | # We don't care about hal | 19 | # We don't care about hal |
20 | rm -rf ${D}${datadir}/hal/ | 20 | rm -rf ${D}${datadir}/hal/ |
21 | rm -rf ${D}${libdir}/hal/ | 21 | rm -rf ${D}${libdir}/hal/ |
@@ -23,4 +23,4 @@ do_install_append () { | |||
23 | 23 | ||
24 | EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" | 24 | EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" |
25 | 25 | ||
26 | FILES_${PN} += "${datadir}/X11/xorg.conf.d" | 26 | FILES:${PN} += "${datadir}/X11/xorg.conf.d" |
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index 161371b118..1d8077a600 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb | |||
@@ -39,4 +39,4 @@ EXTRA_OECONF += '${@oe.utils.conditional( "ROOTLESS_X", "1", " --enable-kms-only | |||
39 | 39 | ||
40 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 40 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
41 | 41 | ||
42 | FILES_${PN} += "${datadir}/polkit-1" | 42 | FILES:${PN} += "${datadir}/polkit-1" |
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb index d313c8c6a8..05bb905b35 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb | |||
@@ -13,7 +13,7 @@ DEPENDS += "virtual/libx11 xorgproto libpciaccess" | |||
13 | 13 | ||
14 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 14 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
15 | 15 | ||
16 | RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" | 16 | RRECOMMENDS:${PN} += "xserver-xorg-module-libint10" |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659" | 18 | SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659" |
19 | 19 | ||
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 493b90a298..65c5e3c48a 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | |||
@@ -10,7 +10,7 @@ DEPENDS = "virtual/xserver xorgproto util-macros" | |||
10 | 10 | ||
11 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" | 11 | SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" |
12 | 12 | ||
13 | FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" | 13 | FILES:${PN} += " ${libdir}/xorg/modules/drivers/*.so" |
14 | 14 | ||
15 | XORGBUILDCLASS ??= "autotools" | 15 | XORGBUILDCLASS ??= "autotools" |
16 | inherit ${XORGBUILDCLASS} pkgconfig features_check | 16 | inherit ${XORGBUILDCLASS} pkgconfig features_check |
@@ -20,7 +20,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
20 | 20 | ||
21 | # FIXME: We don't want to include the libtool archives (*.la) from modules | 21 | # FIXME: We don't want to include the libtool archives (*.la) from modules |
22 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am | 22 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am |
23 | do_install_append() { | 23 | do_install:append() { |
24 | find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- | 24 | find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- |
25 | } | 25 | } |
26 | 26 | ||
@@ -38,6 +38,6 @@ def _add_xorg_abi_depends(d, name): | |||
38 | abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) | 38 | abi = "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) |
39 | 39 | ||
40 | pn = d.getVar("PN") | 40 | pn = d.getVar("PN") |
41 | d.appendVar('RDEPENDS_' + pn, ' ' + abi) | 41 | d.appendVar('RDEPENDS:' + pn, ' ' + abi) |
42 | 42 | ||
43 | SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" | 43 | SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" |
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc index 57912e70db..934c3d75c1 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc | |||
@@ -7,6 +7,6 @@ python add_xorg_abi_depends() { | |||
7 | } | 7 | } |
8 | PACKAGEFUNCS =+ "add_xorg_abi_depends" | 8 | PACKAGEFUNCS =+ "add_xorg_abi_depends" |
9 | 9 | ||
10 | FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ | 10 | FILES:${PN} += " ${libdir}/xorg/modules/input/*.so \ |
11 | ${datadir}/X11/xorg.conf.d \ | 11 | ${datadir}/X11/xorg.conf.d \ |
12 | " | 12 | " |