summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.20/series5
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.20.bb3
3 files changed, 3 insertions, 7 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3edaa342cb..8bb143dbba 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.3"
+SLUGOS_VERSION = "4.4"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series
index 6ceb7622ac..4b67723257 100644
--- a/packages/linux/ixp4xx-kernel/2.6.20/series
+++ b/packages/linux/ixp4xx-kernel/2.6.20/series
@@ -9,10 +9,7 @@ squashfs/squashfs-force-O2.patch
squashfs/squashfs-lzma.patch
squashfs/squashfs-Kconfig.patch
squashfs/squashfs-Makefile.patch
-00-linux-2.6.20.1.patch
-01-fix-redboot-parse-oops.patch
-02-fix-redboot-parse-regression.patch
-03-improve-byteswap-redboot-parse.patch
+00-linux-2.6.20.2.patch
07-remove-avila-ixdp425-setup.patch
08-avila-loft-setup.patch
09-avila-setup-pata.patch
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 667704ae8a..4ddf2c52dd 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -16,10 +16,9 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
# the changes in SVN between revisions include changes in the
# patches applied to the kernel, rather than simply defconfig
# changes
-PR = "r3.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r4.${IXP4XX_KERNEL_SVN_REV}"
require ixp4xx-kernel.inc
require ixp4xx-kernel-svnpatch.inc
SRC_URI += "file://defconfig"
-SRC_URI += "file://series"