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/apt/apt-native.inc                        | 1 -
 meta/packages/apt/apt.inc                               | 2 --
 meta/packages/autoconf/autoconf-native_2.61.bb          | 3 ---
 meta/packages/automake/automake.inc                     | 3 ---
 meta/packages/binutils/binutils-cross-sdk.inc           | 1 -
 meta/packages/binutils/binutils-cross_2.18.bb           | 1 -
 meta/packages/binutils/binutils-cross_2.19.bb           | 1 -
 meta/packages/binutils/binutils-cross_csl-arm-2006q1.bb | 1 -
 meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb | 1 -
 meta/packages/binutils/binutils.inc                     | 1 -
 meta/packages/bison/bison-native_2.0.bb                 | 3 ---
 meta/packages/coreutils/coreutils-native_5.3.0.bb       | 5 -----
 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 -
 meta/packages/dosfstools/dosfstools-native_2.10.bb      | 5 +----
 meta/packages/expat/expat-native_1.95.7.bb              | 2 --
 meta/packages/expat/expat-sdk_1.95.7.bb                 | 2 --
 meta/packages/findutils/findutils-native_4.2.29.bb      | 5 -----
 meta/packages/fontconfig/fontconfig-native_2.6.0.bb     | 3 ---
 meta/packages/fontconfig/fontconfig_2.6.0.bb            | 2 --
 meta/packages/gdb/gdb-common.inc                        | 3 ---
 meta/packages/gettext/gettext-native_0.14.1.bb          | 2 --
 meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb        | 4 ----
 meta/packages/glib-2.0/glib.inc                         | 2 --
 meta/packages/glibc/glibc_csl-2005q3-2.bb               | 2 --
 meta/packages/gmp/gmp-native.inc                        | 4 ----
 meta/packages/gmp/gmp-sdk.inc                           | 4 ----
 meta/packages/gnu-config/gnu-config-native_20050701.bb  | 4 ----
 meta/packages/jpeg/jpeg-native_6b.bb                    | 1 -
 meta/packages/jpeg/jpeg_6b.bb                           | 1 -
 meta/packages/libpng/libpng-native_1.2.20.bb            | 1 -
 meta/packages/libpng/libpng_1.2.20.bb                   | 1 -
 meta/packages/libtool/libtool-cross_2.2.6.bb            | 3 ---
 meta/packages/libtool/libtool-native_2.2.6.bb           | 3 ---
 meta/packages/libtool/libtool-sdk_2.2.6.bb              | 3 ---
 meta/packages/libtool/libtool_2.2.6.bb                  | 1 -
 meta/packages/libusb/libusb_0.1.12.bb                   | 4 ----
 meta/packages/libxml/libxml2-native_2.6.29.bb           | 3 ---
 meta/packages/m4/m4-native_1.4.12.bb                    | 3 ---
 meta/packages/m4/m4_1.4.12.bb                           | 4 +---
 meta/packages/m4/m4_1.4.9.bb                            | 4 +---
 meta/packages/makedevs/makedevs-native_1.0.0.bb         | 3 ---
 meta/packages/makedevs/makedevs_1.0.0.bb                | 1 -
 meta/packages/modutils/modutils-cross_2.4.27.bb         | 2 --
 meta/packages/modutils/modutils_2.4.27.bb               | 1 -
 meta/packages/mtd/mtd-utils-native.inc                  | 1 -
 meta/packages/opkg-utils/opkg-utils-native_svn.bb       | 1 -
 meta/packages/perl/perl-native_5.8.8.bb                 | 2 --
 meta/packages/pkgconfig/pkgconfig-native_0.23.bb        | 3 ---
 meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb           | 3 ---
 meta/packages/popt/popt-native_1.14.bb                  | 3 ---
 meta/packages/quilt/quilt-native.inc                    | 1 -
 meta/packages/quilt/quilt.inc                           | 2 --
 meta/packages/sed/sed_4.1.2.bb                          | 1 -
 meta/packages/sqlite/sqlite3-native.inc                 | 2 --
 meta/packages/xorg-lib/libx11-native_1.1.5.bb           | 2 --
 meta/packages/xorg-lib/libx11-sdk_1.1.5.bb              | 2 --
 meta/packages/xorg-lib/xtrans_1.2.2.bb                  | 2 --
 61 files changed, 3 insertions(+), 136 deletions(-)

diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc
index 6ee26e491..81e9f9415 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/packages/apt/apt-native.inc
@@ -2,7 +2,6 @@ require apt.inc
 inherit native
 
 DEPENDS += "dpkg-native gettext-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
 PACKAGES = ""
 USE_NLS = "yes"
 
diff --git a/meta/packages/apt/apt.inc b/meta/packages/apt/apt.inc
index be764de21..0913a7fcb 100644
--- a/meta/packages/apt/apt.inc
+++ b/meta/packages/apt/apt.inc
@@ -7,8 +7,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
            file://use-host.patch;patch=1 \
            "
 
-S = "${WORKDIR}/apt-${PV}"
-
 inherit autotools gettext
 
 EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
diff --git a/meta/packages/autoconf/autoconf-native_2.61.bb b/meta/packages/autoconf/autoconf-native_2.61.bb
index ad6cb7944..1dea33442 100644
--- a/meta/packages/autoconf/autoconf-native_2.61.bb
+++ b/meta/packages/autoconf/autoconf-native_2.61.bb
@@ -5,7 +5,4 @@ RDEPENDS_${PN} = "m4-native gnu-config-native"
 
 SRC_URI += "file://fix_path_xtra.patch;patch=1"
 
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
 inherit native
diff --git a/meta/packages/automake/automake.inc b/meta/packages/automake/automake.inc
index e8d17a70e..d68c45d4f 100644
--- a/meta/packages/automake/automake.inc
+++ b/meta/packages/automake/automake.inc
@@ -2,13 +2,10 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
 
-S = "${WORKDIR}/automake-${PV}"
-
 inherit autotools
 
 export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
diff --git a/meta/packages/binutils/binutils-cross-sdk.inc b/meta/packages/binutils/binutils-cross-sdk.inc
index b545083d9..10e308030 100644
--- a/meta/packages/binutils/binutils-cross-sdk.inc
+++ b/meta/packages/binutils/binutils-cross-sdk.inc
@@ -1,6 +1,5 @@
 inherit sdk
 DEPENDS += "flex-native bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
 		--program-prefix=${TARGET_PREFIX}"
 
