diff options
| author |   Justin Patrin <papercrane@gmail.com> | 2005-08-31 20:25:55 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-31 20:25:55 +0000 |
| commit | 6ff0407cf8842fb9b60b42440cc9663af78d6a25 (patch) | |
| tree | dfc5811febeb8c8e8cd69ebf676a4e9506deb27f /packages/xserver-common | |
| parent | c1dc05985df7c60cfb7ace030286bd8e390975b8 (diff) | |
| download | openembedded-6ff0407cf8842fb9b60b42440cc9663af78d6a25.tar.gz | |
xserver-common, x11-common: Remove x11-common in favor of xserver-common, remove unneeded run-calibrate.sh from xserver-common
Diffstat (limited to 'packages/xserver-common')
| -rw-r--r-- | packages/xserver-common/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xserver-common/files/remove-run-calibrate-sh.patch | 21 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.1.bb | 4 |
3 files changed, 24 insertions, 1 deletions
diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xserver-common/files/.mtn2git_empty diff --git a/packages/xserver-common/files/remove-run-calibrate-sh.patch b/packages/xserver-common/files/remove-run-calibrate-sh.patch new file mode 100644 index 0000000000..996a2735fb --- /dev/null +++ b/packages/xserver-common/files/remove-run-calibrate-sh.patch @@ -0,0 +1,21 @@ +diff -Nur xserver-common-1.1~/Makefile xserver-common-1.1/Makefile +--- xserver-common-1.1~/Makefile 2005-08-31 13:04:40.000000000 -0700 ++++ xserver-common-1.1/Makefile 2005-08-31 13:05:33.000000000 -0700 +@@ -17,7 +17,6 @@ + install-program: + for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done + install -d $(DESTDIR)$(PREFIX)/bin +- install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh + install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults + install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit + install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver +diff -Nur xserver-common-1.1~/X11/Xinit.d/30xTs_Calibrate xserver-common-1.1/X11/Xinit.d/30xTs_Calibrate +--- xserver-common-1.1~/X11/Xinit.d/30xTs_Calibrate 2005-08-31 13:04:40.000000000 -0700 ++++ xserver-common-1.1/X11/Xinit.d/30xTs_Calibrate 2005-08-31 13:05:18.000000000 -0700 +@@ -1,5 +1,5 @@ + #!/bin/sh + + if [ ! -f /etc/pointercal ]; then +- /usr/bin/run-calibrate.sh ++ xtscal + fi diff --git a/packages/xserver-common/xserver-common_1.1.bb b/packages/xserver-common/xserver-common_1.1.bb index 877ec8fa4e..9daa0c3000 100644 --- a/packages/xserver-common/xserver-common_1.1.bb +++ b/packages/xserver-common/xserver-common_1.1.bb @@ -3,7 +3,9 @@ LICENSE = "GPL" SECTION = "x11" DEPENDS = "xmodmap xrandr xdpyinfo xtscal" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r0" +PR = "r1" # we are using a gpe-style Makefile inherit gpe + +SRC_URI += "file://remove-run-calibrate-sh.patch;patch=1"
\ No newline at end of file |