merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 20:27:47 +0000 (20:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 20:27:47 +0000 (20:27 +0000)
     and 'aa6010d679e0e80d63f4e63191b66e5759482858'

180 files changed:
classes/base.bbclass
classes/package.bbclass
conf/bitbake.conf
conf/machine/compulab-pxa270.conf
conf/machine/efika.conf
conf/machine/logicpd-pxa270.conf
conf/machine/storcenter.conf
conf/machine/x86.conf
contrib/site-conf/aclocal.m4
contrib/site-conf/configure.ac
contrib/site-conf/m4/gnu.m4 [new file with mode: 0644]
packages/autofs/autofs_3.1.7.bb
packages/autofs/autofs_4.0.0.bb
packages/autofs/autofs_4.1.4.bb
packages/binutils/binutils_2.14.90.0.6.bb
packages/binutils/binutils_2.14.90.0.7.bb
packages/binutils/binutils_2.15.94.0.1.bb
packages/binutils/binutils_2.16.91.0.6.bb
packages/binutils/binutils_2.16.91.0.7.bb
packages/binutils/binutils_2.17.50.0.1.bb
packages/binutils/binutils_2.17.50.0.5.bb
packages/diethotplug/diethotplug_0.4.bb
packages/fontconfig/fontconfig_2.4.1.bb
packages/gnutls/gnutls-1.0.23/.mtn2git_empty [deleted file]
packages/gnutls/gnutls-1.0.23/export-symbols.patch [deleted file]
packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch [deleted file]
packages/gnutls/gnutls-1.0.25/.mtn2git_empty [deleted file]
packages/gnutls/gnutls-1.0.25/export-symbols.patch [deleted file]
packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch [deleted file]
packages/gnutls/gnutls-1.3.5/.mtn2git_empty [deleted file]
packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch [deleted file]
packages/gnutls/gnutls-1.3.5/gnutls-texinfo-euro.patch [deleted file]
packages/gnutls/gnutls-1.4.0/.mtn2git_empty [deleted file]
packages/gnutls/gnutls-1.4.0/gnutls-openssl.patch [deleted file]
packages/gnutls/gnutls-1.4.0/gnutls-texinfo-euro.patch [deleted file]
packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch [deleted file]
packages/gnutls/gnutls-1.4.4/onceonly.m4 [deleted file]
packages/gnutls/gnutls.inc [new file with mode: 0644]
packages/gnutls/gnutls/.mtn2git_empty [new file with mode: 0644]
packages/gnutls/gnutls/gnutls-openssl.patch [new file with mode: 0644]
packages/gnutls/gnutls/gnutls-texinfo-euro.patch [new file with mode: 0644]
packages/gnutls/gnutls/onceonly.m4 [new file with mode: 0644]
packages/gnutls/gnutls_1.0.23.bb [deleted file]
packages/gnutls/gnutls_1.0.25.bb [deleted file]
packages/gnutls/gnutls_1.3.5.bb [deleted file]
packages/gnutls/gnutls_1.4.0.bb [deleted file]
packages/gnutls/gnutls_1.4.4.bb
packages/gnutls/gnutls_1.6.0.bb [new file with mode: 0644]
packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty [deleted file]
packages/gpe-mixer/gpe-mixer-0.32/fix_makefile.patch [deleted file]
packages/gpe-mixer/gpe-mixer_0.32.bb [deleted file]
packages/gpe-mixer/gpe-mixer_0.34.bb [deleted file]
packages/gpe-mixer/gpe-mixer_0.38.bb [deleted file]
packages/gpe-mixer/gpe-mixer_0.40.bb [deleted file]
packages/gpe-mixer/gpe-mixer_0.41.bb [deleted file]
packages/hotplug-ng/hotplug-ng_001.bb
packages/hotplug-ng/hotplug-ng_002.bb
packages/interbench/interbench_0.30.bb
packages/kernbench/kernbench_0.41.bb
packages/klibc/klibc.inc
packages/ksymoops/ksymoops_2.4.9.bb
packages/libcap/libcap_1.10.bb
packages/libetpan/libetpan_0.48.bb [new file with mode: 0644]
packages/linux-hotplug/linux-hotplug_20040329.bb
packages/linux-hotplug/linux-hotplug_20040920.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
packages/linux-uml/linux-uml_2.4.26.bb
packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
packages/linux/compulab-pxa270_2.6.16.bb
packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
packages/linux/ipod_2.4.24-ipod0.bb
packages/linux/ixp4xx-kernel.inc
packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
packages/linux/linux-colinux_2.4.28.bb
packages/linux/linux-colinux_2.6.10.bb
packages/linux/linux-dht-walnut_2.6.12.6.bb
packages/linux/linux-dht-walnut_2.6.12.bb
packages/linux/linux-epia_2.6.11.bb
packages/linux/linux-epia_2.6.12.bb
packages/linux/linux-epia_2.6.8.1.bb
packages/linux/linux-ezx_2.6.16.13.bb
packages/linux/linux-geodegx_2.4.24.bb
packages/linux/linux-geodelx_2.6.11.bb
packages/linux/linux-gumstix_2.6.15.bb
packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
packages/linux/linux-h1940_2.6.14-h1940.bb
packages/linux/linux-h1940_2.6.17-h1940.bb
packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
packages/linux/linux-h6300-omap1_2.6.14.3.bb
packages/linux/linux-h6300-omap1_2.6.16.16.bb
packages/linux/linux-jlime-jornada6xx_2.6.17.bb
packages/linux/linux-jlime-jornada7xx_2.6.17.bb
packages/linux/linux-jlime-jornada7xx_2.6.18.bb
packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
packages/linux/linux-ks8695_2.6.16.bb
packages/linux/linux-mtx-3_2.6.15.4.bb
packages/linux/linux-navman_2.6.18.bb
packages/linux/linux-netvista_2.4.27.bb
packages/linux/linux-omap-2.6_2.6.9-omap1.bb
packages/linux/linux-omap1_2.6.12-rc2.bb
packages/linux/linux-omap1_2.6.18-omap1.bb
packages/linux/linux-rp_2.6.16.bb
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.18.bb
packages/linux/linux-rp_2.6.19.bb
packages/linux/linux-smdk2440_2.6.18.bb
packages/linux/linux-storcenter_2.6.12.6.bb
packages/linux/linux-sun4cdm_2.4.26.bb
packages/linux/linux-sun4cdm_2.6.8.1.bb
packages/linux/linux-titan-sh4_2.6.17.bb
packages/linux/linux-wrap-geode_2.6.17.bb
packages/linux/linux-wrt_2.4.20.bb
packages/linux/linux-wrt_2.4.30.bb
packages/linux/linux-x86_2.6.17.9.bb
packages/linux/linux_2.6.19-rc6.bb
packages/linux/logicpd-pxa270_2.6.17-rc5.bb
packages/linux/mainstone-kernel_2.6.11.bb
packages/linux/mainstone-kernel_2.6.18.bb
packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
packages/linux/mx21ads-kernel_2.6.19rc6.bb
packages/linux/mx31ads-kernel_2.6.19rc6.bb
packages/linux/netbook-pro-kernel_2.6.17.bb
packages/linux/nslu2-kernel.inc
packages/linux/nslu2-linksys-kernel_2.4.22.bb
packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
packages/linux/triton-kernel_2.6.11.bb
packages/man-pages/man-pages_2.41.bb
packages/man/man_1.5m2.bb
packages/man/man_1.5p.bb
packages/mdadm/mdadm.inc
packages/module-init-tools/module-init-tools_3.2.1.bb
packages/module-init-tools/module-init-tools_3.2.2.bb
packages/modutils/modutils_2.4.27.bb
packages/mozilla/firefox-2.0/.mtn2git_empty [new file with mode: 0644]
packages/mozilla/firefox-2.0/arm/.mtn2git_empty [new file with mode: 0644]
packages/mozilla/firefox-2.0/arm/jsautocfg.h [new file with mode: 0644]
packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch [new file with mode: 0644]
packages/mozilla/firefox-2.0/mozconfig [new file with mode: 0644]
packages/mozilla/firefox-2.0/powerpc/.mtn2git_empty [new file with mode: 0644]
packages/mozilla/firefox-2.0/powerpc/jsautocfg.h [new file with mode: 0644]
packages/mozilla/firefox-2.0/security-cross.patch [new file with mode: 0644]
packages/mozilla/firefox_2.0.bb [new file with mode: 0644]
packages/nis/nis.inc
packages/nis/pwdutils_2.6.bb
packages/nis/ypbind-mt_1.18.bb
packages/nis/ypserv_2.17.bb
packages/pam/libpam_0.79.bb
packages/pciutils/pciutils_2.1.11.bb
packages/pciutils/pciutils_2.2.4.bb
packages/pcmciautils/pcmciautils.inc [new file with mode: 0644]
packages/pcmciautils/pcmciautils_010.bb
packages/pcmciautils/pcmciautils_013.bb
packages/pcmciautils/pcmciautils_014.bb
packages/pmtools/pmtools_20050926.bb
packages/qpe-vexed/.mtn2git_empty [deleted file]
packages/qpe-vexed/files/.mtn2git_empty [deleted file]
packages/qpe-vexed/files/vit.patch [deleted file]
packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb [deleted file]
packages/qpe-vexed/qpe-vexed_1.3.bb [deleted file]
packages/sylpheed/claws-mail_2.6.1.bb [new file with mode: 0644]
packages/syslinux/syslinux-native_2.11.bb
packages/syslinux/syslinux-native_3.11.bb
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
packages/util-linux/util-linux-native_2.12r.bb
packages/util-linux/util-linux.inc
packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
packages/zeecookbook/.mtn2git_empty [deleted file]
packages/zeecookbook/files/.mtn2git_empty [deleted file]
packages/zeecookbook/files/zeecookbook.patch [deleted file]
packages/zeecookbook/zeecookbook_1.1.bb [deleted file]
removal.txt
site/powerpc-linux

index e1d0e88..249a25a 100644 (file)
@@ -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/
index c53b3ee..132fdcb 100644 (file)
@@ -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()
index b06e2bb..dcdc18c 100644 (file)
@@ -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"
index b49bf48..12f8277 100644 (file)
@@ -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"
 
index d2a0e54..5b2c87b 100644 (file)
@@ -6,6 +6,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
index dc41e7c..8fd58bb 100644 (file)
@@ -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"
 
index 2c21b52..a36684b 100644 (file)
@@ -1,7 +1,7 @@
 TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 # TARGET_VENDOR = "oe"
-IPKG_ARCHS = "all ppc powerpc ppc603e ${MACHINE}"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
index b2147f2..91663df 100644 (file)
@@ -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"
index 8d4b7ee..f415403 100644 (file)
@@ -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])
index 0f08732..283008a 100644 (file)
@@ -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 (file)
index 0000000..1f9331e
--- /dev/null
@@ -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
+])
index e09971b..05481ed 100644 (file)
@@ -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
 
