diff options
41 files changed, 692 insertions, 154 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index da3e630445..29624c3f78 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -112,8 +112,11 @@ def check_sanity(e): missing = missing.rstrip(',') messages = messages + "Please install following missing utilities: %s\n" % missing - if os.path.basename(os.readlink('/bin/sh')) == 'dash': - messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead.\n" + try: + if os.path.basename(os.readlink('/bin/sh')) == 'dash': + messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead.\n" + except: + pass omask = os.umask(022) if omask & 0755: diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 61e894882e..b00d12586b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -314,6 +314,8 @@ IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" IMAGE_EXTRA_SPACE = 10240 +UBI_VOLNAME ?= "${MACHINE}-rootfs" + IMAGE_CMD = "" IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2" @@ -329,7 +331,7 @@ IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) ${EXTRA_IMAGECMD}" IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz) ${EXTRA_IMAGECMD}" -IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=rootfs >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" +IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}" EXTRA_IMAGECMD = "" diff --git a/conf/checksums.ini b/conf/checksums.ini index 4ff2f9a0d2..ac9efe5ffb 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4062,6 +4062,10 @@ sha256=46c0991b71d1991aa2f90d6816d9efb737fc9f9b99713174fcdf8d323727a11c md5=7fdd5f8395162d8728d4b79e97b9819e sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401 +[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/debianutils/debianutils_2.30.tar.gz] +md5=7fdd5f8395162d8728d4b79e97b9819e +sha256=d62e98fee5b1a758d83b62eed8d8bdec473677ff782fed89fc4ae3ba3f381401 + [ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz] md5=053f18fd5d00873de365413cab17a666 sha256=d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d @@ -4358,6 +4362,10 @@ sha256=7b5b456e6ccb3a36cc96b84b79ba148850ab59ac45316b759a090a1121f93e13 md5=79ec740d1a10ee75f13efa4ff36d0250 sha256=9888d96d7d91e518c96a034dc863f8f7d961acd9334a1acde849c6022e540212 +[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.47.tar.gz] +md5=4524081e56d0b935717d493e8e8d3e11 +sha256=f2716a43eb05b232c640a4ad647fd0fc21dd0c4f4ad20c9f5303568742399e5d + [http://www.docbook.org/sgml/3.1/docbk31.zip] md5=432749c0c806dbae81c8bcb70da3b5d3 sha256=20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538 @@ -12554,6 +12562,10 @@ sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff md5=be845c41170d72c7db524f3411b50256 sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff +[ftp://ftp.pl.debian.org/pub/debian/pool/main/libn/libnet/libnet_1.1.2.1.orig.tar.gz] +md5=be845c41170d72c7db524f3411b50256 +sha256=ab01882a3d0556176018c09342cd0731f7cbc8e687795009894c3326942c76ff + [http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-0.0.13.tar.bz2] md5=660cbfd3dc8c10bf9b1803cd2b688256 sha256=1d6b180272befbfb19fedd80b5641354b82d6e719bf3d9ffa2d8287c62046536 @@ -14118,17 +14130,13 @@ sha256=898db51a4016efca7d408163578443238373773357949e1b4978e26807a1fb2b md5=afd35e0770f28121a9f8d6093d20a62b sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6 -[http://heanet.dl.sourceforge.net/ltp/ltp-full-20070228.tgz] -md5=afd35e0770f28121a9f8d6093d20a62b -sha256=bfc8cf4258574b48d33e9d622627db496e6533a469a6a87fd7ed76098dabb8a6 - [http://downloads.sourceforge.net/ltp/ltp-full-20080229.tgz] md5=5860835de7e8d6f76a856243fd5f299e sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4 -[http://heanet.dl.sourceforge.net/ltp/ltp-full-20080229.tgz] -md5=5860835de7e8d6f76a856243fd5f299e -sha256=e4c56dbbbf2d1a4d641624234b561e9402c00e47b5b253ae126aa444182310a4 +[http://downloads.sourceforge.net/ltp/ltp-full-20090131.tgz] +md5=397b376dd659459e4a431474b42263a8 +sha256=5fa4353d826b719cc313e370dd8f4ab0793432e4d797a96cb5bb01e078ff1e10 [ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz] md5=89c0ebdd0a27bc7f68726100f4bb079b @@ -15978,6 +15986,10 @@ sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1 md5=6fbd72e81dd4c135a2cc4f78d596aeb4 sha256=68b8978071f31615ad89119583e629ca7c3069ae0c2fb8f7c390c19807cce0bb +[http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz] +md5=6a8cedad04f095127ca1455162fec955 +sha256=175414df5d7b924779fa513ea614081ae55ae708a5e29473e74911297e4be708 + [http://www.olsr.org/releases/0.4/olsrd-0.4.10.tar.bz2] md5=9807d4451e65cb4ec385155eef7bf3cf sha256=af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3 @@ -18806,6 +18818,10 @@ sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf md5=f7cc9a2a30f480be3ecefedea363575c sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf +[ftp://ftp.pl.debian.org/pub/debian/pool/main/r/resolvconf/resolvconf_1.41.tar.gz] +md5=f7cc9a2a30f480be3ecefedea363575c +sha256=357ae73b048a2a6db46c8b28e0b79bc9448dbae96f52e44b07db7e40895ef2cf + [http://xlibs.freedesktop.org/release/resourceext-1.0.tar.bz2] md5=007713326ca5f1adfd39f3cb587c3b9b sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc @@ -19282,6 +19298,10 @@ sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a md5=659bf15bbbb31817ebad9372c8827618 sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a +[ftp://ftp.pl.debian.org/pub/debian/pool/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz] +md5=659bf15bbbb31817ebad9372c8827618 +sha256=2a19694b9825ec13349adac691933a8f890117ef566a9cd58a9e439030a96a3a + [http://xorg.freedesktop.org/releases/individual/app/scripts-1.0.1.tar.bz2] md5=08c7f078fc351196c21db3a8206d482d sha256=1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136 @@ -20442,6 +20462,10 @@ sha256=199fcaa5bc5b0b56537d43c522a9f0d839e61d7ffc58438da56574f642159519 md5=dcd50ddb2544faeae77f194804559404 sha256=0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab +[http://developer.kde.org/~wheeler/files/src/taglib-1.5.tar.gz] +md5=7b557dde7425c6deb7bbedd65b4f2717 +sha256=ba610716ec539d4858133e008d079728953820c583b200ff0936e36fc0550ec2 + [http://tango-project.org/releases/tango-icon-theme-0.7.2.tar.gz] md5=eace48f8340a95d7134632bad6287100 sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722 diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 1f0b41f05e..86a9afd465 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -34,7 +34,7 @@ BUILD_OPTIMIZATION = "-Os" #Note that this testing was done without the gcc-pr32889.patch. FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer" -TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}" +TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cf879526c7..0cb3c17ba3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -197,7 +197,7 @@ SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" -SRCREV_pn-python-coherence ?= "1154" +SRCREV_pn-python-coherence ?= "1161" SRCREV_pn-python-connexion ?= "1439" SRCREV_pn-python-formencode ?= "3148" SRCREV_pn-python-gsmd ?= "148" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 14a185d715..37bbfe953e 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -276,6 +276,7 @@ do task-opie-apps \ task-opie-games \ task-proper-tools \ + task-xqtlauncher \ tasks \ texinfo \ thttpd \ diff --git a/packages/aufs/aufs/aufs_create_no_manpage.patch b/packages/aufs/aufs/aufs_create_no_manpage.patch deleted file mode 100644 index ec7c0c1138..0000000000 --- a/packages/aufs/aufs/aufs_create_no_manpage.patch +++ /dev/null @@ -1,34 +0,0 @@ -OE-only: -comment: Not building the manpage is just a hack. - -diff -Nur aufs.vanilla/util/Makefile aufs/util/Makefile ---- aufs.vanilla/util/Makefile 2008-08-23 13:00:37.000000000 +0200 -+++ aufs/util/Makefile 2008-08-23 15:40:26.000000000 +0200 -@@ -1,25 +1,10 @@ - - # $Id: Makefile,v 1.10 2008/05/26 04:02:40 sfjro Exp $ - --all: aufs.5 aulchown -+all: aulchown - test -x ./mount.aufs || chmod a+x ./mount.aufs - --aufs.5: aufs.in.5 ./c2tmac -- ${RM} $@ -- ./c2tmac > $@ -- awk '{ \ -- gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \ -- gsub(/\\\[oq\]\140/, "\\[oq]"); \ -- gsub(/\047\\\[cq\]/, "\\[cq]"); \ -- gsub(/\047/, "\\[aq]"); \ -- print; \ -- }' aufs.in.5 >> $@ -- chmod a-w $@ -- - CFLAGS += -O2 -Wall ${EXTRA_CFLAGS} ${ccflags-y} - --.INTERMEDIATE: c2tmac.o c2tmac --c2tmac.o: c2tmac.c ../include/linux/aufs_type.h -- - clean: -- ${RM} c2tmac aulchown aufs.5 *~ .*~ -+ ${RM} aulchown *~ .*~ diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb index cf98e08fc9..815a24fda4 100644 --- a/packages/aufs/aufs_cvs.bb +++ b/packages/aufs/aufs_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which HOMEPAGE = "http://aufs.sourceforge.net/" LICENSE = "GPL" PV = "cvs${SRCDATE}" -PR = "r2" +PR = "r3" RSUGGESTS_${PN} = "${PN}-tools" @@ -10,12 +10,6 @@ inherit module S = "${WORKDIR}/aufs" -# We do not create the manpage for aufs because we do not install it anyway. -# If you want to have the manpage created you will need to add host cc to -# the makefile else it will fail to crosscompile. -# See http://svn.exactcode.de/t2/trunk/package/filesystem/aufs/compile.patch.cross -# as an example how this could be done. - SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE}" EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk" @@ -39,6 +33,16 @@ do_configure() { fi } +do_compile_prepend() { +#compile binaries for host + cd ${S}/util + BRANCH_MAX=$(fgrep CONFIG_AUFS_BRANCH_MAX ../local.mk | grep y | cut -d " " -f 2) + ${BUILD_CC} -D ${BRANCH_MAX} c2tmac.c ../include/linux/aufs_type.h -o c2tmac + ${BUILD_CC} -D ${BRANCH_MAX} c2sh.c ../include/linux/aufs_type.h -o c2sh + cd ${S} +} + + do_install() { install -d ${D}/${sbindir} install -m 0500 mount.aufs umount.aufs auplink aulchown ${D}/${sbindir} diff --git a/packages/busybox/busybox-1.13.2/get_header_tar.patch b/packages/busybox/busybox-1.13.2/get_header_tar.patch new file mode 100644 index 0000000000..0121cd1b61 --- /dev/null +++ b/packages/busybox/busybox-1.13.2/get_header_tar.patch @@ -0,0 +1,11 @@ +--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 +@@ -252,6 +252,8 @@ + file_header->name = concat_path_file(tar.prefix, tar.name); + } else + file_header->name = xstrdup(tar.name); ++ if (strlen(file_header->name) > 100) ++ file_header->name[100] = 0; + } + + /* Set bits 12-15 of the files mode */ diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb index 5ae76b900d..f00830badb 100644 --- a/packages/busybox/busybox_1.13.2.bb +++ b/packages/busybox/busybox_1.13.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r12" +PR = "r13" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ @@ -12,6 +12,7 @@ SRC_URI = "\ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ file://B921600.patch;patch=1 \ + file://get_header_tar.patch;patch=1 \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ @@ -31,6 +32,9 @@ EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config + if [ "${TARGET_ARCH}" = "avr32" ] ; then + sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${S}/.config + fi cml1_do_configure } diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb index 52a2b3ae0e..862dfd8933 100644 --- a/packages/clutter/aaina_svn.bb +++ b/packages/clutter/aaina_svn.bb @@ -1,5 +1,6 @@ require aaina.inc +SRCREV = "3597" PV = "0.3.0+svnr${SRCREV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http" diff --git a/packages/clutter/clutter_0.8+git.bb b/packages/clutter/clutter_0.8+git.bb new file mode 100644 index 0000000000..b578cbe43d --- /dev/null +++ b/packages/clutter/clutter_0.8+git.bb @@ -0,0 +1,13 @@ +require clutter.inc + +CLUTTER_REV = "7129ee4f1b86bfcb65b5fc39021b05b74168785d" + +PV = "0.8.7+gitr${CLUTTER_REV}" +PR = "r0" +SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \ + file://enable-tests-r2990.patch;patch=1" + +S = "${WORKDIR}/git" + + + diff --git a/packages/clutter/clutter_0.8+svn.bb b/packages/clutter/clutter_0.8+svn.bb deleted file mode 100644 index a203165ca8..0000000000 --- a/packages/clutter/clutter_0.8+svn.bb +++ /dev/null @@ -1,14 +0,0 @@ -require clutter.inc - -CLUTTER_REV = "3597" - -PV = "0.8.4+svnr${CLUTTER_REV}" -PR = "r0" -SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http;rev=${CLUTTER_REV} \ - file://enable_tests.patch;patch=1;maxrev=2989 \ - file://enable-tests-r2990.patch;patch=1;minrev=2990" - -S = "${WORKDIR}/clutter-0-8" - - - diff --git a/packages/dnsmasq/dnsmasq-dbus_2.46.bb b/packages/dnsmasq/dnsmasq-dbus_2.47.bb index f6070a1987..d03dbdb06e 100644 --- a/packages/dnsmasq/dnsmasq-dbus_2.46.bb +++ b/packages/dnsmasq/dnsmasq-dbus_2.47.bb @@ -2,12 +2,9 @@ require dnsmasq.inc -PR = "r1" DEPENDS = "dbus" EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS" -SRC_URI += "file://dbus_introspection.patch;patch=1" - do_install_append () { install -d ${D}${sysconfdir}/dbus-1/system.d install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ diff --git a/packages/dnsmasq/dnsmasq_2.46.bb b/packages/dnsmasq/dnsmasq_2.47.bb index 9a79c6e76f..83aea1d299 100644 --- a/packages/dnsmasq/dnsmasq_2.46.bb +++ b/packages/dnsmasq/dnsmasq_2.47.bb @@ -1,3 +1 @@ -PR = "r1" - require dnsmasq.inc diff --git a/packages/dnsmasq/files/dbus_introspection.patch b/packages/dnsmasq/files/dbus_introspection.patch deleted file mode 100644 index 52cbb6e25b..0000000000 --- a/packages/dnsmasq/files/dbus_introspection.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -urN dnsmasq-2.46.orig/src/dbus.c dnsmasq-2.46/src/dbus.c ---- dnsmasq-2.46.orig/src/dbus.c 2008-11-14 21:02:08.000000000 +0100 -+++ dnsmasq-2.46/src/dbus.c 2008-12-15 10:45:48.000000000 +0100 -@@ -21,6 +21,42 @@ - #define DBUS_API_SUBJECT_TO_CHANGE - #include <dbus/dbus.h> - -+const char* introspection_xml = -+"<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n" -+"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n" -+"<node name=\"" DNSMASQ_PATH "\">\n" -+" <interface name=\"org.freedesktop.DBus.Introspectable\">\n" -+" <method name=\"Introspect\">\n" -+" <arg name=\"data\" direction=\"out\" type=\"s\"/>\n" -+" </method>\n" -+" </interface>\n" -+" <interface name=\"" DNSMASQ_SERVICE "\">\n" -+" <method name=\"ClearCache\">\n" -+" </method>\n" -+" <method name=\"GetVersion\">\n" -+" <arg name=\"version\" direction=\"out\" type=\"s\"/>\n" -+" </method>\n" -+" <method name=\"SetServers\">\n" -+" <arg name=\"servers\" direction=\"in\" type=\"av\"/>\n" -+" </method>\n" -+" <signal name=\"DhcpLeaseAdded\">\n" -+" <arg name=\"ipaddr\" type=\"s\"/>\n" -+" <arg name=\"hwaddr\" type=\"s\"/>\n" -+" <arg name=\"hostname\" type=\"s\"/>\n" -+" </signal>\n" -+" <signal name=\"DhcpLeaseDeleted\">\n" -+" <arg name=\"ipaddr\" type=\"s\"/>\n" -+" <arg name=\"hwaddr\" type=\"s\"/>\n" -+" <arg name=\"hostname\" type=\"s\"/>\n" -+" </signal>\n" -+" <signal name=\"DhcpLeaseUpdated\">\n" -+" <arg name=\"ipaddr\" type=\"s\"/>\n" -+" <arg name=\"hwaddr\" type=\"s\"/>\n" -+" <arg name=\"hostname\" type=\"s\"/>\n" -+" </signal>\n" -+" </interface>\n" -+"</node>\n"; -+ - struct watch { - DBusWatch *watch; - struct watch *next; -@@ -229,7 +265,15 @@ - { - char *method = (char *)dbus_message_get_member(message); - -- if (strcmp(method, "GetVersion") == 0) -+ if (dbus_message_is_method_call(message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) -+ { -+ DBusMessage *reply = dbus_message_new_method_return(message); -+ -+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection_xml, DBUS_TYPE_INVALID); -+ dbus_connection_send (connection, reply, NULL); -+ dbus_message_unref (reply); -+ } -+ else if (strcmp(method, "GetVersion") == 0) - { - char *v = VERSION; - DBusMessage *reply = dbus_message_new_method_return(message); diff --git a/packages/ltp/ltp-20090131/cross-compile.patch b/packages/ltp/ltp-20090131/cross-compile.patch new file mode 100644 index 0000000000..b414b6fc0f --- /dev/null +++ b/packages/ltp/ltp-20090131/cross-compile.patch @@ -0,0 +1,352 @@ +--- + Makefile | 4 +++- + lib/Makefile | 3 --- + m4/GNUmakefile | 3 --- + pan/Makefile | 2 -- + testcases/ballista/ballista/Makefile | 2 +- + testcases/ballista/ballista/compile/Makefile | 8 ++++---- + testcases/kernel/device-drivers/acpi/Makefile | 2 +- + testcases/kernel/device-drivers/agp/user_space/Makefile | 6 +++--- + testcases/kernel/device-drivers/base/user_base/Makefile | 6 +++--- + testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile | 6 +++--- + testcases/kernel/device-drivers/drm/user_space/Makefile | 2 +- + testcases/kernel/device-drivers/include/Makefile | 2 +- + testcases/kernel/device-drivers/nls/Makefile | 2 +- + testcases/kernel/device-drivers/pci/user_tpci/Makefile | 6 +++--- + testcases/kernel/device-drivers/tbio/user_space/Makefile | 6 +++--- + testcases/kernel/device-drivers/usb/user_usb/Makefile | 6 +++--- + testcases/kernel/fs/fs-bench/Makefile | 6 +++--- + testcases/kernel/fs/scsi/ltpfs/Makefile | 2 +- + testcases/kernel/sched/hyperthreading/ht_affinity/Makefile | 4 ++-- + testcases/kernel/sched/hyperthreading/ht_enabled/Makefile | 2 +- + testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile | 2 +- + 21 files changed, 38 insertions(+), 44 deletions(-) + +Index: ltp-full-20090131/Makefile +=================================================================== +--- ltp-full-20090131.orig/Makefile ++++ ltp-full-20090131/Makefile +@@ -5,14 +5,16 @@ CROSS_COMPILER = $(CROSS_COMPILE) + endif + ifdef CROSS_COMPILER + CC=$(CROSS_COMPILER)gcc ++CPP=$(CROSS_COMPILER)g++ + AR=$(CROSS_COMPILER)ar + RANLIB=$(CROSS_COMPILER)ranlib + endif ++PREFIX=/opt/ltp + + HAS_NUMA=$(shell sh tools/scripts/numa_test.sh) + + export CFLAGS += -Wall $(CROSS_CFLAGS) +-export CC AR RANLIB CPPFLAGS LDFLAGS HAS_NUMA ++export CC CPP AR RANLIB CPPFLAGS LDFLAGS HAS_NUMA + + -include config.mk + +Index: ltp-full-20090131/testcases/ballista/ballista/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/ballista/ballista/Makefile ++++ ltp-full-20090131/testcases/ballista/ballista/Makefile +@@ -24,7 +24,7 @@ + ######################## + + # compiler info for the host +-CC = g++ -Wno-deprecated ++CC = $(CPP) -Wno-deprecated + CFLAGS += -w ${TARGET_DEF} + CLIBS = -lpthread -ldl -lnsl -rdynamic + TEST_MAN_FILE = selfHost +Index: ltp-full-20090131/testcases/ballista/ballista/compile/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/ballista/ballista/compile/Makefile ++++ ltp-full-20090131/testcases/ballista/ballista/compile/Makefile +@@ -19,14 +19,14 @@ dFLAGS=-g -DDEBUG + FLAGS= -O -Wall + PFLAGS= -p -g3 + +-CPPCOMP= g++ ++CPPCOMP= $(CPP) + + # + # The following is "boilerplate" to set up the standard compilation + # commands: + .SUFFIXES: + .SUFFIXES: .cpp .c .cc .h .o +-.c.o: ; gcc $(FLAGS) -c $*.c ++.c.o: ; $(CC) $(FLAGS) -c $*.c + .cc.o: ; $(CPPCOMP) $(FLAGS) -c $*.cc + .cpp.o: ; $(CPPCOMP) $(FLAGS) $(INC) -c $*.cpp + .cxx.o: ; $(CPPCOMP) $(FLAGS) $(INC) -c $*.cxx +@@ -41,10 +41,10 @@ all: blexer bparser + chmod 700 ../templates/do_parse + + blexer: jlist.o butil.o lex.yy.o blexer.o +- gcc $(FLAGS) -o blexer jlist.o butil.o lex.yy.o blexer.o ++ $(CC) $(FLAGS) -o blexer jlist.o butil.o lex.yy.o blexer.o + + bparser: bparser.o +- g++ $(FLAGS) -o bparser bparser.o butil.c ++ $(CPP) $(FLAGS) -o bparser bparser.o butil.c + + jlist.o: jlist.c butil.h jlist.h + +Index: ltp-full-20090131/testcases/kernel/device-drivers/acpi/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/kernel/device-drivers/acpi/Makefile ++++ ltp-full-20090131/testcases/kernel/device-drivers/acpi/Makefile +@@ -15,7 +15,7 @@ PWD := $(shell pwd) + + default: + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules +- gcc $(CFLAGS) -o LtpAcpiMain LtpAcpiMain.c ++ $(CC) $(CFLAGS) -o LtpAcpiMain LtpAcpiMain.c + # $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules + endif + +Index: ltp-full-20090131/testcases/kernel/device-drivers/agp/user_space/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/kernel/device-drivers/agp/user_space/Makefile ++++ ltp-full-20090131/testcases/kernel/device-drivers/agp/user_space/Makefile +@@ -1,8 +1,8 @@ + test_agp: tagp_ki.o user_tagp.o +- gcc tagp_ki.o user_tagp.o -o test_agp ++ $(CC) tagp_ki.o user_tagp.o -o test_agp + + tagp_ki.o: tagp_ki.c +- gcc -c tagp_ki.c ++ $(CC) -c tagp_ki.c + + user_tagp.o: user_tagp.c +- gcc -c user_tagp.c ++ $(CC) -c user_tagp.c +Index: ltp-full-20090131/testcases/kernel/device-drivers/base/user_base/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/kernel/device-drivers/base/user_base/Makefile ++++ ltp-full-20090131/testcases/kernel/device-drivers/base/user_base/Makefile +@@ -1,11 +1,11 @@ + test_base: tbase_ki.o user_tbase.o +- gcc tbase_ki.o user_tbase.o -o test_base ++ $(CC) tbase_ki.o user_tbase.o -o test_base + + tbase_ki.o: tbase_ki.c +- gcc -c tbase_ki.c ++ $(CC) -c tbase_ki.c + + user_tbase.o: user_tbase.c +- gcc -c user_tbase.c ++ $(CC) -c user_tbase.c + + clean: + rm -f *.o 2>/dev/null || true +Index: ltp-full-20090131/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile ++++ ltp-full-20090131/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile +@@ -1,8 +1,8 @@ + test_mod: tmod_ki.o user_tmod.o +- gcc tmod_ki.o user_tmod.o -o test_mod ++ $(CC) tmod_ki.o user_tmod.o -o test_mod + + tmod_ki.o: tmod_ki.c +- gcc -c tmod_ki.c ++ $(CC) -c tmod_ki.c + + user_tmod.o: user_tmod.c +- gcc -c user_tmod.c ++ $(CC) -c user_tmod.c +Index: ltp-full-20090131/testcases/kernel/device-drivers/drm/user_space/Makefile +=================================================================== +--- ltp-full-20090131.orig/testcases/kernel/device-drivers/drm/user_space/Makefile ++++ ltp-full-20090131/testcases/kernel/device-drivers/drm/user_space/Makefile +@@ -2,4 +2,4 @@ + KDIR := /lib/modules/$(shell uname -r)/build + CFLAGS := -I$(KDIR)/drivers/char/drm + default: |