From 8d0b0994a86b2800363b7d1ab4384bd87fb94f6a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Mar 2009 12:28:27 -0700 Subject: uclibc: Get uclibc working in thumb mode. * WARNING!! Do not use bintils 2.19 or 2.19.1 when compiling in thumb mode. The veneer generation does not work as expected. Use binutils 2.18 or binutils_cvs * Move LEAD_SONAME into uclibc.inc * Use no optimizations while compiling ldso.c to over come a gcc ICE * Use ARM mode resolver for thumb mode. The resolver depends on ip register and if we use thumb function for _dl_linux_resolve then it adds a veneer which corrupts ip. --- recipes/uclibc/bfin-uclibc_svn.bb | 4 +--- ...dso_use_arm_dl_linux_resolve_in_thumb_mode.patch | 21 +++++++++++++++++++++ recipes/uclibc/files/uclibc_ldso_use_O0.patch | 13 +++++++++++++ recipes/uclibc/uclibc.inc | 7 ++----- recipes/uclibc/uclibc_0.9.29.bb | 4 +--- recipes/uclibc/uclibc_0.9.30.1.bb | 6 +++--- recipes/uclibc/uclibc_0.9.30.bb | 6 +++--- recipes/uclibc/uclibc_nptl.bb | 3 ++- recipes/uclibc/uclibc_svn.bb | 5 ++--- 9 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 recipes/uclibc/files/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch create mode 100644 recipes/uclibc/files/uclibc_ldso_use_O0.patch diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb index 7ab3e8ae61..9b438a25dc 100644 --- a/recipes/uclibc/bfin-uclibc_svn.bb +++ b/recipes/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r4" +PR = "r5" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc @@ -30,5 +30,3 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '$ S = "${WORKDIR}/uClibc" -LEAD_SONAME = "libc.so" - diff --git a/recipes/uclibc/files/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch b/recipes/uclibc/files/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch new file mode 100644 index 0000000000..cfa68ce52d --- /dev/null +++ b/recipes/uclibc/files/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch @@ -0,0 +1,21 @@ +Index: uClibc/ldso/ldso/arm/resolve.S +=================================================================== +--- uClibc.orig/ldso/ldso/arm/resolve.S 2009-03-20 12:03:32.000000000 -0700 ++++ uClibc/ldso/ldso/arm/resolve.S 2009-03-20 12:04:23.000000000 -0700 +@@ -97,7 +97,6 @@ + + .text + .align 4 @ 16 byte boundary and there are 32 bytes below (arm case) +- #if !defined(__thumb__) || defined(__thumb2__) + .arm + .globl _dl_linux_resolve + .type _dl_linux_resolve,%function +@@ -129,7 +128,7 @@ + #else + mov pc,ip + #endif +-#else ++#if 0 + @ In the thumb case _dl_linux_resolver is thumb. If a bl is used + @ from arm code the linker will insert a stub call which, with + @ binutils 2.16, is not PIC. Since this code is accessed by an diff --git a/recipes/uclibc/files/uclibc_ldso_use_O0.patch b/recipes/uclibc/files/uclibc_ldso_use_O0.patch new file mode 100644 index 0000000000..7a89e66621 --- /dev/null +++ b/recipes/uclibc/files/uclibc_ldso_use_O0.patch @@ -0,0 +1,13 @@ +Index: uClibc/ldso/ldso/Makefile.in +=================================================================== +--- uClibc.orig/ldso/ldso/Makefile.in 2009-02-03 17:27:55.000000000 -0800 ++++ uClibc/ldso/ldso/Makefile.in 2009-02-03 17:28:11.000000000 -0800 +@@ -8,7 +8,7 @@ + CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) + + # This stuff will not work with -fomit-frame-pointer +-CFLAGS-ldso += -fno-omit-frame-pointer ++CFLAGS-ldso += -O0 -fno-omit-frame-pointer + + CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso + CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 7470ec18f4..be085ab513 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -2,11 +2,6 @@ DESCRIPTION = "C library for embedded systems" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" - -# I added the line below before and someone removed, but without fixing thumb support -# So please leave this in till thumb support has REALLY been fixed. ktnxbye, koen -ARM_INSTRUCTION_SET = "arm" - # # For now, we will skip building of a gcc package if it is a uclibc one # and our build is not a uclibc one, and we skip a glibc one if our build @@ -37,6 +32,8 @@ PARALLEL_MAKE = "" PACKAGES =+ "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db" +LEAD_SONAME = "libc.so" + # The last line (gdb and lib1) is for uclinux-uclibc builds uclibc_baselibs = "/lib/libcrypt*.so* /lib/libdl*.so \ /lib/libintl*.so* /lib/libm*.so \ diff --git a/recipes/uclibc/uclibc_0.9.29.bb b/recipes/uclibc/uclibc_0.9.29.bb index 256196ce2a..aba1830928 100644 --- a/recipes/uclibc/uclibc_0.9.29.bb +++ b/recipes/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r29" +PR = "r30" require uclibc.inc @@ -42,5 +42,3 @@ KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" - -LEAD_SONAME = "libc.so" diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb index ca0147642c..d159ab379c 100644 --- a/recipes/uclibc/uclibc_0.9.30.1.bb +++ b/recipes/uclibc/uclibc_0.9.30.1.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30.1" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -18,6 +18,8 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://arm-linuxthreads.patch;patch=1 \ file://linuxthreads-changes.patch;patch=1 \ file://pthread_atfork.patch;patch=1 \ + file://uclibc_ldso_use_O0.patch;patch=1 \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -29,5 +31,3 @@ KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" - -LEAD_SONAME = "libc.so" diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb index b3e3c15c0f..bbe809f0c5 100644 --- a/recipes/uclibc/uclibc_0.9.30.bb +++ b/recipes/uclibc/uclibc_0.9.30.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -PR = "r5" +PR = "r6" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -18,6 +18,8 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://arm-linuxthreads.patch;patch=1 \ file://linuxthreads-changes.patch;patch=1 \ file://pthread_atfork.patch;patch=1 \ + file://uclibc_ldso_use_O0.patch;patch=1 \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -29,5 +31,3 @@ KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}" SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2" S = "${WORKDIR}/uClibc-${UCLIBC_BASE}" - -LEAD_SONAME = "libc.so" diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index a43a3dfacd..7b3ef1594a 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -29,7 +29,8 @@ SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl;rev=${SRCREV} \ file://uClibc.machine \ file://uClibc.distro \ file://uclibc-arm-ftruncate64.patch;patch=1 \ - file://arm_fix_alignment.patch;patch=1 \ + file://uclibc_ldso_use_O0.patch;patch=1 \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ " S = "${WORKDIR}/uClibc-nptl" diff --git a/recipes/uclibc/uclibc_svn.bb b/recipes/uclibc/uclibc_svn.bb index 893c97db13..654cb6e5f9 100644 --- a/recipes/uclibc/uclibc_svn.bb +++ b/recipes/uclibc/uclibc_svn.bb @@ -29,9 +29,8 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ file://uClibc.machine \ file://uClibc.distro \ file://uclibc-arm-ftruncate64.patch;patch=1 \ - file://arm_fix_alignment.patch;patch=1 \ - file://arm-linuxthreads.patch;patch=1 \ - file://linuxthreads-changes.patch;patch=1 \ file://uclibc_enable_log2_test.patch;patch=1 \ + file://uclibc_ldso_use_O0.patch;patch=1 \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ " S = "${WORKDIR}/uClibc" -- cgit v1.2.3 From 45fb05982c863f934f5b061c9bcec61da41231df Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Mar 2009 14:37:05 -0700 Subject: sane-srcrevs.inc: Bump the sane srcrev for uclibc. --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 87e9204e45..35a83ad8a2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -227,8 +227,8 @@ SRCREV_pn-tmut ?= "60" SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96" SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" -SRCREV_pn-uclibc ?= "24279" -SRCREV_pn-uclibc-initial ?= "24279" +SRCREV_pn-uclibc ?= "25712" +SRCREV_pn-uclibc-initial ?= "25712" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" -- cgit v1.2.3 From 036b1362f3b84d565fe449ba822fa304abbdd110 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 23 Mar 2009 13:08:22 +0100 Subject: llvm 2.5: Fixes - updated patch to include important preprocessor definitions - copy missing header into staging manually --- recipes/llvm/llvm-2.5/fix-build.patch | 6 +++--- recipes/llvm/llvm_2.5.bb | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/recipes/llvm/llvm-2.5/fix-build.patch b/recipes/llvm/llvm-2.5/fix-build.patch index 000fd4aca5..9430ad3cb8 100644 --- a/recipes/llvm/llvm-2.5/fix-build.patch +++ b/recipes/llvm/llvm-2.5/fix-build.patch @@ -1,7 +1,7 @@ Index: llvm-2.5/tools/llvm-config/CMakeLists.txt =================================================================== --- llvm-2.5.orig/tools/llvm-config/CMakeLists.txt 2009-01-07 20:24:44.000000000 +0100 -+++ llvm-2.5/tools/llvm-config/CMakeLists.txt 2009-03-20 14:18:37.637615308 +0100 ++++ llvm-2.5/tools/llvm-config/CMakeLists.txt 2009-03-23 12:49:10.000000000 +0100 @@ -83,13 +83,13 @@ COMMENT "Checking for cyclic dependencies between LLVM libraries.") @@ -10,8 +10,8 @@ Index: llvm-2.5/tools/llvm-config/CMakeLists.txt - COMMAND echo 's,@LLVM_CFLAGS@,${CMAKE_C_FLAGS},' >> temp.sed - COMMAND echo 's,@LLVM_CXXFLAGS@,${CMAKE_CXX_FLAGS},' >> temp.sed + COMMAND echo 's!@LLVM_CPPFLAGS@!${CMAKE_CPP_FLAGS}!' > temp.sed -+ COMMAND echo 's!@LLVM_CFLAGS@!${CMAKE_C_FLAGS}!' >> temp.sed -+ COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS}!' >> temp.sed ++ COMMAND echo 's!@LLVM_CFLAGS@!${CMAKE_C_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS!' >> temp.sed ++ COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS!' >> temp.sed # TODO: Use general flags for linking, not just for shared libs: - COMMAND echo 's,@LLVM_LDFLAGS@,${CMAKE_SHARED_LINKER_FLAGS},' >> temp.sed - COMMAND echo 's,@LIBS@,,' >> temp.sed # TODO: System libs diff --git a/recipes/llvm/llvm_2.5.bb b/recipes/llvm/llvm_2.5.bb index c0ce3345b8..d8a8d1893b 100644 --- a/recipes/llvm/llvm_2.5.bb +++ b/recipes/llvm/llvm_2.5.bb @@ -1,7 +1,3 @@ -# TODO: -# - packages examples -# - fix staging (and probably llvm-config script) - DESCRIPTION = "The Low Level Virtual Machine" HOMEPAGE = "http://llvm.org" LICENSE = "various" @@ -11,6 +7,8 @@ SRC_URI = "\ file://fix-build.patch;patch=1 \ " +PR = "r1" + DEPENDS = "llvm-native" inherit cmake @@ -30,7 +28,11 @@ EXTRA_OECMAKE = "\ " do_stage() { - oe_runmake DESTDIR="${STAGE_TEMP}" install + oe_runmake DESTDIR="${STAGING_DIR_HOST}" install + + install -d ${STAGING_INCDIR}/llvm + find include/llvm -name "*.h" -maxdepth 1 -exec \ + install {} ${STAGING_INCDIR}/llvm \; install -d ${STAGING_BINDIR_CROSS} -- cgit v1.2.3 From 738f0e354b37cb3b71b2cc3e418d32a06e405f79 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 23 Mar 2009 16:06:00 +0100 Subject: classpath-native 0.98: Set DEFAULT_PREFERENCE to -1. --- recipes/classpath/classpath-native_0.98.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb index dfbaad8369..710958a550 100644 --- a/recipes/classpath/classpath-native_0.98.bb +++ b/recipes/classpath/classpath-native_0.98.bb @@ -1,5 +1,8 @@ require classpath-native.inc +# Deadlocks occur on at least amd64 hosts. +DEFAULT_PREFERENCE = "-1" + PR = "r0" # The code affected by the javanet-local patch -- cgit v1.2.3 From 107b6a650d6b0263b1256a30052cabf91342d5d0 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 23 Mar 2009 16:06:33 +0100 Subject: classpath-native 0.97.2: Retrieved back from 595952e9bbff5d25c370fd140d58c3aae9434690. --- recipes/classpath/classpath-native_0.97.2.bb | 32 ++ .../files/sun-security-getproperty_0.96.1.patch | 503 +++++++++++++++++++++ 2 files changed, 535 insertions(+) create mode 100644 recipes/classpath/classpath-native_0.97.2.bb create mode 100644 recipes/classpath/files/sun-security-getproperty_0.96.1.patch diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb new file mode 100644 index 0000000000..0024136b97 --- /dev/null +++ b/recipes/classpath/classpath-native_0.97.2.bb @@ -0,0 +1,32 @@ +require classpath-native.inc + +PR = "r4" + +# The code affected by the javanet-local patch +# is usually not compiled. However if someone changes +# to --enable-local-sockets it will. +SRC_URI += "\ + file://netif_16.patch;patch=1;pnum=0 \ + file://SimpleName.diff;patch=1;pnum=0 \ + file://javanet-local.patch;patch=1;pnum=0 \ + file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \ + file://ecj_java_dir.patch;patch=1 \ + file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ + file://cp-byte-loophelper.patch;patch=1;pnum=0 \ + file://miscompilation.patch;patch=1 \ + " + +do_unpackpost() { + # Kind of patch: Moves package "org.w3c.dom.html2" to "org.w3c.dom.html" + mv external/w3c_dom/org/w3c/dom/html2 \ + external/w3c_dom/org/w3c/dom/html + + find examples/gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \ + -exec sed -i -e"s|org.w3c.dom.html2|org.w3c.dom.html|" {} \; + + sed -i -e"s|org/w3c/dom/html2|org/w3c/dom/html|" external/w3c_dom/Makefile.am +} + +addtask unpackpost after do_unpack before do_patch + diff --git a/recipes/classpath/files/sun-security-getproperty_0.96.1.patch b/recipes/classpath/files/sun-security-getproperty_0.96.1.patch new file mode 100644 index 0000000000..6af03e75ea --- /dev/null +++ b/recipes/classpath/files/sun-security-getproperty_0.96.1.patch @@ -0,0 +1,503 @@ +Index: gnu/classpath/debug/Simple1LineFormatter.java +=================================================================== +--- gnu/classpath/debug/Simple1LineFormatter.java.orig 2006-07-11 18:03:59.000000000 +0200 ++++ gnu/classpath/debug/Simple1LineFormatter.java 2008-06-04 11:14:14.000000000 +0200 +@@ -38,8 +38,6 @@ + + package gnu.classpath.debug; + +-import gnu.java.security.action.GetPropertyAction; +- + import java.io.PrintWriter; + import java.io.StringWriter; + import java.security.AccessController; +@@ -51,6 +49,8 @@ + import java.util.logging.Formatter; + import java.util.logging.LogRecord; + ++import sun.security.action.GetPropertyAction; ++ + /** + * A simple 1-line formatter to use instead of the 2-line SimpleFormatter used + * by default in the JDK logging handlers. +Index: gnu/classpath/debug/SystemLogger.java +=================================================================== +--- gnu/classpath/debug/SystemLogger.java.orig 2006-12-10 21:25:41.000000000 +0100 ++++ gnu/classpath/debug/SystemLogger.java 2008-06-04 11:14:14.000000000 +0200 +@@ -38,13 +38,13 @@ + + package gnu.classpath.debug; + +-import gnu.java.security.action.GetPropertyAction; +- + import java.security.AccessController; + import java.util.StringTokenizer; + import java.util.logging.Level; + import java.util.logging.Logger; + ++import sun.security.action.GetPropertyAction; ++ + public final class SystemLogger extends Logger + { + public static final SystemLogger SYSTEM = new SystemLogger(); +Index: gnu/java/security/PolicyFile.java +=================================================================== +--- gnu/java/security/PolicyFile.java.orig 2006-07-11 18:03:59.000000000 +0200 ++++ gnu/java/security/PolicyFile.java 2008-06-04 11:14:50.000000000 +0200 +@@ -39,7 +39,6 @@ + + import gnu.classpath.debug.Component; + import gnu.classpath.debug.SystemLogger; +-import gnu.java.security.action.GetPropertyAction; + + import java.io.File; + import java.io.IOException; +@@ -72,6 +71,8 @@ + import java.util.StringTokenizer; + import java.util.logging.Logger; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An implementation of a {@link java.security.Policy} object whose + * permissions are specified by a policy file. +Index: gnu/java/security/action/GetPropertyAction.java +=================================================================== +--- gnu/java/security/action/GetPropertyAction.java 2006-12-10 21:25:42.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,89 +0,0 @@ +-/* GetPropertyAction.java +- Copyright (C) 2004 Free Software Foundation, Inc. +- +-This file is part of GNU Classpath. +- +-GNU Classpath is free software; you can redistribute it and/or modify +-it under the terms of the GNU General Public License as published by +-the Free Software Foundation; either version 2, or (at your option) +-any later version. +- +-GNU Classpath is distributed in the hope that it will be useful, but +-WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-General Public License for more details. +- +-You should have received a copy of the GNU General Public License +-along with GNU Classpath; see the file COPYING. If not, write to the +-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-02110-1301 USA. +- +-Linking this library statically or dynamically with other modules is +-making a combined work based on this library. Thus, the terms and +-conditions of the GNU General Public License cover the whole +-combination. +- +-As a special exception, the copyright holders of this library give you +-permission to link this library with independent modules to produce an +-executable, regardless of the license terms of these independent +-modules, and to copy and distribute the resulting executable under +-terms of your choice, provided that you also meet, for each linked +-independent module, the terms and conditions of the license of that +-module. An independent module is a module which is not derived from +-or based on this library. If you modify this library, you may extend +-this exception to your version of the library, but you are not +-obligated to do so. If you do not wish to do so, delete this +-exception statement from your version. */ +- +-package gnu.java.security.action; +- +-import java.security.PrivilegedAction; +- +-/** +- * PrivilegedAction implementation that calls System.getProperty() with +- * the property name passed to its constructor. +- * +- * Example of use: +- * +- * GetPropertyAction action = new GetPropertyAction("http.proxyPort"); +- * String port = AccessController.doPrivileged(action); +- * +- */ +-public class GetPropertyAction implements PrivilegedAction +-{ +- String name; +- String value = null; +- +- public GetPropertyAction() +- { +- } +- +- public GetPropertyAction(String propName) +- { +- setParameters(propName); +- } +- +- public GetPropertyAction(String propName, String defaultValue) +- { +- setParameters(propName, defaultValue); +- } +- +- public String run() +- { +- return System.getProperty(name, value); +- } +- +- public GetPropertyAction setParameters(String propName) +- { +- this.name = propName; +- this.value = null; +- return this; +- } +- +- public GetPropertyAction setParameters(String propName, String defaultValue) +- { +- this.name = propName; +- this.value = defaultValue; +- return this; +- } +-} +Index: gnu/java/security/key/dss/DSSKey.java +=================================================================== +--- gnu/java/security/key/dss/DSSKey.java.orig 2006-08-05 05:23:27.000000000 +0200 ++++ gnu/java/security/key/dss/DSSKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.java.security.key.dss; + + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.util.FormatUtil; + + import java.math.BigInteger; +@@ -49,6 +48,8 @@ + import java.security.interfaces.DSAParams; + import java.security.spec.DSAParameterSpec; + ++import sun.security.action.GetPropertyAction; ++ + /** + * A base asbtract class for both public and private DSS (Digital Signature + * Standard) keys. It encapsulates the three DSS numbers: p, +Index: gnu/java/security/key/dss/DSSPrivateKey.java +=================================================================== +--- gnu/java/security/key/dss/DSSPrivateKey.java.orig 2006-07-11 18:04:00.000000000 +0200 ++++ gnu/java/security/key/dss/DSSPrivateKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -40,7 +40,6 @@ + + import gnu.java.security.Configuration; + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.key.IKeyPairCodec; + + import java.math.BigInteger; +@@ -48,6 +47,8 @@ + import java.security.PrivateKey; + import java.security.interfaces.DSAPrivateKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An object that embodies a DSS (Digital Signature Standard) private key. + * +Index: gnu/java/security/key/dss/DSSPublicKey.java +=================================================================== +--- gnu/java/security/key/dss/DSSPublicKey.java.orig 2006-07-11 18:04:00.000000000 +0200 ++++ gnu/java/security/key/dss/DSSPublicKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.java.security.key.dss; + + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.key.IKeyPairCodec; + + import java.math.BigInteger; +@@ -47,6 +46,8 @@ + import java.security.PublicKey; + import java.security.interfaces.DSAPublicKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An object that embodies a DSS (Digital Signature Standard) public key. + * +Index: gnu/java/security/key/rsa/GnuRSAKey.java +=================================================================== +--- gnu/java/security/key/rsa/GnuRSAKey.java.orig 2006-07-11 18:04:00.000000000 +0200 ++++ gnu/java/security/key/rsa/GnuRSAKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.java.security.key.rsa; + + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.util.FormatUtil; + + import java.math.BigInteger; +@@ -47,6 +46,8 @@ + import java.security.Key; + import java.security.interfaces.RSAKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * A base asbtract class for both public and private RSA keys. + */ +Index: gnu/java/security/key/rsa/GnuRSAPrivateKey.java +=================================================================== +--- gnu/java/security/key/rsa/GnuRSAPrivateKey.java.orig 2006-07-11 18:04:00.000000000 +0200 ++++ gnu/java/security/key/rsa/GnuRSAPrivateKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.java.security.key.rsa; + + import gnu.java.security.Configuration; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.Registry; + import gnu.java.security.key.IKeyPairCodec; + +@@ -49,6 +48,8 @@ + import java.security.interfaces.RSAPrivateCrtKey; + import java.security.interfaces.RSAPrivateKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An object that embodies an RSA private key. + *

