diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-22 00:26:28 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-22 00:26:28 +0400 |
| commit | 255eb9e2b29fb4c027a48c804b336c701f78ea75 (patch) | |
| tree | 6a8774bfd0a912652a5ab62ca43d8c191e330871 /conf | |
| parent | 213e66e9ca111c562558ffb5e19c940597d6e270 (diff) | |
| parent | a185021b298010edd0a212bfca9634c95355bdd5 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/motorola-ezx-base.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 4ae673c624..3020fe90c0 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -334,7 +334,6 @@ PREFERRED_VERSION_expat ?= "2.0.0" PREFERRED_VERSION_expat-native ?= "1.95.7" PREFERRED_VERSION_expect ?= "5.44.1" PREFERRED_VERSION_ez-ipupdate ?= "3.0.10" -PREFERRED_VERSION_ezx-boot-usb-native ?= "0.1.0" PREFERRED_VERSION_ezx-gpiotool ?= "1877" PREFERRED_VERSION_faac ?= "1.24" PREFERRED_VERSION_faad2 ?= "2.0" @@ -1275,6 +1274,7 @@ PREFERRED_VERSION_monotone-4 ?= "0.19" PREFERRED_VERSION_monotone-5 ?= "0.25.2" PREFERRED_VERSION_monotone-6 ?= "0.34" PREFERRED_VERSION_motion ?= "3.2.6" +PREFERRED_VERSION_moto-boot-usb-native ?= "0.1.0" PREFERRED_VERSION_mousepad ?= "0.2.12" PREFERRED_VERSION_mp3blaster ?= "3.2.3" PREFERRED_VERSION_mpc ?= "0.12.1" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index a4780412d4..d65b5b2c71 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -56,7 +56,7 @@ MKUBIFS_ARGS = "-m 1 -e 130944 -c 487" UBINIZE_ARGS = "-m 1 -p 128KiB " -EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native ezx-gen-blob" +EXTRA_IMAGEDEPENDS += "moto-boot-usb-native ezx-gen-blob" IMAGE_INSTALL_append += "\ kernel-module-ohci-hcd \ |