From patchwork Tue Feb 22 12:51:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5270 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 4K2zbm53KTz3xgb for ; Tue, 22 Feb 2022 12:52:52 +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 4K2zb02Ly1z5gL; Tue, 22 Feb 2022 12:52:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K2zZy6bYfz32Mp; Tue, 22 Feb 2022 12:52:10 +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 4K2zZs2JP8z2xVY for ; Tue, 22 Feb 2022 12:52:05 +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 4K2zZq5sS1z5RJ; Tue, 22 Feb 2022 12:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1645534324; 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: in-reply-to:in-reply-to:references:references; bh=6Gr9aBlF0ZfE6/ZX7nYfmA3FdtDlIRhg5XY+N9G5YSw=; b=G5pKoe77o0/PA+w8nDNWDx3E4wu7U8iJhqu4qs85trXdlVjSZFcEvEz9ioJMZIohbKW8Db pPt1+1vuo0i45XPFZkAZi/VIduW5wiOxNfuCX6gdrfJB4l6HnBd7oBnzo8Bd5hIg3chqHg mC8nS2icBst30s8w9Qyn+PbrbdOZH8nmB5wxG87V54tKuo/oNzye23iYYvY9K55USp/Poe UbaTKvdOo86V5YRqPmwwVoq98HELPhOJA5w3Z121L+Lmbt3DGHW51tvqMOEUo+Ay7PPxdT HcQ8E9Lj61XcDWpC79T22N0EtN2GJqV8vi0YjIdxSK8+a9H97Vihn7ft5NMS5Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1645534324; 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: in-reply-to:in-reply-to:references:references; bh=6Gr9aBlF0ZfE6/ZX7nYfmA3FdtDlIRhg5XY+N9G5YSw=; b=35YCoE1NpMdkGky5ghNQt3R8Y3eJSjs+MXOSnU8VgI5gx9Kq7+X+3b4WqvJ0VQmfCcSRRG h63xru1OtZvDe1Cg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 49/50] strip: Do not try to strip QEMU Date: Tue, 22 Feb 2022 12:51:34 +0000 Message-Id: <20220222125135.1211290-50-michael.tremer@ipfire.org> In-Reply-To: <20220222125135.1211290-1-michael.tremer@ipfire.org> References: <20220222125135.1211290-1-michael.tremer@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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/strip | 1 + make.sh | 2 +- src/stripper | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lfs/strip b/lfs/strip index c577c954b..64f5c702f 100644 --- a/lfs/strip +++ b/lfs/strip @@ -58,6 +58,7 @@ else # /usr/sbin/vdr. $(DIR_SRC)/src/stripper / \ --exclude=$(TOOLS_DIR) \ + --exclude=$(QEMU_TARGET_HELPER) \ --exclude=/tmp \ --exclude=/usr/src \ --exclude=/usr/lib/vdr \ diff --git a/make.sh b/make.sh index 1fb14c9ea..b6d8153d2 100755 --- a/make.sh +++ b/make.sh @@ -781,7 +781,7 @@ fake_environ() { } qemu_environ() { - local env + local env="QEMU_TARGET_HELPER=${QEMU_TARGET_HELPER}" # Don't add anything if qemu is not used. if ! qemu_is_required; then diff --git a/src/stripper b/src/stripper index 498a8a30e..fadbc514b 100755 --- a/src/stripper +++ b/src/stripper @@ -11,7 +11,9 @@ while [ $# -gt 0 ]; do strip="${1#*=}" ;; --exclude=*) - excludes+=( "!" "-path" "${1#*=}/*" ) + if [ -n "${1#*=}" ]; then + excludes+=( "!" "-path" "${1#*=}" "!" "-path" "${1#*=}/*" ) + fi ;; --ignore-errors) break_on_error="0"