Drop now unneeded FILESDIR and S variables from various recipes

2026-05-09 17:39:31 +00:00 · 2009-01-02 15:34:40 +00:00
parent 61d8ea7a14
commit f8a23031e2
61 changed files with 3 additions and 136 deletions
@@ -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"
@@ -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"
@@ -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
@@ -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))}"
@@ -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}"
@@ -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
@@ -1,4 +1,3 @@
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 require binutils_${PV}.bb
 require binutils-cross.inc
@@ -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"
@@ -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
@@ -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} \
@@ -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
@@ -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
@@ -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() {
@@ -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"
@@ -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"
@@ -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
@@ -11,7 +11,6 @@ SRC_URI = "\
  file://dbus-1.init \
  file://99_dbus \
 "
 S = "${WORKDIR}/dbus-${PV}"
 inherit autotools pkgconfig update-rc.d gettext
@@ -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="r5"
 PR="r4"
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	file://mkdosfs-bootcode.patch;patch=1 \
@@ -1,4 +1,2 @@
 SECTION = "libs"
 require expat_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}"
@@ -1,4 +1,2 @@
 SECTION = "libs"
 require expat_${PV}.bb
 inherit sdk
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/expat-${PV}"
@@ -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}"
@@ -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))]}"
@@ -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
@@ -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}"
@@ -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 = ""
@@ -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 .
@@ -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
@@ -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"
@@ -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'
@@ -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
@@ -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}/
@@ -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() {
@@ -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 
@@ -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"
@@ -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
@@ -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}"
@@ -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 () {
@@ -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 () {
@@ -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*"
@@ -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 = ""
@@ -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 () {
@@ -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"
@@ -1,8 +1,6 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor."
 processor."
 LICENSE = "GPLv3"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
 S = "${WORKDIR}/m4-${PV}"
 inherit autotools
@@ -1,8 +1,6 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor."
 processor."
 LICENSE = "GPLv2"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
 S = "${WORKDIR}/m4-${PV}"
 inherit autotools
@@ -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}/
@@ -3,7 +3,6 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
 SRC_URI = "file://makedevs.c"
 S = "${WORKDIR}/makedevs-${PV}"
 PR = "r5"
 do_configure() {
@@ -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"
@@ -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 \
@@ -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
@@ -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"
@@ -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 \
@@ -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 = ""
@@ -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 = ""
@@ -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}"
@@ -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"
@@ -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}"
@@ -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
@@ -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() {
 	:
 }
@@ -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 = ""
@@ -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 = ""
@@ -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"