From patchwork Fri Apr 14 21:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 22638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33DA4C77B72 for ; Fri, 14 Apr 2023 21:19:58 +0000 (UTC) Received: from APC01-TYZ-obe.outbound.protection.outlook.com (APC01-TYZ-obe.outbound.protection.outlook.com [40.107.117.55]) by mx.groups.io with SMTP id smtpd.web10.53.1681507189178235956 for ; Fri, 14 Apr 2023 14:19:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=eOmYh7t7; spf=pass (domain: advantech.cz, ip: 40.107.117.55, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hg6v4LN1E5eAFlDTvKAfl2DDXbKbFJZBLTYqRnWzJXlMUA4UD8oN59OT61OmRMmqGkfqI1302QeDYc9VePoHSYCijMb3vQ9YjZlCizD9KxJ1ntGU9JX65eN35WswwTzEkF4PQ8cNqwRtdkU3WYsHsBIMKai0yBH9nV7AKN0VNoiHsP9Q4Q5lgVnMUR01NeUyUWM1sLFY8witSJE0sTi/ylL5DytWqpmneyboK9aEe5Y2WI5feU4kGItH807tynV1rcSrTZfoUkhn36TB4ew9GO9xL9Hg90qr6USg1MT0MwSTutowa2rJteXvMs6hzg8AOSl9zQJfFfOLvp/zTkPcYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lG6ze+ZcG8LLRi0OcwiwdnXX8a6fM30FdQHn8uJfraQ=; b=blzZfseGuhseeFk6F1GhHMZT+Wdm7PLxZzVkK1oO7ke0VvoLEMiu7wA3/Vj7d2RfmN0hJmxweoYhQ2Ujngk19aeZOhgVX9m4J1EEM8IYgPTKjUSXFqvWvW8mg7zTDU+EowdgjPU6MVbgsJ04QvuMV4fryRuJto7Gg5KUuEVgyDCP62qMhufY42qr62cWfQBed2kF1gENzkPCd3LvvxZIonrX7SeQk8YhQ5lpiDuxXy64e5CJEVQbDtlephJI31uUFItvDgV4Df5yRLAa8Wlzo/gy5xdCpmztzwQcN/NhvDkMMSskNgUOJzywlWIdgyfAM40NIdurnCI38KK2TK+Nfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=advantech.cz; dmarc=pass action=none header.from=advantech.cz; dkim=pass header.d=advantech.cz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=advantech.cz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lG6ze+ZcG8LLRi0OcwiwdnXX8a6fM30FdQHn8uJfraQ=; b=eOmYh7t73ZlQSj6dkHpjDN6rUkOZerLplmAuh1z+x/hAWA3v78T69PGpIWymsTkUgX0UJVp4XLJYnxl/4HigYE9yXoYrx4yvTjRkMoHCokn4wiWa0o4fmniZ98yVA3aYoZawJ8kucB7x3YlaPe/1W80jPcp+J/wUTraT+MaSf/Zt4viXLeuUl9chIkqd8Fh0Dtj1hOE7wRIh6EP7tREIpxFXyrtTnxLRrygLK+mfvzoyozx8As5uKk+hUQo6KfisrWIto/T8Ngx8PkgHTp7audWmRszoQca6Ere+qMuk/DSY8wByDK2Df8WtJbjPp9nPBxKnQaztQW4+Wuaa/rSTew== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by PSAPR02MB4726.apcprd02.prod.outlook.com (2603:1096:301:93::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Fri, 14 Apr 2023 21:19:45 +0000 Received: from TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::624d:2113:5376:e9b2]) by TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::624d:2113:5376:e9b2%6]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 21:19:45 +0000 From: Petr Gotthard To: OpenEmbedded Devel List Subject: [meta-networking][PATCH] nftables: upgrade 1.0.6 -> 1.0.7 Thread-Topic: [meta-networking][PATCH] nftables: upgrade 1.0.6 -> 1.0.7 Thread-Index: AdlvFn5+wWvyhOZ0Tc6uy4C9PaX9ag== Date: Fri, 14 Apr 2023 21:19:45 +0000 Message-ID: Accept-Language: en-US Content-Language: cs-CZ X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=advantech.cz; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: TY2PR02MB3678:EE_|PSAPR02MB4726:EE_ x-ms-office365-filtering-correlation-id: 844ac11d-6f99-43f9-999d-08db3d2df856 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: nc37ZkgXJRk5l+l185BMy+EzKvB8vaJiRc3hv60gJ/XkbME6IqyFFtk98Xk2uR0hXS9NlNTQFwX0ceBS/ECODkotbKqwf4pE0hxDu9i5d+zabTFcBSCaZ/m7F6EoizosQfgMVs2UGIC5zlyUrH0W7z/98Z1/5BwbbcAUVxwYcZH6AMaYVcCpWNA2ZCDB/o7EZli35PueulGdBNgpjg4xdvEV0ke+9d5ReA1YsrCdFhQlGjFDg7wX+x2YCme98rIAYysPS3maGV1Jz7XW6hz6tOv9a7UigpzxZPhHoop6cbrKjT66pLGv+/oibp6zF37y06ONihTmfYGncue291mDRMI+djYinda7m6zVaeyfcuub+2zL1ApN/HvvBinY3esNrKVr9t5l/cx+hyUhWXuM1pX1QLSyuiN/NY56cZgXeBCtqcl8FpauNS44+dHtDvLq14ukVPKPq5IsvR6sjd3nREEOPiT8VHATqU5nX0w5nLcbmNg8ZyiImXUvN0KiTvp7SKLBiGKODBt4azfRArUonLkQVsglvSFagFnmiYBZP+AqZyAWQD71StOBQ/2azQ3UEHXXlQzyjB1QQin1Z0qj9PcYzoLn0Q1gVZtVC/OJNSY= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY2PR02MB3678.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(366004)(136003)(346002)(396003)(39860400002)(451199021)(9686003)(6506007)(26005)(55016003)(186003)(83380400001)(966005)(71200400001)(7696005)(5660300002)(33656002)(41300700001)(316002)(8936002)(8676002)(52536014)(38100700002)(38070700005)(86362001)(122000001)(478600001)(66946007)(76116006)(64756008)(66446008)(66556008)(66476007)(6916009)(2906002)(44832011);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?PrxofBCanQ0NvxkWByDrJKrO96T5?= =?utf-8?q?UinO2oSznLZdTUMW7JtqMTYssb/+dAycCyR5TbYkmOtxmhkYPcDjMIhQkwd1c2o1a?= =?utf-8?q?XFOssPQyNPyVfG5jeiIbEmx6n06jNye0688z6m68zGJURXTm6URztis7pBy+aaBUc?= =?utf-8?q?dM7u0ekVVcrKwoMASoncCUrJ7WZO/vQxkZzidaYZqzZq5S31zYoPHvtrqsSlNO1JY?= =?utf-8?q?FrwWNlwZ3f+vngeR2EnjWXArDDYmwBQ6EzrZvnFD5e9RHGTbC6UVM1TDVv7hlLLTd?= =?utf-8?q?sMb19P2hOyhmsCL6zLi7PKKjlCh/e9KJ1+9QA3eG1DdOWMx+UZsQf5BdT9cnFlKTB?= =?utf-8?q?qKH7QPKby26axyrM3AG873Gtv7oL1cfaF18IkGmlzW02zdgRCnaCA3V58RH8xcozI?= =?utf-8?q?XhhKxBq6rTGyvOPHS5qzxTfsV6GKH0ZZau4esAuxzNfUtwxjqsyOqh4CapspO+qRL?= =?utf-8?q?80tEYRj9p5omNpBO1kDkzaYAHe0P4EAr0MMOG90JFxpkaWazinwR7fW9n4/UKxp8T?= =?utf-8?q?9DkLsiukptNHditskwAbBRLqW8cOicAHKDDbpd3EuTe4uOZn5Q7z70mIMGh2aAflk?= =?utf-8?q?zp20J8YBogoF8MtU3lx64Pp81QF0v9P2wXRkoLVEClqVdU8QTrcAJKY17hH/iA38q?= =?utf-8?q?SqWLV72b2zYAIoqFDKwtKMTjkAL6W+58BkeBB5mKCj/FObJSbB0ntuMWuNriwYJaE?= =?utf-8?q?0yf1QxWxQCVdcimp2dxH0+Fw+xI0IV8s3ye0ojV76AUawelvueUyqu6+FNv6CJKXL?= =?utf-8?q?bsauiN4ShZsOmC+0eHoGsrnnBAx3uqE+4uDp/GktNYXupLhQ3kN5c1J6MDRaz1vWR?= =?utf-8?q?uT1C08jIXhrA8GW4ziGyhi5ONzz6KG2bU88ZWaeKLJ5uuK/vm5UeWHAMviR9lcoCX?= =?utf-8?q?3Zp145twNvd+AfKj4dWxlmAbK7jQeQJUnBKUqU77DXi214ZLqZNY6GeivdR4lDTvb?= =?utf-8?q?1XMZrt611QaSsSmNEuLMjhiEOMrCVu13l4cgSvKlSals4SysOrgYfd0flNuBuKQho?= =?utf-8?q?uIBS/xTbuwAgsz4P83OXoDCdrQWWL1P0QVdBn8TG9XwEUJ8IsZ2UnZHzLxgI/edAb?= =?utf-8?q?7jqaIfqwNbbGN95HWlCXloQz0EVkkiRK3S3X9Tciz/2t6L2GQ8HzdWTNfBQtyOBnN?= =?utf-8?q?SUomY4jrCumqWF+lBuH9LWcmswAjlcxoWWQMebgRvO1rthdKhZuyMFAsxLXh7IrHO?= =?utf-8?q?RXbfiRyCUIGeSVP8Q9LL2dqNg/lTmTohrp+mTvqdIRGQK7DZ0MJfZcRbRs+7UXf2N?= =?utf-8?q?6gpsxOyDE7hL8Wy8KCXfwttVS9ttA2JpxKnsSbexkGcHEtZKG79+Xlyk1F6O/4Mm4?= =?utf-8?q?STjYLErB2TQ/wDLh7zsdtUzER3ZkK1l6pYA2oZMXGG99mdYoiHimAtqEnSybpkYgt?= =?utf-8?q?fgP8JIJqpW2AtKhoCUolcKGnKSd3ioTnc1QETxKsoRRYMykwLHBBmy3OUqdgK+wmi?= =?utf-8?q?xhFlhnnG8IQGUk8Ia2rVQCt8KUTeZqljfqAJwe21ooH2JSf6Be1BbbgS4XE8oU+SA?= =?utf-8?q?LPtgwkzOKnG6iAMcrTsfBQjlWJ5Sctkm0w=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: advantech.cz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY2PR02MB3678.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 844ac11d-6f99-43f9-999d-08db3d2df856 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Apr 2023 21:19:45.1936 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a77d40d9-dcba-4dda-b571-5f18e6da853f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 1ShYv47KVMZsaxxY7NEHtvcoeCTXoF6gRCDUGN30qsdR907AjW+jwElNI7MDbyogZUgIiGm/WfaKGvH0g2P7v2dwj14ftDMXIInUY3iBBgE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR02MB4726 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Apr 2023 21:19:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102098 Changelog: https://netfilter.org/projects/nftables/files/changes-nftables-1.0.7.txt The COPYING text changed to highlight that "New code though is moving to GPL version 2 or any later which is the preferred license for this project these days." Although the project itself stays GPLv2 only. https://netfilter.org/licensing.html#terms The upstream replaced distutils with setuptools, so the nftables-python is now built using the standard approach. The coexistence of setuptools and automake is solved in the same way as in meta-oe/recipes-support/libiio. The removal of *.pyc is no longer necessary. Signed-off-by: Petr Gotthard --- .../{nftables_1.0.6.bb => nftables_1.0.7.bb} | 44 ++++++++++++++----- 1 file changed, 33 insertions(+), 11 deletions(-) rename meta-networking/recipes-filter/nftables/{nftables_1.0.6.bb => nftables_1.0.7.bb} (60%) -- 2.34.1 diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb similarity index 60% rename from meta-networking/recipes-filter/nftables/nftables_1.0.6.bb rename to meta-networking/recipes-filter/nftables/nftables_1.0.7.bb index f43a223ac..8380bbd73 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.6.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.7.bb @@ -1,7 +1,7 @@ SUMMARY = "Netfilter Tables userspace utillites" SECTION = "net" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" +LIC_FILES_CHKSUM = "file://COPYING;md5=81ec33bb3e47b460fc993ac768c74b62" DEPENDS = "libmnl libnftnl bison-native \ ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" @@ -9,7 +9,7 @@ DEPENDS = "libmnl libnftnl bison-native \ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c" +SRC_URI[sha256sum] = "c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412" inherit autotools manpages pkgconfig ptest @@ -19,31 +19,53 @@ PACKAGECONFIG[json] = "--with-json, --without-json, jansson" PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --disable-python, python3-setuptools-native" +PACKAGECONFIG[python] = ",, python3-setuptools-native" PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" -EXTRA_OECONF = "${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" +# Disable the python via autoconf so we can build it separately via setuptools3 +EXTRA_OECONF = "--disable-python \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} +SETUPTOOLS_SETUP_PATH = "${S}/py" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} RRECOMMENDS:${PN} += "kernel-module-nf-tables" PACKAGES =+ "${PN}-python" -FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" +# Explicitly define do_configure, do_compile and do_install because both autotools and setuptools3 +# have EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + autotools_do_configure + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_configure + fi +} + +do_compile() { + autotools_do_compile + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_compile + fi +} + +do_install() { + autotools_do_install + if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + setuptools3_do_install + fi +} + RDEPENDS:${PN}-ptest += " ${PN}-python bash make iproute2 iputils-ping procps python3-core python3-ctypes python3-json python3-misc sed util-linux" TESTDIR = "tests" PRIVATE_LIBS:${PN}-ptest:append = " libnftables.so.1" -do_install:append() { - # Avoid "contains reference to TMPDIR" warning - find ${D} -name *.pyc -delete -} - do_install_ptest() { cp -rf ${S}/build-aux ${D}${PTEST_PATH} cp -rf ${S}/src ${D}${PTEST_PATH}