mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 13:00:02 +00:00
Code Issues Projects Releases Wiki Activity

xserver-common 1.34: make it work with xserver-nodm-init

Browse Source 
* Move SHR patches to main SRC_URI, they are generic and good enough for everyone
* Start x-window-manager
* Run through oe-stylize
* Remove duplicated LICENSE
* Add reconflicts with x11-common as well

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-04-21 12:08:35 +02:00
parent 2a9e3855e8
commit 09c8584833
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+19 -19
View File
@@ -1,14 +1,8 @@
DESCRIPTION = "Common X11 scripts and support files" DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo fbset"
PR = "r1"
PACKAGE_ARCH = "all" PR = "r2"
RCONFLICTS_${PN} = "xserver-kdrive-common"
RREPLACES_${PN} = "xserver-kdrive-common"
# we are using a gpe-style Makefile # we are using a gpe-style Makefile
inherit gpe inherit gpe
@@ -19,20 +13,26 @@ SRC_URI[sha256sum] = "cd04c33418f776b1e13fcc7af3d6bd0c7cccd03fbabd7dbcd97f88166c
SRC_URI_append = " \ SRC_URI_append = " \
file://gplv2-license.patch \ file://gplv2-license.patch \
file://setDPI.sh \ file://setDPI.sh \
file://89xdgautostart.sh" file://89xdgautostart.sh \
file://89xTs_Calibrate.xinput_calibrator.patch \
file://90xXWindowManager.patch \
file://Xserver.add.xserver-system.patch \
file://Xserver.add.nocursor.for.gta.patch \
file://Xserver.add.dpi.for.gta.patch \
file://Xserver.n900.patch \
"
RDEPENDS_${PN}_append_shr = " xinput-calibrator "
SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
file://90xXWindowManager.patch \
file://Xserver.add.nocursor.for.gta.patch \
file://Xserver.add.xserver-system.patch \
file://Xserver.add.dpi.for.gta.patch \
file://Xserver.n900.patch"
do_install_append() { do_install_append() {
install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart" install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"
sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common sed -i 's:^BINDIR=.*$:BINDIR=${bindir}:' ${D}/etc/X11/xserver-common
} }
PACKAGE_ARCH = "all"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo fbset xinput-calibrator"
RCONFLICTS_${PN} = "xserver-kdrive-common x11-common"
RREPLACES_${PN} = "xserver-kdrive-common x11-common"