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

into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/04/01 17:11:21+02:00 mn-solutions.de!schurig
the old ethtool and nmap sources were no longer downloadable

2005/04/01 14:07:58+02:00 mn-solutions.de!schurig
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/04/01 13:17:32+02:00 mn-solutions.de!schurig
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe

2005/04/01 13:17:11+02:00 mn-solutions.de!schurig
glibc_2.3.2_cvs20040726: add descriptions for sln, nscd, glibc-extra-nss, ldd, localedef, glibc-utils

2005/04/01 13:16:24+02:00 mn-solutions.de!schurig
some MNCI "Ramses" related changes


BKrev: 424d64abbXKpOU1lgg-iVEp3n6J_Vw

10 files changed, 78 insertions, 59 deletions

diff --git a/packages/base-files/base-files/ramses/profile b/packages/base-files/base-files/ramses/profile
index e69de29bb2..48db09b3e7 100644
--- a/packages/base-files/base-files/ramses/profile
+++ b/packages/base-files/base-files/ramses/profile
@@ -0,0 +1,30 @@
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+
+OPIEDIR=/opt/QtPalmtop
+QPEDIR=/opt/QtPalmtop
+QTDIR=/opt/QtPalmtop
+PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
+
+PS1='$ '
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+   PS1='# '
+fi
+
+if [ -d /etc/profile.d ]; then
+  for i in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$i
+  done
+  unset i
+fi
+
+case "`cat /proc/sys/board/lcd_type`" in
+        2)      export QWS_DISPLAY=Transformed:Rot90 ;;
+        *)      export QWS_DISPLAY=Transformed:Rot180 ;;
+esac
+alias ll="ls -lAF"
+
+export PATH PS1 OPIEDIR QPEDIR QTDIR
+
+umask 022
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 2c677b09e9..caa748e17b 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r28"
+PR = "r29"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/ethtool/ethtool_1.6.bb b/packages/ethtool/ethtool_3.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/ethtool/ethtool_1.6.bb
+++ b/packages/ethtool/ethtool_3.bb
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 29047ea15a..cee4d03667 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -54,6 +54,13 @@ FILES_glibc-thread-db = "/lib/libthread_db*"
 FILES_localedef = "${bindir}/localedef"
 RPROVIDES_glibc-dev += "libc-dev"
 
+DESCRIPTION_sln = "glibc: create symbolic links between files"
+DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts"
+DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services"
+DESCRIPTION_ldd = "glibc: print shared library dependencies"
+DESCRIPTION_localedef = "glibc: compile locale definition files"
+DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
+
 #	   file://noinfo.patch;patch=1
 #	   file://ldconfig.patch;patch=1;pnum=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@bb.data.getVar('PV', d, 1)[9:]} \
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 3e8d26e385..5e562798de 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -2,6 +2,8 @@ SECTION = "kernel"
 DESCRIPTION = "Linux kernel for MNCI device"
 MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
 LICENSE = "GPL"
+DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}"
+COMPATIBLE_HOST = "arm.*-linux"
 KV = "2.4.21"
 RMKV = "2"
 PXAV = "1"
@@ -17,19 +19,32 @@ S = "${WORKDIR}/linux-${KV}"
 inherit kernel
 
 KERNEL_CCSUFFIX = "-3.3.4"
-COMPATIBLE_HOST = "arm.*-linux"
-FILES_kernel = "/boot /tmp"
-DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}"
 
-# Don't want kernel zImage in rootfs, put it into /tmp ramdisk
-FILES_kernel = ""
+# Put the zImage into kernel-image
 ALLOW_EMPTY_kernel = "1"
