diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-12 09:39:46 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-12 09:39:46 +0000 |
| commit | 4d0b880b8a1649e1821883b3afeee2942df2545a (patch) | |
| tree | d0b05ac2b299233842d92b1c136407f47c95a8be /packages/linux | |
| parent | dcd881d0ac2669587a0a0334be1e415aaf927faa (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/12 10:07:03+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded
2005/05/12 10:06:40+01:00 rpsys.net!RP
linux-oz-2.6: Update power management code to honour alarms. Add $PV to the kernel image filename.
BKrev: 42832462J6hXcw4btI3OM4kaqKvdrA
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.11.bb | 6 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 20ef4f07bc..334d8250f9 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r17" +PR = "r18" DOSRC = "http://www.do13.in-berlin.de/openzaurus" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -39,7 +39,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ - ${RPSRC}/corgi_power-r17.patch;patch=1 \ + ${RPSRC}/corgi_power-r18.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/ide_fixes-r1.patch;patch=1 \ ${RPSRC}/mmc_sd-r4.patch;patch=1 \ @@ -163,7 +163,7 @@ do_compile_append() { do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin } do_deploy[dirs] = "${S}" diff --git a/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb b/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb index f5cc01e527..334449b2be 100644 --- a/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb +++ b/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r5" +PR = "r6" DOSRC = "http://www.do13.in-berlin.de/openzaurus" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -35,14 +35,14 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \ ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/ide_drivermodel-r0.patch;patch=1 \ - ${RPSRC}/corgi_power-r17.patch;patch=1 \ + ${RPSRC}/corgi_power-r18.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${RPSRC}/corgi_snd-r6.patch;patch=1 \ ${RPSRC}/w100_split-r8.patch;patch=1 \ ${RPSRC}/pxa_i2c-r1.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_base-r11.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_base-r12.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_pcmcia-r0.patch;patch=1 \ ${RPSRC}/ipaq/pxa_keys-r0.patch;patch=1 \ @@ -160,7 +160,7 @@ do_compile_append() { do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin } do_deploy[dirs] = "${S}" |