From patchwork Mon Nov 28 13:24:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6195 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NLR5H39xMz3xfS for ; Mon, 28 Nov 2022 13:24:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NLR5G5WyGz2qh; Mon, 28 Nov 2022 13:24:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NLR5G4wjJz2xhb; Mon, 28 Nov 2022 13:24:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NLR5F4r7gz2xNV for ; Mon, 28 Nov 2022 13:24:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NLR5D6wdnz1Fy; Mon, 28 Nov 2022 13:24:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669641857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mQS26dIdTME7JPkiisSBCO00l2z0XAnJ1gFr4BAJYdw=; b=FwzbJsms7vapHt7cpZbEwqifoGCRKWzUsbRZH3cpGLHQ9aYMeEuywXjwNL2/15S2RexFYP kkKYMDXQy7xWCXCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669641857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mQS26dIdTME7JPkiisSBCO00l2z0XAnJ1gFr4BAJYdw=; b=MYIFR3k8TFRzRq3hEFw54gJMUx3VX9kALTeqQarR6THHjPz4izIy6zACdnY5HeWLyi0lT3 +qxPeIP8yZWu0oWtKNJwUHqyByzTN3IBjLN9fXwEjjj1os6w0kja/joc5Ou0F2JyvemqFk 6R95UaZNqrN4it+34wRZEvFt5lZktfBPHktlWdHY5PLFOkAtoS/oDU3aP+dQK4YWupqYTY cCoUEY3wMTEbDbXjowZq6lSRm7/hNydoUWkdfY3E5w8CjUok67crph0kL2SV6q9fb3x7Vm NgiszXTSn/WOjRriGye9rVvsm9hUBS0rMVU2et9DvlnQd9tKIlgrVlYVpBfQ/g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] make.sh: Update check for static linked qemu files Date: Mon, 28 Nov 2022 14:24:15 +0100 Message-Id: <20221128132415.1572624-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - In Arch Linux the file -L command comes up with "static-pie linked" instead of "statically linked" - This patch makes the grep look for either one of those strings. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index c0d1f1d2c..e214fdf3e 100755 --- a/make.sh +++ b/make.sh @@ -910,7 +910,7 @@ qemu_find_build_helper_name() { file_is_static() { local file="${1}" - file -L "${file}" 2>/dev/null | grep -q "statically linked" + file -L "${file}" 2>/dev/null | grep -q -e "statically linked" -e "static-pie linked" } update_language_list() {