* [meta-networking][PATCH 1/3] python3-scapy: Define custom PYPA_WHEEL
@ 2022-02-28 22:21 Khem Raj
2022-02-28 22:21 ` [meta-networking][PATCH 2/3] bluepy: " Khem Raj
2022-02-28 22:21 ` [meta-networking][PATCH 3/3] ufw: Upgrade to 0.36.1 bugfix release Khem Raj
0 siblings, 2 replies; 3+ messages in thread
From: Khem Raj @ 2022-02-28 22:21 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Standard defaults are not able to guess it right, so aid it a bit
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb
index d318c27c5a..3a1f102dc9 100644
--- a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb
+++ b/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb
@@ -25,6 +25,8 @@ S = "${WORKDIR}/git"
UPSTREAM_CHECK_COMMITS = "1"
inherit setuptools3 ptest
+PIP_INSTALL_PACKAGE = "scapy"
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
do_install:append() {
mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-networking][PATCH 2/3] bluepy: Define custom PYPA_WHEEL
2022-02-28 22:21 [meta-networking][PATCH 1/3] python3-scapy: Define custom PYPA_WHEEL Khem Raj
@ 2022-02-28 22:21 ` Khem Raj
2022-02-28 22:21 ` [meta-networking][PATCH 3/3] ufw: Upgrade to 0.36.1 bugfix release Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2022-02-28 22:21 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-networking/recipes-connectivity/bluepy/bluepy_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb
index a3b734c2ec..9bf2eed78b 100644
--- a/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb
+++ b/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb
@@ -15,6 +15,8 @@ S = "${WORKDIR}/git"
inherit setuptools3 pkgconfig
+PYPA_WHEEL = "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
+
RDEPENDS:${PN} = "bluez5"
TARGET_CC_ARCH += "${LDFLAGS}"
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [meta-networking][PATCH 3/3] ufw: Upgrade to 0.36.1 bugfix release
2022-02-28 22:21 [meta-networking][PATCH 1/3] python3-scapy: Define custom PYPA_WHEEL Khem Raj
2022-02-28 22:21 ` [meta-networking][PATCH 2/3] bluepy: " Khem Raj
@ 2022-02-28 22:21 ` Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2022-02-28 22:21 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj
Forward port 0002-add-an-option-to-specify-iptables-location.patch
Use distutils3, since it still needs it [1]
[1] https://git.launchpad.net/ufw/tree/setup.py#n28
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...-option-to-specify-iptables-location.patch | 30 +++++++++++--------
.../ufw/{ufw_0.36.bb => ufw_0.36.1.bb} | 8 ++---
2 files changed, 20 insertions(+), 18 deletions(-)
rename meta-networking/recipes-connectivity/ufw/{ufw_0.36.bb => ufw_0.36.1.bb} (88%)
diff --git a/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch
index 884fa1647e..ee935eb615 100644
--- a/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch
+++ b/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch
@@ -23,11 +23,9 @@ Signed-off-by: Silcet <camorga1@gmail.com>
setup.py | 65 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 37 insertions(+), 28 deletions(-)
-diff --git a/setup.py b/setup.py
-index 09204d3..2343bc9 100644
--- a/setup.py
+++ b/setup.py
-@@ -246,41 +246,50 @@ shutil.copytree('src', 'staging')
+@@ -245,45 +245,50 @@ shutil.copytree('src', 'staging')
os.unlink(os.path.join('staging', 'ufw-init'))
os.unlink(os.path.join('staging', 'ufw-init-functions'))
@@ -36,7 +34,11 @@ index 09204d3..2343bc9 100644
iptables_dir = ''
-for e in ['iptables']:
-- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \
+- # Historically iptables was in /sbin, then later also symlinked from
+- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables
+- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate
+- # buildds that may still have the old iptables, search /usr/sbin first
+- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \
- '/usr/local/bin']:
- if e == "iptables":
- if os.path.exists(os.path.join(dir, e)):
@@ -49,6 +51,14 @@ index 09204d3..2343bc9 100644
- if iptables_exe != "":
- break
-
+-
+-if iptables_exe == '':
+- print("ERROR: could not find required binary 'iptables'", file=sys.stderr)
+- sys.exit(1)
+-
+-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']:
+- if not os.path.exists(os.path.join(iptables_dir, e)):
+- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr)
+if "--iptables-dir" in sys.argv:
+ iptables_dir = sys.argv[sys.argv.index("--iptables-dir") + 1]
+ iptables_exe = os.path.join(iptables_dir, "iptables")
@@ -59,7 +69,7 @@ index 09204d3..2343bc9 100644
+
+if not iptables_set:
+ for e in ['iptables']:
-+ for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \
++ for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \
+ '/usr/local/bin']:
+ if e == "iptables":
+ if os.path.exists(os.path.join(dir, e)):
@@ -68,16 +78,10 @@ index 09204d3..2343bc9 100644
+ print("Found '%s'" % iptables_exe)
+ else:
+ continue
-
--if iptables_exe == '':
-- print("ERROR: could not find required binary 'iptables'", file=sys.stderr)
-- sys.exit(1)
++
+ if iptables_exe != "":
+ break
-
--for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']:
-- if not os.path.exists(os.path.join(iptables_dir, e)):
-- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr)
++
+ if iptables_exe == '':
+ print("ERROR: could not find required binary 'iptables'", file=sys.stderr)
sys.exit(1)
diff --git a/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb
similarity index 88%
rename from meta-networking/recipes-connectivity/ufw/ufw_0.36.bb
rename to meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb
index 40188cea21..c6beedf02c 100644
--- a/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb
+++ b/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb
@@ -8,18 +8,16 @@ SECTION = "net"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
-SRC_URI = "https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz \
+SRC_URI = "https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz \
file://0001-optimize-boot.patch \
file://0002-add-an-option-to-specify-iptables-location.patch \
file://0003-only-make-one-reference-to-env.patch \
"
+SRC_URI[sha256sum] = "1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c"
UPSTREAM_CHECK_URI = "https://launchpad.net/ufw"
-SRC_URI[md5sum] = "6d8ab1506da21ae003f4628f93d05781"
-SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc"
-
-inherit setuptools3 features_check systemd update-rc.d
+inherit distutils3 features_check systemd update-rc.d
RDEPENDS:${PN} = " \
iptables \
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-28 22:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-28 22:21 [meta-networking][PATCH 1/3] python3-scapy: Define custom PYPA_WHEEL Khem Raj
2022-02-28 22:21 ` [meta-networking][PATCH 2/3] bluepy: " Khem Raj
2022-02-28 22:21 ` [meta-networking][PATCH 3/3] ufw: Upgrade to 0.36.1 bugfix release Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.