index 2258411..6033b8a 100644 (file)
@@ -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
 
index 35a1652..128c24e 100644 (file)
@@ -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"
index 4a60789..e20a40c 100644 (file)
@@ -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 \
index efad9f5..caae896 100644 (file)
@@ -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 \
index 9aa1b05..a8802c0 100644 (file)
@@ -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 \
index 680730d..8e63fe7 100644 (file)
@@ -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 \
index 664fce8..ad81300 100644 (file)
@@ -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 \
index 664fce8..ad81300 100644 (file)
@@ -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 \
index 09e4a36..4e566fb 100644 (file)
@@ -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 \
index 86f8a6f..150b442 100644 (file)
@@ -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"
index 2590fed..0989393 100644 (file)
@@ -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/gnutls/gnutls-1.0.23/.mtn2git_empty b/packages/gnutls/gnutls-1.0.23/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
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 (file)
index 22a1373..0000000
+++ /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 (file)
index 3ddd8b3..0000000
+++ /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/.mtn2git_empty b/packages/gnutls/gnutls-1.0.25/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
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 (file)
index 22a1373..0000000
+++ /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 (file)
index 3ddd8b3..0000000
+++ /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.3.5/.mtn2git_empty b/packages/gnutls/gnutls-1.3.5/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch b/packages/gnutls/gnutls-1.3.5/gnutls-openssl.patch
deleted file mode 100644 (file)
index 6eca97e..0000000
+++ /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.3.5/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls-1.3.5/gnutls-texinfo-euro.patch
deleted file mode 100644 (file)
index e2a2762..0000000
+++ /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/.mtn2git_empty b/packages/gnutls/gnutls-1.4.0/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
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 (file)
index 6eca97e..0000000
+++ /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 (file)
index e2a2762..0000000
+++ /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 (file)
index e2a2762..0000000
+++ /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/onceonly.m4 b/packages/gnutls/gnutls-1.4.4/onceonly.m4
deleted file mode 100644 (file)
index f6fec37..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-# onceonly.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl This file defines some "once only" variants of standard autoconf macros.
-dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
-dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
-dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
-dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
-dnl The advantage is that the check for each of the headers/functions/decls
-dnl will be put only once into the 'configure' file. It keeps the size of
-dnl the 'configure' file down, and avoids redundant output when 'configure'
-dnl is run.
-dnl The drawback is that the checks cannot be conditionalized. If you write
-dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-dnl function.
-
-dnl Autoconf version 2.57 or newer is recommended.
-AC_PREREQ(2.54)
-
-# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
-  :
-  AC_FOREACH([gl_HEADER_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
-                                                 [-./], [___])), [
-      AC_CHECK_HEADERS(gl_HEADER_NAME)
-    ])
-    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-                                                   [-./], [___])))
-  ])
-])
-
-# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
-  :
-  AC_FOREACH([gl_FUNC_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
-      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
-    ])
-    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
-  ])
-])
-
-# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-# AC_CHECK_DECLS(DECL1, DECL2, ...).
-AC_DEFUN([AC_CHECK_DECLS_ONCE], [
-  :
-  AC_FOREACH([gl_DECL_NAME], [$1], [
-    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
-      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
-    ])
-    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
-  ])
-])
diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc
new file mode 100644 (file)
index 0000000..0d13d13
--- /dev/null
@@ -0,0 +1,42 @@
+DESCRIPTION = "GNU Transport Layer Security Library"
+HOMEPAGE = "http://www.gnu.org/software/gnutls/"
+DEPENDS = "zlib libgcrypt lzo"
+
+LICENSE = "LGPL"
+
+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
+
+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
+
+    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/.mtn2git_empty b/packages/gnutls/gnutls/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/gnutls/gnutls/gnutls-openssl.patch b/packages/gnutls/gnutls/gnutls-openssl.patch
new file mode 100644 (file)
index 0000000..e2c1895
--- /dev/null
@@ -0,0 +1,124 @@
+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;
++  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);
+@@ -285,6 +290,7 @@
+ SSL_set_fd (SSL * ssl, int fd)
+ {
+   gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
++  ssl->rfd = ssl->wfd = fd;
+   return 1;
+ }
+@@ -310,6 +316,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)
+ {
+@@ -325,6 +342,8 @@
+ int
+ SSL_pending (SSL * ssl)
+ {
++  if (ssl->ssl_peek_avail)
++    return ssl->ssl_peek_avail;
+   return gnutls_record_check_pending (ssl->gnutls_state);
+ }
+@@ -480,11 +499,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;
+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;
+     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/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls/gnutls-texinfo-euro.patch
new file mode 100644 (file)
index 0000000..e2a2762
--- /dev/null
@@ -0,0 +1,16 @@
+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/onceonly.m4 b/packages/gnutls/gnutls/onceonly.m4
new file mode 100644 (file)
index 0000000..f6fec37
--- /dev/null
@@ -0,0 +1,63 @@
+# onceonly.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  AC_FOREACH([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
+                                                 [-./], [___])), [
+      AC_CHECK_HEADERS(gl_HEADER_NAME)
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [-./], [___])))
+  ])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  AC_FOREACH([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+  ])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  AC_FOREACH([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+  ])
+])
diff --git a/packages/gnutls/gnutls_1.0.23.bb b/packages/gnutls/gnutls_1.0.23.bb
deleted file mode 100644 (file)
index 76dd844..0000000
+++ /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 (file)
index 4b4b63c..0000000
+++ /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 (file)
index bcadacb..0000000
+++ /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.0.bb b/packages/gnutls/gnutls_1.4.0.bb
deleted file mode 100644 (file)
index 0267684..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "GNU Transport Layer Security Library"
-DEPENDS = "zlib libgcrypt lzo"
-HOMEPAGE = "http://www.gnu.org/software/gnutls/"
-LICENSE = "LGPL"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
-           file://gnutls-openssl.patch;patch=1 \
-           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_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/
-}
-
index e80dc3b..3337e0b 100644 (file)
@@ -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 (file)
index 0000000..c5dffdc
--- /dev/null
@@ -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/.mtn2git_empty b/packages/gpe-mixer/gpe-mixer-0.32/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
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 (file)
index 767bdec..0000000
+++ /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 (file)
index d064a3c..0000000
+++ /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 (file)
index d6cb6dc..0000000
+++ /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 (file)
index d6cb6dc..0000000
+++ /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 (file)
index 3d3ef98..0000000
+++ /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 (file)
index 3d3ef98..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe pkgconfig
-
-DESCRIPTION = "GPE audio mixer"
-DEPENDS = "gtk+ libgpewidget"
-SECTION = "gpe"
-PRIORITY = "optional"
-
index 2a10df6..c76c0f0 100644 (file)
@@ -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}"
 