diff --git a/meta/packages/binutils/binutils-cross_2.18.bb b/meta/packages/binutils/binutils-cross_2.18.bb
index f51badecf..ecda3a16a 100644
--- a/meta/packages/binutils/binutils-cross_2.18.bb
+++ b/meta/packages/binutils/binutils-cross_2.18.bb
@@ -1,7 +1,6 @@
 require binutils_${PV}.bb
 require binutils-cross.inc
 PR = "r1"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 
 do_stage () {
 	oe_runmake install
diff --git a/meta/packages/binutils/binutils-cross_2.19.bb b/meta/packages/binutils/binutils-cross_2.19.bb
index b78a30ac4..8c7e4bc1a 100644
--- a/meta/packages/binutils/binutils-cross_2.19.bb
+++ b/meta/packages/binutils/binutils-cross_2.19.bb
@@ -1,4 +1,3 @@
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
 
diff --git a/meta/packages/binutils/binutils-cross_csl-arm-2006q1.bb b/meta/packages/binutils/binutils-cross_csl-arm-2006q1.bb
index b392d8208..9b34b579b 100644
--- a/meta/packages/binutils/binutils-cross_csl-arm-2006q1.bb
+++ b/meta/packages/binutils/binutils-cross_csl-arm-2006q1.bb
@@ -1,4 +1,3 @@
 require binutils_csl-arm-2006q1.bb
 require binutils-cross.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 S = "${WORKDIR}/binutils-2.17"
diff --git a/meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb b/meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb
index 39b35c9ad..d22da4619 100644
--- a/meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb
+++ b/meta/packages/binutils/binutils-cross_csl-arm-2008q1.bb
@@ -1,7 +1,6 @@
 require binutils_csl-arm-2008q1.bb
 require binutils-cross.inc
 PR = "r1"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 
 do_stage () {
 	oe_runmake install
diff --git a/meta/packages/binutils/binutils.inc b/meta/packages/binutils/binutils.inc
index be752a2f4..d8dd752ec 100644
--- a/meta/packages/binutils/binutils.inc
+++ b/meta/packages/binutils/binutils.inc
@@ -33,7 +33,6 @@ FILES_${PN}-symlinks = " \
 	${bindir}/size \
 	${bindir}/strip"
 
-S = "${WORKDIR}/binutils-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
diff --git a/meta/packages/bison/bison-native_2.0.bb b/meta/packages/bison/bison-native_2.0.bb
index 760295db6..84bdb91ed 100644
--- a/meta/packages/bison/bison-native_2.0.bb
+++ b/meta/packages/bison/bison-native_2.0.bb
@@ -1,7 +1,4 @@
 require bison_${PV}.bb
-SECTION = "devel"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
-S = "${WORKDIR}/bison-${PV}"
 PR = "r2"
 
 inherit native autotools
diff --git a/meta/packages/coreutils/coreutils-native_5.3.0.bb b/meta/packages/coreutils/coreutils-native_5.3.0.bb
index ee9098189..bbee4fda4 100644
--- a/meta/packages/coreutils/coreutils-native_5.3.0.bb
+++ b/meta/packages/coreutils/coreutils-native_5.3.0.bb
@@ -1,7 +1,2 @@
-SECTION = "base"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
-S = "${WORKDIR}/coreutils-${PV}"
-
 require coreutils_${PV}.bb
 inherit native
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
 
diff --git a/meta/packages/dosfstools/dosfstools-native_2.10.bb b/meta/packages/dosfstools/dosfstools-native_2.10.bb
index 1fbbe37c7..494e5135c 100644
--- a/meta/packages/dosfstools/dosfstools-native_2.10.bb
+++ b/meta/packages/dosfstools/dosfstools-native_2.10.bb
@@ -3,11 +3,8 @@
 # Released under the MIT license (see packages/COPYING)
 
 require dosfstools_${PV}.bb
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}"
 
-S="${WORKDIR}/dosfstools-${PV}"
-
-PR="r4"
+PR="r5"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	file://mkdosfs-bootcode.patch;patch=1 \
diff --git a/meta/packages/expat/expat-native_1.95.7.bb b/meta/packages/expat/expat-native_1.95.7.bb
index edfa53ae4..89cf4f41f 100644
--- a/meta/packages/expat/expat-native_1.95.7.bb
+++ b/meta/packages/expat/expat-native_1.95.7.bb
@@ -1,4 +1,2 @@
-SECTION = "libs"
 require expat_${PV}.bb
 inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}"
diff --git a/meta/packages/expat/expat-sdk_1.95.7.bb b/meta/packages/expat/expat-sdk_1.95.7.bb
index b20816d4a..775695f26 100644
--- a/meta/packages/expat/expat-sdk_1.95.7.bb
+++ b/meta/packages/expat/expat-sdk_1.95.7.bb
@@ -1,4 +1,2 @@
-SECTION = "libs"
 require expat_${PV}.bb
 inherit sdk
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}"
diff --git a/meta/packages/findutils/findutils-native_4.2.29.bb b/meta/packages/findutils/findutils-native_4.2.29.bb
index cb6d72f1e..d41baa2c4 100644
--- a/meta/packages/findutils/findutils-native_4.2.29.bb
+++ b/meta/packages/findutils/findutils-native_4.2.29.bb
@@ -1,7 +1,2 @@
 require findutils.inc
