Patchwork [v3] eglibc: Move perl- and bash-using scripts to separate recipes

login
mail settings
Submitter Phil Blundell
Date Oct. 18, 2012, 10:15 p.m.
Message ID <1350598517.4470.177.camel@x121e.pbcl.net>
Download mbox | patch
Permalink /patch/38305/
State New
Headers show

Comments

Phil Blundell - Oct. 18, 2012, 10:15 p.m.
On Thu, 2012-10-18 at 11:02 +0100, Phil Blundell wrote:
> Ah, right, got it.  Maybe it would be better to declare a dummy
> do_evacuate_scripts() in eglibc-initial.inc instead.  I'll give that a
> try and see what happens.

That seems to work ok in at least the meta-toolchain-gmae case.  See
attached.

p.

Patch

From 9a58ce3a332a06d022a4473dd061c52f4540a540 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Thu, 18 Oct 2012 14:12:25 +0100
Subject: [PATCH] eglibc: Provide dummy do_evacuate_scripts() for all variants
 of eglibc-initial

Otherwise the nativesdk and multilib variants might crash trying to
copy a non-existent mtrace script.

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
 meta/recipes-core/eglibc/eglibc-initial.inc |    5 +++++
 meta/recipes-core/eglibc/eglibc-package.inc |    8 --------
 meta/recipes-core/eglibc/eglibc_2.16.bb     |    2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index f44db0c..1520efd 100644
--- a/meta/recipes-core/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -73,3 +73,8 @@  eglibcinitial_sstate_postinst() {
 }
 
 do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}"
+
+# We don't install any scripts so there is nothing to evacuate
+do_evacuate_scripts () {
+	:
+}
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 58dd898..79c43f1 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -117,14 +117,6 @@  do_evacuate_scripts () {
 	done
 }
 
-do_evacuate_scripts_pn-eglibc-initial () {
-	:
-}
-
-do_evacuate_scripts_pn-nativesdk-eglibc-initial () {
-	:
-}
-
 addtask evacuate_scripts after do_install before do_populate_sysroot do_package
 
 PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 56a0a38..4d80ff4 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -1,7 +1,7 @@ 
 require eglibc.inc
 
 DEPENDS += "gperf-native kconfig-frontends-native"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21224.tar.bz2 \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch \
-- 
1.7.10.4