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

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

2005/06/18 20:25:14+01:00 reciva.com!pb
remove some old, broken xservers


2005/06/18 20:18:41+01:00 reciva.com!pb
check for lircd in ${sbindir}

2005/06/18 19:54:54+01:00 reciva.com!pb
update linux-epia to 2.6.12; disable in-kernel drm


BKrev: 42b4789aqSGQUoxkKdKTSUl7RQyMug

6 files changed, 39 insertions, 121 deletions

diff --git a/packages/linux/linux-epia-2.6.12/epia_defconfig b/packages/linux/linux-epia-2.6.12/epia_defconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-epia-2.6.12/epia_defconfig
diff --git a/packages/linux/linux-epia_2.6.12.bb b/packages/linux/linux-epia_2.6.12.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-epia_2.6.12.bb
diff --git a/packages/lirc/files/lircd.init b/packages/lirc/files/lircd.init
index e69de29bb2..e549b7ede9 100644
--- a/packages/lirc/files/lircd.init
+++ b/packages/lirc/files/lircd.init
@@ -0,0 +1,38 @@
+#! /bin/sh
+#
+# This is an init script for Familiar
+# Copy it to /etc/init.d/lirc and type
+# > update-rc.d lirc defaults 20
+#
+
+
+test -f /usr/sbin/lircd || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting lirc daemon: lircd"
+    start-stop-daemon --start --quiet --exec /usr/bin/lircd -- --device=/dev/lirc
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping lirc daemon: lircd"
+    start-stop-daemon --stop --quiet --exec /usr/bin/lircd
+    echo "."
+    ;;
+  reload|force-reload)
+    start-stop-daemon --stop --quiet --signal 1 --exec /usr/bin/lircd
+    ;;
+  restart)
+    echo -n "Stopping lirc daemon: lircd"
+    start-stop-daemon --stop --quiet --exec /usr/bin/lircd
+    sleep 1
+    echo -n "Starting lirc daemon: lircd"
+    start-stop-daemon --start --quiet --exec /usr/bin/lircd -- --device=/dev/lirc
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/lircd {start|stop|reload|restart|force-reload}"
+    exit 1
+esac
+
+exit 0
diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb
index fd3f89046d..a946d3cdb0 100644
--- a/packages/lirc/lirc_0.7.1.bb
+++ b/packages/lirc/lirc_0.7.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
       file://lircd.init file://lircmd.init"
diff --git a/packages/xserver/xserver-xorg_6.8.99.5.bb b/packages/xserver/xserver-xorg_6.8.99.5.bb
deleted file mode 100644
index 5dbdbe8e05..0000000000
--- a/packages/xserver/xserver-xorg_6.8.99.5.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-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_5 \
-	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"
-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/
-}
diff --git a/packages/xserver/xserver-xorg_6.8.bb b/packages/xserver/xserver-xorg_6.8.bb
deleted file mode 100644
index 308189fc24..0000000000
--- a/packages/xserver/xserver-xorg_6.8.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-SECTION = "x11/base"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-LICENSE = "Xorg"
-PR = "r6"
-
-DEPENDS = "freetype libxi xmu flex-2.5.4-native"
-
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
-	cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;tag=release;method=pserver;module=xfree86 \
-	file://imake-staging.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"
-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 ${CC}" >> config/cf/host.def
-	echo "#define LdCmd ${LD}" >> config/cf/host.def
-	echo "" > config/cf/date.def
-	cp -r ${WORKDIR}/xfree86/* ${S}/programs/Xserver/hw/xfree86/drivers/via/
-}
-
-do_compile() {
-	make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
-	make CC="${BUILD_CC}" xmakefile
-	make Makefiles
-	make clean
-	#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=""
-}
-
-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/
-}