summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2008-03-25 07:34:23 +0000
committerGraeme Gregory <dp@xora.org.uk>2008-03-25 07:34:23 +0000
commit80e765ba6f2c395006d82251bea0b3590b277dff (patch)
treea1af31784e3970f80650ca0af796ab7386362423 /packages/linux
parent30670f2daf9a086b47cee18af56265bf8fedaf29 (diff)
parentbc02b41d392b6fce7a50e992de6b5b2234bab183 (diff)
merge of '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'
and '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-ixp4xx/defconfig-2.6.24.4 (renamed from packages/linux/linux-ixp4xx/defconfig-2.6.24)0
-rw-r--r--packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 (renamed from packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24)0
-rw-r--r--packages/linux/linux-ixp4xx_2.6.24.4.bb (renamed from packages/linux/linux-ixp4xx_2.6.24.bb)10
3 files changed, 3 insertions, 7 deletions
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
index 790120452a..790120452a 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
index 0e14d09d11..0e14d09d11 100644
--- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
diff --git a/packages/linux/linux-ixp4xx_2.6.24.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb
index 9a5967afa2..d7ccb4c096 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb
@@ -1,21 +1,17 @@
-# Keep this until the dsmg600 via-velocity BE patch is forward-ported
-DEFAULT_PREFERENCE = "-1"
-
require linux.inc
require linux-ixp4xx.inc
VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.24.4"
# If you use a rc, you will need to use this:
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r1"
-
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
file://defconfig-${KERNEL_RELEASE}"