From patchwork Thu Mar 1 18:26:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 130388 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3132979edc; Thu, 1 Mar 2018 10:27:41 -0800 (PST) X-Google-Smtp-Source: AG47ELse9NuWat3Z4MWcNoxyLYhwy7z6tQBQHyRkSnxoeIiFBcB4GfV34RgHzo3/gNPUUusIKG0y X-Received: by 2002:a17:902:7044:: with SMTP id h4-v6mr2709920plt.378.1519928861766; Thu, 01 Mar 2018 10:27:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519928861; cv=none; d=google.com; s=arc-20160816; b=ep+LHxpDZfzrOUtxXJ2bert1D53dlXSMXYfULF3zIT/ogZffK3PfaqMyviFYz6CpHt cOotrp7CCYAIdmqT2Qxt0hf5mVdIi8okerN+vMKqx0ORD8nE+TwWO/yljOD+4Ue2F29q QANOPkvCQhkGB7lQdxRFPNI3Ne5xjaut3y8NeVVhI3y+AbGejxItLYTNXt224tQVV12U a0X7L5tfdzFURK76cw5FsSQZiipNkleB1eny8jhR72FolX6t+n8++v+ZORWGnp/CP1Am crYC3NhWaXJTAFgO94kdyCcoEGVaJAJOOhMV7cf5Tm/9jlSn5OgIr2/EpgbKQ46P1l8Y nNnQ== 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=KCqSPbYviRMYI+FcVvtD7eAwJ2D2HEDr2h/Law11zho=; b=b5ovNVztQY3A2muMF6Lg7+RTIzctXoV4jGTLRguNYl/3hZOUyvqaPCjiqfgs4wxX59 EVs4mJn4MC77doTdOjCVBu8mgoZhkdovEin9rIr9WU0tzWbo2Cuxb3H865pZTDM0v3qj lkWZleFWbD+wNFDrU5oZgXSF6S9POS4sSXO0BmFSrwAi4gwoSwY7SIjiI01HJm1ea0XC 5maOWXF7d6Vx+0RPVJyuWgBl9VqQWy0FcfkxSV3bAKPUlV818TCwOD75llfqd0XDqQUJ pxTcKp4qUVhDDEOPbIJjknwWq0Wx4ktwDrTUOVsQaYRfJanHiz2Ywu827cjNfiZKcFus ewyg== 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=jM+gC25D; 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 a3-v6si3423914plp.76.2018.03.01.10.27.41; Thu, 01 Mar 2018 10:27:41 -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=jM+gC25D; 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 031C778905; Thu, 1 Mar 2018 18:27:00 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 5D263788C9 for ; Thu, 1 Mar 2018 18:26:49 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id v111so7596412wrb.3 for ; Thu, 01 Mar 2018 10:26:50 -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=pDOf8Udkx7+JepRQRU/DYKsff+amB2IhwwyFLygpCZA=; b=jM+gC25D3Cj3MqPCd+SglGVxMNdzzDXZqTep1P45EtffnuB5qoot10kFKGXrcGeL8p SLQPLB65qdTvNqCNP4gj5Pa6tHHE4EJLCTso9yk9rEw8imeamxfWyqSJztDoktbdmqk7 tQHs+6LBntEEtYWVl97cbsfG7nno7MIurDikv7RAx3tEQfwqc9ZokzRjTQpxib2Gi0u8 xcvUa8iK5sDf2TGaGw2Cxtqf6npc6idt0w8127lu/nxdUIuWHdIo+6AB0k6m1N+jYJor U7QldlOxM/b/ei90/3EtM8vHBPKXHpNizq+5yYwIUtlgUbnsqkBD8ffYNuuD1pSNNiry KFjA== 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=pDOf8Udkx7+JepRQRU/DYKsff+amB2IhwwyFLygpCZA=; b=YUIaWEpLLuSszHpXhytYZ6CRZJtBJSKqo8k0ERzobzXDwYa6OMFUFvpFt+6nYAjwyg U0tCjX2+iMADOD1mpiRQ6c1OE73DTQjw28kdZwicuOdXum/Wa098mcBxKfEEbygWeqry SekZMYG1hrSXtVvXv25iiffW+a6ajkILUooYw9amGDj/GPtXEgwjKaj4eZncXhw8gUz3 lI13C9Mqh4mawnWb8EAOWGm4HD43D4SYT3Ff04lHhasgVUWMhoVkUP7traun0SNLYPVz UIfd+q/xC91Kfq6dVIxRVJ7NgUfPB0Q7gv2aWQ9B7poTpXr0WI2jOLu5ZlzGqZevCyUc pc5Q== X-Gm-Message-State: APf1xPAjlL5bwYtREwPTZaY1XKhTU1d3a98rI5pGlMMGzTQDMdgd4qwc V5OjhzBFIMhtVvkf8GAKxuCuPtEd X-Received: by 10.223.135.231 with SMTP id c36mr2815804wrc.36.1519928809957; Thu, 01 Mar 2018 10:26:49 -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 h188sm4955285wmf.23.2018.03.01.10.26.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 10:26:49 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 1 Mar 2018 18:26:32 +0000 Message-Id: <20180301182634.20502-9-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180301182634.20502-1-ross.burton@intel.com> References: <20180301182634.20502-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 09/11] populate_sdk: install UTF-8 locales in SDKs 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 As glibc 2.27 can't read older locale-archives, SDKs using glibc 2.27 on hosts using glibc earlier than 2.27 won't be able to find any locales, so bitbake won't start and Python can't use UTF-8. So by default install all locales into the SDK. Special-case Extensible SDKs by installing no locales as they ship glibc in a buildtools, and that will have the locales. Locale installation requires cross-localedef, so add that to DEPENDS. Also remove the explicit en_US addition in buildtools-tarball as it is now redundant. Signed-off-by: Ross Burton --- meta/classes/populate_sdk_base.bbclass | 5 ++++- meta/classes/populate_sdk_ext.bbclass | 3 ++- meta/recipes-core/meta/buildtools-tarball.bb | 1 - 3 files changed, 6 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/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index acb91d7d63a..be5970a4bbc 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -23,6 +23,9 @@ SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d) PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target" SDK_PACKAGE_ARCHS += "sdk-provides-dummy-${SDKPKGSUFFIX}" +# List of locales to install, or "all" for all of them, or unset for none. +SDKIMAGE_LINGUAS ?= "all" + inherit rootfs_${IMAGE_PKGTYPE} SDK_DIR = "${WORKDIR}/sdk" @@ -43,7 +46,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" -SDK_DEPENDS = "virtual/fakeroot-native pixz-native" +SDK_DEPENDS = "virtual/fakeroot-native pixz-native cross-localedef-native" # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it # could be set to the MACHINE_ARCH diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index d7a08840371..655375416be 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -655,7 +655,8 @@ fakeroot python do_populate_sdk_ext() { d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn) d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') - + # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice + d.delVar('SDKIMAGE_LINGUAS') populate_sdk_common(d) } diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index be37c442104..d98a9c901ce 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -21,7 +21,6 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-wget \ nativesdk-ca-certificates \ nativesdk-texinfo \ - nativesdk-locale-base-en-us \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"