From patchwork Wed Mar 8 14:34:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 95044 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp2377928qgd; Wed, 8 Mar 2017 06:34:43 -0800 (PST) X-Received: by 10.99.103.133 with SMTP id b127mr7422344pgc.29.1488983683113; Wed, 08 Mar 2017 06:34:43 -0800 (PST) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b6si3435949pfg.209.2017.03.08.06.34.42; Wed, 08 Mar 2017 06:34:43 -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; 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 Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4733E760AC; Wed, 8 Mar 2017 14:34:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f181.google.com (mail-wr0-f181.google.com [209.85.128.181]) by mail.openembedded.org (Postfix) with ESMTP id 6EF93608B7 for ; Wed, 8 Mar 2017 14:34:37 +0000 (UTC) Received: by mail-wr0-f181.google.com with SMTP id u48so24707660wrc.0 for ; Wed, 08 Mar 2017 06:34:38 -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=243NW3/i0HY3DMVhiunsb4dvrayoI7gZ8emkFf0zXcY=; b=CpH/3B73/U2RjyPAQxbmm3y2fUvCovQP5Hdy2sTRQeBeHvDIc1vUsAb1RvCrMuF0gh UpUbqtwhc7J+QmO+s/8AR+EDp0dpXrp2pyxjV/GcZlBxxhPpsK+rMdhB0HcsRar8hvWS RL2ZzUimx4WAnISxtCSW82s5S7+wzCTRb1gliyrXMaYz4w8Oosj3kH/qWTl77o5PdeuG TFcM+g91Z7XP7WQQHdClopIPahQIiHU98675rbH5pTvlPnP6bjGHJclZ7aIiqOnqT/ql /AC07e8YDvf2DxyCR/BjcLYDsMYTB2B+ez/M0mT3LZX+0EXIyW8qJpUEnofsDFdCe4GV 3zgg== 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=243NW3/i0HY3DMVhiunsb4dvrayoI7gZ8emkFf0zXcY=; b=ehY2M7uA8qIgNArK5Q087yZDyqanzCeF0V5EoF0Ab+tOqjBBOJp+nWpjsbq+qs58N+ TIP406YBgDCwAWlVUOvoYc09KiC5GIK+1S8ftu3DySC5MMG+TDKNT2ypXhTtePDd8Mms C3NifzXTObwummNzYCplYZgNvMXUsikvjD7crFqkCB8UxB74ViK1k/bnU6YolN6sB605 kjuhlyHVca5qTKmcno8RxslYDRFKJsZAaBRZJCf2j135UcGHN1Ks06nYm40PzQTtL2jq jcRCtnYpHBFMZDH1VFZlMwoLz4NwzBegcB5Q8niea3G1wDACx7TRYWpyQ/+NEoNNWPeK vyOA== X-Gm-Message-State: AMke39kcjRVKHWtgcZY/jVKKpw6QutjZ0apll2P+8ha5j9cDyp+dR71xPmUpgPAfPrVszOnJ X-Received: by 10.223.132.37 with SMTP id 34mr5339156wrf.45.1488983677313; Wed, 08 Mar 2017 06:34:37 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id j26sm4387585wrb.69.2017.03.08.06.34.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Mar 2017 06:34:36 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 8 Mar 2017 14:34:34 +0000 Message-Id: <1488983674-13774-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Subject: [OE-core] [PATCH] license: don't assume source files are UTF-8 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 We can't assume that source files are entirely UTF-8, so when copying the license blocks open the file as binary instead of text. [ YOCTO #11135 ] Signed-off-by: Ross Burton --- meta/classes/license.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 0ff6560..81458e7 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -386,9 +386,9 @@ def copy_license_files(lic_files_paths, destdir): if begin_idx is None and end_idx is None: shutil.copyfile(src, dst) else: - with open(src, 'r') as src_f: - with open(dst, 'w') as dst_f: - dst_f.write(''.join(src_f.readlines()[begin_idx:end_idx])) + with open(src, 'rb') as src_f: + with open(dst, 'wb') as dst_f: + dst_f.write(b''.join(src_f.readlines()[begin_idx:end_idx])) except Exception as e: bb.warn("Could not copy license file %s to %s: %s" % (src, dst, e))