starlingx/metal
Code Issues Proposed changes

Merge "Remove version from installer"

Browse Source
This commit is contained in:
Zuul 2018-12-21 15:32:32 +00:00 committed by Gerrit Code Review
commit 351cc87c9c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installer/pxe-network-installer/centos/build_srpm.data
View File

@ -2,9 +2,9 @@ COPY_LIST="pxe-network-installer/* \
$GIT_BASE/bsp-files/grub.cfg \
$GIT_BASE/bsp-files/kickstarts/post_clone_iso_ks.cfg \
$SRC_BASE/cgcs-centos-repo/Binary/images/efiboot.img \
/import/mirrors/CentOS/tis-installer/initrd.img-stx-0.2 \
/import/mirrors/CentOS/tis-installer/squashfs.img-stx-0.2 \
/import/mirrors/CentOS/tis-installer/vmlinuz-stx-0.2 \
/import/mirrors/CentOS/stx-installer/initrd.img \
/import/mirrors/CentOS/stx-installer/squashfs.img \
/import/mirrors/CentOS/stx-installer/vmlinuz \
"
TIS_PATCH_VER=27

14
installer/pxe-network-installer/centos/pxe-network-installer.spec
View File

@ -7,13 +7,11 @@ Group: base
Packager: Wind River <info@windriver.com>
URL: unknown
%define tis_image_version stx-0.2
Source0: LICENSE
Source001: vmlinuz-%{tis_image_version}
Source002: initrd.img-%{tis_image_version}
Source003: squashfs.img-%{tis_image_version}
Source001: vmlinuz
Source002: initrd.img
Source003: squashfs.img
Source010: pxeboot-update.sh
Source011: grub.cfg
@ -59,14 +57,14 @@ install -v -d -m 755 %{buildroot}/pxeboot/EFI
install -v -d -m 755 %{buildroot}/pxeboot/EFI/centos
ln -s %{_prefix}/lib/grub/x86_64-efi %{buildroot}/pxeboot/EFI/centos/x86_64-efi
install -v -m 644 %{_sourcedir}/vmlinuz-%{tis_image_version} \
install -v -m 644 %{_sourcedir}/vmlinuz \
%{buildroot}/pxeboot/rel-%{platform_release}/installer-bzImage_1.0
install -v -m 644 %{_sourcedir}/initrd.img-%{tis_image_version} \
install -v -m 644 %{_sourcedir}/initrd.img \
%{buildroot}/pxeboot/rel-%{platform_release}/installer-intel-x86-64-initrd_1.0
ln -s installer-bzImage_1.0 %{buildroot}/pxeboot/rel-%{platform_release}/installer-bzImage
ln -s installer-intel-x86-64-initrd_1.0 %{buildroot}/pxeboot/rel-%{platform_release}/installer-initrd
install -v -D -m 644 %{_sourcedir}/squashfs.img-%{tis_image_version} \
install -v -D -m 644 %{_sourcedir}/squashfs.img \
%{buildroot}/www/pages/feed/rel-%{platform_release}/LiveOS/squashfs.img
install -v -d -m 755 %{buildroot}%{_sbindir}