diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-03-24 14:53:44 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-03-24 14:53:44 +0000 |
| commit | 20d8a68bbc98fc6697efe063b8df1bdca084e412 (patch) | |
| tree | e4828c9ff143716427028781514b7a7fff38158a /packages | |
| parent | 22e0cee8679cc8ae75a6b5f99891a5b410e5c346 (diff) | |
| parent | b2fbe441d12551766370dfb4f76f221091bbe01d (diff) | |
merge of '18a835c49f98aebf12d1299f14d6e62e8358e6a4'
and '224361c92f343abb72e0ab516a332f63dace3f78'
Diffstat (limited to 'packages')
| -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 |
4 files changed, 4 insertions, 8 deletions
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}" |