From 15a0d3432ea8d4441417b689a58aae8a6a7fb860 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Fri, 26 Apr 2013 10:47:58 -0700 Subject: openvswitch: update to version 1.9.0 Update recipe to version 1.9.0. Refer to docs/vswitch_test.sh for a sanity test. This package will not be functional unless the openvswitch kernel module is configured into the kernel. Signed-off-by: Joe Slater Signed-off-by: Bruce Ashfield --- .../openvswitch/openvswitch_1.4.3.bb | 99 ---------------------- .../openvswitch/openvswitch_1.9.0.bb | 99 ++++++++++++++++++++++ 2 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 recipes-networking/openvswitch/openvswitch_1.4.3.bb create mode 100644 recipes-networking/openvswitch/openvswitch_1.9.0.bb (limited to 'recipes-networking/openvswitch') diff --git a/recipes-networking/openvswitch/openvswitch_1.4.3.bb b/recipes-networking/openvswitch/openvswitch_1.4.3.bb deleted file mode 100644 index 67640735..00000000 --- a/recipes-networking/openvswitch/openvswitch_1.4.3.bb +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY = "OpenvSwitch" -DESCRIPTION = "Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through programmatic extension, while still supporting standard management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag)" -HOMEPAGE = "http://openvswitch.org/" -SECTION = "networking" -LICENSE = "Apache-2" - -DEPENDS += "bridge-utils openssl python perl" - -RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid \ - python perl perl-module-strict ${PN}-switch ${PN}-controller" -RDEPENDS_${PN}-controller = "${PN} lsb ${PN}-pki" -RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" -RDEPENDS_${PN}-pki = "${PN}" -RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" -RRECOMMENDS_${PN} += "kernel-module-openvswitch" - -PR = "r1" - -SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \ - file://openvswitch-switch \ - file://openvswitch-switch-setup \ - file://openvswitch-controller \ - file://openvswitch-controller-setup \ - " - -SRC_URI[md5sum] = "66df8e84f579e734aa4a43bc502baffd" -SRC_URI[sha256sum] = "be1ae1ecff0ff095d24f552c148dd4d2931d187bbb35b3d9205416a0aca746a8" -LIC_FILES_CHKSUM = "file://COPYING;md5=49eeb5acb1f5e510f12c44f176c42253" - -# Don't compile kernel modules by default since it heavily depends on -# kernel version. Use the in-kernel module for now. -# distro layers can enable with EXTRA_OECONF_pn_openvswitch += "" -# EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" - -ALLOW_EMPTY_${PN}-pki = "1" -PACKAGES =+ "${PN}-controller ${PN}-switch ${PN}-brcompat ${PN}-pki" - -FILES_${PN}-controller = "${sysconfdir}/init.d/openvswitch-controller \ - ${sysconfdir}/default/openvswitch-controller \ - ${sysconfdir}/openvswitch-controller \ - ${bindir}/ovs-controller" - -FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" - -FILES_${PN}-switch = "${sysconfdir}/init.d/openvswitch-switch \ - ${sysconfdir}/default/openvswitch-switch \ - " -inherit autotools update-rc.d - -INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-controller" -INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch" -INITSCRIPT_PARAMS_${PN}-switch = "defaults 71" - -INITSCRIPT_NAME_${PN}-controller = "openvswitch-controller" -INITSCRIPT_PARAMS_${PN}-controller = "defaults 72" - -do_install_append() { - install -d ${D}/${sysconfdir}/default/ - install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch - install -d ${D}/${sysconfdir}/openvswitch-controller - install -m 660 ${WORKDIR}/openvswitch-controller-setup ${D}/${sysconfdir}/default/openvswitch-controller - - install -d ${D}/${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/openvswitch-controller ${D}/${sysconfdir}/init.d/openvswitch-controller - install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch - true || rm -fr ${D}/${datadir}/${PN}/pki -} - -pkg_postinst_${PN}-pki () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - if test ! -d $D/${datadir}/${PN}/pki; then - ovs-pki init --dir=$D/${datadir}/${PN}/pki - fi -} - -pkg_postinst_${PN}-controller () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - cd $D/${sysconfdir}/openvswitch-controller - if ! test -e cacert.pem; then - ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem - fi - if ! test -e privkey.pem || ! test -e cert.pem; then - oldumask=$(umask) - umask 077 - ovs-pki req+sign --dir=$D/${datadir}/${PN}/pki tmp controller >/dev/null - mv tmp-privkey.pem privkey.pem - mv tmp-cert.pem cert.pem - mv tmp-req.pem req.pem - chmod go+r cert.pem req.pem - umask $oldumask - fi -} diff --git a/recipes-networking/openvswitch/openvswitch_1.9.0.bb b/recipes-networking/openvswitch/openvswitch_1.9.0.bb new file mode 100644 index 00000000..bfaa0046 --- /dev/null +++ b/recipes-networking/openvswitch/openvswitch_1.9.0.bb @@ -0,0 +1,99 @@ +SUMMARY = "OpenvSwitch" +DESCRIPTION = "Open vSwitch is a production quality, multilayer virtual switch licensed under the open source Apache 2.0 license. It is designed to enable massive network automation through programmatic extension, while still supporting standard management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag)" +HOMEPAGE = "http://openvswitch.org/" +SECTION = "networking" +LICENSE = "Apache-2" + +DEPENDS += "bridge-utils openssl python perl" + +RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid \ + python perl perl-module-strict ${PN}-switch ${PN}-controller" +RDEPENDS_${PN}-controller = "${PN} lsb ${PN}-pki" +RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" +RDEPENDS_${PN}-pki = "${PN}" +RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" +RRECOMMENDS_${PN} += "kernel-module-openvswitch" + +PR = "r0" + +SRC_URI = "http://openvswitch.org/releases/openvswitch-${PV}.tar.gz \ + file://openvswitch-switch \ + file://openvswitch-switch-setup \ + file://openvswitch-controller \ + file://openvswitch-controller-setup \ + " + +SRC_URI[md5sum] = "e9004202b0e10c0de9870f19d2044f11" +SRC_URI[sha256sum] = "825730db82c7b46a142f057a43345590c299e66704ef7a88d9ed4ffd0c3d6b64" +LIC_FILES_CHKSUM = "file://COPYING;md5=49eeb5acb1f5e510f12c44f176c42253" + +# Don't compile kernel modules by default since it heavily depends on +# kernel version. Use the in-kernel module for now. +# distro layers can enable with EXTRA_OECONF_pn_openvswitch += "" +# EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" + +ALLOW_EMPTY_${PN}-pki = "1" +PACKAGES =+ "${PN}-controller ${PN}-switch ${PN}-brcompat ${PN}-pki" + +FILES_${PN}-controller = "${sysconfdir}/init.d/openvswitch-controller \ + ${sysconfdir}/default/openvswitch-controller \ + ${sysconfdir}/openvswitch-controller \ + ${bindir}/ovs-controller" + +FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" + +FILES_${PN}-switch = "${sysconfdir}/init.d/openvswitch-switch \ + ${sysconfdir}/default/openvswitch-switch \ + " +inherit autotools update-rc.d + +INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-controller" +INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch" +INITSCRIPT_PARAMS_${PN}-switch = "defaults 71" + +INITSCRIPT_NAME_${PN}-controller = "openvswitch-controller" +INITSCRIPT_PARAMS_${PN}-controller = "defaults 72" + +do_install_append() { + install -d ${D}/${sysconfdir}/default/ + install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch + install -d ${D}/${sysconfdir}/openvswitch-controller + install -m 660 ${WORKDIR}/openvswitch-controller-setup ${D}/${sysconfdir}/default/openvswitch-controller + + install -d ${D}/${sysconfdir}/init.d/ + install -m 755 ${WORKDIR}/openvswitch-controller ${D}/${sysconfdir}/init.d/openvswitch-controller + install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch + true || rm -fr ${D}/${datadir}/${PN}/pki +} + +pkg_postinst_${PN}-pki () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + if test ! -d $D/${datadir}/${PN}/pki; then + ovs-pki init --dir=$D/${datadir}/${PN}/pki + fi +} + +pkg_postinst_${PN}-controller () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + + cd $D/${sysconfdir}/openvswitch-controller + if ! test -e cacert.pem; then + ln -s $D/${datadir}/${PN}/pki/switchca/cacert.pem cacert.pem + fi + if ! test -e privkey.pem || ! test -e cert.pem; then + oldumask=$(umask) + umask 077 + ovs-pki req+sign --dir=$D/${datadir}/${PN}/pki tmp controller >/dev/null + mv tmp-privkey.pem privkey.pem + mv tmp-cert.pem cert.pem + mv tmp-req.pem req.pem + chmod go+r cert.pem req.pem + umask $oldumask + fi +} -- cgit v1.2.3-54-g00ecf