From 0ca0394c94028b941603b2d6f7264d3eaaed5a98 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 28 Feb 2010 21:07:28 +0000 Subject: firefox_3.6.bb : add new version, convert to new staging --- .../0001-Remove-Werror-from-build.patch | 43 +++++++++++++ ...ecurity-cross-compile-cpu-detection-error.patch | 42 +++++++++++++ .../firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff | 56 +++++++++++++++++ .../firefox-3.6/Bug339782.additional.fix.diff | 39 ++++++++++++ .../firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff | 33 ++++++++++ .../mozilla/firefox-3.6/Bug405992.atomic.nspr.diff | 48 +++++++++++++++ recipes/mozilla/firefox-3.6/configure-wchart.patch | 11 ++++ recipes/mozilla/firefox-3.6/jemalloc-tls.patch | 28 +++++++++ recipes/mozilla/firefox-3.6/linkage-problem.patch | 14 +++++ recipes/mozilla/firefox-3.6/mozconfig | 72 ++++++++++++++++++++++ recipes/mozilla/firefox-3.6/plugins-dir.patch | 16 +++++ recipes/mozilla/firefox-3.6/security-cross.patch | 64 +++++++++++++++++++ recipes/mozilla/firefox_3.6.bb | 38 ++++++++++++ 13 files changed, 504 insertions(+) create mode 100644 recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch create mode 100644 recipes/mozilla/firefox-3.6/0002-Fix-security-cross-compile-cpu-detection-error.patch create mode 100644 recipes/mozilla/firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff create mode 100644 recipes/mozilla/firefox-3.6/Bug339782.additional.fix.diff create mode 100644 recipes/mozilla/firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff create mode 100644 recipes/mozilla/firefox-3.6/Bug405992.atomic.nspr.diff create mode 100644 recipes/mozilla/firefox-3.6/configure-wchart.patch create mode 100644 recipes/mozilla/firefox-3.6/jemalloc-tls.patch create mode 100644 recipes/mozilla/firefox-3.6/linkage-problem.patch create mode 100644 recipes/mozilla/firefox-3.6/mozconfig create mode 100644 recipes/mozilla/firefox-3.6/plugins-dir.patch create mode 100644 recipes/mozilla/firefox-3.6/security-cross.patch create mode 100644 recipes/mozilla/firefox_3.6.bb diff --git a/recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch b/recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch new file mode 100644 index 0000000000..008dabbe8d --- /dev/null +++ b/recipes/mozilla/firefox-3.6/0001-Remove-Werror-from-build.patch @@ -0,0 +1,43 @@ +From 48a378ae647cbd6f8466bd0e8dbb04400bb175a8 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin +Date: Thu, 24 Jul 2008 16:05:09 -0400 +Subject: [PATCH 1/1] Remove -Werror from build + +Remove -Werror from build + +Signed-off-by: Eduardo Valentin +--- + configure | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +Index: mozilla-1.9.1/configure +=================================================================== +--- mozilla-1.9.1.orig/configure ++++ mozilla-1.9.1/configure +@@ -5525,7 +5525,7 @@ if test "$GNU_CC"; then + # Don't allow undefined symbols in libraries + DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + DSO_CFLAGS='' + DSO_PIC_CFLAGS='-fPIC' + ASFLAGS="$ASFLAGS -fPIC" +@@ -7104,7 +7104,7 @@ EOF + IMPLIB='emximp -o' + FILTER='emxexp -o' + LDFLAGS='-Zmap' +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_DEBUG_FLAGS="-g -fno-inline" + MOZ_OPTIMIZE_FLAGS="-O2" + MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA" +@@ -7283,7 +7283,7 @@ else + fi + rm -f conftest* + fi +- WARNINGS_AS_ERRORS='-Werror' ++ WARNINGS_AS_ERRORS='' + MOZ_OPTIMIZE_FLAGS="-xO4" + MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@' + MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@' diff --git a/recipes/mozilla/firefox-3.6/0002-Fix-security-cross-compile-cpu-detection-error.patch b/recipes/mozilla/firefox-3.6/0002-Fix-security-cross-compile-cpu-detection-error.patch new file mode 100644 index 0000000000..ce8d4d9948 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/0002-Fix-security-cross-compile-cpu-detection-error.patch @@ -0,0 +1,42 @@ +From 599b26141d493ff19633796ce5e19b00315d3821 Mon Sep 17 00:00:00 2001 +From: Eduardo Valentin +Date: Fri, 25 Jul 2008 11:20:02 -0400 +Subject: [PATCH 1/1] Fix security cross compile cpu detection error + +Fix security cross compile cpu detection error. +Reference to bug 376279. + +Signed-off-by: Eduardo Valentin +--- + security/coreconf/arch.mk | 2 ++ + security/manager/Makefile.in | 1 + + 2 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk +index fba38ff..28da32e 100644 +--- a/security/coreconf/arch.mk ++++ b/security/coreconf/arch.mk +@@ -66,7 +66,9 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + ++ifndef OE_TEST + OS_TEST := $(shell uname -m) ++endif + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in +index 86119f7..86c09ca 100644 +--- a/security/manager/Makefile.in ++++ b/security/manager/Makefile.in +@@ -240,6 +240,7 @@ DEFAULT_GMAKE_FLAGS += \ + RC="$(RC) $(RCFLAGS)" \ + OS_ARCH="$(OS_ARCH)" \ + CPU_ARCH="$(TARGET_CPU)" \ ++ OS_TEST="$(TARGET_CPU)" \ + $(NULL) + SKIP_CHK=1 + endif +-- +1.5.4.3 diff --git a/recipes/mozilla/firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff b/recipes/mozilla/firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff new file mode 100644 index 0000000000..854100c4c3 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/010_FPU_IS_ARM_FPA_xslt.diff @@ -0,0 +1,56 @@ +# Bug 369722 – prdtoa.c jsnum.h txDouble.h not required IEEE_ARM define on Codesourcery EABI gcc3.4.4 compiler +# +--- mozilla/content/xslt/public/txDouble.h.orig 2006-07-13 17:21:52.000000000 +0300 ++++ mozilla/content/xslt/public/txDouble.h 2007-10-25 15:01:25.000000000 +0300 +@@ -58,46 +58,48 @@ fp_except_t oldmask = fpsetmask(~allmask + /** + * Stefan Hanske reports: + * ARM is a little endian architecture but 64 bit double words are stored + * differently: the 32 bit words are in little endian byte order, the two words + * are stored in big endian`s way. + */ + + #if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__) +-#define CPU_IS_ARM ++#if !defined(__VFP_FP__) ++#define FPU_IS_ARM_FPA ++#endif + #endif + + #if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2 + /** + * This version of the macros is safe for the alias optimizations + * that gcc does, but uses gcc-specific extensions. + */ + + typedef union txdpun { + PRFloat64 d; + struct { +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + PRUint32 lo, hi; + #else + PRUint32 hi, lo; + #endif + } s; + } txdpun; + + #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; })) + #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; })) + + #else // __GNUC__ + + /* We don't know of any non-gcc compilers that perform alias optimization, + * so this code should work. + */ + +-#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM) ++#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA) + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[1]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[0]) + #else + #define TX_DOUBLE_HI32(x) (((PRUint32 *)&(x))[0]) + #define TX_DOUBLE_LO32(x) (((PRUint32 *)&(x))[1]) + #endif + + #endif // __GNUC__ diff --git a/recipes/mozilla/firefox-3.6/Bug339782.additional.fix.diff b/recipes/mozilla/firefox-3.6/Bug339782.additional.fix.diff new file mode 100644 index 0000000000..0848e730d3 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/Bug339782.additional.fix.diff @@ -0,0 +1,39 @@ +# XPTC_InvokeByIndex crashes +# Bug 339782 [ARM] XPTC_InvokeByIndex crashes when cross-compiled under GCC 3.4.x with EABI (CodeSourcery) +Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +=================================================================== +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -51,22 +51,32 @@ + #ifdef __ARM_EABI__ + #define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) + #define VAR_STACK_SIZE_64 3 + #else + #define DOUBLEWORD_ALIGN(p) (p) + #define VAR_STACK_SIZE_64 2 + #endif + ++#ifdef __ARM_EABI__ ++#define DOUBLEWORD_ALIGN(p) ((PRUint32 *)((((PRUint32)(p)) + 7) & 0xfffffff8)) ++#else ++#define DOUBLEWORD_ALIGN(p) (p) ++#endif ++ + // Remember that these 'words' are 32bit DWORDS + + static PRUint32 + invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) + { + PRUint32 result = 0; ++ ++ /* Note that we give a "worst case" estimate of how much stack _might_ be ++ * needed, rather than the real count - this should be safe */ ++ + for(PRUint32 i = 0; i < paramCount; i++, s++) + { + if(s->IsPtrData()) + { + result++; + continue; + } + switch(s->type) diff --git a/recipes/mozilla/firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff b/recipes/mozilla/firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff new file mode 100644 index 0000000000..486440c30e --- /dev/null +++ b/recipes/mozilla/firefox-3.6/Bug385583.nspr.jmp_buf.eabi.diff @@ -0,0 +1,33 @@ +diff -up mozilla/nsprpub/pr/include/md/_linux.h.orig mozilla/nsprpub/pr/include/md/_linux.h +--- mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-11-28 14:16:03.000000000 -0500 ++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-11-28 14:12:09.000000000 -0500 +@@ -346,8 +346,8 @@ extern void _MD_CleanupBeforeExit(void); + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) +-/* ARM/Linux */ ++#elif defined(__arm__) && !defined(__ARM_EABI__) ++/* ARM/Linux (old-ABI) */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] + #define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[19] = (val)) +@@ -358,6 +358,18 @@ extern void _MD_CleanupBeforeExit(void); + #error "ARM/Linux pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + ++#elif defined(__arm__) && defined(__ARM_EABI__) ++/* ARM/Linux (EABI) */ ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] ++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) ++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) ++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) ++#define _MD_SP_TYPE __ptr_t ++#else ++#error "ARM/Linux pre-glibc2 not supported yet" ++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ ++ + #else + + #error "Unknown CPU architecture" diff --git a/recipes/mozilla/firefox-3.6/Bug405992.atomic.nspr.diff b/recipes/mozilla/firefox-3.6/Bug405992.atomic.nspr.diff new file mode 100644 index 0000000000..f54f916a6a --- /dev/null +++ b/recipes/mozilla/firefox-3.6/Bug405992.atomic.nspr.diff @@ -0,0 +1,48 @@ +# Add atomic operations for ARM. +diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h +index 5b794c5..cb8d58e 100644 +--- a/nsprpub/pr/include/md/_linux.h ++++ b/nsprpub/pr/include/md/_linux.h +@@ -194,6 +194,42 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); + }) + #endif + ++#if defined(__arm__) ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++ ++typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); ++#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *)0xffff0fc0) ++ ++#define _MD_ATOMIC_INCREMENT(ptr) _MD_ATOMIC_ADD(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) _MD_ATOMIC_ADD(ptr, -1) ++#define _MD_ATOMIC_ADD(ptr, n) \ ++ ({ \ ++ PRInt32 ov, nv; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ nv = ov + (n); \ ++ } \ ++ while (__kernel_cmpxchg(ov, nv, vp)); \ ++ \ ++ nv; \ ++ }) ++#define _MD_ATOMIC_SET(ptr, nv) \ ++ ({ \ ++ PRInt32 ov; \ ++ volatile PRInt32 *vp = (ptr); \ ++ \ ++ do { \ ++ ov = *vp; \ ++ } \ ++ while (__kernel_cmpxchg(ov, (nv), vp)); \ ++ \ ++ ov; \ ++ }) ++#endif ++ + #define USE_SETJMP + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _PR_POLL_AVAILABLE diff --git a/recipes/mozilla/firefox-3.6/configure-wchart.patch b/recipes/mozilla/firefox-3.6/configure-wchart.patch new file mode 100644 index 0000000000..36ee2a0ba4 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/configure-wchart.patch @@ -0,0 +1,11 @@ +--- a/configure.in 2008-04-15 12:56:35.000000000 +0300 ++++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200 +@@ -2743,7 +2743,7 @@ + + AC_CACHE_CHECK(for compiler -fshort-wchar option, + ac_cv_have_usable_wchar_option_v2, +- [AC_TRY_LINK([#include ++ [AC_TRY_COMPILE([#include + $configure_static_assert_macros], + [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); + CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)], diff --git a/recipes/mozilla/firefox-3.6/jemalloc-tls.patch b/recipes/mozilla/firefox-3.6/jemalloc-tls.patch new file mode 100644 index 0000000000..d1d740989e --- /dev/null +++ b/recipes/mozilla/firefox-3.6/jemalloc-tls.patch @@ -0,0 +1,28 @@ +--- /tmp/jemalloc.c 2008-06-23 10:57:36.000000000 +0200 ++++ mozilla/memory/jemalloc/jemalloc.c 2008-06-23 11:20:13.000000000 +0200 +@@ -386,7 +386,7 @@ + #else + # define NO_TLS + #endif +-#if 0 ++ + #ifdef __i386__ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 +@@ -420,7 +420,6 @@ + # define QUANTUM_2POW_MIN 4 + # define SIZEOF_PTR_2POW 2 + #endif +-#endif + + #define SIZEOF_PTR (1U << SIZEOF_PTR_2POW) + +@@ -2582,7 +2581,7 @@ + * knowledge of how _pthread_self() calculates values, we can't + * easily do much better than this. + */ +- ind = (unsigned long) _pthread_self() % narenas; ++ ind = 255255 % narenas; + + /* + * Optimistially assume that arenas[ind] has been initialized. diff --git a/recipes/mozilla/firefox-3.6/linkage-problem.patch b/recipes/mozilla/firefox-3.6/linkage-problem.patch new file mode 100644 index 0000000000..28bffd1e22 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/linkage-problem.patch @@ -0,0 +1,14 @@ +--- mozilla/layout/build/Makefile.in~ 2007-11-24 00:38:14.000000000 -0200 ++++ mozilla/layout/build/Makefile.in 2007-11-24 00:38:14.000000000 -0200 +@@ -229,6 +229,11 @@ + $(NULL) + endif + ++ifdef MOZ_ENABLE_XFT ++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \ ++ $(NULL) ++endif ++ + ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO)) + EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) diff --git a/recipes/mozilla/firefox-3.6/mozconfig b/recipes/mozilla/firefox-3.6/mozconfig new file mode 100644 index 0000000000..b561f067b8 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/mozconfig @@ -0,0 +1,72 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +#ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-bz2 +#ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --enable-necko-disk-cache +ac_add_options --disable-updater + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --enable-debugger-info-modules + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource + +# build minimal set of image decoders +#ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O2 + +# Use cairo from system +ac_add_options --enable-system-cairo + +# Disable jemalloc +ac_add_options --disable-jemalloc + +# enable libxul +ac_add_options --enable-libxul + +# Disable striping +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/recipes/mozilla/firefox-3.6/plugins-dir.patch b/recipes/mozilla/firefox-3.6/plugins-dir.patch new file mode 100644 index 0000000000..2c8b8e9bd1 --- /dev/null +++ b/recipes/mozilla/firefox-3.6/plugins-dir.patch @@ -0,0 +1,16 @@ +Index: mozilla-1.9.1/build/unix/mozilla.in +=================================================================== +--- mozilla-1.9.1.orig/build/unix/mozilla.in ++++ mozilla-1.9.1/build/unix/mozilla.in +@@ -52,6 +52,11 @@ + + moz_libdir=%MOZAPPDIR% + ++if test -d /usr/lib/mozilla/plugins; then ++ MOZ_PLUGIN_PATH="${MOZ_PLUGIN_PATH:+"$MOZ_PLUGIN_PATH:"}/usr/lib/mozilla/plugins" ++ export MOZ_PLUGIN_PATH ++fi ++ + # Use run-mozilla.sh in the current dir if it exists + # If not, then start resolving symlinks until we find run-mozilla.sh + found=0 diff --git a/recipes/mozilla/firefox-3.6/security-cross.patch b/recipes/mozilla/firefox-3.6/security-cross.patch new file mode 100644 index 0000000000..b6c32fe52f --- /dev/null +++ b/recipes/mozilla/firefox-3.6/security-cross.patch @@ -0,0 +1,64 @@ +--- /tmp/Linux.mk 2009-11-02 10:26:16.000000000 +0100 ++++ mozilla-1.9.1/security/coreconf/Linux.mk 2009-11-02 10:27:04.000000000 +0100 +@@ -52,59 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq (,$(filter-out parisc%,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq (,$(filter-out i%86,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-else +-ifeq ($(OS_TEST),sh4a) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sh4 +-else +-# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = $(OS_TEST) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb new file mode 100644 index 0000000000..aa01521de8 --- /dev/null +++ b/recipes/mozilla/firefox_3.6.bb @@ -0,0 +1,38 @@ +DEPENDS += "cairo sqlite3" + +PR = "r0" + +SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ + file://jsautocfg.h \ + file://security-cross.patch;patch=1 \ + file://Bug339782.additional.fix.diff;patch=1 \ + file://Bug385583.nspr.jmp_buf.eabi.diff;patch=1 \ + file://Bug405992.atomic.nspr.diff;patch=1 \ + file://jemalloc-tls.patch;patch=1 \ + file://0001-Remove-Werror-from-build.patch;patch=1 \ + file://0002-Fix-security-cross-compile-cpu-detection-error.patch;patch=1 \ + file://plugins-dir.patch;patch=1 \ + file://firefox-plugin.pc \ + file://firefox-xpcom.pc \ + file://nspr.pc \ +" + +SRC_URI[archive.md5sum] = "458051557ff49e6a352c1d56eee5782a" +SRC_URI[archive.sha256sum] = "8d4f12fff7bc361d83e6b486f9ec4264c60114ed86c805e1221b3d30efec0a4b" + +S = "${WORKDIR}/mozilla-1.9.2" + +inherit mozilla +require firefox.inc + +EXTRA_OECONF += " --enable-official-branding --disable-crashreporter" + + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + -- cgit v1.2.3 From 949238317e2c0cf151ad437683f692da13a0954b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 28 Feb 2010 22:22:59 +0100 Subject: linux-kirkwood: changed openrd-client defconfig to also build ppp modules as requested on the openrd mailing list Signed-off-by: Frans Meulenbroeks --- conf/machine/include/kirkwood.inc | 2 +- .../linux/linux-kirkwood/openrd-client/defconfig | 34 +++++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc index d43cb36e23..632540345b 100644 --- a/conf/machine/include/kirkwood.inc +++ b/conf/machine/include/kirkwood.inc @@ -11,7 +11,7 @@ USE_DEVFS = "0" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood" -MACHINE_KERNEL_PR = "r17" +MACHINE_KERNEL_PR = "r18" IMAGE_FSTYPES += "tar.gz ubi" SERIAL_CONSOLE = "ttyS0 115200" diff --git a/recipes/linux/linux-kirkwood/openrd-client/defconfig b/recipes/linux/linux-kirkwood/openrd-client/defconfig index 59ed843d21..661408b962 100644 --- a/recipes/linux/linux-kirkwood/openrd-client/defconfig +++ b/recipes/linux/linux-kirkwood/openrd-client/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.33-rc1 -# Sat Jan 9 15:57:17 2010 +# Sun Feb 28 20:26:16 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -701,8 +701,9 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel" # # Generic Driver Options # -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_DEVTMPFS is not set +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -856,7 +857,8 @@ CONFIG_MISC_DEVICES=y # CONFIG_AD525X_DPOT is not set # CONFIG_PHANTOM is not set # CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set +CONFIG_TIFM_CORE=y +CONFIG_TIFM_7XX1=y # CONFIG_ICS932S401 is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HP_ILO is not set @@ -1234,9 +1236,22 @@ CONFIG_USB_NET_INT51X1=m # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -# CONFIG_NET_FC is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOL2TP=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +CONFIG_SLIP_MODE_SLIP6=y +CONFIG_NET_FC=y CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETPOLL=y @@ -2255,6 +2270,8 @@ CONFIG_SDIO_UART=y # MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI=y +# CONFIG_MMC_SDHCI_PCI is not set +# CONFIG_MMC_SDHCI_PLTFM is not set # CONFIG_MMC_AT91 is not set # CONFIG_MMC_ATMELMCI is not set CONFIG_MMC_TIFM_SD=y @@ -2418,6 +2435,7 @@ CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m +CONFIG_GENERIC_ACL=y # # Caches @@ -2453,7 +2471,7 @@ CONFIG_PROC_SYSCTL=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set +CONFIG_TMPFS_POSIX_ACL=y # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=m CONFIG_MISC_FILESYSTEMS=y -- cgit v1.2.3 From a8313b6b63c02b6d2171af9b2e4417fc739dacd2 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 28 Feb 2010 22:27:50 +0100 Subject: tasks/task-nas-server: commented out task-nas-server-openmoko commented out task-nas-server-openmoko this one uses dfu-util, but for most distro's dfu-util does not build root cause of dfu-util not building is in the expansion of virtual/libusb0 which for most distro's links to libusb-compat and dfu-util does not build with it. commenting out task-nas-server-openmoko is a temp fix to at least get the image building Signed-off-by: Frans Meulenbroeks --- recipes/tasks/task-nas-server.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/tasks/task-nas-server.bb b/recipes/tasks/task-nas-server.bb index 6924ff5388..fe12347fb6 100644 --- a/recipes/tasks/task-nas-server.bb +++ b/recipes/tasks/task-nas-server.bb @@ -15,7 +15,7 @@ NAS_SERVER_PACKAGES = "\ task-nas-server-samba \ task-nas-server-dnsmasq \ task-nas-server-iptables \ - task-nas-server-openmoko \ +# task-nas-server-openmoko \ task-nas-server-tzdata \ task-nas-server-nfs \ task-nas-server-vfat \ -- cgit v1.2.3 From 09a79a497f9c362bf899a8be2295178c3ed18836 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 1 Mar 2010 08:11:08 +0100 Subject: opkg: don't run merger in case when /usr/lib/ipkg is link * if there is link /usr/lib/ipkg -> /usr/lib/opkg, then merger will create backups of "both" alternatives directories, but they will be both the same /usr/lib/opkg/alternatives, then it will try to merge with output that every file is the same, sofar no real harm. * Problem is after successfull merge, when it removes /usr/lib/ipkg/alternatives which is in this case the right alternatives in opkg :/ * If you've already this problem on your target then * # Restore old alternatives * rm -rf /usr/lib/opkg/alternatives * cp -ra /usr/lib/opkg/alternatives-backup /usr/lib/opkg/alternatives * * # Regenerate links with right alternatives available * opkg install -force-reinstall busybox Signed-off-by: Martin Jansa --- recipes/opkg/opkg.inc | 2 +- recipes/opkg/update-alternatives-merge.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index 20f415e3de..b317de4cc3 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCPV}" -INC_PR = "r19" +INC_PR = "r20" FILESPATHPKG =. "opkg:" diff --git a/recipes/opkg/update-alternatives-merge.inc b/recipes/opkg/update-alternatives-merge.inc index a07275d038..f129fdbe84 100644 --- a/recipes/opkg/update-alternatives-merge.inc +++ b/recipes/opkg/update-alternatives-merge.inc @@ -4,7 +4,8 @@ pkg_postinst_${PN}_append () { alternatives_dir_old="${prefix}/lib/ipkg/alternatives" alternatives_dir_new="${prefix}/lib/opkg/alternatives" - if [ -e "${alternatives_dir_old}" ] ; then + # if ${prefix}/lib/ipkg is already link (probably to ${prefix}/lib/opkg), then nothing needs to be merged and definitely we don't want "rm -rf ${alternatives_dir_old}" to happen + if [ ! -h ${prefix}/lib/ipkg -a -e "${alternatives_dir_old}" ] ; then if [ ! -e "${alternatives_dir_new}" ] ; then mkdir -p "${alternatives_dir_new}"; fi -- cgit v1.2.3 From 5a3429c62d78ab1afd847abcba303768a072f495 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Mar 2010 10:57:32 +0100 Subject: firefox 3.6: bump PR for package.bbclass strip problem --- recipes/mozilla/firefox_3.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mozilla/firefox_3.6.bb b/recipes/mozilla/firefox_3.6.bb index aa01521de8..82e92be128 100644 --- a/recipes/mozilla/firefox_3.6.bb +++ b/recipes/mozilla/firefox_3.6.bb @@ -1,6 +1,6 @@ DEPENDS += "cairo sqlite3" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ file://jsautocfg.h \ -- cgit v1.2.3 From 39e7c169d8ea3f87ffda52fda78a30e47e8e11a2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Mar 2010 10:58:41 +0100 Subject: qt4: bump PR for package.bbclass strip problem --- recipes/qt4/qt4-embedded.inc | 2 +- recipes/qt4/qt4-x11-free-gles/linux.conf | 1 - recipes/qt4/qt4-x11-free-gles_4.6.2.bb | 2 +- recipes/qt4/qt4-x11-free.inc | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index e8184e772d..0ffd2fa629 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r15" +INC_PR = "r16" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf index b5741574b8..b825e5dc16 100644 --- a/recipes/qt4/qt4-x11-free-gles/linux.conf +++ b/recipes/qt4/qt4-x11-free-gles/linux.conf @@ -25,7 +25,6 @@ QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um QMAKE_LIBS_OPENGL_QT = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um -QMAKE_LIBS_OPENVG = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um -lOpenVG -lOpenVGU QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um QMAKE_LIBS_THREAD = -lpthread diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb index 8f2adf4b87..669cbf651e 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb @@ -1,5 +1,5 @@ require qt4-x11-free.inc -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" QT_GLFLAGS = "-opengl es2 -no-openvg" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index dffe3a0d17..8879c90baf 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ -- cgit v1.2.3 From 5f52f56fd8f630b331389e07d084bab63fe0e3aa Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 1 Mar 2010 10:49:06 +0000 Subject: attr_2.4.44.bb : uclibc needs a -lintl to compile --- recipes/udev/attr_2.4.44.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/udev/attr_2.4.44.bb b/recipes/udev/attr_2.4.44.bb index 7cb92179e7..a20568d5c1 100644 --- a/recipes/udev/attr_2.4.44.bb +++ b/recipes/udev/attr_2.4.44.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Commands for Manipulating Filesystem Extended Attributes" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/attr/attr-${PV}.src.tar.gz" @@ -9,6 +9,8 @@ inherit gettext autotools lib_package EXTRA_OECONF = " --enable-gettext=yes ac_cv_path_XGETTEXT=${STAGING_BINDIR_NATIVE}/xgettext" +LDFLAGS_append_libc-uclibc += " -lintl" + do_configure_append() { # gettext hack echo "#define _(str) str" >> ${S}/include/config.h -- cgit v1.2.3 From 7dccaf76a7eff758b8a05cbf8c816f87aaf3e5b0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 1 Mar 2010 12:00:23 +0100 Subject: elementary-theme-gry: bump SRCREV --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d7677e54fc..385dd28cdb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -56,7 +56,7 @@ SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-ebrainy ?= "21" SRCREV_pn-eds-dbus ?= "736" -SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" +SRCREV_pn-elementary-theme-gry ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" SRCREV_pn-elf2flt ?= "1786" -- cgit v1.2.3 From b6faf3681a61ede4d806ce0465f953d600e388e8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2010 12:36:31 +0100 Subject: autoconf: merged Poky changes (BBEXTENDCLASS + new staging) Signed-off-by: Marcin Juszkiewicz --- recipes/automake/automake-native.inc | 11 ----------- recipes/automake/automake-native_1.10.2.bb | 3 --- recipes/automake/automake-native_1.11.1.bb | 5 ----- recipes/automake/automake-native_1.9.6.bb | 3 --- recipes/automake/automake.inc | 6 +++++- 5 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 recipes/automake/automake-native.inc delete mode 100644 recipes/automake/automake-native_1.10.2.bb delete mode 100644 recipes/automake/automake-native_1.11.1.bb delete mode 100644 recipes/automake/automake-native_1.9.6.bb diff --git a/recipes/automake/automake-native.inc b/recipes/automake/automake-native.inc deleted file mode 100644 index 4e2ac41d81..0000000000 --- a/recipes/automake/automake-native.inc +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "devel" -require automake_${PV}.bb -DEPENDS += "autoconf-native" -RDEPENDS_automake-native += "autoconf-native perl-native-runtime" - -inherit native - -do_stage () { - oe_runmake install - install -d ${datadir}/aclocal -} diff --git a/recipes/automake/automake-native_1.10.2.bb b/recipes/automake/automake-native_1.10.2.bb deleted file mode 100644 index 92c861f49c..0000000000 --- a/recipes/automake/automake-native_1.10.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -PV := "${PV}" - -require automake-native.inc diff --git a/recipes/automake/automake-native_1.11.1.bb b/recipes/automake/automake-native_1.11.1.bb deleted file mode 100644 index a7857c562d..0000000000 --- a/recipes/automake/automake-native_1.11.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -PV := "${PV}" - -require automake-native.inc - -DEFAULT_PREFERENCE = "-1" diff --git a/recipes/automake/automake-native_1.9.6.bb b/recipes/automake/automake-native_1.9.6.bb deleted file mode 100644 index 92c861f49c..0000000000 --- a/recipes/automake/automake-native_1.9.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -PV := "${PV}" - -require automake-native.inc diff --git a/recipes/automake/automake.inc b/recipes/automake/automake.inc index 74957cc9e9..662f9f8722 100644 --- a/recipes/automake/automake.inc +++ b/recipes/automake/automake.inc @@ -2,6 +2,8 @@ DESCRIPTION = "A tool for automatically generating Makefiles." LICENSE = "GPL" HOMEPAGE = "http://www.gnu.org/software/automake/" SECTION = "devel" +DEPENDS_virtclass-native = "autoconf-native" +RDEPENDS_automake-native = "autoconf-native perl-native-runtime" RDEPENDS_automake += "\ autoconf \ perl \ @@ -27,7 +29,7 @@ RDEPENDS_automake += "\ perl-module-text-parsewords \ perl-module-vars " SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2" -INC_PR = "r2" +INC_PR = "r3" AUTOMAKE_API = "${@".".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" inherit autotools @@ -47,3 +49,5 @@ do_install_append () { ln -sf automake-${AUTOMAKE_API} ${D}${bindir}/automake install -d ${D}${datadir}/aclocal } + +BBCLASSEXTEND = "native" -- cgit v1.2.3 From 15ab483e62f05c84237b2a92d2a5009d99143113 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2010 13:52:15 +0100 Subject: autoconf: merged Poky changes (BBEXTENDCLASS + new staging) Signed-off-by: Marcin Juszkiewicz --- recipes/autoconf/autoconf-native_2.59.bb | 11 ----------- recipes/autoconf/autoconf-native_2.61.bb | 12 ------------ recipes/autoconf/autoconf-native_2.63.bb | 12 ------------ recipes/autoconf/autoconf.inc | 8 +++++++- recipes/autoconf/autoconf_2.61.bb | 4 ++-- recipes/autoconf/autoconf_2.63.bb | 4 ++-- 6 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 recipes/autoconf/autoconf-native_2.59.bb delete mode 100644 recipes/autoconf/autoconf-native_2.61.bb delete mode 100644 recipes/autoconf/autoconf-native_2.63.bb diff --git a/recipes/autoconf/autoconf-native_2.59.bb b/recipes/autoconf/autoconf-native_2.59.bb deleted file mode 100644 index a2b9dfa2d0..0000000000 --- a/recipes/autoconf/autoconf-native_2.59.bb +++ /dev/null @@ -1,11 +0,0 @@ -require autoconf_${PV}.bb - -PR = "${INC_PR}.0" - -DEPENDS = "m4-native gnu-config-native" -RDEPENDS_${PN} = "m4-native gnu-config-native" - -S = "${WORKDIR}/autoconf-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" - -inherit native diff --git a/recipes/autoconf/autoconf-native_2.61.bb b/recipes/autoconf/autoconf-native_2.61.bb deleted file mode 100644 index b7480cdc11..0000000000 --- a/recipes/autoconf/autoconf-native_2.61.bb +++ /dev/null @@ -1,12 +0,0 @@ -require autoconf_${PV}.bb -PR = "${INC_PR}.0" - -DEPENDS = "m4-native gnu-config-native" -RDEPENDS_${PN} = "m4-native gnu-config-native" - -SRC_URI += "file://fix_path_xtra.patch;patch=1" - -S = "${WORKDIR}/autoconf-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" - -inherit native diff --git a/recipes/autoconf/autoconf-native_2.63.bb b/recipes/autoconf/autoconf-native_2.63.bb deleted file mode 100644 index b7480cdc11..0000000000 --- a/recipes/autoconf/autoconf-native_2.63.bb +++ /dev/null @@ -1,12 +0,0 @@ -require autoconf_${PV}.bb -PR = "${INC_PR}.0" - -DEPENDS = "m4-native gnu-config-native" -RDEPENDS_${PN} = "m4-native gnu-config-native" - -SRC_URI += "file://fix_path_xtra.patch;patch=1" - -S = "${WORKDIR}/autoconf-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" - -inherit native diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc index a561bf1e25..17602858cb 100644 --- a/recipes/autoconf/autoconf.inc +++ b/recipes/autoconf/autoconf.inc @@ -5,7 +5,10 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/" SECTION = "devel" DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 perl gnu-config" -INC_PR = "r8" +DEPENDS_virtclass-native = "m4-native gnu-config-native" +RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" + +INC_PR = "r9" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \ file://program_prefix.patch;patch=1" @@ -20,3 +23,6 @@ do_configure_prepend () { export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}" fi } + +PARALLEL_MAKE = "" +BBCLASSEXTEND = "native" diff --git a/recipes/autoconf/autoconf_2.61.bb b/recipes/autoconf/autoconf_2.61.bb index 53733a90f8..e104bad6d2 100644 --- a/recipes/autoconf/autoconf_2.61.bb +++ b/recipes/autoconf/autoconf_2.61.bb @@ -2,8 +2,6 @@ require autoconf.inc PR = "${INC_PR}.1" -PARALLEL_MAKE = "" - SRC_URI += "file://autoreconf-include.patch;patch=1 \ file://autoreconf-exclude.patch;patch=1 \ file://autoreconf-foreign.patch;patch=1 \ @@ -12,3 +10,5 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \ file://config-site.patch;patch=1 \ file://autoconf-dont-execute-perl.patch;patch=1 \ " + +SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb index e26c004f64..8c81aff658 100644 --- a/recipes/autoconf/autoconf_2.63.bb +++ b/recipes/autoconf/autoconf_2.63.bb @@ -4,10 +4,10 @@ PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" -PARALLEL_MAKE = "" - SRC_URI += "file://autoreconf-exclude.patch;patch=1 \ file://autoreconf-foreign.patch;patch=1 \ file://autoheader-nonfatal-warnings.patch;patch=1 \ file://autoreconf-gnuconfigize.patch;patch=1 \ file://config-site.patch;patch=1" + +SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" -- cgit v1.2.3 From d0d9ad50a4871f38945881f55158370c4a4d9f3f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2010 14:09:12 +0100 Subject: gnu-config: merge Poky improvements (BBCLASSEXTEND, new staging) Signed-off-by: Marcin Juszkiewicz --- recipes/gnu-config/gnu-config-native_20050701.bb | 16 ---------------- recipes/gnu-config/gnu-config_20050701.bb | 13 ++++++++++--- 2 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 recipes/gnu-config/gnu-config-native_20050701.bb diff --git a/recipes/gnu-config/gnu-config-native_20050701.bb b/recipes/gnu-config/gnu-config-native_20050701.bb deleted file mode 100644 index 43df124f7f..0000000000 --- a/recipes/gnu-config/gnu-config-native_20050701.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "base" -require gnu-config_${PV}.bb - -inherit native - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config" - -do_stage () { - install -d ${STAGING_DATADIR}/gnu-config/ - install -d ${STAGING_BINDIR}/ - cat ${WORKDIR}/gnu-configize.in | \ - sed -e 's,@gnu-configdir@,${STAGING_DATADIR}/gnu-config,' \ - -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize - chmod 755 ${STAGING_BINDIR}/gnu-configize - install -m 0644 config.guess config.sub ${STAGING_DATADIR}/gnu-config/ -} diff --git a/recipes/gnu-config/gnu-config_20050701.bb b/recipes/gnu-config/gnu-config_20050701.bb index 8ee0a32120..c6a75ac9c0 100644 --- a/recipes/gnu-config/gnu-config_20050701.bb +++ b/recipes/gnu-config/gnu-config_20050701.bb @@ -6,7 +6,7 @@ INHIBIT_DEFAULT_DEPS = "1" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.1+cvs${FIXEDSRCDATE}" -PR = "r5" +PR = "r6" SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ file://config-guess-uclibc.patch;patch=1 \ @@ -23,10 +23,17 @@ do_install () { ${D}${bindir} cat ${WORKDIR}/gnu-configize.in | \ sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ - -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' \ - -e 's,/usr/bin/perl,${bindir}/perl,g' > ${D}${bindir}/gnu-configize + -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize + # In the native case we want the system perl as perl-native can't have built yet + if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then + cat ${WORKDIR}/gnu-configize.in | \ + sed -e 's,/usr/bin/perl,${bindir}/perl,g' > ${D}${bindir}/gnu-configize + fi chmod 755 ${D}${bindir}/gnu-configize install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/ } FILES_${PN} = "${bindir} ${datadir}/gnu-config" + +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" -- cgit v1.2.3 From 5463fa1e85c7cf6a5a9e58551d9a12f261805ea2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2010 14:09:31 +0100 Subject: gnu-config: remove not used uclibc.patch Signed-off-by: Marcin Juszkiewicz --- recipes/gnu-config/gnu-config/uclibc.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 recipes/gnu-config/gnu-config/uclibc.patch diff --git a/recipes/gnu-config/gnu-config/uclibc.patch b/recipes/gnu-config/gnu-config/uclibc.patch deleted file mode 100644 index 20a3b11f2f..0000000000 --- a/recipes/gnu-config/gnu-config/uclibc.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- config.sub.orig 2004-05-14 19:38:36.000000000 -0500 -+++ config.sub 2004-05-14 19:39:17.000000000 -0500 -@@ -118,7 +118,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-uclibc* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1135,7 +1135,8 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ -- cgit v1.2.3 From 5a9223eab9a7ff2360a105ddfabeba63145b86f3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Mar 2010 15:19:17 +0100 Subject: exalt: convert to new style staging --- recipes/e17/exalt_svn.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb index d024d758e2..9dc3b03b59 100644 --- a/recipes/e17/exalt_svn.bb +++ b/recipes/e17/exalt_svn.bb @@ -25,9 +25,5 @@ do_install_append() { install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/ } -do_stage() { - autotools_stage_all -} - FILES_${PN} += "${datadir}/dbus-1" -- cgit v1.2.3 From b1543738589a29e1f6af430787c3218c6601aeb9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Mar 2010 15:22:15 +0100 Subject: e-wm: convert to new style staging --- recipes/e17/e-wm_svn.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index 7d68ff9d35..d74fbb546f 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r12" +PR = "r13" inherit e update-alternatives @@ -36,14 +36,6 @@ do_configure_prepend() { autopoint } -do_stage() { - autotools_stage_all - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done -} - do_install_append() { # customising - should rather make this simple upstream install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir} -- cgit v1.2.3 From 3b35dfffa89e90fe3042f7813b48e7c35010766e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 1 Mar 2010 14:55:38 +0000 Subject: angstrom-2008.1.conf : increment angstrom uclibc usage to the latest point rel. There were problems compiling later gnome/polkit/conkit stuff that this release fixes. To not deviate too far from glibc builds we need to update. --- conf/distro/angstrom-2008.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index c4562cba14..225e218a5a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -84,8 +84,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.31" #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.9" PREFERRED_VERSION_glibc-initial ?= "2.9" -PREFERRED_VERSION_uclibc ?= "0.9.30.1" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" +PREFERRED_VERSION_uclibc ?= "0.9.30.2" +PREFERRED_VERSION_uclibc-initial ?= "0.9.30.2" #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" -- cgit v1.2.3 From db935da155dd89d3d4638129d7fdcda0e955e01f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 1 Mar 2010 14:56:50 +0000 Subject: angstrom-2008-preferred-versions.inc : downgrade udev for uclibc udev 141 is known good on uclibc, I know there are patches to hack up 151 to work. But for now I would prefer to have a known good stable we can upgrade. --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 04e028e488..fe278925bd 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -47,6 +47,7 @@ PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "151" +PREFERRED_VERSION_udev_libc-uclibc = "141" UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.86" -- cgit v1.2.3 From 175f25a8e3032c515ee6f951115c349596b15cc0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 1 Mar 2010 08:10:00 +0100 Subject: linux-openmoko-2.6.32: simplified JBT6k74 driver as WSOD fix Signed-off-by: Martin Jansa --- .../0010-Simplify-the-JBT6k74-driver.patch | 667 +++++++++++++++++++++ ...-if-userspace-provides-a-pixel-clock-valu.patch | 79 +++ recipes/linux/linux-openmoko-2.6.32_git.bb | 4 +- 3 files changed, 749 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch create mode 100644 recipes/linux/linux-openmoko-2.6.32/0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch diff --git a/recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch b/recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch new file mode 100644 index 0000000000..ca0c2af15b --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0010-Simplify-the-JBT6k74-driver.patch @@ -0,0 +1,667 @@ +From cb84d543b9465a8ea48b504b1dfb745c6682a50e Mon Sep 17 00:00:00 2001 +From: Thomas White +Date: Sun, 28 Feb 2010 15:20:57 +0100 +Subject: [PATCH 1/2] Simplify the JBT6k74 driver + +Simplify the JBT6k74 driver + +We don't need all the native sleep states - they just complicate things. Instead, just +use the LDO "power switch" to send it firmly to sleep and wake it up in a virgin state +each time. + +Signed-off-by: Thomas White +--- + drivers/mfd/glamo/glamo-display.c | 116 ++++++++++++------------ + drivers/mfd/glamo/glamo-display.h | 2 + + drivers/mfd/glamo/glamo-drm-private.h | 10 ++ + drivers/mfd/glamo/glamo-kms-fb.c | 54 ++---------- + drivers/video/backlight/jbt6k74.c | 160 ++++++++------------------------- + include/linux/jbt6k74.h | 1 - + 6 files changed, 115 insertions(+), 228 deletions(-) + +diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c +index 34a665a..a384c8b 100644 +--- a/drivers/mfd/glamo/glamo-display.c ++++ b/drivers/mfd/glamo/glamo-display.c +@@ -239,14 +239,6 @@ static int glamo_run_lcd_script(struct glamodrm_handle *gdrm, + } + + +-extern void jbt6k74_action(int val); +- +-/* Power on/off */ +-static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) +-{ +-} +- +- + static bool glamo_crtc_mode_fixup(struct drm_crtc *crtc, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +@@ -275,6 +267,12 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, + gcrtc = to_glamo_crtc(crtc); + gdrm = gcrtc->gdrm; /* Here it is! */ + ++ if ( !gcrtc->pixel_clock_on ) { ++ printk(KERN_WARNING "[glamo-drm] Refusing to set base while " ++ "pixel clock is off.\n"); ++ return -EBUSY; ++ } ++ + gfb = to_glamo_framebuffer(crtc->fb); + obj = gfb->obj; + gobj = obj->driver_private; +@@ -306,6 +304,12 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc, + gcrtc = to_glamo_crtc(crtc); + gdrm = gcrtc->gdrm; /* Here it is! */ + ++ if ( !gcrtc->pixel_clock_on ) { ++ printk(KERN_WARNING "[glamo-drm] Refusing to set mode while " ++ "pixel clock is off.\n"); ++ return -EBUSY; ++ } ++ + glamo_lcd_cmd_mode(gdrm, 1); + + glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock); +@@ -354,10 +358,47 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc, + + glamo_crtc_mode_set_base(crtc, 0, 0, old_fb); + ++ gcrtc->current_mode = *mode; ++ gcrtc->current_mode_set = 1; ++ gcrtc->current_fb = old_fb; ++ + return 0; + } + + ++extern void jbt6k74_action(int val); ++ ++/* This is not the right place to switch power on/off, because the helper ++ * stuff ends up calling this before/after setting the mode. We can't ++ * set modes with the display off (although backlight off would be OK) */ ++static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) ++{ ++ /* do nothing */ ++} ++ ++ ++void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode) ++{ ++ struct drm_crtc *crtc = gdrm->crtc; ++ struct glamo_crtc *gcrtc = to_glamo_crtc(crtc); ++ ++ if ( mode ) { ++ glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD); ++ gcrtc->pixel_clock_on = 1; ++ jbt6k74_action(1); ++ if ( gcrtc->current_mode_set ) { ++ glamo_crtc_mode_set(crtc, &gcrtc->current_mode, ++ &gcrtc->current_mode, 0, 0, ++ gcrtc->current_fb); ++ } ++ } else { ++ jbt6k74_action(0); ++ glamo_engine_suspend(gdrm->glamo_core, GLAMO_ENGINE_LCD); ++ gcrtc->pixel_clock_on = 0; ++ } ++} ++ ++ + static void glamo_crtc_prepare(struct drm_crtc *crtc) + { + } +@@ -725,6 +766,8 @@ int glamo_display_init(struct drm_device *dev) + + sizeof(struct drm_connector *), GFP_KERNEL); + if (glamo_crtc == NULL) return 1; + glamo_crtc->gdrm = gdrm; ++ gdrm->crtc = (struct drm_crtc *)glamo_crtc; ++ glamo_crtc->pixel_clock_on = 1; + glamo_crtc->blank_mode = DRM_MODE_DPMS_OFF; + drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs); + drm_crtc_helper_add(&glamo_crtc->base, &glamo_crtc_helper_funcs); +@@ -808,62 +851,23 @@ int glamo_display_init(struct drm_device *dev) + + void glamo_display_suspend(struct glamodrm_handle *gdrm) + { +- gdrm->saved_width = reg_read_lcd(gdrm, GLAMO_REG_LCD_WIDTH); +- gdrm->saved_height = reg_read_lcd(gdrm, GLAMO_REG_LCD_HEIGHT); +- gdrm->saved_pitch = reg_read_lcd(gdrm, GLAMO_REG_LCD_PITCH); +- gdrm->saved_htotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL); +- gdrm->saved_hrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START); +- gdrm->saved_hrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END); +- gdrm->saved_hdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START); +- gdrm->saved_hdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END); +- gdrm->saved_vtotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL); +- gdrm->saved_vrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START); +- gdrm->saved_vrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END); +- gdrm->saved_vdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START); +- gdrm->saved_vdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END); ++ /* do nothing */ + } + + + void glamo_display_resume(struct glamodrm_handle *gdrm) + { ++ struct drm_crtc *crtc = gdrm->crtc; ++ struct glamo_crtc *gcrtc = to_glamo_crtc(crtc); ++ + glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD); + glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_LCD); + glamo_run_lcd_script(gdrm, lcd_init_script, + ARRAY_SIZE(lcd_init_script)); + +- /* Restore timings */ +- glamo_lcd_cmd_mode(gdrm, 1); +- glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, +- gdrm->saved_clock); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK, +- gdrm->saved_width); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, GLAMO_LCD_HEIGHT_MASK, +- gdrm->saved_height); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, GLAMO_LCD_PITCH_MASK, +- gdrm->saved_pitch); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL, +- GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_htotal); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START, +- GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_hrtrst); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END, +- GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_hrtren); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START, +- GLAMO_LCD_HV_RETR_DISP_START_MASK, +- gdrm->saved_hdspst); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END, +- GLAMO_LCD_HV_RETR_DISP_END_MASK, +- gdrm->saved_hdspen); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL, +- GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_vtotal); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START, +- GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END, +- GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START, +- GLAMO_LCD_HV_RETR_DISP_START_MASK, +- gdrm->saved_vdspst); +- reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END, +- GLAMO_LCD_HV_RETR_DISP_END_MASK, +- gdrm->saved_vdspen); +- glamo_lcd_cmd_mode(gdrm, 0); ++ if ( gcrtc->current_mode_set ) { ++ glamo_crtc_mode_set(crtc, &gcrtc->current_mode, ++ &gcrtc->current_mode, 0, 0, ++ gcrtc->current_fb); ++ } + } +diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h +index d6f21bc..728bba5 100644 +--- a/drivers/mfd/glamo/glamo-display.h ++++ b/drivers/mfd/glamo/glamo-display.h +@@ -36,4 +36,6 @@ extern int glamo_framebuffer_create(struct drm_device *dev, + extern void glamo_display_suspend(struct glamodrm_handle *gdrm); + extern void glamo_display_resume(struct glamodrm_handle *gdrm); + ++extern void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode); ++ + #endif /* __GLAMO_DISPLAY_H */ +diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h +index 7949a2e..4e24019 100644 +--- a/drivers/mfd/glamo/glamo-drm-private.h ++++ b/drivers/mfd/glamo/glamo-drm-private.h +@@ -106,6 +106,9 @@ struct glamodrm_handle { + + /* A scratch block */ + struct drm_mm_node *scratch; ++ ++ /* We only have one */ ++ struct drm_crtc *crtc; + }; + + +@@ -118,11 +121,18 @@ struct drm_glamo_gem_object { + + + struct glamo_crtc { ++ + struct drm_crtc base; + struct glamodrm_handle *gdrm; + /* a mode_set for fbdev users on this crtc */ + struct drm_mode_set mode_set; + int blank_mode; ++ ++ int pixel_clock_on; ++ ++ int current_mode_set; ++ struct drm_display_mode current_mode; ++ struct drm_framebuffer *current_fb; + }; + + +diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c +index 61cd605..57680ed 100644 +--- a/drivers/mfd/glamo/glamo-kms-fb.c ++++ b/drivers/mfd/glamo/glamo-kms-fb.c +@@ -253,64 +253,24 @@ static void glamofb_on(struct fb_info *info) + { + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; +- struct drm_crtc *crtc; +- struct drm_encoder *encoder; +- int i; ++ struct glamodrm_handle *gdrm = dev->dev_private; + +- /* +- * For each CRTC in this fb, find all associated encoders +- * and turn them off, then turn off the CRTC. +- */ +- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { +- struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; ++ printk(KERN_CRIT "Turning on display...\n"); + +- for (i = 0; i < par->crtc_count; i++) +- if (crtc->base.id == par->crtc_ids[i]) +- break; +- +- crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); ++ gdrm = dev->dev_private; + +- /* Found a CRTC on this fb, now find encoders */ +- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { +- if (encoder->crtc == crtc) { +- struct drm_encoder_helper_funcs *encoder_funcs; +- encoder_funcs = encoder->helper_private; +- encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); +- } +- } +- } ++ glamo_lcd_power(gdrm, 1); + } + + static void glamofb_off(struct fb_info *info, int dpms_mode) + { + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; +- struct drm_crtc *crtc; +- struct drm_encoder *encoder; +- int i; ++ struct glamodrm_handle *gdrm = dev->dev_private; + +- /* +- * For each CRTC in this fb, find all associated encoders +- * and turn them off, then turn off the CRTC. +- */ +- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { +- struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; +- +- for (i = 0; i < par->crtc_count; i++) +- if (crtc->base.id == par->crtc_ids[i]) +- break; ++ printk(KERN_CRIT "Turning off display...\n"); + +- /* Found a CRTC on this fb, now find encoders */ +- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { +- if (encoder->crtc == crtc) { +- struct drm_encoder_helper_funcs *encoder_funcs; +- encoder_funcs = encoder->helper_private; +- encoder_funcs->dpms(encoder, dpms_mode); +- } +- } +- if (dpms_mode == DRM_MODE_DPMS_OFF) +- crtc_funcs->dpms(crtc, dpms_mode); +- } ++ glamo_lcd_power(gdrm, 0); + } + + static int glamofb_blank(int blank, struct fb_info *info) +diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c +index 95ca4cf..9554cb3 100644 +--- a/drivers/video/backlight/jbt6k74.c ++++ b/drivers/video/backlight/jbt6k74.c +@@ -107,14 +107,12 @@ enum jbt_resolution { + }; + + enum jbt_power_mode { +- JBT_POWER_MODE_DEEP_STANDBY, +- JBT_POWER_MODE_SLEEP, ++ JBT_POWER_MODE_OFF, + JBT_POWER_MODE_NORMAL, + }; + + static const char *jbt_power_mode_names[] = { +- [JBT_POWER_MODE_DEEP_STANDBY] = "deep-standby", +- [JBT_POWER_MODE_SLEEP] = "sleep", ++ [JBT_POWER_MODE_OFF] = "off", + [JBT_POWER_MODE_NORMAL] = "normal", + }; + +@@ -260,14 +258,18 @@ static int jbt_init_regs(struct jbt_info *jbt) + return ret ? -EIO : 0; + } + +-static int jbt_standby_to_sleep(struct jbt_info *jbt) ++ ++static int jbt_off_to_normal(struct jbt_info *jbt) + { + int ret; ++ + struct jbt6k74_platform_data *pdata = jbt->spi->dev.platform_data; + + gpio_set_value_cansleep(pdata->gpio_reset, 1); + ret = regulator_bulk_enable(ARRAY_SIZE(jbt->supplies), jbt->supplies); + ++ mdelay(30); ++ + /* three times command zero */ + ret |= jbt_reg_write_nodata(jbt, 0x00); + mdelay(1); +@@ -279,18 +281,11 @@ static int jbt_standby_to_sleep(struct jbt_info *jbt) + /* deep standby out */ + ret |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11); + mdelay(1); +- ret = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28); ++ ret |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28); + + /* (re)initialize register set */ + ret |= jbt_init_regs(jbt); + +- return ret ? -EIO : 0; +-} +-