From patchwork Tue Jul 2 15:22:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 168331 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4374338ilk; Tue, 2 Jul 2019 08:22:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFCSoAMzAHGlV183SoL8+L+/vVQ2wo8aymg3X+W2lxfLn+2LR4x8ka/NBV3mZJd65tcS2J X-Received: by 2002:a63:a1a:: with SMTP id 26mr30760069pgk.265.1562080978475; Tue, 02 Jul 2019 08:22:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562080978; cv=none; d=google.com; s=arc-20160816; b=K57iKNy29jLYU1rmAUXbIVLdykvqEuqUhBIh199LafuVnxPcIdM2kcoL0BbVdmbhhv iCbPPCB9KH8fez6TFAHyXLFn54lI9ufsXBhHwMD/8vPEwVrZO39AMtKarFkDIZLftqEw ksnbEzjL7uPZV+mppXWZd83QkVukNUSO/x/6txQWy6TJv/ouhb8pFRHXK/VtrAOgl6rV ajMU7j3ON6+QrY44ZBuJ92hMWhDMalrFvPCX/igThVieYKzFMv+oDvHKoQ8izHZhBGNT VicLkcp5Sbednd7r5o/tXrF6erTd3P8R2hDTiSAAONW2qhXgfRyBDQ9OdMMEpeq5Ctfo f7bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=HL3hryRvTIzY33LleCHZnH23lVxIQhVD+GI6vcm61Nc=; b=jkQ6IEAJYj3vvfmSRcM/xxXBNcKfyzcsCIU+aIy6hsl1NoE0UK0riUApO3a9LCm4TV YfVNSWJeZoBuhi13Lg5pZy3wLcsjR3Qer+LfKFxYbUZ0rZSC4Yu2ON4G4N2EdNEW/b+S 33uDuMcCWb/rTx5Jcp7NzGMvvhmTlCfrc606IzWkLQF5pC2tkUuVlXhlwfizpuBYCqyA KffvGJOcbtonQgmEHTYGNNysfLp7zARFn27qd07JsvEKm+pmwHOfmEn1zXZNdPT/ALMZ a88PfA5mFKvvkM5eNEiZWjvHeZlIuDCYV87DT3HP2dYMUZgLtC8BenN2OKfCQEy8ZMs9 0HTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=wNXYpk9t; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id g11si12991218plo.433.2019.07.02.08.22.57; Tue, 02 Jul 2019 08:22:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=wNXYpk9t; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 72CF77EAF2; Tue, 2 Jul 2019 15:22:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id EBACA6C1BD for ; Tue, 2 Jul 2019 15:22:51 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id c2so18315732wrm.8 for ; Tue, 02 Jul 2019 08:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=lBPCR6Y38ZVuzeXP9QiO5fF2tx5eDpfDlZDgzpubWQM=; b=wNXYpk9tA5/L4k0v0XtOcsHGApqdcSB/jLEs0BzrG6a/s02nZs4nRDQCvyNaC34FLi i4HOgim9QErSR+ADySb+WA2d64aX1bzIshkENofOnqX0eohI7MXYnJqFX6fQo4oxvFJ8 Otj+JxunxeB/RWdaPwhoMKAeqFeh3foRDR9ZL0qZ285iE5j9ELcKCGqWZIlYso0e8i8i 8xbvVtb+4I3JnBIzmbR6AgzwlKcPL812RfyDuR2gbDELA5cD6mSJRLO2lNFQihqbgG93 vkT1bzXFd8TxAaKHKKzQENqOd6NFwqI0e17lPGtFxOw5I1xaafb1GPzqMpxkAxD4f39f Z0IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=lBPCR6Y38ZVuzeXP9QiO5fF2tx5eDpfDlZDgzpubWQM=; b=QCURVn3ksPaSvH7Y/dz2cf8+feht3fv9bSxwYLQO7HOe4cPGm2hoJ/yPtye6T5GLov wIUyu0Vbq4OZRP4BMl0bS7OZ09vExaqiUJ3AvxrH/BpZHZVC3YFm/uKvxageON91qkL5 j+eKLB6pTwoPvkmWC8J9AqE0qp7Q+VE/BGOyJhtgcOzdEDpzG8f5sM+8QECFjo5x31SL +v8pl7GGDAJY0y1gtc1gbBMGx7gVorxjPyEak2Cc4r/RGmT9kjytsaeX76Tpx/HRTyRW 6gVgxIANdkxAKpZakemkzWHXgNTPT/8Bqcrjllu50MtwXukF3N3rCJlGtWrvcNWLQpGk PDcQ== X-Gm-Message-State: APjAAAV6KSl8j+8Dy+uYBIoKQg8bh20FiPdI6MdMff5Ne3KEq0MyQBKy 6+aGHpOtkgSe1NEdwgYDSZperbhp3BE= X-Received: by 2002:adf:ff84:: with SMTP id j4mr23168093wrr.71.1562080972429; Tue, 02 Jul 2019 08:22:52 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b203sm3548396wmd.41.2019.07.02.08.22.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2019 08:22:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 2 Jul 2019 16:22:47 +0100 Message-Id: <20190702152248.13678-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] multilib_script: fix whitespace X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org The blocks were intended with 3 spaces instead of 4. Signed-off-by: Ross Burton --- meta/classes/multilib_script.bbclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass index dc166d06c17..b11efc1ec5c 100644 --- a/meta/classes/multilib_script.bbclass +++ b/meta/classes/multilib_script.bbclass @@ -17,18 +17,18 @@ multilibscript_rename() { python () { # Do nothing if multilib isn't being used if not d.getVar("MULTILIB_VARIANTS"): - return + return # Do nothing for native/cross if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d): - return + return for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split(): - pkg, script = entry.split(":") - epkg = d.expand(pkg) - scriptname = os.path.basename(script) - d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ") - d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) - d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") - d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") - d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}") + pkg, script = entry.split(":") + epkg = d.expand(pkg) + scriptname = os.path.basename(script) + d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ") + d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) + d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") + d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") + d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}") } From patchwork Tue Jul 2 15:22:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 168332 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4374839ilk; Tue, 2 Jul 2019 08:23:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqynLicgK+3NobJPSfaVJYBhGCp9GCR9gbF8hAk9f+kG995k6rwMbEk1IUZUmvA3IlnWVFHR X-Received: by 2002:a63:101b:: with SMTP id f27mr8927404pgl.291.1562081010926; Tue, 02 Jul 2019 08:23:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562081010; cv=none; d=google.com; s=arc-20160816; b=kYPzUhzaoTIu+qNxr/EeVcKsF2+Jzw+rW3TyeUkdaSMzM68sCrTm5AO98gAYHHJqY6 GDMsy09z9dwqSavLXec7U4exQGSlFSoJD1K/AeqfyvEMjnRraxat7+DYf89cguCIH/C3 QBNef6W/Y9L/ZcRWEatA9TvXPhEVD6mkkBytDT7LlC8uMFdtKv02irbh4P2upZvO7KlN KWZ3gdxreYUh2oF5zCCFMLAWM0i1xcCzDwU27FnE3fHtXcg2cBeJ5CnrZ9JMiZpRbelp 0YfBvnQU5WEKUjT+P53RjDt6gPhvWY8/re/G7Lj50UeCjtMXM27aXr5b/YLw7xuFoXcX n2Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=1b0zmWMwniPO6roXOCVYW8cUXSFMJzaLIeeoPUh3DTc=; b=PMQZNL3OWC0SYV69LxS1zNBh42Kt02xZPKIHn8V95Vftw59px9yK4M+hakXU+YwDev Y+ydRvKnHDzb+4l5/5Yt+FkboCnmsZnqfubrOna3krvyGbU975Bs0XQw1d4LWlUIbIhK XX/QiOUkXIPzLKmQAOH0D9JNjQ+fB84/MLo12PTPKUZ3YIF71HL3J0STM5kg2uH0sU1+ Xu6MrYt9O9Y9BzcnqKMCEPokMhoRUEgtLFOLQiuu0nPA4lVIQCZx/ppdcJBvF63v2NyX yNoZ7EZWzYJcoCmRllUNmWCmxOoPtPnCxKhOAbVPBAqrmnmRqWV4Ga57e6G0diX9uiCD kopg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jbMZfg5s; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p3si2442722pjr.18.2019.07.02.08.23.30; Tue, 02 Jul 2019 08:23:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=jbMZfg5s; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C21957EAB9; Tue, 2 Jul 2019 15:23:28 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mail.openembedded.org (Postfix) with ESMTP id 03C786C1BD for ; Tue, 2 Jul 2019 15:22:52 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id v14so18310953wrr.4 for ; Tue, 02 Jul 2019 08:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=A4S/MWtrE6HLQe02a29DT/K/XOmd/8tT94bG1vWbDfM=; b=jbMZfg5snjGOCmsoeZG9qkFAVyKhGFompOSJfVV3925JFgPEh8DMjtk3ox+cjXLuFt Z3fWYt+um/ztvAISypcz82ZvKk5t9rrvdttRORF+xHQGaMplv4IixEmVGK051ctMk1IQ J0EFItNw6t9QcK7ocAJf2wpzoJdBGCyFY8VdHat5VnV8wiQ3jBfZR9xyJNB6492gVVqg uKwGkVTr1p3aM7EJBa4QJJqdSyUoJPGtT6P8YtnuHhf/tt1u++0KkR5KJbxBveSH2BsU 7eNMjrLGzW6lUSofb7i5kZ4ZdqQZn5a3g7QavO14FATpQe+ROeP0hHw47c0KXJ6lJBVt HbcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=A4S/MWtrE6HLQe02a29DT/K/XOmd/8tT94bG1vWbDfM=; b=XXGXHfZlY1sqJjO+N+d+EI6R7J2zSvXHXUye/qEXWSbhKHAp9SWAjHPTMT/ndnJGI+ fKt8vxOTCZ0dmKqt8XNQRyKNWFzGTzS8YtYbyGPwOcHyFYJ5j79vjTWBLCCOJsD2dDlw lG8n/ggYkzzDDIHlIHgnQn8B4HD+2Lm8oFDKd/rnYnbo5qTnFPqngihfDV7l07rqKAaC iVUyM5dmV7/TOEcCX9VmEKe5Jo9IlYqNWY+vua+ujC1QbANmvdzmmMykF5Vm++AyVscd Yu+RB4YPS38KjY03HPKAK0sCskELheAUGC98mcqDBhrDDL52wYTD74Bcj6d8ME2GCUbX /Tqw== X-Gm-Message-State: APjAAAWZK/PDXzUOiFMpLG8ryHV914markgMADEyUfaUnDpKA2qsI/sf ic6qn1HzYSJzfHuAmDUtgCuTso1jDkI= X-Received: by 2002:a5d:400f:: with SMTP id n15mr16164441wrp.312.1562080973638; Tue, 02 Jul 2019 08:22:53 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b203sm3548396wmd.41.2019.07.02.08.22.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2019 08:22:52 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 2 Jul 2019 16:22:48 +0100 Message-Id: <20190702152248.13678-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190702152248.13678-1-ross.burton@intel.com> References: <20190702152248.13678-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] multilib_script: use MLPREFIX instead of libdir when renaming X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Instead of using part of ${base_libdir} to rename scripts, use MLPREFIX. This is more obvious as MLPREFIX is a common prefix in package names, and as these filenames are hidden behind alternatives they're rarely used directly. Signed-off-by: Ross Burton --- meta/classes/multilib_script.bbclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass index b11efc1ec5c..de95dc6551d 100644 --- a/meta/classes/multilib_script.bbclass +++ b/meta/classes/multilib_script.bbclass @@ -6,8 +6,6 @@ inherit update-alternatives -MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" - PACKAGE_PREPROCESS_FUNCS += "multilibscript_rename" multilibscript_rename() { @@ -26,9 +24,10 @@ python () { pkg, script = entry.split(":") epkg = d.expand(pkg) scriptname = os.path.basename(script) + mlname = os.path.join(os.path.dirname(script), "${MLPREFIX}" + scriptname) d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ") d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) - d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") - d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") - d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}") + d.setVarFlag("ALTERNATIVE_TARGET", scriptname, mlname) + d.appendVar("FILES_" + epkg, " " + mlname) + d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + mlname) }