mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 01:50:18 +00:00
netplan: upgrade 1.0 -> 1.0.1
ChangeLog: https://github.com/canonical/netplan/releases/tag/1.0.1 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+3
-3
@@ -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 <yi.zhao@windriver.com>
|
From: Yi Zhao <yi.zhao@windriver.com>
|
||||||
Date: Wed, 6 Mar 2024 19:27:15 +0800
|
Date: Wed, 6 Mar 2024 19:27:15 +0800
|
||||||
Subject: [PATCH] meson.build: drop unnecessary build dependencies
|
Subject: [PATCH] meson.build: drop unnecessary build dependencies
|
||||||
@@ -15,7 +15,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 9556836a..30f33fe2 100644
|
index b29174de..09421d99 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def
|
@@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def
|
||||||
@@ -39,7 +39,7 @@ index 9556836a..30f33fe2 100644
|
|||||||
timeout: 100,
|
timeout: 100,
|
||||||
@@ -91,7 +92,9 @@ test('legacy-tests',
|
@@ -91,7 +92,9 @@ test('legacy-tests',
|
||||||
find_program('tests/cli_legacy.py'),
|
find_program('tests/cli_legacy.py'),
|
||||||
timeout: 600,
|
timeout: 900,
|
||||||
env: test_env)
|
env: test_env)
|
||||||
+endif
|
+endif
|
||||||
#TODO: split out dbus tests into own test() instance, to run in parallel
|
#TODO: split out dbus tests into own test() instance, to run in parallel
|
||||||
|
|||||||
+2
-2
@@ -14,7 +14,7 @@ inherit meson pkgconfig systemd python3targetconfig features_check
|
|||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "systemd"
|
REQUIRED_DISTRO_FEATURES = "systemd"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \
|
SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.0;protocol=https \
|
||||||
file://0001-meson.build-drop-unnecessary-build-dependencies.patch \
|
file://0001-meson.build-drop-unnecessary-build-dependencies.patch \
|
||||||
file://0002-meson.build-do-not-use-Werror.patch \
|
file://0002-meson.build-do-not-use-Werror.patch \
|
||||||
"
|
"
|
||||||
@@ -22,7 +22,7 @@ SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https
|
|||||||
SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.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"
|
SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch"
|
||||||
|
|
||||||
SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d"
|
SRCREV = "3a7516aadaf864ee9d04727977d3d9fd1bccbbda"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Reference in New Issue
Block a user