From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 3 Jun 2021 07:57:33 +0000 (+0800)
Subject: lighttpd: update for stx 5.0
X-Git-Tag: f-release~83
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a9607e3aace18fc5b41b5680a410d18d2412dad3;p=pti%2Frtp.git

lighttpd: 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

* move the patch ighttpd-init-script-chroot.patch
  to stx-config-files-source since it's for the
  source in 'config-files' repo

Issue-ID: INF-215

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ia083263d8cd25fe72918eb831235220fd445fd4a
---

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
 
 }
 
diff --git a/meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/files/lighttpd-init-script-chroot.patch b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source/lighttpd-config-init-script-chroot.patch
similarity index 82%
rename from meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/files/lighttpd-init-script-chroot.patch
rename to meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source/lighttpd-config-init-script-chroot.patch
index c62d7bc..811f5be 100644
--- a/meta-starlingx/meta-stx-distro/recipes-httpd/lighttpd/files/lighttpd-init-script-chroot.patch
+++ b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source/lighttpd-config-init-script-chroot.patch
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [poky-stx specific]
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+
 diff -ru a/lighttpd-config/files/lighttpd.init b/lighttpd-config/files/lighttpd.init
 --- a/lighttpd-config/files/lighttpd.init       2020-04-29 07:07:49.040288478 +0000
 +++ b/lighttpd-config/files/lighttpd.init       2020-04-29 07:09:35.332285981 +0000
diff --git a/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
index 034967a..b38e587 100644
--- a/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
+++ b/meta-starlingx/meta-stx-flock/stx-config-files/stx-config-files-source_git.bb
@@ -9,4 +9,5 @@ SRCREV = "237737bbd2488bcae6822dfadc4977d86ea642d7"
 
 SRC_URI += "\
 	file://nfs-utils-config-remove-the-f-option-for-rpc.mountd.patch \
+	file://lighttpd-config-init-script-chroot.patch \
 	"