-
 inherit native
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
-
-S = "${WORKDIR}/findutils-${PV}"
diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
index 541b74634..0b95cf668 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
@@ -1,9 +1,6 @@
-SECTION = "base"
-LICENSE = "BSD"
 require fontconfig_${PV}.bb
 inherit native
 DEPENDS = "freetype-native expat-native zlib-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
 
 EXTRA_OEMAKE = ""
 EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index 4a4c31fbe..4c0d5e16b 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -19,8 +19,6 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils"
 RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
 DEBIAN_NOAUTONAME_fontconfig-utils = "1"
 
-S = "${WORKDIR}/fontconfig-${PV}"
-
 PARALLEL_MAKE = ""
 
 inherit autotools pkgconfig
diff --git a/meta/packages/gdb/gdb-common.inc b/meta/packages/gdb/gdb-common.inc
index 84e9d4e28..266c8fe6b 100644
--- a/meta/packages/gdb/gdb-common.inc
+++ b/meta/packages/gdb/gdb-common.inc
@@ -9,8 +9,6 @@ inherit autotools
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
            file://no-werror.patch;patch=1"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
-
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CXX_FOR_BUILD = "${BUILD_CXX}"
 export CPP_FOR_BUILD = "${BUILD_CPP}"
@@ -18,6 +16,5 @@ export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
 export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
 
-S = "${WORKDIR}/gdb-${PV}"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
diff --git a/meta/packages/gettext/gettext-native_0.14.1.bb b/meta/packages/gettext/gettext-native_0.14.1.bb
index 37549dbda..05135d299 100644
--- a/meta/packages/gettext/gettext-native_0.14.1.bb
+++ b/meta/packages/gettext/gettext-native_0.14.1.bb
@@ -1,6 +1,4 @@
 require gettext_${PV}.bb
-S = "${WORKDIR}/gettext-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
 inherit native
 PROVIDES = ""
 
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb b/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb
index ff593ccff..2bfb706c7 100644
--- a/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.18.1.bb
@@ -14,12 +14,8 @@ SRC_URI = "http://download.gnome.org/sources/glib/2.18/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch;patch=1 \
            file://glibconfig-sysdefs.h"
 
