Skip to contentSkip to conversation

Small fixes

PATCH New Martin Jansa 1 participant 6 messages Feb 24, 2012

lore
Share & tools
lore
#0 lore raw

cover Small fixes

The following changes since commit 2eaec194016ba357bb02db8859b2b3737d759865:

meta-multimedia: initial add (2012-02-24 13:53:17 +0100)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (5):
mpfr: drop from meta-oe, 3.1.0 is in oe-core
task-x11-illume: use allarch
task-cli-tools: move ltrace to RRECOMMENDS as it's probably not
available for shr4 and sh3 and use allarch
task-x11: use allarch
meta-oe: add mplayer-common to SIGGEN_EXCLUDERECIPES_ABISAFE

 meta-efl/recipes-efl/tasks/task-x11-illume.bb      |    2 +-
 meta-oe/conf/layer.conf                            |    6 +-
 meta-oe/recipes-core/tasks/task-cli-tools.bb       |   14 +-
 meta-oe/recipes-core/tasks/task-x11_1.0.bb         |    2 +-
 .../mpfr/mpfr-3.0.0/long-long-thumb.patch          |   11 -
 meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch   | 1752 --------------------
 meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb         |   30 -
 7 files changed, 13 insertions(+), 1804 deletions(-)
 delete mode 100644 meta-oe/recipes-support/mpfr/mpfr-3.0.0/long-long-thumb.patch
 delete mode 100644 meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch
 delete mode 100644 meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb
Signature · 1 line
1.7.8.4
#1 lore raw

PATCH 1/5 mpfr: drop from meta-oe, 3.1.0 is in oe-core

---
 .../mpfr/mpfr-3.0.0/long-long-thumb.patch          |   11 -
 meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch   | 1752 --------------------
 meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb         |   30 -
 3 files changed, 0 insertions(+), 1793 deletions(-)
 delete mode 100644 meta-oe/recipes-support/mpfr/mpfr-3.0.0/long-long-thumb.patch
 delete mode 100644 meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch
 delete mode 100644 meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb
meta-oe/recipes-support/mpfr/mpfr-3.0.0/long-long-thumb.patch deleted +0 -11
deleted file mode 100644
index a4029d7..0000000
@@ -1,11 +0,0 @@
---- mpfr-2.3.1/mpfr-longlong.h~	2008-01-01 03:29:09.000000000 +0000
-+++ mpfr-2.3.1/mpfr-longlong.h	2008-10-27 21:46:44.000000000 +0000
-@@ -406,7 +406,7 @@
- 	     "rIJ" ((USItype) (bl)))
- #endif
- 
--#if defined (__arm__) && W_TYPE_SIZE == 32
-+#if defined (__arm__) && W_TYPE_SIZE == 32 && !defined(__thumb__)
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-   __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3"			\
- 	   : "=r" (sh), "=&r" (sl)					\
meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch deleted +0 -1752

1,752 lines not on this page · raw message

meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb deleted +0 -30
deleted file mode 100644
index cb347c7..0000000
@@ -1,30 +0,0 @@
-DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE = "http://www.mpfr.org/"
-LICENSE="GPLv3&LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
-SECTION = "devel"
-BBCLASSEXTEND = "native nativesdk"
-DEPENDS = "gmp"
-
-inherit autotools
-
-do_fixup() {
-        rm ${S}/PATCHES || true
-}
-
-addtask fixup after do_unpack before do_patch
-
-NATIVE_INSTALL_WORKS = "1"
-PR = "r4"
-
-SRC_URI = "http://www.mpfr.org/${BP}/${BP}.tar.bz2 \
-           file://p4.patch"
-
-# fix build in thumb mode for armv4t
-SRC_URI_append_thumb = " file://long-long-thumb.patch"
-
-EXTRA_OECONF_append_virtclass-native = " --enable-static"
-
-SRC_URI[md5sum] = "f45bac3584922c8004a10060ab1a8f9f"
-SRC_URI[sha256sum] = "8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f"
Signature · 1 line
1.7.8.4
#2 lore raw

PATCH 2/5 task-x11-illume: use allarch

---
 meta-efl/recipes-efl/tasks/task-x11-illume.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/recipes-efl/tasks/task-x11-illume.bb +1 -1
index 6557619..20cf2b8 100644
@@ -7,7 +7,7 @@ PR = "r2"
 
 # WORK IN PROGRESS
 
-inherit task
+inherit task allarch
 
 # Default theme and config
 ETHEME ?= "e-wm-theme-default"
Signature · 1 line
1.7.8.4
#3 lore raw

PATCH 3/5 task-cli-tools: move ltrace to RRECOMMENDS as it's probably not available for shr4 and sh3 and use allarch

In reply to Martin Jansa
---
 meta-oe/recipes-core/tasks/task-cli-tools.bb |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
meta-oe/recipes-core/tasks/task-cli-tools.bb +6 -8
index c6dc4a7..a849978 100644
@@ -4,17 +4,12 @@ SECTION = "console"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PV = "1.0"
-PR = "r18"
+PR = "r19"
 
-inherit task
+inherit task allarch
 
 PACKAGES += "${PN}-debug"
 
-def get_ltrace(bb, d):
-    if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'sh4', 'sh3' ] :
-        return ""
-    return "ltrace"
-
 RDEPENDS_${PN} = "\
   dbus-daemon-proxy \
   dosfstools \
@@ -39,7 +34,6 @@ RDEPENDS_${PN}-debug = "\
   devmem2 \
   i2c-tools \
   gdb \
-  ${@get_ltrace(bb, d)} \
   mkdump \
   mioctl \
   procps \
@@ -50,3 +44,7 @@ RDEPENDS_${PN}-debug = "\
   strace \
   tcpdump \
 "
+
+RRECOMMENDS_${PN}-debug = "\
+  ltrace \
+"
Signature · 1 line
1.7.8.4
#4 lore raw

PATCH 4/5 task-x11: use allarch

In reply to Martin Jansa
---
 meta-oe/recipes-core/tasks/task-x11_1.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-core/tasks/task-x11_1.0.bb +1 -1
index 681e4f3..628789a 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r10"
 
-inherit task
+inherit task allarch
 
 PACKAGES += "${PN}-utils"
 
Signature · 1 line
1.7.8.4
#5 lore raw

PATCH 5/5 meta-oe: add mplayer-common to SIGGEN_EXCLUDERECIPES_ABISAFE

In reply to Martin Jansa
---
 meta-oe/conf/layer.conf |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta-oe/conf/layer.conf +5 -1
index cf13a71..7369df1 100644
@@ -23,4 +23,8 @@ BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/"
 
 BBFILE_PRIORITY_openembedded-layer = "6"
 
-SIGGEN_EXCLUDERECIPES_ABISAFE += "pointercal-xinput systemd-serialgetty"
+SIGGEN_EXCLUDERECIPES_ABISAFE += " \
+  pointercal-xinput \
+  systemd-serialgetty \
+  mplayer-common \
+"
Signature · 1 line
1.7.8.4