From ed2ee77c9c05ae6207641726e2104ad15c59ff55 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 12 May 2021 16:26:46 +0800 Subject: [PATCH] openvswitch: update for stx 5.0 * inherit stx-metadata to help install updated files from stx 'config-files' repo * remove do_copy_config_files since it's not needed after using stx-metadata Story: 2008952 Task: 42576 Signed-off-by: Jackie Huang Change-Id: I54bf9408f67df151570acffd78f6f82694af5252 --- .../openvswitch/openvswitch_%.bbappend | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/meta-stx-virt/recipes-networking/openvswitch/openvswitch_%.bbappend b/meta-stx-virt/recipes-networking/openvswitch/openvswitch_%.bbappend index 764b98e..ea347e8 100644 --- a/meta-stx-virt/recipes-networking/openvswitch/openvswitch_%.bbappend +++ b/meta-stx-virt/recipes-networking/openvswitch/openvswitch_%.bbappend @@ -11,26 +11,15 @@ PACKAGECONFIG = "libcap-ng ssl dpdk" PACKAGECONFIG[ssl] = "--enable-ssl,--disable-ssl,openssl," PACKAGECONFIG[dpdk] = "--with-dpdk=${STAGING_DIR_TARGET}${DPDK_INSTALL_DIR}/share/${TARGET_ARCH}-native-linuxapp-gcc,,dpdk," -SRCREV_FORMAT = "opendev" -SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde" -SUBPATH0 = "openvswitch-config" -DSTSUFX0 = "stx-configfiles" +inherit stx-metadata + +STX_REPO = "config-files" +STX_SUBPATH = "openvswitch-config" LICENSE_append = "& Apache-2.0" LIC_FILES_CHKSUM += "\ - file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -SRC_URI += " \ - git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \ - " - -do_unpack_append() { - bb.build.exec_func('do_copy_config_files', d) -} - -do_copy_config_files () { - cp -pf ${WORKDIR}/stx-configfiles/files/LICENSE ${S}/stx-configfiles-LICENSE -} do_install_append () { cd ${S} @@ -95,9 +84,9 @@ do_install_append () { install -m 0755 ${STAGING_DATADIR}/dpdk/usertools/dpdk-devbind.py ${D}${datadir}/openvswitch/scripts/dpdk-devbind.py fi - install -m 0644 ${WORKDIR}/stx-configfiles/files/ovsdb-server.pmon.conf ${D}/${sysconfdir}/openvswitch/ovsdb-server.pmon.conf - install -m 0644 ${WORKDIR}/stx-configfiles/files/ovs-vswitchd.pmon.conf ${D}/${sysconfdir}/openvswitch/ovs-vswitchd.pmon.conf - install -m 0644 ${WORKDIR}/stx-configfiles/files/etc_logrotate.d_openvswitch ${D}/${sysconfdir}/logrotate.d/openvswitch + install -m 0644 ${STX_METADATA_PATH}/files/ovsdb-server.pmon.conf ${D}/${sysconfdir}/openvswitch/ovsdb-server.pmon.conf + install -m 0644 ${STX_METADATA_PATH}/files/ovs-vswitchd.pmon.conf ${D}/${sysconfdir}/openvswitch/ovs-vswitchd.pmon.conf + install -m 0644 ${STX_METADATA_PATH}/files/etc_logrotate.d_openvswitch ${D}/${sysconfdir}/logrotate.d/openvswitch }