summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-20 21:43:23 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-20 21:43:23 +0000
commit91d7a639e99fb8a8823e561cb622e28c94f65ea0 (patch)
tree93ece3f5011926fac995d9c2b2e9a6614a9afab4
parent6cb76ba15d0254186c4e174e7aa70231d7c0cffc (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/20 21:53:39+01:00 handhelds.org!zecke Update local.conf.sample to match the removal of qte-for-opie 2005/02/20 21:47:05+01:00 handhelds.org!zecke Familiar 0.8.1: Use opie-pics from cvs along with libqpe-opie from cvs BKrev: 4219047b-z7BevNhSgCdh9MtoM-LyQ
-rw-r--r--conf/distro/familiar-0.8.1.conf1
-rw-r--r--conf/local.conf.sample2
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index aa8996072f..723804ade9 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -35,6 +35,7 @@ include conf/distro/preferred-opie-versions.inc
PREFERRED_VERSION_libopie2 = "1.1.9+cvs-${CVSDATE}"
PREFERRED_VERSION_libqpe-opie = "1.1.9+cvs-${CVSDATE}"
PREFERRED_VERSION_opie-login = "1.1.9+cvs-${CVSDATE}"
+PREFERRED_VERSION_opie-pics = "1.1.9+cvs-${CVSDATE}"
#
# GPE
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 0e2f20cb71..245cffa2e8 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -38,7 +38,7 @@ BBMASK = ""
# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
# Select between multiple alternative providers, if more than one is eligible.
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"