From 37372b322ecc12f6424a72a8a72382ad507ddcff Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 17 May 2016 01:39:34 +0000 Subject: [PATCH] Rename the legacy installer as such. If will be removed once the new installers are fully qualified on all platforms. --- Makefile | 6 +++--- builds/amd64/installer/legacy/builds/Makefile | 3 +-- builds/any/installer/legacy/APKG.yml | 14 ++------------ builds/any/installer/legacy/fit/builds/Makefile | 2 +- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 743df60f..96dab5a6 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ onl-amd64 onl-x86 x86 x86_64 amd64: packages_base_all $(MAKE) -C packages/base/amd64/faultd $(MAKE) -C builds/amd64/rootfs $(MAKE) -C builds/amd64/swi - $(MAKE) -C builds/amd64/installer/legacy + $(MAKE) -C builds/amd64/installer onl-ppc ppc: packages_base_all $(MAKE) -C packages/base/powerpc/kernels @@ -34,7 +34,7 @@ onl-ppc ppc: packages_base_all $(MAKE) -C packages/base/powerpc/fit $(MAKE) -C builds/powerpc/rootfs $(MAKE) -C builds/powerpc/swi - $(MAKE) -C builds/powerpc/installer/legacy + $(MAKE) -C builds/powerpc/installer ifdef ONL_DEBIAN_SUITE_jessie @@ -51,7 +51,7 @@ onl-arm arm: arm_toolchain_check packages_base_all $(MAKE) -C packages/base/armel/fit $(MAKE) -C builds/armel/rootfs $(MAKE) -C builds/armel/swi - $(MAKE) -C builds/armel/installer/legacy + $(MAKE) -C builds/armel/installer else onl-arm arm: diff --git a/builds/amd64/installer/legacy/builds/Makefile b/builds/amd64/installer/legacy/builds/Makefile index 158cbf6c..c32b3bce 100644 --- a/builds/amd64/installer/legacy/builds/Makefile +++ b/builds/amd64/installer/legacy/builds/Makefile @@ -14,7 +14,7 @@ MKSHAR_PERMS = autoperms.sh # Hardcoded to match ONL File naming conventions. include $(ONL)/make/version-onl.mk -INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER +INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER @@ -41,4 +41,3 @@ shar installer: installer clean: rm -f *.swi *.installer $(notdir $(KERNELS)) initrd-amd64 - diff --git a/builds/any/installer/legacy/APKG.yml b/builds/any/installer/legacy/APKG.yml index cad485cf..a53d0129 100644 --- a/builds/any/installer/legacy/APKG.yml +++ b/builds/any/installer/legacy/APKG.yml @@ -10,8 +10,8 @@ common: maintainer: support@bigswitch.com packages: - - name: onl-installer - summary: Open Network Linux $ARCH Installer + - name: onl-legacy-installer + summary: Open Network Linux $ARCH Legacy Installer files: builds/*INSTALLER : $$PKG_INSTALL/ @@ -23,13 +23,3 @@ packages: release: - builds/*INSTALLER : $ARCH/ - builds/*.md5sum : $ARCH/ - - - - - - - - - - diff --git a/builds/any/installer/legacy/fit/builds/Makefile b/builds/any/installer/legacy/fit/builds/Makefile index 38609d49..ce7e1c65 100644 --- a/builds/any/installer/legacy/fit/builds/Makefile +++ b/builds/any/installer/legacy/fit/builds/Makefile @@ -6,7 +6,7 @@ THISDIR := $(dir $(lastword $(MAKEFILE_LIST))) # Hardcoded to match ONL File naming conventions. include $(ONL)/make/version-onl.mk -INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER +INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb)