merge of 49c7fac357ce377fd6c3fd7142468078920e4984

     and a5762bef24ad46c05460e1d0d170dc8e011fb2db

63 files changed, 86 insertions, 86 deletions

diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index 4d86d9958c..5e6f664bc2 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPL"
 PR = "r2"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://linux-2.6.16.patch;patch=1 \
            file://defconfig \
 	   http://www.compulab.co.il/x270/download/x270-linux-drv.zip"
diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
index 5c257eae47..a79c90220c 100644
--- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
+++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP"
 LICENSE = "GPL"
 PR = "r2"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
 	   ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11-rc4_idp.patch;patch=1 \
 	   ftp://ftp.accelent.com/pxa255_idp/linux/kernel-2.6.11_idp_leds.patch;patch=1 \
 	   ftp://ftp.accelent.com/pxa255_idp/linux/devkitidp-pxa255_defconfig"
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 217b393069..09926ce5c0 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -5,9 +5,9 @@ PR = "r1"
 
 COMPATIBLE_MACHINE = "ep93xx"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
-	   http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc1.bz2;patch=1 \
-	   http://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.18-rc1-git9.bz2;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc1.bz2;patch=1 \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.18-rc1-git9.bz2;patch=1 \
 	   http://www.wantstofly.org/~buytenh/ep93xx/derevo20.diff;pnum=1;patch=1 \
            file://defconfig \
 		   "
diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index befb587f89..875f47c99c 100644
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 COMPATIBLE_MACHINE = "gumstix"
 
 # NOTE: pulled local linux-2.6.5-gnalm1, since it didn't apply cleanly
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \
            file://linux-2.6.5-gnalm1.patch;patch=1 \
            http://gumstix.superlucidity.net/downloads/kernel/patches/linux-2.6.5-gnalm1-gum0.patch;patch=1 \
            file://defconfig"
diff --git a/packages/linux/ipod_2.4.24-ipod0.bb b/packages/linux/ipod_2.4.24-ipod0.bb
index f66039f90e..e6248e581d 100644
--- a/packages/linux/ipod_2.4.24-ipod0.bb
+++ b/packages/linux/ipod_2.4.24-ipod0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 KV = "2.4.24"
 PV = "${KV}-ipod0"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz;patch=1 \
            ${SOURCEFORGE_MIRROR}/ipodlinux/uclinux-2.4.24-ipod0.patch.gz;patch=1  "
 
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 4c5751565f..2e49e912f5 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -87,7 +87,7 @@ python () {
         name.append(patch)
         pname = '-'.join(name)
         if patch[0:2] == "rc" or patch[0:3] == "pre":
-            patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname))
             kernel[-1] = str(int(kernel[-1]) - 1)
             if patch[0:2] == "rc" and pref == 10:
                 pref = 6
@@ -96,14 +96,14 @@ python () {
             else:
                 pref = 2
         elif patch[0:2] == "bk" or patch[0:3] == "git":
-            patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname))
             pref = 2
         elif patch[0:2] == "ac":
-            patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/alan/linux-%s/%s/patch-%s" % (major, base, pname))
             mmac = 2
             filepath[0:0] = [ filedir % (name[0] + "-ac") ]
         elif patch[0:2] == "mm":
-            patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname))
+            patch_uri.append("${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/%s/%s/%s/%s.bz2;patch=1;pname=%s" % (major, base, pname, pname, pname))
             mmac = 2
             filepath[0:0] = [ filedir % (name[0] + "-mm") ]
         else:
