From patchwork Tue Nov 26 13:03:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 294322 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 6FAA62C00A3 for ; Wed, 27 Nov 2013 00:03:28 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 396EA3FF01 for ; Tue, 26 Nov 2013 14:03:24 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 3F3E13F8F3 for ; Tue, 26 Nov 2013 14:03:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2327; q=dns/txt; s=ironport1; t=1385471002; x=1417007002; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gUv+I56T4cCcFPVHdb9Zo09xXzFLBricINqTY9FMRlI=; b=L3fwmlUdUK40oWZZv5X3Am190sgTycAV7Nb7XduR1q3ezJkInXJuJfH9 34nL+sqlSBKoFyX2meqISqy+Gn06DSTBXNxI0CpBkLAcfNX55Qw/fmvEs 4ew2O9mwd6qSaPUONHOOCu3eSyHZ4h6a6wrSQY3qfWGw+2oX1pp0VHz3m o=; X-IronPort-AV: E=Sophos;i="4.93,774,1378850400"; d="scan'208";a="4175583" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 26 Nov 2013 14:03:22 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 26 Nov 2013 14:03:21 +0100 Received: by localhost (Postfix, from userid 30007) id DD1316814DB; Tue, 26 Nov 2013 13:03:21 +0000 (UTC) From: To: Subject: [PATCH 3/4] chrpath: Add option for replacing and stripping of chrpath, machine recipes Date: Tue, 26 Nov 2013 13:03:18 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Adds 2 new useflags: USE_chrpath_replace: is set to false by default. Set to true if you do want the chrpaths to be replaced for machine recipes USE_chrpath_strip: Is set to true by default Set to false if you not want the chrpaths to be stripped. Signed-off-by: Christian Sørensen --- classes/chrpath.oeclass | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/classes/chrpath.oeclass b/classes/chrpath.oeclass index 42c4a3e..4a2162c 100644 --- a/classes/chrpath.oeclass +++ b/classes/chrpath.oeclass @@ -3,6 +3,13 @@ ## Strip of ELF rpath from machine recipe output, and rewrite ELF rpath ## in all other recipe types to be relocatable using $ORIGIN relative paths. ## TBD. +## +## @useflag chrpath_replace Set to true if you do want the chrpaths to be +## replaced for machine recipes. Default is set to 0, meaning no +## replace. +## @useflag chrpath_strip Set to false if you do not wants the chrpaths to +## be stripped. Default is set to 1, meaning the chrpaths are +## stripped. addtask chrpath after install before split @@ -12,10 +19,20 @@ CHRPATH_DIRS = "${base_bindir} ${bindir} ${base_sbindir} ${sbindir} \ ${base_libdir} ${libdir} ${base_sharedlibdir} ${sharedlibdir} \ ${libexecdir}" -CHRPATH_REPLACE_DIRS = "${CHRPATH_DIRS}" -CHRPATH_STRIP_DIRS = "" -CHRPATH_REPLACE_DIRS:machine = "" -CHRPATH_STRIP_DIRS:machine = "${CHRPATH_DIRS}" +CLASS_FLAGS += " chrpath_replace chrpath_strip" +CHRPATH_REPLACE = "1" +#Default: Do not replace for machine recipes +CHRPATH_REPLACE:machine = "" +DEFAULT_USE_chrpath_replace = "${CHRPATH_REPLACE}" +CHRPATH_STRIP = "" +#Default: Strip only for machine recipes +CHRPATH_STRIP:machine = "1" +DEFAULT_USE_chrpath_strip = "${CHRPATH_STRIP}" + +CHRPATH_REPLACE_DIRS = "" +CHRPATH_STRIP_DIRS = "" +CHRPATH_REPLACE_DIRS:USE_chrpath_replace = "${CHRPATH_DIRS}" +CHRPATH_STRIP_DIRS:USE_chrpath_strip = "${CHRPATH_DIRS}" CHRPATH_REPLACE_STAGEDIRS:native = "1" CHRPATH_REPLACE_STAGEDIRS:cross = "1"