index 2b6b1d4..3c5014b 100644 (file)
@@ -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}"
 
index 6ddc947..84bd88d 100644 (file)
@@ -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
 
index 4a49cce..33f651a 100644 (file)
@@ -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
 
index be9448a..29ca168 100644 (file)
@@ -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}"
 
index 52bd0bf..0ce6459 100644 (file)
@@ -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}"
 
index 49332c0..a7e1068 100644 (file)
@@ -6,7 +6,7 @@ DEPENDS = "bison-native flex-native"
 
 CFLAGS_append = " -I${S}/libcap/include"
 
-SRC_URI = "http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${PN}-${PV}.tar.bz2 \
+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 "
 
diff --git a/packages/libetpan/libetpan_0.48.bb b/packages/libetpan/libetpan_0.48.bb
new file mode 100644 (file)
index 0000000..dfef3b1
--- /dev/null
@@ -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"
index 06d9fae..80d6eca 100644 (file)
@@ -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 \
index 7c27551..6209504 100644 (file)
@@ -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 \
index 8fb2600..2e9e7ea 100644 (file)
@@ -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 \
index 2513b4e..6767d7a 100644 (file)
@@ -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"
index efcb228..a5dbfd8 100644 (file)
@@ -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"
index 848bb70..e71199d 100644 (file)
@@ -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 \
index 4d86d99..5e6f664 100644 (file)
@@ -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"
index 5c257ea..a79c902 100644 (file)
@@ -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"
index 217b393..09926ce 100644 (file)
@@ -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 \
                   "
