diff options
197 files changed, 1789 insertions, 1177 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index e1d0e8854a..249a25a218 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -770,12 +770,12 @@ ${GNU_MIRROR} ftp://ftp.matrix.com.br/pub/gnu ${GNU_MIRROR} ftp://ftp.cs.ubc.ca/mirror2/gnu ${GNU_MIRROR} ftp://sunsite.ust.hk/pub/gnu ${GNU_MIRROR} ftp://ftp.ayamura.org/pub/gnu -ftp://ftp.kernel.org/pub http://www.kernel.org/pub -ftp://ftp.kernel.org/pub ftp://ftp.us.kernel.org/pub -ftp://ftp.kernel.org/pub ftp://ftp.uk.kernel.org/pub -ftp://ftp.kernel.org/pub ftp://ftp.hk.kernel.org/pub -ftp://ftp.kernel.org/pub ftp://ftp.au.kernel.org/pub -ftp://ftp.kernel.org/pub ftp://ftp.jp.kernel.org/pub +${KERNELORG_MIRROR} http://www.kernel.org/pub +${KERNELORG_MIRROR} ftp://ftp.us.kernel.org/pub +${KERNELORG_MIRROR} ftp://ftp.uk.kernel.org/pub +${KERNELORG_MIRROR} ftp://ftp.hk.kernel.org/pub +${KERNELORG_MIRROR} ftp://ftp.au.kernel.org/pub +${KERNELORG_MIRROR} ftp://ftp.jp.kernel.org/pub ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ ftp://ftp.gnupg.org/gcrypt/ ftp://ftp.surfnet.nl/pub/security/gnupg/ ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ diff --git a/classes/package.bbclass b/classes/package.bbclass index c53b3ee708..132fdcb37a 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -576,6 +576,7 @@ python package_do_shlibs() { path = os.path.join(root, file) if os.access(path, os.X_OK) or lib_re.match(file): cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null" + cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', d, 1), cmd) fd = os.popen(cmd) lines = fd.readlines() fd.close() diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b06e2bb3d4..dcdc18c322 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -319,7 +319,7 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" -SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" +SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" @@ -332,6 +332,7 @@ E_URI = "http://enlightenment.freedesktop.org/files" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" APACHE_MIRROR = "http://www.apache.org/dist" +KERNELORG_MIRROR = "http://kernel.org/" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6e15224e5f..630fbc6bbf 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "20" +DISTRO_REVISION = "22" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 6ee509759e..28e3b3eddd 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -7,7 +7,13 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 + FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" + BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION_pn-perl = "-O1" + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index b49bf48d07..12f82773d4 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -19,4 +19,6 @@ ROOT_FLASH_SIZE = "32" EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 33fac1ae6a..5b2c87b55c 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -4,8 +4,9 @@ TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc" +PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index dc41e7c2fd..8fd58bb5ed 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -24,4 +24,6 @@ ROOT_FLASH_SIZE = "32" EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index b2147f2c0d..91663dfd7c 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -8,7 +8,11 @@ TARGET_ARCH = "i486" PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" # todo: convert to task-base -BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" +# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" + +MACHINE_TASK_PROVIDER = "task-base" + +MACHINE_FEATURES = "kernel26 pci usbhost" udevdir = "/dev" OLDEST_KERNEL = "2.6.17" diff --git a/contrib/site-conf/aclocal.m4 b/contrib/site-conf/aclocal.m4 index 8d4b7eed8c..f415403d6d 100644 --- a/contrib/site-conf/aclocal.m4 +++ b/contrib/site-conf/aclocal.m4 @@ -1,2 +1,15 @@ -dnl # local file.. -m4_include(builtin.m4) +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_include([m4/builtin.m4]) +m4_include([m4/gnu.m4]) diff --git a/contrib/site-conf/configure.ac b/contrib/site-conf/configure.ac index 0f08732a08..283008a4a7 100644 --- a/contrib/site-conf/configure.ac +++ b/contrib/site-conf/configure.ac @@ -6,6 +6,6 @@ AC_PREREQ([2.60]) AC_GNU_SOURCE OE_CHECK_BUILTIN - +OE_CHECK_GNU AC_OUTPUT([]) diff --git a/contrib/site-conf/m4/gnu.m4 b/contrib/site-conf/m4/gnu.m4 new file mode 100644 index 0000000000..1f9331e2ef --- /dev/null +++ b/contrib/site-conf/m4/gnu.m4 @@ -0,0 +1,35 @@ +# Collection of binutils, gcc, glibc + + +AC_DEFUN([BINUTILS_CHECK_UINT64], +[AC_TRY_COMPILE( +[#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif], +[extern uint64_t foo;], +liberty_cv_uint64=uint64_t, +[AC_TRY_COMPILE( +[#ifdef HAVE_LIMITS_H +#include <limits.h> +#endif +#ifndef CHAR_BIT +#define CHAR_BIT 8 +#endif], +[extern char foo[sizeof(long) * CHAR_BIT >= 64 ? 1 : -1];], +liberty_cv_uint64="unsigned long", +[AC_TRY_COMPILE( +[#ifdef HAVE_LIMITS_H +#include <limits.h> +#endif +#ifndef CHAR_BIT +#define CHAR_BIT 8 +#endif], +[extern char foo[sizeof(long long) * CHAR_BIT >= 64 ? 1 : -1];], +liberty_cv_uint64="unsigned long long", liberty_cv_uint64=none)])])]) + +AC_DEFUN([OE_CHECK_GNU], +[ +AC_CHECK_SIZEOF([int]) +AC_CHECK_TYPE(uintptr_t, unsigned long) +BINUTILS_CHECK_UINT64 +]) diff --git a/packages/autofs/autofs_3.1.7.bb b/packages/autofs/autofs_3.1.7.bb index e09971b59f..05481ed46c 100644 --- a/packages/autofs/autofs_3.1.7.bb +++ b/packages/autofs/autofs_3.1.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Kernel based automounter for linux." SECTION = "base" LICENSE = "GPL" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" inherit autotools diff --git a/packages/autofs/autofs_4.0.0.bb b/packages/autofs/autofs_4.0.0.bb index 225841172a..6033b8a09a 100644 --- a/packages/autofs/autofs_4.0.0.bb +++ b/packages/autofs/autofs_4.0.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Kernel based automounter for linux." SECTION = "base" LICENSE = "GPL" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2" inherit autotools diff --git a/packages/autofs/autofs_4.1.4.bb b/packages/autofs/autofs_4.1.4.bb index 35a1652557..128c24e296 100644 --- a/packages/autofs/autofs_4.1.4.bb +++ b/packages/autofs/autofs_4.1.4.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Kernel based automounter for linux." SECTION = "base" LICENSE = "GPL" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ - ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ - ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \ - ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1 \ file://cross.patch;patch=1 \ file://Makefile.rules-cross.patch;patch=1 \ file://install.patch;patch=1" diff --git a/packages/binutils/binutils_2.14.90.0.6.bb b/packages/binutils/binutils_2.14.90.0.6.bb index 4a6078994e..e20a40cf5c 100644 --- a/packages/binutils/binutils_2.14.90.0.6.bb +++ b/packages/binutils/binutils_2.14.90.0.6.bb @@ -38,7 +38,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://ld_makefile.patch;patch=1 \ file://better_file_error.patch;patch=1 \ file://signed_char_fix.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.14.90.0.7.bb b/packages/binutils/binutils_2.14.90.0.7.bb index efad9f531a..caae896a1f 100644 --- a/packages/binutils/binutils_2.14.90.0.7.bb +++ b/packages/binutils/binutils_2.14.90.0.7.bb @@ -37,7 +37,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://ld_makefile.patch;patch=1 \ file://better_file_error.patch;patch=1 \ file://signed_char_fix.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb index 9aa1b050d3..a8802c09e9 100644 --- a/packages/binutils/binutils_2.15.94.0.1.bb +++ b/packages/binutils/binutils_2.15.94.0.1.bb @@ -37,7 +37,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://ld_makefile.patch;patch=1 \ file://better_file_error.patch;patch=1 \ file://signed_char_fix.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.16.91.0.6.bb b/packages/binutils/binutils_2.16.91.0.6.bb index 680730d5eb..8e63fe78dc 100644 --- a/packages/binutils/binutils_2.16.91.0.6.bb +++ b/packages/binutils/binutils_2.16.91.0.6.bb @@ -42,7 +42,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.16.91.0.7.bb b/packages/binutils/binutils_2.16.91.0.7.bb index 664fce8cb7..ad81300957 100644 --- a/packages/binutils/binutils_2.16.91.0.7.bb +++ b/packages/binutils/binutils_2.16.91.0.7.bb @@ -37,7 +37,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.17.50.0.1.bb b/packages/binutils/binutils_2.17.50.0.1.bb index 664fce8cb7..ad81300957 100644 --- a/packages/binutils/binutils_2.17.50.0.1.bb +++ b/packages/binutils/binutils_2.17.50.0.1.bb @@ -37,7 +37,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb index 09e4a36b81..4e566fb756 100644 --- a/packages/binutils/binutils_2.17.50.0.5.bb +++ b/packages/binutils/binutils_2.17.50.0.5.bb @@ -36,7 +36,7 @@ FILES_${PN}-symlinks = " \ ${bindir}/strip" SRC_URI = \ - "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ file://110-arm-eabi-conf.patch;patch=1 \ diff --git a/packages/bitbake/bitbake_1.6.0.bb b/packages/bitbake/bitbake_1.6.2.bb index 4289c49a04..f0fdfb9e76 100644 --- a/packages/bitbake/bitbake_1.6.0.bb +++ b/packages/bitbake/bitbake_1.6.2.bb @@ -1,6 +1,6 @@ require bitbake.inc -PR = "r1" +PR = "r0" # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" diff --git a/packages/diethotplug/diethotplug_0.4.bb b/packages/diethotplug/diethotplug_0.4.bb index 86f8a6fb8a..150b442962 100644 --- a/packages/diethotplug/diethotplug_0.4.bb +++ b/packages/diethotplug/diethotplug_0.4.bb @@ -2,7 +2,7 @@ SECTION = "base" LICENSE = "GPL" DESCRIPTION = "A small, C implementation of hotplug." -SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/diethotplug-${PV}.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/diethotplug-${PV}.tar.gz \ file://modules.usbmap \ file://modules.pcimap \ file://modules.ieee1394map" diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.25.bb index 0f965af118..f440e117ff 100644 --- a/packages/directfb/++dfb_0.9.23.bb +++ b/packages/directfb/++dfb_0.9.25.bb @@ -6,9 +6,14 @@ LICENSE = "LGPL" SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz" S = "${WORKDIR}/++DFB-${PV}" +RV = "0.9-25" inherit autotools pkgconfig +do_configure_append() { + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + do_stage() { autotools_stage_all } @@ -16,3 +21,4 @@ do_stage() { do_install() { oe_runmake 'DESTDIR=${D}' install } +FILES_++dfb_append = " ${libdir}/*.so*" diff --git a/packages/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.25.bb index 423e888fd8..28de29c4a6 100644 --- a/packages/directfb/directfb-examples_0.9.23.bb +++ b/packages/directfb/directfb-examples_0.9.25.bb @@ -8,3 +8,8 @@ S = "${WORKDIR}/DirectFB-examples-${PV}" inherit autotools +do_configure_append() { +# find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.99+1.0.0rc2.bb index 09fddd4c7c..0298f2a247 100644 --- a/packages/directfb/directfb_0.9.25.1.bb +++ b/packages/directfb/directfb_0.9.99+1.0.0rc2.bb @@ -6,13 +6,18 @@ Linux framebuffer device." SECTION = "libs" LICENSE = "LGPL" HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib" +DEPENDS = "jpeg libpng freetype zlib tslib" PR = "r1" -RV = "0.9.25" +RV = "1.0-0" -SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ - file://fix-pkgconfig-specs.patch;patch=1" -S = "${WORKDIR}/DirectFB-${PV}" +SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.0.0-rc2.tar.gz \ + file://fix-pkgconfig-specs.patch;patch=1 \ + file://mkdfiff.patch;patch=1 \ + file://tslib_support.patch;patch=1" + +S = "${WORKDIR}/DirectFB-1.0.0-rc2" + +LDFLAGS_append =" -lts -lm" inherit autotools pkgconfig diff --git a/packages/directfb/files/mkdfiff.patch b/packages/directfb/files/mkdfiff.patch new file mode 100644 index 0000000000..cb56fd3602 --- /dev/null +++ b/packages/directfb/files/mkdfiff.patch @@ -0,0 +1,11 @@ +--- DirectFB-1.0.0-rc1~org/tools/mkdfiff.c 2006-10-12 13:45:50.000000000 -0400 ++++ DirectFB-1.0.0-rc1/tools/mkdfiff.c 2006-10-12 13:57:38.000000000 -0400 +@@ -15,6 +15,8 @@ + + #include <dfiff.h> + ++#include <unistd.h> ++ + static DirectFBPixelFormatNames( format_names ); + + static const char *filename; diff --git a/packages/directfb/files/tslib_support.patch b/packages/directfb/files/tslib_support.patch new file mode 100644 index 0000000000..f444cb9574 --- /dev/null +++ b/packages/directfb/files/tslib_support.patch @@ -0,0 +1,818 @@ +diff -u'rNF^function' DirectFB-1.0.0-rc1~org/configure.in DirectFB-1.0.0-rc1/configure.in +--- DirectFB-1.0.0-rc1~org/configure.in 2006-09-30 17:08:56.000000000 -0400 ++++ DirectFB-1.0.0-rc1/configure.in 2006-10-16 08:15:32.000000000 -0400 +@@ -998,6 +998,7 @@ + checkfor_serialmouse=no + checkfor_sonypijogdial=no + checkfor_ucb1x00=no ++checkfor_tslib=no + checkfor_wm97xx=no + + AC_MSG_CHECKING(which inputdrivers should be built) +@@ -1027,6 +1028,7 @@ + checkfor_serialmouse=yes + checkfor_sonypijogdial=yes + checkfor_ucb1x00="$have_arm" ++ checkfor_tslib=yes + checkfor_wm97xx=yes + AC_MSG_RESULT(all) + else +@@ -1083,6 +1085,9 @@ + ucb1x00) + checkfor_ucb1x00=yes + ;; ++ tslib) ++ checkfor_tslib=yes ++ ;; + wm97xx) + checkfor_wm97xx=yes + ;; +@@ -1196,6 +1201,12 @@ + enable_ucb1x00_ts=yes + fi + ++enable_tslib=no ++if test "$checkfor_tslib" = "yes"; then ++ dnl Test for TSLIB Touchscreen support ++ enable_tslib=yes ++fi ++ + enable_wm97xx_ts=no + if test "$checkfor_wm97xx" = "yes"; then + dnl Test for WM97xx Touchscreen support +@@ -1266,6 +1277,7 @@ + AM_CONDITIONAL(WM97XX_TS, test "$enable_wm97xx_ts" = "yes") + + AM_CONDITIONAL(UCB1X00_TS, test "$enable_ucb1x00_ts" = "yes") ++AM_CONDITIONAL(TSLIB, test "$enable_tslib" = "yes") + + AM_CONDITIONAL(BUILD_TESTS, test "$with_tests" = "yes") + AM_CONDITIONAL(BUILD_TOOLS, test "$with_tools" = "yes") +@@ -1426,6 +1438,7 @@ + inputdrivers/serialmouse/Makefile + inputdrivers/sonypi/Makefile + inputdrivers/ucb1x00_ts/Makefile ++inputdrivers/tslib/Makefile + inputdrivers/wm97xx_ts/Makefile + + interfaces/Makefile +@@ -1536,6 +1549,7 @@ + Serial Mouse $enable_serial_mouse + SonyPI Jogdial $enable_sonypi_jogdial + ucb1x00 Touchscreen $enable_ucb1x00_ts ++ tslib Touchscreen $enable_tslib + WM97xx Touchscreen $enable_wm97xx_ts]); + fi + +diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/Makefile.am DirectFB-1.0.0-rc1/inputdrivers/Makefile.am +--- DirectFB-1.0.0-rc1~org/inputdrivers/Makefile.am 2006-09-30 17:06:58.000000000 -0400 ++++ DirectFB-1.0.0-rc1/inputdrivers/Makefile.am 2006-10-16 08:06:27.000000000 -0400 +@@ -44,6 +44,10 @@ + UCB1X00_TS_DIR = ucb1x00_ts + endif + ++if TSLIB ++TSLIB_DIR = tslib ++endif ++ + if SONYPI + SONYPI_DIR = sonypi + endif +@@ -80,6 +84,7 @@ + $(SERIALMOUSE_INPUT_DIR) \ + $(H3600_TS_DIR) \ + $(UCB1X00_TS_DIR) \ ++ $(TSLIB_DIR) \ + $(MUTOUCH_TS_DIR) \ + $(PENMOUNT_TS_DIR) \ + $(SONYPI_DIR) \ +diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.am DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.am +--- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.am 1969-12-31 19:00:00.000000000 -0500 ++++ DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.am 2006-10-13 07:44:02.000000000 -0400 +@@ -0,0 +1,31 @@ ++## Makefile.am for DirectFB/inputdrivers/tslib ++ ++INCLUDES = \ ++ -I$(top_srcdir)/include \ ++ -I$(top_builddir)/lib \ ++ -I$(top_srcdir)/lib \ ++ -I$(top_srcdir)/src ++ ++input_LTLIBRARIES = libdirectfb_tslib.la ++ ++if BUILD_STATIC ++input_DATA = $(input_LTLIBRARIES:.la=.o) ++endif ++ ++inputdir = $(MODULEDIR)/inputdrivers ++ ++libdirectfb_tslib_la_SOURCES = \ ++ tslib.c ++ ++libdirectfb_tslib_la_LDFLAGS = \ ++ -export-dynamic \ ++ -avoid-version \ ++ $(DFB_LDFLAGS) ++ ++libdirectfb_tslib_la_LIBADD = \ ++ $(top_builddir)/lib/direct/libdirect.la \ ++ $(top_builddir)/src/libdirectfb.la ++ ++ ++include $(top_srcdir)/rules/libobject.make ++ +diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.in DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.in +--- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/Makefile.in 1969-12-31 19:00:00.000000000 -0500 ++++ DirectFB-1.0.0-rc1/inputdrivers/tslib/Makefile.in 2006-10-13 07:44:02.000000000 -0400 +@@ -0,0 +1,429 @@ ++# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ++ ++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++ ++ ++SHELL = @SHELL@ ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++ ++bindir = @bindir@ ++sbindir = @sbindir@ ++libexecdir = @libexecdir@ ++datadir = @datadir@ ++sysconfdir = @sysconfdir@ ++sharedstatedir = @sharedstatedir@ ++localstatedir = @localstatedir@ ++libdir = @libdir@ ++infodir = @infodir@ ++mandir = @mandir@ ++includedir = @includedir@ ++oldincludedir = /usr/include ++ ++DESTDIR = ++ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++ ++top_builddir = ../.. ++ ++ACLOCAL = @ACLOCAL@ ++AUTOCONF = @AUTOCONF@ ++AUTOMAKE = @AUTOMAKE@ ++AUTOHEADER = @AUTOHEADER@ ++ ++INSTALL = @INSTALL@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++transform = @program_transform_name@ ++ ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++host_alias = @host_alias@ ++host_triplet = @host@ ++AR = @AR@ ++AS = @AS@ ++ASFLAGS = @ASFLAGS@ ++CC = @CC@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++DATADIR = @DATADIR@ ++DFB_CFLAGS_OMIT_FRAME_POINTER = @DFB_CFLAGS_OMIT_FRAME_POINTER@ ++DFB_INTERNAL_CFLAGS = @DFB_INTERNAL_CFLAGS@ ++DFB_LDFLAGS = @DFB_LDFLAGS@ ++DIRECTFB_BINARY_AGE = @DIRECTFB_BINARY_AGE@ ++DIRECTFB_CSOURCE = @DIRECTFB_CSOURCE@ ++DIRECTFB_INTERFACE_AGE = @DIRECTFB_INTERFACE_AGE@ ++DIRECTFB_MAJOR_VERSION = @DIRECTFB_MAJOR_VERSION@ ++DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@ ++DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@ ++DIRECTFB_VERSION = @DIRECTFB_VERSION@ ++DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@ ++DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@ ++DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@ ++DIRECT_BUILD_NETWORK = @DIRECT_BUILD_NETWORK@ ++DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@ ++DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@ ++DLLTOOL = @DLLTOOL@ ++DYNLIB = @DYNLIB@ ++ECHO = @ECHO@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ ++FREETYPE_CONFIG = @FREETYPE_CONFIG@ ++FREETYPE_LIBS = @FREETYPE_LIBS@ ++FREETYPE_PROVIDER = @FREETYPE_PROVIDER@ ++FUSION_BUILD_MULTI = @FUSION_BUILD_MULTI@ ++GCJ = @GCJ@ ++GCJFLAGS = @GCJFLAGS@ ++GIF_PROVIDER = @GIF_PROVIDER@ ++HAVE_LIB = @HAVE_LIB@ ++HAVE_LINUX = @HAVE_LINUX@ ++INCLUDEDIR = @INCLUDEDIR@ ++INTERNALINCLUDEDIR = @INTERNALINCLUDEDIR@ ++JPEG_PROVIDER = @JPEG_PROVIDER@ ++LIB = @LIB@ ++LIBJPEG = @LIBJPEG@ ++LIBPNG = @LIBPNG@ ++LIBTOOL = @LIBTOOL@ ++LN_S = @LN_S@ ++LTLIB = @LTLIB@ ++LT_AGE = @LT_AGE@ ++LT_CURRENT = @LT_CURRENT@ ++LT_RELEASE = @LT_RELEASE@ ++LT_REVISION = @LT_REVISION@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MAN2HTML = @MAN2HTML@ ++MODULEDIR = @MODULEDIR@ ++MODULEDIRNAME = @MODULEDIRNAME@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++OSX_LIBS = @OSX_LIBS@ ++PACKAGE = @PACKAGE@ ++PERL = @PERL@ ++PNG_PROVIDER = @PNG_PROVIDER@ ++RANLIB = @RANLIB@ ++RC = @RC@ ++RUNTIME_SYSROOT = @RUNTIME_SYSROOT@ ++SDL_CFLAGS = @SDL_CFLAGS@ ++SDL_CONFIG = @SDL_CONFIG@ ++SDL_LIBS = @SDL_LIBS@ ++SOPATH = @SOPATH@ ++STRIP = @STRIP@ ++SYSFS_LIBS = @SYSFS_LIBS@ ++THREADFLAGS = @THREADFLAGS@ ++THREADLIB = @THREADLIB@ ++VERSION = @VERSION@ ++VNC_CFLAGS = @VNC_CFLAGS@ ++VNC_CONFIG = @VNC_CONFIG@ ++VNC_LIBS = @VNC_LIBS@ ++X11_CFLAGS = @X11_CFLAGS@ ++X11_LIBS = @X11_LIBS@ ++ZLIB_LIBS = @ZLIB_LIBS@ ++ ++INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/src ++ ++ ++input_LTLIBRARIES = libdirectfb_tslib.la ++ ++@BUILD_STATIC_TRUE@input_DATA = $(input_LTLIBRARIES:.la=.o) ++ ++inputdir = $(MODULEDIR)/inputdrivers ++ ++libdirectfb_tslib_la_SOURCES = tslib.c ++ ++ ++libdirectfb_tslib_la_LDFLAGS = -export-dynamic -avoid-version $(DFB_LDFLAGS) ++ ++ ++libdirectfb_tslib_la_LIBADD = $(top_builddir)/lib/direct/libdirect.la $(top_builddir)/src/libdirectfb.la ++ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = ../../config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(input_LTLIBRARIES) ++ ++ ++DEFS = @DEFS@ -I. -I$(srcdir) -I../.. ++CPPFLAGS = @CPPFLAGS@ ++LDFLAGS = @LDFLAGS@ ++LIBS = @LIBS@ ++libdirectfb_tslib_la_DEPENDENCIES = \ ++$(top_builddir)/lib/direct/libdirect.la \ ++$(top_builddir)/src/libdirectfb.la ++libdirectfb_tslib_la_OBJECTS = tslib.lo ++CFLAGS = @CFLAGS@ ++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ++DATA = $(input_DATA) ++ ++DIST_COMMON = Makefile.am Makefile.in ++ ++ ++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ++ ++TAR = tar ++GZIP_ENV = --best ++SOURCES = $(libdirectfb_tslib_la_SOURCES) ++OBJECTS = $(libdirectfb_tslib_la_OBJECTS) ++ ++all: all-redirect ++.SUFFIXES: ++.SUFFIXES: .S .c .lo .o .obj .s ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/rules/libobject.make ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps inputdrivers/tslib/Makefile ++ ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ++ ++ ++mostlyclean-inputLTLIBRARIES: ++ ++clean-inputLTLIBRARIES: ++ -test -z "$(input_LTLIBRARIES)" || rm -f $(input_LTLIBRARIES) ++ ++distclean-inputLTLIBRARIES: ++ ++maintainer-clean-inputLTLIBRARIES: ++ ++install-inputLTLIBRARIES: $(input_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(inputdir) ++ @list='$(input_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(inputdir)/$$p"; \ ++ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(inputdir)/$$p; \ ++ else :; fi; \ ++ done ++ ++uninstall-inputLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ list='$(input_LTLIBRARIES)'; for p in $$list; do \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(inputdir)/$$p; \ ++ done ++ ++.c.o: ++ $(COMPILE) -c $< ++ ++# FIXME: We should only use cygpath when building on Windows, ++# and only if it is available. ++.c.obj: ++ $(COMPILE) -c `cygpath -w $<` ++ ++.s.o: ++ $(COMPILE) -c $< ++ ++.S.o: ++ $(COMPILE) -c $< ++ ++mostlyclean-compile: ++ -rm -f *.o core *.core ++ -rm -f *.$(OBJEXT) ++ ++clean-compile: ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++maintainer-clean-compile: ++ ++.c.lo: ++ $(LIBTOOL) --mode=compile $(COMPILE) -c $< ++ ++.s.lo: ++ $(LIBTOOL) --mode=compile $(COMPILE) -c $< ++ ++.S.lo: ++ $(LIBTOOL) --mode=compile $(COMPILE) -c $< ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ ++maintainer-clean-libtool: ++ ++libdirectfb_tslib.la: $(libdirectfb_tslib_la_OBJECTS) $(libdirectfb_tslib_la_DEPENDENCIES) ++ $(LINK) -rpath $(inputdir) $(libdirectfb_tslib_la_LDFLAGS) $(libdirectfb_tslib_la_OBJECTS) $(libdirectfb_tslib_la_LIBADD) $(LIBS) ++ ++install-inputDATA: $(input_DATA) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(inputdir) ++ @list='$(input_DATA)'; for p in $$list; do \ ++ if test -f $(srcdir)/$$p; then \ ++ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(inputdir)/$$p"; \ ++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(inputdir)/$$p; \ ++ else if test -f $$p; then \ ++ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(inputdir)/$$p"; \ ++ $(INSTALL_DATA) $$p $(DESTDIR)$(inputdir)/$$p; \ ++ fi; fi; \ ++ done ++ ++uninstall-inputDATA: ++ @$(NORMAL_UNINSTALL) ++ list='$(input_DATA)'; for p in $$list; do \ ++ rm -f $(DESTDIR)$(inputdir)/$$p; \ ++ done ++ ++tags: TAGS ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ here=`pwd` && cd $(srcdir) \ ++ && mkid -f$$here/ID $$unique $(LISP) ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS)'; \ ++ unique=`for i in $$list; do echo $$i; done | \ ++ awk ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ++ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) ++ ++mostlyclean-tags: ++ ++clean-tags: ++ ++distclean-tags: ++ -rm -f TAGS ID ++ ++maintainer-clean-tags: ++ ++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ++ ++subdir = inputdrivers/tslib ++ ++distdir: $(DISTFILES) ++ @for file in $(DISTFILES); do \ ++ d=$(srcdir); \ ++ if test -d $$d/$$file; then \ ++ cp -pr $$d/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++ || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ fi; \ ++ done ++ ++info-am: ++info: info-am ++dvi-am: ++dvi: dvi-am ++check-am: all-am ++check: check-am ++installcheck-am: ++installcheck: installcheck-am ++install-exec-am: ++install-exec: install-exec-am ++ ++install-data-am: install-inputLTLIBRARIES install-inputDATA ++install-data: install-data-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install: install-am ++uninstall-am: uninstall-inputLTLIBRARIES uninstall-inputDATA ++uninstall: uninstall-am ++all-am: Makefile $(LTLIBRARIES) $(DATA) ++all-redirect: all-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++installdirs: ++ $(mkinstalldirs) $(DESTDIR)$(inputdir) $(DESTDIR)$(inputdir) ++ ++ ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) ++ -rm -f config.cache config.log stamp-h stamp-h[0-9]* ++ ++maintainer-clean-generic: ++mostlyclean-am: mostlyclean-inputLTLIBRARIES mostlyclean-compile \ ++ mostlyclean-libtool mostlyclean-tags \ ++ mostlyclean-generic ++ ++mostlyclean: mostlyclean-am ++ ++clean-am: clean-inputLTLIBRARIES clean-compile clean-libtool clean-tags \ ++ clean-generic mostlyclean-am ++ ++clean: clean-am ++ ++distclean-am: distclean-inputLTLIBRARIES distclean-compile \ ++ distclean-libtool distclean-tags distclean-generic \ ++ clean-am ++ -rm -f libtool ++ ++distclean: distclean-am ++ ++maintainer-clean-am: maintainer-clean-inputLTLIBRARIES \ ++ maintainer-clean-compile maintainer-clean-libtool \ ++ maintainer-clean-tags maintainer-clean-generic \ ++ distclean-am ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ ++maintainer-clean: maintainer-clean-am ++ ++.PHONY: mostlyclean-inputLTLIBRARIES distclean-inputLTLIBRARIES \ ++clean-inputLTLIBRARIES maintainer-clean-inputLTLIBRARIES \ ++uninstall-inputLTLIBRARIES install-inputLTLIBRARIES mostlyclean-compile \ ++distclean-compile clean-compile maintainer-clean-compile \ ++mostlyclean-libtool distclean-libtool clean-libtool \ ++maintainer-clean-libtool uninstall-inputDATA install-inputDATA tags \ ++mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ ++distdir info-am info dvi-am dvi check check-am installcheck-am \ ++installcheck install-exec-am install-exec install-data-am install-data \ ++install-am install uninstall-am uninstall all-redirect all-am all \ ++installdirs mostlyclean-generic distclean-generic clean-generic \ ++maintainer-clean-generic clean mostlyclean distclean maintainer-clean ++ ++ ++%.o: .libs/%.a %.la ++ rm -f $<.tmp/*.o ++ if test -d $<.tmp; then rmdir $<.tmp; fi ++ mkdir $<.tmp ++ (cd $<.tmp && $(AR) x ../../$<) ++ $(LD) -o $@ -r $<.tmp/*.o ++ rm -f $<.tmp/*.o && rmdir $<.tmp ++ ++.PHONY: $(LTLIBRARIES:%.la=.libs/%.a) ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -u'rNF^function' DirectFB-1.0.0-rc1~org/inputdrivers/tslib/tslib.c DirectFB-1.0.0-rc1/inputdrivers/tslib/tslib.c +--- DirectFB-1.0.0-rc1~org/inputdrivers/tslib/tslib.c 1969-12-31 19:00:00.000000000 -0500 ++++ DirectFB-1.0.0-rc1/inputdrivers/tslib/tslib.c 2006-10-30 15:30:35.000000000 -0500 +@@ -0,0 +1,258 @@ ++/* ++ (c) Copyright 2000-2002 convergence integrated media GmbH. ++ (c) Copyright 2002-2004 convergence GmbH. ++ ++ All rights reserved. ++ ++ Written by Shane Volpe <shanevolpe@gmail.com ++ ++ Based on usb1x00_ts writen by: ++ Denis Oliver Kropp <dok@directfb.org>, ++ Andreas Hundt <andi@fischlustig.de>, ++ Sven Neumann <neo@directfb.org> and ++ Ville Syrj��<syrjala@sci.fi>. ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the ++ Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. ++*/ ++ ++#include <config.h> ++ ++#include <stdlib.h> ++#include <stdio.h> ++ ++#include <tslib.h> ++ ++#include <directfb.h> ++ ++#include <core/coredefs.h> ++#include <core/coretypes.h> ++ ++#include <core/input.h> ++ ++#include <direct/mem.h> ++#include <direct/messages.h> ++#include <direct/thread.h> ++ ++#include <core/input_driver.h> ++ ++ ++const char* ts_dev = "/dev/ts0"; ++#define TS_BLOCK 0 ++ ++DFB_INPUT_DRIVER( tslib ) ++ ++typedef struct { ++ CoreInputDevice *device; ++ DirectThread *thread; ++ struct tsdev *ts; ++} tslibData; ++ ++ ++static void * ++tslibEventThread( DirectThread *thread, void *driver_data ) ++{ ++ tslibData *data = (tslibData*) driver_data; ++ ++ struct ts_sample ts_event; ++ ++ int readlen; ++ ++ unsigned short old_x = -1; ++ unsigned short old_y = -1; ++ unsigned short old_pressure = 0; ++ ++ while ((readlen = ts_read(data->ts, &ts_event, 1)) >= 0) ++ { ++ DFBInputEvent evt; ++ ++ direct_thread_testcancel( thread ); ++ ++ if (readlen < 1) ++ continue; ++ ++ if (ts_event.pressure) { ++ ++ ++ if (ts_event.x != old_x) { ++ ++ evt.type = DIET_AXISMOTION; ++ evt.flags = DIEF_AXISABS; ++ evt.axis = DIAI_X; ++ evt.axisabs = ts_event.x; ++ ++ dfb_input_dispatch( data->device, &evt ); ++ ++ old_x = ts_event.x; ++ } ++ ++ if (ts_event.y != old_y) { ++ evt.type = DIET_AXISMOTION; ++ evt.flags = DIEF_AXISABS; ++ evt.axis = DIAI_Y; ++ evt.axisabs = ts_event.y; ++ ++ dfb_input_dispatch( data->device, &evt ); ++ ++ old_y = ts_event.y; ++ } ++ } ++ ++ if (!ts_event.pressure != !old_pressure) { ++ evt.type = (ts_event.pressure ? ++ DIET_BUTTONPRESS : DIET_BUTTONRELEASE); ++ evt.flags = DIEF_NONE; ++ evt.button = DIBI_LEFT; ++ ++ dfb_input_dispatch( data->device, &evt ); ++ ++ old_pressure = ts_event.pressure; ++ } ++ } ++ ++ if (readlen <= 0) ++ D_ERROR ("tslib Touchscreen thread died\n"); ++ ++ return NULL; ++} ++ ++ ++/* exported symbols */ ++ ++static int ++driver_get_available() ++{ ++ struct tsdev *tschk; ++ ++// printf("tslib available check occured! \n"); ++ ++ tschk = ts_open(ts_dev, TS_BLOCK); ++ if (!tschk) { ++ D_ERROR( "DirectFB/tslib: Error opening `%s'!\n", ts_dev); ++ return 0; ++ } ++ ++ if (ts_config(tschk)) { ++ D_ERROR( "DirectFB/tslib: Error configuring `%s'!\n", ts_dev); ++ ts_close( tschk ); ++ return 0; ++ } ++ ++ ts_close( tschk ); ++ D_INFO( "DirectFB/tslib: Found `%s'\n", ts_dev); ++ ++ return 1; ++} ++ ++static void ++driver_get_info( InputDriverInfo *info ) ++{ ++ /* fill driver info structure */ ++// printf("tslib getinfo occured! \n"); ++ ++ snprintf( info->name, ++ DFB_INPUT_DRIVER_INFO_NAME_LENGTH, "tslib Touchscreen Driver" ); ++ ++ snprintf( info->vendor, ++ DFB_INPUT_DRIVER_INFO_VENDOR_LENGTH, ++ "tslib" ); ++ ++ info->version.major = 0; ++ info->version.minor = 1; ++} ++ ++static DFBResult ++driver_open_device( CoreInputDevice *device, ++ unsigned int number, ++ InputDeviceInfo *info, ++ void **driver_data ) ++{ ++ tslibData *data; ++ struct tsdev *ts; ++ ++ /* open device */ ++// printf("tslib open occured! \n"); ++ ++ ts = ts_open(ts_dev, TS_BLOCK); ++ if (!ts) { ++ D_ERROR( "DirectFB/tslib: Error opening `%s'!\n", ts_dev); ++ return DFB_INIT; ++ } ++ ++ if (ts_config(ts)) { ++ D_ERROR( "DirectFB/tslib: Error configuring `%s'!\n", ts_dev); ++ ts_close( ts ); ++ return DFB_INIT; ++ } ++ ++ /* fill device info structure */ ++ snprintf( info->desc.name, ++ DFB_INPUT_DEVICE_DESC_NAME_LENGTH, "tslib Touchscreen" ); ++ ++ snprintf( info->desc.vendor, ++ DFB_INPUT_DEVICE_DESC_VENDOR_LENGTH, "Unknown" ); ++ ++ info->prefered_id = DIDID_MOUSE; ++ ++ info->desc.type = DIDTF_MOUSE; ++ info->desc.caps = DICAPS_AXES | DICAPS_BUTTONS; ++ info->desc.max_axis = DIAI_Y; ++ info->desc.max_button = DIBI_LEFT; ++ ++ /* allocate and fill private data */ ++ data = D_CALLOC( 1, sizeof(tslibData) ); ++ ++ data->ts = ts; ++ data->device = device; ++ ++ /* start input thread */ ++ data->thread = direct_thread_create( DTT_INPUT, tslibEventThread, data, "tslib Input" ); ++ ++ /* set private data pointer */ ++ *driver_data = data; ++ D_INFO("tslib open return \n"); ++ ++ return DFB_OK; ++} ++ ++/* ++ * Fetch one entry from the device's keymap if supported. ++ */ ++static DFBResult ++driver_get_keymap_entry( CoreInputDevice *device, ++ void *driver_data, ++ DFBInputDeviceKeymapEntry *entry ) ++{ ++ return DFB_UNSUPPORTED; ++} ++ ++static void ++driver_close_device( void *driver_data ) ++{ ++ tslibData *data = (tslibData*) driver_data; ++// printf("tslib close occured! \n"); ++ ++ /* stop input thread */ ++ direct_thread_cancel( data->thread ); ++ direct_thread_join( data->thread ); ++ direct_thread_destroy( data->thread ); ++ ++ /* close device */ ++ if (ts_close(data->ts)) ++ D_ERROR( "DirectFB/tslib: Error closing `%s'!\n", ts_dev); ++ ++ /* free private data */ ++ D_FREE( data ); ++} diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb index 2590fed88e..098939324a 100644 --- a/packages/fontconfig/fontconfig_2.4.1.bb +++ b/packages/fontconfig/fontconfig_2.4.1.bb @@ -44,11 +44,29 @@ do_stage () { for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done } +BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2" + do_configure_append () { sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile + + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile + + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile + + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile + } do_install () { diff --git a/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff b/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff new file mode 100644 index 0000000000..1046efb2a1 --- /dev/null +++ b/packages/glibc/glibc-2.4/powerpc-sqrt-hack.diff @@ -0,0 +1,25 @@ +diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c +--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200 ++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100 +@@ -25,6 +25,9 @@ + #include <sysdep.h> + #include <ldsodefs.h> + ++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) ++ ++ + static const double almost_half = 0.5000000000000001; /* 0.5 + 2^-53 */ + static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 }; + static const ieee_float_shape_type a_inf = {.word = 0x7f800000 }; +diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c +--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-04-14 07:44:30.000000000 +0200 ++++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c 2006-12-08 12:53:36.992227000 +0100 +@@ -25,6 +25,8 @@ + #include <sysdep.h> + #include <ldsodefs.h> + ++#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0) ++ + static const float almost_half = 0.50000006; /* 0.5 + 2^-24 */ + static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 }; + static const ieee_float_shape_type a_inf = {.word = 0x7f800000 }; diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index 07be0fa181..815038f0a6 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -72,6 +72,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" +SRC_URI_append_powerpc = " file://powerpc-sqrt-hack.diff;patch=1" + S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" diff --git a/packages/gnutls/gnutls-1.0.23/export-symbols.patch b/packages/gnutls/gnutls-1.0.23/export-symbols.patch deleted file mode 100644 index 22a1373944..0000000000 --- a/packages/gnutls/gnutls-1.0.23/export-symbols.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-1.0.23/lib/Makefile.am.orig 2005-06-04 13:46:26.000000000 +0200 -+++ gnutls-1.0.23/lib/Makefile.am 2005-06-04 13:48:38.000000000 +0200 -@@ -9,7 +9,7 @@ - pkgconfig_DATA = gnutls.pc - DISTCLEANFILES = $(pkgconfig_DATA) - --LIBGNUTLS_EXPORTS = -export-symbols-regex '^(_gnutls|gnutls|_E_).*' -+LIBGNUTLS_EXPORTS = -export-symbols-regex '^(asn1_|_gnutls|gnutls|_E_).*' - - DIST_SUBDIRS = minitasn1 x509 - if ENABLE_MINITASN1 diff --git a/packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch b/packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch deleted file mode 100644 index 3ddd8b3a18..0000000000 --- a/packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- clean/gnutls-1.0.23/libextra/gnutls_openssl.c 2004-08-04 22:36:03.000000000 +0100 -+++ gnutls-1.0.23/libextra/gnutls_openssl.c 2005-01-02 19:50:49.000000000 +0000 -@@ -31,7 +31,6 @@ - - static int last_error = 0; - -- - /* Library initialisation functions */ - - int SSL_library_init(void) -@@ -219,12 +218,17 @@ - - ssl->rfd = (gnutls_transport_ptr)-1; - ssl->wfd = (gnutls_transport_ptr)-1; -+ -+ ssl->ssl_peek_buffer = NULL; -+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; - - return ssl; - } - - void SSL_free(SSL *ssl) - { -+ if (ssl->ssl_peek_buffer) -+ free(ssl->ssl_peek_buffer); - gnutls_certificate_free_credentials(ssl->gnutls_cred); - gnutls_deinit(ssl->gnutls_state); - free(ssl); -@@ -245,6 +249,7 @@ - int SSL_set_fd(SSL *ssl, int fd) - { - gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr)fd); -+ ssl->rfd = ssl->wfd = fd; - return 1; - } - -@@ -268,6 +273,16 @@ - return 1; - } - -+int SSL_get_rfd(SSL *ssl) -+{ -+ return ssl->rfd; -+} -+ -+int SSL_get_wfd(SSL *ssl) -+{ -+ return ssl->wfd; -+} -+ - void SSL_set_bio(SSL *ssl, BIO *rbio, BIO *wbio) - { - gnutls_transport_set_ptr2 (ssl->gnutls_state, rbio->fd, wbio->fd); -@@ -280,6 +295,9 @@ - - int SSL_pending(SSL *ssl) - { -+ if (ssl->ssl_peek_avail) -+ return ssl->ssl_peek_avail; -+ - return gnutls_record_check_pending(ssl->gnutls_state); - } - -@@ -430,10 +448,49 @@ - return 1; - } - -+int SSL_peek(SSL *ssl, void *buf, int len) -+{ -+ if (len > ssl->ssl_peek_buffer_size) { -+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); -+ ssl->ssl_peek_buffer_size = len; -+ } -+ -+ if (ssl->ssl_peek_avail == 0) { -+ -+ int ret; -+ -+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); -+ ssl->last_error = ret; -+ -+ if (ret > 0) -+ ssl->ssl_peek_avail += ret; -+ } -+ -+ if (len > ssl->ssl_peek_avail) -+ len = ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, len); -+ -+ return len; -+} -+ - int SSL_read(SSL *ssl, void *buf, int len) - { - int ret; - -+ if (ssl->ssl_peek_avail) { -+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, n); -+ -+ if (ssl->ssl_peek_avail > n) -+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); -+ -+ ssl->ssl_peek_avail -= n; -+ -+ return n; -+ } -+ - ret = gnutls_record_recv(ssl->gnutls_state, buf, len); - ssl->last_error = ret; - ---- clean/gnutls-1.0.23/includes/gnutls/openssl.h 2004-08-04 22:36:02.000000000 +0100 -+++ gnutls-1.0.23/includes/gnutls/openssl.h 2005-01-02 19:48:35.000000000 +0000 -@@ -139,6 +139,10 @@ - - gnutls_transport_ptr rfd; - gnutls_transport_ptr wfd; -+ -+ char *ssl_peek_buffer; -+ size_t ssl_peek_buffer_size; -+ size_t ssl_peek_avail; - } SSL; - - typedef struct diff --git a/packages/gnutls/gnutls-1.0.25/export-symbols.patch b/packages/gnutls/gnutls-1.0.25/export-symbols.patch deleted file mode 100644 index 22a1373944..0000000000 --- a/packages/gnutls/gnutls-1.0.25/export-symbols.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-1.0.23/lib/Makefile.am.orig 2005-06-04 13:46:26.000000000 +0200 -+++ gnutls-1.0.23/lib/Makefile.am 2005-06-04 13:48:38.000000000 +0200 -@@ -9,7 +9,7 @@ - pkgconfig_DATA = gnutls.pc - DISTCLEANFILES = $(pkgconfig_DATA) - --LIBGNUTLS_EXPORTS = -export-symbols-regex '^(_gnutls|gnutls|_E_).*' -+LIBGNUTLS_EXPORTS = -export-symbols-regex '^(asn1_|_gnutls|gnutls|_E_).*' - - DIST_SUBDIRS = minitasn1 x509 - if ENABLE_MINITASN1 diff --git a/packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch b/packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch deleted file mode 100644 index 3ddd8b3a18..0000000000 --- a/packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- clean/gnutls-1.0.23/libextra/gnutls_openssl.c 2004-08-04 22:36:03.000000000 +0100 -+++ gnutls-1.0.23/libextra/gnutls_openssl.c 2005-01-02 19:50:49.000000000 +0000 -@@ -31,7 +31,6 @@ - - static int last_error = 0; - -- - /* Library initialisation functions */ - - int SSL_library_init(void) -@@ -219,12 +218,17 @@ - - ssl->rfd = (gnutls_transport_ptr)-1; - ssl->wfd = (gnutls_transport_ptr)-1; -+ -+ ssl->ssl_peek_buffer = NULL; -+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; - - return ssl; - } - - void SSL_free(SSL *ssl) - { -+ if (ssl->ssl_peek_buffer) -+ free(ssl->ssl_peek_buffer); - gnutls_certificate_free_credentials(ssl->gnutls_cred); - gnutls_deinit(ssl->gnutls_state); - free(ssl); -@@ -245,6 +249,7 @@ - int SSL_set_fd(SSL *ssl, int fd) - { - gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr)fd); -+ ssl->rfd = ssl->wfd = fd; - return 1; - } - -@@ -268,6 +273,16 @@ - return 1; - } - -+int SSL_get_rfd(SSL *ssl) -+{ -+ return ssl->rfd; -+} -+ -+int SSL_get_wfd(SSL *ssl) -+{ -+ return ssl->wfd; -+} -+ - void SSL_set_bio(SSL *ssl, BIO *rbio, BIO *wbio) - { - gnutls_transport_set_ptr2 (ssl->gnutls_state, rbio->fd, wbio->fd); -@@ -280,6 +295,9 @@ - - int SSL_pending(SSL *ssl) - { -+ if (ssl->ssl_peek_avail) -+ return ssl->ssl_peek_avail; -+ - return gnutls_record_check_pending(ssl->gnutls_state); - } - -@@ -430,10 +448,49 @@ - return 1; - } - -+int SSL_peek(SSL *ssl, void *buf, int len) -+{ -+ if (len > ssl->ssl_peek_buffer_size) { -+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); -+ ssl->ssl_peek_buffer_size = len; -+ } -+ -+ if (ssl->ssl_peek_avail == 0) { -+ -+ int ret; -+ -+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); -+ ssl->last_error = ret; -+ -+ if (ret > 0) -+ ssl->ssl_peek_avail += ret; -+ } -+ -+ if (len > ssl->ssl_peek_avail) -+ len = ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, len); -+ -+ return len; -+} -+ - int SSL_read(SSL *ssl, void *buf, int len) - { - int ret; - -+ if (ssl->ssl_peek_avail) { -+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, n); -+ -+ if (ssl->ssl_peek_avail > n) -+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); -+ -+ ssl->ssl_peek_avail -= n; -+ -+ return n; -+ } -+ - ret = gnutls_record_recv(ssl->gnutls_state, buf, len); - ssl->last_error = ret; - ---- clean/gnutls-1.0.23/includes/gnutls/openssl.h 2004-08-04 22:36:02.000000000 +0100 -+++ gnutls-1.0.23/includes/gnutls/openssl.h 2005-01-02 19:48:35.000000000 +0000 -@@ -139,6 +139,10 @@ - - gnutls_transport_ptr rfd; - gnutls_transport_ptr wfd; -+ -+ char *ssl_peek_buffer; -+ size_t ssl_peek_buffer_size; -+ size_t ssl_peek_avail; - } SSL; - - typedef struct diff --git a/packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch b/packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch deleted file mode 100644 index 6eca97efd7..0000000000 --- a/packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- gnutls-1.3.5/libextra/gnutls_openssl.c.orig 2006-04-28 20:01:40.000000000 +0100 -+++ gnutls-1.3.5/libextra/gnutls_openssl.c 2006-04-28 20:10:33.000000000 +0100 -@@ -252,12 +252,17 @@ - ssl->rfd = (gnutls_transport_ptr_t) - 1; - ssl->wfd = (gnutls_transport_ptr_t) - 1; - -+ ssl->ssl_peek_buffer = NULL; -+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; -+ - return ssl; - } - - void - SSL_free (SSL * ssl) - { -+ if (ssl->ssl_peek_buffer) -+ free(ssl->ssl_peek_buffer); - gnutls_certificate_free_credentials (ssl->gnutls_cred); - gnutls_deinit (ssl->gnutls_state); - free (ssl); -@@ -281,6 +286,7 @@ - SSL_set_fd (SSL * ssl, int fd) - { - gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr_t) fd); -+ ssl->rfd = ssl->wfd = fd; - return 1; - } - -@@ -306,6 +312,17 @@ - return 1; - } - -+int SSL_get_rfd(SSL *ssl) -+{ -+ return ssl->rfd; -+} -+ -+int SSL_get_wfd(SSL *ssl) -+{ -+ return ssl->wfd; -+} -+ -+ - void - SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) - { -@@ -321,6 +338,8 @@ - int - SSL_pending (SSL * ssl) - { -+ if (ssl->ssl_peek_avail) -+ return ssl->ssl_peek_avail; - return gnutls_record_check_pending (ssl->gnutls_state); - } - -@@ -476,11 +495,50 @@ - return 1; - } - -+int SSL_peek(SSL *ssl, void *buf, int len) -+{ -+ if (len > ssl->ssl_peek_buffer_size) { -+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); -+ ssl->ssl_peek_buffer_size = len; -+ } -+ -+ if (ssl->ssl_peek_avail == 0) { -+ -+ int ret; -+ -+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); -+ ssl->last_error = ret; -+ -+ if (ret > 0) -+ ssl->ssl_peek_avail += ret; -+ } -+ -+ if (len > ssl->ssl_peek_avail) -+ len = ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, len); -+ -+ return len; -+} -+ - int - SSL_read (SSL * ssl, void *buf, int len) - { - int ret; - -+ if (ssl->ssl_peek_avail) { -+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, n); -+ -+ if (ssl->ssl_peek_avail > n) -+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); -+ -+ ssl->ssl_peek_avail -= n; -+ -+ return n; -+ } -+ - ret = gnutls_record_recv (ssl->gnutls_state, buf, len); - ssl->last_error = ret; - ---- gnutls-1.3.5/includes/gnutls/openssl.h.orig 2006-04-28 20:10:55.000000000 +0100 -+++ gnutls-1.3.5/includes/gnutls/openssl.h 2006-04-28 20:11:52.000000000 +0100 -@@ -164,6 +164,11 @@ - - gnutls_transport_ptr_t rfd; - gnutls_transport_ptr_t wfd; -+ -+ char *ssl_peek_buffer; -+ size_t ssl_peek_buffer_size; -+ size_t ssl_peek_avail; -+ - }; - - #define rbio gnutls_state diff --git a/packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch deleted file mode 100644 index e2a2762424..0000000000 --- a/packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch +++ /dev/null @@ -1,16 +0,0 @@ -The version of texinfo in Debian Sarge does not understand the @euro{} command. -This patch replaces the @euro{} command with the word "euro". - ---- gnutls-1.3.5/doc/signatures.texi.orig 2006-04-26 08:06:40.918268000 +0930 -+++ gnutls-1.3.5/doc/signatures.texi 2006-04-26 08:06:52.446515440 +0930 -@@ -11,8 +11,8 @@ - long as it is difficult enough to generate two different messages with - the same hash algorithm output. In that case the same signature could - be used as a proof for both messages. Nobody wants to sign an innocent --message of donating 1 @euro{} to Greenpeace and find out that he --donated 1.000.000 @euro{} to Bad Inc. -+message of donating 1 euro to Greenpeace and find out that he -+donated 1.000.000 euro to Bad Inc. - - For a hash algorithm to be called cryptographic the following three - requirements must hold diff --git a/packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch deleted file mode 100644 index e2a2762424..0000000000 --- a/packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch +++ /dev/null @@ -1,16 +0,0 @@ -The version of texinfo in Debian Sarge does not understand the @euro{} command. -This patch replaces the @euro{} command with the word "euro". - ---- gnutls-1.3.5/doc/signatures.texi.orig 2006-04-26 08:06:40.918268000 +0930 -+++ gnutls-1.3.5/doc/signatures.texi 2006-04-26 08:06:52.446515440 +0930 -@@ -11,8 +11,8 @@ - long as it is difficult enough to generate two different messages with - the same hash algorithm output. In that case the same signature could - be used as a proof for both messages. Nobody wants to sign an innocent --message of donating 1 @euro{} to Greenpeace and find out that he --donated 1.000.000 @euro{} to Bad Inc. -+message of donating 1 euro to Greenpeace and find out that he -+donated 1.000.000 euro to Bad Inc. - - For a hash algorithm to be called cryptographic the following three - requirements must hold diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls.inc index 0267684946..0d13d132de 100644 --- a/packages/gnutls/gnutls_1.4.0.bb +++ b/packages/gnutls/gnutls.inc @@ -1,37 +1,42 @@ DESCRIPTION = "GNU Transport Layer Security Library" -DEPENDS = "zlib libgcrypt lzo" HOMEPAGE = "http://www.gnu.org/software/gnutls/" +DEPENDS = "zlib libgcrypt lzo" + LICENSE = "LGPL" -PR = "r1" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ file://gnutls-openssl.patch;patch=1 \ + file://onceonly.m4 \ file://gnutls-texinfo-euro.patch;patch=1" inherit autotools binconfig -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" -FILES_${PN} = "${libdir}/libgnutls.so.*" -FILES_${PN}-bin = "${bindir}/gnutls-serv \ - ${bindir}/gnutls-cli \ - ${bindir}/srptool \ - ${bindir}/certtool \ - ${bindir}/gnutls-srpcrypt \ - ${bindir}/psktool" - -FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" - EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" +do_configure_prepend() { + cp ${WORKDIR}/onceonly.m4 ${S}/m4/ +} + do_stage() { - oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} - autotools_stage_includes + oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} + oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} + oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} + autotools_stage_includes - install -d ${STAGING_DATADIR}/aclocal - cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DATADIR}/aclocal + cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ } +PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" + +FILES_${PN} = "${libdir}/libgnutls.so.*" +FILES_${PN}-bin = "${bindir}/gnutls-serv \ + ${bindir}/gnutls-cli \ + ${bindir}/srptool \ + ${bindir}/psktool \ + ${bindir}/certtool \ + ${bindir}/gnutls-srpcrypt" + +FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" +FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" +FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" diff --git a/packages/gnutls/gnutls-1.0.23/.mtn2git_empty b/packages/gnutls/gnutls/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnutls/gnutls-1.0.23/.mtn2git_empty +++ b/packages/gnutls/gnutls/.mtn2git_empty diff --git a/packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch b/packages/gnutls/gnutls/gnutls-openssl.patch index 6eca97efd7..e2c189592f 100644 --- a/packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch +++ b/packages/gnutls/gnutls/gnutls-openssl.patch @@ -1,6 +1,8 @@ ---- gnutls-1.3.5/libextra/gnutls_openssl.c.orig 2006-04-28 20:01:40.000000000 +0100 -+++ gnutls-1.3.5/libextra/gnutls_openssl.c 2006-04-28 20:10:33.000000000 +0100 -@@ -252,12 +252,17 @@ +Index: gnutls-1.6.0/libextra/gnutls_openssl.c +=================================================================== +--- gnutls-1.6.0.orig/libextra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200 ++++ gnutls-1.6.0/libextra/gnutls_openssl.c 2006-12-12 15:07:59.002227000 +0100 +@@ -256,12 +256,17 @@ ssl->rfd = (gnutls_transport_ptr_t) - 1; ssl->wfd = (gnutls_transport_ptr_t) - 1; @@ -18,15 +20,15 @@ gnutls_certificate_free_credentials (ssl->gnutls_cred); gnutls_deinit (ssl->gnutls_state); free (ssl); -@@ -281,6 +286,7 @@ +@@ -285,6 +290,7 @@ SSL_set_fd (SSL * ssl, int fd) { - gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr_t) fd); + gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd)); + ssl->rfd = ssl->wfd = fd; return 1; } -@@ -306,6 +312,17 @@ +@@ -310,6 +316,17 @@ return 1; } @@ -44,7 +46,7 @@ void SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) { -@@ -321,6 +338,8 @@ +@@ -325,6 +342,8 @@ int SSL_pending (SSL * ssl) { @@ -53,7 +55,7 @@ return gnutls_record_check_pending (ssl->gnutls_state); } -@@ -476,11 +495,50 @@ +@@ -480,11 +499,50 @@ return 1; } @@ -104,8 +106,10 @@ ret = gnutls_record_recv (ssl->gnutls_state, buf, len); ssl->last_error = ret; ---- gnutls-1.3.5/includes/gnutls/openssl.h.orig 2006-04-28 20:10:55.000000000 +0100 -+++ gnutls-1.3.5/includes/gnutls/openssl.h 2006-04-28 20:11:52.000000000 +0100 +Index: gnutls-1.6.0/includes/gnutls/openssl.h +=================================================================== +--- gnutls-1.6.0.orig/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100 ++++ gnutls-1.6.0/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100 @@ -164,6 +164,11 @@ gnutls_transport_ptr_t rfd; diff --git a/packages/gnutls/gnutls-1.3.5/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls/gnutls-texinfo-euro.patch index e2a2762424..e2a2762424 100644 --- a/packages/gnutls/gnutls-1.3.5/gnutls-texinfo-euro.patch +++ b/packages/gnutls/gnutls/gnutls-texinfo-euro.patch diff --git a/packages/gnutls/gnutls-1.4.4/onceonly.m4 b/packages/gnutls/gnutls/onceonly.m4 index f6fec37cbf..f6fec37cbf 100644 --- a/packages/gnutls/gnutls-1.4.4/onceonly.m4 +++ b/packages/gnutls/gnutls/onceonly.m4 diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb deleted file mode 100644 index 76dd844db8..0000000000 --- a/packages/gnutls/gnutls_1.0.23.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "GNU Transport Layer Security Library" -DEPENDS = "zlib libgcrypt" -PR = "r6" - -LICENSE = "LGPL" - -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/attic/gnutls-${PV}.tar.gz \ - file://gnutls-openssl.patch;patch=1 \ - file://export-symbols.patch;patch=1" - -inherit autotools -inherit binconfig - -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" -FILES_${PN} = "${libdir}/libgnutls.so.*" -FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \ - ${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt" -FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" - -EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" - -do_stage() { - oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} - autotools_stage_includes - - install -d ${STAGING_DATADIR}/aclocal - cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ -} - diff --git a/packages/gnutls/gnutls_1.0.25.bb b/packages/gnutls/gnutls_1.0.25.bb deleted file mode 100644 index 4b4b63c63c..0000000000 --- a/packages/gnutls/gnutls_1.0.25.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "GNU Transport Layer Security Library" -DEPENDS = "zlib libgcrypt" -PR = "r2" - -LICENSE = "LGPL" - -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.gz \ - file://gnutls-openssl.patch;patch=1 \ - file://export-symbols.patch;patch=1" - -inherit autotools -inherit binconfig - -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" -FILES_${PN} = "${libdir}/libgnutls.so.*" -FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \ - ${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt" -FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" - -EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" - -do_stage() { - oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} - autotools_stage_includes - - install -d ${STAGING_DATADIR}/aclocal - cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ -} - diff --git a/packages/gnutls/gnutls_1.3.5.bb b/packages/gnutls/gnutls_1.3.5.bb deleted file mode 100644 index bcadacb41a..0000000000 --- a/packages/gnutls/gnutls_1.3.5.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "GNU Transport Layer Security Library" -DEPENDS = "zlib libgcrypt lzo" - -LICENSE = "LGPL" -PR = "r4" - -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/devel/gnutls-${PV}.tar.bz2 \ - file://gnutls-openssl.patch;patch=1 \ - file://gnutls-texinfo-euro.patch;patch=1" - -inherit autotools -inherit binconfig - -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" -FILES_${PN} = "${libdir}/libgnutls.so.*" -FILES_${PN}-bin = "${bindir}/gnutls-serv \ - ${bindir}/gnutls-cli \ - ${bindir}/srptool \ - ${bindir}/certtool \ - ${bindir}/gnutls-srpcrypt \ - ${bindir}/psktool" - -FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" - -EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" - -do_stage() { - oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} - autotools_stage_includes - - install -d ${STAGING_DATADIR}/aclocal - cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ -} - diff --git a/packages/gnutls/gnutls_1.4.4.bb b/packages/gnutls/gnutls_1.4.4.bb index e80dc3bb2f..3337e0b370 100644 --- a/packages/gnutls/gnutls_1.4.4.bb +++ b/packages/gnutls/gnutls_1.4.4.bb @@ -1,41 +1,3 @@ -DESCRIPTION = "GNU Transport Layer Security Library" -DEPENDS = "zlib libgcrypt lzo" -HOMEPAGE = "http://www.gnu.org/software/gnutls/" -LICENSE = "LGPL" - -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ - file://onceonly.m4 \ - file://gnutls-openssl.patch;patch=1 \ - file://gnutls-texinfo-euro.patch;patch=1" - -inherit autotools binconfig - -do_configure_prepend() { - cp ${WORKDIR}/onceonly.m4 ${S}/m4/ -} - -PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" -FILES_${PN} = "${libdir}/libgnutls.so.*" -FILES_${PN}-bin = "${bindir}/gnutls-serv \ - ${bindir}/gnutls-cli \ - ${bindir}/srptool \ - ${bindir}/certtool \ - ${bindir}/gnutls-srpcrypt \ - ${bindir}/psktool" - -FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" - -EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" - -do_stage() { - oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} - oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} - autotools_stage_includes - - install -d ${STAGING_DATADIR}/aclocal - cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/ -} +require gnutls.inc +PR = "r1" diff --git a/packages/gnutls/gnutls_1.6.0.bb b/packages/gnutls/gnutls_1.6.0.bb new file mode 100644 index 0000000000..c5dffdc05c --- /dev/null +++ b/packages/gnutls/gnutls_1.6.0.bb @@ -0,0 +1,7 @@ +require gnutls.inc + +PR = "r1" + +do_configure_prepend() { + sed -i "s/2.60/2.59/" ${S}/configure.in +} diff --git a/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch b/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch deleted file mode 100644 index 767bdec728..0000000000 --- a/packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -urNd ../gpe-mixer-0.32-r0/gpe-mixer-0.32/Makefile gpe-mixer-0.32/Makefile ---- ../gpe-mixer-0.32-r0/gpe-mixer-0.32/Makefile 2004-08-03 03:31:33.000000000 +0100 -+++ gpe-mixer-0.32/Makefile 2004-08-03 13:00:42.000000000 +0100 -@@ -1,6 +1,6 @@ - PREFIX = /usr - PACKAGE = gpe-mixer --DEBUG = yes -+DEBUG = no - CVSBUILD = no - GST = yes - VERSION = 0.32 -@@ -8,26 +8,26 @@ - MEMBERS = gpe-mixer - - GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED --GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama -+GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext - --CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall -+PACKAGE_CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall - ifeq ($(DEBUG),yes) --CFLAGS += -O2 -g --LDFLAGS = -g #-lefence -+PACKAGE_CFLAGS += -O2 -g -+PACKAGE_LDFLAGS = -g #-lefence - else --CFLAGS += -Os -fomit-frame-pointer -+PACKAGE_CFLAGS += -Os -fomit-frame-pointer - endif --CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" - - ifeq ($(CVSBUILD),yes) --CFLAGS += -I../libgpewidget --LDFLAGS += -L../libgpewidget -+PACKAGE_CFLAGS += -I../libgpewidget -+PACKAGE_LDFLAGS += -L../libgpewidget - BUILD = ../build - else --CFLAGS += -I/usr/include/gpe -+PACKAGE_CFLAGS += -I/usr/include/gpe - BUILD = build - endif --LDFLAGS += -lgpewidget $(GTKLDFLAGS) -+PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) - - OBJS = $(patsubst %,%.o,$(MEMBERS)) - SOURCES = $(patsubst %,%.c,$(MEMBERS)) -@@ -35,7 +35,7 @@ - all: $(PACKAGE) - - $(PACKAGE): $(OBJS) $(LIB) -- $(CC) -o $@ $^ $(LDFLAGS) -+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) - - install-program: all $(PACKAGE).desktop - mkdir -p $(DESTDIR)$(PREFIX)/bin diff --git a/packages/gpe-mixer/gpe-mixer_0.32.bb b/packages/gpe-mixer/gpe-mixer_0.32.bb deleted file mode 100644 index d064a3c55f..0000000000 --- a/packages/gpe-mixer/gpe-mixer_0.32.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe pkgconfig - -DESCRIPTION = "GPE audio mixer" -DEPENDS = "gtk+ libgpewidget" -SECTION = "gpe" -PRIORITY = "optional" - -SRC_URI += "file://fix_makefile.patch;patch=1" diff --git a/packages/gpe-mixer/gpe-mixer_0.34.bb b/packages/gpe-mixer/gpe-mixer_0.34.bb deleted file mode 100644 index d6cb6dc7d4..0000000000 --- a/packages/gpe-mixer/gpe-mixer_0.34.bb +++ /dev/null @@ -1,7 +0,0 @@ -LICENSE = "GPL" -inherit gpe pkgconfig - -DESCRIPTION = "GPE audio mixer" -DEPENDS = "gtk+ libgpewidget" -SECTION = "gpe" -PRIORITY = "optional" diff --git a/packages/gpe-mixer/gpe-mixer_0.38.bb b/packages/gpe-mixer/gpe-mixer_0.38.bb deleted file mode 100644 index d6cb6dc7d4..0000000000 --- a/packages/gpe-mixer/gpe-mixer_0.38.bb +++ /dev/null @@ -1,7 +0,0 @@ -LICENSE = "GPL" -inherit gpe pkgconfig - -DESCRIPTION = "GPE audio mixer" -DEPENDS = "gtk+ libgpewidget" -SECTION = "gpe" -PRIORITY = "optional" diff --git a/packages/gpe-mixer/gpe-mixer_0.40.bb b/packages/gpe-mixer/gpe-mixer_0.40.bb deleted file mode 100644 index 3d3ef98917..0000000000 --- a/packages/gpe-mixer/gpe-mixer_0.40.bb +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE = "GPL" -PR = "r0" - -inherit gpe pkgconfig - -DESCRIPTION = "GPE audio mixer" -DEPENDS = "gtk+ libgpewidget" -SECTION = "gpe" -PRIORITY = "optional" - diff --git a/packages/gpe-mixer/gpe-mixer_0.41.bb b/packages/gpe-mixer/gpe-mixer_0.41.bb deleted file mode 100644 index 3d3ef98917..0000000000 --- a/packages/gpe-mixer/gpe-mixer_0.41.bb +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE = "GPL" -PR = "r0" - -inherit gpe pkgconfig - -DESCRIPTION = "GPE audio mixer" -DEPENDS = "gtk+ libgpewidget" -SECTION = "gpe" -PRIORITY = "optional" - diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb index 122d5bc1b1..cb5ea6c5c6 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb @@ -11,7 +11,7 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings" -PR = "r3" +PR = "r4" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" @@ -20,7 +20,11 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_angstrom = " file://angstrom-change-theme.diff;patch=1" + +do_configure_append_angstrom() { + sed -i s:Default:Clearlooks:g X11/xsettings.default + sed -i s:Industrial:Clearlooks:g X11/xsettings.default +} do_install_append() { install -d ${D}${sysconfdir}/gpe/xsettings-default.d diff --git a/packages/hotplug-ng/hotplug-ng_001.bb b/packages/hotplug-ng/hotplug-ng_001.bb index 2a10df6886..c76c0f06eb 100644 --- a/packages/hotplug-ng/hotplug-ng_001.bb +++ b/packages/hotplug-ng/hotplug-ng_001.bb @@ -7,7 +7,7 @@ RCONFLICTS = "hotplug" RREPLACES = "hotplug" PR = "r1" -SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz \ file://flags.patch;patch=1" S = "${WORKDIR}/hotplug-ng-${PV}" diff --git a/packages/hotplug-ng/hotplug-ng_002.bb b/packages/hotplug-ng/hotplug-ng_002.bb index 2b6b1d4a45..3c5014be9a 100644 --- a/packages/hotplug-ng/hotplug-ng_002.bb +++ b/packages/hotplug-ng/hotplug-ng_002.bb @@ -6,7 +6,7 @@ RPROVIDES_${PN} = "hotplug" RCONFLICTS_${PN} = "hotplug" RREPLACES_${PN} = "hotplug" -SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz" #S = "${WORKDIR}/hotplug-ng-${PV}" diff --git a/packages/interbench/interbench_0.30.bb b/packages/interbench/interbench_0.30.bb index 6ddc947057..84bd88dbc2 100644 --- a/packages/interbench/interbench_0.30.bb +++ b/packages/interbench/interbench_0.30.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux interactivity benchmark" HOMEPAGE = "http://members.optusnet.com.au/ckolivas/interbench/" LICENSE = "GPL" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2" inherit autotools diff --git a/packages/kernbench/kernbench_0.41.bb b/packages/kernbench/kernbench_0.41.bb index 4a49cce8c6..33f651a154 100644 --- a/packages/kernbench/kernbench_0.41.bb +++ b/packages/kernbench/kernbench_0.41.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://kernbench.kolivas.org/" LICENSE = "GPL" RDEPENDS = "time" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/ck/apps/kernbench/kernbench-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/people/ck/apps/kernbench/kernbench-${PV}.tar.bz2" inherit autotools diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc index be9448afb6..29ca1685c1 100644 --- a/packages/klibc/klibc.inc +++ b/packages/klibc/klibc.inc @@ -4,7 +4,7 @@ DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ use with initramfs. It is deliberately written for small size, \ minimal entaglement, and portability, not speed." LICENSE = "BSD-ADV" -SRC_URI = "http://www.kernel.org/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" SRC_URI += "file://install.patch;patch=1" S = "${WORKDIR}/klibc-${PV}" diff --git a/packages/ksymoops/ksymoops_2.4.9.bb b/packages/ksymoops/ksymoops_2.4.9.bb index 52bd0bfcde..0ce64596fe 100644 --- a/packages/ksymoops/ksymoops_2.4.9.bb +++ b/packages/ksymoops/ksymoops_2.4.9.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Kernel oops and error message decoder." LICENSE = "GPLv2" DEPENDS = "binutils" -SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-${PV}.tar.bz2 \ file://flags.patch;patch=1" S = "${WORKDIR}/ksymoops-${PV}" diff --git a/packages/libcap/libcap_1.10.bb b/packages/libcap/libcap_1.10.bb index 886248c5ad..a7e1068f49 100644 --- a/packages/libcap/libcap_1.10.bb +++ b/packages/libcap/libcap_1.10.bb @@ -2,18 +2,16 @@ DESCRIPTION = "Libcap is a library for getting and setting POSIX.1e (formerly PO PRIORITY = "optional" SECTION = "libs" LICENSE = "GPL" +DEPENDS = "bison-native flex-native" -SRC_URI = "http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/libcap-${PV}.tar.bz2 \ +CFLAGS_append = " -I${S}/libcap/include" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \ file://makenames.patch;patch=1 \ file://make.patch;patch=1 " -S = "${WORKDIR}/libcap-${PV}" - -do_stage() { - install -d ${STAGING_INCDIR}/sys - install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/ - oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR} -} +FILES_${PN} = "${libdir}" +FILES_${PN}-dev = "${includedir}" do_install() { install -d ${D}${includedir}/sys @@ -22,5 +20,8 @@ do_install() { oe_libinstall -s -C libcap libcap ${D}${libdir} } -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir}"
\ No newline at end of file +do_stage() { + install -d ${STAGING_INCDIR}/sys + install -m 0644 libcap/include/sys/capability.h ${STAGING_INCDIR}/sys/ + oe_libinstall -s -C libcap libcap ${STAGING_LIBDIR} +} diff --git a/packages/libetpan/libetpan_0.48.bb b/packages/libetpan/libetpan_0.48.bb new file mode 100644 index 0000000000..dfef3b19c6 --- /dev/null +++ b/packages/libetpan/libetpan_0.48.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \ +It supports the protocols SMTP, POP3, IMAP and NNTP." +HOMEPAGE = "http://www.etpan.org" +SECTION = "libs" +DEPENDS = "gnutls" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ + file://honor-oe-lflags.patch;patch=1" + +inherit autotools pkgconfig gettext binconfig + +EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db" + +PARALLEL_MAKE = "" + +do_stage() { + autotools_stage_all +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig" diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_svn.bb index 3ea70bac01..4f00f4aac8 100644 --- a/packages/libeventdb/libeventdb_cvs.bb +++ b/packages/libeventdb/libeventdb_svn.bb @@ -1,18 +1,21 @@ -LICENSE = "LGPL" DESCRIPTION = "Database access library for GPE calendar" +LICENSE = "LGPL" SECTION = "gpe/libs" PRIORITY = "optional" + DEPENDS = "libgpewidget libgpepimc sqlite" -PV = "0.30+cvs${SRCDATE}" + +PV = "0.30+svn${SRCDATE}" PR = "r0" + DEFAULT_PREFERENCE = "-1" inherit pkgconfig gpe autotools -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" do_stage () { -autotools_stage_all + autotools_stage_all } diff --git a/packages/gnutls/gnutls-1.0.25/.mtn2git_empty b/packages/lighttpd/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnutls/gnutls-1.0.25/.mtn2git_empty +++ b/packages/lighttpd/.mtn2git_empty diff --git a/packages/gnutls/gnutls-1.3.5/.mtn2git_empty b/packages/lighttpd/1.4.13/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnutls/gnutls-1.3.5/.mtn2git_empty +++ b/packages/lighttpd/1.4.13/.mtn2git_empty diff --git a/packages/lighttpd/1.4.13/configure.in.patch b/packages/lighttpd/1.4.13/configure.in.patch new file mode 100644 index 0000000000..f4db64d4fe --- /dev/null +++ b/packages/lighttpd/1.4.13/configure.in.patch @@ -0,0 +1,28 @@ +Index: lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in +=================================================================== +--- lighttpd-1.4.13-r0.orig/lighttpd-1.4.13/configure.in 2006-10-09 18:19:34.000000000 +0200 ++++ lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in 2006-12-07 22:31:52.000000000 +0100 +@@ -250,23 +250,9 @@ + [WITH_PCRE=$withval],[WITH_PCRE=yes]) + AC_MSG_RESULT([$WITH_PCRE]) + +-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then +- AC_PATH_PROG(PCRECONFIG, pcre-config) + +- if test x"$PCRECONFIG" != x; then +- PCRE_LIB=`$PCRECONFIG --libs` +- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`" +- OLDLIBS="$LIBS" +- LIBS="$LIBS $PCRE_LIB" +- AC_CHECK_LIB(pcre, pcre_compile, [ +- AC_CHECK_HEADERS([pcre.h], [ + AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre]) + AC_DEFINE([HAVE_PCRE_H], [1]) +- ]) +- ]) +- LIBS="$OLDLIBS" +- fi +-fi + + AC_SUBST(PCRE_LIB) + diff --git a/packages/lighttpd/1.4.13/src-server.c.patch b/packages/lighttpd/1.4.13/src-server.c.patch new file mode 100644 index 0000000000..6ca0c9ea40 --- /dev/null +++ b/packages/lighttpd/1.4.13/src-server.c.patch @@ -0,0 +1,22 @@ +--- lighttpd/src/server.c.orig 2006-03-04 09:12:17.000000000 -0800 ++++ lighttpd/src/server.c 2006-07-11 09:16:28.000000000 -0700 +@@ -1174,8 +1174,8 @@ + if (srv->sockets_disabled) { + /* our server sockets are disabled, why ? */ + +- if ((srv->cur_fds + srv->want_fds < srv->max_fds * 0.8) && /* we have enough unused fds */ +- (srv->conns->used < srv->max_conns * 0.9) && ++ if ((srv->cur_fds + srv->want_fds < srv->max_fds * 8 / 10) && /* we have enough unused fds */ ++ (srv->conns->used < srv->max_conns * 9 / 10) && + (0 == graceful_shutdown)) { + for (i = 0; i < srv->srv_sockets.used; i++) { + server_socket *srv_socket = srv->srv_sockets.ptr[i]; +@@ -1187,7 +1187,7 @@ + srv->sockets_disabled = 0; + } + } else { +- if ((srv->cur_fds + srv->want_fds > srv->max_fds * 0.9) || /* out of fds */ ++ if ((srv->cur_fds + srv->want_fds > srv->max_fds * 9 / 10) || /* out of fds */ + (srv->conns->used > srv->max_conns) || /* out of connections */ + (graceful_shutdown)) { /* graceful_shutdown */ + diff --git a/packages/lighttpd/lighttpd_1.4.13.bb b/packages/lighttpd/lighttpd_1.4.13.bb new file mode 100644 index 0000000000..53aa9ff37f --- /dev/null +++ b/packages/lighttpd/lighttpd_1.4.13.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Web server" +SECTION = "net" +#DEPENDS = "libpcre openssl" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz \ +file://${PV}/configure.in.patch;patch=1;pnum=2 file://${PV}/src-server.c.patch;patch=1;pnum=1" + +EXTRA_OECONF="--without-bzip2 \ + --without-ldap \ + --without-lua \ + --without-memcache \ + --without-mysql \ + --without-pcre \ + --without-openssl \ + --without-webdav-locks \ + --without-webdav-props \ + --disable-nls \ + --disable-static" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/mod_*.so" diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb index 06d9faee77..80d6eca339 100644 --- a/packages/linux-hotplug/linux-hotplug_20040329.bb +++ b/packages/linux-hotplug/linux-hotplug_20040329.bb @@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug" RREPLACES_${PN} = "hotplug" PR = "r1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \ file://busybox.patch;patch=1 \ file://fix-net.agent \ file://update-usb.usermap \ diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb index 7c27551903..6209504c20 100644 --- a/packages/linux-hotplug/linux-hotplug_20040920.bb +++ b/packages/linux-hotplug/linux-hotplug_20040920.bb @@ -10,7 +10,7 @@ SECTION = "base" RSUGGESTS = "pciutils usbutils" PR = "r9" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ file://dash.patch;patch=1 \ file://userspecified_hcd.patch;patch=1 \ file://hotplug-net-agent-usb.patch;patch=1 \ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb index 8fb2600550..2e9e7eac82 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb @@ -6,7 +6,7 @@ INHIBIT_DEFAULT_DEPS = "1" PR = "r0" SRC_URI = " \ - ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/people/dwmw2/kernel-headers/snapshot/linux-kernel-headers-2.6.19-rc1.tar.bz2 \ file://arm-procinfo-hwcap.patch;patch=1 \ file://arm-unistd-syscall.patch;patch=1 \ file://linux-err.patch;patch=1 \ diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb index 2513b4e54c..6767d7aac9 100644 --- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb @@ -5,7 +5,7 @@ INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "unifdef-native" PR = "r1" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://arm-syscall-define.patch;patch=1" S = "${WORKDIR}/linux-2.6.18" diff --git a/packages/linux-uml/linux-uml_2.4.26.bb b/packages/linux-uml/linux-uml_2.4.26.bb index efcb228396..a5dbfd814a 100644 --- a/packages/linux-uml/linux-uml_2.4.26.bb +++ b/packages/linux-uml/linux-uml_2.4.26.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" UMLR = "2" PR = "1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;patch=1 \ file://defconfig \ file://aio_abi.h" diff --git a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb index 848bb709e8..e71199d617 100644 --- a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb +++ b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb @@ -7,9 +7,9 @@ MMV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" LV = "2.6.10" PR = "r3" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \ - http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${LV}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KV}-${RCV}.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${KV}-${RCV}/${KV}-${RCV}-${MMV}/${KV}-${RCV}-${MMV}.gz;patch=1 \ file://defconfig" #http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-core-on-panic;patch=1 \ #http://www.suse.de/~kraxel/uml/patches/2.6.10-rc3/uml-pretend-to-be-i586;patch=1 \ diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb index 4d86d9958c..5e6f664bc2 100644 --- a/packages/linux/compulab-pxa270_2.6.16.bb +++ b/packages/linux/compulab-pxa270_2.6.16.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Compulab PXA270 system" LICENSE = "GPL" PR = "r2" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://linux-2.6.16.patch;patch=1 \ file://defconfig \ http://www.compulab.co.il/x270/download/x270-linux-drv.zip" diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb index 5c257eae47..a79c90220c 100644 --- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb +++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP" LICENSE = "GPL" PR = "r2" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11-rc4_idp.patch;patch=1 \ ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11_idp_leds.patch;patch=1 \ ftp://ftp.accelent.com/pxa255_idp/linux/devkitidp-pxa255_defconfig" diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb index 217b393069..09926ce5c0 100644 --- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb @@ -5,9 +5,9 @@ PR = "r1" COMPATIBLE_MACHINE = "ep93xx" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ - http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc1.bz2;patch=1 \ - http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.18-rc1-git9.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc1.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.18-rc1-git9.bz2;patch=1 \ http://www.wantstofly.org/~buytenh/ep93xx/derevo20.diff;pnum=1;patch=1 \ file://defconfig \ " diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb index befb587f89..875f47c99c 100644 --- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb +++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" COMPATIBLE_MACHINE = "gumstix" # NOTE: pulled local linux-2.6.5-gnalm1, since it didn't apply cleanly -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \ file://linux-2.6.5-gnalm1.patch;patch=1 \ http://gumstix.superlucidity.net/downloads/kernel/patches/linux-2.6.5-gnalm1-gum0.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/ipod_2.4.24-ipod0.bb b/packages/linux/ipod_2.4.24-ipod0.bb index f66039f90e..e6248e581d 100644 --- a/packages/linux/ipod_2.4.24-ipod0.bb +++ b/packages/linux/ipod_2.4.24-ipod0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" KV = "2.4.24" PV = "${KV}-ipod0" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz;patch=1 \ ${SOURCEFORGE_MIRROR}/ipodlinux/uclinux-2.4.24-ipod0.patch.gz;patch=1 " diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 4c5751565f..2e49e912f5 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -87,7 +87,7 @@ python () { name.append(patch) pname = '-'.join(name) if patch[0:2] == "rc" or patch[0:3] == "pre": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) kernel[-1] = str(int(kernel[-1]) - 1) if patch[0:2] == "rc" and pref == 10: pref = 6 @@ -96,14 +96,14 @@ python () { else: pref = 2 elif patch[0:2] == "bk" or patch[0:3] == "git": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) pref = 2 elif patch[0:2] == "ac": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname)) mmac = 2 filepath[0:0] = [ filedir % (name[0] + "-ac") ] elif patch[0:2] == "mm": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname)) mmac = 2 filepath[0:0] = [ filedir % (name[0] + "-mm") ] else: @@ -112,7 +112,7 @@ python () { base = pname base = '.'.join(kernel) - patch_uri[0] = "ftp://ftp.kernel.org/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base) + patch_uri[0] = "${KERNELORG_MIRROR}/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base) filepath[-1:-1] = [ filedir % base ] if base != minor: filepath[-1:-1] = [ filedir % minor ] diff --git a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb index 6906fdd14e..6c5e1cb16c 100644 --- a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb +++ b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" COMPATIBLE_MACHINE = "amsdelta" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1 \ http://the.earth.li/pub/e3/2.6.16/00-ams-delta-backlight.diff;patch=1 \ http://the.earth.li/pub/e3/2.6.16/01-ams-delta-lcd.diff;patch=1 \ diff --git a/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb b/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb index 18197fa4bc..d58c28e227 100644 --- a/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb +++ b/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb @@ -6,7 +6,7 @@ KV = "2.4.25" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;patch=1 \ http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;patch=1 \ file://defconfig \ diff --git a/packages/linux/linux-colinux_2.4.28.bb b/packages/linux/linux-colinux_2.4.28.bb index 1191945540..b74be3d791 100644 --- a/packages/linux/linux-colinux_2.4.28.bb +++ b/packages/linux/linux-colinux_2.4.28.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" COLV = "0.6.1" #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-0.6.1.tar.gz -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ file://colinux-${COLV}.patch;patch=1 \ file://nofpu.patch;patch=1 \ file://shortloadbytes.patch;patch=1 \ diff --git a/packages/linux/linux-colinux_2.6.10.bb b/packages/linux/linux-colinux_2.6.10.bb index ecd0f64a0d..8b77a17109 100644 --- a/packages/linux/linux-colinux_2.6.10.bb +++ b/packages/linux/linux-colinux_2.6.10.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" COLV = "0.6.2" #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-${COLV}.tar.gz -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://colinux-${COLV}.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-dht-walnut_2.6.12.6.bb b/packages/linux/linux-dht-walnut_2.6.12.6.bb index 15a6946331..7c0f434477 100644 --- a/packages/linux/linux-dht-walnut_2.6.12.6.bb +++ b/packages/linux/linux-dht-walnut_2.6.12.6.bb @@ -1,12 +1,12 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for DHT-Walnut (ppc) machine" LICENSE = "GPL" -PR = "r1" +PR = "r2" DEPENDS = "u-boot" KERNEL_CCSUFFIX = "-3.4.4" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://ppc_40x_uboot.patch;patch=1 \ file://iw_we18-5.diff;patch=1 \ file://linux-2.6.12-mppe-mppc-1.3.patch;patch=1 \ @@ -55,7 +55,7 @@ do_install_append () { install -d ${DEPLOY_DIR}/images install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf install -m 0755 vmlinux ${DEPLOY_DIR}/images/ - powerpc-linux-uclibc-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin + powerpc-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin gzip -f -9 ${DEPLOY_DIR}/images/linux.bin mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "owmnr"+${PV}+"-ppc" -d ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/uImage-${PV}-${MACHINE}-${DATETIME}.bin rm ${DEPLOY_DIR}/images/vmlinux diff --git a/packages/linux/linux-dht-walnut_2.6.12.bb b/packages/linux/linux-dht-walnut_2.6.12.bb index 54586b2976..cdf0c62561 100644 --- a/packages/linux/linux-dht-walnut_2.6.12.bb +++ b/packages/linux/linux-dht-walnut_2.6.12.bb @@ -6,7 +6,7 @@ DEPENDS = "u-boot" KERNEL_CCSUFFIX = "-3.4.4" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://ppc_40x_uboot.patch;patch=1 \ file://iw_we18-5.diff;patch=1 \ file://linux-2.6.12-mppe-mppc-1.3.patch;patch=1 \ diff --git a/packages/linux/linux-epia_2.6.11.bb b/packages/linux/linux-epia_2.6.11.bb index 1b2ee9be6d..dd68bcd4b7 100644 --- a/packages/linux/linux-epia_2.6.11.bb +++ b/packages/linux/linux-epia_2.6.11.bb @@ -5,7 +5,7 @@ PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \ file://epia_defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-epia_2.6.12.bb b/packages/linux/linux-epia_2.6.12.bb index 1b2ee9be6d..dd68bcd4b7 100644 --- a/packages/linux/linux-epia_2.6.12.bb +++ b/packages/linux/linux-epia_2.6.12.bb @@ -5,7 +5,7 @@ PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \ file://epia_defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-epia_2.6.8.1.bb b/packages/linux/linux-epia_2.6.8.1.bb index 11173e1dff..ef38d10853 100644 --- a/packages/linux/linux-epia_2.6.8.1.bb +++ b/packages/linux/linux-epia_2.6.8.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for VIA EPiA" LICENSE = "GPL" PR = "r15" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1 \ http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \ file://epia_defconfig" diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index dda0330b0a..58d98c37f1 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -15,7 +15,7 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" ############################################################## # source and patches # -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-ezx7.tar.bz2 \ \ file://sa1100-rtc-gcc4.diff;patch=1 \ diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb index 605a36e49a..c58e0d46bc 100644 --- a/packages/linux/linux-geodegx_2.4.24.bb +++ b/packages/linux/linux-geodegx_2.4.24.bb @@ -6,7 +6,7 @@ KV = "2.4.24" DESCRIPTION = "Linux kernel for the AMD Geode GX processor" LICENSE = "GPL" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_${KV}_1.00.tar.gz \ file://${WORKDIR}/Patches_Linux_${KV}_1.00/linux-${KV}-geode.patch;patch=1 \ file://linux-2.4.24-gcc340-fixes.patch;patch=1 \ diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb index 3798685f14..f84ceb7f1e 100644 --- a/packages/linux/linux-geodelx_2.6.11.bb +++ b/packages/linux/linux-geodelx_2.6.11.bb @@ -19,7 +19,7 @@ inherit kernel ARCH = "i386" KERNEL_IMAGETYPE = "bzImage" -SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \ http://www.amd.com/files/connectivitysolutions/geode/geode_lx/${AMD_DRIVER_LABEL}.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb index 6afa1ac43a..90a7259d9f 100644 --- a/packages/linux/linux-gumstix_2.6.15.bb +++ b/packages/linux/linux-gumstix_2.6.15.bb @@ -5,7 +5,7 @@ PR = "r1" COMPATIBLE_MACHINE = "gumstix" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd;date=20060223 \ file://defconfig-gumstix \ file://arch-config.patch;patch=1 \ diff --git a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb index 7ad662a1df..242567634c 100644 --- a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb +++ b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;patch=1 \ http://rtpnet.nerim.net/ipaq/2.6.11-bk1/2.6.11-bk1-h1940.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-h1940_2.6.14-h1940.bb b/packages/linux/linux-h1940_2.6.14-h1940.bb index 71829a36eb..750750f5d1 100644 --- a/packages/linux/linux-h1940_2.6.14-h1940.bb +++ b/packages/linux/linux-h1940_2.6.14-h1940.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \ http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb index 40a0efae12..5fbe040810 100644 --- a/packages/linux/linux-h1940_2.6.17-h1940.bb +++ b/packages/linux/linux-h1940_2.6.17-h1940.bb @@ -6,7 +6,7 @@ PR = "r1" COMPATIBLE_HOST = "arm.*-linux" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;patch=1 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/full.patch;patch=1 \ http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;patch=1 \ diff --git a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb index 18f9036d9d..299d813964 100644 --- a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb +++ b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for h6300 devices." SECTION = "kernel" LICENSE = "GPL" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.12-rc5-omap2.bz2;patch=1 \ file://h6300_omap1_2612rc5.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-h6300-omap1_2.6.14.3.bb b/packages/linux/linux-h6300-omap1_2.6.14.3.bb index 4f5e4dc924..ea5aeeea1a 100644 --- a/packages/linux/linux-h6300-omap1_2.6.14.3.bb +++ b/packages/linux/linux-h6300-omap1_2.6.14.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for h6300 devices." SECTION = "kernel" LICENSE = "GPL" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.14-omap2.bz2;patch=1 \ file://patch-linux-2614-omap2-to-2614_3-omap1-h6300;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-h6300-omap1_2.6.16.16.bb b/packages/linux/linux-h6300-omap1_2.6.16.16.bb index 28aaadd107..d1d82adde9 100644 --- a/packages/linux/linux-h6300-omap1_2.6.16.16.bb +++ b/packages/linux/linux-h6300-omap1_2.6.16.16.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for HP iPAQ h6300 series OMAP1510 based phones." SECTION = "kernel" LICENSE = "GPL" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1 \ file://linux-2.6.16.16.patch;patch=1 \ file://linux-h6300-omap2-2.6.16.16.patch;patch=1 \ diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb index 93f45c80d5..bbdb696a48 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -6,7 +6,7 @@ PR = "r0" COMPATIBLE_HOST = "sh.*-linux" #COMPATIBLE_MACHINE = "jornada6xx" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconfig_jlime \ file://LinuxSH-2.6.17.patch;patch=0 \ file://unexpected-int-fix.patch;patch=0 \ diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb index a120b193e7..900191ae2b 100644 --- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb @@ -6,7 +6,7 @@ PR = "r0" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "jornada7xx" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconf_jlime \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb index d4b8da1b4b..4f0349e326 100644 --- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb +++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb @@ -6,7 +6,7 @@ PR = "r0" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "jornada7xx" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \ file://defconf_jlime \ file://linux-2.6.18-jornada7xx.patch;patch=0" diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb index 28cf3e08c0..7fc274351a 100644 --- a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb +++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb @@ -6,8 +6,8 @@ PR = "r0" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "jornada7xx" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ file://jornada7xx.patch;patch=0 \ file://defconf_jlime " diff --git a/packages/linux/linux-ks8695_2.6.16.bb b/packages/linux/linux-ks8695_2.6.16.bb index 176b1fcbdb..e2bc3bb8d8 100644 --- a/packages/linux/linux-ks8695_2.6.16.bb +++ b/packages/linux/linux-ks8695_2.6.16.bb @@ -3,7 +3,7 @@ SECTION = "kernel" LICENSE = "GPL" PR = "r0" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://ks8695-headers-r0.patch;patch=1 \ file://ks8695-base-r0.patch;patch=1 \ file://defconfig-ks8695" diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb index 5da6c57d73..b2375950e8 100644 --- a/packages/linux/linux-mtx-3_2.6.15.4.bb +++ b/packages/linux/linux-mtx-3_2.6.15.4.bb @@ -12,7 +12,7 @@ inherit kernel DEPENDS = "uboot" RDEPENDS = "mtd-utils" -SRC_URI += "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \ +SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \ file://00-mtx-3.diff;patch=1 \ file://01-verbose-and-fatal-mkuboot.diff;patch=1 \ file://defconfig-mtx-3" diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb index 29d8944a3b..47042bfec7 100644 --- a/packages/linux/linux-navman_2.6.18.bb +++ b/packages/linux/linux-navman_2.6.18.bb @@ -8,7 +8,7 @@ PR = "r0" COMPATIBLE_MACHINE = "navman-icn330" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ http://www.duff.dk/navman/navman-2.6.18.patch;patch=1 \ file://defconfig \ " diff --git a/packages/linux/linux-netvista_2.4.27.bb b/packages/linux/linux-netvista_2.4.27.bb index 75c3943f62..2b2721c7c4 100644 --- a/packages/linux/linux-netvista_2.4.27.bb +++ b/packages/linux/linux-netvista_2.4.27.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel x86 for IBM Netvista" LICENSE = "GPL" PR = "r4" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ file://netvista_defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb index feb9581e5c..1a6d1f894a 100644 --- a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb +++ b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2;patch=1 \ file://schedstats-arm.patch;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb index 54b1e304c9..74d6822ff4 100644 --- a/packages/linux/linux-omap1_2.6.12-rc2.bb +++ b/packages/linux/linux-omap1_2.6.12-rc2.bb @@ -2,7 +2,7 @@ require linux-omap1.inc PR = "r4" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.12-rc2-omap1.bz2;patch=1 \ file://defconfig" diff --git a/packages/linux/linux-omap1_2.6.18-omap1.bb b/packages/linux/linux-omap1_2.6.18-omap1.bb index ea429fe400..bc1510b4a7 100644 --- a/packages/linux/linux-omap1_2.6.18-omap1.bb +++ b/packages/linux/linux-omap1_2.6.18-omap1.bb @@ -1,6 +1,6 @@ require linux-omap1.inc -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.18-omap1.bz2;patch=1 \ file://another-ide-cs-ids.patch;patch=1 \ file://defconfig \ diff --git a/packages/linux/linux-rp_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb index 99ca5b090b..6ce8ba1ab6 100644 --- a/packages/linux/linux-rp_2.6.16.bb +++ b/packages/linux/linux-rp_2.6.16.bb @@ -12,7 +12,7 @@ PR = "r47" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://rmk-mmc1.patch;patch=1;status=merged \ file://rmk-mmc2.patch;patch=1;status=merged \ ${RPSRC}/led_core-r15.patch;patch=1;status=merged \ diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index 705b4164e0..eba9f5ef01 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -12,7 +12,7 @@ PR = "r31" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \ diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb index 6e688d1ee5..097eaf8470 100644 --- a/packages/linux/linux-rp_2.6.18.bb +++ b/packages/linux/linux-rp_2.6.18.bb @@ -12,7 +12,7 @@ PR = "r6" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \ ${RPSRC}/poodle_audio-r6.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb index 87b1bd0ba8..b13b127722 100644 --- a/packages/linux/linux-rp_2.6.19.bb +++ b/packages/linux/linux-rp_2.6.19.bb @@ -14,7 +14,7 @@ DEFAULT_PREFERENCE = "-1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ diff --git a/packages/linux/linux-smdk2440_2.6.18.bb b/packages/linux/linux-smdk2440_2.6.18.bb index 23949914ba..701e08a7c4 100644 --- a/packages/linux/linux-smdk2440_2.6.18.bb +++ b/packages/linux/linux-smdk2440_2.6.18.bb @@ -5,7 +5,7 @@ PR = "r1" GGSRC = "http://www.xora.org.uk/oe/patches/" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ ${GGSRC}smdk2440-cs89x0-r1.patch;patch=1 \ ${GGSRC}smdk2440-touchscreen-r1.patch;patch=1 \ file://defconfig-smdk2440" diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb index 541f881fd0..d949e13324 100644 --- a/packages/linux/linux-storcenter_2.6.12.6.bb +++ b/packages/linux/linux-storcenter_2.6.12.6.bb @@ -27,7 +27,7 @@ PR = "r0" COMPATIBLE_MACHINE = "storcenter" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://kernel.patch-${PV};patch=1 \ file://10-command-line.patch;patch=1 \ file://defconfig-${PV} " diff --git a/packages/linux/linux-sun4cdm_2.4.26.bb b/packages/linux/linux-sun4cdm_2.4.26.bb index d91b952787..7145c4451c 100644 --- a/packages/linux/linux-sun4cdm_2.4.26.bb +++ b/packages/linux/linux-sun4cdm_2.4.26.bb @@ -6,7 +6,7 @@ DEPENDS += "elftoaout-native" KERNEL_CCSUFFIX = "-3.3.4" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \ file://defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-sun4cdm_2.6.8.1.bb b/packages/linux/linux-sun4cdm_2.6.8.1.bb index c8c40ed7f1..40583903d8 100644 --- a/packages/linux/linux-sun4cdm_2.6.8.1.bb +++ b/packages/linux/linux-sun4cdm_2.6.8.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for sparc32/sun4c" LICENSE = "GPL" PR = "r1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://sun4c_defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-titan-sh4_2.6.17.bb b/packages/linux/linux-titan-sh4_2.6.17.bb index ac98115c27..55e55929a5 100644 --- a/packages/linux/linux-titan-sh4_2.6.17.bb +++ b/packages/linux/linux-titan-sh4_2.6.17.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for SH4 based TITAN router appliance" LICENSE = "GPL" PR = "r2" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ cvs://anonymous@linuxsh.cvs.sourceforge.net/cvsroot/linuxsh;module=linux;date=20060726 \ file://titan-flash.patch;patch=1 \ file://titan-pcibios-scan-update.patch;patch=1 \ diff --git a/packages/linux/linux-wrap-geode_2.6.17.bb b/packages/linux/linux-wrap-geode_2.6.17.bb index 7bf2c3ee1c..d717cd3c40 100644 --- a/packages/linux/linux-wrap-geode_2.6.17.bb +++ b/packages/linux/linux-wrap-geode_2.6.17.bb @@ -4,7 +4,7 @@ Geode SC1100 (i486) based wirless router appliance boards" LICENSE = "GPL" PR = "r0" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb index 830720f655..f193ec2c79 100644 --- a/packages/linux/linux-wrt_2.4.20.bb +++ b/packages/linux/linux-wrt_2.4.20.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" LICENSE = "GPL" PR = "r1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \ file://linux-2.4.20-mipscvs.patch;patch=1 \ file://2.4.20_broadcom_3_37_2_1109_US.patch;patch=1 \ file://110-sch_htb.patch;patch=1 \ diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index 352c879d45..cf67784af4 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -5,7 +5,7 @@ DEPENDS = "lzma-native" LICENSE = "GPL" PR = "r2" -SRC_URI = "http://www.fi.kernel.org/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ cvs://anonymous@openwrt.org/openwrt;module=openwrt/package/linux/kernel-source;tag=TESTED \ http://downloads.openwrt.org/sources/kernel-binary-wl-0.2.tar.gz \ http://downloads.openwrt.org/sources/kernel-source-et-0.6.tar.gz \ diff --git a/packages/linux/linux-x86_2.6.17.9.bb b/packages/linux/linux-x86_2.6.17.9.bb index 1dfabb398e..d7600dcfa9 100644 --- a/packages/linux/linux-x86_2.6.17.9.bb +++ b/packages/linux/linux-x86_2.6.17.9.bb @@ -3,7 +3,7 @@ SECTION = "kernel" LICENSE = "GPL" PR = "r2" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" S = "${WORKDIR}/linux-${PV}" diff --git a/packages/linux/linux_2.6.19-rc6.bb b/packages/linux/linux_2.6.19-rc6.bb index 56007c3222..59186ef579 100644 --- a/packages/linux/linux_2.6.19-rc6.bb +++ b/packages/linux/linux_2.6.19-rc6.bb @@ -4,13 +4,13 @@ LICENSE = "GPL" PV = "2.6.18+2.6.19-rc6" PR = "r1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc1.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc1-rc2.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc2-rc3.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc3-rc4.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc4-rc5.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc5-rc6.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc1.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc1-rc2.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc2-rc3.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc3-rc4.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc4-rc5.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/incr/patch-2.6.19-rc5-rc6.bz2;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.18" diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb index 8f8b754527..b258e197ff 100644 --- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb +++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)" LICENSE = "GPL" PR = "r3" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \ file://linux-2.6.17-rc5.patch;pnum=0;patch=1 \ file://ucb1400-ac97-audio.patch;pnum=1;patch=1 \ file://ucb1400-touchscreen.patch;pnum=1;patch=1 \ diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb index 9f25af51da..a3679d0b8c 100644 --- a/packages/linux/mainstone-kernel_2.6.11.bb +++ b/packages/linux/mainstone-kernel_2.6.11.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" LICENSE = "GPL" PR = "r1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ file://mainstone_defconfig" S = "${WORKDIR}/linux-2.6.11" diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb index 8aa327f1d2..df14cffca4 100644 --- a/packages/linux/mainstone-kernel_2.6.18.bb +++ b/packages/linux/mainstone-kernel_2.6.18.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" LICENSE = "GPL" PR = "r0" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://mainstone_defconfig" S = "${WORKDIR}/linux-2.6.18" diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index 79592a84eb..381900e038 100644 --- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -8,7 +8,7 @@ RMKV = "2" PXAV = "1" PR = "r5" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://lorien.handhelds.org/ftp.arm.linux.org.uk/kernel/v2.4/patch-${KV}-rmk${RMKV}.bz2;patch=1 \ file://diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \ file://mnci-combined.patch;patch=1" diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb index 54b398eec8..9852af6eca 100644 --- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb +++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb @@ -3,8 +3,8 @@ DESCRIPTION = "Linux kernel for the MX21ADS" LICENSE = "GPL" PR = "r2" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx21/mx21ads-2.6.19rc6-lg1.patch.bz2;patch=1 \ file://mx21ads_defconfig" diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb index d164dfd810..6d6ba6934a 100644 --- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb +++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb @@ -3,8 +3,8 @@ DESCRIPTION = "Linux kernel for the MX31ADS" LICENSE = "GPL" PR = "r3" -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.19-rc6.bz2;patch=1 \ http://opensource.wolfsonmicro.com/~lg/linux-2.6-mx31/mx31ads-2.6.19rc6-lg1.patch.bz2;patch=1 \ file://imx31ads_defconfig" diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb index 564350e620..126485b10f 100644 --- a/packages/linux/netbook-pro-kernel_2.6.17.bb +++ b/packages/linux/netbook-pro-kernel_2.6.17.bb @@ -5,7 +5,7 @@ PR = "r2" COMPATIBLE_MACHINE = "netbook-pro" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ http://linuxtogo.org/~koen/netbook-base-r3.patch;patch=1 \ http://linuxtogo.org/~koen/netbook-pcon-r0.patch;patch=1 \ http://linuxtogo.org/~koen/netbook-pcon-i2c-r1.patch;patch=1 \ diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index 9cad4d76c0..e5ed21f0a1 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -92,7 +92,7 @@ python () { name.append(patch) pname = '-'.join(name) if patch[0:2] == "rc" or patch[0:3] == "pre": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) kernel[-1] = str(int(kernel[-1]) - 1) if patch[0:2] == "rc" and pref == 10: pref = 6 @@ -101,14 +101,14 @@ python () { else: pref = 2 elif patch[0:2] == "bk" or patch[0:3] == "git": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname)) pref = 2 elif patch[0:2] == "ac": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname)) mmac = 2 filepath[0:0] = [ filedir % (name[0] + "-ac") ] elif patch[0:2] == "mm": - patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname)) + patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname)) mmac = 2 filepath[0:0] = [ filedir % (name[0] + "-mm") ] else: @@ -117,7 +117,7 @@ python () { base = pname base = '.'.join(kernel) - patch_uri[0] = "ftp://ftp.kernel.org/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base) + patch_uri[0] = "${KERNELORG_MIRROR}/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base) filepath[-1:-1] = [ filedir % base ] if base != minor: filepath[-1:-1] = [ filedir % minor ] diff --git a/packages/linux/nslu2-linksys-kernel_2.4.22.bb b/packages/linux/nslu2-linksys-kernel_2.4.22.bb index 8af30d09a3..7132d411fb 100644 --- a/packages/linux/nslu2-linksys-kernel_2.4.22.bb +++ b/packages/linux/nslu2-linksys-kernel_2.4.22.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" PR = "r2" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ http://nslu.sf.net/downloads/xfs-2.4.22-all-i386.bz2;patch=1 \ http://nslu.sf.net/downloads/2.4.22-xfs-nslu2.patch.bz2;patch=1 \ file://config-fixes.patch;patch=1 \ diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index 5ebc6b02be..cb33b2d172 100644 --- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = 'simpad' FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ file://${KV}-${VRSV}.patch;patch=1 \ file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \ file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \ diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index bf9d579b77..24fc3bf149 100644 --- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = 'simpad' FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ file://${KV}-${VRSV}.patch;patch=1 \ file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \ file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \ diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 6c02395794..cfedac8425 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "(poodle|corgi|shepherd|husky|poodle255|tosa)" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ ftp://ftp.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \ ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \ http://developer.ezaurus.com/sl_j/source/c860/${SHARPV}/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \ diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb index f8c1917ab9..81c24eda13 100644 --- a/packages/linux/triton-kernel_2.6.11.bb +++ b/packages/linux/triton-kernel_2.6.11.bb @@ -5,8 +5,8 @@ PR = "r0" KERNEL_SUFFIX = "triton" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \ file://patch-2.6.11-mm2-karo9.bz2;patch=1 \ file://defconfig" diff --git a/packages/man-pages/man-pages_2.41.bb b/packages/man-pages/man-pages_2.41.bb index a078853bb6..b05c591d56 100644 --- a/packages/man-pages/man-pages_2.41.bb +++ b/packages/man-pages/man-pages_2.41.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "base set of man pages." LICENSE = "GPL" -SRC_URI = "http://www.kernel.org/pub/linux/docs/manpages/man-pages-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/docs/manpages/man-pages-${PV}.tar.bz2" EXTRA_OEMAKE = "" do_compile () { diff --git a/packages/man/man_1.5m2.bb b/packages/man/man_1.5m2.bb index 5a88a8ca01..10e0576b3c 100644 --- a/packages/man/man_1.5m2.bb +++ b/packages/man/man_1.5m2.bb @@ -6,7 +6,7 @@ of the documentation available on a Linux system." RDEPENDS_${PN} = "less groff" PR = "r1" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/man/man-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/man/man-${PV}.tar.bz2" EXTRA_OEMAKE = "" GS = "-DGREPSILENT=\"q\"" diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb index 34b2bff32a..b05c935513 100644 --- a/packages/man/man_1.5p.bb +++ b/packages/man/man_1.5p.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "less groff" # Note: The default man.conf uses wrong names for GNU eqn and troff, # so we install our own -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/man/man-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/man/man-${PV}.tar.bz2 \ file://man.conf" # Disable parallel make or it tries to link objects before they are built diff --git a/packages/mdadm/mdadm.inc b/packages/mdadm/mdadm.inc index fa03492e8d..a944e0b190 100644 --- a/packages/mdadm/mdadm.inc +++ b/packages/mdadm/mdadm.inc @@ -4,7 +4,7 @@ device arrays using the "md" driver in Linux, also \ known as Software RAID arrays." LICENSE = "GPL" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2" CFLAGS += "-fno-strict-aliasing" diff --git a/packages/module-init-tools/module-init-tools_3.2.1.bb b/packages/module-init-tools/module-init-tools_3.2.1.bb index bbd8cca1bf..3733562c62 100644 --- a/packages/module-init-tools/module-init-tools_3.2.1.bb +++ b/packages/module-init-tools/module-init-tools_3.2.1.bb @@ -11,7 +11,7 @@ RDEPENDS_${PN} += "module-init-tools-depmod" FILES_module-init-tools-depmod = "${sbindir}/depmod.26" FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://ignore_arch_directory;patch=1 \ file://modutils_extension;patch=1 \ file://no_man_rebuild;patch=1 \ diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb index 727bfaac1b..c7782cb54c 100644 --- a/packages/module-init-tools/module-init-tools_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools_3.2.2.bb @@ -11,7 +11,7 @@ RDEPENDS_${PN} += "module-init-tools-depmod" FILES_module-init-tools-depmod = "${sbindir}/depmod.26" FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://ignore_arch_directory;patch=1 \ file://modutils_extension;patch=1 \ file://no_man_rebuild;patch=1 \ diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb index 56420f7de0..8e6fc8c544 100644 --- a/packages/modutils/modutils_2.4.27.bb +++ b/packages/modutils/modutils_2.4.27.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files" PR = "r7" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ file://lex.l.diff;patch=1 \ file://modutils-notest.patch;patch=1 \ file://configure.patch;patch=1 \ diff --git a/packages/gnutls/gnutls-1.4.0/.mtn2git_empty b/packages/mozilla/firefox-2.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnutls/gnutls-1.4.0/.mtn2git_empty +++ b/packages/mozilla/firefox-2.0/.mtn2git_empty diff --git a/packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty b/packages/mozilla/firefox-2.0/arm/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty +++ b/packages/mozilla/firefox-2.0/arm/.mtn2git_empty diff --git a/packages/mozilla/firefox-2.0/arm/jsautocfg.h b/packages/mozilla/firefox-2.0/arm/jsautocfg.h new file mode 100644 index 0000000000..05f3dad50a --- /dev/null +++ b/packages/mozilla/firefox-2.0/arm/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* Lovingly crafted by hand avoiding Mozilla stupidity */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 2L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0/mozconfig b/packages/mozilla/firefox-2.0/mozconfig new file mode 100644 index 0000000000..025b396ac7 --- /dev/null +++ b/packages/mozilla/firefox-2.0/mozconfig @@ -0,0 +1,53 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-debug +ac_add_options --disable-gtktest +ac_add_options --disable-tests + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static diff --git a/packages/qpe-vexed/.mtn2git_empty b/packages/mozilla/firefox-2.0/powerpc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qpe-vexed/.mtn2git_empty +++ b/packages/mozilla/firefox-2.0/powerpc/.mtn2git_empty diff --git a/packages/mozilla/firefox-2.0/powerpc/jsautocfg.h b/packages/mozilla/firefox-2.0/powerpc/jsautocfg.h new file mode 100644 index 0000000000..93d03744f2 --- /dev/null +++ b/packages/mozilla/firefox-2.0/powerpc/jsautocfg.h @@ -0,0 +1,52 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT 4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE 8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG 32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD 32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG2 5L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG 4L +#define JS_ALIGN_OF_INT64 8L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 8L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD 4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#endif /* js_cpucfg___ */ diff --git a/packages/mozilla/firefox-2.0/security-cross.patch b/packages/mozilla/firefox-2.0/security-cross.patch new file mode 100644 index 0000000000..56c8d04a9e --- /dev/null +++ b/packages/mozilla/firefox-2.0/security-cross.patch @@ -0,0 +1,93 @@ +--- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 ++++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 +@@ -52,88 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),m68k) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = m68k +-else +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),ppc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),ia64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ia64 +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq ($(OS_TEST),parisc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),parisc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),s390) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390 +-else +-ifeq ($(OS_TEST),s390x) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390x +-else +-ifeq ($(OS_TEST),mips) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = mips +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/packages/mozilla/firefox_2.0.bb b/packages/mozilla/firefox_2.0.bb new file mode 100644 index 0000000000..c8fbccc2bf --- /dev/null +++ b/packages/mozilla/firefox_2.0.bb @@ -0,0 +1,35 @@ +PR = "r1" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ + file://xptcstubs.patch;patch=1 \ + file://no-xmb.patch;patch=1 \ + file://jsautocfg.h \ + file://extensions-hack.patch;patch=1 \ + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1" + +S = "${WORKDIR}/mozilla" +DEFAULT_PREFERENCE = "-1" + +inherit mozilla + +require firefox.inc + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + + install -d ${STAGING_INCDIR}/${P} + cd dist/sdk/include + headers=`find . -name "*.h"` + for f in $headers + do + install -m 0644 $f ${STAGING_INCDIR}/${P}/$f + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h +} + diff --git a/packages/mozilla/minimo/bug-322806.diff b/packages/mozilla/minimo/bug-322806.diff new file mode 100644 index 0000000000..e001e3fc67 --- /dev/null +++ b/packages/mozilla/minimo/bug-322806.diff @@ -0,0 +1,13 @@ +See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600 + +--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100 +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb index b7c7792879..dcd22b3dd9 100644 --- a/packages/mozilla/minimo_0.016+cvs.bb +++ b/packages/mozilla/minimo_0.016+cvs.bb @@ -11,11 +11,12 @@ BRTAG = "MOZILLA_1_8_BRANCH" MOZDATE = "20060720" PV = "0.016+cvs${MOZDATE}" -PR = "r3" +PR = "r4" SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \ file://minimo.patch;patch=1 \ - file://mozconfig file://minimo \ + file://bug-322806.diff;patch=1 \ + file://mozconfig file://minimo \ file://minimo.desktop file://minimo.png" inherit autotools diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch index 8eec79f291..f1fe636df2 100644 --- a/packages/mplayer/files/Makefile-codec-cfg.patch +++ b/packages/mplayer/files/Makefile-codec-cfg.patch @@ -1,11 +1,13 @@ ---- trunk/Makefile.orig 2006-07-24 09:55:12.000000000 +0100 -+++ trunk/Makefile 2006-07-24 09:56:18.000000000 +0100 -@@ -410,7 +410,7 @@ - endif +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile ++++ trunk/Makefile +@@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS) + $(CC) -o $@ $^ $(LDFLAGS_MENCODER) - codec-cfg: codec-cfg.c codec-cfg.h help_mp.h + codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@ ++ $(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ - codecs.conf.h: codec-cfg etc/codecs.conf - ./codec-cfg ./etc/codecs.conf > $@ + codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf + ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch new file mode 100644 index 0000000000..0c3180c728 --- /dev/null +++ b/packages/mplayer/files/makefile-nostrip-svn.patch @@ -0,0 +1,26 @@ +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile ++++ trunk/Makefile +@@ -253,10 +253,10 @@ install: $(ALL_PRG) + ifeq ($(VIDIX),yes) + $(MAKE) -C libdha install + mkdir -p $(LIBDIR)/mplayer/vidix +- -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix ++ -install -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix + endif + $(INSTALL) -d $(BINDIR) +- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \ ++ $(INSTALL) -m 755 mplayer$(EXESUF) \ + $(BINDIR)/mplayer$(EXESUF) + ifeq ($(GUI),yes) + -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) +@@ -271,7 +271,7 @@ endif + fi ; \ + done + ifeq ($(MENCODER),yes) +- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \ ++ $(INSTALL) -m 755 mencoder$(EXESUF) \ + $(BINDIR)/mencoder$(EXESUF) + for i in $(MAN_LANG); do \ + if test "$$i" = en ; then \ diff --git a/packages/mplayer/files/makefile-nostrip.patch b/packages/mplayer/files/makefile-nostrip.patch new file mode 100644 index 0000000000..22e5c5ad61 --- /dev/null +++ b/packages/mplayer/files/makefile-nostrip.patch @@ -0,0 +1,22 @@ +Index: MPlayer-1.0rc1/Makefile +=================================================================== +--- MPlayer-1.0rc1.orig/Makefile ++++ MPlayer-1.0rc1/Makefile +@@ -416,7 +416,7 @@ ifeq ($(VIDIX),yes) + $(MAKE) -C vidix install + endif + $(INSTALL) -d $(BINDIR) +- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) ++ $(INSTALL) -m 755 $(PRG) $(BINDIR)/$(PRG) + ifeq ($(GUI),yes) + -ln -sf $(PRG) $(BINDIR)/gmplayer + endif +@@ -430,7 +430,7 @@ endif + fi ; \ + done + ifeq ($(MENCODER),yes) +- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) ++ $(INSTALL) -m 755 $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) + for i in $(MAN_LANG); do \ + if test "$$i" = en ; then \ + cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index f91a06d424..41b50bd656 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -15,6 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://w100-video_out.patch;patch=1 \ file://w100-mplayer.patch;patch=1 \ file://pld-onlyarm5.patch;patch=1 \ + file://makefile-nostrip.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1" diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index dd78992d23..5dca7401c9 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -12,8 +12,9 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://Makefile-codec-cfg.patch;patch=1 \ file://w100-configure-svn.patch;patch=1 \ file://w100-video_out.patch;patch=1 \ - file://w100-mplayer.patch;patch= \ - file://pld-onlyarm5.patch;patch=1" + file://w100-mplayer.patch;patch= \ + file://pld-onlyarm5.patch;patch=1 \ + file://makefile-nostrip-svn.patch;patch=1" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" diff --git a/packages/nis/nis.inc b/packages/nis/nis.inc index 18dd00437a..45232881cb 100644 --- a/packages/nis/nis.inc +++ b/packages/nis/nis.inc @@ -10,7 +10,7 @@ PRIORITY ?= "optional" LICENSE ?= "GPL-2" # Override these *after* the include file if necessary! -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${P}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/${P}.tar.bz2" inherit autotools gettext diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb index ddbc41a688..0e01e7e104 100644 --- a/packages/nis/pwdutils_2.6.bb +++ b/packages/nis/pwdutils_2.6.bb @@ -12,7 +12,7 @@ HOMEPAGE="http://lists.suse.com/archive/pwdutils/" require nis.inc -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" # an selinux API is used even if no selinux is detected by # configure. diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb index b544009e22..1cdf1f207e 100644 --- a/packages/nis/ypbind-mt_1.18.bb +++ b/packages/nis/ypbind-mt_1.18.bb @@ -16,7 +16,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" require nis.inc -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb index f887c808c9..1ab9aa8ea4 100644 --- a/packages/nis/ypserv_2.17.bb +++ b/packages/nis/ypserv_2.17.bb @@ -7,7 +7,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html" require nis.inc -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/gpub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" # ypserv needs a database package, gdbm is currently the # only candidate diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb index ef66fcf1da..c19d0ff9c8 100644 --- a/packages/pam/libpam_0.79.bb +++ b/packages/pam/libpam_0.79.bb @@ -26,7 +26,7 @@ pn = "Linux-PAM" p = "${pn}-${PV}" S = "${WORKDIR}/${p}" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/${p}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/pre/library/${p}.tar.bz2" # the patches are necessary to get the autoreconf and cross build # to work correctly diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb index ce9979ca91..22bf67d03a 100644 --- a/packages/pciutils/pciutils_2.1.11.bb +++ b/packages/pciutils/pciutils_2.1.11.bb @@ -10,7 +10,7 @@ PR="r3" PARALLEL_MAKE = "" FILES_pciutils-ids="${prefix}/share/pci.ids" PACKAGES =+ "pciutils-ids" -SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://configure-uclibc.patch;patch=1 \ file://pcimodules-pciutils-2.1.11.diff;patch=1" diff --git a/packages/pciutils/pciutils_2.2.4.bb b/packages/pciutils/pciutils_2.2.4.bb index ce683a152a..57d9e2089f 100644 --- a/packages/pciutils/pciutils_2.2.4.bb +++ b/packages/pciutils/pciutils_2.2.4.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml" LICENSE = "GPLv2" DEPENDS = "zlib" -SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://pcimodules-pciutils.diff;patch=1" diff --git a/packages/pcmciautils/pcmciautils.inc b/packages/pcmciautils/pcmciautils.inc new file mode 100644 index 0000000000..1df39549dc --- /dev/null +++ b/packages/pcmciautils/pcmciautils.inc @@ -0,0 +1,29 @@ +DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" +DEPENDS = "sysfsutils" +RDEPENDS = "udev module-init-tools" +HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" +SECTION = "kernel/userland" +PRIORITY = "optional" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" + +S = "${WORKDIR}/pcmciautils-${PV}" + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export sbindir = "${base_sbindir}" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +export udevrulesdir = "${sysconfdir}/udev/rules.d" +export UDEV = "1" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_010.bb b/packages/pcmciautils/pcmciautils_010.bb index 5b4c58beb2..bcebb5f624 100644 --- a/packages/pcmciautils/pcmciautils_010.bb +++ b/packages/pcmciautils/pcmciautils_010.bb @@ -1,31 +1,5 @@ -DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" -DEPENDS = "sysfsutils udev module-init-tools" -RDEPENDS = "udev module-init-tools" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" -S = "${WORKDIR}/pcmciautils-${PV}" +require pcmciautils.inc PR = "r3" -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export sbindir = "${base_sbindir}" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -export udevrulesdir = "${sysconfdir}/udev/rules.d" -export UDEV = "1" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" CFLAGS =+ '-DPCMCIAUTILS_VERSION=010' - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" diff --git a/packages/pcmciautils/pcmciautils_013.bb b/packages/pcmciautils/pcmciautils_013.bb index 8f10bb45da..17abe5dc9b 100644 --- a/packages/pcmciautils/pcmciautils_013.bb +++ b/packages/pcmciautils/pcmciautils_013.bb @@ -1,33 +1,6 @@ -DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" -DEPENDS = "sysfsutils udev module-init-tools" -RDEPENDS = "udev module-init-tools" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \ - file://makefile_fix.patch;patch=1 \ - file://version_workaround.patch;patch=1" -S = "${WORKDIR}/pcmciautils-${PV}" +require pcmciautils.inc PR = "r0" -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export sbindir = "${base_sbindir}" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -export udevrulesdir = "${sysconfdir}/udev/rules.d" -export UDEV = "1" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" -CFLAGS =+ '-DPCMCIAUTILS_VERSION=013' - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" +SRC_URI += "file://makefile_fix.patch;patch=1 \ + file://version_workaround.patch;patch=1" diff --git a/packages/pcmciautils/pcmciautils_014.bb b/packages/pcmciautils/pcmciautils_014.bb index 8f10bb45da..17abe5dc9b 100644 --- a/packages/pcmciautils/pcmciautils_014.bb +++ b/packages/pcmciautils/pcmciautils_014.bb @@ -1,33 +1,6 @@ -DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem" -DEPENDS = "sysfsutils udev module-init-tools" -RDEPENDS = "udev module-init-tools" -HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -SECTION = "kernel/userland" -PRIORITY = "optional" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \ - file://makefile_fix.patch;patch=1 \ - file://version_workaround.patch;patch=1" -S = "${WORKDIR}/pcmciautils-${PV}" +require pcmciautils.inc PR = "r0" -export HOSTCC = "${BUILD_CC}" -export etcdir = "${sysconfdir}" -export sbindir = "${base_sbindir}" -export pcmciaconfdir = "${sysconfdir}/pcmcia" -export udevrulesdir = "${sysconfdir}/udev/rules.d" -export UDEV = "1" -LD = "${CC}" -CFLAGS =+ "-I${S}/src" -CFLAGS =+ '-DPCMCIAUTILS_VERSION=013' - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" - -do_install () { - oe_runmake 'DESTDIR=${D}' install -} - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -RCONFLICTS_${PN} += "pcmcia-cs" +SRC_URI += "file://makefile_fix.patch;patch=1 \ + file://version_workaround.patch;patch=1" diff --git a/packages/pmtools/pmtools_20050926.bb b/packages/pmtools/pmtools_20050926.bb index 6e6e0f02e7..abeb8cf4ee 100644 --- a/packages/pmtools/pmtools_20050926.bb +++ b/packages/pmtools/pmtools_20050926.bb @@ -1,4 +1,4 @@ -SRC_URI="http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools-${PV}.tar.bz2" +SRC_URI="${KERNELORG_MIRROR}/pub/linux/kernel/people/lenb/acpi/utils/pmtools-${PV}.tar.bz2" S="${WORKDIR}/pmtools" diff --git a/packages/qpe-vexed/files/.mtn2git_empty b/packages/qpe-vexed/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/qpe-vexed/files/.mtn2git_empty +++ /dev/null diff --git a/packages/qpe-vexed/files/vit.patch b/packages/qpe-vexed/files/vit.patch deleted file mode 100644 index c07d46983a..0000000000 --- a/packages/qpe-vexed/files/vit.patch +++ /dev/null @@ -1,82 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qpe-vexed_arm/mainWidget.cpp~vit -+++ qpe-vexed_arm/mainWidget.cpp -@@ -24,7 +24,7 @@ - #include <qhbox.h> - #include <qpe/qpeapplication.h> - --MainWidget::MainWidget(QWidget *parent, const char *name) : QWidget(parent, name) { -+MainWidget::MainWidget(QWidget *parent, const char *name, WFlags f) : QMainWindow(parent, name, f) { - this -> setBackgroundMode(PaletteButton); - this -> setCaption("QPE-Vexed"); - ---- qpe-vexed_arm/mainWidget.h~vit -+++ qpe-vexed_arm/mainWidget.h -@@ -28,7 +28,7 @@ - #include "level.h" - #include "statuslabel.h" - --#include <qwidget.h> -+#include <qmainwindow.h> - #include <qstring.h> - - /* -@@ -36,10 +36,11 @@ - * Handles allmost all signals - */ - --class MainWidget : public QWidget { -+class MainWidget : public QMainWindow { - Q_OBJECT - public: -- MainWidget(QWidget *parent = NULL, const char *name = NULL); -+ static QString appName() { return QString::fromLatin1("qpevexed"); } -+ MainWidget(QWidget *parent = NULL, const char *name = NULL, WFlags f = 0); - ~MainWidget(); - protected: - void keyPressEvent(QKeyEvent*); ---- qpe-vexed_arm/qpeVexed.cpp~vit -+++ qpe-vexed_arm/qpeVexed.cpp -@@ -18,15 +18,8 @@ - * - */ - --#include <qpe/qpeapplication.h> - #include "mainWidget.h" -+#include <opie2/oapplicationfactory.h> - --int main(int argc, char **argv) { -- QPEApplication a(argc, argv); -- -- MainWidget mw; -- -- a.setMainWidget(&mw); -- mw.show(); -- a.exec(); --} -+using namespace Opie::Core; -+OPIE_EXPORT_APP( OApplicationFactory<MainWidget> ) ---- qpe-vexed_arm/statuslabel.cpp~vit -+++ qpe-vexed_arm/statuslabel.cpp -@@ -32,6 +32,6 @@ - StatusLabel::~StatusLabel() {} - - void StatusLabel::setLabel(const QString& pack, const QString& name, int num) { -- QString s = QString::number(num); -+ QString s = QString::number(num+1); - setText(pack+" ("+s+"):\n\t"+name); - } ---- qpe-vexed_arm/qpe-vexed.pro~vit -+++ qpe-vexed_arm/qpe-vexed.pro -@@ -5,6 +5,6 @@ - SOURCES = button.cpp fileiface.cpp level.cpp mainWidget.cpp menuBar.cpp playingBoard.cpp qpeVexed.cpp stone.cpp about.cpp statuslabel.cpp instruction.cpp - INCLUDEPATH += $(QPEDIR)/include - DEPENDPATH += $(QPEDIR)/include --LIBS += -lqpe -lqte -+LIBS += -lqpe -lqte -lopiecore2 - #INTERFACES = board_designed.ui - TARGET = qpe-vexed diff --git a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb deleted file mode 100644 index 0748e58915..0000000000 --- a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Vexed levels for qpe-vexed" -SECTION = "opie/games" -PRIORITY = "optional" -LICENSE = "GPL" -AUTHOR = "The Vexed Development Team" -HOMEPAGE = "http://vexed.sourceforge.net/" -PACKAGE_ARCH = "all" -PR = "r2" - -SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/vexed-levelpacks-20060109.tar.gz" - -S = "${WORKDIR}" - -do_install () { - install -d ${D}${palmtopdir}/etc/qpe-vexed - - for level in ${WORKDIR}/levelpacks/*.ini; - do - install -m 0664 "$level" "${D}${palmtopdir}/etc/qpe-vexed/`basename "$level" .ini`.lvl"; - done -} - -FILES_${PN} = "${palmtopdir}/etc/qpe-vexed/*.lvl" - diff --git a/packages/qpe-vexed/qpe-vexed_1.3.bb b/packages/qpe-vexed/qpe-vexed_1.3.bb deleted file mode 100644 index b38cf5b954..0000000000 --- a/packages/qpe-vexed/qpe-vexed_1.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Vexed clone" -SECTION = "opie/games" -PRIORITY = "optional" -LICENSE = "GPL" -AUTHOR = "Alexander Hausner <Alexander.Hausner@web.de>" -HOMEPAGE = "http://wwwcip.informatik.uni-erlangen.de/~sialhaus/qpe-vexed.html" -DEPENDS = "qpe-vexed-levels" -RDEPENDS = "qpe-vexed-levels" -APPNAME = "qpe-vexed" -APPTYPE = "binary" -APPDESKTOP = "${S}" -PR = "r3" - -SRC_URI = "http://wwwcip.informatik.uni-erlangen.de/~sialhaus/qpe-vexed_1.3_src.tar.gz \ - file://vit.patch;patch=1" - -S = "${WORKDIR}/qpe-vexed_arm/" - -inherit opie - -do_install () { - install -d ${D}${palmtopdir}/pics/${APPNAME}/ \ - ${D}${palmtopdir}/apps/Games/ \ - ${D}${palmtopdir}/bin/ - - install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed.png ${D}${palmtopdir}/pics/ - install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed/*.bmp ${D}${palmtopdir}/pics/${APPNAME}/ -} diff --git a/packages/sylpheed/claws-mail_2.6.1.bb b/packages/sylpheed/claws-mail_2.6.1.bb new file mode 100644 index 0000000000..bed205766b --- /dev/null +++ b/packages/sylpheed/claws-mail_2.6.1.bb @@ -0,0 +1,41 @@ +SECTION = "x11/network" +DESCRIPTION = "Mail user agent" +DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2" + +FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" + +EXTRA_OECONF = "--disable-openssl --disable-aspell-test \ + --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR}/${HOST_SYS} \ + --enable-aspell" + +CFLAGS += "-D_GNU_SOURCE" + +inherit autotools pkgconfig + +do_configure() { + gnu-configize + libtoolize --force + oe_runconf +} + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 claws-mail.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/ + mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN} +} + +do_stage () { + autotools_stage_all +} + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d) + + do_split_packages(d, abiword_libdir, '^(.*)\.so$', 'claws-mail-plugin-%s', 'Claws plugin for %s', extra_depends='') +} diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb index fd92b92dc1..a255ad15c3 100644 --- a/packages/syslinux/syslinux-native_2.11.bb +++ b/packages/syslinux/syslinux-native_2.11.bb @@ -8,7 +8,7 @@ LICENSE="GPL" PR="r1" -SRC_URI="http://www.kernel.org/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \ +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \ file://edx_assume_zero.patch;patch=1" S="${WORKDIR}/syslinux-${PV}" diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb index f24029f466..4cf7873f36 100644 --- a/packages/syslinux/syslinux-native_3.11.bb +++ b/packages/syslinux/syslinux-native_3.11.bb @@ -8,7 +8,7 @@ LICENSE="GPL" PR="r1" -SRC_URI="http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " S="${WORKDIR}/syslinux-${PV}" diff --git a/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch b/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch new file mode 100644 index 0000000000..89555ac027 --- /dev/null +++ b/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch @@ -0,0 +1,15 @@ +--- /examples/orig-Makefile 2005-12-16 18:39:27.000000000 +0200 ++++ /examples/Makefile 2006-12-02 14:58:59.000000000 +0200 +@@ -123,10 +123,10 @@ + $(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \ + -o $@ -e $(<:.o=) $< $(LIB) \ + -L$(gcclibdir) -lgcc +-%.srec: % ++%.srec: %.o + $(OBJCOPY) -O srec $< $@ 2>/dev/null + +-%.bin: % ++%.bin: %.o + $(OBJCOPY) -O binary $< $@ 2>/dev/null + + ######################################################################### diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb index f5751db204..2b29674e7a 100644 --- a/packages/uboot/u-boot_1.1.4.bb +++ b/packages/uboot/u-boot_1.1.4.bb @@ -6,7 +6,9 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://u-boot-make381-fix.patch;patch=1" + SRC_URI_append_gumstix = "\ file://u-boot-autoscript.patch;patch=1 \ file://u-boot-base.patch;patch=1 \ @@ -24,6 +26,10 @@ SRC_URI_append_gumstix = "\ SRC_URI_append_amsdelta = "\ http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1" +SRC_URI_append_dht-walnut= "\ + file://u-boot-dht-walnut-df2.patch;patch=1" + + EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}" TARGET_LDFLAGS = "" @@ -31,6 +37,8 @@ TARGET_LDFLAGS = "" UBOOT_MACHINE ?= "${MACHINE}_config" UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" +UBOOT_MACHINE_dht-walnut = "walnut_config" + def gumstix_mhz(d): import bb m = bb.data.getVar('GUMSTIX_400MHZ', d, 1) diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 7954376d08..1ae2c3b596 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -5,7 +5,7 @@ RPROVIDES = "hotplug" PR = "r14" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ file://udevsynthesize.patch;patch=1 \ diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb index 79ea7b06de..29709c6209 100644 --- a/packages/udev/udev_097.bb +++ b/packages/udev/udev_097.bb @@ -10,7 +10,7 @@ needed to link programs with libvolume_id." PR = "r5" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ file://mount.blacklist \ diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index b17f852c64..dd956668ed 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -11,7 +11,7 @@ needed to link programs with libvolume_id." PR = "r4" -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ file://mount.blacklist \ diff --git a/packages/util-linux/util-linux-native_2.12r.bb b/packages/util-linux/util-linux-native_2.12r.bb index 862a6716bd..d6c60786de 100644 --- a/packages/util-linux/util-linux-native_2.12r.bb +++ b/packages/util-linux/util-linux-native_2.12r.bb @@ -5,7 +5,7 @@ DEPENDS = "zlib-native ncurses-native" inherit autotools native -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \ file://gcc34.patch;patch=1 \ file://MCONFIG \ file://make_include \ diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index aaad0a9697..a5ff009669 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -5,7 +5,7 @@ DEPENDS = "zlib ncurses" inherit autotools -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \ file://gcc34.patch;patch=1 \ file://MCONFIG \ file://make_include \ diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index b0eb8d2489..5b5abf4cea 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -16,9 +16,9 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util;${BUILD_CC} makekeys.c -o makekeys ) || exit 1 - rm -f ${STAGING_INCDIR}/X11/Xlib.h + rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake } diff --git a/packages/zeecookbook/.mtn2git_empty b/packages/zeecookbook/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/zeecookbook/.mtn2git_empty +++ /dev/null diff --git a/packages/zeecookbook/files/.mtn2git_empty b/packages/zeecookbook/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/zeecookbook/files/.mtn2git_empty +++ /dev/null diff --git a/packages/zeecookbook/files/zeecookbook.patch b/packages/zeecookbook/files/zeecookbook.patch deleted file mode 100644 index 94e786dc5d..0000000000 --- a/packages/zeecookbook/files/zeecookbook.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- zeecookbook/zeecookbook.pro -+++ zeecookbook/zeecookbook.pro -@@ -82,5 +82,5 @@ - INTERFACES = - INCLUDEPATH += $(QPEDIR)/include - LIBS += -L$(QPEDIR)/lib -lsqlite -lqpe --DESTDIR = $(QPEDIR)/bin -+DESTDIR = . - TARGET = zeecookbook diff --git a/packages/zeecookbook/zeecookbook_1.1.bb b/packages/zeecookbook/zeecookbook_1.1.bb deleted file mode 100644 index 1964af1eea..0000000000 --- a/packages/zeecookbook/zeecookbook_1.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Zee Cookbook is a cookbook application for Zaurus. \ -It lets you store, view and edit your recipes on your pda. \ -Zee Cookbook can import Meal-Master files and can \ -export recipes in Meal-Master format or in HTML." -SECTION = "opie/applications" -DEPENDS = "sqlite" -PRIORITY = "optional" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://sf.gds.tuwien.ac.at/z/ze/zeecookbook/zeecookbook-1.1.zip \ - file://zeecookbook.patch;patch=1" - -S="${WORKDIR}/zeecookbook-1.1/src/zeecookbook" -QPEDIR="${OPIEDIR}" - -inherit palmtop - - -do_install () { - install -d ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/zeecookbook \ - ${D}${palmtopdir}/help/en - -echo ${STAGING_DIR} -echo ${STAGING} - install -m 0755 ${S}/zeecookbook ${D}${palmtopdir}/bin/ - install -m 0644 ${S}/apps/Applications/zeecookbook.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${S}/pics/ZeeCookbook.png ${D}${palmtopdir}/pics/ - install -m 0644 ${S}/pics/zeecookbook/*.png ${D}${palmtopdir}/pics/zeecookbook/ - install -m 0644 ${S}/help/en/zeecookbook.html ${D}${palmtopdir}/help/en/ -} diff --git a/removal.txt b/removal.txt index 785afa9c12..3a388c4b3c 100644 --- a/removal.txt +++ b/removal.txt @@ -35,40 +35,16 @@ Maintainer: None Reason: Obsolete version - 1.2 is current, 1.0 is not fetchable Proposed by: Marcin 'Hrw' Juszkiewicz -Package Name: zeecookbook -Removal Date: 2006-12-12 -Maintainer: None -Reason: Not maintained upstream, not fetchable -Proposed by: Marcin 'Hrw' Juszkiewicz - -Package Name: qpe-vexed -Removal Date: 2006-12-12 -Maintainer: None -Reason: Not fetchable, all search results points to OE related infos -Proposed by: Marcin 'Hrw' Juszkiewicz - Package Name: ipac-ng Removal Date: 2006-12-12 Maintainer: None Reason: Depends on libgd-perl which is not in metada Proposed by: Marcin 'Hrw' Juszkiewicz -Package Name: -Removal Date: 2006-12-12 -Maintainer: None -Reason: Obsolete version -Proposed by: Marcin 'Hrw' Juszkiewicz - -Package Name: -Removal Date: 2006-12-12 -Maintainer: None -Reason: Obsolete version -Proposed by: Marcin 'Hrw' Juszkiewicz - Package Name: nsqld Removal Date: 2006-12-12 Maintainer: None -Reason: Never used +Reason: Never used Proposed by: Florian Boor Package Name: gpe-mileage diff --git a/site/arm-linux b/site/arm-linux index 3c1a082bd7..32b5c5403f 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -312,3 +312,6 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes} #dbus ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no} + +#apache +apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} diff --git a/site/ix86-common b/site/ix86-common index 6e6a2c96dd..6db5a6c5b0 100644 --- a/site/ix86-common +++ b/site/ix86-common @@ -35,6 +35,7 @@ ac_cv_linux_vers=${ac_cv_linux_vers=2} ac_cv_sctp=${ac_cv_sctp=no} apr_cv_process_shared_works=${apr_cv_process_shared_works=no} +apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} ac_cv_path_ESD_CONFIG=no lf_cv_sane_realloc=yes diff --git a/site/powerpc-linux b/site/powerpc-linux index b6cef0cb0e..6e749d4640 100644 --- a/site/powerpc-linux +++ b/site/powerpc-linux @@ -33,6 +33,9 @@ cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} # libc libc_cv_ppc_machine=${libc_cv_ppc_machine=yes} +libc_cv_mlong_double_128ibm=${libc_cv_mlong_double_128ibm=yes} +libc_cv_mabi_ibmlongdouble=${libc_cv_mabi_ibmlongdouble=yes} +libc_cv_mlong_double_128=${libc_cv_mlong_double_128=yes} # apache ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} @@ -257,3 +260,10 @@ ac_cv_negative_eai=${ac_cv_negative_eai=yes} apr_cv_gai_addrconfig=${apr_cv_gai_addrconfig=no} ac_cv_o_nonblock_inherited=${ac_cv_o_nonblock_inherited=no} apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} + +# binutils (libiberty) +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_type_int=${ac_cv_type_int=yes} +ac_cv_type_uintptr_t=${ac_cv_type_uintptr_t=yes} +liberty_cv_uint64=${liberty_cv_uint64=uint64_t} + |