MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvswitch: uprev to 2.6.1

Browse Source 
Pick up the latest features, including compatability with the latest
DPDK as well as bug fixes.

The patches for TARGET_PYTHON and TARGET_PERL can be dropped as
configure now lets us pass these in the env (which we set).

The systemd service files have been shuffled some upstream and we make
adjustments in the recipe to accomodate these. The sysvinit scripts
remain functional as they are.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Mark Asselstine 2017-01-11 17:12:35 -05:00 committed by Bruce Ashfield
parent dbe846086b
commit 9152441483
5 changed files with 17 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
recipes-networking/openvswitch/files/openvswitch-add-target-perl-handling.patch
View File

@ -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

136
recipes-networking/openvswitch/files/openvswitch-add-target-python-handling.patch
View File

@ -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.
#

0
recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch → recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3.patch
View File

23
recipes-networking/openvswitch/openvswitch.inc
View File

@ -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=${bindir}/python \
PYTHON3=${bindir}/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
@ -74,8 +74,9 @@ inherit autotools update-rc.d systemd python-dir
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

9
recipes-networking/openvswitch/openvswitch_git.bb
View File

@ -12,14 +12,13 @@ RDEPENDS_${PN}-ptest += "\
"
S = "${WORKDIR}/git"
PV = "2.5.0+${SRCREV}"
PV = "2.6.1+${SRCREV}"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
SRCREV = "8c0b419a0b9ac0141d6973dcc80306dfc6a83d31"
SRCREV = "f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3"
SRC_URI += "\
git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.5 \
file://openvswitch-add-more-target-python-substitutions.patch \
git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.6 \
file://openvswitch-add-ptest-${SRCREV}.patch \
file://run-ptest \
file://disable_m4_check.patch \
@ -27,7 +26,7 @@ SRC_URI += "\
file://openvswitch-ptest-Fix-python-path.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=247d8817aece26b21a8cd6791b3ea994"
LIC_FILES_CHKSUM = "file://COPYING;md5=17b2c9d4c70853a09c0e143137754b35"
PACKAGECONFIG ?= ""
PACKAGECONFIG[dpdk] = "--with-dpdk=${STAGING_DIR_TARGET}/opt/dpdk/${TARGET_ARCH}-native-linuxapp-gcc,,dpdk,"