diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-10-08 13:12:23 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-10-08 13:12:23 +0100 |
| commit | ab16c0637abdbbc7349005c9787cffb12dbbbdd1 (patch) | |
| tree | e4c8a3bd4ff6d8b89d6c6a6db51566ffea526fd9 | |
| parent | 8f4dd944ec468de93ff5bd2c78d9fa085431d72f (diff) | |
| parent | f5c2d8febb17c9a6eb199a454b2bef312b783a73 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/linux/linux_2.6.30.bb | 3 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.31.bb | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/recipes/linux/linux_2.6.30.bb b/recipes/linux/linux_2.6.30.bb index 21603f6c45..cd69babe05 100644 --- a/recipes/linux/linux_2.6.30.bb +++ b/recipes/linux/linux_2.6.30.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r3" +PR = "r4" S = "${WORKDIR}/linux-${PV}" @@ -15,6 +15,7 @@ DEFAULT_PREFERENCE_kixrp435 = "1" DEFAULT_PREFERENCE_at91sam9263ek = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.9.bz2;patch=1 \ http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz;patch=1 \ file://aufs2-30.patch;patch=1 \ file://defconfig" diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 622772e1d0..455ff19adc 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r1" +PR = "r2" S = "${WORKDIR}/linux-${PV}" @@ -9,10 +9,10 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_db1200 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.3.bz2;patch=1 \ http://maxim.org.za/AT91RM9200/2.6/2.6.31-at91.patch.gz;patch=1 \ file://defconfig" SRC_URI_append_ep93xx = " \ - file://edb9301-fix-machine-id.patch;patch=1 \ - " + file://edb9301-fix-machine-id.patch;patch=1 \ + " |