3 fixes for dora
cover 3 fixes for dora
The following changes since commit 18f34944696a8098daf33a94bc2f532deb217d0a:
gnutls: fix failure during do_compile (2014-03-06 10:31:57 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib robert/dora-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=robert/dora-next
Chen Qi (1):
iproute2: de-bash its scripts to remove the bash dependency
Ming Liu (1):
grub: move xz to DEPENDS list from RDEPENDS list
Sébastien Mennetrier (1):
libomxil: Fix link issue for gst-omx
meta/recipes-bsp/grub/grub_2.00.bb | 4 +- .../iproute2/0001-iproute2-de-bash-scripts.patch | 64 ++++++++++++++++++++ .../iproute2/iproute2_3.10.0.bb | 1 + .../libomxil-0.9.3/dynamicloader-linking.patch | 20 ++++++ meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 3 +- 5 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch create mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
Signature · 1 line
1.7.10.4
PATCH 1/3 grub: move xz to DEPENDS list from RDEPENDS list
From: Ming Liu <[email protected]>
liblzma5 is really requiring by grub, setting RDEPENDS to xz would pull unneeded xz binaries into rootfs.
(From OE-Core master rev: 78526905999fa38047ae8f3491127cc03de3e3f6)
--- meta/recipes-bsp/grub/grub_2.00.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-bsp/grub/grub_2.00.bb +2 -2
@@ -11,8 +11,8 @@ SECTION = "bootloaders" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "autogen-native flex-native bison-native" -RDEPENDS_${PN} = "diffutils freetype xz" +DEPENDS = "autogen-native flex-native bison-native xz" +RDEPENDS_${PN} = "diffutils freetype" PR = "r1" SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
Signature · 1 line
1.7.10.4
PATCH 2/3 libomxil: Fix link issue for gst-omx
In reply to Robert YangFrom: Sébastien Mennetrier <[email protected]>
gst-omx element can not load due to a missing symbol. Missing symbol RM_Deinit.
(From OE-Core master rev: 56301698a55bcbab4272b273fd98ce4de84cbfac)
--- .../libomxil-0.9.3/dynamicloader-linking.patch | 20 ++++++++++++++++++++ meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch new file +20 -0
@@ -0,0 +1,20 @@ +This patch fixes link issue when libomxdynamicloader.so is loaded : +Missing symbol RM_Deinit. + +This patch comes from "http://pkgs.fedoraproject.org/cgit/libomxil-bellagio.git/commit/?h=f17&id=4996a95828943d345e51ded6876c3103653eecf8" + +Upstream-Status: Pending + +Signed-off-by: Sébastien Mennetrier <[email protected]> + +--- a/src/dynamic_loader/Makefile.am 2014-02-25 15:29:10.128549636 +0100 ++++ b/src/dynamic_loader/Makefile.am 2014-02-25 15:30:15.756548808 +0100 +@@ -3,7 +3,7 @@ + omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la + libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h + +-libomxdynamicloader_la_LDFLAGS = ++libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs + libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base \
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb +2 -1
@@ -10,7 +10,8 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \ file://configure-fix.patch \ file://parallel-make.patch \ - file://makefile-docdir-fix.patch" + file://makefile-docdir-fix.patch \ + file://dynamicloader-linking.patch" SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8" SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c"
Signature · 1 line
1.7.10.4
PATCH 3/3 iproute2: de-bash its scripts to remove the bash dependency
In reply to Robert YangFrom: Chen Qi <[email protected]>
If we build a minimal image with iproute2 installed, the following error will appear during rootfs.
error: Can't install iproute2-3.10.0-r0.0@i586: no package provides /bin/bash
The problem is that iproute2 has an implicit dependency on 'bash'. This dependency is from per-file dependency checking.
Patch two scripts, ifcfg and rtpr, from iproute2 to remove the bash specific syntax.
[YOCTO #5415]
(From OE-Core master rev: 1132c4210eddd59b22b2640935ab0bb8f48c0124)
--- .../iproute2/0001-iproute2-de-bash-scripts.patch | 64 ++++++++++++++++++++ .../iproute2/iproute2_3.10.0.bb | 1 + 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch new file +64 -0
@@ -0,0 +1,64 @@ +Subject: [PATCH] iproute2: de-bash scripts + +de-bash these two scripts to make iproute2 not depend on bash. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <[email protected]> + +--- + ip/ifcfg | 15 ++++++++------- + ip/rtpr | 2 +- + 2 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/ip/ifcfg b/ip/ifcfg +index 083d9df..60bcf1f 100644 +--- a/ip/ifcfg ++++ b/ip/ifcfg +@@ -1,12 +1,13 @@ +-#! /bin/bash ++#! /bin/sh + + CheckForwarding () { +- local sbase fwd ++ local sbase fwd forwarding + sbase=/proc/sys/net/ipv4/conf + fwd=0 + if [ -d $sbase ]; then + for dir in $sbase/*/forwarding; do +- fwd=$[$fwd + `cat $dir`] ++ forwarding=`cat $dir` ++ fwd=$(($fwd+$forwarding)) + done + else + fwd=2 +@@ -127,12 +128,12 @@ fi + arping -q -A -c 1 -I $dev $ipaddr + noarp=$? + ( sleep 2 ; +- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null & ++ arping -q -U -c 1 -I $dev $ipaddr ) > /dev/null 2>&1 </dev/null & + +-ip route add unreachable 224.0.0.0/24 >& /dev/null +-ip route add unreachable 255.255.255.255 >& /dev/null ++ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1 ++ip route add unreachable 255.255.255.255 > /dev/null 2>&1 + if [ `ip link ls $dev | grep -c MULTICAST` -ge 1 ]; then +- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null ++ ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1 + fi + + if [ $fwd -eq 0 ]; then +diff --git a/ip/rtpr b/ip/rtpr +index c3629fd..674198d 100644 +--- a/ip/rtpr ++++ b/ip/rtpr +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /bin/sh + + exec tr "[\\\\]" "[ + ]" +-- +1.7.9.5 +
meta/recipes-connectivity/iproute2/iproute2_3.10.0.bb +1 -0
@@ -2,6 +2,7 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ file://configure-cross.patch \ + file://0001-iproute2-de-bash-scripts.patch \ " SRC_URI[md5sum] = "45fb5427fc723a0001c72b92c931ba02"
Signature · 1 line
1.7.10.4