starlingx/meta-starlingx
Code Issues Proposed changes

rsync: update for stx 5.0

Browse Source 
* 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 <jackie.huang@windriver.com>
Change-Id: I26201b804660140dca86ebb41ab7f0c0f792b521
This commit is contained in:
Jackie Huang 2021-05-12 16:26:46 +08:00
parent a5864ae489
commit 64e622281f
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-stx-integ/recipes-devtools/rsync/rsync_%.bbappend
View File

@ -1,14 +1,11 @@
SRCREV_FORMAT = "opendev" inherit stx-metadata
SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
SUBPATH0 = "rsync-config" STX_REPO = "config-files"
DSTSUFX0 = "stx-configfiles" STX_SUBPATH = "rsync-config"
LICENSE_append = " & Apache-2.0" LICENSE_append = " & Apache-2.0"
LIC_FILES_CHKSUM += "\ LIC_FILES_CHKSUM += "\
file://stx-configfiles-LICENSE;beginline=1;endline=10;md5=0b819b48e21c87ba7f5d0502e304af61 \ file://${STX_METADATA_PATH}/centos/rsync-config.spec;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 \
" "
inherit systemd inherit systemd
@ -16,20 +13,9 @@ SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} = "rsync.service" SYSTEMD_SERVICE_${PN} = "rsync.service"
SYSTEMD_AUTO_ENABLE_${PN} = "enable" 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() { do_install_append_class-target() {
install -p -D -m 644 ${S}/packaging/systemd/rsync.service ${D}/${systemd_system_unitdir}/rsync.service 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}" FILES_${PN}_append = " ${systemd_system_unitdir}"