diff options
author | Michael Lauer <mickey@vanille-media.de> | 2005-07-27 23:18:57 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-27 23:18:57 +0000 |
commit | d2b8df1751fed07eb5f57522705723d21c92a71f (patch) | |
tree | 150ba1457cae678cae9a2106d19d3f8200e35e75 | |
parent | 7f4531c6654d89c928c64c057207149c3d4d9fe6 (diff) | |
parent | 503f111db3dc9ca1c212f44770946d9f53ebd6c0 (diff) |
merge of 7f1a36bb348422ee0ee7643b6c8090a43f6900f4
and 94f303eda501c5ec8e20584ef29de2ce84bf8ed7
-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 |
4 files changed, 8 insertions, 2 deletions
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" |