summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-11-11 17:40:22 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-11-11 17:40:22 +0000
commitb18af1d053bb66991c725cd35dccd5b96eeaabf1 (patch)
tree8055eac12e3bbc0e3f5adb3883475692a8c3a44e
parent2d0b3715d266aa2adc5639a0ba50c5170469ebef (diff)
Merge bk://openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/11 11:48:19+01:00 (none)!br1 nylon: add preferred version for unik-olsrd 2004/11/11 11:47:24+01:00 (none)!br1 ncurses: link xterm-color as xterm 2004/11/10 19:59:45+01:00 (none)!br1 added unik-olsrd cvs build BKrev: 4193a406u5vub6DsrK5lSAXhgtaHtg
-rw-r--r--conf/distro/nylon.conf1
-rw-r--r--ncurses/ncurses_5.4.oe4
-rw-r--r--unik-olsrd/unik-olsrd_cvs.oe0
3 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index b5d1268dac..c75bcece8d 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -31,3 +31,4 @@ PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
PREFERRED_VERSION_binutils = "2.14.90.0.7"
#PREFERRED_VERSION_prism54-module = "1.2"
+PREFERRED_VERSION_unik-olsrd = "0.4.7" \ No newline at end of file
diff --git a/ncurses/ncurses_5.4.oe b/ncurses/ncurses_5.4.oe
index 7cfd0ed12f..ddaa582fdb 100644
--- a/ncurses/ncurses_5.4.oe
+++ b/ncurses/ncurses_5.4.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
DESCRIPTION = "Ncurses library"
SECTION = "libs"
DEPENDS = "ncurses-native"
@@ -70,7 +70,7 @@ do_install() {
fi
done
# i think we can use xterm-color as default xterm
- if [ -e ${D}/etc/terminfo/x/xterm ]
+ if [ -e ${D}/etc/terminfo/x/xterm-color ]
then
ln -sf xterm-color ${D}/etc/terminfo/x/xterm
fi
diff --git a/unik-olsrd/unik-olsrd_cvs.oe b/unik-olsrd/unik-olsrd_cvs.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/unik-olsrd/unik-olsrd_cvs.oe