diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-07-06 16:19:33 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-06 16:19:33 +0000 |
| commit | 336ccfe6e95e0db69098c5dad1d56adec0b3cee2 (patch) | |
| tree | 824d4f7ab8e4a37419a5f607f45582dc24bcb4f2 | |
| parent | cf545572cbf6d2235971e7b883aedc60e9751e9b (diff) | |
| parent | 071302f3d50a4d4a399e73ff119ce17ca823a146 (diff) | |
merge of 6957560e17a99bdee10607797a02209bcfaeed94
and c6de91971461be680012cd5aa78de999ad8b1684
| -rw-r--r-- | conf/distro/ezx.conf | 1 | ||||
| -rw-r--r-- | conf/distro/generic-uclibc.conf | 2 | ||||
| -rw-r--r-- | conf/distro/generic-unstable.conf | 2 | ||||
| -rw-r--r-- | conf/distro/generic.conf | 7 |
4 files changed, 9 insertions, 3 deletions
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf index 5a5204b620..2445c8be46 100644 --- a/conf/distro/ezx.conf +++ b/conf/distro/ezx.conf @@ -58,6 +58,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1" # Utilities # BOOTSTRAP_EXTRA_DEPENDS += "ezx-boot-usb-native" +BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace" # # Opie diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index b26238e66e..b77b3e9c87 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -16,7 +16,7 @@ require conf/distro/generic.conf DISTRO_NAME = "generic-uClibC" # -# Target OS and FPU system +# Target OS & FPU system # TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf index e1805c0d0f..10f14ef42b 100644 --- a/conf/distro/generic-unstable.conf +++ b/conf/distro/generic-unstable.conf @@ -14,7 +14,7 @@ PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_binutils = "2.16.91.0.7" PREFERRED_VERSION_binutils-cross = "2.16.91.0.7" -PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" +# PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" # # Target OS, FPU system and libc diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 594958600f..0973e5b420 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -42,7 +42,7 @@ PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" PREFERRED_VERSION_binutils = "2.15.94.0.1" # -# Target OS and FPU system +# Target OS & FPU system # TARGET_OS = "linux" TARGET_FPU_arm = "soft" @@ -52,6 +52,11 @@ PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" # +# Bootstrap & Init +# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +# # GPE # require conf/distro/preferred-gpe-versions.inc |