From f77d685ceaf42480ea99faa1e5feb435c81b0145 Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Fri, 23 Jul 2021 09:57:38 +0800 Subject: [PATCH] =?UTF-8?q?TSG-7115=20=E5=AE=89=E8=A3=85fish3=E5=92=8Ctmux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/yum.conf | 8 ++++++++ tools/mk-base-image | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/yum.conf b/conf/yum.conf index 207695f3..284bdc66 100644 --- a/conf/yum.conf +++ b/conf/yum.conf @@ -61,6 +61,14 @@ gpgcheck=1 gpgkey=https://download.opensuse.org/repositories/home:/opcm/CentOS_7/repodata/repomd.xml.key enabled=1 +[shells_fish_release_3] +name=Fish shell - 3.x release series (CentOS_7) +type=rpm-md +baseurl=https://download.opensuse.org/repositories/shells:/fish:/release:/3/CentOS_7/ +gpgcheck=1 +gpgkey=https://download.opensuse.org/repositories/shells:/fish:/release:/3/CentOS_7/repodata/repomd.xml.key +enabled=1 + [framework] name=framework baseurl=https://repo.geedge.net/pulp/content/7/x86_64/stable/framework/ diff --git a/tools/mk-base-image b/tools/mk-base-image index 15b6368b..28af295f 100755 --- a/tools/mk-base-image +++ b/tools/mk-base-image @@ -15,7 +15,7 @@ set -ex package_to_install="@base @core @debugging @directory-client @guest-agents @hardware-monitoring @network-file-system-client @performance @remote-system-management - grub2 epel-release efibootmgr ansible yum-utils ipmitool docker-ce docker-ce-cli containerd.io lrzsz python3 vconfig watchdog pcm git" + grub2 epel-release efibootmgr ansible yum-utils ipmitool docker-ce docker-ce-cli containerd.io lrzsz python3 vconfig watchdog pcm git tmux fish" locak_package_to_install="$projectdir/package/kernel-lt-$kernel_version.rpm $projectdir/package/kernel-lt-devel-$kernel_version.rpm"