From f8a23031e2a02e5fbef63a01d33e036bc57240b3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@ted.(none)>
Date: Fri, 2 Jan 2009 15:34:40 +0000
Subject: Drop now unneeded FILESDIR and S variables from various recipes

---
 meta/packages/dbus/dbus-glib-native_0.76.bb | 2 --
 meta/packages/dbus/dbus-native_1.0.3.bb     | 3 ---
 meta/packages/dbus/dbus-native_1.1.20.bb    | 1 -
 meta/packages/dbus/dbus-native_1.2.4.bb     | 1 -
 meta/packages/dbus/dbus.inc                 | 1 -
 5 files changed, 8 deletions(-)

(limited to 'meta/packages/dbus')

diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb
index d76cc043d..4faa18575 100644
--- a/meta/packages/dbus/dbus-glib-native_0.76.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.76.bb
@@ -9,8 +9,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz
 
 inherit autotools pkgconfig gettext native
 
-S = "${WORKDIR}/dbus-glib-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib-${PV}"
 DEPENDS = "glib-2.0-native dbus-native"
 
 do_stage() {
diff --git a/meta/packages/dbus/dbus-native_1.0.3.bb b/meta/packages/dbus/dbus-native_1.0.3.bb
index 55889a1a8..c237a7e8c 100644
--- a/meta/packages/dbus/dbus-native_1.0.3.bb
+++ b/meta/packages/dbus/dbus-native_1.0.3.bb
@@ -9,15 +9,12 @@ DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
 DEFAULT_PREFERENCE = "-1"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
 	   file://cross.patch;patch=1 \
 	   "
 
 inherit autotools pkgconfig gettext native
 
-S = "${WORKDIR}/dbus-${PV}"
-
 EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
                  --disable-doxygen-docs --with-xml=expat --without-x"
 
diff --git a/meta/packages/dbus/dbus-native_1.1.20.bb b/meta/packages/dbus/dbus-native_1.1.20.bb
index eefc76a6a..46683e25e 100644
--- a/meta/packages/dbus/dbus-native_1.1.20.bb
+++ b/meta/packages/dbus/dbus-native_1.1.20.bb
@@ -2,7 +2,6 @@ require dbus.inc
 inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 PR = "r2"
 
 SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 3578572d4..29fd5a2cb 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -2,7 +2,6 @@ require dbus.inc
 inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 
 do_stage() {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 08659a997..965989603 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -11,7 +11,6 @@ SRC_URI = "\
   file://dbus-1.init \
   file://99_dbus \
 "
-S = "${WORKDIR}/dbus-${PV}"
 
 inherit autotools pkgconfig update-rc.d gettext
 
-- 
cgit v1.2.3