index befb587..875f47c 100644 (file)
@@ -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"
index f66039f..e6248e5 100644 (file)
@@ -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  "
 
index 4c57515..2e49e91 100644 (file)
@@ -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 ]
index 6906fdd..6c5e1cb 100644 (file)
@@ -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 \
index 18197fa..d58c28e 100644 (file)
@@ -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 \
index 1191945..b74be3d 100644 (file)
@@ -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 \
index ecd0f64..8b77a17 100644 (file)
@@ -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"
 
index decb5d2..7c0f434 100644 (file)
@@ -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 \
index 54586b2..cdf0c62 100644 (file)
@@ -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 \
index 1b2ee9b..dd68bcd 100644 (file)
@@ -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}"
index 1b2ee9b..dd68bcd 100644 (file)
@@ -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}"
index 11173e1..ef38d10 100644 (file)
@@ -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"
index dda0330..58d98c3 100644 (file)
@@ -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 \
index 605a36e..c58e0d4 100644 (file)
@@ -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 \
index 3798685..f84ceb7 100644 (file)
@@ -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"
 
index 6afa1ac..90a7259 100644 (file)
@@ -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 \
index 7ad662a..2425676 100644 (file)
@@ -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"
 
index 71829a3..750750f 100644 (file)
@@ -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"
index 40a0efa..5fbe040 100644 (file)
@@ -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 \
index 18f9036..299d813 100644 (file)
@@ -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"
index 4f5e4dc..ea5aeee 100644 (file)
@@ -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"
index 28aaadd..d1d82ad 100644 (file)
@@ -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 \
index 93f45c8..bbdb696 100644 (file)
@@ -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 \
index a120b19..900191a 100644 (file)
@@ -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 \
index d4b8da1..4f0349e 100644 (file)
@@ -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"
                            
