diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb')
| -rw-r--r-- | meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index a5ed21d458..3f577bfa05 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb @@ -1,18 +1,17 @@ SUMMARY = "Common X11 scripts and support files" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r9" # we are using a gpe-style Makefile -inherit distro_features_check gpe +inherit features_check gpe REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[md5sum] = "82f2f84cd96610e8f7b92c700cd31c14" SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166cc34210" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-COPYING-add-GPLv2-license-file.patch \ file://0002-add-setdpi-Xinit.d-script.patch \ file://0006-add-support-for-etc-X11-xserver-system.patch \ @@ -27,7 +26,7 @@ SRC_URI_append = " \ file://0001-Don-t-install-Xsession-or-Xserver.patch \ " -do_install_append() { +do_install:append() { sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common # Rename all Xsession files not ending with .sh # Unfortunatelly when xinput-calibrator was moved to oe-core @@ -38,8 +37,8 @@ do_install_append() { done } -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo fbset xinput-calibrator" +RDEPENDS:${PN} = "xmodmap xrandr xdpyinfo fbset xinput-calibrator" -RCONFLICTS_${PN} = "xserver-kdrive-common x11-common" -RREPLACES_${PN} = "xserver-kdrive-common x11-common" +RCONFLICTS:${PN} = "xserver-kdrive-common x11-common" +RREPLACES:${PN} = "xserver-kdrive-common x11-common" |