diff options
| author |   Jate Sujjavanich <jatedev@gmail.com> | 2021-07-23 04:17:24 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-07-24 10:48:10 -0700 |
| commit | da09c4c74344a339dfda670650381e6cf219bed7 (patch) | |
| tree | d87e9dbe9c3162a836f2e03fd346e6fbfeb8402e /meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch | |
| parent | 5eff5262e3890ccef11f9fa4bbc81963c0889da2 (diff) | |
| download | meta-openembedded-da09c4c74344a339dfda670650381e6cf219bed7.tar.gz | |
ufw: backport patches, update RRECOMMENDS, python3 support, tests
Backport patches:
using conntrack instead of state eliminating warning
support setup.py build (python 3)
adjust runtime tests to use daytime port (netbase changes)
empty out IPT_MODULES (nf conntrack warning)
check-requirements patch for python 3.8
Update, add patches for python 3 interpreter
Add ufw-test package. Backport fixes for check-requirements script
Update kernel RRECOMMENDS for linux-yocto 5.4 in dunfell
For dunfell
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch')
| -rw-r--r-- | meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch b/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch index ff704b5a46..f487a6fd6c 100644 --- a/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch +++ b/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch @@ -14,6 +14,10 @@ detected or specified on the build line. Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> + +Added conditional to handle sys.executable without env on python3 + +Signed-off-by Jate Sujjavanich <jatedev@gmail.com> --- setup.py | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) @@ -43,7 +47,7 @@ index b13d11c..73acdef 100644 # Now byte-compile everything super(Install, self).run() -@@ -107,12 +112,23 @@ class Install(_install, object): +@@ -107,12 +112,29 @@ class Install(_install, object): for f in [ script, manpage, manpage_f ]: self.mkpath(os.path.dirname(f)) @@ -62,7 +66,13 @@ index b13d11c..73acdef 100644 - 'staging/ufw']) + print("Updating staging/ufw to use (%s)" % (sys.executable)) + -+ if re.search("(/usr/bin/env)", sys.executable): ++ if not re.search("(/usr/bin/env)", sys.executable): ++ print("Did not find 'env' in sys.executable (%s)" % (sys.executable)) ++ subprocess.call(["sed", ++ "-i", ++ "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g", ++ 'staging/ufw']) ++ elif re.search("(/usr/bin/env)", sys.executable): + print("found 'env' in sys.executable (%s)" % (sys.executable)) + subprocess.call(["sed", + "-i.jjm", |