gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-7602 修正OS候选版本、正式版本版本号前缀有两个v的问题。

Browse Source
This commit is contained in:
Lu Qiuwen
2021-09-01 10:52:15 +08:00
parent 8cdf74b52c
commit be2a7862e2
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installer/install.sh
View File

@@ -31,7 +31,7 @@ dev_part_tsg_os_sysroot="/dev/sda${exp_part_tsg_os_sysroot}"
dev_part_tsg_os_data="/dev/sda${exp_part_tsg_os_data}"
tsg_os_efi_prefix="TSG-OS"
tsg_os_efi_label="TSG-OS: v${DISTR0_VER} (${MACHINE_ID})"
tsg_os_efi_label="TSG-OS: ${DISTR0_VER} (${MACHINE_ID})"
# auto-detect whether BIOS or UEFI
if [ -d "/sys/firmware/efi/efivars" ] ; then
@@ -310,11 +310,11 @@ EOF2
# Add a menu entry for o/s distro
(cat <<EOF3
menuentry 'TSG-OS v${DISTR0_VER} (${MACHINE_ID})' {
menuentry 'TSG-OS ${DISTR0_VER} (${MACHINE_ID})' {
set root='(${root_disk},gpt${distro_part})'
echo 'Loading TSG-OS v${DISTR0_VER} (${MACHINE_ID}) ...'
echo 'Loading TSG-OS ${DISTR0_VER} (${MACHINE_ID}) ...'
linux /boot/vmlinuz ${kernel_args} root=${blk_dev}${distro_part}
echo 'Loading TSG-OS v${DISTR0_VER} (${MACHINE_ID}) initial ramdisk ...'
echo 'Loading TSG-OS ${DISTR0_VER} (${MACHINE_ID}) initial ramdisk ...'
initrd /boot/initrd.img
}
EOF3

2
make/Makefile.7400MCN0P01R01
View File

@@ -43,7 +43,7 @@ sysroot-base: builddir
sysroot-verfile: sysroot-base
sed -i -e "s/^NAME=.*/NAME=\"TSG-OS\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^VERSION=.*/VERSION=\"$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS v$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS $(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR)/tmp/ -r

2
make/Makefile.7400MCN123P01R01
View File

@@ -43,7 +43,7 @@ sysroot-base: builddir
sysroot-verfile: sysroot-base
sed -i -e "s/^NAME=.*/NAME=\"TSG-OS\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^VERSION=.*/VERSION=\"$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS v$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS $(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR)/tmp/ -r

2
make/Makefile.9000NPBP01R01
View File

@@ -43,7 +43,7 @@ sysroot-base: builddir
sysroot-verfile: sysroot-base
sed -i -e "s/^NAME=.*/NAME=\"TSG-OS\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^VERSION=.*/VERSION=\"$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS v$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS $(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR)/tmp/ -r