From patchwork Wed Nov 16 04:44:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 15512 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2B97C4332F for ; Wed, 16 Nov 2022 04:44:41 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.3171.1668573880372464009 for ; Tue, 15 Nov 2022 20:44:40 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id CF1E840D53; Wed, 16 Nov 2022 04:44:39 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oujPavURYZuz; Wed, 16 Nov 2022 04:44:39 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id B4BE540D43; Wed, 16 Nov 2022 04:44:38 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 5BB54163674; Tue, 15 Nov 2022 23:44:34 -0500 (EST) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master/kirkstone][PATCH] meta-arago: remove old deprecated long-SDKPATH hack Date: Wed, 16 Nov 2022 04:44:37 +0000 Message-Id: <20221116044437.2893722-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 16 Nov 2022 04:44:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14113 From: Denys Dmytriyenko The long-SDKPATH hack was used for pre-allocating large enough fields in the ELF headers of nativesdk binaries, so when they are relocated the new path to the dynamic loader and libraries would fit. This is no longer necessary for some time, so time to remove the hack. Change the default SDKPATHINSTALL to include the SDK/distro version. Also drop all workarounds that were needed due to the unusual SDKPATH. Signed-off-by: Denys Dmytriyenko --- meta-arago-distro/conf/distro/arago.conf | 6 +----- .../recipes-devtools/perl/perl_%.bbappend | 12 ------------ .../recipes-devtools/python/python3_%.bbappend | 12 ------------ .../recipes-core/meta/meta-toolchain-arago.bb | 2 +- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta-arago-distro/recipes-devtools/perl/perl_%.bbappend delete mode 100644 meta-arago-distro/recipes-devtools/python/python3_%.bbappend diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index 57eeb57a..d675b077 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -28,8 +28,7 @@ SDK_NAME_PREFIX = "arago" SDK_VERSION = "${DISTRO_VERSION}" SDK_VENDOR = "-${SDK_NAME_PREFIX}" SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_VERSION}" -SDKPATH_REAL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_VERSION}" -SDKPATH = "${@"/tmp/"+"x"*96+"/"+"y"*96}" +SDKPATHINSTALL = "/opt/${SDK_NAME}" IMAGE_FSTYPES += "tar.xz.md5sum" @@ -214,6 +213,3 @@ LICENSE_FLAGS_ACCEPTED = "commercial_gst-ffmpeg commercial_gstreamer1.0-libav co # Do not package own copy of perl into devkit, rely on host one ASSUME_PROVIDED += "nativesdk-perl" - -# Disable empty-dirs QA check, which trips on our devkit default SDKPATH -ERROR_QA:remove = "empty-dirs" diff --git a/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend b/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend deleted file mode 100644 index 9af89cbc..00000000 --- a/meta-arago-distro/recipes-devtools/perl/perl_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# In arago.conf, we pre-allocate SDK path very long to reserve enough space in ELF headers -# and then it gets replaced with a short real path at the time of SDK creation: -# SDKPATH_REAL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_VERSION}" -# SDKPATH = "${@"/tmp/"+"x"*96+"/"+"y"*96}" -# Unfortunately, that triggers the new shebang-size QA check in nativesdk-perl packages - -python() { - if d.getVar('CLASSOVERRIDE') == "class-nativesdk": - pkgs = d.getVar("PACKAGES").split() - for p in pkgs: - d.appendVar('INSANE_SKIP:%s' % (p), ' shebang-size') -} diff --git a/meta-arago-distro/recipes-devtools/python/python3_%.bbappend b/meta-arago-distro/recipes-devtools/python/python3_%.bbappend deleted file mode 100644 index 2afb2b37..00000000 --- a/meta-arago-distro/recipes-devtools/python/python3_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# In arago.conf, we pre-allocate SDK path very long to reserve enough space in ELF headers -# and then it gets replaced with a short real path at the time of SDK creation: -# SDKPATH_REAL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_VERSION}" -# SDKPATH = "${@"/tmp/"+"x"*96+"/"+"y"*96}" -# Unfortunately, that triggers the new shebang-size QA check in nativesdk-python3 packages - -python() { - if d.getVar('CLASSOVERRIDE') == "class-nativesdk": - pkgs = d.getVar("PACKAGES").split() - for p in pkgs: - d.appendVar('INSANE_SKIP:%s' % (p), ' shebang-size') -} diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb index ab484a1e..81affa16 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb @@ -178,7 +178,7 @@ if [ "$INST_ARCH" != "$SDK_ARCH" ]; then fi fi -DEFAULT_INSTALL_DIR="${SDKPATH_REAL}" +DEFAULT_INSTALL_DIR="${SDKPATHINSTALL}" TMPSDKPATH="${SDKPATH}" SUDO_EXEC="" target_sdk_dir=""