diff options
Diffstat (limited to 'recipes-networking')
-rw-r--r-- | recipes-networking/cni/cni_git.bb | 8 | ||||
-rw-r--r-- | recipes-networking/openvswitch/openvswitch.inc | 46 | ||||
-rw-r--r-- | recipes-networking/openvswitch/openvswitch_git.bb | 8 |
3 files changed, 31 insertions, 31 deletions
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index ece5142c..cb8d6fff 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "\ | |||
17 | git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins \ | 17 | git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins \ |
18 | " | 18 | " |
19 | 19 | ||
20 | RPROVIDES_${PN} += "kubernetes-cni" | 20 | RPROVIDES:${PN} += "kubernetes-cni" |
21 | 21 | ||
22 | LICENSE = "Apache-2.0" | 22 | LICENSE = "Apache-2.0" |
23 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" | 23 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" |
@@ -65,10 +65,10 @@ do_install() { | |||
65 | ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin | 65 | ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin |
66 | } | 66 | } |
67 | 67 | ||
68 | FILES_${PN} += "${libexecdir}/cni/* /opt/cni/bin" | 68 | FILES:${PN} += "${libexecdir}/cni/* /opt/cni/bin" |
69 | 69 | ||
70 | INSANE_SKIP_${PN} += "ldflags already-stripped" | 70 | INSANE_SKIP:${PN} += "ldflags already-stripped" |
71 | 71 | ||
72 | deltask compile_ptest_base | 72 | deltask compile_ptest_base |
73 | 73 | ||
74 | RDEPENDS_${PN} += " ca-certificates" | 74 | RDEPENDS:${PN} += " ca-certificates" |
diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc index 37fbe5ab..b354a847 100644 --- a/recipes-networking/openvswitch/openvswitch.inc +++ b/recipes-networking/openvswitch/openvswitch.inc | |||
@@ -13,18 +13,18 @@ LICENSE = "Apache-2" | |||
13 | 13 | ||
14 | DEPENDS += "bridge-utils openssl python3 perl python3-six-native coreutils-native" | 14 | DEPENDS += "bridge-utils openssl python3 perl python3-six-native coreutils-native" |
15 | 15 | ||
16 | RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ | 16 | RDEPENDS:${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ |
17 | python3 perl perl-module-strict ${PN}-switch \ | 17 | python3 perl perl-module-strict ${PN}-switch \ |
18 | bash python3-twisted python3-six" | 18 | bash python3-twisted python3-six" |
19 | RDEPENDS_${PN}-testcontroller = "${PN} ${PN}-pki" | 19 | RDEPENDS:${PN}-testcontroller = "${PN} ${PN}-pki" |
20 | RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" | 20 | RDEPENDS:${PN}-switch = "${PN} openssl procps util-linux-uuidgen" |
21 | RDEPENDS_${PN}-pki = "${PN}" | 21 | RDEPENDS:${PN}-pki = "${PN}" |
22 | RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" | 22 | RDEPENDS:${PN}-brcompat = "${PN} ${PN}-switch" |
23 | 23 | ||
24 | # Some installers will fail because of an install order based on | 24 | # Some installers will fail because of an install order based on |
25 | # rdeps. E.g. ovs-pki calls sed in the postinstall. sed may be | 25 | # rdeps. E.g. ovs-pki calls sed in the postinstall. sed may be |
26 | # queued for install later. | 26 | # queued for install later. |
27 | RDEPENDS_${PN} += "sed gawk grep" | 27 | RDEPENDS:${PN} += "sed gawk grep" |
28 | 28 | ||
29 | SRC_URI = "\ | 29 | SRC_URI = "\ |
30 | file://openvswitch-switch \ | 30 | file://openvswitch-switch \ |
@@ -45,19 +45,19 @@ CONFIGUREOPT_DEPTRACK = "" | |||
45 | # distro layers can enable with EXTRA_OECONF_pn_openvswitch += "" | 45 | # distro layers can enable with EXTRA_OECONF_pn_openvswitch += "" |
46 | # EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" | 46 | # EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" |
47 | 47 | ||
48 | ALLOW_EMPTY_${PN}-pki = "1" | 48 | ALLOW_EMPTY:${PN}-pki = "1" |
49 | PACKAGES =+ "${PN}-testcontroller ${PN}-switch ${PN}-brcompat ${PN}-pki" | 49 | PACKAGES =+ "${PN}-testcontroller ${PN}-switch ${PN}-brcompat ${PN}-pki" |
50 | 50 | ||
51 | FILES_${PN}-testcontroller = "\ | 51 | FILES:${PN}-testcontroller = "\ |
52 | ${sysconfdir}/init.d/openvswitch-testcontroller \ | 52 | ${sysconfdir}/init.d/openvswitch-testcontroller \ |
53 | ${sysconfdir}/default/openvswitch-testcontroller \ | 53 | ${sysconfdir}/default/openvswitch-testcontroller \ |
54 | ${sysconfdir}/openvswitch-testcontroller \ | 54 | ${sysconfdir}/openvswitch-testcontroller \ |
55 | ${bindir}/ovs-testcontroller \ | 55 | ${bindir}/ovs-testcontroller \ |
56 | " | 56 | " |
57 | 57 | ||
58 | FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" | 58 | FILES:${PN}-brcompat = "${sbindir}/ovs-brcompatd" |
59 | 59 | ||
60 | FILES_${PN}-switch = "\ | 60 | FILES:${PN}-switch = "\ |
61 | ${sysconfdir}/init.d/openvswitch-switch \ | 61 | ${sysconfdir}/init.d/openvswitch-switch \ |
62 | ${sysconfdir}/default/openvswitch-switch \ | 62 | ${sysconfdir}/default/openvswitch-switch \ |
63 | ${systemd_unitdir}/system/ovs-vswitchd.service \ | 63 | ${systemd_unitdir}/system/ovs-vswitchd.service \ |
@@ -68,33 +68,33 @@ FILES_${PN}-switch = "\ | |||
68 | " | 68 | " |
69 | 69 | ||
70 | # silence a warning | 70 | # silence a warning |
71 | FILES_${PN} += "${datadir}/ovsdbmonitor" | 71 | FILES:${PN} += "${datadir}/ovsdbmonitor" |
72 | FILES_${PN} += "/run" | 72 | FILES:${PN} += "/run" |
73 | 73 | ||
74 | FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/" | 74 | FILES:${PN} += "${libdir}/python${PYTHON_BASEVERSION}/" |
75 | inherit autotools update-rc.d systemd python3native | 75 | inherit autotools update-rc.d systemd python3native |
76 | 76 | ||
77 | SYSTEMD_PACKAGES = "${PN}-switch" | 77 | SYSTEMD_PACKAGES = "${PN}-switch" |
78 | SYSTEMD_SERVICE_${PN}-switch = " \ | 78 | SYSTEMD_SERVICE:${PN}-switch = " \ |
79 | ovsdb-server.service \ | 79 | ovsdb-server.service \ |
80 | ovs-vswitchd.service \ | 80 | ovs-vswitchd.service \ |
81 | openvswitch.service \ | 81 | openvswitch.service \ |
82 | " | 82 | " |
83 | 83 | ||
84 | INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" | 84 | INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" |
85 | INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch" | 85 | INITSCRIPT_NAME:${PN}-switch = "openvswitch-switch" |
86 | INITSCRIPT_PARAMS_${PN}-switch = "defaults 71" | 86 | INITSCRIPT_PARAMS:${PN}-switch = "defaults 71" |
87 | 87 | ||
88 | INITSCRIPT_NAME_${PN}-testcontroller = "openvswitch-testcontroller" | 88 | INITSCRIPT_NAME:${PN}-testcontroller = "openvswitch-testcontroller" |
89 | INITSCRIPT_PARAMS_${PN}-testcontroller = "defaults 72" | 89 | INITSCRIPT_PARAMS:${PN}-testcontroller = "defaults 72" |
90 | 90 | ||
91 | do_configure_prepend() { | 91 | do_configure:prepend() { |
92 | # Work around the for Makefile CC=$(if ....) by swapping out any | 92 | # Work around the for Makefile CC=$(if ....) by swapping out any |
93 | # "-Wa," assembly directives with "-Xassembler | 93 | # "-Wa," assembly directives with "-Xassembler |
94 | CC=`echo '${CC}' | sed 's/-Wa,/-Xassembler /g'` | 94 | CC=`echo '${CC}' | sed 's/-Wa,/-Xassembler /g'` |
95 | } | 95 | } |
96 | 96 | ||
97 | do_install_prepend() { | 97 | do_install:prepend() { |
98 | SERVICE_FILE="${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service" | 98 | SERVICE_FILE="${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service" |
99 | ${S}/build-aux/dpdkstrip.py \ | 99 | ${S}/build-aux/dpdkstrip.py \ |
100 | ${@bb.utils.contains('PACKAGECONFIG','dpdk','--dpdk','--nodpdk',d)} \ | 100 | ${@bb.utils.contains('PACKAGECONFIG','dpdk','--dpdk','--nodpdk',d)} \ |
@@ -102,7 +102,7 @@ do_install_prepend() { | |||
102 | > ${SERVICE_FILE} | 102 | > ${SERVICE_FILE} |
103 | } | 103 | } |
104 | 104 | ||
105 | do_install_append() { | 105 | do_install:append() { |
106 | install -d ${D}/${sysconfdir}/default/ | 106 | install -d ${D}/${sysconfdir}/default/ |
107 | install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch | 107 | install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch |
108 | install -d ${D}/${sysconfdir}/openvswitch-testcontroller | 108 | install -d ${D}/${sysconfdir}/openvswitch-testcontroller |
@@ -137,13 +137,13 @@ do_install_append() { | |||
137 | cp -r ${S}/python/ovstest/ ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/ | 137 | cp -r ${S}/python/ovstest/ ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/ |
138 | } | 138 | } |
139 | 139 | ||
140 | pkg_postinst_ontarget_${PN}-pki () { | 140 | pkg_postinst_ontarget:${PN}-pki () { |
141 | if test ! -d $D/${datadir}/${PN}/pki; then | 141 | if test ! -d $D/${datadir}/${PN}/pki; then |
142 | ovs-pki init --dir=$D/${datadir}/${PN}/pki | 142 | ovs-pki init --dir=$D/${datadir}/${PN}/pki |
143 | fi | 143 | fi |
144 | } | 144 | } |
145 | 145 | ||
146 | pkg_postinst_ontarget_${PN}-testcontroller () { | 146 | pkg_postinst_ontarget:${PN}-testcontroller () { |
147 | if test ! -d $D/${datadir}/${PN}/pki; then | 147 | if test ! -d $D/${datadir}/${PN}/pki; then |
148 | ovs-pki init --dir=$D/${datadir}/${PN}/pki | 148 | ovs-pki init --dir=$D/${datadir}/${PN}/pki |
149 | fi | 149 | fi |
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index 616bc277..412a7075 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb | |||
@@ -4,7 +4,7 @@ DEPENDS += "virtual/kernel" | |||
4 | 4 | ||
5 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 5 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
6 | 6 | ||
7 | RDEPENDS_${PN}-ptest += "\ | 7 | RDEPENDS:${PN}-ptest += "\ |
8 | python3-logging python3-syslog python3-io python3-core \ | 8 | python3-logging python3-syslog python3-io python3-core \ |
9 | python3-fcntl python3-shell python3-xml python3-math \ | 9 | python3-fcntl python3-shell python3-xml python3-math \ |
10 | python3-datetime python3-netclient python3 sed \ | 10 | python3-datetime python3-netclient python3 sed \ |
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git" | |||
17 | PV = "2.15+${SRCPV}" | 17 | PV = "2.15+${SRCPV}" |
18 | CVE_VERSION = "2.13.0" | 18 | CVE_VERSION = "2.13.0" |
19 | 19 | ||
20 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:" | 20 | FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:" |
21 | 21 | ||
22 | SRCREV = "8dc1733eaea866dce033b3c44853e1b09bf59fc7" | 22 | SRCREV = "8dc1733eaea866dce033b3c44853e1b09bf59fc7" |
23 | SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15 \ | 23 | SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15 \ |
@@ -45,7 +45,7 @@ PACKAGECONFIG[ssl] = ",--disable-ssl,openssl," | |||
45 | # EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_BUILDDIR} --with-linux-source=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" | 45 | # EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_BUILDDIR} --with-linux-source=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" |
46 | 46 | ||
47 | # silence a warning | 47 | # silence a warning |
48 | FILES_${PN} += "/lib/modules" | 48 | FILES:${PN} += "/lib/modules" |
49 | 49 | ||
50 | inherit ptest | 50 | inherit ptest |
51 | 51 | ||
@@ -55,6 +55,6 @@ do_install_ptest() { | |||
55 | oe_runmake test-install | 55 | oe_runmake test-install |
56 | } | 56 | } |
57 | 57 | ||
58 | do_install_append() { | 58 | do_install:append() { |
59 | oe_runmake modules_install INSTALL_MOD_PATH=${D} | 59 | oe_runmake modules_install INSTALL_MOD_PATH=${D} |
60 | } | 60 | } |