diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-18 23:40:10 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-06-18 23:40:10 +0000 |
| commit | 3be1f181bf8354f242c266f14da58673183804ef (patch) | |
| tree | e9ccb74990418b2d689dcb8ef2f89400c3b6a5b3 | |
| parent | 4a6e0401513845984d7ab562eb71c91665dadf03 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/06/19 00:27:56+01:00 rpsys.net!RP
linux-oz-2.6: Add patches for oprofile backtrace on arm, preempt fixes for mwfpe and corgi_ts pmu sharing
2005/06/18 23:40:49+01:00 rpsys.net!RP
linux-oz-2.6: Revert the git-arm-smp.patch as it breaks suspend/resume
BKrev: 42b4b0daw2eZog6X8Fo5JDxdkVgRIA
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb index b48597a4bc..e406d7d4f3 100644 --- a/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-rc6-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r1" +PR = "r3" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -26,7 +26,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \ ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc6/2.6.12-rc6-mm1/2.6.12-rc6-mm1.bz2;patch=1 \ ${RPSRC}/machtype_update-r1.patch;patch=1 \ - ${RPSRC}/copypagefix-r1.patch;patch=1 \ + ${RPSRC}/mmtree_revert_armsmp-r0.patch;patch=1 \ + ${RPSRC}/oprofile_trace-r3.patch;patch=1 \ + ${RPSRC}/preempt_nwfpe-r0.patch;patch=1 \ + ${RPSRC}/copypagefix-r1.patch;patch=1 \ ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ @@ -40,6 +43,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ ${RPSRC}/w100_split-r10.patch;patch=1 \ + ${RPSRC}/corgi_tspmu-r0.patch;patch=1 \ ${RPSRC}/pxa_i2c-r2.patch;patch=1 \ ${DOSRC}/pxa-i2c-suspend-r0.patch;patch=1 \ ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ |