diff options
author | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /fbvncserver | |
parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'fbvncserver')
-rw-r--r-- | fbvncserver/fbvncserver-kmodule_0.9.4.oe | 6 | ||||
-rw-r--r-- | fbvncserver/fbvncserver_0.9.4.oe | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/fbvncserver/fbvncserver-kmodule_0.9.4.oe b/fbvncserver/fbvncserver-kmodule_0.9.4.oe index 2947d790af..3860f7848c 100644 --- a/fbvncserver/fbvncserver-kmodule_0.9.4.oe +++ b/fbvncserver/fbvncserver-kmodule_0.9.4.oe @@ -1,9 +1,9 @@ DESCRIPTION = "framebuffer VNC server keyboard events module" SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ - file://${FILESDIR}/libvncs0.6.patch;patch=1 \ - file://${FILESDIR}/paths.patch;patch=1 \ - file://${FILESDIR}/kernelinclude.patch;patch=1" + file://libvncs0.6.patch;patch=1 \ + file://paths.patch;patch=1 \ + file://kernelinclude.patch;patch=1" S = "${WORKDIR}/fbvncserver-${PV}" diff --git a/fbvncserver/fbvncserver_0.9.4.oe b/fbvncserver/fbvncserver_0.9.4.oe index ab19ffaca9..bb136eb274 100644 --- a/fbvncserver/fbvncserver_0.9.4.oe +++ b/fbvncserver/fbvncserver_0.9.4.oe @@ -3,9 +3,11 @@ DEPENDS = "virtual/libc libvncserver jpeg zlib" RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet" SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ - file://${FILESDIR}/libvncs0.6.patch;patch=1 \ - file://${FILESDIR}/paths.patch;patch=1 \ - file://${FILESDIR}/kernelinclude.patch;patch=1" + file://libvncs0.6.patch;patch=1 \ + file://paths.patch;patch=1 \ + file://kernelinclude.patch;patch=1 \ + file://zaurus_panel.jpg \ + file://init" export INCLUDES = "-I${STAGING_INCDIR}" @@ -24,14 +26,14 @@ do_install () { install -m 0755 zaurus_tssimd ${D}/usr/bin/tssimd install -d ${D}/usr/share/fbvncserver - install -m 0644 ${FILESDIR}/zaurus_panel.jpg ${D}/usr/share/fbvncserver/ + install -m 0644 ${WORKDIR}/zaurus_panel.jpg ${D}/usr/share/fbvncserver/ install -d ${D}/${sysconfdir}/init.d install -d ${D}/${sysconfdir}/rc2.d install -d ${D}/${sysconfdir}/rc3.d install -d ${D}/${sysconfdir}/rc4.d install -d ${D}/${sysconfdir}/rc5.d - install -m 0755 ${FILESDIR}/init ${D}/${sysconfdir}/init.d/fbvncinput + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/fbvncinput ln -sf ../init.d/fbvncinput ${D}/${sysconfdir}/rc2.d/S97fbvncinput ln -sf ../init.d/fbvncinput ${D}/${sysconfdir}/rc3.d/S97fbvncinput ln -sf ../init.d/fbvncinput ${D}/${sysconfdir}/rc4.d/S97fbvncinput |