Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/06 14:35:37+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/01/06 14:32:10+01:00 mn-solutions.de!schurig
support for lib5250-0

2005/01/06 14:31:57+01:00 mn-solutions.de!schurig
MNCI Ramses specific changes

2005/01/06 14:28:19+01:00 mn-solutions.de!schurig
somy busybox fixes

2005/01/06 13:42:32+01:00 uni-frankfurt.de!mickeyl
upgrade nano to 1.3.5. some patches are no longer necessary (yay)

BKrev: 41dd3fb7i1QFp1lB2qL7jHIusO_5GA

diff --git a/conf/distro/openmnci.conf b/conf/distro/openmnci.conf
index becc1b5..231fea0 100644 (file)
--- a/conf/distro/openmnci.conf
+++ b/conf/distro/openmnci.conf
@@ -1,27 +1,39 @@
-#@TYPE: Distribution
-#@NAME: OpenMNCI
-#@DESCRIPTION: Distribution configuration for OpenMNCI
-
 INHERIT += "package_ipk"
 INHERIT += "debian"
-TARGET_FPU = "soft"
-
 
-CVSDATE = 20040915
 
+CVSDATE = 20041120
+#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"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
 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"
 
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "ttyS0"
+TARGET_FPU = "soft"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
 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"
 
+#
 # Opie
-OPIE_VERSION = "1.1.6"
-PREFERRED_VERSION_libopie = "${OPIE_VERSION}"
+#
+
+OPIE_VERSION = "1.1.7"
+PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
 PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
 PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
 PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
@@ -41,11 +53,12 @@ PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-camera = "1.0.1"
+PREFERRED_VERSION_opie-camera = "1.0.3"
 PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-checkbook = "0.8.0"
 PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
@@ -79,8 +92,8 @@ PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
@@ -124,7 +137,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}"
@@ -132,7 +145,6 @@ PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-qashmoney = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-qcop = "1.0.0"
 PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
@@ -164,6 +176,7 @@ PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
@@ -186,7 +199,6 @@ PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-ubrowser = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
@@ -202,3 +214,76 @@ PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
 
