From patchwork Wed Jul 28 17:29:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4569 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GZgdr4mFMz3xGp for ; Wed, 28 Jul 2021 17:29: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 4GZgdq4ZS1zR7; Wed, 28 Jul 2021 17:29:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GZgdq3kyMz2xmL; Wed, 28 Jul 2021 17:29:51 +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 4GZgdp2NV8z2xff for ; Wed, 28 Jul 2021 17:29:50 +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 4GZgdn5vp5zR7; Wed, 28 Jul 2021 17:29:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1627493389; 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=LWQvh4o5oqO4YmKM5sVmzjLdT6HHWU3R5Vs/GTUg60s=; b=wFNPPWptiH/azHo+SYtw+PcP9p0bVpseNZZv98DARmpKIWkYw/QsZS48inqfnAWTVGA2OP eZnCyWDH4S5tmXDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1627493389; 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=LWQvh4o5oqO4YmKM5sVmzjLdT6HHWU3R5Vs/GTUg60s=; b=bipfpyVEDliVM3vvd9Mm/gcLfMR4ZlaQYCd3a56FOMOHQELa/r36OZaSKPzUo7mcUyxI67 xQQ/0ikfgMk+mwSzy1Jb2xqRjhVNqY7vO49kA3DuHA6yo2rHQCPhEfAKB7tCoX4dh6TNgs 3WGXoq/zUDwSDc50gT6abq+j6C3azh6ZWKiiqtZ1MTyV9e9yOm3Slz0GqH4FxrJ1hrqQw4 u8PWfhall9gQYNc36sN6VtmkyhVZ+wOTBl8jj+d6/7WY0l1rFYO+jzWGrKhaxs1tDRTkzg S3P7G0AKZVq4gIOZ339TmCF++FRwFra2i5egx7P78hmLT2RhlmLBzo2Angr7Aw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 1/8] make.sh: Remove crda and remaining python2 modules Date: Wed, 28 Jul 2021 19:29:25 +0200 Message-Id: <20210728172932.2737967-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" - crda only works with python2 version of m2crypto python-m2crypto requires python-setuptools and python-typing - With Linux kernel 4.15 and later the country code status check that crda did is built into the kernel. - So from kernel 4.15, crda can be removed, which allows removal of m2crypto, setuptools and typing. - python-typing is built into python3 so no additional python3 module required. - python3 version of python-setuptools has already been installed. - python3 version of python-m2crypto is not required. python-m2crypto is only used for the build of crda. - ipaddr can be removed as the function of this python2 module is built into python3 with ipaddress.py - removal of crda tested with 5.10.45 kernel and the setting of a country code was recognised. If this test carried out with crda removed and 4.14.232 kernel then country code stays defined as the global code "00". Signed-off-by: Adolf Belka --- make.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/make.sh b/make.sh index 13a48f461..57b83e432 100755 --- a/make.sh +++ b/make.sh @@ -1296,7 +1296,6 @@ buildipfire() { lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools - lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols lfsmake2 hwdata @@ -1333,7 +1332,6 @@ buildipfire() { lfsmake2 XML-Parser lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet - lfsmake2 python-setuptools lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils @@ -1517,10 +1515,7 @@ buildipfire() { lfsmake2 swig lfsmake2 u-boot lfsmake2 u-boot-friendlyarm - lfsmake2 python-typing - lfsmake2 python-m2crypto lfsmake2 wireless-regdb - lfsmake2 crda lfsmake2 libsolv lfsmake2 ddns lfsmake2 python3-setuptools-scm