X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Fclasses%2Fstx-anaconda-image.bbclass;h=bab06f2ed4421d5c473ad7930c66fb018bbb6c68;hb=bd71effc849c7a0b27f8c01190a3164b214b6cfb;hp=7232c0cca53417bb35c1b2526354045dccc4fd08;hpb=57fdea704bd62af847872c40508f00aa1d7cac60;p=pti%2Frtp.git diff --git a/meta-stx/classes/stx-anaconda-image.bbclass b/meta-stx/classes/stx-anaconda-image.bbclass index 7232c0c..bab06f2 100644 --- a/meta-stx/classes/stx-anaconda-image.bbclass +++ b/meta-stx/classes/stx-anaconda-image.bbclass @@ -29,6 +29,7 @@ INSTALLER_CONFDIR = "${IMAGE_ROOTFS}/installer-config" KICKSTART_FILE ??= "" KICKSTART_FILE_EXTRA ??= "" WRL_INSTALLER_CONF ?= "" +REPO_INCLUDE_PKG ??= "" REPO_EXCLUDE_PKG ?= "" build_iso_prepend() { @@ -94,10 +95,20 @@ wrl_installer_copy_local_repos() { if [ -d "$deploy_dir_rpm/"$arch -a ! -d "${IMAGE_ROOTFS}/Packages.$prj_name/"$arch ]; then channel_priority=$(expr $channel_priority - 5) echo "$channel_priority $arch" >> ${IMAGE_ROOTFS}/Packages.$prj_name/.feedpriority - wrl_installer_hardlinktree "$deploy_dir_rpm/"$arch "${IMAGE_ROOTFS}/Packages.$prj_name/." fi done + cd ${deploy_dir_rpm} + for pkg in `cat ${REPO_INCLUDE_PKG}`; do + pkg_file=$(find . -type f -name ${pkg}.rpm) + if [ -z "${pkg_file}" ]; then + bbwarn "Package ${pkg}.rpm not found, please check if there is anything wrong or just remove it from the list." + else + cp --parents -vf ${pkg_file} ${IMAGE_ROOTFS}/Packages.$prj_name/ + fi + done + cd - + for pkg in ${REPO_EXCLUDE_PKG}; do rm -rf ${IMAGE_ROOTFS}/Packages.$prj_name/${pkg} done