diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/ixp4xx.inc | 2 | ||||
| -rw-r--r-- | packages/images/slugos-image.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx/defconfig-2.6.24.3 (renamed from packages/linux/linux-ixp4xx/defconfig-2.6.24) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3 (renamed from packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-ixp4xx_2.6.24.3.bb (renamed from packages/linux/linux-ixp4xx_2.6.24.bb) | 10 |
6 files changed, 6 insertions, 10 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cb960d5168..6f9568c9c0 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -56,7 +56,7 @@ SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "1039" +SRCREV_pn-linux-ixp4xx ?= "1056" SRCREV_pn-linux-openmoko ?= "4194" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index da1e8b7557..4696d7906d 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.3+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index fb1b372735..56abc3d39f 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://www.nslu2-linux.org" DEPENDS = "task-slugos" IMAGE_INSTALL = "task-slugos" -COMPATIBLE_MACHINE = "nslu2" +COMPATIBLE_MACHINE = "nslu2|ixp4xx" IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}" IMAGE_FSTYPES = "jffs2 tar.gz" diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.3 index 790120452a..790120452a 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.3 diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3 index 0e14d09d11..0e14d09d11 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3 diff --git a/packages/linux/linux-ixp4xx_2.6.24.bb b/packages/linux/linux-ixp4xx_2.6.24.3.bb index 9a5967afa2..06ff3f13d7 100644 --- a/packages/linux/linux-ixp4xx_2.6.24.bb +++ b/packages/linux/linux-ixp4xx_2.6.24.3.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.3" # 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}" |