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

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

2005/06/16 20:13:21+01:00 reciva.com!pb
round up escaped Xprint bits

2005/06/16 19:59:03+01:00 reciva.com!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.internal.reciva.com:/nexus/home/pb/oe/oe

2005/06/16 19:56:15+01:00 reciva.com!pb
use $D, not ${D}

2005/06/16 20:52:57+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/06/16 20:52:32+02:00 mn-solutions.de!schurig
some MNCI/RT3000 changes to base-files and mnci.conf

2005/06/16 20:51:32+02:00 mn-solutions.de!schurig
classes/qpf.bbclass: allow font names like terminus-bold_240_75_t5.qpf

2005/06/15 12:44:41+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/06/15 12:44:17+02:00 mn-solutions.de!schurig
more MNCI & RT3000 related changes

BKrev: 42b1d599T2HX_lr1efBC_rS0YIhYBA

8 files changed, 137 insertions, 4 deletions

diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass
index 7346b45c3d..d6e58871d5 100644
--- a/classes/qpf.bbclass
+++ b/classes/qpf.bbclass
@@ -26,7 +26,7 @@ python populate_packages_prepend() {
 	postinst = bb.data.getVar('pkg_postinst_fonts', d, 1)
 	postrm   = bb.data.getVar('pkg_postrm_fonts', d, 1)
 	fontdir  = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts'
-	pkgregex = "^([a-z]*_[0-9]*).*.qpf$"
+	pkgregex = "^([a-z-]*_[0-9]*).*.qpf$"
 	pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s'
 	pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s'
 
diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf
index e69de29bb2..316720d655 100644
--- a/conf/distro/openmn.conf
+++ b/conf/distro/openmn.conf
@@ -0,0 +1,21 @@
+#@TYPE: Distribution
+#@NAME: OpenMN
+#@DESCRIPTION: Destribution for Devices produced by M&N Solutions GmbH, Germany, Rosbach
+
+# Used in base-files for /etc/issue and /etc/issue.net
+DISTRO_NAME = "OpenMN"
+DISTRO_VERSION = "5.4"
+
+TARGET_ARCH = "arm"
+TARGET_FPU = "soft"
+TARGET_OS = "linux"
+
+INHERIT += "package_ipk"
+INHERIT += "debian"
+IPKG_ARCHS = "armv5te openmn"
+
+FEED_URIS  = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
+
+IMAGE_FSTYPE = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/rootfs.${MACHINE} ${EXTRA_IMAGECMD}"
diff --git a/conf/machine/mnci.conf b/conf/machine/mnci.conf
index e69de29bb2..9f6a0d8385 100644
--- a/conf/machine/mnci.conf
+++ b/conf/machine/mnci.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: M&N MNCI-RX
+#@DESCRIPTION: Machine configuration for the PXA255 based M&N Solutions MNCI-RX
+
+PREFERRED_PROVIDER_virtual/kernel = "mnci-ramses"
+
+USE_DEVFS = "1"
+GUI_MACHINE_CLASS = "smallscreen"
+
+# For sysvinit:
+USE_VT = "0"
diff --git a/packages/base-files/base-files/openmn/fstab b/packages/base-files/base-files/openmn/fstab
index e69de29bb2..a2e78a2011 100644
--- a/packages/base-files/base-files/openmn/fstab
+++ b/packages/base-files/base-files/openmn/fstab
@@ -0,0 +1,6 @@
+devfs		/dev		devfs		defaults		0 0
+proc		/proc		proc		defaults		0 0
+none		/sys		sysfs		defaults		0 0
+rootfs		/		rootfs		rw			1 1
+tmpfs		/var		tmpfs		defaults		0 0
+tmpfs		/tmp		tmpfs		defaults		0 0
diff --git a/packages/base-files/base-files/openmn/profile b/packages/base-files/base-files/openmn/profile
index e69de29bb2..2b01071e15 100644
--- a/packages/base-files/base-files/openmn/profile
+++ b/packages/base-files/base-files/openmn/profile
@@ -0,0 +1,31 @@
+# /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 ;;
+        3)      export QWS_DISPLAY=Transformed:Rot270 ;;
+        *)      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 fc653cb343..4ca12c7aab 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -46,9 +46,11 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
 	     ${sysconfdir}/default"
 
 hostname = "openembedded"
+hostname_openslug = "openslug"
 hostname_mnci = "MNCI"
+PACKAGE_ARCH_mnci = "mnci"
 hostname_rt3000 = "MNRT"
-hostname_openslug = "openslug"
+PACKAGE_ARCH_rt3000 = "rt3000"
 
 do_install () {
 	for d in ${dirs755}; do
diff --git a/packages/lirc/lirc-modules_0.7.1.bb b/packages/lirc/lirc-modules_0.7.1.bb
index a230078a71..0bf709ee92 100644
--- a/packages/lirc/lirc-modules_0.7.1.bb
+++ b/packages/lirc/lirc-modules_0.7.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel fakeroot-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
            file://lirc_sir-sa1100.patch;patch=1"
@@ -27,7 +27,7 @@ fakeroot do_install() {
 pkg_postinst() {
 #!/bin/sh
 set -e
-if [ ! -c ${D}/dev/lirc ]; then mknod ${D}/dev/lirc c 61 0; fi
+if [ ! -c $D/dev/lirc ]; then mknod $D/dev/lirc c 61 0; fi
 exit 0
 }
 
diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb
index e69de29bb2..aa8fff95a4 100644
--- a/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -0,0 +1,62 @@
+SECTION = "x11/base"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+LICENSE = "Xorg"
+PR = "r1"
+
+DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+
+SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
+	file://imake-staging.patch;patch=1 \
+	file://imake-installed.patch;patch=1 \
+	file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
+	file://dri.patch;patch=1"
+
+PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
+
+S = "${WORKDIR}/xc"
+
+FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
+FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
+FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
+FILES_${PN}-doc += "${libdir}/X11/doc"
+
+do_configure() {
+	echo "#define BuildServersOnly YES" > config/cf/host.def
+	echo "#define ProjectRoot /usr" >> config/cf/host.def
+	echo "#define XnestServer NO"  >> config/cf/host.def
+	echo "#define XdmxServer NO"  >> config/cf/host.def
+	echo "#define CcCmd gcc" >> config/cf/host.def
+	echo "#define LdCmd ld" >> config/cf/host.def
+	echo "#define HasFreetype2 YES" >> config/cf/host.def
+	echo "#define HasFontconfig YES" >> config/cf/host.def
+	echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
+	echo "" > config/cf/date.def
+	rm -f include/extensions/panoramiX.h
+	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
+	make CC="${BUILD_CC}" xmakefile
+	make Makefiles
+	make clean
+}
+
+do_compile() {
+	#make depend
+	make includes
+	make -C config/util CC="${BUILD_CC}"
+	for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
+	make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
+}
+
+do_install() {
+	make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+	make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xserver-xorg
+	for i in i810 via; do
+	  pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+	done
+	install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
+}