From 2b8f679ffe5929b5a11eb71e514aa4997c36f13e Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sat, 22 May 2004 16:47:36 +0000 Subject: 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 --- aalib/aalib_1.4rc5.oe | 2 +- acpid/acpid_1.0.2.oe | 5 +- acpid/acpid_1.0.3.oe | 5 +- adns/adns_1.0.oe | 4 +- alsa-oss/alsa-oss_1.0.4.oe | 4 +- alsa-utils/alsa-utils_1.0.4.oe | 10 ++ apache/apache_2.0.48.oe | 9 +- apmd/apmd_3.2.0.oe | 20 ++-- appweb/appweb_1.0.0.oe | 4 +- appweb/appweb_1.0.1.oe | 4 +- appweb/appweb_1.0.2.oe | 4 +- at/at_3.1.8.oe | 4 +- atk/atk_1.2.0.oe | 2 +- atk/atk_1.6.0.oe | 2 +- aumix/aumix_2.8.oe | 2 +- autoconf/autoconf_2.57.oe | 2 +- autoconf/autoconf_2.59.oe | 14 +-- automake/automake_1.8.2.oe | 2 +- avr-libc/avr-libc_1.0.3.oe | 2 +- base-files/base-files_3.0.14.oe | 116 ++++++++++--------- base-passwd/base-passwd_3.5.7.oe | 4 +- bash/bash_2.05b.oe | 4 +- binutils/binutils_2.15.90.0.3.oe | 12 +- bison/bison_1.875.oe | 2 +- bluez-hcidump/bluez-hcidump_1.5.oe | 2 +- bluez-utils/bluez-utils_2.3.oe | 2 +- bochs/bochs_2.1.oe | 2 +- bootmenu/bootmenu_0.6.oe | 2 +- brickout/brickout_2002.06.09.oe | 2 +- btscanner/btscanner_1.0.oe | 2 +- busybox/busybox_1.00-pre10.oe | 13 ++- bvi/bvi_1.3.1.oe | 4 +- bzip2/bzip2_1.0.2.oe | 2 +- centericq/centericq_4.9.10.oe | 4 +- centericq/centericq_4.9.7.oe | 4 +- cflow/cflow_2.0.oe | 2 +- ckermit/ckermit_209.oe | 4 +- comprec/comprec_0.01.oe | 2 +- comprec/comprec_0.02.oe | 2 +- console-tools/console-tools_0.3.2.oe | 9 +- coreutils/coreutils_5.0.oe | 4 +- coreutils/coreutils_5.1.3.oe | 2 +- corkscrew/corkscrew_2.0.oe | 2 +- cpufreqd/cpufreqd_1.1.2.oe | 2 +- cron/cron_3.0pl1.oe | 4 +- cumulus/cumulus_1.1.oe | 2 +- cyrus-sasl/cyrus-sasl_2.1.17.oe | 2 +- dbus/dbus_0.20.oe | 2 +- dbus/dbus_0.21.oe | 2 +- dcron/dcron_2.3.3.oe | 2 +- desktop-file-utils/desktop-file-utils_0.3.oe | 2 +- dhclient/dhclient_2.0pl5.oe | 2 +- dhcpcd/dhcpcd_1.3.22-pl4.oe | 2 +- dialog/dialog_0.9b-20031207.oe | 4 +- diethotplug/diethotplug_0.4.oe | 11 +- dosfstools/dosfstools_2.9.oe | 4 +- dropbear/dropbear_0.41.oe | 4 +- dsniff/dsniff_2.3.oe | 2 +- e2fsprogs-libs/e2fsprogs-libs_1.33.oe | 6 +- e2fsprogs-libs/e2fsprogs-libs_1.34.oe | 8 +- e2fsprogs-libs/e2fsprogs-libs_1.35.oe | 8 +- e2fsprogs/e2fsprogs_1.33.oe | 8 +- e2fsprogs/e2fsprogs_1.34.oe | 10 +- e2fsprogs/e2fsprogs_1.35.oe | 10 +- eet/eet_0.0.1.oe | 2 +- elfutils/elfutils_0.89.oe | 2 +- esound/esound-gpe_cvs.oe | 4 +- ettercap/ettercap_0.6.b.oe | 2 +- evas/evas_1.0.0-pre5.oe | 5 +- evas/evas_cvs.oe | 57 +++++++++ expat/expat_1.95.7.oe | 2 +- fam/fam_2.6.10.oe | 2 +- fam/fam_2.7.0.oe | 2 +- fbgetty/fbgetty_0.1.698.oe | 2 +- fbi/fbi_1.22.oe | 2 +- fbvncserver/fbvncserver-kmodule_0.9.4.oe | 6 +- fbvncserver/fbvncserver_0.9.4.oe | 12 +- fetchmail/fetchmail_6.2.3.oe | 2 +- file/file_3.41.oe | 2 +- file/file_4.09.oe | 8 ++ findutils/findutils_4.1.20.oe | 4 +- flex/flex_2.5.31.oe | 2 +- flexis-zaurus/flexis-zaurus_1.0.0.oe | 3 +- flnx/flnx_0.18.oe | 2 +- fontconfig/fontconfig_2.2.92.oe | 6 +- fontconfig/fontconfig_2.2.94.oe | 6 +- freedroid/freedroid_1.0.2.oe | 5 +- freeswan/freeswan_2.04.oe | 2 +- freeswan/freeswan_2.05.oe | 2 +- freetype/freetype-native_2.1.7.oe | 2 +- freetype/freetype_2.1.7.oe | 2 +- freetype/freetype_2.1.8.oe | 34 ++++++ gawk/gawk_3.0.4.oe | 2 +- gcc/gcc_3.3.3.oe | 68 +++++------ gcc/gcc_3.4.0.oe | 18 +-- gdb/gdb_6.1.oe | 47 ++++++++ gdbm/gdbm_1.8.3.oe | 2 +- gemdropx/gemdropx_0.9.oe | 5 +- genext2fs/genext2fs_1.3.oe | 2 +- gettext/gettext_0.14.1.oe | 2 +- giftcurs/giftcurs_0.6.2.oe | 2 +- glib-2.0/glib-2.0-native_2.2.3.oe | 5 +- glib-2.0/glib-2.0-native_2.4.1.oe | 7 +- glib-2.0/glib-2.0_2.2.3.oe | 5 +- glib-2.0/glib-2.0_2.4.1.oe | 7 +- glibc/glibc_2.3.2.oe | 128 ++++++++++----------- glibc/glibc_cvs.oe | 22 ++-- gmp/gmp_4.1.2.oe | 2 +- gnome/gconf_2.6.1.oe | 2 +- gnome/libbonobo_2.6.0.oe | 8 +- gnome/libgnome_2.6.1.1.oe | 8 ++ gnome/orbit2-native_2.10.2.oe | 12 +- gnome/orbit2_2.10.2.oe | 12 +- gnu-config/gnu-config.oe | 4 +- gnu-config/gnu-config_cvs.oe | 22 ++++ gnuboy/qtopiagnuboy_1.0.3.oe | 4 +- gnupg/gnupg_1.2.3.oe | 2 +- gnupg/gnupg_1.2.4.oe | 2 +- gpe-conf/gpe-conf_0.1.7.oe | 19 +++ gpe-timesheet/gpe-timesheet_0.13.oe | 7 ++ gpe-today/gpe-today_0.08.oe | 2 +- gpm/gpm_1.20.1.oe | 4 +- gpsd/gpsd_1.10.oe | 6 +- grep/grep_2.5.oe | 2 +- grub/grub_0.93.oe | 6 +- gtk+/gtk+_2.2.4.oe | 18 +-- gtk+/gtk+_2.4.1.oe | 11 +- gzip/gzip_1.3.5.oe | 2 +- hostap/hostap-modules_0.1.3.oe | 6 +- hostap/hostap-modules_0.2.0.oe | 6 +- hotplug/hotplug_20030501.oe | 2 +- hotplug/hotplug_20030805.oe | 2 +- hotplug/hotplug_20040105.oe | 2 +- hotplug/hotplug_20040311.oe | 11 +- hotplug/hotplug_20040329.oe | 31 +++++ httppc/httppc_0.8.5.oe | 2 +- ifupdown/ifupdown_0.6.4.oe | 16 +-- inetutils/inetutils_1.4.2.oe | 2 +- initscripts/initscripts_1.0.oe | 121 +++++++++++-------- ipkg/ipkg_0.99.121.oe | 4 +- iqnotes/iqnotes_2.0.2.oe | 2 +- irda-utils/irda-utils_0.9.15.oe | 4 +- jpeg/jpeg_6b.oe | 4 +- knights/knights_1.14.oe | 4 +- korganizer/korganizer-embedded_1.5.0.oe | 2 +- less/less_381.oe | 2 +- lftp/lftp_3.0.1.oe | 15 +++ libao/libao_0.8.4.oe | 2 +- libdes/libdes_4.01.oe | 2 +- libdotdesktop/libdotdesktop_0.11.oe | 2 +- libesmtp/libesmtp_1.0.1.oe | 2 +- libetpan/libetpan_0.33pre.oe | 8 +- libglade/libglade_2.0.1.oe | 5 +- libgpepimc/libgpepimc_0.2.oe | 2 +- libgpewidget/libgpewidget_0.79.oe | 2 +- liblockfile/liblockfile_1.05.oe | 6 +- libmpeg2/libmpeg2_0.4.0b.oe | 22 ++++ libnet/libnet_1.0.2a.oe | 2 +- libnids/libnids_1.18.oe | 2 +- libopie/libopie2_cvs.oe | 6 +- libpcap/libpcap_0.7.2.oe | 6 +- libpcap/libpcap_0.8.1.oe | 4 +- libpcap/libpcap_0.8.3.oe | 4 +- libsdl/libsdl-qpe_1.2.7.oe | 9 +- libsdl/libsdl-ttf_2.0.3.oe | 2 +- libsdl/libsdl-x11_1.2.7.oe | 2 +- libsidplay/libsidplay_1.36.57.oe | 2 +- libtomcrypt/libtomcrypt_0.93.oe | 2 +- libtool/libtool-cross_1.5.6.oe | 8 +- libtool/libtool-native_1.5.6.oe | 8 +- libtool/libtool_1.4.3.oe | 8 +- libtool/libtool_1.5.6.oe | 2 +- libtool/libtool_1.5.oe | 2 +- libusb/libusb_0.1.7.oe | 2 +- libxine/libxine_1.0.0-beta12.oe | 10 +- libxsettings-client/libxsettings-client0_0.12.oe | 2 +- links/links_2.1pre12.oe | 2 +- links/links_2.1pre14.oe | 2 +- linux-uml/linux-uml_2.4.26.oe | 27 ++--- linux/gumstix_2.6.5-gnalm1-gum0.oe | 25 ++++ linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe | 4 +- linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.8.oe | 2 +- linux/linux-bast_2.4.25-vrs1-bast1.oe | 11 +- linux/linux-epia_2.6.5.oe | 5 +- linux/mnci-ramses-2.4.21-rmk2-pxa1.oe | 80 ++++++------- linux/omap_2.6.5-omap1.oe | 23 ++++ linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe | 21 ++-- ...nzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe | 53 ++++----- ...enzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe | 32 +++--- ...zaurus-tosa_2.4.18-rmk7-pxa3-embedix20040311.oe | 56 +++++++++ linux/openzaurus_2.6.5-jl3.oe | 9 +- lisa/lisa_0.2.2.oe | 2 +- lmbench/lmbench_2.0.4.oe | 41 +++++++ lrzsz/lrzsz_0.12.20.oe | 8 +- ltt/ltt_0.9.5a.oe | 2 +- mailutils/mailutils_0.3.1.oe | 2 +- mailx/mailx_8.1.2-0.20020411cvs.oe | 2 +- mailx/mailx_8.1.2-0.20031014cvs.oe | 2 +- make/make_3.80.oe | 2 +- makedevs/makedevs-native_1.0.0.oe | 3 +- makedevs/makedevs_1.0.0.oe | 5 +- matchbox-wm/matchbox-wm_0.8.1.oe | 2 +- matchbox-wm/matchbox-wm_0.8.oe | 2 +- mgetty/mgetty_1.1.30.oe | 64 +++++------ mikmod/mikmod_3.2.2-beta1.oe | 2 +- minimo/minimo-cvs.oe | 5 +- modutils/modutils-collateral.oe | 42 +++---- modutils/modutils_2.4.27.oe | 27 ++++- mp3blaster/mp3blaster_3.1.3.oe | 2 +- mp3blaster/mp3blaster_3.2.0.oe | 2 +- mtd/mtd.oe | 4 +- murasaki/murasaki_0.7.10.oe | 2 +- mutt/mutt_1.5.4i.oe | 6 +- nano/nano_1.2.1.oe | 5 +- nano/nano_1.3.0.oe | 7 +- ncurses/ncurses_5.3.oe | 4 +- netbase/netbase_4.16.oe | 15 ++- netkit-base/netkit-base_0.17.oe | 10 +- netkit-ftp/netkit-ftp_0.17.oe | 2 +- ntp/ntp_4.1.2.oe | 2 +- obexftp/obexftp_0.10.3.oe | 2 +- openjade/openjade-native_1.3.2.oe | 2 +- openjade/openjade_1.3.2.oe | 2 +- openobex-apps/openobex-apps_1.0.0.oe | 4 +- openobex/openobex_1.0.1.oe | 2 +- opensp/opensp-native_1.5.oe | 4 +- opensp/opensp_1.5.oe | 4 +- openssh/openssh_3.7.1p1.oe | 7 +- openssh/openssh_3.7.1p2.oe | 7 +- openssh/openssh_3.8p1.oe | 7 +- openssl/openssl_0.9.7b.oe | 2 +- opie-taskbar/opie-taskbar_cvs.oe | 10 +- orinoco/orinoco-modules_0.13e.oe | 7 +- orinoco/orinoco-modules_0.15rc1.oe | 5 +- orpheus/orpheus_1.5.oe | 2 +- pad/pad-native.oe | 13 +++ pango/pango_1.2.5.oe | 6 +- pango/pango_1.4.0.oe | 4 +- pciutils/pciutils_2.1.11.oe | 2 +- pcre/pcre_4.4.oe | 4 +- petitepainture/petitepainture_1.0.oe | 5 +- phalanx/phalanx_22.oe | 8 +- pkgconfig/pkgconfig_0.15.0.oe | 5 +- plinciv/plinciv_0.16.oe | 2 +- pocketcellar/pocketcellar_1.1.oe | 2 +- popt/popt_1.7.oe | 2 +- portaudio/portaudio_0.0.19.oe | 2 +- ppp/ppp_2.4.1.oe | 10 ++ prboom/prboom_2.3.0.oe | 8 +- prelink/prelink_20031029.oe | 21 ++-- prelink/prelink_20040304.oe | 11 +- procps/procps_3.1.15.oe | 4 +- procps/procps_3.2.1.oe | 2 +- psmisc/psmisc_20.2.oe | 4 +- puzz-le/puzz-le_2.0.0.oe | 2 +- python/python-native_2.3.3.oe | 4 +- python/python-pycodes_1.1.oe | 2 +- python/python-pygame_1.6.oe | 5 +- python/python-pylinda_0.1.oe | 2 +- python/python-pyqt_3.11.oe | 5 +- python/python-pyqwt_3.10.oe | 7 +- python/python-soappy_0.11.3.oe | 5 +- python/python-vorbis_1.3.oe | 2 +- python/python_2.3.3.oe | 10 +- qmake/qmake-native_3.2.3.oe | 2 +- qpegps/qpegps_cvs.oe | 32 ++++++ qplot/qplot_2.0.1cvs.oe | 2 +- qt/qt-x11-free_3.3.2.oe | 2 +- qte/qte-for-opie_2.3.7.oe | 2 +- qte/qte-for-qtopia_2.3.7.oe | 8 +- qte/qte_2.3.7.oe | 16 +-- qte/qte_2.3.8-snap.oe | 8 +- radvd/radvd_0.7.2.oe | 2 +- readline/readline_4.3.oe | 2 +- rosetta/rosetta-cvs.oe | 17 +++ rsync/rsync_2.6.1pre-1.oe | 2 +- rxvt-unicode/rxvt-unicode_1.9.oe | 4 +- rxvt-unicode/rxvt-unicode_2.2.oe | 2 +- rxvt/rxvt_2.7.9.oe | 2 +- scew/scew_0.3.1.oe | 2 +- screen/screen_3.9.15.oe | 2 +- screen/screen_4.0.1.oe | 2 +- screen/screen_4.0.2.oe | 2 +- scummvm/scummvm_0.6.0.oe | 6 +- sgml-common/sgml-common_0.6.3.oe | 2 +- ...harp-camera-support_2.4.18-rmk7-pxa3-embedix.oe | 2 +- sharp-binary-only/sharp-flash-header-c700.oe | 7 ++ ...sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.oe | 2 +- shopper/shopper_1.2.1.oe | 2 +- sidplayer/sidplayer_1.5.0.oe | 6 +- simpad-utilities/genboot-native.oe | 14 +++ simpad-utilities/serload-native.oe | 13 +++ slrn/slrn_0.9.8.0.oe | 4 +- slutils/slutils_0.1.0.oe | 2 +- smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe | 4 +- snes9x/snes9x-sdl-qpe_1.39.oe | 2 +- socat/socat_1.3.2.1.oe | 2 +- sqlite/sqlite_2.8.9.oe | 2 +- ssmtp/ssmtp_2.60.4.oe | 7 +- strace/strace_4.4.98.oe | 4 +- strace/strace_4.5.3.oe | 10 ++ stunnel/stunnel_4.05.oe | 4 +- subapplet/subapplet_1.0.8.oe | 2 +- sudo/sudo_1.6.7p5.oe | 4 +- sysklogd/sysklogd_1.4.1.oe | 2 +- sysvinit/sysvinit_2.85.oe | 24 ++-- t1lib/t1lib_5.0.0.oe | 4 +- t1lib/t1lib_5.0.1.oe | 4 +- tar/tar_1.13.93.oe | 4 +- tin/tin_1.7.3.oe | 6 +- tmdns/tmdns_20030116.oe | 6 +- tn5250/tn5250_0.16.5.oe | 2 +- tslib/tslib.oe | 36 +++--- txdrug/txdrug_0.1.oe | 9 +- tximage/tximage_0.2.oe | 2 +- uae/uae_0.8.23-20040129.oe | 4 +- uclibc/uclibc_0.9.26.oe | 8 +- udev/udev_024.oe | 4 +- uicmoc/uicmoc-native_2.3.7.oe | 2 +- uicmoc/uicmoc3_native_3.3.2.oe | 2 +- uml-utilities/uml-utilities_20040406.oe | 16 +++ units/units_1.80.oe | 4 +- usbutils/usbutils_0.11.oe | 2 +- util-linux/util-linux_2.12.oe | 14 ++- vim/vim_6.2.oe | 2 +- vorbis-tools/vorbis-tools_1.0.1.oe | 2 +- vpnc/vpnc_0.2-rm+zomb-pre7.oe | 2 +- xdamage/xdamage-cvs.oe | 2 +- xkbd/xkbd_0.8.12.oe | 4 +- xmms-embedded/xmms-embedded_20040327.oe | 17 +-- xserver/xserver-cvs.oe | 2 +- xtst/xtst-cvs.oe | 2 +- zcip/zcip_4.oe | 6 +- zddice/zddice_1.0.0.oe | 21 ++++ zgscore/zgscore_1.0.0.oe | 2 +- zipsc/zipsc_0.4.3.oe | 2 +- zlapspeed/zlapspeed_1.0.0.oe | 21 ++++ zsh/zsh_4.1.1.oe | 2 +- 338 files changed, 1731 insertions(+), 1010 deletions(-) diff --git a/aalib/aalib_1.4rc5.oe b/aalib/aalib_1.4rc5.oe index 9306602346..b259b63f31 100644 --- a/aalib/aalib_1.4rc5.oe +++ b/aalib/aalib_1.4rc5.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc ncurses" DESCRIPTION = "An ASCII art gfx library." SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" S = "${WORKDIR}/aalib-1.4.0" inherit autotools diff --git a/acpid/acpid_1.0.2.oe b/acpid/acpid_1.0.2.oe index 3744a0dd48..62e22cc73f 100644 --- a/acpid/acpid_1.0.2.oe +++ b/acpid/acpid_1.0.2.oe @@ -1,7 +1,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "A daemon for delivering ACPI events." -SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ + file://init" EXTRA_OEMAKE = "" do_compile () { @@ -11,7 +12,7 @@ do_compile () { do_install () { oe_runmake 'INSTPREFIX=${D}' install install -d ${D}/${sysconfdir}/init.d - cat ${FILESDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}/${sysconfdir}/init.d/acpid + cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}/${sysconfdir}/init.d/acpid chmod 755 ${D}/${sysconfdir}/init.d/acpid } diff --git a/acpid/acpid_1.0.3.oe b/acpid/acpid_1.0.3.oe index 3744a0dd48..62e22cc73f 100644 --- a/acpid/acpid_1.0.3.oe +++ b/acpid/acpid_1.0.3.oe @@ -1,7 +1,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "A daemon for delivering ACPI events." -SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \ + file://init" EXTRA_OEMAKE = "" do_compile () { @@ -11,7 +12,7 @@ do_compile () { do_install () { oe_runmake 'INSTPREFIX=${D}' install install -d ${D}/${sysconfdir}/init.d - cat ${FILESDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}/${sysconfdir}/init.d/acpid + cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}/${sysconfdir}/init.d/acpid chmod 755 ${D}/${sysconfdir}/init.d/acpid } diff --git a/adns/adns_1.0.oe b/adns/adns_1.0.oe index d541b23605..0dc674493c 100644 --- a/adns/adns_1.0.oe +++ b/adns/adns_1.0.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "An advanced alternative, asynchronous resolver." SRC_URI = "ftp://ftp.gnu.org/gnu/adns/adns-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/fixparsedomainflags.patch;patch=1" + file://configure.patch;patch=1 \ + file://fixparsedomainflags.patch;patch=1" inherit autotools diff --git a/alsa-oss/alsa-oss_1.0.4.oe b/alsa-oss/alsa-oss_1.0.4.oe index 118da08dbe..bb52ddc38f 100644 --- a/alsa-oss/alsa-oss_1.0.4.oe +++ b/alsa-oss/alsa-oss_1.0.4.oe @@ -4,8 +4,8 @@ LICENSE = "GPL" DEPENDS = "virtual/libc alsa-lib" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" inherit autotools diff --git a/alsa-utils/alsa-utils_1.0.4.oe b/alsa-utils/alsa-utils_1.0.4.oe index e69de29bb2..40eec280db 100644 --- a/alsa-utils/alsa-utils_1.0.4.oe +++ b/alsa-utils/alsa-utils_1.0.4.oe @@ -0,0 +1,10 @@ +DESCRIPTION = "Alsa Utilities" +MAINTAINER = "Lorn Potter " +LICENSE = "GPL" +DEPENDS = "virtual/libc" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://autotools.patch;patch=1 \ + file://m4.patch;patch=1" + +inherit autotools diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe index dd5db4fda9..b47baa14fa 100644 --- a/apache/apache_2.0.48.oe +++ b/apache/apache_2.0.48.oe @@ -3,14 +3,15 @@ DEPENDS = "virtual/libc expat openssl" DESCRIPTION = "A high performance Unix-based HTTP server." SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/pcre-configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://pcre-configure.patch;patch=1 \ + file://init" S = "${WORKDIR}/httpd-${PV}" basesysconfdir := "${sysconfdir}" sysconfdir = "/etc/apache" -inherit autotools +inherit autotools FILES_${PN}="${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \ @@ -57,7 +58,7 @@ do_compile () { do_install_append () { set -x install -d ${D}/${basesysconfdir}/init.d - cat ${FILESDIR}/init | \ + cat ${WORKDIR}/init | \ sed -e 's,/usr/sbin/,${sbindir}/,g; \ s,/usr/bin/,${bindir}/,g; \ s,/usr/lib,${libdir}/,g; \ diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe index e48678742f..6eaa21806e 100644 --- a/apmd/apmd_3.2.0.oe +++ b/apmd/apmd_3.2.0.oe @@ -4,13 +4,15 @@ MAINTAINER = "Greg Gilbert " DEPENDS = "virtual/libc libtool-cross" DESCRIPTION = "Set of tools for managing notebook power consumption." -SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz;" -SRC_URI_append =" file://${FILESDIR}/apmd_${PV}-3.diff;patch=1" -SRC_URI_append =" file://${FILESDIR}/workaround.patch;patch=1" -SRC_URI_append =" file://${FILESDIR}/conf.patch;patch=1" -SRC_URI_append =" file://${FILESDIR}/proxy.patch;patch=1" -SRC_URI_append =" file://${FILESDIR}/compile.patch;patch=1" -SRC_URI_append =" file://${FILESDIR}/make.patch;patch=1" +SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \ + file://apmwrapper \ + file://init" +SRC_URI_append =" file://apmd_${PV}-3.diff;patch=1" +SRC_URI_append =" file://workaround.patch;patch=1" +SRC_URI_append =" file://conf.patch;patch=1" +SRC_URI_append =" file://proxy.patch;patch=1" +SRC_URI_append =" file://compile.patch;patch=1" +SRC_URI_append =" file://make.patch;patch=1" S = "${WORKDIR}/apmd-${PV}.orig" @@ -38,14 +40,14 @@ do_install() { install -d ${D}/${libdir} install -d ${D}/${datadir}/apmd install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig - install -m 0755 ${FILESDIR}/apmwrapper ${D}/${bindir}/apm + install -m 0755 ${WORKDIR}/apmwrapper ${D}/${bindir}/apm install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/ install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/ install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd oe_libinstall -so libapm ${D}/${libdir} - cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd + cat ${WORKDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd chmod 755 ${D}/${sysconfdir}/init.d/apmd } diff --git a/appweb/appweb_1.0.0.oe b/appweb/appweb_1.0.0.oe index 5e96ef9b3e..8bdcfd4db0 100644 --- a/appweb/appweb_1.0.0.oe +++ b/appweb/appweb_1.0.0.oe @@ -3,8 +3,8 @@ DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \ - file://${FILESDIR}/charsignedness.patch;patch=1 \ - file://${FILESDIR}/makerules.patch;patch=1' + file://charsignedness.patch;patch=1 \ + file://makerules.patch;patch=1' S = "${WORKDIR}/appWeb-${PV}" python do_unpack () { diff --git a/appweb/appweb_1.0.1.oe b/appweb/appweb_1.0.1.oe index 4131739756..c11fb652b5 100644 --- a/appweb/appweb_1.0.1.oe +++ b/appweb/appweb_1.0.1.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind." SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \ - file://${FILESDIR}/charsignedness.patch;patch=1 \ - file://${FILESDIR}/makerules.patch;patch=1' + file://charsignedness.patch;patch=1 \ + file://makerules.patch;patch=1' S = "${WORKDIR}/appWeb-${PV}" python do_unpack () { diff --git a/appweb/appweb_1.0.2.oe b/appweb/appweb_1.0.2.oe index 776f5632fe..be86603052 100644 --- a/appweb/appweb_1.0.2.oe +++ b/appweb/appweb_1.0.2.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind." SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-12.tar.gz \ - file://${FILESDIR}/charsignedness.patch;patch=1 \ - file://${FILESDIR}/makerules.patch;patch=1' + file://charsignedness.patch;patch=1 \ + file://makerules.patch;patch=1' S = "${WORKDIR}/appWeb-${PV}" python do_unpack () { diff --git a/at/at_3.1.8.oe b/at/at_3.1.8.oe index 97ef803f67..bbf42f4150 100644 --- a/at/at_3.1.8.oe +++ b/at/at_3.1.8.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc flex" DESCRIPTION = "Delayed job execution and batch processing." SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}-11.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/nonrootinstall.patch;patch=1" + file://configure.patch;patch=1 \ + file://nonrootinstall.patch;patch=1" inherit autotools diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe index e52e3778b6..ce017dfe6e 100644 --- a/atk/atk_1.2.0.oe +++ b/atk/atk_1.2.0.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc glib-2.0" DESCRIPTION = "An accessibility toolkit for GNOME." SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/atk/1.2/atk-${PV}.tar.bz2 \ - file://${FILESDIR}/m4.patch;patch=1" + file://m4.patch;patch=1" inherit autotools pkgconfig diff --git a/atk/atk_1.6.0.oe b/atk/atk_1.6.0.oe index 73231935f1..ef7ed7e203 100644 --- a/atk/atk_1.6.0.oe +++ b/atk/atk_1.6.0.oe @@ -5,7 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Philip Blundell " SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \ - file://${FILESDIR}/gtk-doc.patch;patch=1" + file://gtk-doc.patch;patch=1" inherit autotools pkgconfig diff --git a/aumix/aumix_2.8.oe b/aumix/aumix_2.8.oe index ab121aa36c..d4b5fb0259 100644 --- a/aumix/aumix_2.8.oe +++ b/aumix/aumix_2.8.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc ncurses" DESCRIPTION = "A mixer for the terminal or X11, with mouse support." SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" inherit autotools diff --git a/autoconf/autoconf_2.57.oe b/autoconf/autoconf_2.57.oe index 6b3378cb68..093c52ac49 100644 --- a/autoconf/autoconf_2.57.oe +++ b/autoconf/autoconf_2.57.oe @@ -1,5 +1,5 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ - file://${FILESDIR}/program_prefix.patch;patch=1" + file://program_prefix.patch;patch=1" DESCRIPTION = "A package of M4 macros to produce scripts to \ automatically configure sourcecode." diff --git a/autoconf/autoconf_2.59.oe b/autoconf/autoconf_2.59.oe index ee7f8ddfe9..76c50e6a4a 100644 --- a/autoconf/autoconf_2.59.oe +++ b/autoconf/autoconf_2.59.oe @@ -1,11 +1,11 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ - file://${FILESDIR}/program_prefix.patch;patch=1 \ - file://${FILESDIR}/autoreconf-include.patch;patch=1 \ - file://${FILESDIR}/autoreconf-exclude.patch;patch=1 \ - file://${FILESDIR}/autoreconf-foreign.patch;patch=1 \ - file://${FILESDIR}/autoreconf-gnuconfigize.patch;patch=1 \ - file://${FILESDIR}/autoconf259-update-configscripts.patch;patch=1 \ - file://${FILESDIR}/autoheader-nonfatal-warnings.patch;patch=1" + file://program_prefix.patch;patch=1 \ + file://autoreconf-include.patch;patch=1 \ + file://autoreconf-exclude.patch;patch=1 \ + file://autoreconf-foreign.patch;patch=1 \ + file://autoreconf-gnuconfigize.patch;patch=1 \ + file://autoconf259-update-configscripts.patch;patch=1 \ + file://autoheader-nonfatal-warnings.patch;patch=1" DESCRIPTION = "A package of M4 macros to produce scripts to \ automatically configure sourcecode." diff --git a/automake/automake_1.8.2.oe b/automake/automake_1.8.2.oe index ae5117d3d9..814b061dda 100644 --- a/automake/automake_1.8.2.oe +++ b/automake/automake_1.8.2.oe @@ -1,5 +1,5 @@ SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \ - file://${FILESDIR}/automake182-update-configscripts.patch;patch=1;pnum=1" + file://automake182-update-configscripts.patch;patch=1;pnum=1" DESCRIPTION = "A tool for automatically generating Makefiles." FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/automake-${PV}" diff --git a/avr-libc/avr-libc_1.0.3.oe b/avr-libc/avr-libc_1.0.3.oe index f0387bf937..3123138128 100644 --- a/avr-libc/avr-libc_1.0.3.oe +++ b/avr-libc/avr-libc_1.0.3.oe @@ -10,7 +10,7 @@ python __anonymous () { } SRC_URI = "http://savannah.nongnu.org/download/avr-libc/avr-libc-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" B = "${WORKDIR}/build.${BUILD_SYS}.${TARGET_SYS}" inherit autotools diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe index 30b3db06cf..1f25ba676b 100644 --- a/base-files/base-files_3.0.14.oe +++ b/base-files/base-files_3.0.14.oe @@ -3,60 +3,63 @@ SECTION = "base" PRIORITY = "required" PR = "r5" -SRC_URI = " file://${FILESDIR}/etc/nsswitch.conf \ - file://${FILESDIR}/etc/motd \ - file://${FILESDIR}/etc/issue.net- \ - file://${FILESDIR}/etc/issue-opensimpad \ - file://${FILESDIR}/etc/issue.net-opensimpad \ - file://${FILESDIR}/etc/issue- \ - file://${FILESDIR}/etc/issue-openzaurus \ - file://${FILESDIR}/etc/issue.net-openzaurus \ - file://${FILESDIR}/etc/issue-familiar \ - file://${FILESDIR}/etc/issue.net-familiar \ - file://${FILESDIR}/etc/inputrc \ - file://${FILESDIR}/etc/host.conf \ - file://${FILESDIR}/etc/profile \ - file://${FILESDIR}/shepherd/fstab \ - file://${FILESDIR}/shepherd/hostname \ - file://${FILESDIR}/epia/fstab \ - file://${FILESDIR}/h3600/hostname \ - file://${FILESDIR}/corgi/fstab \ - file://${FILESDIR}/corgi/hostname \ - file://${FILESDIR}/fstab \ - file://${FILESDIR}/husky/fstab \ - file://${FILESDIR}/husky/hostname \ - file://${FILESDIR}/share/dot.bashrc \ - file://${FILESDIR}/share/dot.profile \ - file://${FILESDIR}/share/info.dir \ - file://${FILESDIR}/share/motd.md5sums \ - file://${FILESDIR}/collie/fstab \ - file://${FILESDIR}/collie/hostname \ - file://${FILESDIR}/debian/FAQ \ - file://${FILESDIR}/debian/directory-list \ - file://${FILESDIR}/debian/control \ - file://${FILESDIR}/debian/1777-dirs \ - file://${FILESDIR}/debian/rules \ - file://${FILESDIR}/debian/conffiles \ - file://${FILESDIR}/debian/changelog \ - file://${FILESDIR}/debian/copyright.in \ - file://${FILESDIR}/debian/postinst \ - file://${FILESDIR}/debian/README.FHS \ - file://${FILESDIR}/debian/2775-dirs \ - file://${FILESDIR}/debian/preinst.in \ - file://${FILESDIR}/debian/remove-base \ - file://${FILESDIR}/debian/README.base \ - file://${FILESDIR}/debian/current-md5sums \ - file://${FILESDIR}/hostname \ - file://${FILESDIR}/poodle/fstab \ - file://${FILESDIR}/poodle/hostname \ - file://${FILESDIR}/ramses/fstab \ - file://${FILESDIR}/ramses/hostname \ - file://${FILESDIR}/simpad/hostname \ - file://${FILESDIR}/licenses/BSD \ - file://${FILESDIR}/licenses/GPL-2 \ - file://${FILESDIR}/licenses/LGPL-2 \ - file://${FILESDIR}/licenses/LGPL-2.1 \ - file://${FILESDIR}/licenses/Artistic" +SRC_URI = " \ + file://etc/nsswitch.conf \ + file://etc/motd \ + file://etc/issue.net- \ + file://etc/issue-opensimpad \ + file://etc/issue.net-opensimpad \ + file://etc/issue- \ + file://etc/issue-openzaurus \ + file://etc/issue.net-openzaurus \ + file://etc/issue-familiar \ + file://etc/issue.net-familiar \ + file://etc/inputrc \ + file://etc/host.conf \ + file://etc/profile \ + file://shepherd/fstab \ + file://shepherd/hostname \ + file://epia/fstab \ + file://h3600/hostname \ + file://corgi/fstab \ + file://corgi/hostname \ + file://fstab \ + file://husky/fstab \ + file://husky/hostname \ + file://share/dot.bashrc \ + file://share/dot.profile \ + file://share/info.dir \ + file://share/motd.md5sums \ + file://collie/fstab \ + file://collie/hostname \ + file://debian/FAQ \ + file://debian/directory-list \ + file://debian/control \ + file://debian/1777-dirs \ + file://debian/rules \ + file://debian/conffiles \ + file://debian/changelog \ + file://debian/copyright.in \ + file://debian/postinst \ + file://debian/README.FHS \ + file://debian/2775-dirs \ + file://debian/preinst.in \ + file://debian/remove-base \ + file://debian/README.base \ + file://debian/current-md5sums \ + file://hostname \ + file://poodle/fstab \ + file://poodle/hostname \ + file://ramses/fstab \ + file://ramses/hostname \ + file://simpad/hostname \ + file://licenses/BSD \ + file://licenses/GPL-2 \ + file://licenses/LGPL-2 \ + file://licenses/LGPL-2.1 \ + file://licenses/Artistic \ + file://etc/issue-${DISTRO} \ + file://etc/issue.net-${DISTRO}" S = "${WORKDIR}" docdir_append = "/${P}" @@ -91,8 +94,8 @@ do_install () { oe_machinstall -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab oe_machinstall -m 0644 ${WORKDIR}/hostname ${D}/${sysconfdir}/hostname oe_machinstall -m 0644 ${WORKDIR}/profile ${D}/${sysconfdir}/profile - install -m 0644 ${FILESDIR}/etc/issue-${DISTRO} ${D}/${sysconfdir}/issue - install -m 0644 ${FILESDIR}/etc/issue.net-${DISTRO} ${D}/${sysconfdir}/issue.net + install -m 0644 ${WORKDIR}/etc/issue-${DISTRO} ${D}/${sysconfdir}/issue + install -m 0644 ${WORKDIR}/etc/issue.net-${DISTRO} ${D}/${sysconfdir}/issue.net cat ${WORKDIR}/etc/motd | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/motd for f in inputrc nsswitch.conf host.conf profile do @@ -132,4 +135,3 @@ do_install () { PACKAGES = "${PN}-doc ${PN}" FILES_${PN} = "/" FILES_${PN}-doc = "/usr/share/doc /usr/share/common-licenses" - diff --git a/base-passwd/base-passwd_3.5.7.oe b/base-passwd/base-passwd_3.5.7.oe index 3ebac8590c..3a5f33561c 100644 --- a/base-passwd/base-passwd_3.5.7.oe +++ b/base-passwd/base-passwd_3.5.7.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "Base System Password/Group Files." SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/nobash.patch;patch=1" + file://configure.patch;patch=1 \ + file://nobash.patch;patch=1" inherit autotools diff --git a/bash/bash_2.05b.oe b/bash/bash_2.05b.oe index 78cd314863..8f3b45340b 100644 --- a/bash/bash_2.05b.oe +++ b/bash/bash_2.05b.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc ncurses" DESCRIPTION = "An sh-compatible command language interpreter." SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ - file://${FILESDIR}/make.patch;patch=1 \ - file://${FILESDIR}/configure.patch;patch=1" + file://make.patch;patch=1 \ + file://configure.patch;patch=1" inherit autotools diff --git a/binutils/binutils_2.15.90.0.3.oe b/binutils/binutils_2.15.90.0.3.oe index 3555a9d936..8765917e66 100644 --- a/binutils/binutils_2.15.90.0.3.oe +++ b/binutils/binutils_2.15.90.0.3.oe @@ -29,12 +29,12 @@ FILES_${PN}-symlinks = " \ SRC_URI = \ "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ - file://${FILESDIR}/binutils-001_ld_makefile.patch;patch=1 \ - file://${FILESDIR}/binutils-006_better_file_error.patch;patch=1 \ - file://${FILESDIR}/binutils-009_signed_char_fix.patch;patch=1 \ - file://${FILESDIR}/binutils-100_cflags_for_build.patch;patch=1 \ - file://${FILESDIR}/binutils-2.15.90.0.3-uclibc-100-conf.patch;patch=1 \ - file://${FILESDIR}/binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1" + file://binutils-001_ld_makefile.patch;patch=1 \ + file://binutils-006_better_file_error.patch;patch=1 \ + file://binutils-009_signed_char_fix.patch;patch=1 \ + file://binutils-100_cflags_for_build.patch;patch=1 \ + file://binutils-2.15.90.0.3-uclibc-100-conf.patch;patch=1 \ + file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1" S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/bison/bison_1.875.oe b/bison/bison_1.875.oe index 686cdf35a0..ba52de8e64 100644 --- a/bison/bison_1.875.oe +++ b/bison/bison_1.875.oe @@ -2,6 +2,6 @@ DEPENDS = "virtual/libc" DESCRIPTION = "GNU Project parser generator (yacc replacement)." SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.bz2 \ - file://${FILESDIR}/m4.patch;patch=1" + file://m4.patch;patch=1" inherit autotools diff --git a/bluez-hcidump/bluez-hcidump_1.5.oe b/bluez-hcidump/bluez-hcidump_1.5.oe index 38433943d6..0fe3b30810 100644 --- a/bluez-hcidump/bluez-hcidump_1.5.oe +++ b/bluez-hcidump/bluez-hcidump_1.5.oe @@ -5,7 +5,7 @@ DEPENDS = "virtual/libc virtual/libbluetooth" DESCRIPTION = "Analyses Bluetooth HCI packets." SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR}/.." diff --git a/bluez-utils/bluez-utils_2.3.oe b/bluez-utils/bluez-utils_2.3.oe index 0bc09811d0..457d2cd525 100644 --- a/bluez-utils/bluez-utils_2.3.oe +++ b/bluez-utils/bluez-utils_2.3.oe @@ -5,7 +5,7 @@ DEPENDS = "virtual/libc virtual/libbluetooth" DESCRIPTION = "Utilities for controlling Bluetooth devices." SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" diff --git a/bochs/bochs_2.1.oe b/bochs/bochs_2.1.oe index 44eccd5362..024335df39 100644 --- a/bochs/bochs_2.1.oe +++ b/bochs/bochs_2.1.oe @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "virtual/libc libsdl-qpe" SRC_URI = "${SOURCEFORGE_MIRROR}/bochs/bochs-${PV}.tar.gz \ - file://${FILESDIR}/compile.patch;patch=1" + file://compile.patch;patch=1" inherit autotools diff --git a/bootmenu/bootmenu_0.6.oe b/bootmenu/bootmenu_0.6.oe index 803e344546..d711613acc 100644 --- a/bootmenu/bootmenu_0.6.oe +++ b/bootmenu/bootmenu_0.6.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc" DESCRIPTION = "Pluginable bootup menu." SRC_URI = "http://www.cosmicpenguin.net/pub/bootmenu/bootmenu-${PV}.tar.gz \ - file://${FILESDIR}/compile.patch;patch=1" + file://compile.patch;patch=1" EXTRA_OEMAKE = "" diff --git a/brickout/brickout_2002.06.09.oe b/brickout/brickout_2002.06.09.oe index 8798a02fe7..e6424a5512 100644 --- a/brickout/brickout_2002.06.09.oe +++ b/brickout/brickout_2002.06.09.oe @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libc virtual/libqpe virtual/libsdl" SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/brickout/src/brickout-${PV}.tar.gz \ - file://${FILESDIR}/directories.patch;patch=1" + file://directories.patch;patch=1" inherit palmtop diff --git a/btscanner/btscanner_1.0.oe b/btscanner/btscanner_1.0.oe index c1380275d1..b4fd18a0e6 100644 --- a/btscanner/btscanner_1.0.oe +++ b/btscanner/btscanner_1.0.oe @@ -5,6 +5,6 @@ PRIORITY = "optional" DEPENDS = "virtual/libbluetooth virtual/libsdp gdbm ncurses" SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" inherit autotools diff --git a/busybox/busybox_1.00-pre10.oe b/busybox/busybox_1.00-pre10.oe index 49a1eb465d..fbbea6f13e 100644 --- a/busybox/busybox_1.00-pre10.oe +++ b/busybox/busybox_1.00-pre10.oe @@ -11,9 +11,12 @@ functionality and behave very much like their GNU counterparts. BusyBox \ provides a fairly complete POSIX environment for any small or embedded \ system." -# file://${FILESDIR}/busybox-1.00-pre10-fuser.patch;patch=1 +# file://busybox-1.00-pre10-fuser.patch;patch=1 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://${FILESDIR}/bb-iproute-iftunnel.patch;patch=1" + file://bb-iproute-iftunnel.patch;patch=1 \ + file://defconfig \ + file://syslog \ + file://hwclock.sh" S = "${WORKDIR}/busybox-${PV}" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" @@ -22,7 +25,7 @@ FILES_${PN} += " ${datadir}/udhcpc" inherit cml1 do_configure () { - install -m 0644 ${FILESDIR}/defconfig ${S}/.config + install -m 0644 ${WORKDIR}/defconfig ${S}/.config cml1_do_configure } @@ -34,8 +37,8 @@ do_compile () { do_install () { install -d ${D}/etc/init.d oe_runmake 'PREFIX=${D}' install - install -m 0755 ${FILESDIR}/syslog ${D}/etc/init.d/syslog - install -m 0755 ${FILESDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh + install -m 0755 ${WORKDIR}/syslog ${D}/etc/init.d/syslog + install -m 0755 ${WORKDIR}/hwclock.sh ${D}/etc/init.d/hwclock.sh install -d ${D}${datadir}/udhcpc install -m 0755 ${S}/examples/udhcp/simple.script ${D}${datadir}/udhcpc/default.script } diff --git a/bvi/bvi_1.3.1.oe b/bvi/bvi_1.3.1.oe index ffcbbae87f..e08117b5b8 100644 --- a/bvi/bvi_1.3.1.oe +++ b/bvi/bvi_1.3.1.oe @@ -3,7 +3,7 @@ DESCRIPTION = "binary vi (binary file editor)" DEPENDS = "virtual/libc ncurses" SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/compile.patch;patch=1" + file://configure.patch;patch=1 \ + file://compile.patch;patch=1" inherit autotools diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe index 8efb839d14..d6aed27454 100644 --- a/bzip2/bzip2_1.0.2.oe +++ b/bzip2/bzip2_1.0.2.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc" DESCRIPTION = "Very high-quality data compression program." SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \ - file://${FILESDIR}/installpaths.patch;patch=1" + file://installpaths.patch;patch=1" CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64" diff --git a/centericq/centericq_4.9.10.oe b/centericq/centericq_4.9.10.oe index 02b08993b9..f9f087e8d7 100644 --- a/centericq/centericq_4.9.10.oe +++ b/centericq/centericq_4.9.10.oe @@ -3,8 +3,8 @@ DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ AIM, IRC, Jabber and LiveJournal" SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" inherit autotools diff --git a/centericq/centericq_4.9.7.oe b/centericq/centericq_4.9.7.oe index 2c1aeb68f3..c76de537c1 100644 --- a/centericq/centericq_4.9.7.oe +++ b/centericq/centericq_4.9.7.oe @@ -3,8 +3,8 @@ DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ AIM, IRC, Jabber and LiveJournal" SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" inherit autotools diff --git a/cflow/cflow_2.0.oe b/cflow/cflow_2.0.oe index 5fcabe1e11..fb9ee09d8c 100644 --- a/cflow/cflow_2.0.oe +++ b/cflow/cflow_2.0.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc" DESCRIPTION = "Utility for viewing function call flow." SRC_URI = "http://www.ibiblio.org/pub/Linux/devel/lang/c/cflow-${PV}.tar.gz \ - file://${FILESDIR}/compile.patch;patch=1" + file://compile.patch;patch=1" do_install () { install -d ${D}/${bindir} diff --git a/ckermit/ckermit_209.oe b/ckermit/ckermit_209.oe index 1f512159bd..183e0ab138 100644 --- a/ckermit/ckermit_209.oe +++ b/ckermit/ckermit_209.oe @@ -6,8 +6,8 @@ sessions, file transfer, character-set translation, and automation \ of communication tasks." SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz \ - file://${FILESDIR}/cross.patch;patch=1 \ - file://${FILESDIR}/compile.patch;patch=1" + file://cross.patch;patch=1 \ + file://compile.patch;patch=1" export CC_FOR_BUILD = "${BUILD_CC}" export CC2 = "${CC}" diff --git a/comprec/comprec_0.01.oe b/comprec/comprec_0.01.oe index 3b1c485e7a..3c2e45e8fc 100644 --- a/comprec/comprec_0.01.oe +++ b/comprec/comprec_0.01.oe @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libc" SRC_URI = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-${PV}.tar.gz \ - file://${FILESDIR}/makefile.patch;patch=1" + file://makefile.patch;patch=1" export AS = "${TARGET_PREFIX}as" diff --git a/comprec/comprec_0.02.oe b/comprec/comprec_0.02.oe index 3b1c485e7a..3c2e45e8fc 100644 --- a/comprec/comprec_0.02.oe +++ b/comprec/comprec_0.02.oe @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libc" SRC_URI = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-${PV}.tar.gz \ - file://${FILESDIR}/makefile.patch;patch=1" + file://makefile.patch;patch=1" export AS = "${TARGET_PREFIX}as" diff --git a/console-tools/console-tools_0.3.2.oe b/console-tools/console-tools_0.3.2.oe index b9d09bc647..17589532e1 100644 --- a/console-tools/console-tools_0.3.2.oe +++ b/console-tools/console-tools_0.3.2.oe @@ -2,9 +2,10 @@ DEPENDS = "virtual/libc" DESCRIPTION = "Allows you to set-up and manipulate the Linux console." SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ - file://${FILESDIR}/codepage.patch;patch=1 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/compile.patch;patch=1" + file://codepage.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://compile.patch;patch=1 \ + file://config/*.m4" export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \ examples po intl compat" @@ -12,7 +13,7 @@ export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \ acpaths = "-I config" do_configure_prepend () { mkdir -p config - cp ${FILESDIR}/config/*.m4 config/ + cp ${WORKDIR}/config/*.m4 config/ } do_compile () { diff --git a/coreutils/coreutils_5.0.oe b/coreutils/coreutils_5.0.oe index 6113297249..ff314f8311 100644 --- a/coreutils/coreutils_5.0.oe +++ b/coreutils/coreutils_5.0.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "A collection of core GNU utilities." SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \ - file://${FILESDIR}/malloc.patch;patch=1 \ - file://${FILESDIR}/configure.patch;patch=1" + file://malloc.patch;patch=1 \ + file://configure.patch;patch=1" inherit autotools diff --git a/coreutils/coreutils_5.1.3.oe b/coreutils/coreutils_5.1.3.oe index 2ab0cbdb73..d599a8de75 100644 --- a/coreutils/coreutils_5.1.3.oe +++ b/coreutils/coreutils_5.1.3.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc" DESCRIPTION = "A collection of core GNU utilities." SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ - file://${FILESDIR}/install-cross.patch;patch=1;pnum=0" + file://install-cross.patch;patch=1;pnum=0" inherit autotools diff --git a/corkscrew/corkscrew_2.0.oe b/corkscrew/corkscrew_2.0.oe index cf15bbdf05..b93e72c43e 100644 --- a/corkscrew/corkscrew_2.0.oe +++ b/corkscrew/corkscrew_2.0.oe @@ -2,6 +2,6 @@ HOMEPAGE = "http://www.agroman.net/corkscrew/" DESCRIPTION = "Tunnel SSH throught HTTP proxies" SECTION = "net" SRC_URI = "http://www.agroman.net/corkscrew/corkscrew-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" inherit autotools diff --git a/cpufreqd/cpufreqd_1.1.2.oe b/cpufreqd/cpufreqd_1.1.2.oe index 74242bf47c..feae76afc3 100644 --- a/cpufreqd/cpufreqd_1.1.2.oe +++ b/cpufreqd/cpufreqd_1.1.2.oe @@ -5,7 +5,7 @@ according to a set of rules specified in the config file." DEPENDS = "virtual/libc" SRC_URI = "${SOURCEFORGE_MIRROR}/cpufreqd/cpufreqd-${PV}.tar.gz \ - file://${FILESDIR}/nonrootinstall.patch;patch=1" + file://nonrootinstall.patch;patch=1" inherit autotools diff --git a/cron/cron_3.0pl1.oe b/cron/cron_3.0pl1.oe index 5b3c160f85..bbebf20200 100644 --- a/cron/cron_3.0pl1.oe +++ b/cron/cron_3.0pl1.oe @@ -2,8 +2,8 @@ DEPENDS = "virtual/libc" DESCRIPTION = "Vixie cron." SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \ - file://${FILESDIR}/nonrootinstall.patch;patch=1 \ - file://${FILESDIR}/time.patch;patch=1" + file://nonrootinstall.patch;patch=1 \ + file://time.patch;patch=1" S = "${WORKDIR}/cron${PV}" CFLAGS_append = " -I${S} -DSYS_TIME_H=0" diff --git a/cumulus/cumulus_1.1.oe b/cumulus/cumulus_1.1.oe index e63cb9a756..709aaa7285 100644 --- a/cumulus/cumulus_1.1.oe +++ b/cumulus/cumulus_1.1.oe @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libc virtual/libqpe" SRC_URI = "http://cumulus.kflog.org/download/src/cumulus-${PV}.src.tar.bz2 \ - file://${FILESDIR}/qtooltip.patch;patch=1" + file://qtooltip.patch;patch=1" S = "${WORKDIR}/cumulus-arm-${PV}" inherit palmtop diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe index cb6fcf9653..a2c8018587 100644 --- a/cyrus-sasl/cyrus-sasl_2.1.17.oe +++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc db3" DESCRIPTION = "Generic client/server library for SASL authentication." SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" inherit autotools diff --git a/dbus/dbus_0.20.oe b/dbus/dbus_0.20.oe index 04661a4815..adff083dcc 100644 --- a/dbus/dbus_0.20.oe +++ b/dbus/dbus_0.20.oe @@ -3,7 +3,7 @@ DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "virtual/libc expat glib-2.0" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ - file://${FILESDIR}/cross.patch;patch=1" + file://cross.patch;patch=1" inherit autotools pkgconfig diff --git a/dbus/dbus_0.21.oe b/dbus/dbus_0.21.oe index 04661a4815..adff083dcc 100644 --- a/dbus/dbus_0.21.oe +++ b/dbus/dbus_0.21.oe @@ -3,7 +3,7 @@ DESCRIPTION = "message bus system for applications to talk to one another" DEPENDS = "virtual/libc expat glib-2.0" SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \ - file://${FILESDIR}/cross.patch;patch=1" + file://cross.patch;patch=1" inherit autotools pkgconfig diff --git a/dcron/dcron_2.3.3.oe b/dcron/dcron_2.3.3.oe index 2b27970c5c..317a8988b4 100644 --- a/dcron/dcron_2.3.3.oe +++ b/dcron/dcron_2.3.3.oe @@ -3,7 +3,7 @@ DESCRIPTION = "Dillon's Cron is a multi-user cron written from scratch, \ similar to vixie-cron but with major differences." SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/dcron-${PV}.tar.gz \ - file://${FILESDIR}/compile.patch;patch=1" + file://compile.patch;patch=1" do_install () { install -d ${D}/${bindir} ${D}/${sbindir} \ diff --git a/desktop-file-utils/desktop-file-utils_0.3.oe b/desktop-file-utils/desktop-file-utils_0.3.oe index 9795a76974..2164a5b63e 100644 --- a/desktop-file-utils/desktop-file-utils_0.3.oe +++ b/desktop-file-utils/desktop-file-utils_0.3.oe @@ -3,6 +3,6 @@ DESCRIPTION = "command line utilities to work with *.desktop files" DEPENDS = "virtual/libc popt glib-2.0" SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz \ - file://${FILESDIR}/m4.patch;patch=1" + file://m4.patch;patch=1" inherit autotools diff --git a/dhclient/dhclient_2.0pl5.oe b/dhclient/dhclient_2.0pl5.oe index e7c6958fa7..8d95754b39 100644 --- a/dhclient/dhclient_2.0pl5.oe +++ b/dhclient/dhclient_2.0pl5.oe @@ -2,7 +2,7 @@ DEPENDS = "virtual/libc" DESCRIPTION = "ISC DHCP Distribution (client and server)." SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \ - file://${FILESDIR}/make.patch;patch=1" + file://make.patch;patch=1" S = "${WORKDIR}/dhcp-${PV}" export BINDIR = "${sbindir}" diff --git a/dhcpcd/dhcpcd_1.3.22-pl4.oe b/dhcpcd/dhcpcd_1.3.22-pl4.oe index 4ab632b3bb..c0f6778882 100644 --- a/dhcpcd/dhcpcd_1.3.22-pl4.oe +++ b/dhcpcd/dhcpcd_1.3.22-pl4.oe @@ -6,6 +6,6 @@ configures the network interface, and tries to renew the \ lease time according to RFC2131 or RFC1541." SRC_URI = "http://www.phystech.com/ftp/dhcpcd-${PV}.tar.gz \ - file://${FILESDIR}/config_dir.patch;patch=1" + file://config_dir.patch;patch=1" inherit autotools diff --git a/dialog/dialog_0.9b-20031207.oe b/dialog/dialog_0.9b-20031207.oe index 6dc5f16f0a..9fceed91d2 100644 --- a/dialog/dialog_0.9b-20031207.oe +++ b/dialog/dialog_0.9b-20031207.oe @@ -4,7 +4,7 @@ or display messages using dialog boxes from a shell \ script (or any scripting language)." SRC_URI = "ftp://ftp.us.debian.org/debian/pool/main/d/dialog/dialog_${PV}.orig.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" inherit autotools diff --git a/diethotplug/diethotplug_0.4.oe b/diethotplug/diethotplug_0.4.oe index 91f0c8dceb..af74cfa67d 100644 --- a/diethotplug/diethotplug_0.4.oe +++ b/diethotplug/diethotplug_0.4.oe @@ -1,14 +1,17 @@ DEPENDS = "virtual/libc" DESCRIPTION = "A small, C implementation of hotplug." -SRC_URI = "http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/diethotplug-${PV}.tar.gz" +SRC_URI = "http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/diethotplug-${PV}.tar.gz \ + file://modules.usbmap \ + file://modules.pcimap \ + file://modules.ieee1394map" export KLIBC = "" do_compile () { - perl convert_usb.pl ${FILESDIR}/modules.usbmap > usb_modules.h - perl convert_pci.pl ${FILESDIR}/modules.pcimap > pci_modules.h - perl convert_ieee1394.pl ${FILESDIR}/modules.ieee1394map > ieee1394_modules.h + perl convert_usb.pl ${WORKDIR}/modules.usbmap > usb_modules.h + perl convert_pci.pl ${WORKDIR}/modules.pcimap > pci_modules.h + perl convert_ieee1394.pl ${WORKDIR}/modules.ieee1394map > ieee1394_modules.h oe_runmake } diff --git a/dosfstools/dosfstools_2.9.oe b/dosfstools/dosfstools_2.9.oe index 8ef3d32f38..66930639d7 100644 --- a/dosfstools/dosfstools_2.9.oe +++ b/dosfstools/dosfstools_2.9.oe @@ -5,8 +5,8 @@ MAINTAINER = "Greg Gilbert " DEPENDS = "virtual/libc" SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ - file://${FILESDIR}/alignment_hack.patch;patch=1 \ - file://${FILESDIR}/mkdosfs-errno.patch;patch=1" + file://alignment_hack.patch;patch=1 \ + file://mkdosfs-errno.patch;patch=1" do_install () { oe_runmake "PREFIX=${D}" "SBINDIR=${D}/${sbindir}" \ diff --git a/dropbear/dropbear_0.41.oe b/dropbear/dropbear_0.41.oe index 352c8d428f..1314e78d37 100644 --- a/dropbear/dropbear_0.41.oe +++ b/dropbear/dropbear_0.41.oe @@ -4,8 +4,8 @@ DEPENDS = "virtual/libc zlib ncurses" PR = "r2" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/initd.patch;patch=1" + file://configure.patch;patch=1 \ + file://initd.patch;patch=1" S = "${WORKDIR}/dropbear-${PV}" inherit autotools update-rc.d diff --git a/dsniff/dsniff_2.3.oe b/dsniff/dsniff_2.3.oe index c39c9698e9..f59047feb1 100644 --- a/dsniff/dsniff_2.3.oe +++ b/dsniff/dsniff_2.3.oe @@ -3,7 +3,7 @@ DESCRIPTION = "dsniff is a collection of tools for network auditing and penetrat DEPENDS = "virtual/libc db3 libpcap libnet libnids openssl" SRC_URI = "http://www.monkey.org/~dugsong/dsniff/dsniff-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1" + file://configure.patch;patch=1" inherit autotools diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe index 96fb787e2d..865589a69c 100644 --- a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe +++ b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe @@ -6,9 +6,9 @@ DEPENDS = "virtual/libc " FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/compile-subst.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" + file://configure.patch;patch=1 \ + file://compile-subst.patch;patch=1 \ + file://m4.patch;patch=1" inherit autotools diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe index b776c6dc66..e35d044626 100644 --- a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe +++ b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe @@ -6,10 +6,10 @@ DEPENDS = "virtual/libc " FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/compile-subst.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1 \ - file://${FILESDIR}/ldflags.patch;patch=1" + file://configure.patch;patch=1 \ + file://compile-subst.patch;patch=1 \ + file://m4.patch;patch=1 \ + file://ldflags.patch;patch=1" inherit autotools diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.35.oe b/e2fsprogs-libs/e2fsprogs-libs_1.35.oe index 5d741fa7bd..45c335b961 100644 --- a/e2fsprogs-libs/e2fsprogs-libs_1.35.oe +++ b/e2fsprogs-libs/e2fsprogs-libs_1.35.oe @@ -6,10 +6,10 @@ DEPENDS = "virtual/libc" FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/compile-subst.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1 \ - file://${FILESDIR}/ldflags.patch;patch=1" + file://configure.patch;patch=1 \ + file://compile-subst.patch;patch=1 \ + file://m4.patch;patch=1 \ + file://ldflags.patch;patch=1" inherit autotools diff --git a/e2fsprogs/e2fsprogs_1.33.oe b/e2fsprogs/e2fsprogs_1.33.oe index 01fac62cd1..9e373458ed 100644 --- a/e2fsprogs/e2fsprogs_1.33.oe +++ b/e2fsprogs/e2fsprogs_1.33.oe @@ -5,9 +5,9 @@ MAINTAINER = "Greg Gilbert " DEPENDS = "virtual/libc " SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://${FILESDIR}/ln.patch;patch=1 \ - file://${FILESDIR}/configure.patch;patch=1 \ - file://${FILESDIR}/compile-subst.patch;patch=1 \ - file://${FILESDIR}/m4.patch;patch=1" + file://ln.patch;patch=1 \ + file://configure.patch;patch=1 \ + file://compile-subst.patch;patch=1 \ +