diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-networking/openvswitch')
8 files changed, 190 insertions, 297 deletions
diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch deleted file mode 100644 index 2b87a1161..000000000 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-more-target-python-substitutions.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d1ab2f62a03c2c977de6fed5fca8de63e328a870 Mon Sep 17 00:00:00 2001 -Message-Id: <d1ab2f62a03c2c977de6fed5fca8de63e328a870.1391527986.git.Jim.Somerville@windriver.com> -From: Jim Somerville <Jim.Somerville@windriver.com> -Date: Tue, 4 Feb 2014 15:30:41 +0000 -Subject: [PATCH 1/1] openvswitch: add more target python substitutions - -The TARGET_PYTHON variable is used for script -substitutions to ensure the scripts will be able to properly execute -if the target system has a different path for the python. - -Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> ---- - ovsdb/ovsdb-dot.in | 2 +- - ovsdb/ovsdb-idlc.in | 2 +- - utilities/ovs-dpctl-top.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in -index 85c126d..402a77c 100755 ---- a/ovsdb/ovsdb-dot.in -+++ b/ovsdb/ovsdb-dot.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - - from datetime import date - import ovs.db.error -diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in -index ec1c655..f5c135f 100755 ---- a/ovsdb/ovsdb-idlc.in -+++ b/ovsdb/ovsdb-idlc.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - - import getopt - import os -diff --git a/utilities/ovs-dpctl-top.in b/utilities/ovs-dpctl-top.in -index f43fdeb..8475118 100755 ---- a/utilities/ovs-dpctl-top.in -+++ b/utilities/ovs-dpctl-top.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Copyright (c) 2013 Nicira, Inc. - # --- -1.8.3.4 - diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch deleted file mode 100644 index 98224b422..000000000 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 569ac1066cd3046b8ac899153df9f07908d45145 Mon Sep 17 00:00:00 2001 -From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Fri, 21 Jun 2013 11:16:00 -0400 -Subject: [PATCH] openvswitch: add target perl handling - -Allow the build to specify a path for the perl instead of reusing -the PERL variable which can lead to inconsistencies if we are cross -compiling. The TARGET_PERL variable will be used for script -substitutions to ensure the scripts will be able to properly execute -if the target system has a different path for the perl. - -Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- - Makefile.am | 1 + - configure.ac | 7 +++++++ - utilities/ovs-parse-leaks.in | 2 +- - 3 files changed, 9 insertions(+), 1 deletion(-) - -Index: openvswitch-2.0.0/Makefile.am -=================================================================== ---- openvswitch-2.0.0.orig/Makefile.am -+++ openvswitch-2.0.0/Makefile.am -@@ -114,6 +114,7 @@ - -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ - -e 's,[@]DBDIR[@],$(DBDIR),g' \ - -e 's,[@]PERL[@],$(PERL),g' \ -+ -e 's,[@]TARGET_PERL[@],$(TARGET_PERL),g' \ - -e 's,[@]PYTHON[@],$(PYTHON),g' \ - -e 's,[@]TARGET_PYTHON[@],$(TARGET_PYTHON),g' \ - -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ -Index: openvswitch-2.0.0/configure.ac -=================================================================== ---- openvswitch-2.0.0.orig/configure.ac -+++ openvswitch-2.0.0/configure.ac -@@ -115,6 +115,13 @@ - AC_SUBST(KARCH) - OVS_CHECK_LINUX - -+if test "$TARGET_PERL"; then -+ TARGET_PERL=$TARGET_PERL -+else -+ TARGET_PERL=$PERL -+fi -+AC_SUBST(TARGET_PERL) -+ - if test "$TARGET_PYTHON"; then - TARGET_PYTHON=$TARGET_PYTHON - else diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch deleted file mode 100644 index 97b352cb5..000000000 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch +++ /dev/null @@ -1,136 +0,0 @@ -From e8a5d34885c5fdba7d951fb1bb85131cbafca432 Mon Sep 17 00:00:00 2001 -From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Wed, 19 Jun 2013 17:25:56 -0400 -Subject: [PATCH] openvswitch: add target python handling - -Allow the build to specify a path for the python instead of reusing -the PYTHON variable which can lead to inconsistencies if we are cross -compiling. The TARGET_PYTHON variable will be used for script -substitutions to ensure the scripts will be able to properly execute -if the target system has a different path for the python. - -Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> ---- - Makefile.am | 1 + - configure.ac | 7 +++++++ - ovsdb/ovsdbmonitor/ovsdbmonitor.in | 2 +- - utilities/bugtool/ovs-bugtool.in | 2 +- - utilities/ovs-check-dead-ifs.in | 2 +- - utilities/ovs-l3ping.in | 2 +- - utilities/ovs-parse-backtrace.in | 2 +- - utilities/ovs-pcap.in | 2 +- - utilities/ovs-tcpundump.in | 2 +- - utilities/ovs-test.in | 2 +- - utilities/ovs-vlan-test.in | 2 +- - 11 files changed, 17 insertions(+), 9 deletions(-) - -Index: openvswitch-2.1.2/Makefile.am -=================================================================== ---- openvswitch-2.1.2.orig/Makefile.am -+++ openvswitch-2.1.2/Makefile.am -@@ -125,6 +125,7 @@ - -e 's,[@]DBDIR[@],$(DBDIR),g' \ - -e 's,[@]PERL[@],$(PERL),g' \ - -e 's,[@]PYTHON[@],$(PYTHON),g' \ -+ -e 's,[@]TARGET_PYTHON[@],$(TARGET_PYTHON),g' \ - -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]localstatedir[@],$(localstatedir),g' \ -Index: openvswitch-2.1.2/configure.ac -=================================================================== ---- openvswitch-2.1.2.orig/configure.ac -+++ openvswitch-2.1.2/configure.ac -@@ -118,6 +118,13 @@ - AC_SUBST(KARCH) - OVS_CHECK_LINUX - -+if test "$TARGET_PYTHON"; then -+ TARGET_PYTHON=$TARGET_PYTHON -+else -+ TARGET_PYTHON=$PYTHON -+fi -+AC_SUBST(TARGET_PYTHON) -+ - AC_CONFIG_FILES(Makefile) - AC_CONFIG_FILES(datapath/Makefile) - AC_CONFIG_FILES(datapath/linux/Kbuild) -Index: openvswitch-2.1.2/utilities/bugtool/ovs-bugtool.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/bugtool/ovs-bugtool.in -+++ openvswitch-2.1.2/utilities/bugtool/ovs-bugtool.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - - # This library is free software; you can redistribute it and/or - # modify it under the terms of version 2.1 of the GNU Lesser General Public -Index: openvswitch-2.1.2/utilities/ovs-check-dead-ifs.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-check-dead-ifs.in -+++ openvswitch-2.1.2/utilities/ovs-check-dead-ifs.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - - import os - import re -Index: openvswitch-2.1.2/utilities/ovs-l3ping.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-l3ping.in -+++ openvswitch-2.1.2/utilities/ovs-l3ping.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. -Index: openvswitch-2.1.2/utilities/ovs-parse-backtrace.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-parse-backtrace.in -+++ openvswitch-2.1.2/utilities/ovs-parse-backtrace.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Copyright (c) 2012 Nicira, Inc. - # -Index: openvswitch-2.1.2/utilities/ovs-pcap.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-pcap.in -+++ openvswitch-2.1.2/utilities/ovs-pcap.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Copyright (c) 2010 Nicira, Inc. - # -Index: openvswitch-2.1.2/utilities/ovs-tcpundump.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-tcpundump.in -+++ openvswitch-2.1.2/utilities/ovs-tcpundump.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Copyright (c) 2010 Nicira, Inc. - # -Index: openvswitch-2.1.2/utilities/ovs-test.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-test.in -+++ openvswitch-2.1.2/utilities/ovs-test.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. -Index: openvswitch-2.1.2/utilities/ovs-vlan-test.in -=================================================================== ---- openvswitch-2.1.2.orig/utilities/ovs-vlan-test.in -+++ openvswitch-2.1.2/utilities/ovs-vlan-test.in -@@ -1,4 +1,4 @@ --#! @PYTHON@ -+#! @TARGET_PYTHON@ - # - # Copyright (c) 2010 Nicira, Inc. - # diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch new file mode 100644 index 000000000..68f46ff57 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch @@ -0,0 +1,152 @@ +From 04ad1c3d9f47cfdf4ad9b5d685e953ec094326ff Mon Sep 17 00:00:00 2001 +From: Mark Asselstine <mark.asselstine@windriver.com> +Date: Fri, 13 Jan 2017 16:12:55 -0500 +Subject: [PATCH] python: make remaining scripts use /usr/bin/env + +Unfortunately there is no concept of a host python vs. target python +to facilitate cross compilation. There is only one PYTHON variable and +this is used during building and in the header of python scripts after +installation. The best approach for cross compilation is to thus to +ensure python is in the path and avoid passing a path as part of +PYTHON. To make this function smoothly all installed scripts should +make use of /usr/bin/env to increase the chances of finding python. + +Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> +--- + build-aux/check-structs | 2 +- + build-aux/extract-ofp-actions | 2 +- + build-aux/extract-ofp-errors | 2 +- + build-aux/extract-ofp-fields | 2 +- + build-aux/extract-ofp-msgs | 2 +- + build-aux/xml2nroff | 2 +- + ovn/utilities/ovn-docker-overlay-driver | 2 +- + ovn/utilities/ovn-docker-underlay-driver | 2 +- + ovsdb/ovsdb-doc | 2 +- + ovsdb/ovsdb-dot.in | 2 +- + ovsdb/ovsdb-idlc.in | 2 +- + utilities/bugtool/ovs-bugtool.in | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/build-aux/check-structs b/build-aux/check-structs +index f79f235..c7b8730 100755 +--- a/build-aux/check-structs ++++ b/build-aux/check-structs +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + import os.path + import sys +diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions +index 184447b..92ea18d 100755 +--- a/build-aux/extract-ofp-actions ++++ b/build-aux/extract-ofp-actions +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + import sys + import os.path +diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors +index 9642593..11e6de7 100755 +--- a/build-aux/extract-ofp-errors ++++ b/build-aux/extract-ofp-errors +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + import sys + import os.path +diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields +index 498b887..5d6bcec 100755 +--- a/build-aux/extract-ofp-fields ++++ b/build-aux/extract-ofp-fields +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + import getopt + import sys +diff --git a/build-aux/extract-ofp-msgs b/build-aux/extract-ofp-msgs +index 1813638..e9e3c25 100755 +--- a/build-aux/extract-ofp-msgs ++++ b/build-aux/extract-ofp-msgs +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + import sys + import os.path +diff --git a/build-aux/xml2nroff b/build-aux/xml2nroff +index bd4e879..9d81503 100755 +--- a/build-aux/xml2nroff ++++ b/build-aux/xml2nroff +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. + # +diff --git a/ovn/utilities/ovn-docker-overlay-driver b/ovn/utilities/ovn-docker-overlay-driver +index 52de3db..c90f02b 100755 +--- a/ovn/utilities/ovn-docker-overlay-driver ++++ b/ovn/utilities/ovn-docker-overlay-driver +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + # Copyright (C) 2015 Nicira, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/ovn/utilities/ovn-docker-underlay-driver b/ovn/utilities/ovn-docker-underlay-driver +index 2c9c4b6..89b804c 100755 +--- a/ovn/utilities/ovn-docker-underlay-driver ++++ b/ovn/utilities/ovn-docker-underlay-driver +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + # Copyright (C) 2015 Nicira, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc +index 5cf26ee..f76f4bd 100755 +--- a/ovsdb/ovsdb-doc ++++ b/ovsdb/ovsdb-doc +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#! /usr/bin/env python + + # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. + # +diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in +index 134ce22..893c408 100755 +--- a/ovsdb/ovsdb-dot.in ++++ b/ovsdb/ovsdb-dot.in +@@ -1,4 +1,4 @@ +-#! @PYTHON@ ++#! /usr/bin/env @PYTHON@ + + from datetime import date + import ovs.db.error +diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in +index 721ab50..bfbcf23 100755 +--- a/ovsdb/ovsdb-idlc.in ++++ b/ovsdb/ovsdb-idlc.in +@@ -1,4 +1,4 @@ +-#! @PYTHON@ ++#! /usr/bin/env @PYTHON@ + + import getopt + import os +diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in +index 963c50c..c84d7c2 100755 +--- a/utilities/bugtool/ovs-bugtool.in ++++ b/utilities/bugtool/ovs-bugtool.in +@@ -1,4 +1,4 @@ +-#! @PYTHON@ ++#! /usr/bin/env @PYTHON@ + + # This library is free software; you can redistribute it and/or + # modify it under the terms of version 2.1 of the GNU Lesser General Public +-- +2.7.4 + diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch index 7e7404412..47c81dd98 100644 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch @@ -1,4 +1,4 @@ -From e20556d7cf0fc8258db77c1f3e0a160cf9fd4514 Mon Sep 17 00:00:00 2001 +From a2a656e6976a60e5df3ade0d17a40b4ebdc2b41a Mon Sep 17 00:00:00 2001 From: He Zhe <zhe.he@windriver.com> Date: Wed, 30 Mar 2016 06:23:45 -0400 Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution @@ -19,13 +19,13 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> create mode 100644 test.mk diff --git a/Makefile.am b/Makefile.am -index ed43c2f..f38d278 100644 +index a4dd7b8..0bd32c7 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -401,3 +401,4 @@ include datapath-windows/include/automake.mk - include windows/automake.mk +@@ -429,3 +429,4 @@ include windows/automake.mk include ovn/automake.mk include selinux/automake.mk + include build-aux/automake.mk +include test.mk diff --git a/test.mk b/test.mk new file mode 100644 @@ -106,5 +106,5 @@ index 0000000..b10a581 + sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite + sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite -- -1.9.1 +2.7.4 diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch deleted file mode 100644 index c75ebc50d..000000000 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2a78bddb865e0d3377f437428ed6825195af0a14 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Wed, 13 Apr 2016 03:13:01 -0400 -Subject: [PATCH] openvswitch: ptest: Fix python path - -For now PYTHON just happens to be the same as TARGET_PYTHON so we get the right -python binary. This patch sets PYTHON to TARGET_PYTHON since ptest is going to -be run on target. - -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - tests/atlocal.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/atlocal.in b/tests/atlocal.in -index 5815c6c..db2d2c9 100644 ---- a/tests/atlocal.in -+++ b/tests/atlocal.in -@@ -5,7 +5,7 @@ EGREP='@EGREP@' - PERL='@PERL@' - - if test x"$PYTHON" = x; then -- PYTHON='@PYTHON@' -+ PYTHON='@TARGET_PYTHON@' - fi - - PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH --- -1.9.1 - diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc index 3c70703a7..1f0b52b3b 100644 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc @@ -11,11 +11,11 @@ HOMEPAGE = "http://openvswitch.org/" SECTION = "networking" LICENSE = "Apache-2" -DEPENDS += "bridge-utils openssl python perl" +DEPENDS += "bridge-utils openssl python perl python-six-native coreutils-native" RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ python perl perl-module-strict ${PN}-switch \ - bash python-twisted" + bash python-twisted python-six" RDEPENDS_${PN}-testcontroller = "${PN} lsb ${PN}-pki" RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" RDEPENDS_${PN}-pki = "${PN}" @@ -31,13 +31,12 @@ SRC_URI = "\ file://openvswitch-switch-setup \ file://openvswitch-testcontroller \ file://openvswitch-testcontroller-setup \ - file://openvswitch-add-target-python-handling.patch \ - file://openvswitch-add-target-perl-handling.patch \ " EXTRA_OECONF += "\ - TARGET_PYTHON=${bindir}/python \ - TARGET_PERL=${bindir}/perl \ + PYTHON=python \ + PYTHON3=python3 \ + PERL=${bindir}/perl \ " CONFIGUREOPT_DEPTRACK = "" @@ -61,8 +60,9 @@ FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" FILES_${PN}-switch = "\ ${sysconfdir}/init.d/openvswitch-switch \ ${sysconfdir}/default/openvswitch-switch \ + ${systemd_unitdir}/system/ovs-vswitchd.service \ ${systemd_unitdir}/system/openvswitch.service \ - ${systemd_unitdir}/system/openvswitch-nonetwork.service \ + ${systemd_unitdir}/system/ovsdb-server.service \ " # silence a warning @@ -70,12 +70,13 @@ FILES_${PN} += "${datadir}/ovsdbmonitor" FILES_${PN} += "/run" FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/" -inherit autotools update-rc.d systemd python-dir +inherit autotools update-rc.d systemd pythonnative SYSTEMD_PACKAGES = "${PN}-switch" SYSTEMD_SERVICE_${PN}-switch = " \ - openvswitch-nonetwork.service \ - openvswitch-switch.service \ + ovsdb-server.service \ + ovs-vswitchd.service \ + openvswitch.service \ " INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" @@ -97,10 +98,12 @@ do_install_append() { true || rm -fr ${D}/${datadir}/${PN}/pki install -d ${D}/${systemd_unitdir}/system/ + install -m 644 ${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service \ + ${D}/${systemd_unitdir}/system/ovs-vswitchd.service install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch.service \ - ${D}/${systemd_unitdir}/system/openvswitch-switch.service - install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service \ - ${D}/${systemd_unitdir}/system/openvswitch-nonetwork.service + ${D}/${systemd_unitdir}/system/openvswitch.service + install -m 644 ${S}/rhel/usr_lib_systemd_system_ovsdb-server.service \ + ${D}/${systemd_unitdir}/system/ovsdb-server.service oe_runmake modules_install INSTALL_MOD_PATH=${D} install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb index 5ecb29ae3..1fb82aee5 100644 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch_git.bb @@ -12,24 +12,26 @@ RDEPENDS_${PN}-ptest += "\ " S = "${WORKDIR}/git" -PV = "2.5.0+${SRCREV}" +PV = "2.7.0+${SRCREV}" FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:" -SRCREV = "8c0b419a0b9ac0141d6973dcc80306dfc6a83d31" -SRC_URI += "\ - git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.5 \ - file://openvswitch-add-more-target-python-substitutions.patch \ - file://openvswitch-add-ptest-${SRCREV}.patch \ - file://run-ptest \ - file://disable_m4_check.patch \ - file://kernel_module.patch \ - file://openvswitch-ptest-Fix-python-path.patch \ - file://0001-use-the-linux-if_packet.h-Interface-directly.patch \ - file://0002-Define-WAIT_ANY-if-not-provided-by-system.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=247d8817aece26b21a8cd6791b3ea994" +SRCREV = "c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1" +SRC_URI = "file://openvswitch-switch \ + file://openvswitch-switch-setup \ + file://openvswitch-testcontroller \ + file://openvswitch-testcontroller-setup \ + git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.7 \ + file://openvswitch-add-ptest-${SRCREV}.patch \ + file://run-ptest \ + file://disable_m4_check.patch \ + file://kernel_module.patch \ + file://python-make-remaining-scripts-use-usr-bin-env.patch \ + file://0001-use-the-linux-if_packet.h-Interface-directly.patch \ + file://0002-Define-WAIT_ANY-if-not-provided-by-system.patch \ + " + +LIC_FILES_CHKSUM = "file://COPYING;md5=17b2c9d4c70853a09c0e143137754b35" PACKAGECONFIG ?= "" PACKAGECONFIG[dpdk] = "--with-dpdk=${STAGING_DIR_TARGET}/opt/dpdk/${TARGET_ARCH}-native-linuxapp-gcc,,dpdk," |
