From patchwork Fri Sep 3 16:20:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524427 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=KnQ8rc2l; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NM64hs3z9sX3 for ; Sat, 4 Sep 2021 02:20:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 17EDE426C6; Fri, 3 Sep 2021 16:20:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sIXVwF1LphSF; Fri, 3 Sep 2021 16:20:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 630CA426BC; Fri, 3 Sep 2021 16:20:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 42C8D1BF327 for ; Fri, 3 Sep 2021 16:20:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 33676426B4 for ; Fri, 3 Sep 2021 16:20:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ytTtL2TOnCTP for ; Fri, 3 Sep 2021 16:20:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by smtp4.osuosl.org (Postfix) with ESMTPS id B263B426B1 for ; Fri, 3 Sep 2021 16:20:36 +0000 (UTC) Received: by mail-pg1-x530.google.com with SMTP id c17so6040411pgc.0 for ; Fri, 03 Sep 2021 09:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cB8KLqH1jaPjXZLFz/11dp2/uz8+Az3UKvVLDS9nqto=; b=KnQ8rc2lQf0Vbnmf7K7udPvq13jyEpd31rXvyKQsmq6cebEMbGGnXAKf41pU0KcdDU Xtyf70R4Vj2hlOK+kpyYj/hWeF6h6DdjgrgOdQXCRB926WenZmPPLvShCNMfeIfAEvJa +FtXrQuVP4OTIR+dBt9pmjNPkk4RhXq6yQd4iLndLsUeun+OUnSY+DvVdguaVGBdciKo 0sVztZqHiBhvWB++W43VZ+yckpCJzre3vnKC3DvYl+TTX5K3kX31onlqOwd+cerchjzN e2BNeSSeyX1p3yNDAzSaKwYutZ71v1WFHh68P917F/pw2lm+ksqIXRB0fN1MQ4FmxtpU 5clg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cB8KLqH1jaPjXZLFz/11dp2/uz8+Az3UKvVLDS9nqto=; b=Pc5quDY6ylJcUelyoCD0IzV6BNmjuoQv6IiPKfxFcQogOf9lfulZcqXrup177/hYAg XD7KcjJQMNAc5UIyDiAGHLlKMziPasn28po9qBkhaQNJug8JinGRpoJ4hNjP8lFczTxu C2NPQIapEK9t3VGUERHksl7PRQAt27nPi+3Cu9JH3cBcNq3S0Uoc8Yq9W/TbKDiQtVlh cMziiP01974wY/pg5Jravy9wa3hgMsaR7qUgiLWfndsGEOA+pFWJ0uxGhpDD5/xB7e2J Ff42IFvnSPu8GJKrabO2vnihRMGD8k1ox4Js4yXtnrP41GiIDgtCX4VM28jdFIk9w/iU usIw== X-Gm-Message-State: AOAM531Ymjq0l+P5PdtntLI+9jsYT220PFwcFRmj9k76HpRswoq1grZI wdrYnDk3w/qoLUwTJOSIopqj0GFUaHCVJw== X-Google-Smtp-Source: ABdhPJxNcHDBE2XGgut+zXznJofOhHLwglWxUGj0enURpd6jZULJjNV7UiSwbOVeV3p7TDJkrvqsdw== X-Received: by 2002:aa7:8b07:0:b029:2f7:d38e:ff1 with SMTP id f7-20020aa78b070000b02902f7d38e0ff1mr4153937pfd.72.1630686035976; Fri, 03 Sep 2021 09:20:35 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:35 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:21 -0700 Message-Id: <20210903162027.1935040-2-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 1/7] g-ir-scanner-qemuwrapper.in: Fix latent bug in X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" If GIR_EXTRA_LIBS_PATH is empty, the LD_LIBRARY_PATH variable is ":.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib". As discussed with Yann Morin, add a new variable, "GOI_LIBRARY_PATH" and prepend ${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:} to the path to fix the above bug. Signed-off-by: Adam Duskett --- package/gobject-introspection/g-ir-scanner-qemuwrapper.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in index cad7ef875e..ec066062e2 100644 --- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -4,10 +4,11 @@ # is older than the target kernel. # Use a modules directory which does not exist so we don't load random things # which may then get deleted (or their dependencies) and potentially segfault +GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname "$0")/../lib:$(dirname "$0")/../../lib" GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \ @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ -L $(dirname $0)/../../ \ --E LD_LIBRARY_PATH=${GIR_EXTRA_LIBS_PATH}:.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib \ +-E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \ "$@" if [[ $? -ne 0 ]]; then From patchwork Fri Sep 3 16:20:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524428 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=FLhMUaNT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NML55DGz9sCD for ; Sat, 4 Sep 2021 02:21:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 282B060719; Fri, 3 Sep 2021 16:21:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PjRE0X4VABkn; Fri, 3 Sep 2021 16:20:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 78EB9606C4; Fri, 3 Sep 2021 16:20:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 33A0B1BF327 for ; Fri, 3 Sep 2021 16:20:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 30EFC426B4 for ; Fri, 3 Sep 2021 16:20:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N4AfNSt7yWDE for ; Fri, 3 Sep 2021 16:20:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9707A426B1 for ; Fri, 3 Sep 2021 16:20:37 +0000 (UTC) Received: by mail-pg1-x529.google.com with SMTP id s11so5990597pgr.11 for ; Fri, 03 Sep 2021 09:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XkAuGVmZ4sGtuCDQdqC3y2FeVvygDcKc2H36Ag77FKs=; b=FLhMUaNTpJaXstPhXjfTHqbiQ/nIDLHxgWhnrpSy5kjeWa43SdJiLplKc+gFKAiUcy w0FVPsGCnK2M16XfBiWiJV4P01oxzbrpBk82y1YnYaGStu91QPrjuGC4tzofhIa/RLSY sWqTnJXO4Q7BCHmN2aeP4kHpnIWF/G1CepTdOgrcK/aNwQJhy2/3FVv1jkfWDxkeql4/ UQnQoigEO3IKhSH78GaiVq1vlEp+GP5aS6rq6u00tQlyjHggfPJt4KFSK9xK3LCH5k+9 hfiYFXgPPJytqFrnOGxjSyhgfWBLhbM9sf4B22EYzCBje7rdi1PUk5RBnYLmzRCHTijm oZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XkAuGVmZ4sGtuCDQdqC3y2FeVvygDcKc2H36Ag77FKs=; b=XgtclnU1ixN6NeEHIBf+SAENaINXNUhOHJZFFkaZsFer86/bYynLCaYzIORf9eHUdJ oyNMvE8MGejLkUY2bikK890ijemaeJM2uxEshkFwPV5GIhdYgCXDqQUUxXKOqk5BIupN d7cLIP+LlmuDOTNmJ25Voi9jvC4bTkJE7rGneH05VMmo69CauG0EMZuE/OA/wpYn/Vy7 T5sbJ8LnnzHRiMOFLTrQOIme7Z3Y0qsj30gn5DEy3RzbEFP3BqWtCJJi7G9BZ6hEXZVd lMM8Qz+QsPXo245+DtJLxCwITLdpD3iRdhV/cRc+tIQymJ6OkZXnohUlVor155acM0lc T3PA== X-Gm-Message-State: AOAM531d0rOtPr4ySO32peIPgHqW+bJ3i1xohlUYfJKq54oRidffPUoV VTNr4DBoNGZ4kaVxHLOOM9SsvDpI1Rh5vw== X-Google-Smtp-Source: ABdhPJyw1cz9ZVsBu1SJzAf3CWg2XmBzpgI4c+IxdyVJgTYkk1LfxgD2pALn/B/WDUHXJul5nuDoDA== X-Received: by 2002:a62:a117:0:b029:394:dddf:6b00 with SMTP id b23-20020a62a1170000b0290394dddf6b00mr4045939pff.50.1630686036857; Fri, 03 Sep 2021 09:20:36 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:36 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:22 -0700 Message-Id: <20210903162027.1935040-3-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 2/7] g-ir-scanner-qemuwrapper.in: Fix shellcheck warnings, switch to sh X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" - Add double quotes to prevent globbing and word splitting. - Add indentations of continuation lines. - Disable SC2181 and SC2016 as we explicitly do not want the variables expanded in the echo. Signed-off-by: Adam Duskett --- .../g-ir-scanner-qemuwrapper.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in index ec066062e2..5ece75d0a4 100644 --- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -1,18 +1,20 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh -# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel +# Pass -r to qemu-user as to trick glibc into not erroring out if the host kernel # is older than the target kernel. # Use a modules directory which does not exist so we don't load random things # which may then get deleted (or their dependencies) and potentially segfault GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname "$0")/../lib:$(dirname "$0")/../../lib" -GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \ +GIO_MODULE_DIR="$(dirname "$0")/../lib/gio/modules-dummy" \ @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ --L $(dirname $0)/../../ \ --E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \ -"$@" + -L "$(dirname "$0")/../../" \ + -E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \ + "$@" -if [[ $? -ne 0 ]]; then +# shellcheck disable=SC2181 +if [ $? -ne 0 ]; then echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help." + # shellcheck disable=SC2016 echo 'Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"' exit 1 fi From patchwork Fri Sep 3 16:20:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524429 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=NWF2r5HB; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NMZ2rfQz9sCD for ; Sat, 4 Sep 2021 02:21:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 10E3183EE6; Fri, 3 Sep 2021 16:21:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kPXJ2p3tj_6f; Fri, 3 Sep 2021 16:21:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 6563F83E5D; Fri, 3 Sep 2021 16:21:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A56511BF327 for ; Fri, 3 Sep 2021 16:20:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 951C180D96 for ; Fri, 3 Sep 2021 16:20:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XHIcsf1a62eC for ; Fri, 3 Sep 2021 16:20:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7362F80DAA for ; Fri, 3 Sep 2021 16:20:38 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id v1so3587731plo.10 for ; Fri, 03 Sep 2021 09:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=USulRNweNztHc55o4aCohjdlbHAYnI1WoKOU2wSRfsQ=; b=NWF2r5HBYaiyJzef/c8q2tT83P/9OulC3XPcPJLQ/LIpLmmV72ichLWPyPN0kl6Azd Zmf+8RBiYFfY6FVIej0Dr8KtninIq0EUPCjnJyUxbCeurA84Ulsc4ijNKi2erjtbWYos HrfJgi9uDNfLGhVhRPdWwhCJgbKFGKJw+ckwRngJbjvnUEc40KBWW96D77xijlvIcqTp DckQzsMO41aDWd5uPs5aBjWssQCyLpCKv0pU/hhmLpZAYb1p2pfamje98gObPEiOaWgN RU5/+wuklCbQMzQt631HgHVJ2Y27LKEGuBbG1pwk8Oachiu5b/vhu7fMCBSVxfhQOVb2 6Okw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=USulRNweNztHc55o4aCohjdlbHAYnI1WoKOU2wSRfsQ=; b=C7u8wARk9f8+ryz7J3zXgmi2R6yHOOkbyRclH25Scl67suuDaz2U8i+VMoW/AWNyYG 2lrtKdnmdj2wZjqQUJXmiBiTLAx7rpC0xaxUvTJLMjJ7SUw4Zxv2o/cQnu0YaGInJOle ilSWim/XpXZQ4TlIDPe0yyHapVg4EN/AVcMU0gzdzwIAHKZPj5smas1+Z5GKOqct5uG6 eMjtSCnM9b36ndllGnaT1UvcjJHJo3mJl8/+zCuU+TR5+N3TnnddD+dTMazTqNShjz1T vVHanMKrKg70A+9DmvuBXQ1qqi7AP+mjAuIaXhl1xYJ6aq53HfxqmgK0HGZ4NTdCZ5QV kh7Q== X-Gm-Message-State: AOAM532casUfq0VlJ+2UhcDC8u+hPRA9PChkRr8kroCEzbv8Tj3oMlkS jvJe2v84JkU2GL9ntea0XKgCRIp3fk/azA== X-Google-Smtp-Source: ABdhPJzWiDW9qzKKrShoHA89xkN7pG5Mc67MSRoVy63MbeQbyZlfHZaCxzKrjyWaKiIbyo6ZQFCu9A== X-Received: by 2002:a17:902:db0a:b0:138:d2b6:4d1c with SMTP id m10-20020a170902db0a00b00138d2b64d1cmr3673738plx.72.1630686037710; Fri, 03 Sep 2021 09:20:37 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:37 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:23 -0700 Message-Id: <20210903162027.1935040-4-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 3/7] g-ir-scanner.in: Fix shellcheck warnings, switch to sh X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Signed-off-by: Adam Duskett --- package/gobject-introspection/g-ir-scanner.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in index 22df7be309..013eb15700 100644 --- a/package/gobject-introspection/g-ir-scanner.in +++ b/package/gobject-introspection/g-ir-scanner.in @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # These environment variables are empty by default, and as such ccompiler.py # defaults to either using the system tools (CC, CXX, and CPP) or leaving @@ -15,8 +15,8 @@ export LDFLAGS="${LDFLAGS:-@TARGET_LDFLAGS@}" export GI_SCANNER_DISABLE_CACHE=1 -${HOST_DIR}/bin/g-ir-scanner \ ---lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ ---use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \ ---use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \ ---add-include-path=$(dirname $0)/../share/gir-1.0 "$@" +"${HOST_DIR}"/bin/g-ir-scanner \ + --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ + --use-binary-wrapper="$(dirname "$0")"/g-ir-scanner-qemuwrapper \ + --use-ldd-wrapper="$(dirname "$0")"/g-ir-scanner-lddwrapper \ + --add-include-path="$(dirname "$0")"/../share/gir-1.0 "$@" From patchwork Fri Sep 3 16:20:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524430 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=o07GSj11; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NMn4fCdz9sCD for ; Sat, 4 Sep 2021 02:21:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 044D361542; Fri, 3 Sep 2021 16:21:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UIROrgQuu31t; Fri, 3 Sep 2021 16:21:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 5ABE06070C; Fri, 3 Sep 2021 16:21:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5DA8B1BF327 for ; Fri, 3 Sep 2021 16:20:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A512080DAA for ; Fri, 3 Sep 2021 16:20:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RYGHzV9xYUUn for ; Fri, 3 Sep 2021 16:20:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by smtp1.osuosl.org (Postfix) with ESMTPS id 33FD380D88 for ; Fri, 3 Sep 2021 16:20:39 +0000 (UTC) Received: by mail-pg1-x52b.google.com with SMTP id w7so5983491pgk.13 for ; Fri, 03 Sep 2021 09:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=op4V2cIud4vxDZYwjxkdI3wWu0mwsvsjQhpYuAKxXAE=; b=o07GSj11159R4y41GHo4cjxAsAD5XWpCKg7B/Y0R1jkOTiYt9Hadl4YEx5SSi/ifdG /+mEVUQ7f+JkeO5Zpea0ye8J+627GdRkw7INRog8gARASL9dMoPzCm4vAdRQ08q9FxJ2 ghC0uKym9iVtPE01CSxv71KNxo9v0aZ5oNI0pqWHfQbYWme9CKcpku4s+cW17TkHhd1I wx8nyjDyNkbBFXJOOpL54IcP2bYz7LoHWcrYsYFhKl9nMr9R0PlicyijN8S3TElRC1Zl U7f9lauqQe7elvrHxmOmc5h3YRnN1rVBJFrwe3xnHFSpZ13+edXl38dTFeTj0X771Ziv wFPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=op4V2cIud4vxDZYwjxkdI3wWu0mwsvsjQhpYuAKxXAE=; b=BRG9tc2lDL9JjB5ZjnGMJxseHkm+v/1irok5nNyjNS/bqHhcEZR69/lAXgUUEZ99cg i37hmBCKdYB7av6hbquboyXAwlrvqvZ8DzcG9xZnEhODldXZwAWFZ2ANnLrZsAA87D4N T1U/Iuxk9TDpkCACEjGyXzLYt5kU+ihP+uN64BEEoeCCfFy51ClDXpMgNPbIcLNrQih7 iKW/0JKmDHmKbtH/VReZv3yJSA68Gi4JpxqQUr4JzL7gS7qL19wKz2p6Gk2IsSqIv0rb X1u7hv8pxApCAHkseVG2429LC+7NNSU1pH2GTVugy8SJYSO8AX+kovrKjDJnz7FbdhCI kOZw== X-Gm-Message-State: AOAM533YrcfMAba2H9JTeDGB2gffB/ZGQa8LOW5fQuLUPuxiHCLrukpZ ShHh/sYZCSQTcVWQvMxEVX7iGj8yDSe73g== X-Google-Smtp-Source: ABdhPJzQUXLIOnFlwUnmkPayrJDmpIQkRjlD/K/NURGdaaG/3+P/e8qK1Kc6z9EF/IdpkcPopUcOKQ== X-Received: by 2002:a63:cc01:: with SMTP id x1mr4311100pgf.304.1630686038528; Fri, 03 Sep 2021 09:20:38 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:38 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:24 -0700 Message-Id: <20210903162027.1935040-5-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 4/7] g-ir-scanner-lddwrapper.in: Fix shellcheck warnings, switch to sh X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Signed-off-by: Adam Duskett --- package/gobject-introspection/g-ir-scanner-lddwrapper.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in index c19314566a..2f09bca77a 100644 --- a/package/gobject-introspection/g-ir-scanner-lddwrapper.in +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in @@ -1,3 +1,3 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh -${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../../ "$@" +"${HOST_DIR}"/sbin/prelink-rtld --root="$(dirname "$0")/../../" "$@" From patchwork Fri Sep 3 16:20:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524431 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=OWXEkgwM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NN14mRGz9sCD for ; Sat, 4 Sep 2021 02:21:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 076AD426C7; Fri, 3 Sep 2021 16:21:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cxBezaEMnAcY; Fri, 3 Sep 2021 16:21:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 609CC426C1; Fri, 3 Sep 2021 16:21:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4651D1BF327 for ; Fri, 3 Sep 2021 16:20:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 362A480D96 for ; Fri, 3 Sep 2021 16:20:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OhyKwQHdUzbO for ; Fri, 3 Sep 2021 16:20:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by smtp1.osuosl.org (Postfix) with ESMTPS id BAA8E80D88 for ; Fri, 3 Sep 2021 16:20:40 +0000 (UTC) Received: by mail-pf1-x42e.google.com with SMTP id u6so4690033pfi.0 for ; Fri, 03 Sep 2021 09:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vkvo0uHKR3O8C8Y6KX+ZyU7wcwPniSvzSFj8twsBlnQ=; b=OWXEkgwMFIj5MBcPi8j2ahf/BIx1mLdWwZQupfjpRVbPH4QqE8yFUOPSfmQhpiw9MB acnmgJRww0BlkdGHmKfaDNNTZqQyKE8uypSx6lhwtyz+f7jmbhvEQ+Epgjhj+CTITqHY JJB8dXZFNTsclSBStM1P2RIRHN0W2GUJhOvtgK8adM6duDvdpnHPDndCzYmT8G6iESYb g9Ec4ZIkeiRwO2Fp9jNyR7Bkps63/9LCCtZEdkAL+6vMQQKHEaZGgDy/0oF10o0sQhbx 25wd2ucG6fbhFPx+QzK7nM5KdaaG6wkuigrAfWalqQwlVurhJfC/rpds3V/2QUu0j6SV cpUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vkvo0uHKR3O8C8Y6KX+ZyU7wcwPniSvzSFj8twsBlnQ=; b=mojlFcK3VpvhG8LtHDJI4Mu4Mf6xX5XEF8S8LtEKGHYUbApHYkFKnePPRg63m+qu0Y EVGg/k72kXHBSLGNoWci/n3ImO91g6A/TNzeE89kVdf6L2mbux+ZpLZCqBL70f3p9Op5 Z7WG1noDY4XfCFH1s9OaKbcTpaA0nwQmfINGSoPSnwADt2ByWkCzHItbqaoM6faUedaQ 38ySQz8eVztwveji+PLIvy6VRufBazUOIr3oggjsG9+l5MZj4OcuI7s7x9tZJTjWzzJm C+NrjNs0poHCUSiiinv9B768zFMCMS2W5NLibYyRlPOKbepptO5qv2j5sVS6rI8nM38Q XArg== X-Gm-Message-State: AOAM531dbqcAf/lGzuBDBDS4hOgPHy+t3dPZ6Ho/da7+Gu+KSAdWwnRL m43UjrL2IzqIa6deX2YZnpHOQgVGe8NAsg== X-Google-Smtp-Source: ABdhPJy+qNPSQr/T23criTQDYsKC/WpblFzuTcLZ0jV+o9gjHh7yaIJU5oMTS0lJsxgJ5bLBhwqIUw== X-Received: by 2002:a63:fe41:: with SMTP id x1mr4219758pgj.272.1630686039286; Fri, 03 Sep 2021 09:20:39 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:39 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:25 -0700 Message-Id: <20210903162027.1935040-6-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 5/7] g-ir-compiler.in: Fix shellcheck warnings, switch to sh X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Signed-off-by: Adam Duskett --- package/gobject-introspection/g-ir-compiler.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in index 3313cc501f..712753023a 100644 --- a/package/gobject-introspection/g-ir-compiler.in +++ b/package/gobject-introspection/g-ir-compiler.in @@ -1,3 +1,3 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh -$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/g-ir-compiler.real "$@" +"$(dirname "$0")"/g-ir-scanner-qemuwrapper "$(dirname "$0")"/g-ir-compiler.real "$@" From patchwork Fri Sep 3 16:20:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524432 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LFKHEAhV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NNG4JTGz9sCD for ; Sat, 4 Sep 2021 02:21:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2B7BA407FF; Fri, 3 Sep 2021 16:21:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uIYfvyxWkowa; Fri, 3 Sep 2021 16:21:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 38C784073D; Fri, 3 Sep 2021 16:21:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9BD681BF327 for ; Fri, 3 Sep 2021 16:20:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 96C1E4073D for ; Fri, 3 Sep 2021 16:20:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GJthfBdNyxk7 for ; Fri, 3 Sep 2021 16:20:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by smtp2.osuosl.org (Postfix) with ESMTPS id E5684400C7 for ; Fri, 3 Sep 2021 16:20:40 +0000 (UTC) Received: by mail-pg1-x52c.google.com with SMTP id r2so5995246pgl.10 for ; Fri, 03 Sep 2021 09:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DvuXWTm3SB6cQ4/PhpZjL1LA/FnhOYWY42zqGqqrs74=; b=LFKHEAhVFn6BN4zfGulSnXd/wyRVq1VwjyWNUrxNtQhW8Yyfjp9b1ppEAd4vzYivPJ QFUC1cFhSo4OQT1B0yZrttZkwNnWufHQviA5LGPrxVkRfiysLXaU6NUWfxJkTQCpgUmw jseIdbsNaODMzFB7v8aE3j7ogAiSVH0d0wDKW1fhQXurmBlza4oixtYf7uRix1n4DLPx XP7OK5gZXWiolT1/FM6TxuvRaTN6W3NhbEOskxkQeghvvncz4YH2hrkcM0mI6NybWkLc vRNxuJiCeFxO6n1e+1Sz0/UIWutH4C/5a5yFfOjQgR6l1iXY/9sJGfA4frGgyVESaMyc 5d6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DvuXWTm3SB6cQ4/PhpZjL1LA/FnhOYWY42zqGqqrs74=; b=CSNsIoAMAgsVMqrZKHt7Hw67CAxCmOF5z/Agvqe1tqE69els8mvtRTJuqHxqiLRCTS uKFzSI+uUakBUPnxkrSaideizsiy+H8I/KyeO+NFDdsdSNJpmgP+w2OqcgJOZYxsbess xmZoo0YGAZNED8xjtpeWrnODK7tAaDb4ZBYBYrlct1qfNBmeEmVP80Xj3Ua5nqUuJ1KO ockIReaCKRspLZgvrtHlfy8Fmj2KSzu/YbnygodTCPruX9oFflmB+1V7zUEEo1y3F8Dd s4DTgRzc8oWU0GiV9RdWiUL1pGe1OzlHdDYmuHMOBf8Kavtlpb0vlrvdxG9BDbWyNyed ohhQ== X-Gm-Message-State: AOAM531COQKwQ00YJPdxKqtDlWpwHNtZ90PFz9hfL4m+XGkIXbGoul34 sMlSgvDKW/0rmtmDryXQ85syHKQyyb3xpA== X-Google-Smtp-Source: ABdhPJxn/KRHD0KcFs+7iDET70ij8lStSly9xFDS4+6kMvnP8Kd6v9hMTWD9Qb31h1u903adKcwBTA== X-Received: by 2002:a63:595f:: with SMTP id j31mr4259155pgm.109.1630686040176; Fri, 03 Sep 2021 09:20:40 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:39 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:26 -0700 Message-Id: <20210903162027.1935040-7-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 6/7] package/qemu: add BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS string X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" For specific architectures, running qemu in user mode without any additional options may fail if the host processor does not have the necessary instructions to properly run qemu in user mode, which results in the following error: "qemu: uncaught target signal 4 (Illegal instruction) - core dumped" CoreI7 is one such architecture that has had consistent auto-build failures. Add a new string in qemu/Config.in.host: BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS. The default for the Corei7 architecture is directly from the OpenEmbedded project found in meta/conf/machine/include/x86/tune-corei7.inc: "-cpu Nehalem,check=false." Other architectures may be added to this string at a later date if other failures occure. Signed-off-by: Adam Duskett --- package/qemu/Config.in.host | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index 2dcf5631e5..fedf90d8b7 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -73,6 +73,10 @@ config BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE the running host kernel, you may run into invalid system calls, which may yield surprising effects. +config BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS + string + default "-cpu Nehalem,check=false" if BR2_x86_corei7 + config BR2_PACKAGE_HOST_QEMU_VDE2 bool "VDE2 support" help From patchwork Fri Sep 3 16:20:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1524433 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=TUvvmayt; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@lists.buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H1NNV3qzSz9sCD for ; Sat, 4 Sep 2021 02:22:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D308D83E5D; Fri, 3 Sep 2021 16:22:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YEFLYPz_ncwR; Fri, 3 Sep 2021 16:22:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 1DC5780F79; Fri, 3 Sep 2021 16:21:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9700A1BF327 for ; Fri, 3 Sep 2021 16:20:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 93F4580D96 for ; Fri, 3 Sep 2021 16:20:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id us7olzaLSgJd for ; Fri, 3 Sep 2021 16:20:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by smtp1.osuosl.org (Postfix) with ESMTPS id BFA2280D88 for ; Fri, 3 Sep 2021 16:20:41 +0000 (UTC) Received: by mail-pg1-x52d.google.com with SMTP id g184so6016265pgc.6 for ; Fri, 03 Sep 2021 09:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n1e+TjQ5E/oH7/8sE+dNUb2Rj/cZfHlOI7LfccoUooM=; b=TUvvmaytj4aThJv6sMyt7PZq6qEwOVY7gy5/g2iGUPAE+ydCcfv/Pm9jJzCSGQ9nT+ iIBG+CyR404EMIvGZZwALCCleQsWCUVYdtzDMNa/fqqCwXMl1Y6j11R++uymMZ/Ei3pd CSx1e1VThCN1CnrQ20e29nBnEqcXb8yqg4apWmDzGazCaUmGS+uFPkk9fWy07yq9zDtv P8Hiz2s8w0oVxS1Fwl3Gmr966vFTNhjP4ObisLHpy06NWeKWVIwIQG8j00htLRaQm9qn slYhkA3ffGqMGomjitYCltWDm9gOK/HfhfKU9YgaeeF8m9+5s7Hp9vOWnPZwADwl/T3Q OniQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n1e+TjQ5E/oH7/8sE+dNUb2Rj/cZfHlOI7LfccoUooM=; b=IlND5hF8CCraqo6mGu9X/pKMwRAIytbQ1FqjYLDFUCO59ziqPTieuAdYzvpV43CFYV vO3JfzmZq+oLZD/GLzmTolwLW8DcQEJnGC8n36xQP4yz53B98n7mwFYYbURBeMDw8I5A p7muvK+8MtAh+mVDPIlU4HEnJFmatZdjRUzfqpvVk6oSAJbC7zF5UhmcJBqeU0w84ssV RvYedF+Fct33X1dtdNkT2ytaAWH0HGQduKQ5yXyjo3sekT4zuG+2f4GvGcEdVcjTDuj8 /M4RZnI37uVo+b1mGKyI8M5deCCJTPayYiqt9FfFIacwNrqp8eVVzJ64lc0Ibvk40CRv TTyg== X-Gm-Message-State: AOAM530lhsmL4n9QmpPzqfvzQd4EYiuj2z8SnSJt6DkzeLezobu/rSAS i1R/KmRzslss1DUZHxrLVXbcisiOR6rhaQ== X-Google-Smtp-Source: ABdhPJw3+GXrRbmISQqJmbRKhGTcrGkiPiY7FWqeENffz0f/cFUjrh8x1PIrICJbuJrJOVLA/3lbLg== X-Received: by 2002:a65:648b:: with SMTP id e11mr4262648pgv.138.1630686041015; Fri, 03 Sep 2021 09:20:41 -0700 (PDT) Received: from adam.rai.com ([47.149.13.137]) by smtp.gmail.com with ESMTPSA id q7sm5586184pja.11.2021.09.03.09.20.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 09:20:40 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Fri, 3 Sep 2021 09:20:27 -0700 Message-Id: <20210903162027.1935040-8-aduskett@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210903162027.1935040-1-aduskett@gmail.com> References: <20210903162027.1935040-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/master 7/7] package/gobject-introspection: Add QEMU_USERMODE_ARGS support X-BeenThere: buildroot@lists.buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Anisse Astier , Adam Duskett Errors-To: buildroot-bounces@lists.buildroot.org Sender: "buildroot" Now that the qemu package has the BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS string, the gobject-introspection g-ir-scanner-qemuwrapper script can pass that string to qemu. Add the QEMU_USERMODE_ARGS to g-ir-scanner-qemuwrapper.in and unconditionally sed @QEMU_USERMODE_ARGS@ with BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS. Fixes: http://autobuild.buildroot.org/results/2e9dbc0d36600c09fa9e59ab1b1903c9f40661e8 Signed-off-by: Adam Duskett --- package/gobject-introspection/g-ir-scanner-qemuwrapper.in | 2 ++ package/gobject-introspection/gobject-introspection.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in index 5ece75d0a4..e434502e2b 100644 --- a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -5,8 +5,10 @@ # Use a modules directory which does not exist so we don't load random things # which may then get deleted (or their dependencies) and potentially segfault GOI_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH:+${GIR_EXTRA_LIBS_PATH}:}.libs:$(dirname "$0")/../lib:$(dirname "$0")/../../lib" +QEMU_USERMODE_ARGS="@QEMU_USERMODE_ARGS@" GIO_MODULE_DIR="$(dirname "$0")/../lib/gio/modules-dummy" \ @QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ + ${QEMU_USERMODE_ARGS:+${QEMU_USERMODE_ARGS}} \ -L "$(dirname "$0")/../../" \ -E LD_LIBRARY_PATH="${GOI_LIBRARY_PATH}" \ "$@" diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 81938b14df..23d6a8231e 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -84,6 +84,8 @@ define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@QEMU_USERMODE_ARGS@%$(call qstrip,$(BR2_PACKAGE_HOST_QEMU_USER_MODE_ARGS))%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper