From 5842b19396415f83419f729c11fd31c1072cd25e Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 12 May 2021 16:26:46 +0800 Subject: [PATCH] rsync: 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 Issue-ID: INF-215 Signed-off-by: Jackie Huang Change-Id: I66dd061b08b67ae089269ffdcfcc65be5c34f209 --- .../recipes-devtools/rsync/rsync_%.bbappend | 26 +++++----------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/meta-starlingx/meta-stx-integ/recipes-devtools/rsync/rsync_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-devtools/rsync/rsync_%.bbappend index d2c8693..1eee6f5 100644 --- a/meta-starlingx/meta-stx-integ/recipes-devtools/rsync/rsync_%.bbappend +++ b/meta-starlingx/meta-stx-integ/recipes-devtools/rsync/rsync_%.bbappend @@ -1,14 +1,11 @@ -SRCREV_FORMAT = "opendev" -SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde" -SUBPATH0 = "rsync-config" -DSTSUFX0 = "stx-configfiles" +inherit stx-metadata + +STX_REPO = "config-files" +STX_SUBPATH = "rsync-config" LICENSE_append = " & Apache-2.0" LIC_FILES_CHKSUM += "\ - file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=0b819b48e21c87ba7f5d0502e304af61 \ - " -SRC_URI += " \ - git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \ + file://${STX_METADATA_PATH}/centos/rsync-config.spec;beginline=1;endline=10;md5=0b819b48e21c87ba7f5d0502e304af61 \ " inherit systemd @@ -16,20 +13,9 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "rsync.service" SYSTEMD_AUTO_ENABLE_${PN} = "enable" -do_unpack_append() { - bb.build.exec_func('do_copy_config_files', d) -} - -do_copy_config_files () { - cp -pf ${WORKDIR}/${DSTSUFX0}/centos/rsync-config.spec ${S}/stx-configfiles-LICENSE -} - - do_install_append_class-target() { install -p -D -m 644 ${S}/packaging/systemd/rsync.service ${D}/${systemd_system_unitdir}/rsync.service - install -m 644 ${WORKDIR}/${DSTSUFX0}/files/rsyncd.conf ${D}/${sysconfdir}/rsyncd.conf + install -m 644 ${STX_METADATA_PATH}/files/rsyncd.conf ${D}/${sysconfdir}/rsyncd.conf } FILES_${PN}_append = " ${systemd_system_unitdir}" - - -- 2.16.6