Message ID | 20210805210152.3467498-1-adolf.belka@ipfire.org |
---|---|
State | Accepted |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 web04.haj.ipfire.org (Postfix) with ESMTPS id 4Gggz01DQKz3xGN for <patchwork@web04.haj.ipfire.org>; Thu, 5 Aug 2021 21:02:04 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Gggyy5hFPz27s; Thu, 5 Aug 2021 21:02:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Gggyy3n1bz2yDk; Thu, 5 Aug 2021 21:02:02 +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 4Gggyx6k3lz2xd7 for <development@lists.ipfire.org>; Thu, 5 Aug 2021 21:02:01 +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 4Gggyx1fp3zht; Thu, 5 Aug 2021 21:02:01 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1628197321; 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=2sAlh5lPni10x7hsq1z/hXhaqvK72GqR4k2ZCIGAv6E=; b=PqMpNiHPFqrHoVkn5d6OJ4CjqS+9Q7fj3d7LeasM7+tJfDCznM4eLUJQxfP9CBvSEhbY4D 4K+aMvVvqw1uQ/DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1628197321; 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=2sAlh5lPni10x7hsq1z/hXhaqvK72GqR4k2ZCIGAv6E=; b=Xj/xT9l29nCzcp1L5qYE7s0lFCl06I8nKxIdFcAyifsfxMUdd9VSJqSUyJfFu1O19tt10b UhWMmv+YWq9wd7k0zSQ42lP28aJoWZQtqK1z/lcKSla1L1P2nk0p0QoP4NpwMk9F4p4t0m YV5P0FyB4PbeOSDbEoECg4pQ3c2pdHIv46STWAfVA+ypu6tZJkhWwnlYVg/6oscVXJ9Vke EEhRRpHfNI87lxv9U51Ks8Glt2YCfP9Vj5K3h0O1g3a5kuy2HFk8+NFDFm2Dt8OH1Yt385 /xQk1Vrz8jmW3lxWYActfCHEwLgbN9lp6mq+o2acV8vg0BchHkflx3VW0NAcdQ== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH v4 1/8] make.sh: Remove crda and remaining python2 modules Date: Thu, 5 Aug 2021 23:01:45 +0200 Message-Id: <20210805210152.3467498-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
[v4,1/8] make.sh: Remove crda and remaining python2 modules
|
|
Commit Message
Adolf Belka
Aug. 5, 2021, 9:01 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".
- wlanap.cgi uses regdbdump from crda to create a text based list of the
wireless settings by country database. With the removal of crda a modification is
required to wireless-reg to copy the db.txt file to a specific location that wlan.cgi
can then access. db.txt is the text file version of the wireless settings by country
database.
- This series version copies the db.txt file and renames it regulatorydb.txt and places it in
/lib/firmware/
- This series version also corrects the loading command from regulatorydb.txt into the
@countrylist_cmd variable
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
make.sh | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Comments
Sorry for late review but this patch alter the IPFire version back to 2.25. Should i fix this at merge or want you send a new version ? Arne Am 2021-08-05 23:01, schrieb Adolf Belka: > - 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". > - wlanap.cgi uses regdbdump from crda to create a text based list of > the > wireless settings by country database. With the removal of crda a > modification is > required to wireless-reg to copy the db.txt file to a specific > location that wlan.cgi > can then access. db.txt is the text file version of the wireless > settings by country > database. > - This series version copies the db.txt file and renames it > regulatorydb.txt and places it in > /lib/firmware/ > - This series version also corrects the loading command from > regulatorydb.txt into the > @countrylist_cmd variable > > Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> > --- > make.sh | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/make.sh b/make.sh > index d78fb2ff0..57b83e432 100755 > --- a/make.sh > +++ b/make.sh > @@ -25,7 +25,7 @@ > NAME="IPFire" # Software name > SNAME="ipfire" # Short name > # If you update the version don't forget to update backupiso and add > it to core update > -VERSION="2.27" # Version number > +VERSION="2.25" # Version number > CORE="159" # Core Level (Filename) > SLOGAN="www.ipfire.org" # Software slogan > CONFIG_ROOT=/var/ipfire # Configuration rootdir > @@ -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
Hi Arne, You can just merge this, then edit make.sh and change the commit using “git commit —-amend”. That is probably the easiest. -Michael > On 6 Sep 2021, at 11:47, Arne Fitzenreiter <arne_f@ipfire.org> wrote: > > Sorry for late review but this patch alter the IPFire version back to 2.25. > Should i fix this at merge or want you send a new version ? > > Arne > > > Am 2021-08-05 23:01, schrieb Adolf Belka: >> - 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". >> - wlanap.cgi uses regdbdump from crda to create a text based list of the >> wireless settings by country database. With the removal of crda a >> modification is >> required to wireless-reg to copy the db.txt file to a specific >> location that wlan.cgi >> can then access. db.txt is the text file version of the wireless >> settings by country >> database. >> - This series version copies the db.txt file and renames it >> regulatorydb.txt and places it in >> /lib/firmware/ >> - This series version also corrects the loading command from >> regulatorydb.txt into the >> @countrylist_cmd variable >> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> >> --- >> make.sh | 7 +------ >> 1 file changed, 1 insertion(+), 6 deletions(-) >> diff --git a/make.sh b/make.sh >> index d78fb2ff0..57b83e432 100755 >> --- a/make.sh >> +++ b/make.sh >> @@ -25,7 +25,7 @@ >> NAME="IPFire" # Software name >> SNAME="ipfire" # Short name >> # If you update the version don't forget to update backupiso and add >> it to core update >> -VERSION="2.27" # Version number >> +VERSION="2.25" # Version number >> CORE="159" # Core Level (Filename) >> SLOGAN="www.ipfire.org" # Software slogan >> CONFIG_ROOT=/var/ipfire # Configuration rootdir >> @@ -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
diff --git a/make.sh b/make.sh index d78fb2ff0..57b83e432 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update -VERSION="2.27" # Version number +VERSION="2.25" # Version number CORE="159" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -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