From patchwork Sat Aug 17 13:18:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 1973489 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WmKFK6L38z1yXf for ; Sat, 17 Aug 2024 23:19:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 07AFC4031C; Sat, 17 Aug 2024 13:19:00 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id yza1-RwT8bwK; Sat, 17 Aug 2024 13:18:58 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B70574036E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id B70574036E; Sat, 17 Aug 2024 13:18:58 +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 535EA1BF267 for ; Sat, 17 Aug 2024 13:18:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4D52F4031C for ; Sat, 17 Aug 2024 13:18:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hGeB5Pzlxz-a for ; Sat, 17 Aug 2024 13:18:56 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=89.238.66.15; helo=helium.openadk.org; envelope-from=wbx@openadk.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 2877C400C6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2877C400C6 Received: from helium.openadk.org (helium.openadk.org [89.238.66.15]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2877C400C6 for ; Sat, 17 Aug 2024 13:18:54 +0000 (UTC) Received: by helium.openadk.org (Postfix, from userid 1000) id 919283535C1E; Sat, 17 Aug 2024 15:18:52 +0200 (CEST) Date: Sat, 17 Aug 2024 15:18:52 +0200 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 5.10.0-31-amd64 x86_64 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openadk.org; s=2022; t=1723900732; bh=HaHvlCPgucSYDnxaxf52aKcXAkTz5RIMl03/wfmclUs=; h=Date:From:To:Subject:From; b=Xw9kQFte9fwpEFC+NWPqgwtceAyDW+efsC91q4ic9CralMAkvvEsnt09hiCaGEQs8 vVnLym7XI0mT7rZcNEzr5NtZYC1juOc+Xpw/yW4iDeUJmWlp3ph9IT7gStKbCAoD9o yA6L9OBMjuiKHlKET2IfuUffHyeawl9ikASG9aedJC9VMTAoItNqOu5cQSmLo88PQK jtPXjlvJAowPNabYyTJAtYXSvx43V/zwhshczxeSiExYrDlW7mPbJr97PVVyoGRN7m eY0WNRu7r2reVui+L2os1of6RISU6MngLZLrgBNulVVdKtTiysv1SAdXhPuDds6Al9 NqRzL7iP5la9A== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=openadk.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=openadk.org header.i=@openadk.org header.a=rsa-sha256 header.s=2022 header.b=Xw9kQFte Subject: [Buildroot] [PATCH] package/avahi: fix python install issue X-BeenThere: buildroot@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: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Since the update of Python to 3.12.4 in commit 76cd14167f5eb3ffe22e131ddbbecf9bc61f2ef1 avahi fails to install python subcomponents. The reason is that the obsolete imp python modul is used. Add a patch to remove the imp dependency. Fixes: - http://autobuild.buildroot.net/results/2bf/2bf391b93362204917a560705bc402585334ab3c Signed-off-by: Waldemar Brodkorb --- .../0002-remove-imp-from-py-compile.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/avahi/0002-remove-imp-from-py-compile.patch diff --git a/package/avahi/0002-remove-imp-from-py-compile.patch b/package/avahi/0002-remove-imp-from-py-compile.patch new file mode 100644 index 0000000000..37534a3f7a --- /dev/null +++ b/package/avahi/0002-remove-imp-from-py-compile.patch @@ -0,0 +1,50 @@ +Remove optional imp python module dependency. + +Upstream already removed py-compile entirely in their git repository, +so the patch is not appropiate for upstream. + +Signed-off-by: Waldemar Brodkorb +Upstream: not appropiate + +diff -Nur avahi-0.8.orig/py-compile avahi-0.8/py-compile +--- avahi-0.8.orig/py-compile 2020-02-18 07:58:21.192417644 +0100 ++++ avahi-0.8/py-compile 2024-08-17 15:03:07.328733849 +0200 +@@ -116,7 +116,7 @@ + fi + + $PYTHON -c " +-import sys, os, py_compile, imp ++import sys, os, py_compile + + files = '''$files''' + +@@ -129,15 +129,12 @@ + continue + sys.stdout.write(file) + sys.stdout.flush() +- if hasattr(imp, 'get_tag'): +- py_compile.compile(filepath, imp.cache_from_source(filepath), path) +- else: +- py_compile.compile(filepath, filepath + 'c', path) ++ py_compile.compile(filepath, filepath + 'c', path) + sys.stdout.write('\n')" || exit $? + + # this will fail for python < 1.5, but that doesn't matter ... + $PYTHON -O -c " +-import sys, os, py_compile, imp ++import sys, os, py_compile + + # pypy does not use .pyo optimization + if hasattr(sys, 'pypy_translation_info'): +@@ -153,10 +150,7 @@ + continue + sys.stdout.write(file) + sys.stdout.flush() +- if hasattr(imp, 'get_tag'): +- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) +- else: +- py_compile.compile(filepath, filepath + 'o', path) ++ py_compile.compile(filepath, filepath + 'o', path) + sys.stdout.write('\n')" 2>/dev/null || : + + # Local Variables: