diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-16 10:39:43 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-16 10:39:43 +0000 |
| commit | f80a95d2b6cf850caa9c51128a3be4ab213e154a (patch) | |
| tree | 48a7d4adb616f2aea2cf8f04cdbdcbef2db7dd57 /conf/distro | |
| parent | 958588c6d18a958f5d3e5ccc98fc5c1069e355f3 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/16 12:31:29+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/05/16 12:31:18+02:00 uni-frankfurt.de!mickeyl
lock down embryo version
2005/05/16 12:30:48+02:00 uni-frankfurt.de!mickeyl
repeat do_stage() in libpng-native to fix an odd packaging error on some systems
2005/05/16 11:11:48+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded
2005/05/16 11:11:21+01:00 rpsys.net!RP
linux-oz-2.6: Tosa updates from Dirk. Also add preliminary sptiz support under 2.6 - thanks BigAl!
2005/05/16 12:10:29+02:00 utwente.nl!koen
familiar-0.9.0.conf: include preferred-e-versions.inc, courtesy Buildmeister Lauer
2005/05/16 12:04:27+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/05/16 12:04:14+02:00 uni-frankfurt.de!mickeyl
bump openzaurus-3.5.4 and lock down our e packages to my working versions through preferred-e-versions.inc
2005/05/16 12:03:24+02:00 utwente.nl!koen
Added packages/thc/ dir for stuff from http://thc.org/, moved hydra and thcrut into it.
2005/05/16 10:20:43+01:00 rpsys.net!RP
linux-oz-2.6: Update to later irda patch
BKrev: 4288786fKHhlElesndlOW9HB4IcxyQ
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/familiar-0.9.0.conf | 6 | ||||
| -rw-r--r-- | conf/distro/openzaurus-3.5.4.conf | 11 | ||||
| -rw-r--r-- | conf/distro/preferred-e-versions.inc | 0 |
3 files changed, 13 insertions, 4 deletions
diff --git a/conf/distro/familiar-0.9.0.conf b/conf/distro/familiar-0.9.0.conf index 369b112cb9..d617780940 100644 --- a/conf/distro/familiar-0.9.0.conf +++ b/conf/distro/familiar-0.9.0.conf @@ -42,3 +42,9 @@ PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_x11 = "diet-x11" include conf/distro/preferred-gpe-versions.inc + +# +# E +# +include conf/distro/preferred-e-versions.inc + diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index 1bac374c3e..bc5a4007c8 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -13,7 +13,7 @@ FEED_URIS += " \ console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" -CVSDATE = "20050510" +CVSDATE = "20050516" # # Zaurus @@ -29,15 +29,14 @@ KERNEL_CONSOLE = "ttyS0" # # Base # - PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + # # Opie # - PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" OPIE_VERSION = "1.2.1" @@ -46,8 +45,12 @@ include conf/distro/preferred-opie-versions.inc # # GPE # - PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDER_x11 = "diet-x11" include conf/distro/preferred-gpe-versions.inc +# +# E +# +include conf/distro/preferred-e-versions.inc + diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/distro/preferred-e-versions.inc |