From patchwork Mon Mar 5 11:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130626 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2547726lja; Mon, 5 Mar 2018 03:02:07 -0800 (PST) X-Google-Smtp-Source: AG47ELshmBd/mz/F0LRzER+9tDukv2pjVHnxf5ngxIV3TIcVsyxa0KNGaJsNPFZme6Hm9liUy4FL X-Received: by 2002:a17:902:b192:: with SMTP id s18-v6mr12676807plr.243.1520247727545; Mon, 05 Mar 2018 03:02:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520247727; cv=none; d=google.com; s=arc-20160816; b=oXGZ+yJJdbp0Q565lk/Wr870AIt1pqnLkFn/nI340lsRGucBakPJJiBKqb6U0b9Gya ulDd4YSNEEwN8Hsgz39yLc6N1qOpbHFFJ0EhQzyFmI8wk8FOZ54LzsqxgUMX9XAtL6ru iudNqIhJxelayofzWZOll7OzYZ7rY7acG4UiSb3xevrkV+eUgpBEZKrnniob1ZcWT+tU dKSiW+HQahTRWayZ3vR9VmQ49suHXNZsQn9sVwAwYW+Zh6TWxoLYvraGS0JkwY2TKses RcNdR81cAZa6YsRbbDoto9mNIc/0rpgVIQ2W1ZX1IbdrgvRNBKw57IJAN7z/xO2i6RzM cYKA== 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:arc-authentication-results; bh=kJcN5hHqaLs7UsKbEY2Lx24TC1lMjD3c9f6bliMY/ek=; b=azs2t1w1ho505kU/dgQBSSVggINtuD+IMfjj1lbh5bgscN/45Fw/I88YopACh1Kxld WEHbTEi9HAZPt+jblAMeQvWrM4/eLBsSS0dUT4CoKMiKalbNvvJf358Q3tn5ZajJbzPv gsjWUTFxHtH5/Vf8OCdjq1xS56QYLRcvuauQH2ub8V1yy+ehq808ZH8MZJ3854rHeZvr d6C597ZoDI3ovpQVTL+5drFQ2GG/JU9sD0UavtRZIAkeCiJmW6FfztzQSdbFYXCmIw/F AccLyGh4cgNCk27xojCAwbYhQHUla9jcLZsnqGDHVhuvGUmaNjYLqLwZz49EM65yBK0F SoiQ== 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=j1YtlLzY; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a11-v6si3370895plp.363.2018.03.05.03.02.07; Mon, 05 Mar 2018 03:02:07 -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=j1YtlLzY; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0804478A92; Mon, 5 Mar 2018 11:02:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by mail.openembedded.org (Postfix) with ESMTP id B34DB78A6F for ; Mon, 5 Mar 2018 11:02:02 +0000 (UTC) Received: by mail-wr0-f177.google.com with SMTP id f14so16759498wre.8 for ; Mon, 05 Mar 2018 03:02:03 -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=B7mhhfys3sr2L542YIwm6NiJvuL3JbokzeUhKRnFGxI=; b=j1YtlLzYLj1IlEVOLwDJOtLK8ceUarposvhFJcgernzlIXtnpxKUuMDsrvLtRL6o80 rGIYi8++EMptNXCxu0oNgoAdYkXogoxiJr5ZMWKsKDJxKRJ4tKdyRNGhjvDSZNh8QoNY ye6i/LAf2p0p5AflG6D6uW7Yllb6f0yEANL/x1/Unhhw/Nt1u6qoSVTDDKiSXlZLl6ob +m+JPvnRBJWJICd/z7FifnnmaWuVL2GDjar8ku+u9eLolWjHjKGnflL8SJjyWR1nikdI MXNYbni2syum1xCQbCmVByBbfUmxAUqk2W0gzdy+xA24GT1DqIkXS1IXX9Vk/lyk5qeu /0sw== 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=B7mhhfys3sr2L542YIwm6NiJvuL3JbokzeUhKRnFGxI=; b=eETtgd4vc4TAJBs35A6D1ivrPvetLrwkMZ1Cr929sC5ycyrxzWFqNGk78twqy04/cf mjAnbr6DZJeIid6PIwPVfh5gx8xR8CAoOJ6ZaDlBYp1Mn5PiXQ7q0AK4lv8FFlPMal/A m8qFiIMk0dcUIfNYrMwwTChbtLu8kWK0F+R6j9sCAPhtkmVcPhBwtudAex6cW2DrIHZ/ V5qkf0Q3Q8icdEoVadG54ScWei0DZt89Eik+1cBfIoRmvFI1pvdXzgkq0lRJkJlaPwkC uDKbY0GoPMM37vIjRKqp45Ns2KM+ucn38ITrD9Pnx7SY4vux0ETzR2bbPRTAruz4WWq0 5wfQ== X-Gm-Message-State: APf1xPCirDGYHpT9yjaYDujEYYdotXexv4qswMZlYGMGAiqMNgaWf0rA 019e6JyI8Vr+LmeE1q4Bxqx8sb2x X-Received: by 10.223.176.228 with SMTP id j33mr11554188wra.67.1520247722856; Mon, 05 Mar 2018 03:02:02 -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 o9sm13042874wrf.43.2018.03.05.03.02.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 03:02:01 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 11:01:55 +0000 Message-Id: <20180305110158.10308-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/4] xcb-proto: solve python cache colliion 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 Because I didn't really want python3-native to be at the bottom of the entire X11 stack this recipe jumps through a small hoop to use the host Python to run some modules it installs into the sysroot. The Makefile compiles the Python module, which is good as the cache file is recorded in the sstate manifest so when the package is removed from the sysroot all of it is removed. However in an enviroment where the sstate is shared between multiple hosts it is possible that a different Python is used and this will generate a new cache when the code is executed, which is not recorded in the manifest. Eventually you'll end up with ownerless cache files in a sysroot which conflict with the same file coming from a sstate upgrade. Solve this with a SSTATE_INST_POSTRM which is ran when sstate is removed to ensure that there are no Python cache files left behind. [ YOCTO #11809 ] Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb index 712ab6c59ab..25a8373e0b9 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb @@ -34,3 +34,20 @@ RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" + +# Need to do this dance because we're forcing the use of host Python above and +# if xcb-proto is built with Py3.5 and then re-used from sstate on a host with +# Py3.6 the second build will write new cache files into the sysroot which won't +# be listed in the manifest so won't be deleted, resulting in an error on +# rebuilds. Solve this by deleting the entire cache directory when this package +# is removed from the sysroot. +SSTATEPOSTINSTFUNCS += "xcb_sstate_postinst" +xcb_sstate_postinst() { + if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] + then + cat <${SSTATE_INST_POSTRM} +#!/bin/sh +rm -rf ${libdir}/xcb-proto/xcbgen/__pycache__ +EOF + fi +} From patchwork Mon Mar 5 11:01:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130627 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2547816lja; Mon, 5 Mar 2018 03:02:13 -0800 (PST) X-Google-Smtp-Source: AG47ELvZ5t9L9pANnp5ZBAFder+EXl7VxmQAlt1DfyXWwjO07YgaQbCbdjRfV2ycuJpy9Wl2Yc0r X-Received: by 10.98.87.80 with SMTP id l77mr15129782pfb.32.1520247732958; Mon, 05 Mar 2018 03:02:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520247732; cv=none; d=google.com; s=arc-20160816; b=vcPvVLz9sPyuu5PXsB7tvJL2oclZs2jBvj6VzVV/CtqxOR4p092QEFCgRhnGS/uI6V ncsBjZe66uqcJgKi90mCk4lnTxccWY+CYTt7PpdYg+tv2tFOiKOh6JEefELqHGtHE1Ri 9GdrVVJ3kYJHDatw8lHTUCtMLhg0lx+nCdcWzjnk/1o6xim3uhuyXwYTtjm9BPtfn441 2ksXe9wSA06jitlLC5OszQufj67BHABSmk8bXyW0UeRoRv7tmRx8TkrDOVl3lTR0NyjU rIPv0fESvkXAYonGD6gofrGl7nvEdz53pEHq26yJZxgWcxv4mSrQqiOvIR5RK3O8jLiq 63pg== 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:arc-authentication-results; bh=VTz6q8TLRJ7wruAlJa2YSQqVgsNpv7YFeDre5uE4lsI=; b=n2G+lmkBO9R5EYqBB6RD++EA3aBw9QhqPlvEU4XuI+IeELv+gKpw9vJ+8iOoh3WyW+ ujK9mMbu5YN4lloBK/a00Dia/Td3H/GJBK4RzfoDSpnh06Y2OwSC6BGygvMJAlQ8nsZ1 V9asfv/ca2ULVpfYyef3ah0fjWg59My4xlMmS1SE+AL/zonqCk8ivdRvCU5xoq1bd/nc B3ZbFO8AqNd+Mu1nqjmF7lXkLJQ+on62UMoM7qtWrMsqPq7725cTr3Y6ke1Oqa53XwOz UJ4e65tNw3HtM5M0taRCQ/QFFFyCNcAdBy3aPnf7XQtDpy4eFAoZHXjNtL0c2zGda15c qe9A== 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=kk9gla9Z; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o33-v6si9179602plb.772.2018.03.05.03.02.12; Mon, 05 Mar 2018 03:02:12 -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=kk9gla9Z; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5AAE878A96; Mon, 5 Mar 2018 11:02:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 35EB478A99 for ; Mon, 5 Mar 2018 11:02:03 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t3so14906249wmc.2 for ; Mon, 05 Mar 2018 03:02:05 -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:in-reply-to:references; bh=ynF9UGEhyEqcdsadq4vUDebPFieDeSO98PGDUwXaCb4=; b=kk9gla9ZH4YhEI3cfBJkve5/34c+MRh9rZlA7INCDZ+/V1JZ8dn9iRg3/HAirKzrA1 NUe9ndyhA9hQCAzhA76ogRNDMQ+4XPTJnW61AfiAuRQFtrO2GwaacfPnaK0UDrzjKpdR Rvk9wCoWgl/qTh127xfzjYIPU25hCpBEGrXMibtvOKpsGcjA3NvfhWIKlmR4jsYeijAH h396o1gnZdBTXy52jwQrY/wkgHJ7KgajJkmY+yUgcnVhSYYdQeWJBO8qetXdK8zacJaP LQ2tCRYAEmNaQPjoog04HZvnLOtTr9yOdjIdFGKblM9ppBPzuRKMQgdKjVwbpd1h7qRy nMAA== 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=ynF9UGEhyEqcdsadq4vUDebPFieDeSO98PGDUwXaCb4=; b=jkhz7B64eh/UVoOuAi9x3f4yVu7xvB4kOceju5BjVkVdrKLCJ7AcerBibe9OF4wKSE QLRPmfvEUtqx4U4BDo8l8976VXXgsrKC0VWAtaJgaT1rjCW+UtYB1v17DBWtEX7nDRJT CiyekQQ3sA8juuB3OCyvawG4aQr6z5VC+WJ1PVeNDZCITAv40+sbECKktcV2A18CpEGG fX1SFAvODJBmxspYsCnjd2gY+hjpfjgTfnqfgJcR3pK31JrpsyCTd2L4VSD9vHn60/oI qBW1H14dXxT5Na6hHQKkI46K9LQnfCgGJv6uS6CoOYRAZXCXNwLbozm6KV4i6x3zFRat M6dA== X-Gm-Message-State: AElRT7GhqnVWefMXqlfpClS3z7k3IePj1Sjkwc1aDgbPBU6XI/hYhZ8w 3kqho5gNmIr+5cGIZFQGIBEIejk0 X-Received: by 10.28.106.19 with SMTP id f19mr8441820wmc.84.1520247724007; Mon, 05 Mar 2018 03:02:04 -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 o9sm13042874wrf.43.2018.03.05.03.02.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 03:02:03 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 11:01:56 +0000 Message-Id: <20180305110158.10308-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180305110158.10308-1-ross.burton@intel.com> References: <20180305110158.10308-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] testexport-tarball: sync with buildtools-tarball 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 This is basically a copy/paste of buildtools-tarball so copy some of the recent changes to buildtools across. Signed-off-by: Ross Burton --- meta/recipes-core/meta/testexport-tarball.bb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 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/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index 72f5531c5c5..c38ac902a06 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb @@ -10,7 +10,13 @@ TOOLCHAIN_TARGET_TASK ?= "" TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES}" -SDK_PACKAGE_ARCHS += "tesexport-tools-${SDKPKGSUFFIX}" +MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" +PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}" +PACKAGE_ARCHS = "" +TARGET_ARCH = "none" +TARGET_OS = "none" + +SDK_PACKAGE_ARCHS += "testexport-tools-${SDKPKGSUFFIX}" TOOLCHAIN_OUTPUTNAME ?= "${TEST_EXPORT_SDK_NAME}" @@ -22,7 +28,15 @@ EXCLUDE_FROM_WORLD = "1" inherit meta inherit populate_sdk -inherit toolchain-scripts +inherit toolchain-scripts-base +inherit nopackages + +deltask install +deltask populate_sysroot + +do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" + +REAL_MULTIMACH_TARGET_SYS = "none" create_sdk_files_append () { rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* From patchwork Mon Mar 5 11:01:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130628 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2547889lja; Mon, 5 Mar 2018 03:02:18 -0800 (PST) X-Google-Smtp-Source: AG47ELuAG+SDg5lfTRJnvsaLvn/JkolHW5BBvMRkHzluAJ7qug7uLfQqyZ5DC3vKdWE9vUIV1okH X-Received: by 10.98.201.88 with SMTP id k85mr70692pfg.9.1520247738029; Mon, 05 Mar 2018 03:02:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520247738; cv=none; d=google.com; s=arc-20160816; b=iB1wZ89WKuNhKj4Ghy9K9e4La1sOUu+urCyMjJQOCEvqBQOaf6arH4cYNt21MxfiOq uclIZ3koJVgB3CP+l3Dhm0V2GcRXWiJ8FDrKEtWXNNdPsQ9U2xscU/oRNgDJnogXM/pE vebSRVYst+jHTFpnoR8Q1K7Za7x/qRG/5EWM7w+GF9Iazii/uS19Avkpk+3OuQVL8FQJ gPnJfR1nVxSWeNRCPxQaZ01UieCB7kFGltcizXM/txYffBLPmAGR/JQ8P+pbJQT5IhN8 0aHi0Cazm3+ZHEzqtINEjdlQr7XZtp7XSkeT8qnvdhbjiKjA6PwxkVGX1R8WYiCwToCn G4qQ== 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:arc-authentication-results; bh=f3Q82a5C7+0YSAQPSWJaiYllkIjgjYQjrwN0rUp7vmI=; b=piKHAoSfg5HSMf/5W4gpH0CgDRLZVXtiZc679ESjXrWCbmWt8KG3yR682TeNXvwRKH h05jwK0eyLadljmyBBBcMnPDHZT8hdZDXlHunFbxtl1/tZZyQaVNBw7jYi13/AXfgvYy OuOu8gR0ywaQlvKHmAef6CG9M6300bF+MQISo6vaM4SiEP0F/zVadrBbDnyw1zf8nPlf oZs2jCwCa3adVHEKU3ceSqi7b3hqvjJwGS/htsVqkOc68eLgQNp2UC24iqkXNCfrxkQ9 0DO314S9QKUUuAdStw3p9EhkFgOgDtXSKU7f/i6dSGuzoTjLB+HsyOIjy7sr/w2jP7V0 cuFA== 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=Ot3TZDPg; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s16si10049313pfe.375.2018.03.05.03.02.17; Mon, 05 Mar 2018 03:02:18 -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=Ot3TZDPg; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 63A1C78A85; Mon, 5 Mar 2018 11:02:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 41D1678A91 for ; Mon, 5 Mar 2018 11:02:04 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id 139so14636423wmn.2 for ; Mon, 05 Mar 2018 03:02:06 -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:in-reply-to:references; bh=yDjhwm+v44UdSBpVXk0l1bbIwvMs3qon6nwtWF+bnZU=; b=Ot3TZDPgYWy8S2vv32OgL92P8P493AfO6Q2zPi0JIPKMpZdvA8dkSPv7Sntt9uJiwZ 3sPd1TQQf4qkaKdO3HheitGAE5/Ihmy2uJ9gdppKJIbheDafGcwj+B04TeiBLBGtdxv/ u9g4DFTLS/R3jg/KWDz95xvkUxQGJHqL8d3KemB+vu8PZkFQOQFw1oBWn4QeVsrt58n1 mHOPNoymFKxcYcSGasDXWDq6QXcYBg8OZG2XKWGQIBxwwWYIH4FffI23BCwObnDZ54Yb 0+24Ni46swg6ygGHy6+T7U8PRvFid/5PK0OQBTmh6BLyslOcViscOBCkoXBg4rKLELgZ buqA== 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=yDjhwm+v44UdSBpVXk0l1bbIwvMs3qon6nwtWF+bnZU=; b=rDuAp/mZ76bVUKBI306Mj6gE030YrKwBiO7L0ERPSnv3Z4Q3wm2+kexYQG3DFDZIyS rfkrX2dm8ZJiKNgFEM0OjIhxJZJKZYS/yx2rXbDmsAC8BZ8illfutN4O+s1ZJg4ebuB/ bo56UG3ghZcUArpyR92wHcoZtgTK6fnniC4aSZonHDPWOSkGLFtIfhZfff6aiMw1MWhb zyG9GTNQrH+85DGQNURIzTp4Nje8LR3CLtvsUQRDOxcQyR1gvzu10pgTfMUAktj1a3tD iNk1+gfF3nkwXmk1T0XurI3RWZnxVeZLxv+SAWSApLP2azPsMdjednjlb0FEcmLitdLa YpSg== X-Gm-Message-State: AElRT7E1pv873NrxJ3eoGk/q3vkdaOQYu8WNXFtitFSKdZtPsjm7Zmtb EoBzWToGnKBYIJsyMs9OqMCGDf0P X-Received: by 10.28.142.135 with SMTP id q129mr8638957wmd.112.1520247725741; Mon, 05 Mar 2018 03:02:05 -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 o9sm13042874wrf.43.2018.03.05.03.02.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 03:02:04 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 11:01:57 +0000 Message-Id: <20180305110158.10308-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180305110158.10308-1-ross.burton@intel.com> References: <20180305110158.10308-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/4] sdk: only install locales if we're using glibc 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 Using glibc-locale to install locales only makes sense if we're using glibc. Signed-off-by: Ross Burton --- meta/lib/oe/sdk.py | 4 ++++ 1 file changed, 4 insertions(+) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 76fe02c37b2..6cd4115202f 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -130,6 +130,10 @@ class Sdk(object, metaclass=ABCMeta): bb.warn("cannot remove SDK dir: %s" % path) def install_locales(self, pm): + # This is only relevant for glibc + if self.d.getVar("TCLIBC") != "glibc": + return + linguas = self.d.getVar("SDKIMAGE_LINGUAS") if linguas: import fnmatch From patchwork Mon Mar 5 11:01:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130629 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2548010lja; Mon, 5 Mar 2018 03:02:24 -0800 (PST) X-Google-Smtp-Source: AG47ELsBR6b5Ee6skJjEZAsLAh9QDGH2Oiwr+cCO+cZxPutgNTZYrSzwUFTI4wIKBvTVP7MYXtm6 X-Received: by 2002:a17:902:b605:: with SMTP id b5-v6mr12860290pls.354.1520247744040; Mon, 05 Mar 2018 03:02:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520247744; cv=none; d=google.com; s=arc-20160816; b=ggLp81TPrAvwbn28honuL9LACZ8N34nCnkvEO32t7URugiRq58lKx2ZyEC6UDF9x1l qVq2SGRyaefrYP4EAnZTmMc0wGthCEfdiKCM0m9iyf0le6jbaP4koAPXmRSPZUqBdGn8 glFfTFVhZseoWnvg81GyJIbhezLHOBUMEv2iSK+9nSCkOhQaBhpB3fPCJswo+9nohbdr 4y6LK+u4D9UWyEpGDFRlqU6M9Ou2TnpygJHLHFbgytCweFKsmU75TxMWxnQh/6I4XnYc Y4bH6Kr/fG2CtWR4003ICLPka0wCGCPglMBIvETRS+MARaTBfxz8fwfxBXC8aBQ79Glt REew== 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:arc-authentication-results; bh=FF9xZYUW4D7eoSs1HmNrdNdXQolexL0ZZulpQMxVpRE=; b=Z2E9dzBsp0sSh9fP2ye7Bu8oOcfmSgWgmYEpB8UvCagNJWU1E939RtcrK/5z2QMCVq OFy/T7+nv1jQbosjB1VSgsnlpIC3ZKCs+LO3uIsthLvDMl34e6/ope21h9FEj1gRHVGn QDGu2wil6+YNA3tLQQfGnF0eEoEPxGkiDiREOIEECxTzYnQ2ZpD6oJ69HdAaPVv4qPAW Nvk3YkzuijzMUmwL3Y6K9PPViQ76BxtWwLh7t5Ux0XsCE/HFBPBbV4oxUp63aZ9ZFzN8 HNkEg8r+MWfkeP6VliJ4Cdh82Dkq5AUxGUoA1dA7KVBphoxpr9e0u3q7n1fYkYnnsjn/ mXFg== 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=EoZi4L+H; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f9si1501744pgt.584.2018.03.05.03.02.23; Mon, 05 Mar 2018 03:02:24 -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=EoZi4L+H; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 71B7378AA2; Mon, 5 Mar 2018 11:02:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by mail.openembedded.org (Postfix) with ESMTP id 997B378A96 for ; Mon, 5 Mar 2018 11:02:06 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id 139so14636597wmn.2 for ; Mon, 05 Mar 2018 03:02:08 -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:in-reply-to:references; bh=mRW8EXVXJCXNwNqzYiD84y+v32aIEuif6iqbSgfTFo4=; b=EoZi4L+HYHyGxz0WiccFOiQvCSZ0PIbPRg0cwvhOKJDRJG9EJLVrlSy1LmVDWMWy9M mUqCyO8QS8bBv1DNbIn/EfI5/79Y2+91Yud4AQ9PdCphSms+0tKkxqzwyiiw/Ln7gZb/ LujFUwNLjvuQ8/mFYa6VX4siQ3/QSHTxv8cXY5wxPzCckdKcG1U8MSxcOUsWmU3xkZMU apctIuO2OphqCtKGU2MDfcidj6RU/MhSih87oj9YsGr/mKRVvNpw3LT8/x99iGiI5+SY Xo2/HVmvNK5Yz7UUnDgL2sdDpJ8J70IPy6j3buyf8OuNZnbL6wfZtImKht8wpMiZodPN 95Iw== 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=mRW8EXVXJCXNwNqzYiD84y+v32aIEuif6iqbSgfTFo4=; b=QSXSyj5qRI2EPZDFASqT4s80phNTvF05XFOz5vtG/898h5tbqroE5B4GRPQHXPNGdf KraIpfBAjcphvRCMSJINnETj4RDgC+doGvAapuhrs6Gzir/ASXXH+gdYgZL6gfqziBiN Tsp6Tnl2izg7rJdpPAzKlGfiMfAKOGLqUQ48p/38WDVStA19Ayl4CdXeFCKKFVHWCvFz eYdUdLfcfY4s/nVvSbnboseSyfXRJW9h2F9sqbUHmLcD/kVlgnzKX31CUKQGlFR6mEXz R+Sd6a3N9AAtVdtJGYhFF9zRivKtqpZg6UDc02o2qzC0TlcOVd0ga/YVlI8tlf6UOkm+ 6tSw== X-Gm-Message-State: AElRT7FnKXycW/RqTI/e2Rbr9wGEOMpth8yKtQL9Rtt9V1uqnDt/vMZi gpa5gR1nEngYwyrwqa+6VqUECr2t X-Received: by 10.28.4.216 with SMTP id 207mr4983823wme.108.1520247727125; Mon, 05 Mar 2018 03:02:07 -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 o9sm13042874wrf.43.2018.03.05.03.02.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 03:02:06 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Mar 2018 11:01:58 +0000 Message-Id: <20180305110158.10308-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180305110158.10308-1-ross.burton@intel.com> References: <20180305110158.10308-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/4] populate_sdk_base: depend on nativesdk-glibc-locale 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 we're building a SDK and we're using glibc so may be installing locales, add a build-dependency on natiesdk-glibc-locale so the locales we need will exist. Signed-off-by: Ross Burton --- meta/classes/populate_sdk_base.bbclass | 1 + 1 file changed, 1 insertion(+) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Tested-by: Martin Jansa diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index be5970a4bbc..60a5abc7dc8 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -47,6 +47,7 @@ TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" SDK_DEPENDS = "virtual/fakeroot-native pixz-native cross-localedef-native" +SDK_DEPENDS_append_libc-glibc = " nativesdk-glibc-locale" # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it # could be set to the MACHINE_ARCH