diff --git a/make/Makefile.9000NPBP01R01 b/make/Makefile.9000NPBP01R01 index be0699ce..0d629134 100644 --- a/make/Makefile.9000NPBP01R01 +++ b/make/Makefile.9000NPBP01R01 @@ -36,7 +36,7 @@ installer: builddir sed -i -e "s/%%SIZE_PART_DATA%%/$(SIZE_PART_DATA)/" $(TARGET_INSTALLER_DIR)/install.sh sysroot-base: builddir - $(TOOLSDIR)/mk-base-image $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR) + $(TOOLSDIR)/mk-base-image $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR) $(PROJECTDIR) sysroot-ansible: sysroot-base $(TOOLSDIR)/ansible-stage-one $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) diff --git a/tsg-9140-scripts/roles/kernel-ml/files/kernel/kernel-lt-5.4.113-1.el7.elrepo.x86_64.rpm b/package/kernel-lt-5.4.113-1.el7.elrepo.x86_64.rpm similarity index 100% rename from tsg-9140-scripts/roles/kernel-ml/files/kernel/kernel-lt-5.4.113-1.el7.elrepo.x86_64.rpm rename to package/kernel-lt-5.4.113-1.el7.elrepo.x86_64.rpm diff --git a/tsg-9140-scripts/roles/kernel-ml/files/kernel/kernel-lt-devel-5.4.113-1.el7.elrepo.x86_64.rpm b/package/kernel-lt-devel-5.4.113-1.el7.elrepo.x86_64.rpm similarity index 100% rename from tsg-9140-scripts/roles/kernel-ml/files/kernel/kernel-lt-devel-5.4.113-1.el7.elrepo.x86_64.rpm rename to package/kernel-lt-devel-5.4.113-1.el7.elrepo.x86_64.rpm diff --git a/tools/mk-base-image b/tools/mk-base-image index 30c18785..9124d51e 100755 --- a/tools/mk-base-image +++ b/tools/mk-base-image @@ -8,15 +8,19 @@ yum_config=$1 target=$2 +projectdir=$3 +kernel_version="5.4.113-1.el7.elrepo.x86_64" set -ex package_to_install="@base @core @debugging @directory-client @guest-agents @hardware-monitoring @network-file-system-client @performance @remote-system-management - grub2 kernel kernel-devel epel-release ansible yum-utils ipmitool docker-ce docker-ce-cli containerd.io" - + grub2 epel-release ansible yum-utils ipmitool docker-ce docker-ce-cli containerd.io" +locak_package_to_install="$projectdir/package/kernel-lt-$kernel_version.rpm + $projectdir/package/kernel-lt-devel-$kernel_version.rpm" setopt="group_package_types=mandatory,default,optional" +yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt install $locak_package_to_install yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt install $package_to_install cat > "$target"/etc/sysconfig/network <