From 6b0e4966a8b381491dc8289f113eb87f7aeb846f Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 12 May 2021 16:26:46 +0800 Subject: [PATCH] systemd-conf: 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: I9488872677d4d9d86b0b8a4732629224b2e7f33a --- .../recipes-core/systemd/systemd-conf_241.bbappend | 25 ++++++---------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/meta-starlingx/meta-stx-integ/recipes-core/systemd/systemd-conf_241.bbappend b/meta-starlingx/meta-stx-integ/recipes-core/systemd/systemd-conf_241.bbappend index 1840341..684aeb6 100644 --- a/meta-starlingx/meta-stx-integ/recipes-core/systemd/systemd-conf_241.bbappend +++ b/meta-starlingx/meta-stx-integ/recipes-core/systemd/systemd-conf_241.bbappend @@ -1,30 +1,17 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRCREV_FORMAT = "opendev" -SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde" -SUBPATH0 = "systemd-config" -DSTSUFX0 = "stx-configfiles" +inherit stx-metadata + +STX_REPO = "config-files" +STX_SUBPATH = "systemd-config" LICENSE_append = "& Apache-2.0" LIC_FILES_CHKSUM += "\ - file://stx-configfiles-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 \ + file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -do_unpack_append() { - bb.build.exec_func('do_copy_config_files', d) -} - -do_copy_config_files () { - cp -f ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE -} - - do_install_append () { install -d -m 0755 ${D}/${sysconfdir}/systemd - install -m644 ${WORKDIR}/${DSTSUFX0}/files/journald.conf ${D}/${sysconfdir}/systemd/journald.conf + install -m644 ${STX_METADATA_PATH}/files/journald.conf ${D}/${sysconfdir}/systemd/journald.conf chmod 644 ${D}/${sysconfdir}/systemd/journald.conf } -- 2.16.6