From 6b3c3e9c91586a4e3a55e8c01b18915db1b93661 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 17 May 2022 12:55:33 +0800 Subject: [PATCH] scripts: move yocto build scripts into build_inf_yocto Issue-ID: INF-274 Signed-off-by: Jackie Huang Change-Id: I0397263e62cff8e8fc01269bfc1b92b550359e5b --- scripts/{build_inf.sh => build_inf_yocto/build_inf_yocto.sh} | 7 ++++--- scripts/{ => build_inf_yocto}/configs/local-anaconda.conf | 0 scripts/{ => build_inf_yocto}/configs/local-mirrors.conf | 0 scripts/{ => build_inf_yocto}/configs/local-stx.conf | 0 scripts/{ => build_inf_yocto}/find_rpm_path.sh | 2 +- .../0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch | 0 .../0004-Ceilometer-compute-is-not-build-nor-installed.patch | 0 .../0005-Fix-postinstall-scriptlets-to-ontarget.patch | 0 .../0001-image-live.bbclass-work-around-for-large-image-size.patch | 0 scripts/{ => build_inf_yocto}/rpm_repo_list.txt | 0 10 files changed, 5 insertions(+), 4 deletions(-) rename scripts/{build_inf.sh => build_inf_yocto/build_inf_yocto.sh} (98%) rename scripts/{ => build_inf_yocto}/configs/local-anaconda.conf (100%) rename scripts/{ => build_inf_yocto}/configs/local-mirrors.conf (100%) rename scripts/{ => build_inf_yocto}/configs/local-stx.conf (100%) rename scripts/{ => build_inf_yocto}/find_rpm_path.sh (97%) rename scripts/{ => build_inf_yocto}/meta-patches/nxp-lx2xxx/0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch (100%) rename scripts/{ => build_inf_yocto}/meta-patches/src_stx/meta-cloud-services/0004-Ceilometer-compute-is-not-build-nor-installed.patch (100%) rename scripts/{ => build_inf_yocto}/meta-patches/src_stx/meta-cloud-services/0005-Fix-postinstall-scriptlets-to-ontarget.patch (100%) rename scripts/{ => build_inf_yocto}/meta-patches/src_stx/poky/0001-image-live.bbclass-work-around-for-large-image-size.patch (100%) rename scripts/{ => build_inf_yocto}/rpm_repo_list.txt (100%) diff --git a/scripts/build_inf.sh b/scripts/build_inf_yocto/build_inf_yocto.sh similarity index 98% rename from scripts/build_inf.sh rename to scripts/build_inf_yocto/build_inf_yocto.sh index 29a37c6..4689263 100755 --- a/scripts/build_inf.sh +++ b/scripts/build_inf_yocto/build_inf_yocto.sh @@ -77,7 +77,7 @@ SUB_LAYER_META_OE_ANACONDA="\ meta-gnome \ " -SCRIPTS_DIR=$(dirname $(readlink -f $0)) +SCRIPTS_DIR=$(dirname $(dirname $(readlink -f $0))) TIMESTAMP=`date +"%Y%m%d_%H%M%S"` ######################################################################### @@ -259,8 +259,9 @@ PRJ_BUILD_DIR_ANACONDA=${WORKSPACE}/prj_oran_inf_anaconda PRJ_SHARED_DIR=${WORKSPACE}/prj_shared PRJ_SHARED_DL_DIR=${WORKSPACE}/prj_shared/downloads PRJ_SHARED_SS_DIR=${WORKSPACE}/prj_shared/sstate-cache -SRC_META_PATCHES=${SRC_ORAN_DIR}/rtp/scripts/meta-patches/src_stx -SRC_CONFIGS=${SRC_ORAN_DIR}/rtp/scripts/configs +SRC_SCRIPTS=${SRC_ORAN_DIR}/rtp/scripts/build_inf_yocto +SRC_META_PATCHES=${SRC_SCRIPTS}/meta-patches/src_stx +SRC_CONFIGS=${SRC_SCRIPTS}/configs IMG_STX=stx-image-aio IMG_ANACONDA=stx-image-aio-installer IMG_INF=inf-image-aio-installer diff --git a/scripts/configs/local-anaconda.conf b/scripts/build_inf_yocto/configs/local-anaconda.conf similarity index 100% rename from scripts/configs/local-anaconda.conf rename to scripts/build_inf_yocto/configs/local-anaconda.conf diff --git a/scripts/configs/local-mirrors.conf b/scripts/build_inf_yocto/configs/local-mirrors.conf similarity index 100% rename from scripts/configs/local-mirrors.conf rename to scripts/build_inf_yocto/configs/local-mirrors.conf diff --git a/scripts/configs/local-stx.conf b/scripts/build_inf_yocto/configs/local-stx.conf similarity index 100% rename from scripts/configs/local-stx.conf rename to scripts/build_inf_yocto/configs/local-stx.conf diff --git a/scripts/find_rpm_path.sh b/scripts/build_inf_yocto/find_rpm_path.sh similarity index 97% rename from scripts/find_rpm_path.sh rename to scripts/build_inf_yocto/find_rpm_path.sh index 46df1aa..5d6b290 100755 --- a/scripts/find_rpm_path.sh +++ b/scripts/build_inf_yocto/find_rpm_path.sh @@ -80,7 +80,7 @@ fi SRC_WRL_DIR=${WORKSPACE}/src_wrl1018 SRC_ORAN_DIR=${WORKSPACE}/src_oran PRJ_BUILD_DIR=${WORKSPACE}/prj_oran-inf -RPM_REPO_LIST=${SRC_ORAN_DIR}/rtp/scripts/rpm_repo_list.txt +RPM_REPO_LIST=${SRC_ORAN_DIR}/rtp/scripts/build_inf_yocto/rpm_repo_list.txt RPM_DEPLOY_DIR=${PRJ_BUILD_DIR}/tmp-glibc/deploy/rpm RPM_REPODATA=${RPM_DEPLOY_DIR}/repodata diff --git a/scripts/meta-patches/nxp-lx2xxx/0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch b/scripts/build_inf_yocto/meta-patches/nxp-lx2xxx/0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch similarity index 100% rename from scripts/meta-patches/nxp-lx2xxx/0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch rename to scripts/build_inf_yocto/meta-patches/nxp-lx2xxx/0001-Revert-nxp-lx2xxx-remove-preempt-rt-related-file.patch diff --git a/scripts/meta-patches/src_stx/meta-cloud-services/0004-Ceilometer-compute-is-not-build-nor-installed.patch b/scripts/build_inf_yocto/meta-patches/src_stx/meta-cloud-services/0004-Ceilometer-compute-is-not-build-nor-installed.patch similarity index 100% rename from scripts/meta-patches/src_stx/meta-cloud-services/0004-Ceilometer-compute-is-not-build-nor-installed.patch rename to scripts/build_inf_yocto/meta-patches/src_stx/meta-cloud-services/0004-Ceilometer-compute-is-not-build-nor-installed.patch diff --git a/scripts/meta-patches/src_stx/meta-cloud-services/0005-Fix-postinstall-scriptlets-to-ontarget.patch b/scripts/build_inf_yocto/meta-patches/src_stx/meta-cloud-services/0005-Fix-postinstall-scriptlets-to-ontarget.patch similarity index 100% rename from scripts/meta-patches/src_stx/meta-cloud-services/0005-Fix-postinstall-scriptlets-to-ontarget.patch rename to scripts/build_inf_yocto/meta-patches/src_stx/meta-cloud-services/0005-Fix-postinstall-scriptlets-to-ontarget.patch diff --git a/scripts/meta-patches/src_stx/poky/0001-image-live.bbclass-work-around-for-large-image-size.patch b/scripts/build_inf_yocto/meta-patches/src_stx/poky/0001-image-live.bbclass-work-around-for-large-image-size.patch similarity index 100% rename from scripts/meta-patches/src_stx/poky/0001-image-live.bbclass-work-around-for-large-image-size.patch rename to scripts/build_inf_yocto/meta-patches/src_stx/poky/0001-image-live.bbclass-work-around-for-large-image-size.patch diff --git a/scripts/rpm_repo_list.txt b/scripts/build_inf_yocto/rpm_repo_list.txt similarity index 100% rename from scripts/rpm_repo_list.txt rename to scripts/build_inf_yocto/rpm_repo_list.txt -- 2.16.6