From patchwork Thu Oct 6 10:03:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Linderud X-Patchwork-Id: 2087 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [2a01:4f9:c010:3052::1] by patchwork.archlinux.org with IMAP (fetchmail-6.4.33) for (single-drop); Thu, 06 Oct 2022 10:03:30 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id ILx8C/KnPmMqggEAK+/4rw (envelope-from ) for ; Thu, 06 Oct 2022 10:03:30 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::1]) (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 mail.archlinux.org (Postfix) with ESMTPS id A7639153C30C; Thu, 6 Oct 2022 10:03:28 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 326DE51FC0B; Thu, 6 Oct 2022 10:03:26 +0000 (UTC) Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by lists.archlinux.org (Postfix) with ESMTPS id 916A851FC02 for ; Thu, 6 Oct 2022 10:03:22 +0000 (UTC) From: Morten Linderud DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1665050602; 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=WufKxmsMBfLIqBDQfiO5zzIyKlLH4+N1cT4c++mWt3U=; b=gNbl0VYidC2893AAzRFRtcSUY7cU+nkh76ZSkxc0DHzvb4pljPP+de59yY01vrinjQL6ov jCgKsIzPaxqQDsVJS1aEdpBKAn8IQ2zLrlGI4N7doQqZdiSaFCoXuxqmsK87Z4aHWQlpd2 vgpRuo24NnK2kIkMSMlUQhOTTsAN9/Ed0/OtpiqCp2BVo87VWSkQSSPcDDzQjbQmCxdFOv G8FSSDf2XbAjT4pdwO/wGfLDJDyZf9CeESMA6yNyRWyzJx1RRBAU/zO3/BWnoHvY2pLY0p OvJbG9bRbMlgIOc6X9fyvalsDPsjGjupfbdz2sjYeaZ5b6ByRVTfGcrOvWzWHVFAbix0Mj S5KRPEuar4I0GN36rsGF8kXBRefAlZ96lnw7f3QVcNbzjhBqFzrr9zbM5CJXbpC+xKSsbf JnS90NC5gAPsi1yHn7/VmHbryZWbH93EZQGrDNpSVDWPacOW3gYucGZfv9MzhE6SAi896b +e3eh9EeNJ2uJ3Z46knkHs3P2WYuOFH1tXE1EexIicGfzCrMnF556DklStBKJ252l2g2X2 LgJHtOTTQYR0UW0ntNUdomcxSzBJ9gAquEkwbR0zBE8C+Rac2j1Lm8URzRc3gtiI7zOvr6 8E/Dkt8lxlu8diVHz163XgJi773Xv/8QVZMm+bAGrOHKCkYAwjErM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1665050602; 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=WufKxmsMBfLIqBDQfiO5zzIyKlLH4+N1cT4c++mWt3U=; b=5pUr5x0W5Bho02KIJEvFHkW34IYdDx+A8l08IQ0YIxy/tLgDzLL9fujIhIYQrjxENWK1F+ OJyan661x7QWGqCg== To: pacman-dev@lists.archlinux.org Subject: [PATCH] strip: fix unique source paths Date: Thu, 6 Oct 2022 12:03:14 +0200 Message-Id: <20221006100314.972835-1-foxboron@archlinux.org> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 Message-ID-Hash: IQJ67VBIG6VRTHOYKYNLR2BCLAK2IA2U X-Message-ID-Hash: IQJ67VBIG6VRTHOYKYNLR2BCLAK2IA2U X-MailFrom: foxboron@archlinux.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Morten Linderud X-Mailman-Version: 3.3.5 Precedence: list List-Id: Discussion list for pacman development Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Spamd-Result: default: False [-1.51 / 15.00]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[archlinux.org:dkim]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-rsa,archlinux.org:s=dkim-ed25519]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; RCVD_IN_DNSWL_MED(-0.20)[2a01:4f9:c010:9eb4::1:from]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[95.216.189.61:received]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; DKIM_TRACE(0.00)[archlinux.org:+]; RCVD_COUNT_THREE(0.00)[3]; FROM_NEQ_ENVFROM(0.00)[foxboron@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM(-0.00)[-1.000]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Authentication-Results: mail.archlinux.org; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b=gNbl0VYi; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b=5pUr5x0W; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org; dmarc=pass (policy=none) header.from=archlinux.org X-Rspamd-Queue-Id: A7639153C30C From: Morten Linderud `${pkgbase}` was added to the wrong invocation. This ensures we are producing correct debug packages. Example from the package: /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.h /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.c /usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.h Fixes: 776b7c1e75f2 ("debugflags: Ensure we have unique source paths") Signed-off-by: Morten Linderud --- scripts/libmakepkg/tidy/strip.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 91c66f13..01af6e03 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -47,7 +47,7 @@ source_files() { LANG=C debugedit --no-recompute-build-id \ --base-dir "${srcdir}" \ - --dest-dir "${dbgsrcdir}/${pkgbase}" \ + --dest-dir "${dbgsrcdir}" \ --list-file /dev/stdout "$1" \ | sort -zu | tr '\0' '\n' } @@ -141,7 +141,7 @@ tidy_strip() { if check_option "debug" "y"; then dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug" - dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}" + dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" dbgsrc="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@$dbgsrcdir" mkdir -p "$dbgdir" "$dbgsrc" fi