[oe-commits] org.oe.dev merge of '49d63989ff625988d6bb90696a2abb7d3fc939bb'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Jan 3 15:00:58 UTC 2008
merge of '49d63989ff625988d6bb90696a2abb7d3fc939bb'
and 'e470e7389a3efbef69e6eb562d9457d642b782a1'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 274270bd49f45e5d154a09560078fd8473cebef3
ViewMTN: http://monotone.openembedded.org/revision/info/274270bd49f45e5d154a09560078fd8473cebef3
Files:
1
packages/dbus/dbus-1.1.1
packages/dbus/dbus-1.1.1/cross.patch
packages/dbus/dbus-1.1.1/dbus-1.init
packages/dbus/dbus-1.1.1/fix-install-daemon.patch
packages/dbus/dbus-1.1.1/tmpdir.patch
packages/dbus/dbus-native_1.1.1.bb
packages/dbus/dbus_1.1.1.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302
packages/linux/linux-2.6.23+2.6.24-rc6
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek
packages/sgmlspl
packages/sgmlspl/files
packages/speech-dispatcher
packages/speech-dispatcher/files
packages/util-linux-ng
conf/distro/include/preferred-om-2008-versions.inc
conf/machine/gesbc-9302.conf
packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb
packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch
packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch
packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig
packages/linux/linux_2.6.23+2.6.24-rc6.bb
packages/ntpclient/ntpclient_2007_365.bb
packages/opie-taskbar/opie-taskbar/firstuse-path.patch
packages/sgmlspl/files/combined.patch
packages/sgmlspl/sgmlspl-native_1.03ii.bb
packages/speech-dispatcher/files/srcMakefile.am.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/util-linux-ng/util-linux-ng.inc
packages/util-linux-ng/util-linux-ng_2.13.1.bb
MAINTAINERS
packages/docbook-utils/docbook-utils-native_0.6.14.bb
packages/gpsd/gpsd.inc
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/opie-taskbar/opie-taskbar_1.2.3.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/xrestop/xrestop_0.4.bb
Diffs:
#
# mt diff -r49d63989ff625988d6bb90696a2abb7d3fc939bb -r274270bd49f45e5d154a09560078fd8473cebef3
#
#
#
# add_dir "packages/dbus/dbus-1.1.1"
#
# add_file "packages/dbus/dbus-1.1.1/cross.patch"
# content [8893afa8766367ecce4e78b1bbede8c7e4781336]
#
# add_file "packages/dbus/dbus-1.1.1/dbus-1.init"
# content [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
#
# add_file "packages/dbus/dbus-1.1.1/fix-install-daemon.patch"
# content [a130a0f9e1442b0848f09d45516d4c1fae678502]
#
# add_file "packages/dbus/dbus-1.1.1/tmpdir.patch"
# content [074f93acba96cb165a3d21cac74b5fdfaae98fc8]
#
# add_file "packages/dbus/dbus-native_1.1.1.bb"
# content [6b8c402959c6434e289e34eae91e9e615a2ddf77]
#
# add_file "packages/dbus/dbus_1.1.1.bb"
# content [8067523daef0e32a078d9ed9d83ac3254616dcc5]
#
============================================================
--- packages/dbus/dbus-1.1.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
+++ packages/dbus/dbus-1.1.1/cross.patch 8893afa8766367ecce4e78b1bbede8c7e4781336
@@ -0,0 +1,10 @@
+--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+ exit (0);
+ ]])],
+ [ac_cv_have_abstract_sockets=yes],
++ [ac_cv_have_abstract_sockets=no],
+ [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
============================================================
--- packages/dbus/dbus-1.1.1/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
+++ packages/dbus/dbus-1.1.1/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
@@ -0,0 +1,110 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters at debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+ . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+ if [ ! -d $PIDDIR ]; then
+ mkdir -p $PIDDIR
+ chown $DAEMONUSER $PIDDIR
+ chgrp $DAEMONUSER $PIDDIR
+ fi
+ if [ -e $PIDFILE ]; then
+ PIDDIR=/proc/$(cat $PIDFILE)
+ if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+ echo "$DESC already started; not starting."
+ else
+ echo "Removing stale PID file $PIDFILE."
+ rm -f $PIDFILE
+ fi
+ fi
+
+ if [ ! -d $UUIDDIR ]; then
+ mkdir -p $UUIDDIR
+ chown $DAEMONUSER $UUIDDIR
+ chgrp $DAEMONUSER $UUIDDIR
+ fi
+
+ dbus-uuidgen --ensure
+
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ if [ -d $EVENTDIR ]; then
+ run-parts --arg=start $EVENTDIR
+ fi
+}
+
+shut_it_down()
+{
+ if [ -d $EVENTDIR ]; then
+ # TODO: --reverse when busybox supports it
+ run-parts --arg=stop $EVENTDIR
+ fi
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER
+ # We no longer include these arguments so that start-stop-daemon
+ # can do its job even given that we may have been upgraded.
+ # We rely on the pidfile being sanely managed
+ # --exec $DAEMON -- --system $PARAMS
+ echo "$NAME."
+ rm -f $PIDFILE
+}
+
+reload_it()
+{
+ echo -n "Reloading $DESC config: "
+ dbus-send --print-reply --system --type=method_call \
+ --dest=org.freedesktop.DBus \
+ / org.freedesktop.DBus.ReloadConfig > /dev/null
+ # hopefully this is enough time for dbus to reload it's config file.
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start_it_up
+ ;;
+ stop)
+ shut_it_down
+ ;;
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
+ shut_it_down
+ sleep 1
+ start_it_up
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/dbus/dbus-1.1.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
+++ packages/dbus/dbus-1.1.1/fix-install-daemon.patch a130a0f9e1442b0848f09d45516d4c1fae678502
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ fi
+- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
============================================================
--- packages/dbus/dbus-1.1.1/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
+++ packages/dbus/dbus-1.1.1/tmpdir.patch 074f93acba96cb165a3d21cac74b5fdfaae98fc8
@@ -0,0 +1,30 @@
+--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+- DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+- DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+- DEFAULT_SOCKET_DIR=$TMP
+-else
+- DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++# DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++# DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++# DEFAULT_SOCKET_DIR=$TMP
++#else
++# DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+
+ if ! test -z "$with_test_socket_dir" ; then
+ TEST_SOCKET_DIR="$with_test_socket_dir"
============================================================
--- packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
+++ packages/dbus/dbus-native_1.1.1.bb 6b8c402959c6434e289e34eae91e9e615a2ddf77
@@ -0,0 +1,31 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+SECTION = "base"
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
+ "
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-${PV}"
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+ --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+ oe_runmake install
+ autotools_stage_all
+
+ # for dbus-glib-native introspection generation
+ install -d ${STAGING_DATADIR}/dbus
+ install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
============================================================
--- packages/dbus/dbus_1.1.1.bb 8067523daef0e32a078d9ed9d83ac3254616dcc5
+++ packages/dbus/dbus_1.1.1.bb 8067523daef0e32a078d9ed9d83ac3254616dcc5
@@ -0,0 +1,63 @@
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "base"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+PR = "r3"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init \
+ file://cross.patch;patch=1 \
+ file://fix-install-daemon.patch;patch=1"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+ --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+ oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+
+ mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+ install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+python populate_packages_prepend () {
+ if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+ bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
#
# mt diff -re470e7389a3efbef69e6eb562d9457d642b782a1 -r274270bd49f45e5d154a09560078fd8473cebef3
#
#
#
# rename "packages/docbook-sgml-dtd/docbook-sgml-dtd-native_3.1.bb"
# to "packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb"
#
# rename "packages/gpsd/gpsd_2.34.bb"
# to "packages/gpsd/gpsd_2.36.bb"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc6"
#
# add_dir "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek"
#
# add_dir "packages/sgmlspl"
#
# add_dir "packages/sgmlspl/files"
#
# add_dir "packages/speech-dispatcher"
#
# add_dir "packages/speech-dispatcher/files"
#
# add_dir "packages/util-linux-ng"
#
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
# content [f09fc00fcb956472364428627b653deb21fa27ae]
#
# add_file "conf/machine/gesbc-9302.conf"
# content [dc5cebcd4e8515d7e65c4053f016747909663f28]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb"
# content [8af8a43ede5d17504c520bf8d4329c50aeb479f1]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb"
# content [e8096a2fc94fd8c1d952962f9e9a3172902171fb]
#
# add_file "packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc"
# content [01a0574c4b3118881ffd717a2614da49aad139af]
#
# add_file "packages/gpsd/gpsd_2.34.bb"
# content [8e241bbd828101019cda7b30a6725fd6759f50f4]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch"
# content [ab4bd36055349047026603f7f1035fe82b99c6e6]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig"
# content [9dd09f9d70607d6a484fe477d1ad29e3da5382a9]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch"
# content [707e51aa6cd3708350eac84d75dac92c331ebcb6]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch"
# content [1c329717e813ec3539ae5ede3b9e483408c66fe5]
#
# add_file "packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig"
# content [4a6da18c95a3d28a7e9e1d26bdcb8e1f265a4078]
#
# add_file "packages/linux/linux_2.6.23+2.6.24-rc6.bb"
# content [484f320fd5570d9501196799d9d68a36d909f36f]
#
# add_file "packages/ntpclient/ntpclient_2007_365.bb"
# content [d5bc8f8a34db32961a6955ff40660c464bbc2d5c]
#
# add_file "packages/opie-taskbar/opie-taskbar/firstuse-path.patch"
# content [3daabb637a289e05a96e0c4ac8364ea64b7edcf4]
#
# add_file "packages/sgmlspl/files/combined.patch"
# content [4ca5a624cdcc66efa1d3aa936c8a9a116486d189]
#
# add_file "packages/sgmlspl/sgmlspl-native_1.03ii.bb"
# content [d31e81ad7221fd62d1b0de0b029adda659ed88a2]
#
# add_file "packages/speech-dispatcher/files/srcMakefile.am.patch"
# content [7c2fd881a766fc549324acfbb465e7c40a936749]
#
# add_file "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# content [990e0945a62343c1db6ea8b85b8b82ce5e35151c]
#
# add_file "packages/util-linux-ng/util-linux-ng.inc"
# content [5cc612853b6855e2f4df6b91f5f06801c6b029aa]
#
# add_file "packages/util-linux-ng/util-linux-ng_2.13.1.bb"
# content [506c0f835de96a1c5623a992679b614ef4a4555f]
#
# patch "MAINTAINERS"
# from [4feb68bdd9be0d74c5e83609ed81cdb2f0e33169]
# to [8be8b1832f42218d3cc6ae809b61dc80fcd70003]
#
# patch "packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb"
# from [dc639dcc8d259f0b47f5c3350b926cc213ffe48f]
# to [1fc1597723f6cd7f859c6ab5cb7cd2829205a052]
#
# patch "packages/docbook-utils/docbook-utils-native_0.6.14.bb"
# from [1a0a22dd392f60cedcc86e8ef30f293786d3ebc9]
# to [a71a90f95c1e63d6e70e783d56e0e3d756600f16]
#
# patch "packages/gpsd/gpsd.inc"
# from [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
# to [91e167633095484f711ff118e87bf2839f7105b2]
#
# patch "packages/gpsd/gpsd_2.36.bb"
# from [8e241bbd828101019cda7b30a6725fd6759f50f4]
# to [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
#
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
# from [13ddabf2aeaf44b5315cb84028c6cae9a8168953]
# to [8cef3230be1ba924b6e2c80492f1092a17566910]
#
# patch "packages/opie-taskbar/opie-taskbar_1.2.3.bb"
# from [0112ad577e4b14c11a22556dd9de7e2c22083f02]
# to [15845323fc8ba58771813583d4029baff27ca2b0]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [61a236fc7e91c5eab32ed70a7bd08065ed5186a2]
# to [edbbc176136c3e3d59b88a9c7ca445855ffe7c96]
#
# patch "packages/xrestop/xrestop_0.4.bb"
# from [db89658b7bd6b24b3f7e98e50641efe9b4e25bb3]
# to [0a3c25fb100d4201cfed337558f772d41d2ba1fb]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
+++ conf/distro/include/preferred-om-2008-versions.inc f09fc00fcb956472364428627b653deb21fa27ae
@@ -0,0 +1 @@
+PREFERRED_VERSION_vte = "0.16.10"
============================================================
--- conf/machine/gesbc-9302.conf dc5cebcd4e8515d7e65c4053f016747909663f28
+++ conf/machine/gesbc-9302.conf dc5cebcd4e8515d7e65c4053f016747909663f28
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Glomation GESBC-9302 single board computer
+#@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "57600 ttyAM0"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+#extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
+
+#tune for ep93xx cpus
+#can be used for crunch support later on
+#require conf/machine/include/tune-ep9312.inc
+
+require conf/machine/include/tune-arm920t.inc
+
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb 8af8a43ede5d17504c520bf8d4329c50aeb479f1
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb 8af8a43ede5d17504c520bf8d4329c50aeb479f1
@@ -0,0 +1,12 @@
+require docbook-sgml-dtd-native.inc
+
+DTD_VERSION = "4.1"
+
+SRC_URI = "http://docbook.org/sgml/4.1/docbk41.zip"
+
+do_compile() {
+ # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
+ # for details.
+ sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat
+}
+
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb e8096a2fc94fd8c1d952962f9e9a3172902171fb
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb e8096a2fc94fd8c1d952962f9e9a3172902171fb
@@ -0,0 +1,10 @@
+require docbook-sgml-dtd-native.inc
+
+DTD_VERSION = "4.4"
+
+do_compile() {
+ # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
+ # for details.
+ sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat
+}
+
============================================================
--- packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc 01a0574c4b3118881ffd717a2614da49aad139af
+++ packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc 01a0574c4b3118881ffd717a2614da49aad139af
@@ -0,0 +1,31 @@
+# The DTDs of the various versions have to be installed in parallel and should
+# not replace each other. The installation step is common for all versions
+# and just differs in the DTD_VERSION.
+#
+# However the DTDs need some quirks (see LFS documentation).
+
+DESCRIPTION = "Document type definitions for verification of SGML data files against the DocBook rule set"
+
+DEPENDS = "sgml-common-native"
+
+SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip"
+
+S = "${WORKDIR}"
+
+inherit native
+
+do_stage () {
+ # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html
+ # for details.
+ install -d -m 755 ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}
+ install docbook.cat ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog
+ cp -dpr *.dtd *.mod *.dcl ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}
+
+ install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat \
+ ${STAGING_DATADIR}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog
+
+ install-catalog --add ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat \
+ ${sysconfdir}/sgml/sgml-docbook.cat
+}
+
+PACKAGES = ""
============================================================
--- packages/gpsd/gpsd_2.34.bb 8e241bbd828101019cda7b30a6725fd6759f50f4
+++ packages/gpsd/gpsd_2.34.bb 8e241bbd828101019cda7b30a6725fd6759f50f4
@@ -0,0 +1,4 @@
+require gpsd.inc
+
+PR = "r6"
+
============================================================
--- packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch ab4bd36055349047026603f7f1035fe82b99c6e6
+++ packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch ab4bd36055349047026603f7f1035fe82b99c6e6
@@ -0,0 +1,306 @@
+From 9819226a16a12ba0545e90b475fa70d408544971 Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake at happy.(none)>
+Date: Mon, 17 Dec 2007 16:45:47 -0500
+Subject: [PATCH] gesbc-nand
+
+---
+ drivers/mtd/nand/Kconfig | 7 ++
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/gesbc.c | 255 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 263 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/mtd/nand/gesbc.c
+
+diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
+index 246d451..cde3146 100644
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -51,6 +51,13 @@ config MTD_NAND_EDB7312
+ This enables the driver for the Cirrus Logic EBD7312 evaluation
+ board to access the onboard NAND Flash.
+
++config MTD_NAND_GESBC
++ tristate "Support for Glomation GESBC-93xx board"
++ depends on MTD_NAND && MACH_EDB9302
++ help
++ This enables the driver for the Glomation GESBC-93xx
++ board to access the onboard NAND Flash.
++
+ config MTD_NAND_H1900
+ tristate "iPAQ H1900 flash"
+ depends on ARCH_PXA && MTD_PARTITIONS
+diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
+index 3ad6c01..58c1961 100644
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o
+ obj-$(CONFIG_MTD_NAND_TOTO) += toto.o
+ obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o
+ obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
++obj-$(CONFIG_MTD_NAND_GESBC) += gesbc.o
+ obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o
+ obj-$(CONFIG_MTD_NAND_BF5XX) += bf5xx_nand.o
+ obj-$(CONFIG_MTD_NAND_PPCHAMELEONEVB) += ppchameleonevb.o
+diff --git a/drivers/mtd/nand/gesbc.c b/drivers/mtd/nand/gesbc.c
+new file mode 100644
+index 0000000..a5844b1
+--- /dev/null
++++ b/drivers/mtd/nand/gesbc.c
+@@ -0,0 +1,255 @@
++/*
++ * drivers/mtd/nand/gesbc-9302.c
++ *
++ * Copyright (C) 2004 Glomation (support at glomationinc.com)
++ *
++ * Derived from drivers/mtd/nand/edb7312.c
++ * Copyright (C) 2004 Marius Grer (mag at sysgo.de)
++ *
++ * Derived from drivers/mtd/nand/autcpu12.c
++ * Copyright (c) 2001 Thomas Gleixner (gleixner at autronix.de)
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * Overview:
++ * This is a device driver for the NAND flash device found on the
++ * GESBC-93xx board with Samsung 128/256/512 Mbyte part.
++ */
++
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/partitions.h>
++#include <asm/io.h>
++#include <asm/arch/hardware.h>
++#include <asm/sizes.h>
++
++#define GESBC_NAND_FLASH_DATA 0x10000000
++
++#define GPIO_PADR EP93XX_GPIO_REG(0x0)
++#define GPIO_PADDR EP93XX_GPIO_REG(0x10)
++#define SMCBCR1 (EP93XX_AHB_VIRT_BASE + 0x00082000 + 0x04)
++
++/*
++ * MTD structure for GESBC-93xx board
++ */
++static struct mtd_info *gesbc_mtd = NULL;
++
++
++/*
++ * Module stuff
++ */
++static unsigned long gesbc_fio_pbase = GESBC_NAND_FLASH_DATA;
++
++#ifdef CONFIG_MTD_PARTITIONS
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info32[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 128*1024*1024 },
++};
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info128[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 128*1024*1024 },
++};
++
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info256[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 256*1024*1024 },
++};
++
++/*
++ * Define static partitions for flash device
++ */
++static struct mtd_partition partition_info512[] = {
++ { .name= "GESBC NAND FLASH",
++ .offset= 0,
++ .size= 512*1024*1024 },
++};
++
++#define NUM_PARTITIONS 1
++#endif
++
++
++/*
++ * hardware specific access to control-lines
++ * NAND_NCE: bit 0 -> bit 3
++ * NAND_CLE: bit 1 -> bit 4
++ * NAND_ALE: bit 2 -> bit 6
++ */
++static void gesbc_hwcontrol(struct mtd_info *mtd, int cmd, int ctrl)
++{
++ unsigned long flags;
++ struct nand_chip *chip = mtd->priv;
++
++ /* Disbale interrupt to avoid race condition */
++ local_irq_save(flags);
++
++ if (ctrl & NAND_CTRL_CHANGE) {
++ unsigned char bits;
++
++ bits = (ctrl & NAND_CLE) << 3;
++ bits |= (ctrl & NAND_ALE) << 4;
++ if (ctrl & NAND_NCE)
++ bits &= ~0x08;
++ else
++ bits |= 0x08;
++
++ __raw_writel( (__raw_readl(GPIO_PADR) & ~0x58 )| bits, GPIO_PADR);
++ }
++ if (cmd != NAND_CMD_NONE)
++ writeb(cmd, chip->IO_ADDR_W);
++ /* Restore interrupt state */
++ local_irq_restore(flags);
++}
++
++/*
++ * read device ready pin
++ */
++static int gesbc_device_ready(struct mtd_info *mtd)
++{
++ return (__raw_readl(GPIO_PADR) & 0x80) >> 7;
++}
++
++#define MTDID "s3c2440-nand"
++
++static const char *probes[] = { "cmdlinepart", NULL };
++
++
++
++/*
++ * Main initialization routine
++ */
++static int __init gesbc_nand_init (void)
++{
++ struct nand_chip *this;
++ const char *part_type = 0;
++ int mtd_parts_nb = 0;
++ struct mtd_partition *mtd_parts = 0;
++ unsigned long flags;
++ void * gesbc_fio_base;
++
++ /* Allocate memory for MTD device structure and private data */
++ gesbc_mtd = kmalloc(sizeof(struct mtd_info) +
++ sizeof(struct nand_chip),
++ GFP_KERNEL);
++ if (!gesbc_mtd) {
++ printk("Unable to allocate GESBC NAND MTD device structure.\n");
++ return -ENOMEM;
++ }
++
++ /* map physical adress */
++ gesbc_fio_base = ioremap(gesbc_fio_pbase, SZ_1K);
++ if(!gesbc_fio_base) {
++ printk("ioremap GESBC-93xx NAND flash failed\n");
++ kfree(gesbc_mtd);
++ return -EIO;
++ }
++
++
++ /* Get pointer to private data */
++ this = (struct nand_chip *) (&gesbc_mtd[1]);
++
++ /* Initialize structures */
++ memset((char *) gesbc_mtd, 0, sizeof(struct mtd_info));
++ memset((char *) this, 0, sizeof(struct nand_chip));
++
++ /* Link the private data with the MTD structure */
++ gesbc_mtd->priv = this;
++
++ /* Disbale interrupt to avoid race condition */
++ local_irq_save(flags);
++
++ /*
++ * Set GPIO Port A control register so that the pins are configured
++ * to be outputs for controlling the NAND flash.
++ */
++ __raw_writel((__raw_readl(GPIO_PADDR) | 0x58) & ~0x80, GPIO_PADDR);
++ /* Clear NCE, clear CLE, clear ALE */
++ __raw_writel( (__raw_readl(GPIO_PADR) | 0x08 ) & ~0x50, GPIO_PADR);
++ /* Set SRAM controller to 32 bit (8 bit just doesn't work, don't know why) bus width and 7 CLK wait state */
++ __raw_writel(0x10003ce0, SMCBCR1);
++ local_irq_restore(flags);
++
++
++ /* insert callbacks */
++ this->IO_ADDR_R = (void *) gesbc_fio_base;
++ this->IO_ADDR_W = (void *) gesbc_fio_base;
++ this->cmd_ctrl = (void *) gesbc_hwcontrol;
++ this->dev_ready = gesbc_device_ready;
++ this->chip_delay = 25;
++ this->ecc.mode = NAND_ECC_SOFT;
++
++ __raw_writel(0xffffffff, gesbc_fio_base);
++ printk("Searching for NAND flash...\n");
++ /* Scan to find existence of the device */
++ if (nand_scan (gesbc_mtd, 1)) {
++ iounmap((void *)gesbc_fio_base);
++ kfree (gesbc_mtd);
++ return -ENXIO;
++ }
++
++#ifdef CONFIG_MTD_CMDLINE_PARTS
++ gesbc_mtd->name="GESBC-NAND";
++ mtd_parts_nb = parse_mtd_partitions(gesbc_mtd, p%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list