X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-starlingx%2Fmeta-stx-distro%2Frecipes-httpd%2Flighttpd%2Flighttpd_%25.bbappend;h=44d8112ab3d0c233f304c59750af3a4b144edf79;hb=d2a85903840cbd5940c47e31a2219abd52e09155;hp=b32164d5770401dbe82a3a696b4f3d872484182c;hpb=e0634c6eaf2fe2641a0fb90e84a5defb880b1335;p=pti%2Frtp.git diff --git a/meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/lighttpd_%.bbappend b/meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/lighttpd_%.bbappend index b32164d..44d8112 100644 --- a/meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/lighttpd_%.bbappend +++ b/meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/lighttpd_%.bbappend @@ -1,28 +1,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRCREV_FORMAT = "opendev" -SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde" -SUBPATH0 = "lighttpd-config" -DSTSUFX0 = "stx-configfiles" +inherit stx-metadata + +STX_REPO = "config-files" +STX_SUBPATH = "lighttpd-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://lighttpd-init-script-chroot.patch;striplevel=3 \ + 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 -pf ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE - cp -pf ${WORKDIR}/${DSTSUFX0}/files/lighttpd.init ${S}/lighttpd.init -} - do_install_append () { # remove the symlinks rm ${D}/www/logs @@ -40,12 +27,12 @@ do_install_append () { install -d -m755 ${D}/${sysconfdir}/logrotate.d - install -m755 ${S}/lighttpd.init ${D}/${sysconfdir}/init.d/lighttpd + install -m755 ${STX_METADATA_PATH}/files/lighttpd.init ${D}/${sysconfdir}/init.d/lighttpd - install -m640 ${WORKDIR}/${DSTSUFX0}/files/lighttpd.conf ${D}/${sysconfdir}/lighttpd/lighttpd.conf - install -m644 ${WORKDIR}/${DSTSUFX0}/files/lighttpd-inc.conf ${D}/${sysconfdir}/lighttpd/lighttpd-inc.conf - install -m644 ${WORKDIR}/${DSTSUFX0}/files/index.html.lighttpd ${D}/www/pages/index.html - install -m644 ${WORKDIR}/${DSTSUFX0}/files/lighttpd.logrotate ${D}/${sysconfdir}/logrotate.d/lighttpd + install -m640 ${STX_METADATA_PATH}/files/lighttpd.conf ${D}/${sysconfdir}/lighttpd/lighttpd.conf + install -m644 ${STX_METADATA_PATH}/files/lighttpd-inc.conf ${D}/${sysconfdir}/lighttpd/lighttpd-inc.conf + install -m644 ${STX_METADATA_PATH}/files/index.html.lighttpd ${D}/www/pages/index.html + install -m644 ${STX_METADATA_PATH}/files/lighttpd.logrotate ${D}/${sysconfdir}/logrotate.d/lighttpd }