diff options
| author |   Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-03 23:22:42 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-03 23:22:42 +0000 |
| commit | 91818574fb20e98aed69f4f4586e3f971e17f013 (patch) | |
| tree | e025ebd5590ec3ca7edf69a871753f85e10598f5 /conf/distro | |
| parent | c73693c12be6d852f243ed5bb5b8d585943e8003 (diff) | |
| parent | 84a4706fc5292c926fb1126857cd350b62ddd0b4 (diff) | |
| download | openembedded-91818574fb20e98aed69f4f4586e3f971e17f013.tar.gz | |
merge of '4b865f129d7c784106bb82861c16cc6330c629a9'
and '7e82eca3f8662bfb12dc49e93daed21b2aa8feeb'
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2007.1-oabi.conf | 3 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/debianslug.conf | 5 | ||||
| -rw-r--r-- | conf/distro/openomap.conf | 3 | ||||
| -rw-r--r-- | conf/distro/openslug.conf | 5 |
5 files changed, 12 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index e63dc61a48..d1541509c5 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -3,9 +3,6 @@ require conf/distro/angstrom-2007.1.conf #this is a special version of angstrom for armv4 based machines that can't do EABI #see http://wiki.debian.org/ArmEabiPort for details on that -#set compatible machine so people don't 'accidentally' use this -COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)" - #only glibc based builds are supported ATM TARGET_OS = "linux" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index e295a70855..b95fdb7223 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -68,7 +68,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode -#SRCDATE = "20061029" +#SRCDATE = "20070303" PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 2904db1108..d33ae96c68 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -103,6 +103,11 @@ kernel-module-libata \ kernel-module-pata-artop \ " +# Add modules required for Network support +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index f73a980c52..5819b5ad59 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -23,8 +23,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" # use latest booting kernel but allow to override it in local.conf -PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18-omap1" -#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18+git" +#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1" #use EABI toolchain diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 8634d091f0..1091aa2e98 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -103,6 +103,11 @@ kernel-module-libata \ kernel-module-pata-artop \ " +# Add modules required for Network support +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # |