scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 09:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build directory-based installers

Browse Source 
- move default installer to 'swi' directory
- add BOOTMODE salt to deb and installer name
This commit is contained in:
Carl D. Roth
2016-05-26 14:07:33 -07:00
parent e17ea293e2
commit 14870ac7b7
36 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builds/amd64/installer/PKG.yml
View File

@@ -1 +0,0 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=amd64

1
builds/amd64/installer/installed/Makefile Normal file
View File

@@ -0,0 +1 @@
include $(ONL)/make/pkg.mk

2
builds/amd64/installer/installed/PKG.yml Normal file
View File

@@ -0,0 +1,2 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=amd64 BOOTMODE=INSTALLED

0
builds/amd64/installer/builds/.gitignore → builds/amd64/installer/installed/builds/.gitignore vendored
View File

3
builds/amd64/installer/installed/builds/Makefile Normal file
View File

@@ -0,0 +1,3 @@
BOOTMODE=INSTALLED
include $(ONL)/make/config.amd64.mk
include $(ONL)/builds/any/installer/grub/builds/Makefile

4
builds/amd64/installer/installed/builds/boot-config Normal file
View File

@@ -0,0 +1,4 @@
NETDEV=ma1
NETAUTO=dhcp
BOOTMODE=INSTALLED
SWI=images::latest

1
builds/amd64/installer/swi/Makefile Normal file
View File

@@ -0,0 +1 @@
include $(ONL)/make/pkg.mk

1
builds/amd64/installer/swi/PKG.yml Normal file
View File

@@ -0,0 +1 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=amd64 BOOTMODE=swi

0
builds/armel/installer/builds/.gitignore → builds/amd64/installer/swi/builds/.gitignore vendored
View File

1
builds/amd64/installer/builds/Makefile → builds/amd64/installer/swi/builds/Makefile
View File

@@ -1,2 +1,3 @@
BOOTMODE=SWI
include $(ONL)/make/config.amd64.mk
include $(ONL)/builds/any/installer/grub/builds/Makefile

0
builds/amd64/installer/builds/boot-config → builds/amd64/installer/swi/builds/boot-config
View File

2
builds/any/installer/APKG.yml
View File

@@ -10,7 +10,7 @@ common:
maintainer: support@bigswitch.com
packages:
- name: onl-installer
- name: onl-installer-$BOOTMODE
summary: Open Network Linux $ARCH Installer
files:

6
builds/any/installer/grub/builds/Makefile
View File

@@ -2,6 +2,10 @@ ifndef ARCH
$(error $$ARCH not set)
endif
ifndef BOOTMODE
$(error $$BOOTMODE not set)
endif
ONLPLATFORM = python $(ONL)/tools/onlplatform.py
PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:$(ARCH))
@@ -11,7 +15,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)_$(BOOTMODE)_INSTALLER
ifeq ($(ARCH), amd64)
INSTALLER_ARCH = x86_64

6
builds/any/installer/uboot/builds/Makefile
View File

@@ -2,6 +2,10 @@ ifndef ARCH
$(error $$ARCH not set)
endif
ifndef BOOTMODE
$(error $$BOOTMODE not set)
endif
ONLPLATFORM = python $(ONL)/tools/onlplatform.py
PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:$(ARCH))
@@ -15,7 +19,7 @@ PYFIT_ENVIRONMENT = PYTHONPATH=$(VONLDIR)/src/python
# 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)_$(BOOTMODE)_INSTALLER
# default fit image can be used as the canonical location for the initrd
FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb)

1
builds/armel/installer/PKG.yml
View File

@@ -1 +0,0 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=armel

1
builds/armel/installer/installed/Makefile Normal file
View File

@@ -0,0 +1 @@
include $(ONL)/make/pkg.mk

1
builds/armel/installer/installed/PKG.yml Normal file
View File

@@ -0,0 +1 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=armel BOOTMODE=installed

0
builds/powerpc/installer/builds/.gitignore → builds/armel/installer/installed/builds/.gitignore vendored
View File

3
builds/armel/installer/installed/builds/Makefile Normal file
View File

@@ -0,0 +1,3 @@
BOOTMODE=INSTALLED
include $(ONL)/make/config.armel.mk
include $(ONL)/builds/any/installer/uboot/builds/Makefile

4
builds/armel/installer/installed/builds/boot-config Normal file
View File

@@ -0,0 +1,4 @@
NETDEV=ma1
NETAUTO=dhcp
BOOTMODE=INSTALLED
SWI=images::latest

1
builds/armel/installer/swi/Makefile Normal file
View File

@@ -0,0 +1 @@
include $(ONL)/make/pkg.mk

1
builds/armel/installer/swi/PKG.yml Normal file
View File

@@ -0,0 +1 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=armel BOOTMODE=swi

1
builds/armel/installer/swi/builds/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
*INSTALLER

1
builds/armel/installer/builds/Makefile → builds/armel/installer/swi/builds/Makefile
View File

@@ -1,2 +1,3 @@
BOOTMODE=SWI
include $(ONL)/make/config.armel.mk
include $(ONL)/builds/any/installer/uboot/builds/Makefile

0
builds/armel/installer/builds/boot-config → builds/armel/installer/swi/builds/boot-config
View File

1
builds/powerpc/installer/PKG.yml
View File

@@ -1 +0,0 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=powerpc

1
builds/powerpc/installer/installed/Makefile Normal file
View File

@@ -0,0 +1 @@
include $(ONL)/make/pkg.mk

1
builds/powerpc/installer/installed/PKG.yml Normal file
View File

@@ -0,0 +1 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=powerpc BOOTMODE=INSTALLED

1
builds/powerpc/installer/installed/builds/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
*INSTALLER

3
builds/powerpc/installer/installed/builds/Makefile Normal file
View File

@@ -0,0 +1,3 @@
BOOTMODE=INSTALLED
include $(ONL)/make/config.powerpc.mk
include $(ONL)/builds/any/installer/uboot/builds/Makefile

4
builds/powerpc/installer/installed/builds/boot-config Normal file
View File

@@ -0,0 +1,4 @@
NETDEV=ma1
NETAUTO=dhcp
BOOTMODE=INSTALLED
SWI=images::latest

1
builds/powerpc/installer/swi/Makefile Normal file
View File

@@ -0,0 +1 @@
include $(ONL)/make/pkg.mk

2
builds/powerpc/installer/swi/PKG.yml Normal file
View File

@@ -0,0 +1,2 @@
!include $ONL/builds/any/installer/APKG.yml ARCH=powerpc BOOTMODE=swi

1
builds/powerpc/installer/swi/builds/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
*INSTALLER

1
builds/powerpc/installer/builds/Makefile → builds/powerpc/installer/swi/builds/Makefile
View File

@@ -1,2 +1,3 @@
BOOTMODE=SWI
include $(ONL)/make/config.powerpc.mk
include $(ONL)/builds/any/installer/uboot/builds/Makefile

0
builds/powerpc/installer/builds/boot-config → builds/powerpc/installer/swi/builds/boot-config
View File