Browse Source

openvswitch: remove explicit dependency on librt

Selection of librt will be handled by the build system

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
lilik-openwrt-22.03
Yousong Zhou 4 years ago
parent
commit
a00671bf86
2 changed files with 13 additions and 17 deletions
  1. +8
    -10
      net/openvswitch/Makefile
  2. +5
    -7
      net/ovn/Makefile

+ 8
- 10
net/openvswitch/Makefile View File

@ -17,7 +17,7 @@ include ./openvswitch.mk
# #
PKG_NAME:=openvswitch PKG_NAME:=openvswitch
PKG_VERSION:=$(ovs_version) PKG_VERSION:=$(ovs_version)
PKG_RELEASE:=8
PKG_RELEASE:=9
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.openvswitch.org/releases/ PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
PKG_HASH:=dd5f727427e36cab22bdeae61529d8c8fccacc53d968cfa7658f7f935ddda531 PKG_HASH:=dd5f727427e36cab22bdeae61529d8c8fccacc53d968cfa7658f7f935ddda531
@ -156,8 +156,6 @@ ovs_kmod_openvswitch-lisp-intree_depends:= +kmod-openvswitch-intree
ovs_kmod_openvswitch-lisp-intree_files:= $(ovs_kmod_intree_dir)/vport-lisp.ko ovs_kmod_openvswitch-lisp-intree_files:= $(ovs_kmod_intree_dir)/vport-lisp.ko
$(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree)) $(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree))
ovs__common_depends:=+libatomic +librt
# Dependency review # Dependency review
# #
# for f in sbin/*; do echo $f; readelf -d $f | grep -i shared; done # for f in sbin/*; do echo $f; readelf -d $f | grep -i shared; done
@ -167,21 +165,21 @@ ovs__common_depends:=+libatomic +librt
ovs_libopenvswitch_title:=Open vSwitch (libopenvswitch.so) ovs_libopenvswitch_title:=Open vSwitch (libopenvswitch.so)
ovs_libopenvswitch_hidden:=1 ovs_libopenvswitch_hidden:=1
ovs_libopenvswitch_depends:=+libopenssl +libunbound +!(arc||arceb):libunwind ovs_libopenvswitch_depends:=+libopenssl +libunbound +!(arc||arceb):libunwind
ovs_libopenvswitch_depends+=$(ovs__common_depends)
ovs_libopenvswitch_depends+=+libatomic
ovs_libopenvswitch_files:=usr/lib/libopenvswitch*.so* ovs_libopenvswitch_files:=usr/lib/libopenvswitch*.so*
$(eval $(call OvsPackageTemplate,libopenvswitch)) $(eval $(call OvsPackageTemplate,libopenvswitch))
ovs_libofproto_title:=Open vSwitch (libofproto.so libsflow.so) ovs_libofproto_title:=Open vSwitch (libofproto.so libsflow.so)
ovs_libofproto_hidden:=1 ovs_libofproto_hidden:=1
ovs_libofproto_depends+=$(ovs__common_depends)
ovs_libofproto_depends+=+libatomic
ovs_libofproto_files:=usr/lib/libofproto*.so* usr/lib/libsflow*.so* ovs_libofproto_files:=usr/lib/libofproto*.so* usr/lib/libsflow*.so*
$(eval $(call OvsPackageTemplate,libofproto)) $(eval $(call OvsPackageTemplate,libofproto))
ovs_libovsdb_title:=Open vSwitch (libovsdb.so) ovs_libovsdb_title:=Open vSwitch (libovsdb.so)
ovs_libovsdb_hidden:=1 ovs_libovsdb_hidden:=1
ovs_libovsdb_depends+=$(ovs__common_depends)
ovs_libovsdb_depends+=+libatomic
ovs_libovsdb_files:=usr/lib/libovsdb*.so* ovs_libovsdb_files:=usr/lib/libovsdb*.so*
$(eval $(call OvsPackageTemplate,libovsdb)) $(eval $(call OvsPackageTemplate,libovsdb))
@ -189,7 +187,7 @@ $(eval $(call OvsPackageTemplate,libovsdb))
ovs_vswitchd_title:=Open vSwitch (ovs-vswitchd) ovs_vswitchd_title:=Open vSwitch (ovs-vswitchd)
ovs_vswitchd_hidden:=1 ovs_vswitchd_hidden:=1
ovs_vswitchd_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto ovs_vswitchd_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto
ovs_vswitchd_depends+=$(ovs__common_depends)
ovs_vswitchd_depends+=+libatomic
ovs_vswitchd_files:=usr/sbin/ovs-vswitchd ovs_vswitchd_files:=usr/sbin/ovs-vswitchd
$(eval $(call OvsPackageTemplate,vswitchd)) $(eval $(call OvsPackageTemplate,vswitchd))
@ -197,7 +195,7 @@ $(eval $(call OvsPackageTemplate,vswitchd))
ovs_ovsdb_title:=Open vSwitch (ovsdb-server) ovs_ovsdb_title:=Open vSwitch (ovsdb-server)
ovs_ovsdb_hidden:=1 ovs_ovsdb_hidden:=1
ovs_ovsdb_depends:=+openvswitch-libopenvswitch +openvswitch-libovsdb ovs_ovsdb_depends:=+openvswitch-libopenvswitch +openvswitch-libovsdb
ovs_ovsdb_depends+=$(ovs__common_depends)
ovs_ovsdb_depends+=+libatomic
ovs_ovsdb_files:=usr/sbin/ovsdb-server ovs_ovsdb_files:=usr/sbin/ovsdb-server
$(eval $(call OvsPackageTemplate,ovsdb)) $(eval $(call OvsPackageTemplate,ovsdb))
@ -205,7 +203,7 @@ $(eval $(call OvsPackageTemplate,ovsdb))
ovs_common_title:=Open vSwitch (common files) ovs_common_title:=Open vSwitch (common files)
ovs_common_hidden:=1 ovs_common_hidden:=1
ovs_common_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto +openvswitch-libovsdb ovs_common_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto +openvswitch-libovsdb
ovs_common_depends+=$(ovs__common_depends)
ovs_common_depends+=+libatomic
ovs_common_files:= \ ovs_common_files:= \
usr/share/openvswitch/scripts/ovs-lib \ usr/share/openvswitch/scripts/ovs-lib \
usr/share/openvswitch/scripts/ovs-ctl \ usr/share/openvswitch/scripts/ovs-ctl \
@ -237,7 +235,7 @@ ovs_openvswitch_title:=Open vSwitch
ovs_openvswitch_hidden:= ovs_openvswitch_hidden:=
ovs_openvswitch_depends:=+coreutils +coreutils-sleep +uuidgen \ ovs_openvswitch_depends:=+coreutils +coreutils-sleep +uuidgen \
+openvswitch-common +openvswitch-vswitchd +openvswitch-ovsdb +kmod-openvswitch +openvswitch-common +openvswitch-vswitchd +openvswitch-ovsdb +kmod-openvswitch
ovs_openvswitch_depends+=$(ovs__common_depends)
ovs_openvswitch_depends+=+libatomic
ovs_openvswitch_files:= usr/share/openvswitch/vswitch.ovsschema ovs_openvswitch_files:= usr/share/openvswitch/vswitch.ovsschema
$(eval $(call OvsPackageTemplate,openvswitch)) $(eval $(call OvsPackageTemplate,openvswitch))


