diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-04-11 16:29:38 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-04-11 16:29:38 +0000 |
| commit | 8c10368b4be141e179e5756afbe7cb9a83d593be (patch) | |
| tree | 133edaf8cb9947811dfb35abe8cf94cdff23fa8f /packages | |
| parent | dbd6810c95c51b4e05fc9079e5fe27982dbffec2 (diff) | |
use MACHINE in do_deploy for the c7x0 2.4 kernel or else we end up overriding two kernels
BKrev: 425aa5f2bfWqEnmaYv5AYk4NQhLf4Q
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.11.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb index 064d1a8a40..7e101b8f4a 100644 --- a/packages/linux/linux-openzaurus_2.6.11.bb +++ b/packages/linux/linux-openzaurus_2.6.11.bb @@ -103,7 +103,7 @@ COMPATIBLE_HOST = "arm.*-linux" #CMDLINE_MTDPARTS_husky = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) mem=64M" #CMDLINE_MTDPARTS_tosa = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2" -CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" +CMDLINE_CON = "console=ttyS0,115200n8 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 " CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 " diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 1d2487966c..c944da86ce 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -7,7 +7,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r36" +PR = "r37" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ @@ -95,7 +95,7 @@ do_configure_prepend() { do_deploy() { install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin } do_deploy[dirs] = "${S}" |