This is to make explicit the conditional select of libunwind is only needed for libopenvswitch. If we spill it over other packages, the generated kconfig will have recursive dependency issue. 2 new patches were made for this goal The other thing is that "+libunwind" will cause it to be built if any of the packages defined in this Makefile is enabled (y or m). This is at the moment by-design of the build system. Libunwind does not support architectures like arc. Use conditional select To avoid (libunwind) build failures like the following, checking for ELF helper width... configure: error: Unknown ELF target: arc make[3]: *** [Makefile:65: /data/openwrt/build_dir/target-arc_arc700_uClibc/ libunwind-1.3.1/.configured_68b329da9893e34099c7d8ad5cb9c940] Error 1 Things like "+PACKAGE_openvswitch-libopenvswitch:libunwind" will also result in recursive deps error for chains of 3 nodes. Kconfig construct like the following will be made config A tristate select B depends on !(C) || (x) config B tristate select C config C tristate config x bool Other changes include - Shared use of variable ovs__common_depends was removed - Ovn doc build was patched out Link: https://github.com/openwrt/packages/pull/12959#issuecomment-665021413 Reported-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
28 lines
961 B
Diff
28 lines
961 B
Diff
From 7385d1e67dda100853cf748034220cdbed6b3d7c Mon Sep 17 00:00:00 2001
|
|
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Date: Mon, 23 Mar 2020 15:54:26 +0800
|
|
Subject: [PATCH] ovn-lib: fix install_dir()
|
|
|
|
The command "install" is not available in OpenWrt by default
|
|
|
|
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
|
---
|
|
utilities/ovn-lib.in | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in
|
|
index af1b72edb..f6ab5581c 100644
|
|
--- a/utilities/ovn-lib.in
|
|
+++ b/utilities/ovn-lib.in
|
|
@@ -54,7 +54,10 @@ ovn_install_dir () {
|
|
[ "${OVN_USER##*:}" != "" ] && INSTALL_GROUP="${OVN_USER##*:}"
|
|
|
|
if test ! -d "$DIR"; then
|
|
- install -d -m "$INSTALL_MODE" -o "$INSTALL_USER" -g "$INSTALL_GROUP" "$DIR"
|
|
+ mkdir -p "$DIR"
|
|
+ chmod "$INSTALL_MODE" "$DIR"
|
|
+ chown "$INSTALL_USER" "$DIR"
|
|
+ chgrp "$INSTALL_GROUP" "$DIR"
|
|
restorecon "$DIR" >/dev/null 2>&1
|
|
fi
|
|
}
|