-S = "${WORKDIR}/glib-${PV}"
-
 inherit autotools pkgconfig native gettext
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
-
 acpaths = ""
 do_configure_prepend () {
 	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
diff --git a/meta/packages/glib-2.0/glib.inc b/meta/packages/glib-2.0/glib.inc
index 78f36c034..e65665da6 100644
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/packages/glib-2.0/glib.inc
@@ -15,8 +15,6 @@ FILES_glib-2.0-utils = "${bindir}/*"
 
 EXTRA_OECONF = "--enable-included-printf=no"
 
-S = "${WORKDIR}/glib-${PV}"
-
 inherit autotools pkgconfig gettext
 
 require glib-2.0.inc
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb
index 1fff0e196..c82121f02 100644
--- a/meta/packages/glibc/glibc_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb
@@ -8,8 +8,6 @@ PR = "r11"
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
-FILESDIR = "${FILE_DIRNAME}/files"
-
 GLIBC_ADDONS ?= "nptl,libidn"
 
 GLIBC_BROKEN_LOCALES = "sid_ET tr_TR mn_MN gez_ET bn_BD gez_ER te_IN"
diff --git a/meta/packages/gmp/gmp-native.inc b/meta/packages/gmp/gmp-native.inc
index c3d36e0fd..362d29031 100644
--- a/meta/packages/gmp/gmp-native.inc
+++ b/meta/packages/gmp/gmp-native.inc
@@ -1,8 +1,4 @@
 require gmp_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gmp-${PV}"
-S = "${WORKDIR}/gmp-${PV}"
-
 inherit native
 
 # darwin 'hacks'
diff --git a/meta/packages/gmp/gmp-sdk.inc b/meta/packages/gmp/gmp-sdk.inc
index a6b15332a..5d4fe1d50 100644
--- a/meta/packages/gmp/gmp-sdk.inc
+++ b/meta/packages/gmp/gmp-sdk.inc
@@ -1,8 +1,4 @@
 require gmp_${PV}.bb
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gmp-${PV}"
-S = "${WORKDIR}/gmp-${PV}"
-
 inherit sdk
 
 
diff --git a/meta/packages/gnu-config/gnu-config-native_20050701.bb b/meta/packages/gnu-config/gnu-config-native_20050701.bb
index 43df124f7..256a8af3e 100644
--- a/meta/packages/gnu-config/gnu-config-native_20050701.bb
+++ b/meta/packages/gnu-config/gnu-config-native_20050701.bb
@@ -1,10 +1,6 @@
-SECTION = "base"
 require gnu-config_${PV}.bb
-
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config"
-
 do_stage () {
 	install -d ${STAGING_DATADIR}/gnu-config/
 	install -d ${STAGING_BINDIR}/
diff --git a/meta/packages/jpeg/jpeg-native_6b.bb b/meta/packages/jpeg/jpeg-native_6b.bb
index 450e4b36a..2591a7ab1 100644
--- a/meta/packages/jpeg/jpeg-native_6b.bb
+++ b/meta/packages/jpeg/jpeg-native_6b.bb
@@ -1,7 +1,6 @@
 SECTION = "libs"
 require jpeg_${PV}.bb
 inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}"
 DEPENDS = ""
 
 do_stage() {
diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb
index b930870bc..d64fb0996 100644
--- a/meta/packages/jpeg/jpeg_6b.bb
+++ b/meta/packages/jpeg/jpeg_6b.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://ldflags.patch;patch=1 \
 	   file://paths.patch;patch=1 \
 	   file://libtool_tweak.patch;patch=1"
-S = "${WORKDIR}/jpeg-${PV}"
 
 inherit autotools 
 
diff --git a/meta/packages/libpng/libpng-native_1.2.20.bb b/meta/packages/libpng/libpng-native_1.2.20.bb
index 231b95667..ca223690f 100644
--- a/meta/packages/libpng/libpng-native_1.2.20.bb
+++ b/meta/packages/libpng/libpng-native_1.2.20.bb
@@ -1,6 +1,5 @@
 require libpng_${PV}.bb
 inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
 DEPENDS = "zlib-native"
 
 INHIBIT_NATIVE_STAGE_INSTALL = "1"
diff --git a/meta/packages/libpng/libpng_1.2.20.bb b/meta/packages/libpng/libpng_1.2.20.bb
index 842fc04af..6233d9005 100644
--- a/meta/packages/libpng/libpng_1.2.20.bb
+++ b/meta/packages/libpng/libpng_1.2.20.bb
@@ -8,7 +8,6 @@ PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \
            file://makefile_fix.patch;patch=1"
-S = "${WORKDIR}/libpng-${PV}"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index bc39d8d4b..451f5796c 100644
--- a/meta/packages/libtool/libtool-cross_2.2.6.bb
+++ b/meta/packages/libtool/libtool-cross_2.2.6.bb
@@ -3,7 +3,6 @@ require libtool_${PV}.bb
 
 PR = "r23"
 PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
 
@@ -16,8 +15,6 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
 
-S = "${WORKDIR}/libtool-${PV}"
-
 prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
 exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb
index a6eb392e8..c806043a4 100644
--- a/meta/packages/libtool/libtool-native_2.2.6.bb
+++ b/meta/packages/libtool/libtool-native_2.2.6.bb
@@ -2,12 +2,9 @@ require libtool.inc
 require libtool_${PV}.bb
 
 PR = "r19"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1 \
                    file://prefix.patch;patch=1"
 
-S = "${WORKDIR}/libtool-${PV}"
-
 inherit native
 
 do_configure_prepend () {
diff --git a/meta/packages/libtool/libtool-sdk_2.2.6.bb b/meta/packages/libtool/libtool-sdk_2.2.6.bb
index 83f63cbd2..577907887 100644
--- a/meta/packages/libtool/libtool-sdk_2.2.6.bb
+++ b/meta/packages/libtool/libtool-sdk_2.2.6.bb
@@ -2,11 +2,8 @@ require libtool.inc
 require libtool_${PV}.bb
 
 PR = "r0"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
-S = "${WORKDIR}/libtool-${PV}"
-
 inherit sdk
 
 do_install () {
diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb
index cf6a8b32c..e552ea24c 100644
--- a/meta/packages/libtool/libtool_2.2.6.bb
+++ b/meta/packages/libtool/libtool_2.2.6.bb
@@ -4,7 +4,6 @@ PR = "r14"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \
            file://dolt.m4"
-S = "${WORKDIR}/libtool-${PV}"
 
 PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
 FILES_${PN} += "${datadir}/aclocal*"
diff --git a/meta/packages/libusb/libusb_0.1.12.bb b/meta/packages/libusb/libusb_0.1.12.bb
index c446c1b5a..5ef482f2b 100644
--- a/meta/packages/libusb/libusb_0.1.12.bb
+++ b/meta/packages/libusb/libusb_0.1.12.bb
@@ -8,10 +8,6 @@ PR = "r5"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
            file://configure_fix.patch;patch=1"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libusb"
-
-S = "${WORKDIR}/libusb-${PV}"
-
 inherit autotools pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
diff --git a/meta/packages/libxml/libxml2-native_2.6.29.bb b/meta/packages/libxml/libxml2-native_2.6.29.bb
index da79c9bb4..75169f2bc 100644
--- a/meta/packages/libxml/libxml2-native_2.6.29.bb
+++ b/meta/packages/libxml/libxml2-native_2.6.29.bb
@@ -6,9 +6,6 @@ DEPENDS += "python-native"
 
 EXTRA_OECONF = "--with-python=${STAGING_DIR_NATIVE}/${prefix} --without-debug --without-legacy --with-catalog --without-docbook --with-c14n"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
-S = "${WORKDIR}/libxml2-${PV}"
-
 inherit native
 
 do_stage () {
diff --git a/meta/packages/m4/m4-native_1.4.12.bb b/meta/packages/m4/m4-native_1.4.12.bb
index 8beb8748e..64442292e 100644
--- a/meta/packages/m4/m4-native_1.4.12.bb
+++ b/meta/packages/m4/m4-native_1.4.12.bb
@@ -1,9 +1,6 @@
 require m4_${PV}.bb
-
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
-
 INHIBIT_AUTOTOOLS_DEPS = "1"
 DEPENDS += "gnu-config-native"
 
diff --git a/meta/packages/m4/m4_1.4.12.bb b/meta/packages/m4/m4_1.4.12.bb
index e2676269c..479f86095 100644
--- a/meta/packages/m4/m4_1.4.12.bb
+++ b/meta/packages/m4/m4_1.4.12.bb
@@ -1,8 +1,6 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
-processor."
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor."
 LICENSE = "GPLv3"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-S = "${WORKDIR}/m4-${PV}"
 
 inherit autotools
 
diff --git a/meta/packages/m4/m4_1.4.9.bb b/meta/packages/m4/m4_1.4.9.bb
index 0f3167574..8110bcc63 100644
--- a/meta/packages/m4/m4_1.4.9.bb
+++ b/meta/packages/m4/m4_1.4.9.bb
@@ -1,8 +1,6 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
-processor."
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor."
 LICENSE = "GPLv2"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-S = "${WORKDIR}/m4-${PV}"
 
 inherit autotools
 
diff --git a/meta/packages/makedevs/makedevs-native_1.0.0.bb b/meta/packages/makedevs/makedevs-native_1.0.0.bb
index 004a71374..7462ac721 100644
--- a/meta/packages/makedevs/makedevs-native_1.0.0.bb
+++ b/meta/packages/makedevs/makedevs-native_1.0.0.bb
@@ -1,9 +1,6 @@
-SECTION = "base"
 require makedevs_${PV}.bb
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/makedevs-${PV}"
-
 do_stage() {
 	install -d ${STAGING_BINDIR}/
         install -m 0755 ${S}/makedevs ${STAGING_BINDIR}/
diff --git a/meta/packages/makedevs/makedevs_1.0.0.bb b/meta/packages/makedevs/makedevs_1.0.0.bb
index c78b73b6e..235b2fdc3 100644
--- a/meta/packages/makedevs/makedevs_1.0.0.bb
+++ b/meta/packages/makedevs/makedevs_1.0.0.bb
@@ -3,7 +3,6 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
 SRC_URI = "file://makedevs.c"
-S = "${WORKDIR}/makedevs-${PV}"
 PR = "r5"
 
 do_configure() {
diff --git a/meta/packages/modutils/modutils-cross_2.4.27.bb b/meta/packages/modutils/modutils-cross_2.4.27.bb
index 3bd1ae2b8..1d60c4666 100644
--- a/meta/packages/modutils/modutils-cross_2.4.27.bb
+++ b/meta/packages/modutils/modutils-cross_2.4.27.bb
@@ -1,8 +1,6 @@
-SECTION = "base"
 require modutils_${PV}.bb
 PR = "r9"
 inherit cross
-S = "${WORKDIR}/modutils-${PV}"
 DEPENDS = ""
 PACKAGES = ""
 PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.4"
diff --git a/meta/packages/modutils/modutils_2.4.27.bb b/meta/packages/modutils/modutils_2.4.27.bb
index c02dc1d5c..119e219f7 100644
--- a/meta/packages/modutils/modutils_2.4.27.bb
+++ b/meta/packages/modutils/modutils_2.4.27.bb
@@ -3,7 +3,6 @@ DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
 manageable for all users, administrators and distribution maintainers."
 LICENSE = "GPLv2"
 DEPENDS = "bison-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files"
 PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
diff --git a/meta/packages/mtd/mtd-utils-native.inc b/meta/packages/mtd/mtd-utils-native.inc
index 8ac467352..01337697e 100644
--- a/meta/packages/mtd/mtd-utils-native.inc
+++ b/meta/packages/mtd/mtd-utils-native.inc
@@ -1,6 +1,5 @@
 inherit native
 DEPENDS = "zlib-native lzo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
 
 do_stage () {
         install -d ${STAGING_INCDIR}/mtd
diff --git a/meta/packages/opkg-utils/opkg-utils-native_svn.bb b/meta/packages/opkg-utils/opkg-utils-native_svn.bb
index 0495b1eda..b12b5456b 100644
--- a/meta/packages/opkg-utils/opkg-utils-native_svn.bb
+++ b/meta/packages/opkg-utils/opkg-utils-native_svn.bb
@@ -6,5 +6,4 @@ inherit native
 
 # Avoid circular dependencies from package_ipk.bbclass
 PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opkg-utils"
 
diff --git a/meta/packages/perl/perl-native_5.8.8.bb b/meta/packages/perl/perl-native_5.8.8.bb
index 0e89f1105..e2bdaee30 100644
--- a/meta/packages/perl/perl-native_5.8.8.bb
+++ b/meta/packages/perl/perl-native_5.8.8.bb
@@ -5,8 +5,6 @@ LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
 PR = "r13"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
-
 SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
            file://perl-5.8.8-gcc-4.2.patch;patch=1 \
            file://Configure-multilib.patch;patch=1 \
diff --git a/meta/packages/pkgconfig/pkgconfig-native_0.23.bb b/meta/packages/pkgconfig/pkgconfig-native_0.23.bb
index 24497a986..dc5e3fc15 100644
--- a/meta/packages/pkgconfig/pkgconfig-native_0.23.bb
+++ b/meta/packages/pkgconfig/pkgconfig-native_0.23.bb
@@ -1,6 +1,3 @@
 require pkgconfig.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
-
-S = "${WORKDIR}/pkg-config-${PV}/"
 inherit native
 DEPENDS = ""
diff --git a/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb b/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb
index 3b2037177..47fbcdaf2 100644
--- a/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb
+++ b/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb
@@ -1,6 +1,3 @@
 require pkgconfig.inc
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
-
-S = "${WORKDIR}/pkg-config-${PV}/"
 inherit sdk
 DEPENDS = ""
diff --git a/meta/packages/popt/popt-native_1.14.bb b/meta/packages/popt/popt-native_1.14.bb
index 75b90d076..18b59d78a 100644
--- a/meta/packages/popt/popt-native_1.14.bb
+++ b/meta/packages/popt/popt-native_1.14.bb
@@ -1,5 +1,2 @@
 require popt_${PV}.bb
 inherit native
-
-S = "${WORKDIR}/popt-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/popt-${PV}"
diff --git a/meta/packages/quilt/quilt-native.inc b/meta/packages/quilt/quilt-native.inc
index 4d7291f5b..fb34305d1 100644
--- a/meta/packages/quilt/quilt-native.inc
+++ b/meta/packages/quilt/quilt-native.inc
@@ -2,7 +2,6 @@ require quilt_${PV}.inc
 
 SRC_URI_append_build-darwin = "?   file://non-gnu.patch;patch=1 "
 RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/quilt-${PV}"
 
 INHIBIT_AUTOTOOLS_DEPS = "1"
 
diff --git a/meta/packages/quilt/quilt.inc b/meta/packages/quilt/quilt.inc
index b1d19daf4..f83951bc9 100644
--- a/meta/packages/quilt/quilt.inc
+++ b/meta/packages/quilt/quilt.inc
@@ -4,5 +4,3 @@ SECTION = "devel"
 LICENSE = "GPL"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz "
-
-S = "${WORKDIR}/quilt-${PV}"
diff --git a/meta/packages/sed/sed_4.1.2.bb b/meta/packages/sed/sed_4.1.2.bb
index fe80f3e68..e3383b3a0 100644
--- a/meta/packages/sed/sed_4.1.2.bb
+++ b/meta/packages/sed/sed_4.1.2.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "sed is a Stream EDitor."
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
-S = "${WORKDIR}/sed-${PV}"
 
 inherit autotools
 
diff --git a/meta/packages/sqlite/sqlite3-native.inc b/meta/packages/sqlite/sqlite3-native.inc
index d61551703..37a394982 100644
--- a/meta/packages/sqlite/sqlite3-native.inc
+++ b/meta/packages/sqlite/sqlite3-native.inc
@@ -4,8 +4,6 @@ require sqlite3.inc
 
 DEPENDS = "readline-native ncurses-native"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/sqlite3"
-
 do_install() {
 	:
 }
diff --git a/meta/packages/xorg-lib/libx11-native_1.1.5.bb b/meta/packages/xorg-lib/libx11-native_1.1.5.bb
index 71b45afdf..dda63965e 100644
--- a/meta/packages/xorg-lib/libx11-native_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-native_1.1.5.bb
@@ -1,7 +1,5 @@
 require libx11_${PV}.bb
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
 DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
 PROVIDES = ""
 
diff --git a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb
index 6140d1370..c3859ea48 100644
--- a/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb
+++ b/meta/packages/xorg-lib/libx11-sdk_1.1.5.bb
@@ -1,7 +1,5 @@
 require libx11_${PV}.bb
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-
 DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native"
 PROVIDES = ""
 
diff --git a/meta/packages/xorg-lib/xtrans_1.2.2.bb b/meta/packages/xorg-lib/xtrans_1.2.2.bb
index 75ba93c78..0722dad84 100644
--- a/meta/packages/xorg-lib/xtrans_1.2.2.bb
+++ b/meta/packages/xorg-lib/xtrans_1.2.2.bb
@@ -5,8 +5,6 @@ libraries from OS network vageries."
 PE = "1"
 PR = "r0"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
-
 RDEPENDS_${PN}-dev = ""
 
 XORG_PN = "xtrans"
-- 
cgit v1.2.3