diff options
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch | 6 | ||||
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb (renamed from meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb) | 4 |
2 files changed, 5 insertions, 5 deletions
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 @@ | |||
| 1 | From d3aa30f5cd7ba375e006a755752acbcfcd619452 Mon Sep 17 00:00:00 2001 | 1 | From 6a1a24eb0f30002a4b0049d6cf38d3f2bc3c0209 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
| 3 | Date: Wed, 6 Mar 2024 19:27:15 +0800 | 3 | Date: Wed, 6 Mar 2024 19:27:15 +0800 |
| 4 | Subject: [PATCH] meson.build: drop unnecessary build dependencies | 4 | Subject: [PATCH] meson.build: drop unnecessary build dependencies |
| @@ -15,7 +15,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
| 15 | 1 file changed, 6 insertions(+), 2 deletions(-) | 15 | 1 file changed, 6 insertions(+), 2 deletions(-) |
| 16 | 16 | ||
| 17 | diff --git a/meson.build b/meson.build | 17 | diff --git a/meson.build b/meson.build |
| 18 | index 9556836a..30f33fe2 100644 | 18 | index b29174de..09421d99 100644 |
| 19 | --- a/meson.build | 19 | --- a/meson.build |
| 20 | +++ b/meson.build | 20 | +++ b/meson.build |
| 21 | @@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def | 21 | @@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def |
| @@ -39,7 +39,7 @@ index 9556836a..30f33fe2 100644 | |||
| 39 | timeout: 100, | 39 | timeout: 100, |
| 40 | @@ -91,7 +92,9 @@ test('legacy-tests', | 40 | @@ -91,7 +92,9 @@ test('legacy-tests', |
| 41 | find_program('tests/cli_legacy.py'), | 41 | find_program('tests/cli_legacy.py'), |
| 42 | timeout: 600, | 42 | timeout: 900, |
| 43 | env: test_env) | 43 | env: test_env) |
| 44 | +endif | 44 | +endif |
| 45 | #TODO: split out dbus tests into own test() instance, to run in parallel | 45 | #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.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.1.bb index 229414718c..bb9f09f7e5 100644 --- 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.1.bb | |||
| @@ -14,7 +14,7 @@ inherit meson pkgconfig systemd python3targetconfig features_check | |||
| 14 | 14 | ||
| 15 | REQUIRED_DISTRO_FEATURES = "systemd" | 15 | REQUIRED_DISTRO_FEATURES = "systemd" |
| 16 | 16 | ||
| 17 | SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ | 17 | SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.0;protocol=https \ |
| 18 | file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ | 18 | file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ |
| 19 | file://0002-meson.build-do-not-use-Werror.patch \ | 19 | file://0002-meson.build-do-not-use-Werror.patch \ |
| 20 | " | 20 | " |
| @@ -22,7 +22,7 @@ SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https | |||
| 22 | SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" | 22 | SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" |
| 23 | SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" | 23 | SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" |
| 24 | 24 | ||
| 25 | SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d" | 25 | SRCREV = "3a7516aadaf864ee9d04727977d3d9fd1bccbbda" |
| 26 | 26 | ||
| 27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
| 28 | 28 | ||