+#
+# GPE
+#
+
+PREFERRED_VERSION_libmatchbox = "1.4"
+PREFERRED_VERSION_matchbox = "0.8.1"
+PREFERRED_VERSION_matchbox-common = "0.8"
+PREFERRED_VERSION_matchbox-desktop = "0.8.1"
+PREFERRED_VERSION_matchbox-wm = "0.8.4"
+PREFERRED_VERSION_matchbox-panel = "0.8.3"
+PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
+PREFERRED_VERSION_gtk+ = "2.4.13"
+PREFERRED_VERSION_libgpewidget = "0.95"
+PREFERRED_VERSION_libgpepimc = "0.3"
+PREFERRED_VERSION_libgpevtype = "0.5"
+PREFERRED_VERSION_libschedule = "0.13"
+PREFERRED_VERSION_gpe-icons = "0.24"
+PREFERRED_VERSION_libgsm = "1.0.10"
+PREFERRED_VERSION_diet-x11 = "6.2.1"
+PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
+PREFERRED_VERSION_rxvt-unicode = "3.7"
+PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
+PREFERRED_VERSION_xst = "0.14"
+PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost = "0.0cvs20040413"
+PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login = "0.73"
+PREFERRED_VERSION_gpe-session-scripts = "0.62"
+PREFERRED_VERSION_gpe-soundserver = "0.4-1"
+PREFERRED_VERSION_gpe-todo = "0.50"
+PREFERRED_VERSION_gpe-calendar = "0.58"
+PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
+PREFERRED_VERSION_gpe-contacts = "0.33"
+PREFERRED_VERSION_gpe-today = "0.08"
+PREFERRED_VERSION_matchbox-panel-manager = "0.1"
+PREFERRED_VERSION_dbus = "0.22"
+PREFERRED_VERSION_gpe-bluetooth = "0.37"
+PREFERRED_VERSION_gpe-su = "0.18"
+PREFERRED_VERSION_gpe-conf = "0.1.22"
+PREFERRED_VERSION_gpe-clock = "0.14"
+PREFERRED_VERSION_gpe-mininet = "0.4"
+PREFERRED_VERSION_gpe-mixer = "0.38"
+PREFERRED_VERSION_gpe-shield = "0.6"
+PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager = "0.17"
+PREFERRED_VERSION_keylaunch = "2.0.7"
+PREFERRED_VERSION_minilite = "0.44"
+PREFERRED_VERSION_xmonobut = "0.4"
+PREFERRED_VERSION_gpe-edit = "0.28"
+PREFERRED_VERSION_gpe-gallery = "0.95"
+PREFERRED_VERSION_gpe-calculator = "0.2"
+PREFERRED_VERSION_gpe-package = "0.0.12"
+PREFERRED_VERSION_gpe-soundbite = "1.0.5"
+PREFERRED_VERSION_gpe-terminal = "1.1"
+PREFERRED_VERSION_gpe-watch = "0.10"
+PREFERRED_VERSION_gpe-what = "0.31"
+PREFERRED_VERSION_gpe-filemanager = "0.20"
+PREFERRED_VERSION_gpe-go = "0.05"
+PREFERRED_VERSION_gpe-irc = "0.07"
+PREFERRED_VERSION_gpe-lights = "0.12"
+PREFERRED_VERSION_gpe-nmf = "0.19"
+PREFERRED_VERSION_gpe-othello = "0.2-1"
+PREFERRED_VERSION_gpe-plucker = "0.1"
+PREFERRED_VERSION_gpe-tetris = "0.6-2"
+PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
+PREFERRED_VERSION_xdemineur = "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
+PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_dillo2 = "0.6.6"
+PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
+PREFERRED_VERSION_linphone = "0.12.2"
+PREFERRED_VERSION_firefox = "1.0"

diff --git a/packages/busybox/busybox-1.00/ramses/defconfig b/packages/busybox/busybox-1.00/ramses/defconfig
index 30da7d8..94f175b 100644 (file)
--- a/packages/busybox/busybox-1.00/ramses/defconfig
+++ b/packages/busybox/busybox-1.00/ramses/defconfig
@@ -15,9 +15,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_FEATURE_DEVFS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_FEATURE_SUID is not set
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
 
 #
@@ -195,7 +195,7 @@ CONFIG_SETKEYCODES=y
 CONFIG_MKTEMP=y
 # CONFIG_PIPE_PROGRESS is not set
 CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
+CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RUN_PARTS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_WHICH=y
@@ -345,7 +345,7 @@ CONFIG_FEATURE_FANCY_PING=y
 CONFIG_ROUTE=y
 CONFIG_TELNET=y
 # CONFIG_FEATURE_TELNET_TTYPE is not set
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
 # CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set
 CONFIG_TRACEROUTE=y
@@ -370,7 +370,7 @@ CONFIG_FEATURE_UDHCP_SYSLOG=y
 CONFIG_FREE=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
-CONFIG_PIDOF=y
+# CONFIG_PIDOF is not set
 CONFIG_PS=y
 CONFIG_RENICE=y
 CONFIG_TOP=y

diff --git a/packages/busybox/files/syslog b/packages/busybox/files/syslog
index 44698c5..a999565 100644 (file)
--- a/packages/busybox/files/syslog
+++ b/packages/busybox/files/syslog
@@ -10,10 +10,10 @@ if [ -f /etc/syslog.conf ]; then
        LOG_LOCAL=0
        LOG_REMOTE=0
        for D in $DESTINATION; do
-               if [ "$D" == "buffer" ]; then
+               if [ "$D" = "buffer" ]; then
                        SYSLOG_ARGS="$SYSLOG_ARGS -C $BUFFERSIZE"
                        LOG_LOCAL=1
