From patchwork Sat Feb 3 10:52:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7534 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 (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4TRqHK0RVQz3wvr for ; Sat, 3 Feb 2024 10:53:01 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4TRqHF25nfzmr; Sat, 3 Feb 2024 10:52:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TRqHD64vjz32hQ; Sat, 3 Feb 2024 10:52:56 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4TRqH96Qq2z2xcR for ; Sat, 3 Feb 2024 10:52:53 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4TRqH90C00zPW; Sat, 3 Feb 2024 10:52:52 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1706957573; 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=4TBdLZBLdAz/JN4BDdimave72sCZYBjR+0JV6oYbt6E=; b=4fTDXepAcPnCsB1qpvDM5kCW4zJ0F480T0AuykOPgpSVcIju/vJPGe+QsX2wn8nA0ru32H 5JsCirlyTaVOsPCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1706957573; 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=4TBdLZBLdAz/JN4BDdimave72sCZYBjR+0JV6oYbt6E=; b=LTU/NiF5WrjdtFHQdgA+d5MVlURlqnu2sq0X+3NXcVEUC0UAaoQ7RuhQKcsKVA4daduMnk qsM0FZPSx2SAGggnCokd9oqwInma683rUyd164XTCK4kO+5VSbyMKhEAtYqoe1vVBACkms 7PU/FoWJ1JRGaNLTaMe1UCUW+jLnpur92OwsRXPC0JM/Ol4UERV+Ufx+5+oxsqftTlXG52 Kea0kGJerujEG46bbA8yQyzMFOlvOw/Fm1p6FGminmqw03qIrbVhMknGjmH+FEkqgdBbe/ yHn4HZ/yBygufopynTsQglXEj1YldxdclRUe8YQKGKb1YvgiDZD5hldYlF8Vrg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] python3-msgpack: Add xxxMACHINExxx into arch specific file in rootfile Date: Sat, 3 Feb 2024 11:52:44 +0100 Message-ID: <20240203105244.3497-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: BWMSYPG3FL3RJE46QDVAFXVDDRRON5GY X-Message-ID-Hash: BWMSYPG3FL3RJE46QDVAFXVDDRRON5GY X-MailFrom: adolf.belka@ipfire.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 X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - In the 1.0.7 version of python3-msgpack there is one filename that has been introduced in the rootfile that has an architecture specific name. This did not get flagged up by the IPFire build process so I missed it. - I noticed it from the aarch64 nightly build of next continually failing at the package installation section of python3-msgpack because it could not find that file which was labelled in the original patch submission explicitly with the x86_64 name. - This patch corrects that, replacing the x86_64 with xxxMACHINExxx and bumping the PAK VER for this package. Signed-off-by: Adolf Belka --- config/rootfiles/packages/python3-msgpack | 2 +- lfs/python3-msgpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack index 2347b0834..e5742ddb9 100644 --- a/config/rootfiles/packages/python3-msgpack +++ b/config/rootfiles/packages/python3-msgpack @@ -6,7 +6,7 @@ usr/lib/python3.10/site-packages/msgpack #usr/lib/python3.10/site-packages/msgpack-1.0.7-py3.10.egg-info/top_level.txt usr/lib/python3.10/site-packages/msgpack/__init__.py usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpp -usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpython-310-x86_64-linux-gnu.so +usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpython-310-xxxMACHINExxx-linux-gnu.so usr/lib/python3.10/site-packages/msgpack/_cmsgpack.pyx usr/lib/python3.10/site-packages/msgpack/_packer.pyx usr/lib/python3.10/site-packages/msgpack/_unpacker.pyx diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack index f09edd3e8..1179678fc 100644 --- a/lfs/python3-msgpack +++ b/lfs/python3-msgpack @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-msgpack -PAK_VER = 4 +PAK_VER = 5 DEPS = # borgbackup only works with specific versions of python3-msgpack - check when updating