From 1ef003e35871b118f6c2e86461973ff4e8d288d6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 18 Jun 2021 16:03:07 +0800 Subject: [PATCH] base-files: update for stx 5.0 The part for the installation of the /etc/issue has been moved upstream meta-starlingx by the commit: ```````````````````````````````````````````````````````````` commit eb4455b2b058e2eee111c166b79271fb3989cb60 Author: Jackie Huang Date: Wed May 12 16:26:46 2021 +0800 base-files: 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 * install the issue* files from sub-dir centos-release-config Story: 2008952 Task: 42576 Signed-off-by: Jackie Huang ```````````````````````````````````````````````````````````` So update the bbappend and only keep the part to change the release name. Issue-ID: INF-215 Signed-off-by: Jackie Huang Change-Id: Ia3a963970112606e16516d08f4ff2ad8f5b1b4dc --- meta-stx-oran/recipes-core/base-files/base-files_%.bbappend | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend b/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend index 53b5a08..4904dfe 100644 --- a/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend +++ b/meta-stx-oran/recipes-core/base-files/base-files_%.bbappend @@ -13,16 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBPATH1 = "centos-release-config" -DSTSUFX1 = "stx-release-config" - -SRC_URI += " \ - git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX1};branch="r/stx.3.0";subpath=${SUBPATH1};name=opendev \ - " - do_install_append() { - install -m 644 ${WORKDIR}/${DSTSUFX1}/files/issue ${D}/${sysconfdir}/issue - install -m 644 ${WORKDIR}/${DSTSUFX1}/files/issue.net ${D}/${sysconfdir}/issue.net - - sed -i -e 's/@PLATFORM_RELEASE@/${ORAN_REL}/' ${D}${sysconfdir}/issue* + sed -i -e 's/${STX_REL}/${ORAN_REL}/' ${D}${sysconfdir}/issue* } -- 2.16.6