From patchwork Fri Nov 30 10:40:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 152504 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3496289ljp; Fri, 30 Nov 2018 02:40:49 -0800 (PST) X-Google-Smtp-Source: AFSGD/WoeDONQetBX6/5IeqrTg7f7eQpzJLdVkaT3PoT2t5nkhr4WVUR0MTIwKpSXrZgPYrh3utG X-Received: by 2002:a63:193:: with SMTP id 141mr4424406pgb.136.1543574449391; Fri, 30 Nov 2018 02:40:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543574449; cv=none; d=google.com; s=arc-20160816; b=H+UBqolHr7gdgO5X5WiRZhaQ4x/3mU5WTMn3WPFwsXCEvT9HuASxA3F+Bji+bdtgfY oP+dpYVQYEiOAP6xj2e3WnZjKKLrGtCThYzl19/J/ByU4DySk5gECuolEeePLH2JUrMo 4qp4/5WfIpGkc3QQRzit+yUlqYQzD21ViUWJV/muGu6MVC0+Z260xBEIxeCAwl+FkGlz zCVQDiuKgiG0rOaSTHS6se+yzcfeGyBfiM3wKKb9tOxNlFaDrKjIOKUxXfXxBx3d/0kG duAIdcO3WTFU99Kc3z7wwKfQ65N5ZKhHx+U1eiRx4iPApn9EwegcsSMhYYuaaVl48uPj 6y1w== 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=WSZEDqe1Ejcv+UT2J8vJmGHVx0oR1Z+KvGe8ZNIUq+c=; b=IBA7EiMsCaVorCUz4nm+BKrGckAk7vXMWJ74khPismyYyrJkC3yg8DAZUb0yLU4C5M D+s1TrP7f0z8WLD3BahvpTzF4y5G5q4Jy8VDKXVERSwrqgsOzEgp42tQI1jNIyemf1lv uE/Lr1nb3WZ8PFl3ITxDaxDQiAlHin9a6UGBplw3H9YzvJ0HGXrbR1ETvIST1VIYCE5j vYmUDVv1Xkc5crvOxO0pp/H0hR36fxc4adgIsLZ4zT906dIqsgzI09j58p+JriMoUhVy FU95ZtG4hYdkXyle8qn1A2vPCX2fFGEeWHTDYSVKeBOVtW5u7EpTOembBMg9HfKQzPUB +C8g== 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=aB66dNSt; 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 87si4985577pfs.7.2018.11.30.02.40.48; Fri, 30 Nov 2018 02:40:49 -0800 (PST) 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=aB66dNSt; 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 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0F5326D749; Fri, 30 Nov 2018 10:40:44 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id CCECF6C107 for ; Fri, 30 Nov 2018 10:40:40 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id j10so4793450wru.4 for ; Fri, 30 Nov 2018 02:40:42 -0800 (PST) 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=uIZHhq2NhGh30VaEgH6812Tds1ng8g9dwjkcPFUsFNA=; b=aB66dNStNJnkXEqKtukjzvzsXSzIMApvZP08Iua0YmoUb57mPCPOrJJxZ93hdUv6iV V3L/oaNKB3DDVl76GxNA6RErCOAZidPklxf8Refn3hIWsP7kpbM5R+8+K9pMUvgFIO5G kMlym+LicFcPvH5yBCl7qGxChmpqA9hEvBCAW5GBNMZLtVk8bPXrU1sn+rn11n0aHriI S49ubAbFjzW7q2fRQn8+WCV5Wwzuq9qm3ae9seo+ge5f5gsNAXW7aCGZQWW6CCw8PLcf zApJ9P1okvjTx11coAe4eIjSfsZH3LNW5+Li0DUmbm4z0miDB/Pg9+cVMXczwhzOJnXq +nPQ== 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=uIZHhq2NhGh30VaEgH6812Tds1ng8g9dwjkcPFUsFNA=; b=r/U67SZ/1tOZLfHAONbLg/mGJjT9tYbrHRxfI5Nw1WQ3WP67oUMCYkFSGV/rFlVgiH c4TvL8lcKq/KyDsxElHrXKn7GlBlwTXfEQq6JCWq/oaUE69jIquEuRpDQQ3qVqQvQ793 OketUSkFJcelfjtxUn2HQrD/UuVs/f1ji/8UpjTnYpGE7Xn4Sk7g0nS1tR73i8n/g4db A36MHDrMw1acCxki399lyPD2wwBkPd7EYDKRF+VdLXkU+169A9ccGi7YVZkpIPoMrdvU Z2dF91xmjXKyxODXkEjsjpgxAgnUr9pHNOpLyjFLTYZYXpVQYQGH1bjJtiq6oUMKY531 WWcw== X-Gm-Message-State: AA+aEWau1oACmnfpEn9LK9xM7K+4iRg8pgCrCwu52OQmDBvebilKnOrr sv/2VzCheor7T3T3TZo8qTLriDKhAbM= X-Received: by 2002:adf:b30f:: with SMTP id j15mr4799511wrd.46.1543574441402; Fri, 30 Nov 2018 02:40:41 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id v6sm5199277wro.57.2018.11.30.02.40.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Nov 2018 02:40:40 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 30 Nov 2018 10:40:38 +0000 Message-Id: <20181130104038.3131-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] binconfig: only try to mangles files 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 If a file matches the glob that is an absolute symlink then sed will try to alter files on the host, so restrict the search to just actual files. Signed-off-by: Ross Burton --- meta/classes/binconfig.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 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/binconfig.bbclass b/meta/classes/binconfig.bbclass index 39c3e2b17bb..133b9537cf0 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -31,7 +31,7 @@ BINCONFIG_GLOB ?= "*-config" PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" binconfig_package_preprocess () { - for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do + for config in `find ${PKGD} -type f -name '${BINCONFIG_GLOB}'`; do sed -i \ -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ @@ -40,7 +40,7 @@ binconfig_package_preprocess () { -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ $config done - for lafile in `find ${PKGD} -name "*.la"` ; do + for lafile in `find ${PKGD} -type f -name "*.la"` ; do sed -i \ -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ @@ -54,7 +54,7 @@ binconfig_package_preprocess () { SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess" binconfig_sysroot_preprocess () { - for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do + for config in `find ${S} -type f -name '${BINCONFIG_GLOB}'` `find ${B} -type f -name '${BINCONFIG_GLOB}'`; do configname=`basename $config` install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} sed ${@get_binconfig_mangle(d)} $config > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname