From 9490a2b1fb3f0f3bf802aaf90eb1cd73738506f8 Mon Sep 17 00:00:00 2001 From: Erich Cordoba Date: Fri, 7 Dec 2018 11:04:29 -0600 Subject: [PATCH] Remove version from installer The stx-2.0 version was removed from the required filenames. Also, now the files should be placed on the stx-installer folder. Story: 2004126 Task: 28336 Change-Id: I1d8667472c7dfa6d48ce120626fe202a16f41c28 Signed-off-by: Erich Cordoba --- .../pxe-network-installer/centos/build_srpm.data | 6 +++--- .../centos/pxe-network-installer.spec | 16 +++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/installer/pxe-network-installer/centos/build_srpm.data b/installer/pxe-network-installer/centos/build_srpm.data index 0c11c127..f12953f6 100644 --- a/installer/pxe-network-installer/centos/build_srpm.data +++ b/installer/pxe-network-installer/centos/build_srpm.data @@ -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 diff --git a/installer/pxe-network-installer/centos/pxe-network-installer.spec b/installer/pxe-network-installer/centos/pxe-network-installer.spec index 0059cec9..29b89932 100644 --- a/installer/pxe-network-installer/centos/pxe-network-installer.spec +++ b/installer/pxe-network-installer/centos/pxe-network-installer.spec @@ -7,13 +7,11 @@ Group: base Packager: Wind River 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} @@ -75,7 +73,7 @@ install -v -m 755 %{_sourcedir}/pxeboot-update.sh %{buildroot}%{_sbindir}/pxeboo install -v -m 644 %{_sourcedir}/post_clone_iso_ks.cfg \ %{buildroot}/pxeboot/post_clone_iso_ks.cfg - + install -v -m 644 %{_sourcedir}/default \ %{buildroot}/pxeboot/pxelinux.cfg.files/default install -v -m 644 %{_sourcedir}/default.static \