-               elif [ "$D" == "file" ]; then
+               elif [ "$D" = "file" ]; then
                        if [ -n "$LOGFILE" ]; then
                                SYSLOG_ARGS="$SYSLOG_ARGS -O $LOGFILE"
                        fi
@@ -24,18 +24,18 @@ if [ -f /etc/syslog.conf ]; then
                                SYSLOG_ARGS="$SYSLOG_ARGS -b $ROTATEGENS"
                        fi
                        LOCAL=0
-               elif [ "$D" == "remote" ]; then
+               elif [ "$D" = "remote" ]; then
                        SYSLOG_ARGS="$SYSLOG_ARGS -R $REMOTE"
                        LOG_REMOTE=1
                fi
        done
-       if (( $LOG_LOCAL && $LOG_REMOTE )); then 
+       if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then
                SYSLOG_ARGS="$SYSLOG_ARGS -L"
        fi
        if [ -n "$MARKINT" ]; then
                SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT"
        fi
-       if [ "$REDUCE" == "yes" ]; then
+       if [ "$REDUCE" = "yes" ]; then
                SYSLOG_ARGS="$SYSLOG_ARGS -S"
        fi
 else

diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf
index e69de29..e2a2d58 100644 (file)
--- a/packages/busybox/files/syslog.conf
+++ b/packages/busybox/files/syslog.conf
@@ -0,0 +1,9 @@
+DESTINATION="buffer"           # log destinations (buffer file remote)
+MARKINT=20                     # intervall between --mark-- entries
+LOGFILE=/var/log/messages      # where to log (file)
+REMOTE=loghost:514             # where to log (syslog remote)
+REDUCE=no                      # reduce-size logging
+ROTATESIZE=0                   # rotate log if grown beyond X [kByte]
+ROTATEGENS=3                   # keep X generations of rotated logs
+BUFFERSIZE=64                  # size of circular buffer [kByte]
+FOREGROUND=no                  # run in foreground (don't use!)

diff --git a/packages/nano/nano-1.3.0/make.patch b/packages/nano/nano-1.3.0/make.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/nano/nano-1.3.0/glib.m4 b/packages/nano/nano-1.3.5/glib.m4
similarity index 100%
rename from packages/nano/nano-1.3.0/glib.m4
rename to packages/nano/nano-1.3.5/glib.m4

diff --git a/packages/nano/nano_1.3.0.bb b/packages/nano/nano_1.3.0.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/nano/nano-1.3.0/configure.patch b/packages/nano/nano_1.3.5.bb
similarity index 100%
rename from packages/nano/nano-1.3.0/configure.patch
rename to packages/nano/nano_1.3.5.bb

diff --git a/packages/tn5250/tn5250_0.16.5.bb b/packages/tn5250/tn5250_0.16.5.bb
index e69de29..08e2fe9 100644 (file)
--- a/packages/tn5250/tn5250_0.16.5.bb
+++ b/packages/tn5250/tn5250_0.16.5.bb
@@ -0,0 +1,24 @@
+SECTION = "console/network"
+DESCRIPTION = "tn5250 is a 5250 terminal emulator, used for connecting \
+to IBM's AS/400 (now known as eServer iSeries) midrange computers."
+HOMEPAGE = "http://tn5250.sourceforge.net/"
+LICENSE = "LGPL"
+DEPENDS = "ncurses openssl"
+PR="r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/tn5250/tn5250-${PV}.tar.gz \
+          file://compile.patch;patch=1"
+
+inherit autotools
+
+PACKAGES = "lib5250-0 tn5250-dev tn5250-doc tn5250"
+FILES_lib5250-0 = "${libdir}/lib*.so.*"
+AUTO_LIBNAME_PKGS = "lib5250"
+
+do_stage() {
+       autotools_stage_includes
+        oe_libinstall -so -a -C src lib5250 ${STAGING_LIBDIR}
+}
+
+do_install_append() {
+}