index 28cf3e0..7fc2743 100644 (file)
@@ -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 "
 
index 176b1fc..e2bc3bb 100644 (file)
@@ -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"
index 5da6c57..b237595 100644 (file)
@@ -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"
index 29d8944..47042bf 100644 (file)
@@ -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 \
                   "
index 75c3943..2b2721c 100644 (file)
@@ -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}"
 
index feb9581..1a6d1f8 100644 (file)
@@ -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"
index 54b1e30..74d6822 100644 (file)
@@ -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"
 
index ea429fe..bc1510b 100644 (file)
@@ -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 \
index 99ca5b0..6ce8ba1 100644 (file)
@@ -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 \
index 705b416..eba9f5e 100644 (file)
@@ -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 \
index 6e688d1..097eaf8 100644 (file)
@@ -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 \
index 87b1bd0..b13b127 100644 (file)
@@ -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 \
index 2394991..701e08a 100644 (file)
@@ -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"
index 541f881..d949e13 100644 (file)
@@ -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} "
index d91b952..7145c44 100644 (file)
@@ -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}"
 
index c8c40ed..4058390 100644 (file)
@@ -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}"
 
index ac98115..55e5592 100644 (file)
@@ -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 \
index 7bf2c3e..d717cd3 100644 (file)
@@ -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}"
 
