diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-11-15 07:34:46 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-11-15 07:34:46 +0000 |
| commit | dfca6a11f1e6289fa0ee4a436e639e83573c61be (patch) | |
| tree | 2c575ff72812a4934cae8a5a2e313d2d13f72f75 | |
| parent | 2a5e0559b351fa8b83a03f6535d669164ecd1db5 (diff) | |
| parent | c1a7b8ddc811d94cfe2d14331feae0f6ee92e892 (diff) | |
merge of 2d9eee8c16bb6bb0232beade8d8538e6a55c577e
and ed9696ef4fb1a4ce6b21e46ad70e0bb8e9e4c556
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.19-rc5.bb | 2 | ||||
| -rw-r--r-- | packages/slugimage/slugimage.bb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 299944ee29..b4af6dd5f1 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -36,7 +36,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.0" +SLUGOS_VERSION = "4.1" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb index bfb9dccb80..8e2932b9ca 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "577" +IXP4XX_KERNEL_SVN_REV = "579" # # The directory containing the patches to be applied is # specified below diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb index d553a21777..2e9d16ac34 100644 --- a/packages/slugimage/slugimage.bb +++ b/packages/slugimage/slugimage.bb @@ -3,11 +3,11 @@ SECTION = "console/utils" LICENSE = "BSD" DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \ flash images for the Linksys NSLU2 device. It also has jffs2 support" -PR = "r6" +PR = "r7" RDEPENDS = "perl" -SLUGIMAGE_SVN_REV ?= 77 +SLUGIMAGE_SVN_REV ?= 78 SLUGIMAGE_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/slugimage/trunk addtask svnfetch before do_configure after do_patch |