+FILES_kernel = ""
 FILES_kernel-image += "/tmp/zImage"
 
 do_configure_prepend() {
 	install -m 0644 ${S}/arch/arm/def-configs/${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 }
 
+kernel_do_install() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
+		oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
+	else
+		oenote "no modules to install"
+	fi
+	install -d ${D}/tmp
+	install -m 0644 ${KERNEL_OUTPUT} ${D}/tmp
+	install -d ${D}/boot
+	install -m 0644 .config ${D}/boot/config-${PV}
+	bzip2 -9 ${D}/boot/*
+	install -d ${D}${sysconfdir}/modutils
+}
+
+
 pkg_postinst_kernel-image () {
 test -f /tmp/zImage || exit 0
 cp /tmp/zImage /dev/mtdblock/1
@@ -55,19 +70,3 @@ pkg_postrm_modules () {
 pkg_postrm_kernel () {
 }
 
-kernel_do_install() {
-	echo Files: ${FILES}
-	echo Files Kernel: ${FILES_kernel}
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
-		oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-	else
-		oenote "no modules to install"
-	fi
-	install -d ${D}/tmp
-	install -m 0644 ${KERNEL_OUTPUT} ${D}/tmp
-	install -d ${D}/boot
-	install -m 0644 .config ${D}/boot/config-${PV}
-	bzip2 -9 ${D}/boot/*
-	install -d ${D}${sysconfdir}/modutils
-}
diff --git a/packages/modutils/files/ramses/modules.conf b/packages/modutils/files/ramses/modules.conf
index e69de29bb2..310e5bb6c8 100644
--- a/packages/modutils/files/ramses/modules.conf
+++ b/packages/modutils/files/ramses/modules.conf
@@ -0,0 +1,20 @@
+alias irda0 pxa_ir
+alias usbd0 usbdmonitor
+alias usbf usb-eth
+alias sound-slot-0 pxa-ac97
+alias sound-slot-1 pxa-ac97
+
+# Affix modules
+alias net-pf-27 affix
+alias char-major-60 affix_rfcomm
+
+# BlueZ modules
+alias net-pf-31 bluez
+alias bt-proto-0 l2cap
+alias bt-proto-2 sco
+alias bt-proto-3 rfcomm
+alias bt-proto-4 bnep
+alias bt-proto-5 cmtp
+alias bt-proto-6 hidp
+alias tty-ldisc-15 hci_uart
+alias char-major-10-250 hci_vhci
diff --git a/packages/nmap/nmap-3.77/autofoo.patch b/packages/nmap/nmap-3.81/autofoo.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/nmap/nmap-3.77/autofoo.patch
+++ b/packages/nmap/nmap-3.81/autofoo.patch
diff --git a/packages/nmap/nmap-3.77/remove_gtk.patch b/packages/nmap/nmap-3.81/remove_gtk.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/nmap/nmap-3.77/remove_gtk.patch
+++ b/packages/nmap/nmap-3.81/remove_gtk.patch
diff --git a/packages/nmap/nmap_3.77.bb b/packages/nmap/nmap_3.77.bb
deleted file mode 100644
index a028d9d077..0000000000
--- a/packages/nmap/nmap_3.77.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Nmap is a command line portscanner."
-HOMEPAGE = "http://www.insecure.org/nmap/"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "libpcap pcre"
-PR = "r1"
-
-inherit autotools
-
-SRC_URI = "http://download.insecure.org/nmap/dist/nmap-${PV}.tar.bz2 \
-	   file://autofoo.patch;patch=1 \
-	   file://remove_gtk.patch;patch=1"
-S = "${WORKDIR}/nmap-${PV}"
-
-EXTRA_OECONF = "--with-pcap=linux \
-		--with-libpcap=${STAGING_LIBDIR}/.. \
-		--with-libpcre=${STAGING_LIBDIR}/.. \
-		--without-nmapfe \
-		--without-openssl"
-EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
-
-CXXFLAGS_append = " -fpermissive"
-# Ugly hack follows -- their configure.ac doesnt match their configure .. 
-# doesnt include a check for the length type in recvfrom, so we hack it here
-CPPFLAGS_append = " -Drecvfrom6_t=socklen_t"
-
-do_install () {
-	oe_runmake 'prefix=${D}${prefix}' \
-		   'exec_prefix=${D}${exec_prefix}' \
-		   'bindir=${D}${bindir}' \
-		   'sbindir=${D}${sbindir}' \
-		   'mandir=${D}${mandir}' \
-		   'datadir=${D}${datadir}' \
-		   'nmapdatadir=${D}${datadir}/nmap' \
-		   install
-}
diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nmap/nmap_3.81.bb