summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-02-01 15:55:49 +0100
committerKoen Kooi <koen@openembedded.org>2010-02-02 11:40:31 +0100
commit6678c25d1c94a31825d93b29697b2904c73ae72d (patch)
treeedd431efd069511c661f3f805d092f16b5fd0661
parent01d1a1ffd67f176630ed1d8d8ae21417a1cf2b09 (diff)
xserver-common: fix angstrom RDEPENDS for 1.25 and fix ts for angstrom in 1.32
-rw-r--r--recipes/xserver-common/xserver-common_1.25.bb4
-rw-r--r--recipes/xserver-common/xserver-common_1.32.bb5
2 files changed, 6 insertions, 3 deletions
diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb
index 40ec4affa0..e56d84a4be 100644
--- a/recipes/xserver-common/xserver-common_1.25.bb
+++ b/recipes/xserver-common/xserver-common_1.25.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r4"
+PR = "r5"
PACKAGE_ARCH = "all"
@@ -17,7 +17,7 @@ SRC_URI_append = " file://setDPI.sh \
"
SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "
-RDEPENDS_append_angstrom = " tslib-calibrate "
+RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
do_install_append() {
install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/recipes/xserver-common/xserver-common_1.32.bb b/recipes/xserver-common/xserver-common_1.32.bb
index 63368649c1..2ed416c830 100644
--- a/recipes/xserver-common/xserver-common_1.32.bb
+++ b/recipes/xserver-common/xserver-common_1.32.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
PACKAGE_ARCH = "all"
DEFAULT_PREFERENCE = "-1"
@@ -13,6 +13,9 @@ inherit gpe
SRC_URI_append = " file://setDPI.sh \
file://89xdgautostart.sh"
+SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 "
+RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
+
do_install_append() {
install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart"