From patchwork Mon Jun 28 19:13:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4469 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 4GDHNB0CzNz3wfZ for ; Mon, 28 Jun 2021 19:14:18 +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 4GDHN83lhwzD4; Mon, 28 Jun 2021 19:14:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GDHN80zSMz2xbv; Mon, 28 Jun 2021 19:14:16 +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 4GDHN63znfz2xbv for ; Mon, 28 Jun 2021 19:14:14 +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 4GDHN56m3fzD4; Mon, 28 Jun 2021 19:14:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1624907654; 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=dCO73yO27K1utjpCBZ9LBMqdyc1KRczlbn5vndP/jn0=; b=B0toZEK1tgRdlsjK9cmyyyLhcXFuc80b62K6cGm0DLH97W0Ry/J//l10Y5CMfw0TLRt8Jl ign5A1ZHXbnGXDCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1624907654; 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=dCO73yO27K1utjpCBZ9LBMqdyc1KRczlbn5vndP/jn0=; b=PWIm6Ia/K4cpFc4nUCMUxGUQ2b7E9rNfk/6x8DjCKo+t4Fdol7l9HgG/iUWZaUXeSs011o 0NrhzDIJtp4pzQyo/aDn0/pUKqYLYut8k/WGr4fk5b5nPuhzyUGRHVzgFozBv073n9B+oW 7cmYTfCDj3zWxQxx16xo20R85A9ZisFiwj9oroyK0PzZ84KPc61ZFy9j4pFJpK50s4Ep/z NzvqwLWw80Hsc+ZJ8+BTVghV9Sk50PpbwFNmNc/QxjklUgSh1hPzvzEoXMBX4uEvL9zpJU bR/MwwpNlbs6NsW3lIisUrMLiY6XZcu1vCwfxxTmIhOtyftNqlvb3uoJZ1bd+g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/6] make.sh: Remove crda and remaining python2 modules Date: Mon, 28 Jun 2021 21:13:55 +0200 Message-Id: <20210628191400.2860975-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 Acked-by: Michael Tremer --- make.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/make.sh b/make.sh index fc03ebcd5..f8767bad9 100755 --- a/make.sh +++ b/make.sh @@ -1307,7 +1307,6 @@ buildipfire() { lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools - lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols lfsmake2 hwdata @@ -1344,7 +1343,6 @@ buildipfire() { lfsmake2 XML-Parser lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet - lfsmake2 python-setuptools lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils @@ -1527,10 +1525,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