diff options
29 files changed, 292 insertions, 132 deletions
diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index b98177d40a..880f02e62d 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -19,31 +19,58 @@ def oestats_getid(d): return f.read() def oestats_send(server, action, vars = {}): - import httplib, urllib - - params = urllib.urlencode(vars) - headers = {"Content-type": "application/x-www-form-urlencoded", - "Accept": "text/plain"} + import httplib + + # build body + output = [] + bound = '----------ThIs_Is_tHe_bouNdaRY_$' + for key in vars: + assert vars[key] + output.append('--' + bound) + output.append('Content-Disposition: form-data; name="%s"' % key) + output.append('') + output.append(vars[key]) + output.append('--' + bound + '--') + output.append('') + body = "\r\n".join(output) + + # build headers + headers = { + "User-agent": "oestats-client/0.1", + "Content-type": "multipart/form-data; boundary=%s" % bound, + "Content-length": str(len(body))} + + # send request conn = httplib.HTTPConnection(server) - conn.request("POST", action, params, headers) + conn.request("POST", action, body, headers) response = conn.getresponse() + data = response.read() conn.close() - return response + return data def oestats_start(server, builder, d): import bb import os.path + import re # send report - response = oestats_send(server, "/builds/start/", { - 'builder': builder, - 'revision': bb.data.getVar('METADATA_REVISION', d, True), - 'machine': bb.data.getVar('MACHINE', d, True), - 'distro': bb.data.getVar('DISTRO', d, True), - }) - id = response.read() + id = "" + try: + data = oestats_send(server, "/builds/start/", { + 'builder': builder, + 'revision': bb.data.getVar('METADATA_REVISION', d, True), + 'machine': bb.data.getVar('MACHINE', d, True), + 'distro': bb.data.getVar('DISTRO', d, True), + }) + if re.match("^\d+$", data): id=data + except: + pass # save the build id + if id: + bb.note("oestats: build %s" % id) + else: + bb.note("oestats: error starting build, disabling stats") oestats_setid(d, id) def oestats_stop(server, d, status): @@ -51,11 +78,15 @@ def oestats_stop(server, d, status): # retrieve build id id = oestats_getid(d) + if not id: return # send report - response = oestats_send(server, "/builds/stop/%s/" % id, { - 'status': status, - }) + try: + response = oestats_send(server, "/builds/stop/%s/" % id, { + 'status': status, + }) + except: + bb.note("oestats: error stopping build") def oestats_task(server, d, task, status): import bb @@ -63,20 +94,27 @@ def oestats_task(server, d, task, status): # retrieve build id id = oestats_getid(d) + if not id: return + + # calculate build time try: elapsed = time.time() - float(bb.data.getVar('OESTATS_STAMP', d, True)) except: elapsed = 0 # send report - response = oestats_send(server, "/builds/task/%s/" % id, { - 'package': bb.data.getVar('PN', d, True), - 'version': bb.data.getVar('PV', d, True), - 'revision': bb.data.getVar('PR', d, True), - 'task': task, - 'status': status, - 'time': elapsed, - }) + try: + response = oestats_send(server, "/builds/task/%s/" % id, { + 'package': bb.data.getVar('PN', d, True), + 'version': bb.data.getVar('PV', d, True), + 'revision': bb.data.getVar('PR', d, True), + 'task': task, + 'status': status, + 'time': str(elapsed), + }) + except: + bb.note("oestats: error sending task, disabling stats") + oestats_setid(d, "") addhandler oestats_eventhandler python oestats_eventhandler () { diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ef41dec781..17029ec21e 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -85,42 +85,30 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" #powerpc needs additional patches to gcc -PREFERRED_VERSION_gcc_ppc405 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_ppc405 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_ppc405 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_ppc405 ?= "4.1.1" - -PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" - -PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" - -# GCC 4.3.0 is the first release with armv7-* support -PREFERRED_VERSION_gcc_armv7a = "4.2.3+csl-arm-2008q1-126" -PREFERRED_VERSION_gcc-cross_armv7a = "4.2.3+csl-arm-2008q1-126" -PREFERRED_VERSION_gcc-cross-sdk_armv7a = "4.2.3+csl-arm-2008q1-126" -PREFERRED_VERSION_gcc-cross-initial_armv7a = "4.2.3+csl-arm-2008q1-126" - -PREFERRED_VERSION_gcc ?= "4.2.2" -PREFERRED_VERSION_gcc-cross ?= "4.2.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2" +ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" +ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" +ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" + +#for proper NEON support we need a CSL toolchain +ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53" + +#avr32 only has support for gcc 4.2.2 +ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" + +#Everybody else can just use this: +ANGSTROM_GCC_VERSION ?= "4.2.2" + +PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc -#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE -PREFERRED_VERSION_gcc_avr32 = "4.2.2" -PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2" +#avr32 only has patches for binutils 2.17 in OE PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index a9e9f3f7eb..8c76de6f1a 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -24,17 +24,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os" -FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -frename-registers -fomit-frame-pointer -O2" -TARGET_CC_ARCH_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp " - FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -FULL_OPTIMIZATION_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp " -CFLAGS_pn-glibc_armv7a = " -fexpensive-optimizations -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp" - BUILD_OPTIMIZATION = "-Os" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2" diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index 8b7d5be188..5aa789e5aa 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -7,15 +7,19 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " +#Compile with armv5te optimizations, incompatible with armv4(t) cpus +require conf/machine/include/tune-xscale.inc + + PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel" KERNEL_IMAGETYPE = "uImage" RDEPENDS_kernel-base = "" + KERNEL_IMAGE_MAXSIZE = "1048577" UBOOT_ENTRYPOINT = "a0008000" MACHINE_FEATURES += "kernel26 " -COMBINED_FEATURES ?= "" IMAGE_FSTYPES = "jffs2 tar.gz" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids" @@ -27,28 +31,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " \ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \ " -# -# The following *should* be in a distro.conf file -# We include them here to avoid creating a new distro - -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" - -PREFERRED_VERSION_gumstix-kernel = "2.6.21" -PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_gnuplot = "4.0.0" -PREFERRED_VERSION_dropbear = "0.47" -PREFERRED_VERSION_wpa-supplicant = "0.5.8" -PREFERRED_VERSION_bluez-utils = "3.24" -PREFERRED_VERSION_bluez-utils-alsa = "3.24" -PREFERRED_VERSION_bluez-libs = "3.24" -PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24" -PREFERRED_VERSION_bluez-hcidump = "1.40" -PREFERRED_VERSION_microwindows = "0.91" -PREFERRED_VERSION_midori = "0.0.15" -PREFERRED_VERSION_jamvm = "1.5.0" -PREFERRED_VERSION_classpath = "0.96" -PREFERRED_VERSION_qtopia-core = "4.3.3" -PREFERRED_VERSION_uicmoc4-native = "4.3.3" - -SRCREV_pn-webkit-gtk = "28656" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 6c3bdb6ee0..f886366f10 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -3,6 +3,6 @@ # [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html # [3] https://support.codesourcery.com/GNUToolchain/kbentry29 -TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp" +TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" FEED_ARCH = "armv7a" PACKAGE_ARCH = "armv7a" diff --git a/conf/machine/include/tune-mips2.inc b/conf/machine/include/tune-mips2.inc new file mode 100644 index 0000000000..b10d65f23d --- /dev/null +++ b/conf/machine/include/tune-mips2.inc @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-mips2" diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf index e17ca31bcb..30676b2fc4 100644 --- a/conf/machine/rb500.conf +++ b/conf/machine/rb500.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the MIPS based Routerboard TARGET_ARCH = "mipsel" -TARGET_CC_ARCH = "-Os -mips2" PREFERRED_PROVIDER_virtual/kernel = "linux-rb500" + +include conf/machine/include/tune-mips2.inc diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf index f2e4006a8f..5ed227dfa3 100644 --- a/conf/machine/wl500g.conf +++ b/conf/machine/wl500g.conf @@ -5,4 +5,4 @@ TARGET_ARCH = "mipsel" MACHINE_FEATURES = "kernel26 usbhost wifi ext2" -TARGET_CC_ARCH = "-Os -mips2" +include conf/machine/include/mips2.inc diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index f61570a950..1b07df2666 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices TARGET_ARCH = "mipsel" -TARGET_CC_ARCH = "-Os" SERIAL_CONSOLE = "tts/0" @@ -31,4 +30,4 @@ INHERIT += "wrt-image" # strip even more: # would be nice but breaks automatic shared library dependencies #DEPENDS_prepend = "${@["elfkickers-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" -#export STRIP = "sstrip"
\ No newline at end of file +#export STRIP = "sstrip" diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control index 583a13e292..01f9f4b906 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control +++ b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Marcin Juszkiewicz <hrw@openembedded.org> Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: openembedded-essential Architecture: all diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules index 586b2ff42f..22ac384645 100755 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules +++ b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules @@ -4,6 +4,7 @@ build: binary-arch: clean: + dh_clean binary-indep: dh_testdir diff --git a/packages/dropbear/dropbear-0.49/scp-argument-fix.patch b/packages/dropbear/dropbear-0.49/scp-argument-fix.patch new file mode 100644 index 0000000000..716a9670fe --- /dev/null +++ b/packages/dropbear/dropbear-0.49/scp-argument-fix.patch @@ -0,0 +1,21 @@ +source: https://dev.openwrt.org/browser/trunk/openwrt/package/dropbear/patches/scp-argument-fix.patch?rev=453 +comment: remove unsupported default arguments in scp. Fixes OE bug 3227. + +diff -ur dropbear-0.49-orig/scp.c dropbear-0.49/scp.c +--- dropbear-0.49-orig/scp.c 2007-02-22 16:51:35.000000000 +0100 ++++ dropbear-0.49/scp.c 2007-10-19 14:19:08.000000000 +0200 +@@ -308,10 +308,10 @@ + memset(&args, '\0', sizeof(args)); + args.list = NULL; + addargs(&args, "%s", ssh_program); +- addargs(&args, "-x"); +- addargs(&args, "-oForwardAgent no"); +- addargs(&args, "-oPermitLocalCommand no"); +- addargs(&args, "-oClearAllForwardings yes"); ++// addargs(&args, "-x"); ++// addargs(&args, "-oForwardAgent no"); ++// addargs(&args, "-oPermitLocalCommand no"); ++// addargs(&args, "-oClearAllForwardings yes"); + + fflag = tflag = 0; + while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1) diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb index 0ed386ca0c..3245cffe5d 100644 --- a/packages/dropbear/dropbear_0.49.bb +++ b/packages/dropbear/dropbear_0.49.bb @@ -1,3 +1,5 @@ -PR = "r1" +PR = "r2" require dropbear.inc +SRC_URI += "file://scp-argument-fix.patch;patch=1 \ + " diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb index 419ee7a3e3..513b06f35a 100644 --- a/packages/freesmartphone/zhone_git.bb +++ b/packages/freesmartphone/zhone_git.bb @@ -2,9 +2,9 @@ DESCRIPTION = "Zhone: Zen Phone" LICENSE = "GPL" SECTION = "x11" DEPENDS = "edje-native" -RDEPENDS = "task-python-efl python-textutils" +RDEPENDS = "task-python-efl python-textutils python-dbus" PV = "0.0.0+gitr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ file://80zhone" @@ -12,10 +12,6 @@ S = "${WORKDIR}/git" inherit autotools -RDEPENDS_${PN} += "\ - python-dbus \ -" - do_install_append() { install -d ${D}${sysconfdir}/X11/Xsession.d/ install -m 0755 ${WORKDIR}/80zhone ${D}${sysconfdir}/X11/Xsession.d/ @@ -23,7 +19,5 @@ do_install_append() { FILES_${PN} += "${datadir} ${sysconfdir}" -RCONFLICTS = "openmoko-session2" -RREPLACES = "openmoko-session2" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb index 5756e98567..14c7c0f4e0 100644 --- a/packages/gallery/gallery_1.5.5.bb +++ b/packages/gallery/gallery_1.5.5.bb @@ -2,21 +2,21 @@ DESCRIPTION = "The Gallery v1 web image gallery" SECTION = "apps" LICENSE = "GPL" RDEPENDS = "apache2 modphp imagemagick jhead" -PR = "r1" +PR = "r2" -SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-pl1.tar.gz" +SRC_URI = "http://{SOURCEFORGE_MIRROR}/sourceforge/gallery/gallery-${PV}-pl1.tar.gz" S = "${WORKDIR}/gallery" inherit autotools -HTTPCONF = "/etc/apache2/httpd.conf" -DEST_DIR = "/usr/share/apache2/htdocs/" +HTTPCONF = "${sysconfdir}/apache2/httpd.conf" +DEST_DIR = "${datadir}/apache2/htdocs/" # # don't list the albums as a file - it might get auto-deleted # -FILES_${PN} = "${DEST_DIR}/gallery /etc/apache2/modules.d" +FILES_${PN} = "${DEST_DIR}/gallery ${sysconfdir}/apache2/modules.d" # No configure step for gallery @@ -31,12 +31,12 @@ do_compile() { # do_install() { - mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d + mkdir -p ${D}/${DEST_DIR} ${D}${sysconfdir}/apache2/modules.d cp -pPR ${S} ${D}/${DEST_DIR} - cp ${FILESDIR}/gallery.conf ${D}/etc/apache2/modules.d/95_gallery.conf + cp ${FILESDIR}/gallery.conf ${D}${sysconfdir}/apache2/modules.d/95_gallery.conf } # remove the gallery code, but not the albums! pkg_postrm_${PN}() { - rm -rf ${DEST_DIR}/gallery /etc/apache2/modules.d/95_gallery.conf + rm -rf ${DEST_DIR}/gallery /${sysconfdir}/apache2/modules.d/95_gallery.conf } diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb new file mode 100644 index 0000000000..99656dbe83 --- /dev/null +++ b/packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb @@ -0,0 +1,12 @@ +require gcc-cross_${PV}.bb +require gcc-cross-initial.inc + +S = "${WORKDIR}/gcc-4.2" + +EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " + +# Hack till we fix *libc properly +do_stage_append() { + ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ +} + diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb new file mode 100644 index 0000000000..4fde67b006 --- /dev/null +++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb @@ -0,0 +1,26 @@ +PR = "r0" + +require gcc-csl-arm-2007q3.inc +require gcc-cross4.inc +require gcc-configure-cross.inc +require gcc-package-cross.inc + +SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " + +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + +#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include +CFLAGS = "" +CXXFLAGS = "" +LDFLAGS = "" + +# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain +do_compile_prepend() { + ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ + sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure + +} + +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" diff --git a/packages/gcc/gcc-csl-arm-2007q3.inc b/packages/gcc/gcc-csl-arm-2007q3.inc new file mode 100644 index 0000000000..601b4f0110 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3.inc @@ -0,0 +1,51 @@ +require gcc-common.inc + +BINV = "4.2.1" +PV = "4.2.1+csl-arm-2007q3-53" + +FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm" + +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2 \ + file://gcc-new-makeinfo.patch;patch=1 \ +# file://100-uclibc-conf.patch;patch=1 \ +# file://103-uclibc-conf-noupstream.patch;patch=1 \ +# file://200-uclibc-locale.patch;patch=1 \ +# file://203-uclibc-locale-no__x.patch;patch=1 \ +# file://204-uclibc-locale-wchar_fix.patch;patch=1 \ +# file://205-uclibc-locale-update.patch;patch=1 \ +# file://300-libstdc++-pic.patch;patch=1 \ +# file://302-c99-snprintf.patch;patch=1 \ +# file://303-c99-complex-ugly-hack.patch;patch=1 \ +# file://304-index_macro.patch;patch=1 \ +# file://305-libmudflap-susv3-legacy.patch;patch=1 \ +# file://306-libstdc++-namespace.patch;patch=1 \ +# file://307-locale_facets.patch;patch=1 \ +# file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \ +# file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://arm-nolibfloat.patch;patch=1 \ + file://arm-softfloat.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ +# file://gfortran.patch;patch=1 \ +# file://fortran-static-linking.patch;patch=1 \ +# file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \ +# file://gcc-new-makeinfo.patch;patch=1 \ +" + + +S = "${WORKDIR}/gcc-4.2" + +do_unpack2() { + cd ${WORKDIR} + tar -xvjf ./arm-2007q3-53-arm-none-eabi/gcc-2007q3-53.tar.bz2 +} + +# Language Overrides +FORTRAN = "" +#FORTRAN_linux-gnueabi = ",fortran" +#JAVA = ",java" + +EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +ARM_INSTRUCTION_SET = "arm" + +addtask unpack2 after do_unpack before do_patch diff --git a/packages/gcc/gcc-csl-arm-2007q3/.mtn2git_empty b/packages/gcc/gcc-csl-arm-2007q3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3/.mtn2git_empty diff --git a/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch b/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch new file mode 100644 index 0000000000..b59bd76c85 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch @@ -0,0 +1,22 @@ +--- /tmp/configure 2008-05-18 12:57:11.378648834 +0200 ++++ gcc-4.2/configure 2008-05-18 12:58:38.309478684 +0200 +@@ -3776,7 +3776,7 @@ + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +--- /tmp/configure.in 2008-05-18 12:57:32.665314708 +0200 ++++ gcc-4.2/configure.in 2008-05-18 12:59:03.000000000 +0200 +@@ -2271,7 +2271,7 @@ + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" diff --git a/packages/gcc/gcc_csl-arm-2007q3.bb b/packages/gcc/gcc_csl-arm-2007q3.bb new file mode 100644 index 0000000000..d610713177 --- /dev/null +++ b/packages/gcc/gcc_csl-arm-2007q3.bb @@ -0,0 +1,5 @@ +PR = "r0" + +require gcc-${PV}.inc +require gcc-configure-target.inc +require gcc-package-target.inc diff --git a/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb b/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb index eb9c9ba910..dcd6486fab 100644 --- a/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb +++ b/packages/gpe-helpviewer/gpe-helpviewer_1.0.bb @@ -1,13 +1,10 @@ -PR = "r2" - DESCRIPTION = "A helpviewer based on gtk+webcore" LICENSE = "GPL" - -SRC_URI = "http://stag.mind.be/gpe-helpviewer-${PV}.tar.bz2" - DEPENDS = "osb-nrcit" RDEPENDS = "gpe-helpviewer-doc" +PR = "r2" +SRC_URI = "http://stag.mind.be/gpe-helpviewer-${PV}.tar.bz2" S = "${WORKDIR}/gpe-helpviewer" @@ -16,23 +13,23 @@ inherit autotools do_install() { install -d ${D}${docdir}/gpe install -m 0644 ${S}/gpe-helpviewer.html ${D}${docdir}/gpe/ - install -d ${D}/usr/share/applications - install -m 0644 ${S}/gpe-helpviewer.desktop ${D}/usr/share/applications/gpe-helpviewer.desktop - install -d ${D}/usr/share/pixmaps - install -m 0644 ${S}/gpe-help.png ${D}/usr/share/pixmaps/gpe-help.png + install -d ${D}${datadir}/applications + install -m 0644 ${S}/gpe-helpviewer.desktop ${D}${datadir}/applications/gpe-helpviewer.desktop + install -d ${D}${datadir}/pixmaps + install -m 0644 ${S}/gpe-help.png ${D}${datadir}/pixmaps/gpe-help.png autotools_do_install } pkg_postinst_${PN}-doc () { #!/bin/sh if [ "x$D" != "x" ]; then - if [ -e /etc/gpe/gpe-help.conf ]; then - echo gpe-helpviewer = /usr/share/doc/gpe/gpe-helpviewer.html >> /etc/gpe/gpe-help.conf + if [ -e ${sysconfdir}/gpe/gpe-help.conf ]; then + echo gpe-helpviewer = ${docdir}/gpe/gpe-helpviewer.html >> ${sysconfdir}/gpe/gpe-help.conf else - echo [Help] >> /etc/gpe/gpe-help.conf - echo gpe-helpviewer = /usr/share/doc/gpe/gpe-helpviewer.html >> /etc/gpe/gpe-help.conf + echo [Help] >> ${sysconfdir}/gpe/gpe-help.conf + echo gpe-helpviewer = ${docdir}/gpe/gpe-helpviewer.html >> ${sysconfdir}/gpe/gpe-help.conf fi - if [ -x /usr/bin/gpe-helpindex ]; then + if [ -x ${bindir}/gpe-helpindex ]; then echo generating help-index gpe-helpindex else @@ -44,11 +41,11 @@ pkg_postinst_${PN}-doc () { pkg_postrm_${PN}-doc () { #!/bin/sh if [ "x$D" != "x" ]; then - if [ -e /etc/gpe/gpe-help.conf ]; then - sed '/^\<gpe-helpviewer\>/d' /etc/gpe/gpe-help.conf > /tmp/gpe-help.conf - mv /tmp/gpe-help.conf /etc/gpe/gpe-help.conf + if [ -e ${sysconfdir}/gpe/gpe-help.conf ]; then + sed '/^\<gpe-helpviewer\>/d' ${sysconfdir}/gpe/gpe-help.conf > /tmp/gpe-help.conf + mv /tmp/gpe-help.conf ${sysconfdir}/gpe/gpe-help.conf fi - if [ -x /usr/bin/gpe-helpindex ]; then + if [ -x ${bindir}/gpe-helpindex ]; then echo generating help-index gpe-helpindex else diff --git a/packages/libopie/libopie2/remove_h2200_rotate_fix.patch b/packages/libopie/libopie2/remove_h2200_rotate_fix.patch new file mode 100644 index 0000000000..cef436f2f7 --- /dev/null +++ b/packages/libopie/libopie2/remove_h2200_rotate_fix.patch @@ -0,0 +1,15 @@ +--- libopie2/opiecore/device/odevice_ipaq.cpp 25 Jul 2007 10:49:20 -0000 1.32 ++++ libopie2/opiecore/device/odevice_ipaq.cpp 17 Mar 2007 22:08:43 -0000 1.30 +@@ -330,12 +330,6 @@ + case Rot180: quarters = 1/*270deg*/; break; + case Rot270: quarters = 0/*270deg*/; break; + } +- if( d->m_model == Model_iPAQ_H22xx ) { +- // FIXME: there's something screwed with the keycodes being sent on h2200. I have +- // added a temporary workaround for this here, but the bug should be fixed properly +- // later in the right place. - Paul Eggleton 25/07/2007 +- quarters = 0; +- } + newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; + break; + } diff --git a/packages/python/python-setuptools-native_0.6c6.bb b/packages/python/python-setuptools-native_0.6c6.bb index 1b9f90911d..b7716d8cac 100644 --- a/packages/python/python-setuptools-native_0.6c6.bb +++ b/packages/python/python-setuptools-native_0.6c6.bb @@ -1,4 +1,5 @@ require python-setuptools_${PV}.bb +inherit native DEPENDS = "python-native" diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb index 721b29961e..fe78e585f7 100644 --- a/packages/python/python-setuptools_0.6c6.bb +++ b/packages/python/python-setuptools_0.6c6.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "MIT-like" RDEPENDS = "python-distutils python-compression" SRCNAME = "setuptools" -PR = "ml1" +PR = "ml2" SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" diff --git a/packages/qte/qte-2.3.10/disable-dup-rotation.patch b/packages/qte/qte-2.3.10/disable-dup-rotation.patch new file mode 100644 index 0000000000..ae2332c5f0 --- /dev/null +++ b/packages/qte/qte-2.3.10/disable-dup-rotation.patch @@ -0,0 +1,13 @@ +--- qte/src/kernel/kernelkeyboard.cpp 2008-04-04 11:07:42.000000000 +0100 ++++ qte/src/kernel/kernelkeyboard.cpp 2008-04-04 11:07:45.000000000 +0100 +@@ -627,8 +627,8 @@ + case Qt::Key_Down: + unicode = 0xffff; + mod_key = false; +- if (qt_screen->isTransformed()) +- qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) ); ++// if (qt_screen->isTransformed()) ++// qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) ); + break; + /* + * handle lock, we don't handle scroll lock! diff --git a/packages/tasks/task-opie-16mb.bb b/packages/tasks/task-opie-16mb.bb index b92a137822..859a0f5feb 100644 --- a/packages/tasks/task-opie-16mb.bb +++ b/packages/tasks/task-opie-16mb.bb @@ -29,7 +29,7 @@ RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspen opie-screenshotapplet \ ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \ ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}" PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}" diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index cb08f92e3d..47d2eba229 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -18,7 +18,7 @@ RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batter opie-clipboardapplet opie-clockapplet opie-homeapplet \
opie-irdaapplet opie-lockapplet opie-logoutapplet \
opie-mailapplet opie-memoryapplet opie-multikeyapplet \
- opie-networkapplet opie-notesapplet opie-pcmciaapplet \
+ opie-networkapplet opie-notesapplet opie-cardapplet \
opie-pyquicklaunchapplet opie-restartapplet \
opie-restartapplet2 opie-rotateapplet \
opie-screenshotapplet opie-suspendapplet opie-vmemo \
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 05b507706b..41dd92ac7a 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -44,7 +44,7 @@ RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspen opie-screenshotapplet \ ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \ ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-pcmciaapplet", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}" PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}" |