From 3124f23254045209974337a20e8f51aadbc5c403 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 9 Apr 2021 09:47:14 -0400 Subject: openvswitch: fix clobbered SRC_URI commit 1b83c21436b2 [openvswitch: Fix build with musl libc] mistakenly copies common files and then clobbers the SRC_URI. While we could drop the SRC_URI components from the .inc now that we only have one active version in master (_git), we avoid that for now, since it is possible that a LTS version will be introduced in future cycles. So to fix the oddity, we drop the common components from the _git SRC_URI and append versus clobber. Signed-off-by: Bruce Ashfield --- recipes-networking/openvswitch/openvswitch_git.bb | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'recipes-networking/openvswitch') diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index bda9ab05..616bc277 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb @@ -20,18 +20,14 @@ CVE_VERSION = "2.13.0" FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:" SRCREV = "8dc1733eaea866dce033b3c44853e1b09bf59fc7" -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.15 \ - file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ - file://run-ptest \ - file://disable_m4_check.patch \ - file://kernel_module.patch \ - file://systemd-update-tool-paths.patch \ - file://systemd-create-runtime-dirs.patch \ - file://0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch \ +SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15 \ + file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ + file://run-ptest \ + file://disable_m4_check.patch \ + file://kernel_module.patch \ + file://systemd-update-tool-paths.patch \ + file://systemd-create-runtime-dirs.patch \ + file://0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab" -- cgit v1.2.3-54-g00ecf