From f58099c4b71893db89309bb714f01b1482f10667 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2005 09:43:57 +0000 Subject: Attempt to fix the overrides situation in h3900.conf --- conf/machine/h3900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine') diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 37dd0a52f2..aee3bacdbd 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES := "${KERNEL}:${OVERRIDES}" +OVERRIDES .= "${KERNEL}" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" -- cgit v1.2.3 From 503f111db3dc9ca1c212f44770946d9f53ebd6c0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Jul 2005 23:18:38 +0000 Subject: zaurus machine confs: add console-tools and zaurus-updater --- conf/machine/poodle.conf | 2 ++ conf/machine/tosa.conf | 2 ++ conf/machine/zaurus-clamshell-2.4.conf | 4 ++-- conf/machine/zaurus-clamshell.conf | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index ad0ebc96bc..4ff3fe7e56 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -12,6 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" + include conf/machine/handheld-common.conf # yes, it has 64MB... diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index c3f440fae2..dfdabf482f 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -12,6 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" +EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 705dcd1905..0934d84baa 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -9,11 +9,11 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ -pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index e0b8d31349..d03c9a7f6b 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -11,6 +11,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" +EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed" GPE_EXTRA_INSTALL += "gaim sylpheed" -- cgit v1.2.3 From 01d62c4ab8d7d07f4b6e7db7c3e099ad720475eb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Jul 2005 10:21:57 +0000 Subject: s/EXTRA_BOOTSTRAP_DEPENDS/BOOTSTRAP_EXTRA_DEPENDS/ thanks Justin --- conf/machine/poodle.conf | 2 +- conf/machine/tosa.conf | 2 +- conf/machine/zaurus-clamshell.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 4ff3fe7e56..e0cc83e6aa 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" -EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" include conf/machine/handheld-common.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index dfdabf482f..ab5b169d4f 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index d03c9a7f6b..285ab851ab 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -11,7 +11,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" -EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed" -- cgit v1.2.3 From a71d272b399e7d37adafa1926f7dc4207cada6d8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2005 11:23:36 +0000 Subject: add : before KERNEL in h3900.conf --- conf/machine/h3900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf/machine') diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index aee3bacdbd..9e91dcfbbc 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES .= "${KERNEL}" +OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" -- cgit v1.2.3