index 830720f..f193ec2 100644 (file)
@@ -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 \
index 352c879..cf67784 100644 (file)
@@ -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 \
index 1dfabb3..d7600dc 100644 (file)
@@ -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}"
index 56007c3..59186ef 100644 (file)
@@ -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"
index 8f8b754..b258e19 100644 (file)
@@ -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 \
index 9f25af5..a3679d0 100644 (file)
@@ -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"
index 8aa327f..df14cff 100644 (file)
@@ -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"
index 79592a8..381900e 100644 (file)
@@ -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"
index 54b398e..9852af6 100644 (file)
@@ -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"
 
index d164dfd..6d6ba69 100644 (file)
@@ -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"
 
index 564350e..126485b 100644 (file)
@@ -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 \
index 9cad4d7..e5ed21f 100644 (file)
@@ -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 ]
index 8af30d0..7132d41 100644 (file)
@@ -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 \
index 5ebc6b0..cb33b2d 100644 (file)
@@ -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 \
index bf9d579..24fc3bf 100644 (file)
@@ -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 \
index 6c02395..cfedac8 100644 (file)
@@ -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 \
index f8c1917..81c24ed 100644 (file)
@@ -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"
  
index a078853..b05c591 100644 (file)
@@ -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 () {
index 5a88a8c..10e0576 100644 (file)
@@ -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\""
index 34b2bff..b05c935 100644 (file)
@@ -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
index fa03492..a944e0b 100644 (file)
@@ -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"
 
index bbd8cca..3733562 100644 (file)
@@ -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 \
index 727bfaa..c7782cb 100644 (file)
@@ -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 \
index 56420f7..8e6fc8c 100644 (file)
@@ -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/mozilla/firefox-2.0/.mtn2git_empty b/packages/mozilla/firefox-2.0/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/mozilla/firefox-2.0/arm/.mtn2git_empty b/packages/mozilla/firefox-2.0/arm/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/mozilla/firefox-2.0/arm/jsautocfg.h b/packages/mozilla/firefox-2.0/arm/jsautocfg.h
new file mode 100644 (file)
index 0000000..05f3dad
--- /dev/null
@@ -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 (file)
index 0000000..39978cf
--- /dev/null
@@ -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 (file)
index 0000000..025b396
--- /dev/null
@@ -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/mozilla/firefox-2.0/powerpc/.mtn2git_empty b/packages/mozilla/firefox-2.0/powerpc/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/mozilla/firefox-2.0/powerpc/jsautocfg.h b/packages/mozilla/firefox-2.0/powerpc/jsautocfg.h
new file mode 100644 (file)
index 0000000..93d0374
--- /dev/null
@@ -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 (file)
index 0000000..56c8d04
--- /dev/null
@@ -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 (file)
index 0000000..c8fbccc
--- /dev/null
@@ -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
+}
+
index 18dd004..4523288 100644 (file)
@@ -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
 
index ddbc41a..0e01e7e 100644 (file)
@@ -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.
index b544009..1cdf1f2 100644 (file)
@@ -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.
index f887c80..1ab9aa8 100644 (file)
@@ -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
index ef66fcf..c19d0ff 100644 (file)
@@ -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
index ce9979c..22bf67d 100644 (file)
@@ -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"
index ce683a1..57d9e20 100644 (file)
@@ -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 (file)
index 0000000..1df3954
--- /dev/null
@@ -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"
index 5b4c58b..bcebb5f 100644 (file)
@@ -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"
index 8f10bb4..17abe5d 100644 (file)
@@ -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"
index 8f10bb4..17abe5d 100644 (file)
@@ -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"
index 6e6e0f0..abeb8cf 100644 (file)
@@ -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/.mtn2git_empty b/packages/qpe-vexed/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/qpe-vexed/files/.mtn2git_empty b/packages/qpe-vexed/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/qpe-vexed/files/vit.patch b/packages/qpe-vexed/files/vit.patch
deleted file mode 100644 (file)
index c07d469..0000000
+++ /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 (file)
index 0748e58..0000000
+++ /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 (file)
index b38cf5b..0000000
+++ /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 (file)
index 0000000..bed2057
--- /dev/null
@@ -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='')
+}
index fd92b92..a255ad1 100644 (file)
@@ -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}"
index f24029f..4cf7873 100644 (file)
@@ -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}"
 
