diff mbox series

[1/6] make.sh: Remove crda and remaining python2 modules

Message ID 20210628191400.2860975-1-adolf.belka@ipfire.org
State Superseded
Headers
Series [1/6] make.sh: Remove crda and remaining python2 modules |

Commit Message

Adolf Belka June 28, 2021, 7:13 p.m. UTC 
  - 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 <adolf.belka@ipfire.org>
---
 make.sh | 5 -----
 1 file changed, 5 deletions(-)

Comments

Michael Tremer July 5, 2021, 4:39 p.m. UTC | #1 
Hello,

I can ack this, that we can drop CRDA entirely. We only need to keep the wireless-regdb.

Acked-by: Michael Tremer <michael.tremer@ipfire.org>

I cannot think of anything that would use the dropped Python modules.

Great work Adolf!

Best,
-Michael

> On 28 Jun 2021, at 20:13, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> - 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 <adolf.belka@ipfire.org>
> ---
> 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
> -- 
> 2.32.0
>
diff mbox series

Patch

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