|
[meta-python] [PATCH] python3-twine: upgrade 4.0.0 -> 4.0.1
wangmy
Bugfixes
========== Improve logging when keyring fails. (#890) Reconfgure root logger to show all log messages. (#896) Signed-off-by: Wang Mingyu <wangmy@...> --- .../python/{python3-twine_4.0.0.bb => python3-twine_4.0.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-twine_4.0.0.bb => python3-twine_4.0.1.bb} (81%) diff --git a/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb b/meta-python/recipes-devtools/python/python3-twine_4.0.1.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-twine_4.0.0.bb rename to meta-python/recipes-devtools/python/python3-twine_4.0.1.bb index 08252e837..0178dde73 100644 --- a/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-twine_4.0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://twine.readthedocs.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" -SRC_URI[sha256sum] = "817aa0c0bdc02a5ebe32051e168e23c71a0608334e624c793011f120dbbc05b7" +SRC_URI[sha256sum] = "96b1cf12f7ae611a4a40b6ae8e9570215daff0611828f5fe1f37a16255ab24a0" inherit pypi python_setuptools_build_meta -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-cantools: upgrade 37.0.7 -> 37.1.0
wangmy
Add dependence asyncio.
Changelog: ========== Parse SPNs in SYM Files Miscellaneous smaller fixes Implement support for AUTOSAR secure on-board communication Distribute & expose type annotations per PEP 561 Add more type annotations Improve encoding performance Add Support for Dumping Database as SYM File Fix SYM file bugs Fix parsing of referenced data in CDDs implement decoding of partial messages Use floating point scaling in encoding Small improvements after #417 minor bug fixes and improvements Signed-off-by: Wang Mingyu <wangmy@...> --- .../{python3-cantools_37.0.7.bb => python3-cantools_37.1.0.bb} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-cantools_37.0.7.bb => python3-cantools_37.1.0.bb} (78%) diff --git a/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb b/meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb similarity index 78% rename from meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb rename to meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb index c179071af..1af1310ab 100644 --- a/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb +++ b/meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "e603a7e1e40f5b4963c4c64cf4b013264afa009e232a878c73d31c29942e4466" +SRC_URI[sha256sum] = "9f2449e94a7698bd44bb50d9b464788053a0bf070faa09a132535c3aa07e7e6a" PYPI_PACKAGE = "cantools" @@ -16,6 +16,7 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-textparser \ ${PYTHON_PN}-typing-extensions \ ${PYTHON_PN}-diskcache \ + ${PYTHON_PN}-asyncio \ " CLEANBROKEN = "1" -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-regex: upgrade 2022.4.24 -> 2022.6.2
wangmy
Signed-off-by: Wang Mingyu <wangmy@...>
--- .../{python3-regex_2022.4.24.bb => python3-regex_2022.6.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-regex_2022.4.24.bb => python3-regex_2022.6.2.bb} (79%) diff --git a/meta-python/recipes-devtools/python/python3-regex_2022.4.24.bb b/meta-python/recipes-devtools/python/python3-regex_2022.6.2.bb similarity index 79% rename from meta-python/recipes-devtools/python/python3-regex_2022.4.24.bb rename to meta-python/recipes-devtools/python/python3-regex_2022.6.2.bb index 28e16001a..3067c0df3 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2022.4.24.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2022.6.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255" +SRC_URI[sha256sum] = "f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c" RDEPENDS:${PN} += " \ python3-stringold \ -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-asyncinotify: upgrade 2.0.3 -> 2.0.4
zhengruoqin
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@...>
--- ...hon3-asyncinotify_2.0.3.bb => python3-asyncinotify_2.0.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-asyncinotify_2.0.3.bb => python3-asyncinotify_2.0.4.bb} (82%) diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.4.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb rename to meta-python/recipes-devtools/python/python3-asyncinotify_2.0.4.bb index 189547bae..efa91c654 100644 --- a/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec941a1cd6616454970d03cb9c9e8f8" -SRC_URI[sha256sum] = "a14baf680a3d3e1cf54e082ab56f56c475d59d3644cfc25c00c460e56d9bbdf7" +SRC_URI[sha256sum] = "0ec20725b09decced856e46bb4dae6843ab429bfec87c42340dd0fefe1e2a25a" inherit pypi setuptools3 -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-alembic: upgrade 1.7.7 -> 1.8.0
zhengruoqin
Changelog:
=========== *Alembic 1.8 now supports Python 3.7 and above. *The "Pylons" environment template has been removed as of Alembic 1.8. This template was based on the very old pre-Pyramid Pylons web framework which has been long superseded by Pyramid. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@...> --- .../{python3-alembic_1.7.7.bb => python3-alembic_1.8.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-alembic_1.7.7.bb => python3-alembic_1.8.0.bb} (81%) diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb b/meta-python/recipes-devtools/python/python3-alembic_1.8.0.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb rename to meta-python/recipes-devtools/python/python3-alembic_1.8.0.bb index 6b7ac4a99..3b12439cb 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.8.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f5a8522010db1a393833988dbe2c7f0b" inherit pypi setuptools3 -SRC_URI[sha256sum] = "4961248173ead7ce8a21efb3de378f13b8398e6630fab0eb258dc74a8af24c58" +SRC_URI[sha256sum] = "a2d4d90da70b30e70352cd9455e35873a255a31402a438fe24815758d7a0e5e1" PYPI_PACKAGE = "alembic" -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-absl: upgrade 1.0.0 -> 1.1.0
zhengruoqin
Changelog:
========== *Flag instances now raise an error if used in a bool context. This prevents the occasional mistake of testing an instance for truthiness rather than testing flag.value. *absl-py no longer depends on six. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@...> --- .../python/{python3-absl_1.0.0.bb => python3-absl_1.1.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-absl_1.0.0.bb => python3-absl_1.1.0.bb} (76%) diff --git a/meta-python/recipes-devtools/python/python3-absl_1.0.0.bb b/meta-python/recipes-devtools/python/python3-absl_1.1.0.bb similarity index 76% rename from meta-python/recipes-devtools/python/python3-absl_1.0.0.bb rename to meta-python/recipes-devtools/python/python3-absl_1.1.0.bb index 736e6a944..e3f7c4c6a 100644 --- a/meta-python/recipes-devtools/python/python3-absl_1.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-absl_1.1.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea" +SRC_URI[sha256sum] = "3aa39f898329c2156ff525dfa69ce709e42d77aab18bf4917719d6f260aa6a08" PYPI_PACKAGE = "absl-py" -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-crc32c: upgrade 2.2.post0 -> 2.3
zhengruoqin
Changelog:
========== *Improved macro definition logic and platform detection to enable building universal2 binary wheels for macOS, alongside arm64 and x86_64 ones; added step to GitHub Actions to generate and publish them (#28). *Mention explicit support for Python 3.10. *Fixed minor compilation warning in ARM64 builds. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@...> --- .../{python3-crc32c_2.2.post0.bb => python3-crc32c_2.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-crc32c_2.2.post0.bb => python3-crc32c_2.3.bb} (89%) diff --git a/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb b/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb similarity index 89% rename from meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb rename to meta-python/recipes-devtools/python/python3-crc32c_2.3.bb index 4f6a3aba9..203256895 100644 --- a/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb +++ b/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://crc32c_adler.c;startline=9;endline=24;md5=c60e6e55d0e5d95effa6fad27db0711a \ " -SRC_URI[sha256sum] = "3d058e7a5e37e4985d1a7ad4cb702bca56b490daa658d4851377d13ead8b435e" +SRC_URI[sha256sum] = "17ce6c596ad0d53df52dcd72defb66984aeabd98fbefea7ba848a6b6bdece36a" inherit pypi setuptools3 -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-protobuf: upgrade 3.20.1 -> 4.21.1
xuhuan.fnst@fujitsu.com
From: Xu Huan <xuhuan.fnst@...>
Signed-off-by: Xu Huan <xuhuan.fnst@...> --- .../{python3-protobuf_3.20.1.bb => python3-protobuf_4.21.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-protobuf_3.20.1.bb => python3-protobuf_4.21.1.bb} (92%) diff --git a/meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb b/meta-python/recipes-devtools/python/python3-protobuf_4.21.1.bb similarity index 92% rename from meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb rename to meta-python/recipes-devtools/python/python3-protobuf_4.21.1.bb index 976d2aa9b..cdce531e8 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_4.21.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a inherit pypi setuptools3 -SRC_URI[sha256sum] = "adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9" +SRC_URI[sha256sum] = "5d9b5c8270461706973c3871c6fbdd236b51dfe9dab652f1fb6a36aa88287e47" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-msk: upgrade 0.3.16 -> 0.4.0
zhengruoqin
License-Update: replace '~/.local/share' for '/opt'
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@...> --- .../python/{python3-msk_0.3.16.bb => python3-msk_0.4.0.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python3-msk_0.3.16.bb => python3-msk_0.4.0.bb} (53%) diff --git a/meta-python/recipes-devtools/python/python3-msk_0.3.16.bb b/meta-python/recipes-devtools/python/python3-msk_0.4.0.bb similarity index 53% rename from meta-python/recipes-devtools/python/python3-msk_0.3.16.bb rename to meta-python/recipes-devtools/python/python3-msk_0.4.0.bb index a1572276b..8fa2c62cc 100644 --- a/meta-python/recipes-devtools/python/python3-msk_0.3.16.bb +++ b/meta-python/recipes-devtools/python/python3-msk_0.4.0.bb @@ -1,10 +1,9 @@ SUMMARY = "A tool to help with creating, uploading, and upgrading Mycroft skills on the skills repo." HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-kit" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.md;md5=2f90e43663eddf1c33087419fbb35e28" +LIC_FILES_CHKSUM = "file://README.md;md5=f518abfcfc3935b1f0ec8f2332cb30d3" -SRC_URI[md5sum] = "8a4fc92a074544f81f482da2c21ef989" -SRC_URI[sha256sum] = "c6a717fc068f7c69ddc8cb21dbeeda7cfa97a4e9f41690459c9fbec68b16ee87" +SRC_URI[sha256sum] = "f698f193112a8628e776e67b89a95c3f78095857c045dd9cde4cf915a5fbdd80" inherit pypi setuptools3 -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-hatchling: upgrade 1.3.0 -> 1.3.1
xuhuan.fnst@fujitsu.com
From: Xu Huan <xuhuan.fnst@...>
Signed-off-by: Xu Huan <xuhuan.fnst@...> --- .../{python3-hatchling_1.3.0.bb => python3-hatchling_1.3.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-hatchling_1.3.0.bb => python3-hatchling_1.3.1.bb} (88%) diff --git a/meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb b/meta-python/recipes-devtools/python/python3-hatchling_1.3.1.bb similarity index 88% rename from meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb rename to meta-python/recipes-devtools/python/python3-hatchling_1.3.1.bb index a6550a973..1c08bd60f 100644 --- a/meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-hatchling_1.3.1.bb @@ -8,7 +8,7 @@ inherit pypi python_hatchling DEPENDS += "python3-pluggy-native python3-tomli-native python3-pathspec-native python3-packaging-native python3-editables-native" DEPENDS:remove:class-native = "python3-hatchling-native" -SRC_URI[sha256sum] = "1401d45d3dd6a5910f64d539acaa943486d5e8b7dda1a97f2b0040fdddc5b85e" +SRC_URI[sha256sum] = "aaa63019c9d666053d9ff318097335e766123844547c52940155c0401c3c142f" # Until we have a proper tool to invoke PEP517 builds, hatchling can't # bootstrap itself automatically. -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-lxml: upgrade 4.8.0 -> 4.9.0
xuhuan.fnst@fujitsu.com
From: Xu Huan <xuhuan.fnst@...>
Changelog: ========= Bugs fixed ---------- * GH#341: The mixin inheritance order in ''lxml.html'' was corrected. Patch by xmo-odoo. Other changes ------------- * Built with Cython 0.29.30 to adapt to changes in Python 3.11 and 3.12. * Wheels include zlib 1.2.12, libxml2 2.9.14 and libxslt 1.1.35 (libxml2 2.9.12+ and libxslt 1.1.34 on Windows). * GH#343: Windows-AArch64 build support in Visual Studio. Patch by Steve Dower. Signed-off-by: Xu Huan <xuhuan.fnst@...> --- .../python/{python3-lxml_4.8.0.bb => python3-lxml_4.9.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-lxml_4.8.0.bb => python3-lxml_4.9.0.bb} (95%) diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb b/meta-python/recipes-devtools/python/python3-lxml_4.9.0.bb similarity index 95% rename from meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb rename to meta-python/recipes-devtools/python/python3-lxml_4.9.0.bb index c4d4df383..74c5e480a 100644 --- a/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-lxml_4.9.0.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23" +SRC_URI[sha256sum] = "520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7" SRC_URI += "${PYPI_SRC_URI}" inherit pkgconfig pypi setuptools3 -- 2.25.1
|
|
|
|
[meta-python] [PATCH] python3-msgpack: upgrade 1.0.3 -> 1.0.4
xuhuan.fnst@fujitsu.com
From: Xu Huan <xuhuan.fnst@...>
Changelog: ========== Support Python 3.11 (beta) refresh ci settings. Don't define _*ENDIAN macro on Unix. Update setuptools and black Use PyFloat_Pack8() on Python 3.11a7 Upgrade black to fix CI Fix Unpacker max_buffer_length handling ci: Update action versions. Signed-off-by: Xu Huan <xuhuan.fnst@...> --- .../{python3-msgpack_1.0.3.bb => python3-msgpack_1.0.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-python/recipes-devtools/python/{python3-msgpack_1.0.3.bb => python3-msgpack_1.0.4.bb} (84%) diff --git a/meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb b/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb similarity index 84% rename from meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb rename to meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb index 92999255b..a796d7cb5 100644 --- a/meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" PYPI_PACKAGE = "msgpack" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e" +SRC_URI[sha256sum] = "f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f" RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-io \ -- 2.25.1
|
|
|
|
[meta-oe][PATCH] cryptsetup: Add support for building without SSH tokens
Peter Kjellerstedt
Cryptsetup SSH tokens is the only feature that has a dependency on
libssh. Add a packageconfig to control this dependency. Change-Id: Iac4f91e099ad2e3a79aab183734108f8bfbff57f Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@...> --- .../recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb index 435b55477..652fd6661 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb @@ -14,7 +14,6 @@ DEPENDS = " \ libdevmapper \ popt \ util-linux-libuuid \ - libssh \ " DEPENDS:append:libc-musl = " argp-standalone" @@ -39,6 +38,7 @@ PACKAGECONFIG ??= " \ blkid \ luks-adjust-xts-keysize \ openssl \ + ssh-token \ " PACKAGECONFIG:append:class-target = " \ udev \ @@ -69,7 +69,7 @@ PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" - +PACKAGECONFIG[ssh-token] = "--enable-ssh-token,--disable-ssh-token,libssh" EXTRA_OECONF = "--enable-static" # Building without largefile is not supported by upstream @@ -90,6 +90,14 @@ EXTRA_OECONF += "--with-luks2-pbkdf=${LUKS2_PBKDF} \ --with-luks2-parallel-threads=${LUKS2_PARALLEL_THREADS} \ --with-luks2-iter-time=${LUKS2_ITERTIME}" +do_install:append() { + # The /usr/lib/cryptsetup directory is always created, even when ssh-token + # is disabled. In that case it is empty and causes a packaging error. Since + # there is no reason to distribute the empty directory, the easiest solution + # is to remove it if it is empty. + rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/${BPN} +} + FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" RDEPENDS:${PN} = " \
|
|
|
|
[meta-oe][PATCH] minicoredumper: retry elf parsing as long as needed
Sakib Sajal
Maximum number of tries, in rare cases, is insufficient for
elf parse. Backport patch that fixes the issue. Signed-off-by: Sakib Sajal <sakib.sajal@...> --- ...-retry-elf-parsing-as-long-as-needed.patch | 128 ++++++++++++++++++ .../minicoredumper/minicoredumper_2.0.1.bb | 1 + 2 files changed, 129 insertions(+) create mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch new file mode 100644 index 000000000..8d5b8b6cb --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch @@ -0,0 +1,128 @@ +From 7a8c6a06c86e133e4346b1dc66483bd8d0d3c716 Mon Sep 17 00:00:00 2001 +From: John Ogness <john.ogness@...> +Date: Tue, 24 Aug 2021 21:10:43 +0200 +Subject: [PATCH] minicoredumper: retry elf parsing as long as needed + +As was reported in github issue #2 ("maximum number of tries +insufficient, in rare cases, for elf parse"), the number of retries +for parsing a process may be insufficient. Rather than setting an +upper limit on the maximum number of retries, track the number of +headers seen. As long as the number of seen headers is greater than +the previous try, try again. + +In order to avoid introducing any new issues, preserve the behavior +of retrying at least 10 times, even if no new headers are seen. + +Reported-by: github.com/ssajal-wr +Signed-off-by: John Ogness <john.ogness@...> + +Upstream-Status: Backport [7a8c6a06c86e133e4346b1dc66483bd8d0d3c716] + +Signed-off-by: Sakib Sajal <sakib.sajal@...> +--- + src/minicoredumper/corestripper.c | 30 +++++++++++++++++++++++------- + 1 file changed, 23 insertions(+), 7 deletions(-) + +diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c +index d96d1df..c96b350 100644 +--- a/src/minicoredumper/corestripper.c ++++ b/src/minicoredumper/corestripper.c +@@ -761,7 +761,7 @@ static int init_log(struct dump_info *di) + typedef int elf_parse_cb(struct dump_info *di, Elf *elf, GElf_Phdr *phdr); + + static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, +- elf_parse_cb *callback) ++ elf_parse_cb *callback, size_t *phnum_found) + { + GElf_Ehdr ehdr_mem; + GElf_Ehdr *ehdr; +@@ -770,6 +770,9 @@ static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, + size_t phnum; + size_t cnt; + ++ if (phnum_found) ++ *phnum_found = 0; ++ + /* start from beginning of core */ + if (lseek64(di->elf_fd, 0, SEEK_SET) == -1) { + info("lseek failed: %s", strerror(errno)); +@@ -809,6 +812,9 @@ static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, + goto out; + } + ++ if (phnum_found) ++ *phnum_found = phnum; ++ + for (cnt = 0; cnt < phnum; cnt++) { + GElf_Phdr phdr_mem; + GElf_Phdr *phdr; +@@ -891,7 +897,7 @@ static int vma_cb(struct dump_info *di, Elf *elf, GElf_Phdr *phdr) + /* + * Tries to parse the found ELF headers and reads all vmas from it. + */ +-static int parse_vma_info(struct dump_info *di) ++static int parse_vma_info(struct dump_info *di, size_t *phnum_found) + { + unsigned long min_off = ULONG_MAX; + unsigned long max_len = 0; +@@ -911,7 +917,7 @@ static int parse_vma_info(struct dump_info *di) + memset(&type, 0, sizeof(type)); + type.p_type = PT_LOAD; + type.p_flags = PF_R; +- if (do_elf_ph_parse(di, &type, vma_cb) != 0) ++ if (do_elf_ph_parse(di, &type, vma_cb, phnum_found) != 0) + return -1; + + for (v = di->vma; v; v = v->next) { +@@ -1614,8 +1620,10 @@ int add_core_data(struct dump_info *di, off64_t dest_offset, size_t len, + */ + static int init_src_core(struct dump_info *di, int src) + { ++ size_t last_phnum = 0; + int tries = 0; + int ret = -1; ++ size_t phnum; + size_t len; + char *buf; + long pos; +@@ -1642,7 +1650,7 @@ again: + goto out; + + /* try to elf-parse the core to read vma info */ +- ret = parse_vma_info(di); ++ ret = parse_vma_info(di, &phnum); + + /* restore our position */ + if (lseek64(di->elf_fd, pos, SEEK_SET) == -1) +@@ -1653,9 +1661,17 @@ again: + + tries++; + +- /* maybe try again */ +- if (tries < 10) ++ if (phnum > last_phnum) { ++ /* new headers found, keep trying */ ++ last_phnum = phnum; + goto again; ++ } else if (tries < 10) { ++ /* ++ * even if no new headers are found, ++ * retry at least 10 times ++ */ ++ goto again; ++ } + + goto out; + } +@@ -2106,7 +2122,7 @@ static int dump_stacks(struct dump_info *di) + /* find and set the first task */ + memset(&type, 0, sizeof(type)); + type.p_type = PT_NOTE; +- do_elf_ph_parse(di, &type, note_cb); ++ do_elf_ph_parse(di, &type, note_cb, NULL); + } + + if (di->first_pid) +-- +2.25.1 + diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index bf9915294..0b934ee2d 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ file://minicoredumper.service \ file://minicoredumper.init \ + file://0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch \ " S = "${WORKDIR}/git" -- 2.33.0
|
|
|
|
[meta-networking][PATCH v3 1/1] mdio-tools: add recipes
Potin Lai
From: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@...>
Self-description from the README: mdio-tools is a low-level debug tool for communicating with devices attached to an MDIO bus. Signed-off-by: Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@...> Signed-off-by: Potin Lai <potin.lai.pt@...> --- LINK: [v2] https://lore.kernel.org/all/20220201142608.186135-1-enguerrand.de-ribaucourt@savoirfairelinux.com/ LINK: [v1] https://lore.kernel.org/all/20220107150722.2221609-1-enguerrand.de-ribaucourt@savoirfairelinux.com/ change v2 --> v3: * update version to 1.1.1 change v1 --> v2: * moved in recipes-support * removed version in mdio-tools_1.0.1.inc filename --- .../recipes-support/mdio-tools/mdio-netlink_git.bb | 13 +++++++++++++ .../recipes-support/mdio-tools/mdio-tools.inc | 9 +++++++++ .../recipes-support/mdio-tools/mdio-tools_git.bb | 9 +++++++++ 3 files changed, 31 insertions(+) create mode 100644 meta-networking/recipes-support/mdio-tools/mdio-netlink_git.bb create mode 100644 meta-networking/recipes-support/mdio-tools/mdio-tools.inc create mode 100644 meta-networking/recipes-support/mdio-tools/mdio-tools_git.bb diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_git.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_git.bb new file mode 100644 index 000000000..b50d33f90 --- /dev/null +++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_git.bb @@ -0,0 +1,13 @@ +require mdio-tools.inc + +DEPENDS += "virtual/kernel libmnl" +# This module requires Linux 5.6 higher + +S = "${WORKDIR}/git/kernel" + +inherit module + +EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR}" +MODULES_INSTALL_TARGET = "install" + +RPROVIDES:${PN} += "kernel-module-mdio-netlink" diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools.inc b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc new file mode 100644 index 000000000..a37500d93 --- /dev/null +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "A low-level debug tool for communicating with devices attached to an MDIO bus" +SECTION = "networking" +HOMEPAGE = "https://github.com/wkz/mdio-tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/wkz/mdio-tools.git;protocol=https;branch=master" +SRCREV = "07cbff2d5e2de05037e5e7edd5044d678394c8d1" +PV = "1.1.1" diff --git a/meta-networking/recipes-support/mdio-tools/mdio-tools_git.bb b/meta-networking/recipes-support/mdio-tools/mdio-tools_git.bb new file mode 100644 index 000000000..cd4df3da0 --- /dev/null +++ b/meta-networking/recipes-support/mdio-tools/mdio-tools_git.bb @@ -0,0 +1,9 @@ +require mdio-tools.inc + +DEPENDS += "libmnl" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools + +RDEPENDS:${PN} = "kernel-module-mdio-netlink" -- 2.17.1
|
|
|
|
[meta-networking][PATCH] firewalld: update to 1.1.1 fixes ptest
Adrian Freihofer
Update firewalld by 2 major versions, which also includes breaking and
behavioral changes. Highlights from 0.9 to 1.0: - Reduced dependencies - Intra-zone forwarding by default - NAT rules moved to inet family (reduced rule set) - Default target is now similar to reject - ICMP blocks and block inversion only apply to input, not forward - tftp-client service has been removed - iptables backend is deprecated - Direct interface is deprecated - CleanupModulesOnExit defaults to no (kernel modules not unloaded) Details: - https://firewalld.org/2021/07/firewalld-1-0-0-release - https://github.com/firewalld/firewalld/compare/v0.9.0...v1.0.0 From 1.0 to 1.1 is mostly a bug fix release update. Details: - https://firewalld.org/2022/02/firewalld-1-1-0-release - https://github.com/firewalld/firewalld/compare/v0.9.0...v1.0.0 Improvements on the recipe: - Add ptest - Very helpful to get all the kernel modules - Long running, probably not suitable for any OE autobuilder - RRECOMMENS kernel modules, document configuration - Improve package splitting - firewalld-config and firewalld-applet depend on QT5, pyqt5 and GTK. The dependencies were not correctly set but the code was ending up on the target device. Now the code gets into a separate package but the dependeinces are probably still not complete. Since this is probably not used anyway it is not tested yet. It's still not perfect but much better than installing broken stuff to the target device. - The dependenices are added to variables instead of rdepends to keep the meta-qt5 and gnome layers optional also at build-time. - New packageconfigs: ebtables, ipset. This is mosly required to get the test suite running but probably also usable otherwise. Signed-off-by: Adrian Freihofer <adrian.freihofer@...> --- .../firewalld/files/run-ptest | 21 ++ .../firewalld/firewalld_0.9.4.bb | 92 ------ .../firewalld/firewalld_1.1.1.bb | 297 ++++++++++++++++++ 3 files changed, 318 insertions(+), 92 deletions(-) create mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb create mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.1.1.bb diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest new file mode 100644 index 0000000000..9d3ec79042 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest @@ -0,0 +1,21 @@ +#!/bin/sh + +ret_val=0 + +# Check if all the kernel modules are available +FIREWALLD_KERNEL_MODULES="@@FIREWALLD_KERNEL_MODULES@@" +for m in $FIREWALLD_KERNEL_MODULES; do + if modprobe $m; then + echo "PASS: loading $m" + else + echo "FAIL: loading $m" + ret_val=1 + fi +done + +# Run the test suite from firewalld +# Failing testsuites: 203 226 241 250 270 280 281 282 285 286 +# Problem icmpv6 compared against ipv6-icmptype? +/usr/share/firewalld/testsuite/testsuite -C /tmp -A || ret_val=1 + +exit $ret_val diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb deleted file mode 100644 index 1dea339535..0000000000 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb +++ /dev/null @@ -1,92 +0,0 @@ -SUMMARY = "Dynamic firewall daemon with a D-Bus interface" -HOMEPAGE = "https://firewalld.org/" -BUGTRACKER = "https://github.com/firewalld/firewalld/issues" -UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ - file://firewalld.init \ -" -SRC_URI[sha256sum] = "52c5e3d5b1e2efc0e86c22b2bc1f7fd80908cc2d8130157dc2a3517a59b0a760" - -# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 -DEPENDS = "intltool-native glib-2.0-native nftables" - -inherit gettext autotools bash-completion pkgconfig python3native gsettings systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" -PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" - -PACKAGES += "${PN}-zsh-completion" - -# iptables, ip6tables, ebtables, and ipset *should* be unnecessary -# when the nftables backend is available, because nftables supersedes all of them. -# However we still need iptables and ip6tables to be available otherwise any -# application relying on "direct passthrough" rules (such as docker) will break. -# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by -# the Red Hat-specific init script which we aren't using, so we disable that. -EXTRA_OECONF = "\ - --without-ipset \ - --with-iptables=${sbindir}/iptables \ - --with-iptables-restore=${sbindir}/iptables-restore \ - --with-ip6tables=${sbindir}/ip6tables \ - --with-ip6tables-restore=${sbindir}/ip6tables-restore \ - --without-ebtables \ - --without-ebtables-restore \ - --disable-sysconfig \ -" - -INITSCRIPT_NAME = "firewalld" -SYSTEMD_SERVICE:${PN} = "firewalld.service" - -do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - : - else - # firewalld ships an init script but it contains Red Hat-isms, replace it with our own - rm -rf ${D}${sysconfdir}/rc.d/ - install -d ${D}${sysconfdir}/init.d - install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld - fi - - # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE - # so now we need to fix up any references to point at the proper path in the image. - # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. - if [ ${PN} != "${BPN}-native" ]; then - sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - fi - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - - # This file contains Red Hat-isms. Modules get loaded without it. - rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf -} - -FILES:${PN} += "\ - ${PYTHON_SITEPACKAGES_DIR}/firewall \ - ${nonarch_libdir}/firewalld \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ - ${datadir}/metainfo \ -" -FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS:${PN} = "\ - nftables-python \ - iptables \ - python3-core \ - python3-io \ - python3-fcntl \ - python3-shell \ - python3-syslog \ - python3-xml \ - python3-dbus \ - python3-slip-dbus \ - python3-decorator \ - python3-pygobject \ - python3-json \ - python3-ctypes \ -" diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.1.1.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.1.1.bb new file mode 100644 index 0000000000..00e851f450 --- /dev/null +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.1.1.bb @@ -0,0 +1,297 @@ +SUMMARY = "Dynamic firewall daemon with a D-Bus interface" +HOMEPAGE = "https://firewalld.org/" +BUGTRACKER = "https://github.com/firewalld/firewalld/issues" +UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "\ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://firewalld.init \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "1dcd314ff836b2ce69f15f60fc7d50bd77ed359d784f9b3c07f2d394ea570e4c" + +# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 +DEPENDS = "intltool-native glib-2.0-native nftables" + +inherit gettext autotools-brokensep bash-completion pkgconfig python3native python3-dir gsettings systemd update-rc.d ptest + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" +PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[ipset] = "--with-ipset=${sbindir}/ipset,--without-ipset,,ipset" +PACKAGECONFIG[ebtables] = "--with-ebtables=${base_sbindir}/ebtables --with-ebtables-restore=${sbindir}/ebtables-legacy-restore,--without-ebtables --without-ebtables-restore,,ebtables" + +# The UIs are not yet tested and the dependencies are probably not quite correct yet. +# Splitting into separate packages is beneficial so that no dead code is transferred +# to the target device. +# Without enabling qt5, the firewalld-config package is not usable. +# Without enabling qt5 and gtk, the firewalld-applet package is not usable. +PACKAGECONFIG[qt5] = "" +PACKAGECONFIG[gtk] = "" + +PACKAGES =+ "python3-firewall ${PN}-applet ${PN}-config ${PN}-offline-cmd ${PN}-zsh-completion" + +# iptables, ip6tables, ebtables, and ipset *should* be unnecessary +# when the nftables backend is available, because nftables supersedes all of them. +# However we still need iptables and ip6tables to be available otherwise any +# application relying on "direct passthrough" rules (such as docker) will break. +# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by +# the Red Hat-specific init script which we aren't using, so we disable that. +EXTRA_OECONF = "\ + --with-iptables=${sbindir}/iptables \ + --with-iptables-restore=${sbindir}/iptables-restore \ + --with-ip6tables=${sbindir}/ip6tables \ + --with-ip6tables-restore=${sbindir}/ip6tables-restore \ + --disable-sysconfig \ +" + +INITSCRIPT_NAME = "firewalld" +SYSTEMD_SERVICE:${PN} = "firewalld.service" + +# kernel modules loaded after ptest execution (linux-yocto 5.15) +FIREWALLD_KERNEL_MODULES ?= "\ + xt_tcpudp \ + xt_TCPMSS \ + xt_set \ + xt_sctp \ + xt_REDIRECT \ + xt_pkttype \ + xt_NFLOG \ + xt_nat \ + xt_MASQUERADE \ + xt_mark \ + xt_mac \ + xt_LOG \ + xt_limit \ + xt_dccp \ + xt_CT \ + xt_conntrack \ + xt_CHECKSUM \ + nft_redir \ + nft_objref \ + nft_nat \ + nft_masq \ + nft_log \ + nfnetlink_log \ + nf_nat_tftp \ + nf_nat_sip \ + nf_nat_ftp \ + nf_log_syslog \ + nf_conntrack_tftp \ + nf_conntrack_sip \ + nf_conntrack_netbios_ns \ + nf_conntrack_ftp \ + nf_conntrack_broadcast \ + ipt_REJECT \ + ip6t_rpfilter \ + ip6t_REJECT \ + ip_set_hash_netport \ + ip_set_hash_netnet \ + ip_set_hash_netiface \ + ip_set_hash_net \ + ip_set_hash_mac \ + ip_set_hash_ipportnet \ + ip_set_hash_ipport \ + ip_set_hash_ipmark \ + ip_set_hash_ip \ + ebt_ip6 \ + nft_fib_inet \ + nft_fib_ipv4 \ + nft_fib_ipv6 \ + nft_fib \ + nft_reject_inet \ + nf_reject_ipv4 \ + nf_reject_ipv6 \ + nft_reject \ + nft_ct \ + nft_chain_nat \ + ebtable_nat \ + ebtable_broute \ + ip6table_nat \ + ip6table_mangle \ + ip6table_raw \ + ip6table_security \ + iptable_nat \ + nf_nat \ + nf_conntrack \ + nf_defrag_ipv6 \ + nf_defrag_ipv4 \ + iptable_mangle \ + iptable_raw \ + iptable_security \ + ip_set \ + ebtable_filter \ + ebtables \ + ip6table_filter \ + ip6_tables \ + iptable_filter \ + ip_tables \ + x_tables \ + sch_fq_codel \ +" + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then + # firewalld ships an init script but it contains Red Hat-isms, replace it with our own + rm -rf ${D}${sysconfdir}/rc.d/ + install -d ${D}${sysconfdir}/init.d + install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'false', 'true', d)}; then + # Delete polkit profiles if polkit is not available + rm -rf ${D}${datadir}/polkit-1 + fi + + # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE + # so now we need to fix up any references to point at the proper path in the image. + # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. + if [ ${PN} != "${BPN}-native" ]; then + sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + fi + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + + # This file contains Red Hat-isms. Modules get loaded without it. + rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf +} + +do_install_ptest:append() { + # Add kernel modules to the ptest script + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's:@@FIREWALLD_KERNEL_MODULES@@:${FIREWALLD_KERNEL_MODULES}:g' \ + ${D}${PTEST_PATH}/run-ptest + fi +} + +SUMMARY:python3-firewall = "${SUMMARY} (Python3 bindings)" +FILES:python3-firewall = "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/config/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/config/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/io/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/io/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/server/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/server/__pycache__/*.py* \ +" +RDEPENDS:python3-firewall = "\ + python3-dbus \ + nftables-python \ + python3-pygobject \ +" + +# Do not depend on QT5 layer and GTK deps if not explicitely required. +FIREWALLD_QT5_RDEPENDS = "\ + ${PN}-config \ + hicolor-icon-theme \ + python3-pyqt5 \ + python3-pygobject \ + libnotify \ + networkmanager \ +" +FIREWALLD_GTK_RDEPENDS = "\ + gtk3 \ +" + +# A QT5 based UI +SUMMARY:${PN}-config = "${SUMMARY} (configuration application)" +FILES:${PN}-config = "\ + ${bindir}/firewall-config \ + ${datadir}/firewalld/firewall-config.glade \ + ${datadir}/firewalld/gtk3_chooserbutton.py* \ + ${datadir}/firewalld/gtk3_niceexpander.py* \ + ${datadir}/applications/firewall-config.desktop \ + ${datadir}/metainfo/firewall-config.appdata.xml \ + ${datadir}/icons/hicolor/*/apps/firewall-config*.* \ +" +RDEPENDS:${PN}-config += "\ + python3-core \ + python3-ctypes \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '${FIREWALLD_QT5_RDEPENDS}', '', d)} \ +" + +# A GTK3 applet depending on the QT5 firewall-config UI +SUMMARY:${PN}-applet = "${SUMMARY} (panel applet)" +FILES:${PN}-applet += "\ + ${bindir}/firewall-applet \ + ${sysconfdir}/xdg/autostart/firewall-applet.desktop \ + ${sysconfdir}/firewall/applet.conf \ + ${datadir}/icons/hicolor/*/apps/firewall-applet*.* \ +" +RDEPENDS:${PN}-applet += "\ + python3-core \ + python3-ctypes \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '${FIREWALLD_QT5_RDEPENDS}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${FIREWALLD_GTK_RDEPENDS}', '', d)} \ +" + +SUMMARY:${PN}-offline-cmd = "${SUMMARY} (offline configuration utility)" +FILES:${PN}-offline-cmd += " \ + ${bindir}/firewall-offline-cmd \ +" +RDEPENDS:${PN}-offline-cmd += "python3-core" + +# To get allmost all tests passing +# - Enable PACKAGECONFIG ipset, ebtable +# - Enough RAM QB_MEM = "-m 8192" (used für fancy ipset tests) +FILES:${PN}-ptest += "\ + ${datadir}/firewalld/testsuite \ +" +RDEPENDS:${PN}-ptest += "\ + python3-unittest \ + ${PN}-offline-cmd \ + procps-ps \ + iproute2 \ +" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" + +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +FILES:${PN} += "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall \ + ${nonarch_libdir}/firewalld \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ + ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \ +" +RDEPENDS:${PN} += "\ + python3-firewall \ + iptables \ + python3-core \ + python3-io \ + python3-fcntl \ + python3-syslog \ + python3-xml \ + python3-json \ + python3-ctypes \ + python3-pprint \ +" +# Add required kernel modules. With Yocto kernel 5.15 this currently means: +# - features/nf_tables/nf_tables.scc +# - features/netfilter/netfilter.scc +# - cgl/features/audit/audit.scc +# - cfg/net/ip6_nf.scc +# - Plus: +# - ebtables +# - ipset +# - CONFIG_IP6_NF_SECURITY=m +# - CONFIG_IP6_NF_MATCH_RPFILTER=m +# - CONFIG_IP6_NF_TARGET_REJECT=m +# - CONFIG_NFT_OBJREF=m +# - CONFIG_NFT_FIB=m +# - CONFIG_NFT_FIB_INET=m +# - CONFIG_NFT_FIB_IPV4=m +# - CONFIG_NFT_FIB_IPV6=m +# - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +# - CONFIG_NETFILTER_XT_SET=m +def get_kernel_deps(d): + kmodules = (d.getVar('FIREWALLD_KERNEL_MODULES') or "").split() + return ' '.join([ 'kernel-module-' + mod.replace('_', '-').lower() for mod in kmodules ]) +RRECOMMENDS:${PN} += "${@get_kernel_deps(d)}" -- 2.35.3
|
|
|
|
Re: [meta-networking][PATCH 3/5] networkmanager: use nftables by default
On Tue, Jun 7, 2022 at 10:26 AM Adrian Freihofer
<adrian.freihofer@...> wrote: I think if defaults have changed to use nftables then this change is fine.
|
|
|
|
Re: [meta-networking][PATCH 3/5] networkmanager: use nftables by default
Adrian Freihofer
Hi Andreas
toggle quoted messageShow quoted text
Good question. I changed it back and forth before I sent it to the mailing list. I finally changed it to the NetworkManager defaults (they changed it a few versions ago). I think it can easily be changed back. And after the LTS release, it's a good time to point out that nftables should be considered for future builds. But there is no strong argument for it. I'm also fine to put it on iptables. Maybe a distro feature to set a preference for iptables or nftables would also be useful. There are now various packages that support both configurably. Regards, Adrian
On Tue, 2022-06-07 at 09:29 +0200, Andreas Müller wrote:
Hi Adrian,
|
|
|
|
Re: kirkstone merge request: June 6th
merged thanks.
toggle quoted messageShow quoted text
On Mon, Jun 6, 2022 at 10:05 PM akuster808 <akuster808@...> wrote:
|
|
|
|
Re: [meta-networking][PATCH 3/5] networkmanager: use nftables by default
Andreas Müller
Hi Adrian,
just out of curiosity: Why do you suggest to prefer nftables over iptables? Andreas On Tue, Jun 7, 2022 at 12:01 AM Adrian Freihofer <adrian.freihofer@...> wrote:
|
|
|