summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-05-31 16:51:00 +0000
committerJohn Bowler <jbowler@nslu2-linux.org>2005-05-31 16:51:00 +0000
commit2c43fc45b1d9265f2fe0bbd229ef816ce31a7ec0 (patch)
tree1671e52e7b1b3d1028df15ed4e3af3182a941251 /packages
parentc419bfc84ec3c2d1499c5a13dc361450e74dda83 (diff)
Merge marsco.kalmiopsis:/home/nslu2/openembedded
into marsco.kalmiopsis:/home/nslu2/ref 2005/05/31 09:49:53-07:00 kalmiopsis!jbowler Dev only change (does not change openslug). Fix nslu2-kernel so that it handles -rc patches correctly. Move or copy patches from 2.6.11-mm which are required in 2.6.12 BKrev: 429c95f4Cw4H12IiLOLp5_5mnzbGpw
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/nslu2-kernel.inc6
-rw-r--r--packages/linux/nslu2-kernel/2.6.12/x1205-rtc.c-id.patch (renamed from packages/linux/nslu2-kernel/2.6.11-mm/compile-switches.patch)0
-rw-r--r--packages/linux/nslu2-kernel/2.6/compile-switches.patch0
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 749fadce8a..26e8f729e6 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -113,13 +113,13 @@ python () {
pname = '-'.join(name)
if patch[0:2] == "rc" or patch[0:3] == "pre":
patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/testing/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname))
- kernel[-1] = kernel[-1] - 1
+ kernel[-1] = str(int(kernel[-1]) - 1)
if patch[0:2] == "rc" and pref == 10:
pref = 6
filepath[0:0] = [ filedir % (name[0] + "-rc") ]
else:
pref = 2
- elif patch[0:2] == "bk":
+ elif patch[0:2] == "bk" or patch[0:3] == "git":
patch_uri.append("ftp://ftp.kernel.org/pub/linux/kernel/v%s/snapshots/patch-%s.bz2;patch=1;pname=%s" % (major, pname, pname))
pref = 2
elif patch[0:2] == "ac":
@@ -149,7 +149,7 @@ python () {
bb.data.setVar("N2K_FILESPATH", ':'.join(filepath), d)
# bb.note("N2K_FILESPATH := %s" % ' '.join(filepath))
bb.data.setVar("DEFAULT_PREFERENCE", pref-mmac, d)
- # bb.note("DEFAULT_PREFERENCE := %s" % pref-mmac)
+ # bb.note("DEFAULT_PREFERENCE := %s" % (pref-mmac))
}
# FILESPATH: this list is in order last-searched-first, therefore
diff --git a/packages/linux/nslu2-kernel/2.6.11-mm/compile-switches.patch b/packages/linux/nslu2-kernel/2.6.12/x1205-rtc.c-id.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/nslu2-kernel/2.6.11-mm/compile-switches.patch
+++ b/packages/linux/nslu2-kernel/2.6.12/x1205-rtc.c-id.patch
diff --git a/packages/linux/nslu2-kernel/2.6/compile-switches.patch b/packages/linux/nslu2-kernel/2.6/compile-switches.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/nslu2-kernel/2.6/compile-switches.patch