diff options
author | Rod Whitby <rod@whitby.id.au> | 2007-01-09 12:32:17 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2007-01-09 12:32:17 +0000 |
commit | fca0304f86c05d73e8586701963e36c69acb634e (patch) | |
tree | 13ee81330e8db80145570429415aedf15409c39e /packages/linux | |
parent | d33d07ddf3ca35e4ee9a2a50e08d173a2f60de85 (diff) | |
parent | 76d74e58922ff6196faefb57b0b9264a738e26f5 (diff) |
merge of '293e51d51d159e1203f6f75bb02b80e8adc041ab'
and '336c3826d3982a8a1f9b8569c023289204dd0092'
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 3 | ||||
-rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index a45a690955..099bfca2d3 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -72,6 +72,9 @@ python () { # pre patches actually require the *preceding* kernel version the code # fixes that up appropriately. pv = bb.data.getVar("PV",d,1).split('-') + if pv[0].count('+'): + prev = pv[0].split('+') + pv[0] = prev[1]; kernel = pv[0].split('.') base = pv[0] name = [base] diff --git a/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb b/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb new file mode 100644 index 0000000000..d7d4de3b63 --- /dev/null +++ b/packages/linux/ixp4xx-kernel_2.6.19+2.6.20-rc4.bb @@ -0,0 +1,22 @@ +# Kernel for IXP4xx +# +# This bitbake file pulls patches and the defconfig straight +# from the NSLU2-Linux SVN repository. Information about this +# repository can be found at: +# http://trac.nslu2-linux.org/kernel/ +# +# The revision that is pulled from SVN is specified below +IXP4XX_KERNEL_SVN_REV = "659" +# +# The directory containing the patches to be applied is +# specified below +IXP4XX_KERNEL_PATCH_DIR = "2.6.20" +# +# Increment the number below (i.e. the digits after PR) when +# the changes in SVN between revisions include changes in the +# patches applied to the kernel, rather than simply defconfig +# changes +PR = "r1.${IXP4XX_KERNEL_SVN_REV}" + +require ixp4xx-kernel.inc +require ixp4xx-kernel-svnpatch.inc |