diff options
49 files changed, 1192 insertions, 48 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8f36b1a4d8..0a85bd4647 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16,10 +16,34 @@ Recipes: Maintained recipes (should match package names, can include wildcard ----------------------------------------------------------------------------- +Person: Erik Hovland +Mail: erik@hovland.org +Distros: familiar +Machines: h3600, h5400 +Interests: Kernels, Porting, Distro refinement +Recipes: at76c503a, dropbear, handhelds-sa, handhelds-pxa + +Person: Jamie Lenehan +Mail: lenehan@twibble.org +Website: http://twibble.org/ +Interests: sh4, router/firewall/networking +Distros: eRouter +Machines: titan, wrap +Recipes: quagga, iputils, ndic6, hping2, lilo-sh, conserver, ipsec-tools, +Recipes: lilo-sh, clamav, havp, p3scan, clamsmtp, librsync, rdiff-backup, +Recipes: net-snmp, ebtables, ethtool, arpwatch, lib*-perl + Person: Joaquim Duran Mail: joaquinduran@adtelecom.es Recipes: fltk +Person: Justin Patrin +Mail: papercrane@reversefold.com +Website: http://www.reversefold.com +Interests: OpenZaurus, E17, PHP +Recipes: efl/*, e17/*, musicpd/*, parted, netcat, emacs +Recipes: elitaire, synergy, lineak + Person: Koen Kooi Mail: koen@openembedded.org Website: http://dominion.kabel.utwente.nl/koen/cms @@ -79,4 +103,3 @@ Recipes: ccxstream, eciadsl, ssmtp, gstreamer, ixp4xx-npe, joe Recipes: lcdproc, libol, mailx, mysql, musicpd, openntpd, qc-usb Recipes: radlib, scsi-idle, rng-tools, slugos-init, syslog-ng Recipes: vsftpd, zd1211, wpa-supplicant - diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 11d47f11c8..8fb5ada118 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,6 +8,7 @@ #DISTRO_VERSION = "2006.9" DISTRO_VERSION = "test-${DATE}" +DISTRO_REVISION = "2" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -16,6 +17,7 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ + no-arch##${ANGSTROM_URI}/unstable/feed/all \ base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \ perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \ python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \ @@ -154,7 +156,7 @@ PREFERRED_VERSION_hostap-modules ?= "0.4.7" # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' #this should go away soon EXTRA_STUFF ?= "" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 35cb1d2070..12143edf63 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -17,7 +17,7 @@ OLDEST_KERNEL = "2.6.17" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" -MACHINE_FEATURES = "kernel26 usbhost ext2" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci" require conf/machine/include/tune-athlonmp.conf diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index e94b7d4d56..caaead2d93 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -23,7 +23,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb PCMCIA_MANAGER = "pcmciautils" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA__RRECOMMENDS = "kernel-module-nls_cp437 \ +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls_cp437 \ kernel-module-nls_iso8859-1 \ kernel-module-nls_utf8 \ kernel-module-af_key \ diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py index 0c0aea27c1..0b91347a48 100755 --- a/contrib/python/generate-manifest.py +++ b/contrib/python/generate-manifest.py @@ -236,10 +236,11 @@ if __name__ == "__main__": "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " "pipes.* socket.* tempfile.* StringIO.* " ) - m.addPackage( 0, "python-lang", "Python Low-Level Language Support", "python-core", + m.addPackage( 1, "python-lang", "Python Low-Level Language Support", "python-core", "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " + - "lib-dynload/itertools.so lib-dynload/collections.so " + - "atexit.* code.* codeop.* dis.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* traceback.* linecache.* weakref.*" ) + "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " + + "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* " + + "traceback.* linecache.* weakref.*" ) m.addPackage( 0, "python-logging", "Python Logging Support", "python-core", "logging" ) # package @@ -305,8 +306,8 @@ if __name__ == "__main__": m.addPackage( 0, "python-tests", "Python Tests", "python-core", "test" ) # package - m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", - "_threading_local.* bisect.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) + m.addPackage( 1, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", + "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang", "unittest.*" ) diff --git a/packages/aiostress/.mtn2git_empty b/packages/aiostress/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/aiostress/.mtn2git_empty diff --git a/packages/aiostress/aiostress_0.0.bb b/packages/aiostress/aiostress_0.0.bb new file mode 100644 index 0000000000..8b4085ad4f --- /dev/null +++ b/packages/aiostress/aiostress_0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Asynchronous I/O stress util" +LICENSE = "GPLv2" +DEPENDS = "libaio" + +SRC_URI = "ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c;md5sum=727e5fc3566837b3ea72f887d048769b" + +S = "${WORKDIR}" + +do_compile() { + + cd ${S} && ${CC} aio-stress.c -o aio-stress -I${STAGING_INCDIR} -L${STAGING_LIBDIR} -laio -lpthread +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 aio-stress ${D}${bindir} +} diff --git a/packages/bitbake/bitbake_svn.bb b/packages/bitbake/bitbake_svn.bb index 1df6dacbed..d43d03b0f3 100644 --- a/packages/bitbake/bitbake_svn.bb +++ b/packages/bitbake/bitbake_svn.bb @@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1" # We don't need a toolchain... INHIBIT_DEFAULT_DEPS = "1" -PV = "0.0+svn${SRCDATE}" +PV = "1.7.0+svn${SRCDATE}" SRC_URI = "svn://svn.berlios.de/bitbake/trunk;module=bitbake" # SRC_URI = "svn+ssh://svn.berlios.de/bitbake/trunk;module=bitbake" S = "${WORKDIR}/bitbake" diff --git a/packages/dbench/.mtn2git_empty b/packages/dbench/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbench/.mtn2git_empty diff --git a/packages/dbench/dbench/.mtn2git_empty b/packages/dbench/dbench/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbench/dbench/.mtn2git_empty diff --git a/packages/dbench/dbench/destdir.patch b/packages/dbench/dbench/destdir.patch new file mode 100644 index 0000000000..9fe1508f97 --- /dev/null +++ b/packages/dbench/dbench/destdir.patch @@ -0,0 +1,23 @@ +Index: dbench-3.04/Makefile.in +=================================================================== +--- dbench-3.04.orig/Makefile.in 2006-09-17 20:21:07.000000000 +0200 ++++ dbench-3.04/Makefile.in 2006-09-17 20:21:36.000000000 +0200 +@@ -32,12 +32,12 @@ + + # Careful here: don't install client.txt over itself. + install: all +- ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir) +- ${INSTALLCMD} dbench tbench tbench_srv $(bindir) +- ${INSTALLCMD} client.txt $(datadir) +- ${INSTALLCMD} -m644 dbench.1 $(mandir) +- ln -sf dbench.1 $(mandir)/tbench.1 +- ln -sf dbench.1 $(mandir)/tbench_srv.1 ++ ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) ++ ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) ++ ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) ++ ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir) ++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 ++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 + + clean: + rm -f *.o *~ dbench tbench tbench_srv diff --git a/packages/dbench/dbench_3.04.bb b/packages/dbench/dbench_3.04.bb new file mode 100644 index 0000000000..5eec719b95 --- /dev/null +++ b/packages/dbench/dbench_3.04.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "The dbench (disk) and tbench (TCP) benchmarks" +DESCRIPTION_dbench = "Filesystem load benchmark" +DESCRIPTION_tbench = "TCP load benchmark" +HOMEPAGE = "http://samba.org/ftp/tridge/dbench/" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \ + file://destdir.patch;patch=1" + +inherit autotools + +PACKAGES =+ "tbench tbench-dbg" + +FILES_tbench = "${bindir}/tbench*" +FILES_tbench-dbg = "${bindir}/.debug/tbench*" diff --git a/packages/dbus/dbus-0.94/.mtn2git_empty b/packages/dbus/dbus-0.94/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-0.94/.mtn2git_empty diff --git a/packages/dbus/dbus-0.94/fix-install-daemon.patch b/packages/dbus/dbus-0.94/fix-install-daemon.patch new file mode 100644 index 0000000000..c31786357d --- /dev/null +++ b/packages/dbus/dbus-0.94/fix-install-daemon.patch @@ -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 diff --git a/packages/dbus/dbus-native_0.94.bb b/packages/dbus/dbus-native_0.94.bb new file mode 100644 index 0000000000..2d99c56370 --- /dev/null +++ b/packages/dbus/dbus-native_0.94.bb @@ -0,0 +1,28 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" + +S = "${WORKDIR}/dbus-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus" +DEPENDS = "glib-2.0-native libxml2-native expat-native" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1" + +inherit autotools pkgconfig gettext native + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --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 +} diff --git a/packages/dbus/dbus_0.94.bb b/packages/dbus/dbus_0.94.bb new file mode 100644 index 0000000000..050be8a86e --- /dev/null +++ b/packages/dbus/dbus_0.94.bb @@ -0,0 +1,64 @@ +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" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://fix-segfault.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" +dbus-uuidgen --ensure +} + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --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) +} diff --git a/packages/diffutils/diffutils_2.8.1.bb b/packages/diffutils/diffutils_2.8.1.bb index e8de2cad62..a0a7b7dad9 100644 --- a/packages/diffutils/diffutils_2.8.1.bb +++ b/packages/diffutils/diffutils_2.8.1.bb @@ -3,11 +3,11 @@ LICENSE = "GPL" DESCRIPTION = "Diffutils contains the GNU diff, diff3, \ sdiff, and cmp utilities. These programs are usually \ used for creating patch files." -PR = "r1" +PR = "r2" SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" -inherit autotools +inherit autotools update-alternatives # diffutils assumes non-glibc compilation with uclibc and # this causes it to generate its own implementations of @@ -15,3 +15,11 @@ inherit autotools # because it uses __mempcpy, there are other things (TBD: # see diffutils.mk in buildroot) EXTRA_OECONF_linux-uclibc = "--without-included-regex" + +do_install_append () { + mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN} +} + +ALTERNATIVE_NAME = "diff" +ALTERNATIVE_PATH = "diff.${PN}" +ALTERNATIVE_PRIORITY = "100" diff --git a/packages/fakeroot/fakeroot_1.2.13.bb b/packages/fakeroot/fakeroot_1.2.13.bb index 6867a39c93..e29cf162b4 100644 --- a/packages/fakeroot/fakeroot_1.2.13.bb +++ b/packages/fakeroot/fakeroot_1.2.13.bb @@ -1,14 +1,17 @@ DESCRIPTION = "Gives a fake root environment" -SECTION = "base" HOMEPAGE = "http://joostje.op.het.net/fakeroot/index.html" +SECTION = "base" LICENSE = "GPL" +# fakeroot needs getopt which is provided by the util-linux package +RDEPENDS = "util-linux" +PR = "r1" SRC_URI = "http://openzaurus.org/mirror/fakeroot_${PV}.tar.gz" inherit autotools do_stage() { - install -d ${STAGING_INCDIR}/fakeroot - install -m 644 *.h ${STAGING_INCDIR}/fakeroot - autotools_stage_all + install -d ${STAGING_INCDIR}/fakeroot + install -m 644 *.h ${STAGING_INCDIR}/fakeroot + autotools_stage_all } diff --git a/packages/fsx-linux/.mtn2git_empty b/packages/fsx-linux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fsx-linux/.mtn2git_empty diff --git a/packages/fsx-linux/fsx-linux_0.0.bb b/packages/fsx-linux/fsx-linux_0.0.bb new file mode 100644 index 0000000000..294af8fdfd --- /dev/null +++ b/packages/fsx-linux/fsx-linux_0.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Asynchronous I/O stress util" + +SRC_URI = "http://www.codemonkey.org.uk/projects/fsx/fsx-linux.c" + +S = "${WORKDIR}" + +do_compile() { + + cd ${S} && ${CC} fsx-linux.c -o fsx-linux -I${STAGING_INCDIR} -L${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 fsx-linux ${D}${bindir} +} diff --git a/packages/interbench/.mtn2git_empty b/packages/interbench/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/interbench/.mtn2git_empty diff --git a/packages/interbench/interbench_0.30.bb b/packages/interbench/interbench_0.30.bb new file mode 100644 index 0000000000..6ddc947057 --- /dev/null +++ b/packages/interbench/interbench_0.30.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Linux interactivity benchmark" +HOMEPAGE = "http://members.optusnet.com.au/ckolivas/interbench/" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/ck/apps/interbench/interbench-0.30.tar.bz2" + +inherit autotools + +do_install() { + install -d ${D}${bindir} ${D}${datadir}/doc/${PN}/ ${D}${mandir}/man8/ + install -m 0755 interbench ${D}${bindir} + install -m 0644 readme* ${D}${datadir}/doc/${PN}/ + install -m 0644 interbench.8 ${D}${mandir}/man8/ +} diff --git a/packages/kernbench/.mtn2git_empty b/packages/kernbench/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kernbench/.mtn2git_empty diff --git a/packages/kernbench/kernbench_0.41.bb b/packages/kernbench/kernbench_0.41.bb new file mode 100644 index 0000000000..4a49cce8c6 --- /dev/null +++ b/packages/kernbench/kernbench_0.41.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "cpu throughput benchmark" +HOMEPAGE = "http://kernbench.kolivas.org/" +LICENSE = "GPL" +RDEPENDS = "time" + +SRC_URI = "http://www.kernel.org/pub/linux/kernel/people/ck/apps/kernbench/kernbench-${PV}.tar.bz2" + +inherit autotools + +do_install() { + install -d ${D}${bindir} ${D}${datadir}/doc/${PN}/ + install -m 0755 kernbench ${D}${bindir} + install -m 0644 README ${D}${datadir}/doc/${PN}/ +} diff --git a/packages/less/less_382.bb b/packages/less/less_382.bb index b489722edb..f336a59ad6 100644 --- a/packages/less/less_382.bb +++ b/packages/less/less_382.bb @@ -1,16 +1,22 @@ -SECTION = "console/utils" -DEPENDS = "ncurses" DESCRIPTION = "Less is a program similar to more, i.e. a terminal \ based program for viewing text files and the output from other \ programs. Less offers many features beyond those that more does." HOMEPAGE = "http://www.greenwoodsoftware.com/" +SECTION = "console/utils" LICENSE = "BSD" +DEPENDS = "ncurses" +PR = "r1" SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \ - file://configure.patch;patch=1" + file://configure.patch;patch=1" -inherit autotools +inherit autotools update-alternatives do_install () { - oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install + oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install + mv ${D}${bindir}/less ${D}${bindir}/less.${PN} } + +ALTERNATIVE_NAME = "less" +ALTERNATIVE_PATH = "less.${PN}" +ALTERNATIVE_PRIORITY = "100" diff --git a/packages/libaio/libaio-0.3.106/.mtn2git_empty b/packages/libaio/libaio-0.3.106/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libaio/libaio-0.3.106/.mtn2git_empty diff --git a/packages/libaio/libaio-0.3.106/00_arches.patch b/packages/libaio/libaio-0.3.106/00_arches.patch new file mode 100644 index 0000000000..f4ca5ff11d --- /dev/null +++ b/packages/libaio/libaio-0.3.106/00_arches.patch @@ -0,0 +1,770 @@ +--- libaio-0.3.106.orig/src/syscall-m68k.h ++++ libaio-0.3.106/src/syscall-m68k.h +@@ -0,0 +1,78 @@ ++#define __NR_io_setup 241 ++#define __NR_io_destroy 242 ++#define __NR_io_getevents 243 ++#define __NR_io_submit 244 ++#define __NR_io_cancel 245 ++ ++#define io_syscall1(type,fname,sname,atype,a) \ ++type fname(atype a) \ ++{ \ ++register long __res __asm__ ("%d0") = __NR_##sname; \ ++register long __a __asm__ ("%d1") = (long)(a); \ ++__asm__ __volatile__ ("trap #0" \ ++ : "+d" (__res) \ ++ : "d" (__a) ); \ ++return (type) __res; \ ++} ++ ++#define io_syscall2(type,fname,sname,atype,a,btype,b) \ ++type fname(atype a,btype b) \ ++{ \ ++register long __res __asm__ ("%d0") = __NR_##sname; \ ++register long __a __asm__ ("%d1") = (long)(a); \ ++register long __b __asm__ ("%d2") = (long)(b); \ ++__asm__ __volatile__ ("trap #0" \ ++ : "+d" (__res) \ ++ : "d" (__a), "d" (__b) \ ++ ); \ ++return (type) __res; \ ++} ++ ++#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \ ++type fname(atype a,btype b,ctype c) \ ++{ \ ++register long __res __asm__ ("%d0") = __NR_##sname; \ ++register long __a __asm__ ("%d1") = (long)(a); \ ++register long __b __asm__ ("%d2") = (long)(b); \ ++register long __c __asm__ ("%d3") = (long)(c); \ ++__asm__ __volatile__ ("trap #0" \ ++ : "+d" (__res) \ ++ : "d" (__a), "d" (__b), \ ++ "d" (__c) \ ++ ); \ ++return (type) __res; \ ++} ++ ++#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \ ++type fname (atype a, btype b, ctype c, dtype d) \ ++{ \ ++register long __res __asm__ ("%d0") = __NR_##sname; \ ++register long __a __asm__ ("%d1") = (long)(a); \ ++register long __b __asm__ ("%d2") = (long)(b); \ ++register long __c __asm__ ("%d3") = (long)(c); \ ++register long __d __asm__ ("%d4") = (long)(d); \ ++__asm__ __volatile__ ("trap #0" \ ++ : "+d" (__res) \ ++ : "d" (__a), "d" (__b), \ ++ "d" (__c), "d" (__d) \ ++ ); \ ++return (type) __res; \ ++} ++ ++#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ ++type fname (atype a,btype b,ctype c,dtype d,etype e) \ ++{ \ ++register long __res __asm__ ("%d0") = __NR_##sname; \ ++register long __a __asm__ ("%d1") = (long)(a); \ ++register long __b __asm__ ("%d2") = (long)(b); \ ++register long __c __asm__ ("%d3") = (long)(c); \ ++register long __d __asm__ ("%d4") = (long)(d); \ ++register long __e __asm__ ("%d5") = (long)(e); \ ++__asm__ __volatile__ ("trap #0" \ ++ : "+d" (__res) \ ++ : "d" (__a), "d" (__b), \ ++ "d" (__c), "d" (__d), "d" (__e) \ ++ ); \ ++return (type) __res; \ ++} ++ +--- libaio-0.3.106.orig/src/syscall-sparc.h ++++ libaio-0.3.106/src/syscall-sparc.h +@@ -0,0 +1,130 @@ ++/* $Id: unistd.h,v 1.74 2002/02/08 03:57:18 davem Exp $ */ ++ ++/* ++ * System calls under the Sparc. ++ * ++ * Don't be scared by the ugly clobbers, it is the only way I can ++ * think of right now to force the arguments into fixed registers ++ * before the trap into the system call with gcc 'asm' statements. ++ * ++ * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) ++ * ++ * SunOS compatibility based upon preliminary work which is: ++ * ++ * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) ++ */ ++ ++ ++#define __NR_io_setup 268 ++#define __NR_io_destroy 269 ++#define __NR_io_submit 270 ++#define __NR_io_cancel 271 ++#define __NR_io_getevents 272 ++ ++ ++#define io_syscall1(type,fname,sname,type1,arg1) \ ++type fname(type1 arg1) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res >= 0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ ++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ ++type fname(type1 arg1,type2 arg2) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res >= 0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ ++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ ++type fname(type1 arg1,type2 arg2,type3 arg3) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++register long __o2 __asm__ ("o2") = (long)(arg3); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res>=0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ ++#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++register long __o2 __asm__ ("o2") = (long)(arg3); \ ++register long __o3 __asm__ ("o3") = (long)(arg4); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res>=0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ ++#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ ++ type5,arg5) \ ++type fname(type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ ++{ \ ++long __res; \ ++register long __g1 __asm__ ("g1") = __NR_##sname; \ ++register long __o0 __asm__ ("o0") = (long)(arg1); \ ++register long __o1 __asm__ ("o1") = (long)(arg2); \ ++register long __o2 __asm__ ("o2") = (long)(arg3); \ ++register long __o3 __asm__ ("o3") = (long)(arg4); \ ++register long __o4 __asm__ ("o4") = (long)(arg5); \ ++__asm__ __volatile__ ("t 0x10\n\t" \ ++ "bcc 1f\n\t" \ ++ "mov %%o0, %0\n\t" \ ++ "sub %%g0, %%o0, %0\n\t" \ ++ "1:\n\t" \ ++ : "=r" (__res), "=&r" (__o0) \ ++ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__g1) \ ++ : "cc"); \ ++if (__res < -255 || __res>=0) \ ++ return (type) __res; \ ++return -1; \ ++} ++ +--- libaio-0.3.106.orig/src/syscall.h ++++ libaio-0.3.106/src/syscall.h +@@ -22,6 +22,16 @@ + #include "syscall-s390.h" + #elif defined(__alpha__) + #include "syscall-alpha.h" ++#elif defined(__arm__) ++#include "syscall-arm.h" ++#elif defined(__m68k__) ++#include "syscall-m68k.h" ++#elif defined(__sparc__) ++#include "syscall-sparc.h" ++#elif defined(__hppa__) ++#include "syscall-parisc.h" ++#elif defined(__mips__) ++#include "syscall-mips.h" + #else + #error "add syscall-arch.h" + #endif +--- libaio-0.3.106.orig/src/syscall-mips.h ++++ libaio-0.3.106/src/syscall-mips.h +@@ -0,0 +1,223 @@ ++/* ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file "COPYING" in the main directory of this archive ++ * for more details. ++ * ++ * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle ++ * Copyright (C) 1999, 2000 Silicon Graphics, Inc. ++ * ++ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto ++ * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A ++ */ ++ ++#ifndef _MIPS_SIM_ABI32 ++#define _MIPS_SIM_ABI32 1 ++#define _MIPS_SIM_NABI32 2 ++#define _MIPS_SIM_ABI64 3 ++#endif ++ ++#if _MIPS_SIM == _MIPS_SIM_ABI32 ++ ++/* ++ * Linux o32 style syscalls are in the range from 4000 to 4999. ++ */ ++#define __NR_Linux 4000 ++#define __NR_io_setup (__NR_Linux + 241) ++#define __NR_io_destroy (__NR_Linux + 242) ++#define __NR_io_getevents (__NR_Linux + 243) ++#define __NR_io_submit (__NR_Linux + 244) ++#define __NR_io_cancel (__NR_Linux + 245) ++ ++#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ ++ ++#if _MIPS_SIM == _MIPS_SIM_ABI64 ++ ++/* ++ * Linux 64-bit syscalls are in the range from 5000 to 5999. ++ */ ++#define __NR_Linux 5000 ++#define __NR_io_setup (__NR_Linux + 200) ++#define __NR_io_destroy (__NR_Linux + 201) ++#define __NR_io_getevents (__NR_Linux + 202) ++#define __NR_io_submit (__NR_Linux + 203) ++#define __NR_io_cancel (__NR_Linux + 204) ++#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ ++ ++#if _MIPS_SIM == _MIPS_SIM_NABI32 ++ ++/* ++ * Linux N32 syscalls are in the range from 6000 to 6999. ++ */ ++#define __NR_Linux 6000 ++#define __NR_io_setup (__NR_Linux + 200) ++#define __NR_io_destroy (__NR_Linux + 201) ++#define __NR_io_getevents (__NR_Linux + 202) ++#define __NR_io_submit (__NR_Linux + 203) ++#define __NR_io_cancel (__NR_Linux + 204) ++#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ ++ ++#define io_syscall1(type,fname,sname,atype,a) \ ++type fname(atype a) \ ++{ \ ++ register unsigned long __a0 asm("$4") = (unsigned long) a; \ ++ register unsigned long __a3 asm("$7"); \ ++ unsigned long __v0; \ ++ \ ++ __asm__ volatile ( \ ++ ".set\tnoreorder\n\t" \ ++ "li\t$2, %3\t\t\t# " #fname "\n\t" \ ++ "syscall\n\t" \ ++ "move\t%0, $2\n\t" \ ++ ".set\treorder" \ ++ : "=&r" (__v0), "=r" (__a3) \ ++ : "r" (__a0), "i" (__NR_##sname) \ ++ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ ++ "memory"); \ ++ \ ++ if (__a3 == 0) \ ++ return (type) __v0; \ ++ return (type) -1; \ ++} ++ ++#define io_syscall2(type,fname,sname,atype,a,btype,b) \ ++type fname(atype a, btype b) \ ++{ \ ++ register unsigned long __a0 asm("$4") = (unsigned long) a; \ ++ register unsigned long __a1 asm("$5") = (unsigned long) b; \ ++ register unsigned long __a3 asm("$7"); \ ++ unsigned long __v0; \ ++ \ ++ __asm__ volatile ( \ ++ ".set\tnoreorder\n\t" \ ++ "li\t$2, %4\t\t\t# " #fname "\n\t" \ ++ "syscall\n\t" \ ++ "move\t%0, $2\n\t" \ ++ ".set\treorder" \ ++ : "=&r" (__v0), "=r" (__a3) \ ++ : "r" (__a0), "r" (__a1), "i" (__NR_##sname) \ ++ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ ++ "memory"); \ ++ \ ++ if (__a3 == 0) \ ++ return (type) __v0; \ ++ return (type) -1; \ ++} ++ ++#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \ ++type fname(atype a, btype b, ctype c) \ ++{ \ ++ register unsigned long __a0 asm("$4") = (unsigned long) a; \ ++ register unsigned long __a1 asm("$5") = (unsigned long) b; \ ++ register unsigned long __a2 asm("$6") = (unsigned long) c; \ ++ register unsigned long __a3 asm("$7"); \ ++ unsigned long __v0; \ ++ \ ++ __asm__ volatile ( \ ++ ".set\tnoreorder\n\t" \ ++ "li\t$2, %5\t\t\t# " #fname "\n\t" \ ++ "syscall\n\t" \ ++ "move\t%0, $2\n\t" \ ++ ".set\treorder" \ ++ : "=&r" (__v0), "=r" (__a3) \ ++ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \ ++ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ ++ "memory"); \ ++ \ ++ if (__a3 == 0) \ ++ return (type) __v0; \ ++ return (type) -1; \ ++} ++ ++#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \ ++type fname(atype a, btype b, ctype c, dtype d) \ ++{ \ ++ register unsigned long __a0 asm("$4") = (unsigned long) a; \ ++ register unsigned long __a1 asm("$5") = (unsigned long) b; \ ++ register unsigned long __a2 asm("$6") = (unsigned long) c; \ ++ register unsigned long __a3 asm("$7") = (unsigned long) d; \ ++ unsigned long __v0; \ ++ \ ++ __asm__ volatile ( \ ++ ".set\tnoreorder\n\t" \ ++ "li\t$2, %5\t\t\t# " #fname "\n\t" \ ++ "syscall\n\t" \ ++ "move\t%0, $2\n\t" \ ++ ".set\treorder" \ ++ : "=&r" (__v0), "+r" (__a3) \ ++ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \ ++ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ ++ "memory"); \ ++ \ ++ if (__a3 == 0) \ ++ return (type) __v0; \ ++ return (type) -1; \ ++} ++ ++#if (_MIPS_SIM == _MIPS_SIM_ABI32) ++ ++/* ++ * Using those means your brain needs more than an oil change ;-) ++ */ ++ ++#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ ++type fname(atype a, btype b, ctype c, dtype d, etype e) \ ++{ \ ++ register unsigned long __a0 asm("$4") = (unsigned long) a; \ ++ register unsigned long __a1 asm("$5") = (unsigned long) b; \ ++ register unsigned long __a2 asm("$6") = (unsigned long) c; \ ++ register unsigned long __a3 asm("$7") = (unsigned long) d; \ ++ unsigned long __v0; \ ++ \ ++ __asm__ volatile ( \ ++ ".set\tnoreorder\n\t" \ ++ "lw\t$2, %6\n\t" \ ++ "subu\t$29, 32\n\t" \ ++ "sw\t$2, 16($29)\n\t" \ ++ "li\t$2, %5\t\t\t# " #fname "\n\t" \ ++ "syscall\n\t" \ ++ "move\t%0, $2\n\t" \ ++ "addiu\t$29, 32\n\t" \ ++ ".set\treorder" \ ++ : "=&r" (__v0), "+r" (__a3) \ ++ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname), \ ++ "m" ((unsigned long)e) \ ++ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ ++ "memory"); \ ++ \ ++ if (__a3 == 0) \ ++ return (type) __v0; \ ++ return (type) -1; \ ++} ++ ++#endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ ++ ++#if (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) ++ ++#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ ++type fname (atype a,btype b,ctype c,dtype d,etype e) \ ++{ \ ++ register unsigned long __a0 asm("$4") = (unsigned long) a; \ ++ register unsigned long __a1 asm("$5") = (unsigned long) b; \ ++ register unsigned long __a2 asm("$6") = (unsigned long) c; \ ++ register unsigned long __a3 asm("$7") = (unsigned long) d; \ ++ register unsigned long __a4 asm("$8") = (unsigned long) e; \ ++ unsigned long __v0; \ ++ \ ++ __asm__ volatile ( \ ++ ".set\tnoreorder\n\t" \ ++ "li\t$2, %6\t\t\t# " #fname "\n\t" \ ++ "syscall\n\t" \ ++ "move\t%0, $2\n\t" \ ++ ".set\treorder" \ ++ : "=&r" (__v0), "+r" (__a3) \ ++ : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), "i" (__NR_##sname) \ ++ : "$2", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ ++ "memory"); \ ++ \ ++ if (__a3 == 0) \ ++ return (type) __v0; \ ++ return (type) -1; \ ++} ++ ++#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ ++ +--- libaio-0.3.106.orig/src/libaio.h ++++ libaio-0.3.106/src/libaio.h +@@ -72,6 +72,40 @@ + #define PADDED(x, y) unsigned y; x + #define PADDEDptr(x, y) unsigned y; x + #define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__arm__) ++# if defined (__ARMEB__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++# else /* little endian, 32 bits */ ++#define PADDED(x, y) x; unsigned y ++#define PADDEDptr(x, y) x; unsigned y ++#define PADDEDul(x, y) unsigned long x; unsigned y ++# endif ++#elif defined(__m68k__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__sparc__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__hppa__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++#elif defined(__mips__) ++# if defined (__MIPSEB__) /* big endian, 32 bits */ ++#define PADDED(x, y) unsigned y; x ++#define PADDEDptr(x, y) unsigned y; x ++#define PADDEDul(x, y) unsigned y; unsigned long x ++# elif defined(__MIPSEL__) /* little endian, 32 bits */ ++#define PADDED(x, y) x; unsigned y ++#define PADDEDptr(x, y) x; unsigned y ++#define PADDEDul(x, y) unsigned long x; unsigned y ++# else ++# error "neither mipseb nor mipsel?" ++# endif + #else + #error endian? + #endif +--- libaio-0.3.106.orig/src/syscall-parisc.h ++++ libaio-0.3.106/src/syscall-parisc.h +@@ -0,0 +1,146 @@ ++/* ++ * Linux system call numbers. ++ * ++ * Cary Coutant says that we should just use another syscall gateway ++ * page to avoid clashing with the HPUX space, and I think he's right: ++ * it will would keep a branch out of our syscall entry path, at the ++ * very least. If we decide to change it later, we can ``just'' tweak ++ * the LINUX_GATEWAY_ADDR define at the bottom and make __NR_Linux be ++ * 1024 or something. Oh, and recompile libc. =) ++ * ++ * 64-bit HPUX binaries get the syscall gateway address passed in a register ++ * from the kernel at startup, which seems a sane strategy. ++ */ ++ ++#define __NR_Linux 0 ++#define __NR_io_setup (__NR_Linux + 215) ++#define __NR_io_destroy (__NR_Linux + 216) ++#define __NR_io_getevents (__NR_Linux + 217) ++#define __NR_io_submit (__NR_Linux + 218) ++#define __NR_io_cancel (__NR_Linux + 219) ++ ++#define SYS_ify(syscall_name) __NR_##syscall_name ++ ++/* Assume all syscalls are done from PIC code just to be ++ * safe. The worst case scenario is that you lose a register ++ * and save/restore r19 across the syscall. */ ++#define PIC ++ ++/* Definition taken from glibc 2.3.3 ++ * sysdeps/unix/sysv/linux/hppa/sysdep.h ++ */ ++ ++#ifdef PIC ++/* WARNING: CANNOT BE USED IN A NOP! */ ++# define K_STW_ASM_PIC " copy %%r19, %%r4\n" ++# define K_LDW_ASM_PIC " copy %%r4, %%r19\n" ++# define K_USING_GR4 "%r4", ++#else ++# define K_STW_ASM_PIC " \n" ++# define K_LDW_ASM_PIC " \n" ++# define K_USING_GR4 ++#endif ++ ++/* GCC has to be warned that a syscall may clobber all the ABI ++ registers listed as "caller-saves", see page 8, Table 2 ++ in section 2.2.6 of the PA-RISC RUN-TIME architecture ++ document. However! r28 is the result and will conflict with ++ the clobber list so it is left out. Also the input arguments ++ registers r20 -> r26 will conflict with the list so they ++ are treated specially. Although r19 is clobbered by the syscall ++ we cannot say this because it would violate ABI, thus we say ++ r4 is clobbered and use that register to save/restore r19 ++ across the syscall. */ ++ ++#define K_CALL_CLOB_REGS "%r1", "%r2", K_USING_GR4 \ ++ "%r20", "%r29", "%r31" ++ ++#undef K_INLINE_SYSCALL ++#define K_INLINE_SYSCALL(name, nr, args...) ({ \ ++ long __sys_res; \ ++ { \ ++ register unsigned long __res __asm__("r28"); \ ++ K_LOAD_ARGS_##nr(args) \ ++ /* FIXME: HACK stw/ldw r19 around syscall */ \ ++ __asm__ volatile( \ ++ K_STW_ASM_PIC \ ++ " ble 0x100(%%sr2, %%r0)\n" \ ++ " ldi %1, %%r20\n" \ ++ K_LDW_ASM_PIC \ ++ : "=r" (__res) \ ++ : "i" (SYS_ify(name)) K_ASM_ARGS_##nr \ ++ : "memory", K_CALL_CLOB_REGS K_CLOB_ARGS_##nr \ ++ ); \ ++ __sys_res = (long)__res; \ ++ } \ ++ __sys_res; \ ++}) ++ ++#define K_LOAD_ARGS_0() ++#define K_LOAD_ARGS_1(r26) \ ++ register unsigned long __r26 __asm__("r26") = (unsigned long)(r26); \ ++ K_LOAD_ARGS_0() ++#define K_LOAD_ARGS_2(r26,r25) \ ++ register unsigned long __r25 __asm__("r25") = (unsigned long)(r25); \ ++ K_LOAD_ARGS_1(r26) ++#define K_LOAD_ARGS_3(r26,r25,r24) \ ++ register unsigned long __r24 __asm__("r24") = (unsigned long)(r24); \ ++ K_LOAD_ARGS_2(r26,r25) ++#define K_LOAD_ARGS_4(r26,r25,r24,r23) \ ++ register unsigned long __r23 __asm__("r23") = (unsigned long)(r23); \ ++ K_LOAD_ARGS_3(r26,r25,r24) ++#define K_LOAD_ARGS_5(r26,r25,r24,r23,r22) \ ++ register unsigned long __r22 __asm__("r22") = (unsigned long)(r22); \ ++ K_LOAD_ARGS_4(r26,r25,r24,r23) ++#define K_LOAD_ARGS_6(r26,r25,r24,r23,r22,r21) \ ++ register unsigned long __r21 __asm__("r21") = (unsigned long)(r21); \ ++ K_LOAD_ARGS_5(r26,r25,r24,r23,r22) ++ ++/* Even with zero args we use r20 for the syscall number */ ++#define K_ASM_ARGS_0 ++#define K_ASM_ARGS_1 K_ASM_ARGS_0, "r" (__r26) ++#define K_ASM_ARGS_2 K_ASM_ARGS_1, "r" (__r25) ++#define K_ASM_ARGS_3 K_ASM_ARGS_2, "r" (__r24) ++#define K_ASM_ARGS_4 K_ASM_ARGS_3, "r" (__r23) ++#define K_ASM_ARGS_5 K_ASM_ARGS_4, "r" (__r22) ++#define K_ASM_ARGS_6 K_ASM_ARGS_5, "r" (__r21) ++ ++/* The registers not listed as inputs but clobbered */ ++#define K_CLOB_ARGS_6 ++#define K_CLOB_ARGS_5 K_CLOB_ARGS_6, "%r21" ++#define K_CLOB_ARGS_4 K_CLOB_ARGS_5, "%r22" ++#define K_CLOB_ARGS_3 K_CLOB_ARGS_4, "%r23" ++#define K_CLOB_ARGS_2 K_CLOB_ARGS_3, "%r24" ++#define K_CLOB_ARGS_1 K_CLOB_ARGS_2, "%r25" ++#define K_CLOB_ARGS_0 K_CLOB_ARGS_1, "%r26" ++ ++#define io_syscall1(type,fname,sname,type1,arg1) \ ++type fname(type1 arg1) \ ++{ \ ++ return K_INLINE_SYSCALL(sname, 1, arg1); \ ++} ++ ++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ ++type fname(type1 arg1, type2 arg2) \ ++{ \ ++ return K_INLINE_SYSCALL(sname, 2, arg1, arg2); \ ++} ++ ++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ ++type fname(type1 arg1, type2 arg2, type3 arg3) \ ++{ \ ++ return K_INLINE_SYSCALL(sname, 3, arg1, arg2, arg3); \ ++} ++ ++#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ ++{ \ ++ return K_INLINE_SYSCALL(sname, 4, arg1, arg2, arg3, arg4); \ ++} ++ ++#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ ++{ \ ++ return K_INLINE_SYSCALL(sname, 5, arg1, arg2, arg3, arg4, arg5); \ ++} ++ +--- libaio-0.3.106.orig/src/syscall-arm.h ++++ libaio-0.3.106/src/syscall-arm.h +@@ -0,0 +1,116 @@ ++/* ++ * linux/include/asm-arm/unistd.h ++ * ++ * Copyright (C) 2001-2005 Russell King ++ * ++ * 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. ++ * ++ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk, ++ * no matter what the change is. Thanks! ++ */ ++ ++#define __NR_OABI_SYSCALL_BASE 0x900000 ++ ++#if defined(__thumb__) || defined(__ARM_EABI__) ++#define __NR_SYSCALL_BASE 0 ++#else ++#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE ++#endif ++ ++#define __NR_io_setup (__NR_SYSCALL_BASE+243) ++#define __NR_io_destroy (__NR_SYSCALL_BASE+244) ++#define __NR_io_getevents (__NR_SYSCALL_BASE+245) ++#define __NR_io_submit (__NR_SYSCALL_BASE+246) ++#define __NR_io_cancel (__NR_SYSCALL_BASE+247) ++ ++#define __sys2(x) #x ++#define __sys1(x) __sys2(x) ++ ++#if defined(__thumb__) || defined(__ARM_EABI__) ++#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name; ++#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs ++#define __syscall(name) "swi\t0" ++#else ++#define __SYS_REG(name) ++#define __SYS_REG_LIST(regs...) regs ++#define __syscall(name) "swi\t" __sys1(__NR_##name) "" ++#endif ++ ++#define io_syscall1(type,fname,sname,type1,arg1) \ ++type fname(type1 arg1) { \ ++ __SYS_REG(sname) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __res_r0 __asm__("r0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0) ) \ ++ : "memory" ); \ ++ return (type) __res_r0; \ ++} ++ ++#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ ++type fname(type1 arg1,type2 arg2) { \ ++ __SYS_REG(sname) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __res_r0 __asm__("r0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) \ ++ : "memory" ); \ ++ return (type) __res_r0; \ ++} ++ ++#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ ++type fname(type1 arg1,type2 arg2,type3 arg3) { \ ++ __SYS_REG(sname) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __res_r0 __asm__("r0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) \ ++ : "memory" ); \ ++ return (type) __res_r0; \ ++} ++ ++#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \ ++ __SYS_REG(sname) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __r3 __asm__("r3") = (long)arg4; \ ++ register long __res_r0 __asm__("r0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \ ++ : "memory" ); \ ++ return (type) __res_r0; \ ++} ++ ++#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\ ++ __SYS_REG(sname) \ ++ register long __r0 __asm__("r0") = (long)arg1; \ ++ register long __r1 __asm__("r1") = (long)arg2; \ ++ register long __r2 __asm__("r2") = (long)arg3; \ ++ register long __r3 __asm__("r3") = (long)arg4; \ ++ register long __r4 __asm__("r4") = (long)arg5; \ ++ register long __res_r0 __asm__("r0"); \ ++ __asm__ __volatile__ ( \ ++ __syscall(sname) \ ++ : "=r" (__res_r0) \ ++ : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ ++ "r" (__r3), "r" (__r4) ) \ ++ : "memory" ); \ ++ return (type) __res_r0; \ ++} ++ diff --git a/packages/libaio/libaio-0.3.106/destdir.patch b/packages/libaio/libaio-0.3.106/destdir.patch new file mode 100644 index 0000000000..3246f095c8 --- /dev/null +++ b/packages/libaio/libaio-0.3.106/destdir.patch @@ -0,0 +1,13 @@ +Index: libaio-0.3.106/Makefile +=================================================================== +--- libaio-0.3.106.orig/Makefile 2004-02-26 07:25:10.000000000 -0800 ++++ libaio-0.3.106/Makefile 2006-10-14 09:19:07.000000000 -0700 +@@ -15,7 +15,7 @@ + @$(MAKE) -C src + + install: +- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) ++ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) + + + clean: diff --git a/packages/libaio/libaio_0.3.106.bb b/packages/libaio/libaio_0.3.106.bb new file mode 100644 index 0000000000..bc70bbe8d2 --- /dev/null +++ b/packages/libaio/libaio_0.3.106.bb @@ -0,0 +1,17 @@ +DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \ + file://00_arches.patch;patch=1 \ + file://destdir.patch;patch=1" + +do_stage() { + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + install -m 0644 src/libaio.h ${STAGING_INCDIR} + oe_libinstall -so -C src libaio ${STAGING_LIBDIR} +} + +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc index 573888f30a..30d7eee5dd 100644 --- a/packages/linux/ixp4xx-kernel-svnpatch.inc +++ b/packages/linux/ixp4xx-kernel-svnpatch.inc @@ -1,12 +1,11 @@ addtask svnpatch before do_configure after do_patch -IXP4XX_KERNEL_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/kernel/trunk +IXP4XX_KERNEL_SVN_REPO = http://svn.nslu2-linux.org/svnroot/kernel/trunk do_svnpatch() { - svn co ${IXP4XX_KERNEL_SVN_REPO}/patches/${PV} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV} + svn co ${IXP4XX_KERNEL_SVN_REPO}/patches/${IXP4XX_KERNEL_PATCH_DIR} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV} cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig rm -rf ${S}/patches cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches - cd ${S} && ${STAGING_BINDIR}/quilt push -av + cd ${S} && rm -rf .pc && ${STAGING_BINDIR}/quilt push -av } - diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index 963658f503..611ff8c65c 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.bb @@ -6,7 +6,11 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "446" +IXP4XX_KERNEL_SVN_REV = "473" +# +# The directory containing the patches to be applied is +# specified below +IXP4XX_KERNEL_PATCH_DIR = "2.6.18" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc2.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc2.bb new file mode 100644 index 0000000000..9ed2aa748a --- /dev/null +++ b/packages/linux/ixp4xx-kernel_2.6.19-rc2.bb @@ -0,0 +1,22 @@ +# Kernel for IXP4xx +# +# This bitbake file pulls patches and the defconfig straight +# from the NSLU2-Linux SVN repository. Information about this +# repository can be found at: +# http://trac.nslu2-linux.org/kernel/ +# +# The revision that is pulled from SVN is specified below +IXP4XX_KERNEL_SVN_REV = "473" +# +# The directory containing the patches to be applied is +# specified below +IXP4XX_KERNEL_PATCH_DIR = "2.6.19" +# +# Increment the number below (i.e. the digits after PR) when +# the changes in SVN between revisions include changes in the +# patches applied to the kernel, rather than simply defconfig +# changes +PR = "r1.${IXP4XX_KERNEL_SVN_REV}" + +require ixp4xx-kernel.inc +require ixp4xx-kernel-svnpatch.inc diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb index eae524a7ae..edeb927f0d 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb @@ -5,6 +5,7 @@ PV = "2.4.20-rmk2-embedix" LICENSE = "GPL" KV = "2.4.20" PR = "r18" +COMPATIBLE_MACHINE = "(akita|spitz)" SRC_URI = "http://developer.ezaurus.com/sl_j/source/c3100/20050602/linux-c3100-20050602-rom1_01.tar.bz2 \ file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \ diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index a79d4f3a00..34ccfb14f3 100644 --- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -8,6 +8,7 @@ PXAV = "3" SHARPV = "20030509" PR = "r23" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" +COMPATIBLE_MACHINE = "collie" SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \ file://cacko.patch;patch=1 \ diff --git a/packages/ossiecf/.mtn2git_empty b/packages/ossiecf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ossiecf/.mtn2git_empty diff --git a/packages/ossiecf/ossiecf_svn.bb b/packages/ossiecf/ossiecf_svn.bb new file mode 100644 index 0000000000..5e69f9ec46 --- /dev/null +++ b/packages/ossiecf/ossiecf_svn.bb @@ -0,0 +1,17 @@ +PR = "r0" +DESCRIPTION = "OSSIE Core Framework" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" + +DEPENDS = "xerces-c omniorb" + +S="${WORKDIR}/ossie" + +SRC_URI = "svn://ossie-dev.mprg.org/repos/ossie/ossie/trunk;module=ossie;proto=https" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb index abbcc28987..b1e1ae2fad 100644 --- a/packages/psmisc/psmisc_21.8.bb +++ b/packages/psmisc/psmisc_21.8.bb @@ -1,3 +1,3 @@ require psmisc.inc -PR = "r1" +PR = "r2" SRC_URI += "file://signames-header-fix.patch;patch=1" diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb index 4f0d7f219d..62327fa4d6 100644 --- a/packages/psmisc/psmisc_22.2.bb +++ b/packages/psmisc/psmisc_22.2.bb @@ -1,2 +1,2 @@ require psmisc.inc -PR = "r0" +PR = "r1" diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 3a460e562a..ad73cb9451 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Fri Aug 25 15:00:35 2006 +### AUTO-GENERATED by '/local/pkg/oe/org.openembedded.dev/contrib/python/generate-manifest.py' [(C) 2002-2006 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Oct 14 21:22:20 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -18,9 +18,9 @@ RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml0" +PR_python-threading="ml1" RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " +FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" PR_python-distutils="ml0" @@ -258,9 +258,9 @@ RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml0" +PR_python-lang="ml1" RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " +FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" PR_python-audio="ml0" diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 1380c2e40f..2650926307 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml6" +PR = "ml7" PYTHON_MAJMIN = "2.4" diff --git a/packages/reaim/.mtn2git_empty b/packages/reaim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/reaim/.mtn2git_empty diff --git a/packages/reaim/reaim/.mtn2git_empty b/packages/reaim/reaim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/reaim/reaim/.mtn2git_empty diff --git a/packages/reaim/reaim/makefile-fix.patch b/packages/reaim/reaim/makefile-fix.patch new file mode 100644 index 0000000000..4678d9d83f --- /dev/null +++ b/packages/reaim/reaim/makefile-fix.patch @@ -0,0 +1,23 @@ +From: Marcin Juszkiewicz <hrw@openembedded.org> + +1. Link with libaio +2. Do not show instructions during do_install or bitbake will break + +Index: osdl-aim-7/src/Makefile.am +=================================================================== +--- osdl-aim-7.orig/src/Makefile.am 2004-10-21 01:31:33.000000000 +0200 ++++ osdl-aim-7/src/Makefile.am 2006-10-14 19:57:28.000000000 +0200 +@@ -8,7 +8,7 @@ + LIBADD_READLINE = + # endif + +-reaim_LDADD = $(top_builddir)/lib/libltp.a $(LIBADD_READLINE) ++reaim_LDADD = $(top_builddir)/lib/libltp.a $(LIBADD_READLINE) -laio + reaim_SOURCES = driver.c suite.h files.h ram.c aimlist.h \ + rand.c times_ms.c testerr.h add.c creat_clo.c drv_funcs.c \ + div.c disk_funcs.c pipe_test.c mul.c num_fcns.c int_fcns.c \ +@@ -42,4 +42,3 @@ + if test -f $(srcdir)/README; then \ + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(datadir)/reaim; \ + fi +- @/bin/sh $(top_srcdir)/scripts/instruct.sh diff --git a/packages/reaim/reaim_7.0.1.13.bb b/packages/reaim/reaim_7.0.1.13.bb new file mode 100644 index 0000000000..5694a4364e --- /dev/null +++ b/packages/reaim/reaim_7.0.1.13.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "The AIM Multiuser Benchmark - Suite VII \ +tests and measures the performance of Open System multiuser computers." +HOMEPAGE = "http://re-aim-7.sourceforge.net/" +SECTION = "console/tests" +LICENSE = "GPL" +DEPENDS = "libaio" + +SRC_URI = "${SOURCEFORGE_MIRROR}/re-aim-7/osdl-aim-${PV}.tar.gz \ + file://makefile-fix.patch;patch=1" + +S = "${WORKDIR}/osdl-aim-7/" + +inherit autotools diff --git a/packages/strace/strace-4.5.14/glibc-2.5.patch b/packages/strace/strace-4.5.14/glibc-2.5.patch new file mode 100644 index 0000000000..3ee6b3de75 --- /dev/null +++ b/packages/strace/strace-4.5.14/glibc-2.5.patch @@ -0,0 +1,11 @@ +--- strace-4.5.14/strace.c~ 2006-10-14 14:54:54.000000000 +1000 ++++ strace-4.5.14/strace.c 2006-10-14 14:54:54.000000000 +1000 +@@ -2251,7 +2251,7 @@ + if (!cflag + && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) { + unsigned long addr = 0, pc = 0; +-#ifdef PT_GETSIGINFO ++#if defined(PT_GETSIGINFO) && defined(IA64) + # define PSR_RI 41 + struct siginfo si; + unsigned long psr; diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb index fcfa2b74d0..b301d0100b 100644 --- a/packages/strace/strace_4.5.14.bb +++ b/packages/strace/strace_4.5.14.bb @@ -1,15 +1,15 @@ -LICENSE = "GPL" -SECTION = "console/utils" -PR = "r3" - DESCRIPTION = "strace is a system call tracing tool." +SECTION = "console/utils" +LICENSE = "GPL" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ - file://arm-eabi.patch;patch=1 \ - file://drop-ctl-proc.patch;patch=1 \ - file://sh-arch-update.patch;patch=1 \ - file://sh-syscall-update.patch;patch=1 \ - file://strace-fix-arm-bad-syscall.patch;patch=1" + file://glibc-2.5.patch;patch=1 \ + file://arm-eabi.patch;patch=1 \ + file://drop-ctl-proc.patch;patch=1 \ + file://sh-arch-update.patch;patch=1 \ + file://sh-syscall-update.patch;patch=1 \ + file://strace-fix-arm-bad-syscall.patch;patch=1" inherit autotools diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 50ca203b9a..d724e65b57 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r9" +PR = "r10" PACKAGES = "task-base \ task-base-minimal \ @@ -74,6 +74,7 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ @@ -149,6 +150,9 @@ task-base-kernel26-rdepends = "\ task-base-keyboard-rdepends = "\ keymaps" +task-base-pci-rdepends = "\ + pciutils" + task-base-kernel26-extras-rrecommends = "\ kernel-module-input \ kernel-module-uinput" diff --git a/packages/zlib/zlib-1.2.3/autotools.patch b/packages/zlib/zlib-1.2.3/autotools.patch index 722a20d499..d1dc8dd8d4 100644 --- a/packages/zlib/zlib-1.2.3/autotools.patch +++ b/packages/zlib/zlib-1.2.3/autotools.patch @@ -480,15 +480,17 @@ diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac + +AC_OUTPUT diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am ---- zlib-1.2.3/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ zlib-1.2.3new/Makefile.am 2006-08-07 19:57:26.522344250 +0200 -@@ -0,0 +1,6 @@ +--- zlib-1.2.3/Makefile.am 2006/10/14 05:35:40 1.1 ++++ zlib-1.2.3new/Makefile.am 2006/10/14 05:36:49 +@@ -0,0 +1,8 @@ +lib_LTLIBRARIES = libz.la + +libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ + trees.c zutil.c inflate.c infback.c inftrees.c inffast.c + +libz_la_LDFLAGS = -version-number 1:2:3 ++ ++include_HEADERS = zconf.h zlib.h diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in --- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 +++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100 diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb index 571f7b5e08..629ee83efb 100644 --- a/packages/zlib/zlib_1.2.3.bb +++ b/packages/zlib/zlib_1.2.3.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "required" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" -PR="r1" +PR="r2" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ file://visibility.patch;patch=1 \ |