diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-27 13:40:44 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-27 13:40:44 +0000 |
| commit | 9680f4a242b63233f8d15646ac6f5f7e04695468 (patch) | |
| tree | 2622c4e71687de077565df0a623e25b8f63cf016 /conf | |
| parent | ae05fa2fe9dbda08a39afcd6d32eb6deed317e58 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2004/12/27 14:28:28+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded
2004/12/27 14:28:11+01:00 dyndns.org!reenoo
vlc-gpe: fix FILES. package .desktop file.
2004/12/27 14:00:41+01:00 uni-frankfurt.de!mickeyl
opie cvs stuff is now 1.1.8+cvs-
2004/12/27 13:53:14+01:00 uni-frankfurt.de!mickeyl
openzaurus 3.5.3 uses opie 1.1.8 and qte 2.3.9
BKrev: 41d010dc7G8fBE-Qnk0n_kXXQwxqPw
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openzaurus-3.5.3.conf | 9 | ||||
| -rw-r--r-- | conf/distro/preferred-opie-versions.inc | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index a6410d61ac..b59c31e2c5 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -1,7 +1,7 @@ include conf/distro/openzaurus.conf DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" -DISTRO_VERSION = "3.5.2-snapshot" +DISTRO_VERSION = "3.5.2-snapshot-${DATE}" # DISTRO_VERSION = "3.5.3" FEED_URIS += " \ @@ -11,7 +11,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 = 20041127 +CVSDATE = 20041227 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie" PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive" @@ -27,15 +27,12 @@ TARGET_FPU = "soft" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" -#ENABLE_SYSREQ = "yes" PREFERRED_VERSION_binutils-cross = "2.15.91.0.2" PREFERRED_VERSION_libtool-native = "1.5.6" PREFERRED_VERSION_libtool-cross= "1.5.6" -PREFERRED_VERSION_qte-for-opie = "2.3.7" PREFERRED_VERSION_orinoco-modules = "0.13e" PREFERRED_VERSION_glibc = "2.3.2+cvs20040726" -#PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5" PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22" PREFERRED_VERSION_bluez-utils-dbus = "2.11" @@ -43,7 +40,7 @@ PREFERRED_VERSION_bluez-utils-dbus = "2.11" # Opie # -OPIE_VERSION = "1.1.7" +OPIE_VERSION = "1.1.8" include conf/distro/preferred-opie-versions.inc # diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc index 0c24b5d1b4..3de891eb78 100644 --- a/conf/distro/preferred-opie-versions.inc +++ b/conf/distro/preferred-opie-versions.inc @@ -17,7 +17,7 @@ PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}" PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}" PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}" -# PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}" PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}" PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}" @@ -108,7 +108,7 @@ PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}" PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}" PREFERRED_VERSION_opie-oxygen = "1.0.0" PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}" -# PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}" PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}" PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}" PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}" |