+ 5
- 7
net/ovn/Makefile View File

@ -10,7 +10,7 @@ include ../openvswitch/openvswitch.mk
PKG_NAME:=ovn PKG_NAME:=ovn
PKG_VERSION:=20.06.1 PKG_VERSION:=20.06.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ovn-org/ovn.git PKG_SOURCE_URL:=https://github.com/ovn-org/ovn.git
@ -33,11 +33,9 @@ PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-host.mk include ../../lang/python/python3-host.mk
ovs__common_depends:=+libatomic +librt
ovs_libovn_title:=Open vSwitch (libovn.so) ovs_libovn_title:=Open vSwitch (libovn.so)
ovs_libovn_hidden:=1 ovs_libovn_hidden:=1
ovs_libovn_depends+=$(ovs__common_depends)
ovs_libovn_depends+=+libatomic
ovs_libovn_files:=usr/lib/libovn*.so* ovs_libovn_files:=usr/lib/libovn*.so*
$(eval $(call OvsPackageTemplate,libovn)) $(eval $(call OvsPackageTemplate,libovn))
@ -45,7 +43,7 @@ $(eval $(call OvsPackageTemplate,libovn))
ovs_ovn-common_title:=Open Virtual Network (common files) ovs_ovn-common_title:=Open Virtual Network (common files)
ovs_ovn-common_hidden:=1 ovs_ovn-common_hidden:=1
ovs_ovn-common_depends:=+openvswitch-common +openvswitch-libopenvswitch +openvswitch-libovn +openvswitch-libovsdb ovs_ovn-common_depends:=+openvswitch-common +openvswitch-libopenvswitch +openvswitch-libovn +openvswitch-libovsdb
ovs_ovn-common_depends+=$(ovs__common_depends)
ovs_ovn-common_depends+=+libatomic
ovs_ovn-common_files:= \ ovs_ovn-common_files:= \
usr/share/ovn/scripts/ovn-ctl \ usr/share/ovn/scripts/ovn-ctl \
usr/share/ovn/scripts/ovn-lib \ usr/share/ovn/scripts/ovn-lib \
@ -59,7 +57,7 @@ $(eval $(call OvsPackageTemplate,ovn-common))
ovs_ovn-north_title:=Open Virtual Network (north package) ovs_ovn-north_title:=Open Virtual Network (north package)
ovs_ovn-north_hidden:= ovs_ovn-north_hidden:=
ovs_ovn-north_depends:=+openvswitch-ovsdb +openvswitch-ovn-common ovs_ovn-north_depends:=+openvswitch-ovsdb +openvswitch-ovn-common
ovs_ovn-north_depends+=$(ovs__common_depends)
ovs_ovn-north_depends+=+libatomic
ovs_ovn-north_files:=\ ovs_ovn-north_files:=\
usr/share/ovn/ovn-nb.ovsschema \ usr/share/ovn/ovn-nb.ovsschema \
usr/share/ovn/ovn-sb.ovsschema \ usr/share/ovn/ovn-sb.ovsschema \
@ -70,7 +68,7 @@ $(eval $(call OvsPackageTemplate,ovn-north))
ovs_ovn-host_title:=Open Virtual Network (chassis package) ovs_ovn-host_title:=Open Virtual Network (chassis package)
ovs_ovn-host_hidden:= ovs_ovn-host_hidden:=
ovs_ovn-host_depends:=+openvswitch +openvswitch-ovn-common ovs_ovn-host_depends:=+openvswitch +openvswitch-ovn-common
ovs_ovn-host_depends+=$(ovs__common_depends)
ovs_ovn-host_depends+=+libatomic
ovs_ovn-host_files:=usr/bin/ovn-controller ovs_ovn-host_files:=usr/bin/ovn-controller
$(eval $(call OvsPackageTemplate,ovn-host)) $(eval $(call OvsPackageTemplate,ovn-host))


Loading…
Cancel
Save