@@ -112,7 +112,7 @@ python () {
         base = pname
 
     base = '.'.join(kernel)
-    patch_uri[0] = "ftp://ftp.kernel.org/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base)
+    patch_uri[0] = "${KERNELORG_MIRROR}/pub/linux/kernel/v%s/linux-%s.tar.bz2" % (major, base)
     filepath[-1:-1] = [ filedir % base ]
     if base != minor:
         filepath[-1:-1] = [ filedir % minor ]
diff --git a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
index 6906fdd14e..6c5e1cb16c 100644
--- a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
+++ b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 COMPATIBLE_MACHINE = "amsdelta"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 	http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1 \
 	http://the.earth.li/pub/e3/2.6.16/00-ams-delta-backlight.diff;patch=1 \
 	http://the.earth.li/pub/e3/2.6.16/01-ams-delta-lcd.diff;patch=1 \
diff --git a/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb b/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
index 18197fa4bc..d58c28e227 100644
--- a/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
+++ b/packages/linux/linux-bast_2.4.25-vrs1-bast1.bb
@@ -6,7 +6,7 @@ KV = "2.4.25"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;patch=1 \
            http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;patch=1 \
            file://defconfig \
diff --git a/packages/linux/linux-colinux_2.4.28.bb b/packages/linux/linux-colinux_2.4.28.bb
index 1191945540..b74be3d791 100644
--- a/packages/linux/linux-colinux_2.4.28.bb
+++ b/packages/linux/linux-colinux_2.4.28.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 COLV = "0.6.1"
 
 #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-0.6.1.tar.gz
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
 	   file://colinux-${COLV}.patch;patch=1 \
 	   file://nofpu.patch;patch=1 \
 	   file://shortloadbytes.patch;patch=1 \
diff --git a/packages/linux/linux-colinux_2.6.10.bb b/packages/linux/linux-colinux_2.6.10.bb
index ecd0f64a0d..8b77a17109 100644
--- a/packages/linux/linux-colinux_2.6.10.bb
+++ b/packages/linux/linux-colinux_2.6.10.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 COLV = "0.6.2"
 
 #http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-${COLV}.tar.gz
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   file://colinux-${COLV}.patch;patch=1 \
 	   file://defconfig"
 
diff --git a/packages/linux/linux-dht-walnut_2.6.12.6.bb b/packages/linux/linux-dht-walnut_2.6.12.6.bb
index 15a6946331..7c0f434477 100644
--- a/packages/linux/linux-dht-walnut_2.6.12.6.bb
+++ b/packages/linux/linux-dht-walnut_2.6.12.6.bb
@@ -1,12 +1,12 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for DHT-Walnut (ppc)  machine"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 DEPENDS = "u-boot"
 
 KERNEL_CCSUFFIX = "-3.4.4"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://ppc_40x_uboot.patch;patch=1 \
            file://iw_we18-5.diff;patch=1 \
            file://linux-2.6.12-mppe-mppc-1.3.patch;patch=1 \
@@ -55,7 +55,7 @@ do_install_append () {
         install -d  ${DEPLOY_DIR}/images
         install -m 0755 arch/ppc/boot/images/zImage.elf ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf
         install -m 0755 vmlinux ${DEPLOY_DIR}/images/
-        powerpc-linux-uclibc-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
+        powerpc-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR}/images/vmlinux ${DEPLOY_DIR}/images/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/images/linux.bin
         mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "owmnr"+${PV}+"-ppc" -d ${DEPLOY_DIR}/images/linux.bin.gz ${DEPLOY_DIR}/images/uImage-${PV}-${MACHINE}-${DATETIME}.bin
         rm ${DEPLOY_DIR}/images/vmlinux
diff --git a/packages/linux/linux-dht-walnut_2.6.12.bb b/packages/linux/linux-dht-walnut_2.6.12.bb
index 54586b2976..cdf0c62561 100644
--- a/packages/linux/linux-dht-walnut_2.6.12.bb
+++ b/packages/linux/linux-dht-walnut_2.6.12.bb
@@ -6,7 +6,7 @@ DEPENDS = "u-boot"
 
 KERNEL_CCSUFFIX = "-3.4.4"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://ppc_40x_uboot.patch;patch=1 \
            file://iw_we18-5.diff;patch=1 \
            file://linux-2.6.12-mppe-mppc-1.3.patch;patch=1 \
diff --git a/packages/linux/linux-epia_2.6.11.bb b/packages/linux/linux-epia_2.6.11.bb
index 1b2ee9be6d..dd68bcd4b7 100644
--- a/packages/linux/linux-epia_2.6.11.bb
+++ b/packages/linux/linux-epia_2.6.11.bb
@@ -5,7 +5,7 @@ PR = "r0"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \
            file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"
diff --git a/packages/linux/linux-epia_2.6.12.bb b/packages/linux/linux-epia_2.6.12.bb
index 1b2ee9be6d..dd68bcd4b7 100644
--- a/packages/linux/linux-epia_2.6.12.bb
+++ b/packages/linux/linux-epia_2.6.12.bb
@@ -5,7 +5,7 @@ PR = "r0"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \
            file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"
diff --git a/packages/linux/linux-epia_2.6.8.1.bb b/packages/linux/linux-epia_2.6.8.1.bb
index 11173e1dff..ef38d10853 100644
--- a/packages/linux/linux-epia_2.6.8.1.bb
+++ b/packages/linux/linux-epia_2.6.8.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
 PR = "r15"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	   http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1 \
 	   http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \
            file://epia_defconfig"
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index dda0330b0a..58d98c37f1 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -15,7 +15,7 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
 ##############################################################
 # source and patches
 #
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-ezx7.tar.bz2 \
            \
            file://sa1100-rtc-gcc4.diff;patch=1 \
diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb
index 605a36e49a..c58e0d46bc 100644
--- a/packages/linux/linux-geodegx_2.4.24.bb
+++ b/packages/linux/linux-geodegx_2.4.24.bb
@@ -6,7 +6,7 @@ KV = "2.4.24"
 DESCRIPTION = "Linux kernel for the AMD Geode GX processor"
 LICENSE = "GPL"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 	http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_${KV}_1.00.tar.gz \
 	file://${WORKDIR}/Patches_Linux_${KV}_1.00/linux-${KV}-geode.patch;patch=1 \
 	file://linux-2.4.24-gcc340-fixes.patch;patch=1 \
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index 3798685f14..f84ceb7f1e 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -19,7 +19,7 @@ inherit kernel
 ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
 
-SRC_URI = "http://kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
 	http://www.amd.com/files/connectivitysolutions/geode/geode_lx/${AMD_DRIVER_LABEL}.patch;patch=1 \
 	file://defconfig"
 
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index 6afa1ac43a..90a7259d9f 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -5,7 +5,7 @@ PR = "r1"
 
 COMPATIBLE_MACHINE = "gumstix"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 		   cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd;date=20060223 \
            file://defconfig-gumstix \
 		   file://arch-config.patch;patch=1 \
diff --git a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
index 7ad662a1df..242567634c 100644
--- a/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.11-bk1-h1940.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
-           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/snapshots/old/patch-2.6.11-bk1.gz;patch=1 \
            http://rtpnet.nerim.net/ipaq/2.6.11-bk1/2.6.11-bk1-h1940.patch;patch=1 \
            file://defconfig"
 
diff --git a/packages/linux/linux-h1940_2.6.14-h1940.bb b/packages/linux/linux-h1940_2.6.14-h1940.bb
index 71829a36eb..750750f5d1 100644
--- a/packages/linux/linux-h1940_2.6.14-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.14-h1940.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \
 	   http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch;patch=1 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch;patch=1 \
            file://defconfig"
diff --git a/packages/linux/linux-h1940_2.6.17-h1940.bb b/packages/linux/linux-h1940_2.6.17-h1940.bb
index 40a0efae12..5fbe040810 100644
--- a/packages/linux/linux-h1940_2.6.17-h1940.bb
+++ b/packages/linux/linux-h1940_2.6.17-h1940.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/v2.6.17-gitcurrent.patch;patch=1 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/full.patch;patch=1 \
            http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/serial_sparse.patch;patch=1 \
diff --git a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
index 18f9036d9d..299d813964 100644
--- a/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
+++ b/packages/linux/linux-h6300-omap1_2.6.12-rc5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel for h6300 devices."
 SECTION = "kernel"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \
            http://www.muru.com/linux/omap/patches/patch-2.6.12-rc5-omap2.bz2;patch=1 \