mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-30 13:00:02 +00:00
netplan upgrade 1.1.2 -> 1.2.1
ChangeLog: https://github.com/canonical/netplan/releases/tag/1.2 https://github.com/canonical/netplan/releases/tag/1.2.1 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
+4
-4
@@ -1,4 +1,4 @@
|
|||||||
From 668ee79f39614ad758edd44c42b8b0eff57877cf Mon Sep 17 00:00:00 2001
|
From 3790a098f4905cd330234fc4d18b4d4536b360bf Mon Sep 17 00:00:00 2001
|
||||||
From: Alexander Kanavin <alex@linutronix.de>
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
Date: Sun, 3 Oct 2021 21:52:16 +0200
|
Date: Sun, 3 Oct 2021 21:52:16 +0200
|
||||||
Subject: [PATCH] meson.build: do not use -Werror
|
Subject: [PATCH] meson.build: do not use -Werror
|
||||||
@@ -12,7 +12,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
diff --git a/meson.build b/meson.build
|
||||||
index 30f33fe2..0b214795 100644
|
index 6f517b5a..2ecb7f5d 100644
|
||||||
--- a/meson.build
|
--- a/meson.build
|
||||||
+++ b/meson.build
|
+++ b/meson.build
|
||||||
@@ -4,7 +4,7 @@ project('netplan', 'c',
|
@@ -4,7 +4,7 @@ project('netplan', 'c',
|
||||||
@@ -22,8 +22,8 @@ index 30f33fe2..0b214795 100644
|
|||||||
- 'werror=true',
|
- 'werror=true',
|
||||||
+ 'werror=false',
|
+ 'werror=false',
|
||||||
],
|
],
|
||||||
meson_version: '>= 0.61.0',
|
meson_version: '>= 1.3.0',
|
||||||
)
|
)
|
||||||
--
|
--
|
||||||
2.25.1
|
2.34.1
|
||||||
|
|
||||||
|
|||||||
+3
-2
@@ -14,13 +14,13 @@ inherit meson pkgconfig systemd python3targetconfig features_check
|
|||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "systemd"
|
REQUIRED_DISTRO_FEATURES = "systemd"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=stable/1.1;protocol=https \
|
SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \
|
||||||
file://0001-meson.build-do-not-use-Werror.patch \
|
file://0001-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:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"
|
||||||
|
|
||||||
SRCREV = "01045f683b9419beb90119497cd1b2be44e83b8e"
|
SRCREV = "f758e3f6415aa68b7cf28991bc5b3e9631297d6d"
|
||||||
|
|
||||||
|
|
||||||
DEPENDS = "glib-2.0 libyaml util-linux-libuuid \
|
DEPENDS = "glib-2.0 libyaml util-linux-libuuid \
|
||||||
@@ -43,6 +43,7 @@ PACKAGES += "${PN}-dbus libnetplan"
|
|||||||
|
|
||||||
FILES:libnetplan = "${libdir}/libnetplan.so.*"
|
FILES:libnetplan = "${libdir}/libnetplan.so.*"
|
||||||
FILES:${PN} = "${sbindir} ${libexecdir}/netplan/generate \
|
FILES:${PN} = "${sbindir} ${libexecdir}/netplan/generate \
|
||||||
|
${libexecdir}/netplan/configure \
|
||||||
${datadir}/netplan ${datadir}/bash-completion \
|
${datadir}/netplan ${datadir}/bash-completion \
|
||||||
${systemd_unitdir} ${PYTHON_SITEPACKAGES_DIR} \
|
${systemd_unitdir} ${PYTHON_SITEPACKAGES_DIR} \
|
||||||
${sysconfdir}/netplan \
|
${sysconfdir}/netplan \
|
||||||
Reference in New Issue
Block a user