index 7954376..1ae2c3b 100644 (file)
@@ -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 \
index 79ea7b0..29709c6 100644 (file)
@@ -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 \
index b17f852..dd95666 100644 (file)
@@ -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 \
index 862a671..d6c6078 100644 (file)
@@ -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 \
index aaad0a9..a5ff009 100644 (file)
@@ -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 \
index b0eb8d2..5b5abf4 100644 (file)
@@ -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 (file)
index e69de29..0000000
diff --git a/packages/zeecookbook/files/.mtn2git_empty b/packages/zeecookbook/files/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packages/zeecookbook/files/zeecookbook.patch b/packages/zeecookbook/files/zeecookbook.patch
deleted file mode 100644 (file)
index 94e786d..0000000
+++ /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 (file)
index 1964af1..0000000
+++ /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/
-}
index 2c72a65..79af0cc 100644 (file)
@@ -23,46 +23,30 @@ Maintainer:     None
 Reason:         Obsoleted by task-base
 Proposed by:    Koen Kooi
 
+Package Name:   bluez*2.*
+Removal Date:   2007-01-15
+Maintainer:     None
+Reason:         Obsolete by, and conflicts with bluez 3.7               
+Proposed by:    Koen Kooi
+Will fix:       Paul Sokolovsky
+Reason:         Still known to be used by OPIE, so extra time needed to upgrade it.
+
 Package Name:   mono
 Removal Date:   2006-12-12
 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
index 5cbd9ff..6e749d4 100644 (file)
@@ -237,22 +237,13 @@ ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr='yes'}
 # vim
 ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}
 
-#openprotium additions:
-ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
-ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
-
-#samba
-samba_cv_have_gettimeofday_tz=${samba_cv_have_gettimeofday_tz=yes}
-samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_use_setresuid=${samba_cv_use_setresuid=yes}
-
 #modphp 
 ac_cv_c_bigendian_php=${ac_cv_c_bigendian_php=yes}
 ac_cv_sizeof_ptrdiff_t=${ac_cv_sizeof_ptrdiff_t=0}
 ac_cv_func_dlopen=${ac_cv_func_dlopen=yes}
 lt_cv_dlopen_self=${lt_cv_dlopen_self=yes}
 
-# for apache2 (note other apache stanza in this file provided by OE
+# apache2 (note other apache stanza in this file)
 ap_void_ptr_lt_long=${ap_void_ptr_lt_long=no}
 apr_cv_use_lfs64=${apr_cv_use_lfs64=yes}
 apr_cv_epoll=${apr_cv_epoll=yes}
@@ -261,25 +252,18 @@ apr_cv_pthreads_lib=${apr_cv_pthreads_lib=-lpthread}
 apr_cv_mutex_recursive=${apr_cv_mutex_recursive=yes}
 ac_cv_func_mmap=${ac_cv_func_mmap=yes}
 ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes}
-ac_cv_type_off_t=${ac_cv_type_off_t=yes}
 ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4}
-ac_cv_type_pid_t=${ac_cv_type_pid_t=yes}
 ac_cv_sizeof_pid_t=${ac_cv_sizeof_pid_t=4}
-ac_cv_type_size_t=${ac_cv_type_size_t=yes}
-ac_cv_type_ssize_t=${ac_cv_type_ssize_t=yes}
 ac_cv_socklen_t=${ac_cv_socklen_t=yes}
-ac_cv_type_voidp=${ac_cv_type_voidp=yes}
-ac_cv_sizeof_voidp=${ac_cv_sizeof_voidp=4}
 ac_cv_struct_rlimit=${ac_cv_struct_rlimit=yes}
-ac_cv_type_char=${ac_cv_type_char=yes}
-ac_cv_type_int=${ac_cv_type_int=yes}
-ac_cv_type_long=${ac_cv_type_long=yes}
-ac_cv_type_short=${ac_cv_type_short=yes}
-ac_cv_type_long_long=${ac_cv_type_long_long=yes}
 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}
 
-# fnmatch
-ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=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}
+