diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-07-21 21:38:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-21 21:38:58 +0000 |
| commit | 3c0cb2cdfeeadc79a81ff78b3f74785c1dc11932 (patch) | |
| tree | 6aa3116846275777b7784f7d0e2f15317b80698e /conf | |
| parent | c4703f1da90d9eb7d947c98f7b2541d8b61cc097 (diff) | |
| parent | 7d1dc55f6d1d02a283c152e26da59e9a99a0ec1e (diff) | |
merge of d23fa20efa477539bb55a99c02a96896167f1c2b
and d974b2fdc2202ed227cf57f941cdb0b45b03cf15
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/h3900.conf | 2 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index a095f15cdf..37dd0a52f2 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES_prepend = "${KERNEL}:" +OVERRIDES := "${KERNEL}:${OVERRIDES}" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index c860ea414d..9470fe009c 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES_prepend = "${KERNEL}:" +OVERRIDES := "${KERNEL}:${OVERRIDES}" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 3ce5924d04..7b6761b250 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,8 +27,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- # Infrared Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -# PPP Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" #USB Gadget Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ |