diff options
| author |   Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-07 00:54:21 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-07 00:54:21 +0000 |
| commit | 0825e944345291cac5d45daae904c50a87389642 (patch) | |
| tree | fd5cb214d06e52a9ff2c4eafc1c1821dd5a6328a /conf | |
| parent | 5574fc5f3a610aefb6b90365108e10df38b5393f (diff) | |
| parent | a64033ce2a9d11b1336f7dee39203bbcee43f579 (diff) | |
| download | openembedded-0825e944345291cac5d45daae904c50a87389642.tar.gz | |
merge of c1749e31b60b984658b557139430b4fe8eb432a7
and e1dfbc0aedf7759ad0b062d01ebcad3149da58f9
Diffstat (limited to 'conf')
| -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 |