diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-07-28 11:32:16 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-28 11:32:16 +0000 |
| commit | 0c405d4a02fbd2013ae05a958c5de43876fa52e2 (patch) | |
| tree | 7103924b17b612c75d3025c50457869467695ebf /conf | |
| parent | 2f39b508a29be263113576e51fd07715183e3b3f (diff) | |
| parent | a71d272b399e7d37adafa1926f7dc4207cada6d8 (diff) | |
merge of cf227662bf5075a64cb22a8e517fa3a4ed9a6b45
and e34e002afa05c5fa5be23cd743d8ca5ad2d2b90b
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/h3900.conf | 2 | ||||
| -rw-r--r-- | conf/machine/poodle.conf | 2 | ||||
| -rw-r--r-- | conf/machine/tosa.conf | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.4.conf | 4 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell.conf | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 37dd0a52f2..9e91dcfbbc 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" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index ad0ebc96bc..e0cc83e6aa 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}" +BOOTSTRAP_EXTRA_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..ab5b169d4f 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}" +BOOTSTRAP_EXTRA_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..285ab851ab 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" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed" GPE_EXTRA_INSTALL += "gaim sylpheed" |