From c66db889484059a2339b374e789425f6829d6ee6 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sat, 20 Jul 2024 21:51:58 +0800 Subject: netplan: upgrade 1.0 -> 1.0.1 ChangeLog: https://github.com/canonical/netplan/releases/tag/1.0.1 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...build-drop-unnecessary-build-dependencies.patch | 6 +-- .../recipes-connectivity/netplan/netplan_1.0.1.bb | 52 ++++++++++++++++++++++ .../recipes-connectivity/netplan/netplan_1.0.bb | 52 ---------------------- 3 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb (limited to 'meta-oe') diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch index 4f385e917a..860451d972 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch @@ -1,4 +1,4 @@ -From d3aa30f5cd7ba375e006a755752acbcfcd619452 Mon Sep 17 00:00:00 2001 +From 6a1a24eb0f30002a4b0049d6cf38d3f2bc3c0209 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 6 Mar 2024 19:27:15 +0800 Subject: [PATCH] meson.build: drop unnecessary build dependencies @@ -15,7 +15,7 @@ Signed-off-by: Yi Zhao 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 9556836a..30f33fe2 100644 +index b29174de..09421d99 100644 --- a/meson.build +++ b/meson.build @@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def @@ -39,7 +39,7 @@ index 9556836a..30f33fe2 100644 timeout: 100, @@ -91,7 +92,9 @@ test('legacy-tests', find_program('tests/cli_legacy.py'), - timeout: 600, + timeout: 900, env: test_env) +endif #TODO: split out dbus tests into own test() instance, to run in parallel diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb new file mode 100644 index 0000000000..bb9f09f7e5 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "The network configuration abstraction renderer" +DESCRIPTION = "Netplan is a utility for easily configuring networking on a \ +linux system. You simply create a YAML description of the required network \ +interfaces and what each should be configured to do. From this description \ +Netplan will generate all the necessary configuration for your chosen renderer \ +tool." +HOMEPAGE = "https://netplan.io" +SECTION = "net/misc" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit meson pkgconfig systemd python3targetconfig features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.0;protocol=https \ + file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ + file://0002-meson.build-do-not-use-Werror.patch \ + " + +SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" +SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" + +SRCREV = "3a7516aadaf864ee9d04727977d3d9fd1bccbbda" + +S = "${WORKDIR}/git" + +DEPENDS = "glib-2.0 libyaml util-linux-libuuid \ + systemd python3-cffi-native \ + " + +EXTRA_OEMESON = "-Dunit_testing=false" + +RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ + python3-dbus python3-rich python3-cffi \ + util-linux-libuuid libnetplan \ + " + +do_install:append() { + install -d -m 755 ${D}${sysconfdir}/netplan +} + +PACKAGES += "${PN}-dbus libnetplan" + +FILES:libnetplan = "${libdir}/libnetplan.so.*" +FILES:${PN} = "${sbindir} ${libexecdir}/netplan/generate \ + ${datadir}/netplan ${datadir}/bash-completion \ + ${systemd_unitdir} ${PYTHON_SITEPACKAGES_DIR} \ + ${sysconfdir}/netplan \ + " +FILES:${PN}-dbus = "${libexecdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb deleted file mode 100644 index 229414718c..0000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "The network configuration abstraction renderer" -DESCRIPTION = "Netplan is a utility for easily configuring networking on a \ -linux system. You simply create a YAML description of the required network \ -interfaces and what each should be configured to do. From this description \ -Netplan will generate all the necessary configuration for your chosen renderer \ -tool." -HOMEPAGE = "https://netplan.io" -SECTION = "net/misc" - -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit meson pkgconfig systemd python3targetconfig features_check - -REQUIRED_DISTRO_FEATURES = "systemd" - -SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ - file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ - file://0002-meson.build-do-not-use-Werror.patch \ - " - -SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" -SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" - -SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d" - -S = "${WORKDIR}/git" - -DEPENDS = "glib-2.0 libyaml util-linux-libuuid \ - systemd python3-cffi-native \ - " - -EXTRA_OEMESON = "-Dunit_testing=false" - -RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ - python3-dbus python3-rich python3-cffi \ - util-linux-libuuid libnetplan \ - " - -do_install:append() { - install -d -m 755 ${D}${sysconfdir}/netplan -} - -PACKAGES += "${PN}-dbus libnetplan" - -FILES:libnetplan = "${libdir}/libnetplan.so.*" -FILES:${PN} = "${sbindir} ${libexecdir}/netplan/generate \ - ${datadir}/netplan ${datadir}/bash-completion \ - ${systemd_unitdir} ${PYTHON_SITEPACKAGES_DIR} \ - ${sysconfdir}/netplan \ - " -FILES:${PN}-dbus = "${libexecdir}/netplan/netplan-dbus ${datadir}/dbus-1" -- cgit v1.2.3-54-g00ecf