project-lakitu: update netplan to v0.103
BUG=b/213609716
TEST=presubmit
RELEASE_NOTE=update netplan to v0.103
Change-Id: I13df35ebdccd497e859498215b1df6cf9c41387c
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/27180
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-lakitu/net-misc/netplan/Manifest b/project-lakitu/net-misc/netplan/Manifest
index 1f7337a..a4b994f 100644
--- a/project-lakitu/net-misc/netplan/Manifest
+++ b/project-lakitu/net-misc/netplan/Manifest
@@ -1 +1 @@
-DIST netplan-0.102.tar.gz 212703 BLAKE2B a12e98ad5b827369579d677e5a9221507547349de99ac4b0f760d66361bea8822e3d082933a8a6dc52a5ccebe7ee8b79854007eba53c807bcb143478fbe4976b SHA512 50b9a49108519180d5463fc075fea957a06944606b5c2ceec4e1f700f60c56fd95235dcc3804d02dbee4a8b5887b10ae8f6caaf9ac07d42e697923d54ca3c445
+DIST netplan-0.103.tar.gz 235165 BLAKE2B 4fff823e9abbe666a7d152ddf944b5be20184c14ca6b193130c783558759e32c44d5afab4dd7d368fde559150e53bd632256ce526b6ec4500d75578924c92462 SHA512 306557c033d6aedf900b0f8d278434d94878196e6b8b25e99255c03496fb6d3241c5b18a8bbc81ac7d06ef6f8c0700dcb3d4a70840c8af090bcae1130255c82b
diff --git a/project-lakitu/net-misc/netplan/files/netplan-0.102-modify-makefile-to-accept-custom-pkg-config.patch b/project-lakitu/net-misc/netplan/files/netplan-0.103-modify-makefile-to-accept-custom-pkg-config.patch
similarity index 70%
rename from project-lakitu/net-misc/netplan/files/netplan-0.102-modify-makefile-to-accept-custom-pkg-config.patch
rename to project-lakitu/net-misc/netplan/files/netplan-0.103-modify-makefile-to-accept-custom-pkg-config.patch
index b0565f2..a33ac4f 100644
--- a/project-lakitu/net-misc/netplan/files/netplan-0.102-modify-makefile-to-accept-custom-pkg-config.patch
+++ b/project-lakitu/net-misc/netplan/files/netplan-0.103-modify-makefile-to-accept-custom-pkg-config.patch
@@ -9,18 +9,21 @@
is not supported by cos currently
--- a/Makefile
+++ b/Makefile
-@@ -13,6 +13,10 @@ BUILDFLAGS = \
- SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd)
- SYSTEMD_UNIT_DIR=$(shell pkg-config --variable=systemdsystemunitdir systemd)
- BASH_COMPLETIONS_DIR=$(shell pkg-config --variable=completionsdir bash-completion || echo "/etc/bash_completion.d")
+@@ -10,9 +10,10 @@ BUILDFLAGS = \
+ -Werror \
+ $(NULL)
+
+-SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd)
+-SYSTEMD_UNIT_DIR=$(shell pkg-config --variable=systemdsystemunitdir systemd)
+-BASH_COMPLETIONS_DIR=$(shell pkg-config --variable=completionsdir bash-completion || echo "/etc/bash_completion.d")
+HOSTPKGCONFIG ?= pkg-config
-+SYSTEMD_GENERATOR_DIR=$(shell $(HOSTPKGCONFIG) --variable=systemdsystemgeneratordir systemd)
-+SYSTEMD_UNIT_DIR=$(shell $(HOSTPKGCONFIG) --variable=systemdsystemunitdir systemd)
-+BASH_COMPLETIONS_DIR=$(shell $(HOSTPKGCONFIG) --variable=completionsdir bash-completion || echo "/etc/bash_completion.d")
++SYSTEMD_GENERATOR_DIR=$(shell ${HOSTPKGCONFIG} --variable=systemdsystemgeneratordir systemd)
++SYSTEMD_UNIT_DIR=$(shell ${HOSTPKGCONFIG} --variable=systemdsystemunitdir systemd)
++BASH_COMPLETIONS_DIR=$(shell ${HOSTPKGCONFIG} --variable=completionsdir bash-completion || echo "/etc/bash_completion.d")
GCOV ?= gcov
ROOTPREFIX ?=
-@@ -33,20 +37,20 @@ PYFLAKES3 ?= $(shell which pyflakes-3 || which pyflakes3 || echo true)
+@@ -33,20 +34,20 @@ PYFLAKES3 ?= $(shell which pyflakes-3 || which pyflakes3 || echo true)
PYCODESTYLE3 ?= $(shell which pycodestyle-3 || which pycodestyle || which pep8 || echo true)
NOSETESTS3 ?= $(shell which nosetests-3 || which nosetests3 || echo true)
@@ -29,24 +32,24 @@
%.o: src/%.c
- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
-+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `$(HOSTPKGCONFIG) --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `${HOSTPKGCONFIG} --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
libnetplan.so.$(NETPLAN_SOVER): parse.o netplan.o util.o validation.o error.o parse-nm.o
- $(CC) -shared -Wl,-soname,libnetplan.so.$(NETPLAN_SOVER) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --libs glib-2.0 gio-2.0 yaml-0.1`
-+ $(CC) -shared -Wl,-soname,libnetplan.so.$(NETPLAN_SOVER) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `$(HOSTPKGCONFIG) --libs glib-2.0 gio-2.0 yaml-0.1`
++ $(CC) -shared -Wl,-soname,libnetplan.so.$(NETPLAN_SOVER) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `${HOSTPKGCONFIG} --libs glib-2.0 gio-2.0 yaml-0.1`
ln -snf libnetplan.so.$(NETPLAN_SOVER) libnetplan.so
generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o openvswitch.o generate.o sriov.o
- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
-+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `$(HOSTPKGCONFIG) --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `${HOSTPKGCONFIG} --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid`
netplan-dbus: src/dbus.c src/_features.h parse.o util.o validation.o error.o
- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1`
-+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `$(HOSTPKGCONFIG) --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1`
++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `${HOSTPKGCONFIG} --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1`
src/_features.h: src/[^_]*.[hc]
printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@
-@@ -116,12 +120,6 @@ install: default
+@@ -116,12 +117,6 @@ install: default
# headers, dev data
install -m 644 src/*.h $(DESTDIR)/$(INCLUDEDIR)/netplan/
# TODO: install pkg-config once available
@@ -59,11 +62,10 @@
# dbus
mkdir -p $(DESTDIR)/$(DATADIR)/dbus-1/system.d $(DESTDIR)/$(DATADIR)/dbus-1/system-services
install -m 755 netplan-dbus $(DESTDIR)/$(ROOTLIBEXECDIR)/netplan/
-@@ -131,14 +129,4 @@ install: default
- %.service: %.service.in
+@@ -132,13 +127,4 @@ install: default
sed -e "s#@ROOTLIBEXECDIR@#$(ROOTLIBEXECDIR)#" $< > $@
--
+
-%.html: %.md
- pandoc -s --toc -o $@ $<
-
@@ -74,15 +76,3 @@
- pandoc -s -o $@ $^
-
.PHONY: clean
-diff --git a/src/netplan.h b/src/netplan.h
-index d2c538b..26574f8 100644
---- a/src/netplan.h
-+++ b/src/netplan.h
-@@ -81,7 +81,6 @@ static const char* const netplan_def_type_to_str[NETPLAN_DEF_TYPE_MAX_] = {
- [NETPLAN_DEF_TYPE_ETHERNET] = "ethernets",
- [NETPLAN_DEF_TYPE_WIFI] = "wifis",
- [NETPLAN_DEF_TYPE_MODEM] = "modems",
-- [NETPLAN_DEF_TYPE_VIRTUAL] = NULL,
- [NETPLAN_DEF_TYPE_BRIDGE] = "bridges",
- [NETPLAN_DEF_TYPE_BOND] = "bonds",
- [NETPLAN_DEF_TYPE_VLAN] = "vlans",
diff --git a/project-lakitu/net-misc/netplan/netplan-0.102-r1.ebuild b/project-lakitu/net-misc/netplan/netplan-0.102-r1.ebuild
deleted file mode 120000
index fa12e59..0000000
--- a/project-lakitu/net-misc/netplan/netplan-0.102-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-netplan-0.102.ebuild
\ No newline at end of file
diff --git a/project-lakitu/net-misc/netplan/netplan-0.103-r1.ebuild b/project-lakitu/net-misc/netplan/netplan-0.103-r1.ebuild
new file mode 120000
index 0000000..01b328f
--- /dev/null
+++ b/project-lakitu/net-misc/netplan/netplan-0.103-r1.ebuild
@@ -0,0 +1 @@
+netplan-0.103.ebuild
\ No newline at end of file
diff --git a/project-lakitu/net-misc/netplan/netplan-0.102.ebuild b/project-lakitu/net-misc/netplan/netplan-0.103.ebuild
similarity index 95%
rename from project-lakitu/net-misc/netplan/netplan-0.102.ebuild
rename to project-lakitu/net-misc/netplan/netplan-0.103.ebuild
index 3f511bc..fe4f2dc 100644
--- a/project-lakitu/net-misc/netplan/netplan-0.102.ebuild
+++ b/project-lakitu/net-misc/netplan/netplan-0.103.ebuild
@@ -42,7 +42,7 @@
src_prepare() {
# Adding this patch so that makefile accepts custom pkg-config
- eapply "${FILESDIR}/netplan-0.102-modify-makefile-to-accept-custom-pkg-config.patch"
+ eapply "${FILESDIR}/${P}-modify-makefile-to-accept-custom-pkg-config.patch"
sed -i -e "s:\$(DOCDIR)/netplan:\$(DOCDIR)/${PF}:" Makefile || die
