diff options
| -rw-r--r-- | packages/liboil/liboil-0.3.15/autotools.patch | 35 | ||||
| -rw-r--r-- | packages/liboil/liboil_0.3.15.bb | 6 | ||||
| -rw-r--r-- | packages/linux/linux-omap2-git/beagleboard/defconfig | 13 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 2 |
4 files changed, 11 insertions, 45 deletions
diff --git a/packages/liboil/liboil-0.3.15/autotools.patch b/packages/liboil/liboil-0.3.15/autotools.patch index bbd4cbb250..53501e3991 100644 --- a/packages/liboil/liboil-0.3.15/autotools.patch +++ b/packages/liboil/liboil-0.3.15/autotools.patch @@ -1,8 +1,8 @@ Index: liboil-0.3.15/configure.ac =================================================================== --- liboil-0.3.15.orig/configure.ac 2008-07-01 06:45:53.000000000 +0200 -+++ liboil-0.3.15/configure.ac 2008-09-24 20:37:24.963143501 +0200 -@@ -187,15 +187,33 @@ ++++ liboil-0.3.15/configure.ac 2008-09-25 13:44:18.633758105 +0200 +@@ -187,16 +187,6 @@ true) fi @@ -13,34 +13,9 @@ Index: liboil-0.3.15/configure.ac - #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], - # [VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp"], - # true) -+dnl macro taken from cacao -+dnl check if softfloat should be used -+ -+AC_DEFUN([AC_CHECK_SOFTFLOAT],[ -+AC_MSG_CHECKING(whether softfloat should be used) -+AC_ARG_ENABLE([softfloat], -+ [AS_HELP_STRING(--enable-softfloat,use softfloat [[default=no]])], -+ [case "${enableval}" in -+ yes) -+ ENABLE_SOFTFLOAT=yes -+ ;; -+ *) -+ ENABLE_SOFTFLOAT=no -+ ;; -+ esac], -+ [ENABLE_SOFTFLOAT=no]) -+AC_MSG_RESULT(${ENABLE_SOFTFLOAT}) -+ -+if test x"${ENABLE_SOFTFLOAT}" = "xyes"; then -+ VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp" -+else -+ VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp" - fi +-fi -AC_SUBST(VFP_CFLAGS) -+AC_SUBST([VFP_CFLAGS]) -+]) -+ -+AC_CHECK_SOFTFLOAT - +- #AS_COMPILER_FLAG(["-fasm-blocks"], HAVE_ASM_BLOCKS=yes, HAVE_ASM_BLOCKS=no) HAVE_ASM_BLOCKS=no + if test "x$HAVE_ASM_BLOCKS" = "xyes" diff --git a/packages/liboil/liboil_0.3.15.bb b/packages/liboil/liboil_0.3.15.bb index 2021451ddb..338121ac66 100644 --- a/packages/liboil/liboil_0.3.15.bb +++ b/packages/liboil/liboil_0.3.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." HOMEPAGE = "http://liboil.freedesktop.org/" LICENSE = "various" -PR = "r1" +PR = "r2" DEPENDS = "glib-2.0" @@ -11,10 +11,6 @@ SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \ inherit autotools pkgconfig -EXTRA_OECONF = "\ - ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ - " - do_stage() { autotools_stage_all } diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 47c41f1425..c726740485 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Sat Sep 20 15:44:20 2008 +# Thu Sep 25 07:42:19 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -80,9 +80,8 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set # CONFIG_SLOB is not set CONFIG_PROFILING=y # CONFIG_MARKERS is not set @@ -719,9 +718,6 @@ CONFIG_B43=m CONFIG_B43_LEDS=y # CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set -# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_RT2X00=m @@ -1881,8 +1877,7 @@ CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index ded3a3bbe8..dcb8139486 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r63" +PR = "r64" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" |