+Index: gnu/java/security/key/rsa/GnuRSAPublicKey.java +=================================================================== +--- gnu/java/security/key/rsa/GnuRSAPublicKey.java.orig 2006-07-11 18:04:00.000000000 +0200 ++++ gnu/java/security/key/rsa/GnuRSAPublicKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.java.security.key.rsa; + + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.key.IKeyPairCodec; + + import java.math.BigInteger; +@@ -47,6 +46,8 @@ + import java.security.PublicKey; + import java.security.interfaces.RSAPublicKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An object that encapsulates an RSA public key. + *

+Index: gnu/javax/crypto/key/dh/GnuDHKey.java +=================================================================== +--- gnu/javax/crypto/key/dh/GnuDHKey.java.orig 2006-07-11 18:03:59.000000000 +0200 ++++ gnu/javax/crypto/key/dh/GnuDHKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.javax.crypto.key.dh; + + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.util.FormatUtil; + + import java.math.BigInteger; +@@ -49,6 +48,8 @@ + import javax.crypto.interfaces.DHKey; + import javax.crypto.spec.DHParameterSpec; + ++import sun.security.action.GetPropertyAction; ++ + /** + * A base asbtract class for both public and private Diffie-Hellman keys. It + * encapsulates the two DH numbers: p, and g. +Index: gnu/javax/crypto/key/dh/GnuDHPrivateKey.java +=================================================================== +--- gnu/javax/crypto/key/dh/GnuDHPrivateKey.java.orig 2006-07-11 18:03:59.000000000 +0200 ++++ gnu/javax/crypto/key/dh/GnuDHPrivateKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -40,7 +40,6 @@ + + import gnu.java.security.Configuration; + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.key.IKeyPairCodec; + + import java.math.BigInteger; +@@ -48,6 +47,8 @@ + + import javax.crypto.interfaces.DHPrivateKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An implementation of the Diffie-Hellman private key. + *

+Index: gnu/javax/crypto/key/dh/GnuDHPublicKey.java +=================================================================== +--- gnu/javax/crypto/key/dh/GnuDHPublicKey.java.orig 2006-07-11 18:03:59.000000000 +0200 ++++ gnu/javax/crypto/key/dh/GnuDHPublicKey.java 2008-06-04 11:14:14.000000000 +0200 +@@ -39,7 +39,6 @@ + package gnu.javax.crypto.key.dh; + + import gnu.java.security.Registry; +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.key.IKeyPairCodec; + + import java.math.BigInteger; +@@ -47,6 +46,8 @@ + + import javax.crypto.interfaces.DHPublicKey; + ++import sun.security.action.GetPropertyAction; ++ + /** + * An implementation of the Diffie-Hellman public key. + *

+Index: gnu/javax/crypto/sasl/plain/PasswordFile.java +=================================================================== +--- gnu/javax/crypto/sasl/plain/PasswordFile.java.orig 2006-07-11 18:03:59.000000000 +0200 ++++ gnu/javax/crypto/sasl/plain/PasswordFile.java 2008-06-04 11:14:14.000000000 +0200 +@@ -38,7 +38,6 @@ + + package gnu.javax.crypto.sasl.plain; + +-import gnu.java.security.action.GetPropertyAction; + import gnu.javax.crypto.sasl.NoSuchUserException; + import gnu.javax.crypto.sasl.UserAlreadyExistsException; + +@@ -56,6 +55,8 @@ + import java.util.NoSuchElementException; + import java.util.StringTokenizer; + ++import sun.security.action.GetPropertyAction; ++ + /** + * A representation of a Plain password file. + */ +Index: gnu/javax/net/ssl/provider/X509TrustManagerFactory.java +=================================================================== +--- gnu/javax/net/ssl/provider/X509TrustManagerFactory.java.orig 2006-12-10 21:25:43.000000000 +0100 ++++ gnu/javax/net/ssl/provider/X509TrustManagerFactory.java 2008-06-04 11:14:14.000000000 +0200 +@@ -66,11 +66,12 @@ + import javax.net.ssl.TrustManagerFactorySpi; + import javax.net.ssl.X509TrustManager; + +-import gnu.java.security.action.GetPropertyAction; + import gnu.java.security.x509.X509CertPath; + import gnu.javax.net.ssl.NullManagerParameters; + import gnu.javax.net.ssl.StaticTrustAnchors; + ++import sun.security.action.GetPropertyAction; ++ + /** + * This class implements a {@link javax.net.ssl.TrustManagerFactory} engine + * for the ``JessieX509'' algorithm. +Index: gnu/xml/aelfred2/XmlParser.java +=================================================================== +--- gnu/xml/aelfred2/XmlParser.java.orig 2007-09-21 20:05:21.000000000 +0200 ++++ gnu/xml/aelfred2/XmlParser.java 2008-06-04 11:14:14.000000000 +0200 +@@ -53,8 +53,6 @@ + + package gnu.xml.aelfred2; + +-import gnu.java.security.action.GetPropertyAction; +- + import java.io.BufferedInputStream; + import java.io.CharConversionException; + import java.io.EOFException; +@@ -74,6 +72,7 @@ + import org.xml.sax.InputSource; + import org.xml.sax.SAXException; + ++import sun.security.action.GetPropertyAction; + + /** + * Parse XML documents and return parse events through call-backs. +Index: sun/security/action/GetPropertyAction.java +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ sun/security/action/GetPropertyAction.java 2008-06-04 11:14:14.000000000 +0200 +@@ -0,0 +1,92 @@ ++/* GetPropertyAction.java ++ Copyright (C) 2004, 2008 Free Software Foundation, Inc. ++ ++This file is part of GNU Classpath. ++ ++GNU Classpath is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 2, or (at your option) ++any later version. ++ ++GNU Classpath is distributed in the hope that it will be useful, but ++WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GNU Classpath; see the file COPYING. If not, write to the ++Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++02110-1301 USA. ++ ++Linking this library statically or dynamically with other modules is ++making a combined work based on this library. Thus, the terms and ++conditions of the GNU General Public License cover the whole ++combination. ++ ++As a special exception, the copyright holders of this library give you ++permission to link this library with independent modules to produce an ++executable, regardless of the license terms of these independent ++modules, and to copy and distribute the resulting executable under ++terms of your choice, provided that you also meet, for each linked ++independent module, the terms and conditions of the license of that ++module. An independent module is a module which is not derived from ++or based on this library. If you modify this library, you may extend ++this exception to your version of the library, but you are not ++obligated to do so. If you do not wish to do so, delete this ++exception statement from your version. */ ++ ++package sun.security.action; ++ ++import java.security.PrivilegedAction; ++ ++/** ++ * PrivilegedAction implementation that calls System.getProperty() with ++ * the property name passed to its constructor. ++ * ++ * Example of use: ++ * ++ * GetPropertyAction action = new GetPropertyAction("http.proxyPort"); ++ * String port = AccessController.doPrivileged(action); ++ * ++ * ++ * Note: Usage of this class is discouraged as it is not a part of the ++ * J2SE API. ++ */ ++public class GetPropertyAction implements PrivilegedAction ++{ ++ String name; ++ String value = null; ++ ++ public GetPropertyAction() ++ { ++ } ++ ++ public GetPropertyAction(String propName) ++ { ++ setParameters(propName); ++ } ++ ++ public GetPropertyAction(String propName, String defaultValue) ++ { ++ setParameters(propName, defaultValue); ++ } ++ ++ public String run() ++ { ++ return System.getProperty(name, value); ++ } ++ ++ public GetPropertyAction setParameters(String propName) ++ { ++ this.name = propName; ++ this.value = null; ++ return this; ++ } ++ ++ public GetPropertyAction setParameters(String propName, String defaultValue) ++ { ++ this.name = propName; ++ this.value = defaultValue; ++ return this; ++ } ++} -- cgit v1.2.3 From 5261978d6f9600640c1ea4f1393e18772d4f9657 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 23 Mar 2009 17:26:37 +0100 Subject: busybox: fix linuxrc link and put it in a seperate package * runtime tested on a beagleboard --- recipes/busybox/busybox.inc | 11 +++++++---- recipes/busybox/busybox_1.13.2.bb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index cb8eb53216..acf47f2178 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -142,10 +142,10 @@ pkg_postinst_${PN} () { # so the update-alternatives script will get the utilities it needs # (update-alternatives have no problem replacing links later anyway) test -n 2> /dev/null || alias test='busybox test' - if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; busybox ln -s $to $link; fi; done Date: Mon, 23 Mar 2009 15:38:24 -0700 Subject: base.bbclass: Abort early if localpath() was unable to find a local file for the url. Signed-off-by: Chris Larson --- classes/base.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index f39059ecc0..919d01d77b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -794,7 +794,9 @@ python base_do_unpack() { try: local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata) except bb.MalformedUrl, e: - raise FuncFailed('Unable to generate local path for malformed uri: %s' % e) + raise bb.build.FuncFailed('Unable to generate local path for malformed uri: %s' % e) + if not local: + raise bb.build.FuncFailed('Unable to locate local file for %s' % url) local = os.path.realpath(local) ret = oe_unpack_file(local, localdata, url) if not ret: -- cgit v1.2.3 From 6ddd16d877b167b929b5a64a2e01d2e6be161b15 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 23 Mar 2009 15:40:22 -0700 Subject: base.bbclass: rstrip the git branch/revision. Signed-off-by: Chris Larson --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 919d01d77b..9ec705bc1e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -870,7 +870,7 @@ def base_get_metadata_svn_revision(path, d): def base_get_metadata_git_branch(path, d): import os - branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read() + branch = os.popen('cd %s; git symbolic-ref HEAD' % path).read().rstrip() if len(branch) != 0: return branch.replace("refs/heads/", "") @@ -878,7 +878,7 @@ def base_get_metadata_git_branch(path, d): def base_get_metadata_git_revision(path, d): import os - rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0] + rev = os.popen("cd %s; git show-ref HEAD" % path).read().split(" ")[0].rstrip() if len(rev) != 0: return rev return "" -- cgit v1.2.3 From 9bb0079fdb658519027cd4bfa419ddae8a39334a Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 23 Mar 2009 15:59:28 -0700 Subject: bitbake.conf: resurrect FILESDIR, didn't intend its complete removal just yet. Signed-off-by: Chris Larson --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 2d86f1ea07..7c159afcee 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -235,7 +235,8 @@ export MANIFEST = "${FILESDIR}/manifest" FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" FILESPATHBASE = "${FILE_DIRNAME}" FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." -FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" +FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}" +FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}" ################################################################## # General work and output directories for the build system. -- cgit v1.2.3 From c20e6cd2364611ecda9fee490840b5301c1546ce Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 23 Mar 2009 21:06:36 -0700 Subject: libxml2-native: Move EXTRA_OECONF to do_configure_prepend * EXTRA_OECONF uses --with-python=${PYTHON_DIR} and PYTHON_DIR is a python evaluated. So unless we have python-native built and installed in staging we can not evaluate this variable. We move this evaluation inside do_configure so that it gets evluated after dependency is met. Signed-off-by: Khem Raj --- recipes/libxml/libxml2-native.inc | 18 ++++++++++-------- recipes/libxml/libxml2-native_2.7.2.bb | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc index b819f95fba..c8182de91a 100644 --- a/recipes/libxml/libxml2-native.inc +++ b/recipes/libxml/libxml2-native.inc @@ -7,14 +7,16 @@ S = "${WORKDIR}/libxml2-${PV}" inherit distutils-base autotools native pkgconfig -EXTRA_OECONF = "\ - --with-python=${PYTHON_DIR} \ - --without-debug \ - --without-legacy \ - --with-catalog \ - --without-docbook \ - --with-c14n \ -" +do_configure_prepend () { + EXTRA_OECONF = "\ + --with-python=${PYTHON_DIR} \ + --without-debug \ + --without-legacy \ + --with-catalog \ + --without-docbook \ + --with-c14n \ + " +} do_stage () { oe_runmake install diff --git a/recipes/libxml/libxml2-native_2.7.2.bb b/recipes/libxml/libxml2-native_2.7.2.bb index bcbfb6637b..24261d66f2 100644 --- a/recipes/libxml/libxml2-native_2.7.2.bb +++ b/recipes/libxml/libxml2-native_2.7.2.bb @@ -1,2 +1,2 @@ require libxml2-native.inc -PR = "r1" +PR = "r2" -- cgit v1.2.3 From 9682e05eb124431e19049516dc297add5e89f0f7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 24 Mar 2009 10:45:58 +0100 Subject: angstrom preferred versions: remove libosip version that no-one can explain --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b19794038c..a11c1d5691 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,7 +13,6 @@ PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" -PREFERRED_VERSION_libosip2 = "2.2.2" PREFERRED_VERSION_libsdl-x11 = "1.2.11" PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" -- cgit v1.2.3 From ed9094c6885767bf5b229a0b3901048eeecd9791 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 24 Mar 2009 11:52:59 +0100 Subject: midori: disable hildon interface * if you want a hildon midori, create a midori-hildon recipe --- recipes/gtk-webcore/midori.inc | 1 + recipes/gtk-webcore/midori_git.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/gtk-webcore/midori.inc b/recipes/gtk-webcore/midori.inc index 793590babb..a241157c58 100644 --- a/recipes/gtk-webcore/midori.inc +++ b/recipes/gtk-webcore/midori.inc @@ -7,4 +7,5 @@ inherit autotools gtk-icon-cache pkgconfig SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz" +EXTRA_OECONF = " --disable-hildon " diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb index f4039a414f..c22f00aff3 100644 --- a/recipes/gtk-webcore/midori_git.bb +++ b/recipes/gtk-webcore/midori_git.bb @@ -3,7 +3,7 @@ require midori.inc DEPENDS += "python-native python-docutils-native" # increment PR every time SRCREV is updated! -PR = "r0" +PR = "r1" PV = "0.1.2+${PR}+gitr${SRCREV}" SRC_URI = "http://git.xfce.org/kalikiana/midori/snapshot/midori-${SRCREV}.tar.bz2" -- cgit v1.2.3 From 9a591708b4932b5f57357a04152e53b2342016d5 Mon Sep 17 00:00:00 2001 From: woglinde Date: Tue, 24 Mar 2009 12:08:21 +0100 Subject: wrap: fix tuning --- conf/machine/wrap.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf index 1fc75ebe94..8dbd6619d9 100644 --- a/conf/machine/wrap.conf +++ b/conf/machine/wrap.conf @@ -3,7 +3,8 @@ #@DESCRIPTION: Machine configuration for the PC Engines WRAP (Wireless Router Application Platform) boards. TARGET_ARCH = "i486" -PACKAGE_EXTRA_ARCHS = "i386 x86" + +require conf/machine/include/tune-x86.inc PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -- cgit v1.2.3 From b4b4c8664e53f15a436e17151c7c8cef33b766cd Mon Sep 17 00:00:00 2001 From: woglinde Date: Tue, 24 Mar 2009 12:08:58 +0100 Subject: uclibc-0.9.30.1: enable UCLIBC_HAS_GETPT --- recipes/uclibc/uclibc-0.9.30.1/uClibc.distro | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/uclibc/uclibc-0.9.30.1/uClibc.distro b/recipes/uclibc/uclibc-0.9.30.1/uClibc.distro index b072b2fd37..77f6091e78 100644 --- a/recipes/uclibc/uclibc-0.9.30.1/uClibc.distro +++ b/recipes/uclibc/uclibc-0.9.30.1/uClibc.distro @@ -32,6 +32,7 @@ UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y +UCLIBC_HAS_GETPT=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y -- cgit v1.2.3 From 20ad023c27df9817513e0a15d173901720288df6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 24 Mar 2009 13:41:51 +0100 Subject: linux-omap: add recipe for 2.6.29 and update git version to that as well --- .../0001-ASoC-Add-support-for-OMAP3-EVM.patch | 206 + ...es-Steve-Kipisz-USB-EHCI-support.-He-star.patch | 146 + recipes/linux/linux-omap-2.6.29/DSS2.diff | 23964 ++++++ .../linux/linux-omap-2.6.29/beagleboard/defconfig | 2238 + .../beagleboard/logo_linux_clut224.ppm | 73147 +++++++++++++++++++ .../linux-omap-2.6.29/cache-display-fix.patch | 238 + recipes/linux/linux-omap-2.6.29/evm-mcspi-ts.diff | 132 + recipes/linux/linux-omap-2.6.29/fix-install.patch | 23 + .../linux-omap-2.6.29/no-cortex-deadlock.patch | 77 + .../no-empty-flash-warnings.patch | 15 + .../linux/linux-omap-2.6.29/no-harry-potter.diff | 11 + .../linux/linux-omap-2.6.29/omap-2430-lcd.patch | 11 + .../linux/linux-omap-2.6.29/omap1710h3/defconfig | 1224 + .../linux/linux-omap-2.6.29/omap2420h4/defconfig | 1119 + .../linux/linux-omap-2.6.29/omap2430sdp/defconfig | 1303 + .../linux-omap-2.6.29/omap3-pandora/defconfig | 2186 + recipes/linux/linux-omap-2.6.29/omap3evm/defconfig | 2197 + .../linux-omap-2.6.29/omap3evm/omap3evm-dss2.diff | 443 + .../omap3evm/omap3evm-lcd-redtint.diff | 66 + .../linux/linux-omap-2.6.29/omap5912osk/defconfig | 1098 + recipes/linux/linux-omap-2.6.29/overo/defconfig | 1967 + recipes/linux/linux-omap-2.6.29/read_die_ids.patch | 23 + .../linux-omap-2.6.29/timer-suppression.patch | 43 + recipes/linux/linux-omap-2.6.29/touchscreen.patch | 22 + recipes/linux/linux-omap-2.6.29/usbttyfix.patch | 29 + ...-New-display-subsystem-driver-for-OMAP2-3.patch | 10365 --- .../0001-Implement-downsampling-with-debugs.patch | 138 - ...solution-check-that-prevents-scaling-when.patch | 26 - ...001-board-omap3beagle-set-i2c-3-to-100kHz.patch | 30 - ...MAPFB-fb-driver-for-new-display-subsystem.patch | 3809 - .../0003-DSS-Add-generic-DVI-panel.patch | 146 - .../0004-DSS-support-for-Beagle-Board.patch | 1605 - ...05-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch | 156 - .../0006-DSS-Support-for-OMAP3-SDP-board.patch | 1877 - .../0007-DSS-Support-for-OMAP3-EVM-board.patch | 255 - .../linux-omap/0008-DSS-Hacked-N810-support.patch | 1076 - ...FB-allocate-fbmem-only-for-fb0-or-if-spes.patch | 121 - ...FB-remove-extra-omapfb_setup_overlay-call.patch | 29 - ...B-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch | 27 - ...omments-to-FAKE_VSYNC-to-make-things-more.patch | 27 - .../0013-DSS-OMAPFB-remove-extra-spaces.patch | 25 - .../linux-omap/0014-DSS-fix-clk_get_usecount.patch | 67 - .../0015-OMAPFB-remove-debug-print.patch | 25 - recipes/linux/linux-omap/DSS2.diff | 23964 ++++++ recipes/linux/linux-omap/beagleboard/defconfig | 188 +- .../linux/linux-omap/fix-clkrate-programming.diff | 57 - recipes/linux/linux-omap/fix-dpll-m4.diff | 37 - recipes/linux/linux-omap/fix-irq33.diff | 111 - recipes/linux/linux-omap/mru-256MB.diff | 24 - .../mru-enable-overlay-optimalization.diff | 117 - .../linux/linux-omap/mru-fix-display-panning.diff | 49 - recipes/linux/linux-omap/mru-fix-timings.diff | 26 - .../linux-omap/mru-improve-pixclock-config.diff | 93 - .../mru-make-video-timings-selectable.diff | 312 - .../musb-support-high-bandwidth.patch.eml | 134 - recipes/linux/linux-omap/oprofile-0.9.3.armv7.diff | 599 - .../linux/linux-omap/strongly-ordered-memory.diff | 18 - recipes/linux/linux-omap_2.6.29.bb | 40 + recipes/linux/linux-omap_git.bb | 37 +- 59 files changed, 136057 insertions(+), 21481 deletions(-) create mode 100644 recipes/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch create mode 100644 recipes/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch create mode 100644 recipes/linux/linux-omap-2.6.29/DSS2.diff create mode 100644 recipes/linux/linux-omap-2.6.29/beagleboard/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/beagleboard/logo_linux_clut224.ppm create mode 100644 recipes/linux/linux-omap-2.6.29/cache-display-fix.patch create mode 100644 recipes/linux/linux-omap-2.6.29/evm-mcspi-ts.diff create mode 100644 recipes/linux/linux-omap-2.6.29/fix-install.patch create mode 100644 recipes/linux/linux-omap-2.6.29/no-cortex-deadlock.patch create mode 100644 recipes/linux/linux-omap-2.6.29/no-empty-flash-warnings.patch create mode 100644 recipes/linux/linux-omap-2.6.29/no-harry-potter.diff create mode 100644 recipes/linux/linux-omap-2.6.29/omap-2430-lcd.patch create mode 100644 recipes/linux/linux-omap-2.6.29/omap1710h3/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/omap2420h4/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/omap2430sdp/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/omap3-pandora/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/omap3evm/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/omap3evm/omap3evm-dss2.diff create mode 100644 recipes/linux/linux-omap-2.6.29/omap3evm/omap3evm-lcd-redtint.diff create mode 100644 recipes/linux/linux-omap-2.6.29/omap5912osk/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/overo/defconfig create mode 100644 recipes/linux/linux-omap-2.6.29/read_die_ids.patch create mode 100644 recipes/linux/linux-omap-2.6.29/timer-suppression.patch create mode 100644 recipes/linux/linux-omap-2.6.29/touchscreen.patch create mode 100644 recipes/linux/linux-omap-2.6.29/usbttyfix.patch delete mode 100644 recipes/linux/linux-omap/0001-DSS-New-display-subsystem-driver-for-OMAP2-3.patch delete mode 100644 recipes/linux/linux-omap/0001-Implement-downsampling-with-debugs.patch delete mode 100644 recipes/linux/linux-omap/0001-Removed-resolution-check-that-prevents-scaling-when.patch delete mode 100644 recipes/linux/linux-omap/0001-board-omap3beagle-set-i2c-3-to-100kHz.patch delete mode 100644 recipes/linux/linux-omap/0002-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch delete mode 100644 recipes/linux/linux-omap/0003-DSS-Add-generic-DVI-panel.patch delete mode 100644 recipes/linux/linux-omap/0004-DSS-support-for-Beagle-Board.patch delete mode 100644 recipes/linux/linux-omap/0005-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch delete mode 100644 recipes/linux/linux-omap/0006-DSS-Support-for-OMAP3-SDP-board.patch delete mode 100644 recipes/linux/linux-omap/0007-DSS-Support-for-OMAP3-EVM-board.patch delete mode 100644 recipes/linux/linux-omap/0008-DSS-Hacked-N810-support.patch delete mode 100644 recipes/linux/linux-omap/0009-DSS-OMAPFB-allocate-fbmem-only-for-fb0-or-if-spes.patch delete mode 100644 recipes/linux/linux-omap/0010-DSS-OMAPFB-remove-extra-omapfb_setup_overlay-call.patch delete mode 100644 recipes/linux/linux-omap/0011-DSS-OMAPFB-fix-GFX_SYNC-to-be-compatible-with-DSS1.patch delete mode 100644 recipes/linux/linux-omap/0012-DSS-Add-comments-to-FAKE_VSYNC-to-make-things-more.patch delete mode 100644 recipes/linux/linux-omap/0013-DSS-OMAPFB-remove-extra-spaces.patch delete mode 100644 recipes/linux/linux-omap/0014-DSS-fix-clk_get_usecount.patch delete mode 100644 recipes/linux/linux-omap/0015-OMAPFB-remove-debug-print.patch create mode 100644 recipes/linux/linux-omap/DSS2.diff delete mode 100644 recipes/linux/linux-omap/fix-clkrate-programming.diff delete mode 100644 recipes/linux/linux-omap/fix-dpll-m4.diff delete mode 100644 recipes/linux/linux-omap/fix-irq33.diff delete mode 100644 recipes/linux/linux-omap/mru-256MB.diff delete mode 100644 recipes/linux/linux-omap/mru-enable-overlay-optimalization.diff delete mode 100644 recipes/linux/linux-omap/mru-fix-display-panning.diff delete mode 100644 recipes/linux/linux-omap/mru-fix-timings.diff delete mode 100644 recipes/linux/linux-omap/mru-improve-pixclock-config.diff delete mode 100644 recipes/linux/linux-omap/mru-make-video-timings-selectable.diff delete mode 100644 recipes/linux/linux-omap/musb-support-high-bandwidth.patch.eml delete mode 100644 recipes/linux/linux-omap/oprofile-0.9.3.armv7.diff delete mode 100644 recipes/linux/linux-omap/strongly-ordered-memory.diff create mode 100644 recipes/linux/linux-omap_2.6.29.bb diff --git a/recipes/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch b/recipes/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch new file mode 100644 index 0000000000..a76e96e444 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/0001-ASoC-Add-support-for-OMAP3-EVM.patch @@ -0,0 +1,206 @@ +From c1dad0b6b434300ae64c902d11611c54c513ea10 Mon Sep 17 00:00:00 2001 +From: Anuj Aggarwal +Date: Fri, 21 Nov 2008 17:41:03 +0530 +Subject: [PATCH] ASoC: Add support for OMAP3 EVM + +This patch adds ALSA SoC support for OMAP3 EVM using TWL4030 audio codec. + +Signed-off-by: Anuj Aggarwal +--- + sound/soc/omap/Kconfig | 8 +++ + sound/soc/omap/Makefile | 3 +- + sound/soc/omap/omap3evm.c | 147 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 157 insertions(+), 1 deletions(-) + create mode 100644 sound/soc/omap/omap3evm.c + +diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig +index 0daeee4..deb6ba9 100644 +--- a/sound/soc/omap/Kconfig ++++ b/sound/soc/omap/Kconfig +@@ -22,6 +22,14 @@ config SND_OMAP_SOC_OMAP3_BEAGLE + help + Say Y if you want to add support for SoC audio on the Beagleboard. + ++config SND_OMAP_SOC_OMAP3EVM ++ tristate "SoC Audio support for OMAP3EVM board" ++ depends on SND_OMAP_SOC && MACH_OMAP3EVM ++ select SND_OMAP_SOC_MCBSP ++ select SND_SOC_TWL4030 ++ help ++ Say Y if you want to add support for SoC audio on the omap3evm board. ++ + config SND_OMAP_SOC_OSK5912 + tristate "SoC Audio support for omap osk5912" + depends on SND_OMAP_SOC && MACH_OMAP_OSK +diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile +index 4bae404..ef31c25 100644 +--- a/sound/soc/omap/Makefile ++++ b/sound/soc/omap/Makefile +@@ -10,9 +10,10 @@ snd-soc-n810-objs := n810.o + snd-soc-omap3beagle-objs := omap3beagle.o + snd-soc-osk5912-objs := osk5912.o + snd-soc-overo-objs := overo.o ++snd-soc-omap3evm-objs := omap3evm.o + + obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o + obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o + obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o + obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o +- ++obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o +diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c +new file mode 100644 +index 0000000..570af55 +--- /dev/null ++++ b/sound/soc/omap/omap3evm.c +@@ -0,0 +1,147 @@ ++/* ++ * omap3evm.c -- ALSA SoC support for OMAP3 EVM ++ * ++ * Author: Anuj Aggarwal ++ * ++ * Based on sound/soc/omap/beagle.c by Steve Sakoman ++ * ++ * Copyright (C) 2008 Texas Instruments, Incorporated ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation version 2. ++ * ++ * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind, ++ * whether express or implied; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "omap-mcbsp.h" ++#include "omap-pcm.h" ++#include "../codecs/twl4030.h" ++ ++static int omap3evm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; ++ int ret; ++ ++ /* Set codec DAI configuration */ ++ ret = snd_soc_dai_set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_ERR "can't set codec DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set cpu DAI configuration */ ++ ret = snd_soc_dai_set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_ERR "can't set cpu DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set the codec system clock for DAC and ADC */ ++ ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) { ++ printk(KERN_ERR "can't set codec system clock\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops omap3evm_ops = { ++ .hw_params = omap3evm_hw_params, ++}; ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link omap3evm_dai = { ++ .name = "TWL4030", ++ .stream_name = "TWL4030", ++ .cpu_dai = &omap_mcbsp_dai[0], ++ .codec_dai = &twl4030_dai, ++ .ops = &omap3evm_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_omap3evm = { ++ .name = "omap3evm", ++ .dai_link = &omap3evm_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device omap3evm_snd_devdata = { ++ .machine = &snd_soc_machine_omap3evm, ++ .platform = &omap_soc_platform, ++ .codec_dev = &soc_codec_dev_twl4030, ++}; ++ ++static struct platform_device *omap3evm_snd_device; ++ ++static int __init omap3evm_soc_init(void) ++{ ++ int ret; ++ ++ if (!machine_is_omap3evm()) { ++ pr_debug("Not OMAP3 EVM!\n"); ++ return -ENODEV; ++ } ++ pr_info("OMAP3 EVM SoC init\n"); ++ ++ omap3evm_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!omap3evm_snd_device) { ++ printk(KERN_ERR "Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(omap3evm_snd_device, &omap3evm_snd_devdata); ++ omap3evm_snd_devdata.dev = &omap3evm_snd_device->dev; ++ *(unsigned int *)omap3evm_dai.cpu_dai->private_data = 1; /* McBSP2 */ ++ ++ ret = platform_device_add(omap3evm_snd_device); ++ if (ret) ++ goto err1; ++ ++ return 0; ++ ++err1: ++ printk(KERN_ERR "Unable to add platform device\n"); ++ platform_device_put(omap3evm_snd_device); ++ ++ return ret; ++} ++ ++static void __exit omap3evm_soc_exit(void) ++{ ++ platform_device_unregister(omap3evm_snd_device); ++} ++ ++module_init(omap3evm_soc_init); ++module_exit(omap3evm_soc_exit); ++ ++MODULE_AUTHOR("Anuj Aggarwal "); ++MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); ++MODULE_LICENSE("GPL"); +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch b/recipes/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch new file mode 100644 index 0000000000..d590f8ffb9 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/0001-This-merges-Steve-Kipisz-USB-EHCI-support.-He-star.patch @@ -0,0 +1,146 @@ +From f8f10f496bce396416d7156da876222c6ce8c341 Mon Sep 17 00:00:00 2001 +From: Steven Kipisz +Date: Wed, 9 Jan 2009 12:01:11 -0600 +Subject: [PATCH-USB] Omap3 beagleboard: add support for EHCI in revision C1 boards + +Signed-off-by: Jason Kridner +--- + arch/arm/mach-omap2/board-omap3beagle.c | 10 +--------- + arch/arm/mach-omap2/usb-ehci.c | 4 +--- + drivers/usb/host/ehci-omap.c | 26 ++++++++++++++++++++++++++ + 3 files changed, 28 insertions(+), 12 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index fe97bab..de81153 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -140,15 +140,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + * power switch and overcurrent detect + */ + +- gpio_request(gpio + 1, "EHCI_nOC"); +- gpio_direction_input(gpio + 1); +- +- /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ +- gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); +- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); +- +- /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ +- gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; ++ /* TODO: This needs to be modified to not rely on u-boot */ + + return 0; + } +diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c +index 489439d..2c6305b 100644 +--- a/arch/arm/mach-omap2/usb-ehci.c ++++ b/arch/arm/mach-omap2/usb-ehci