From 77c4bc6e8dd8acebfba272af2eab19ee15bc9f54 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 5 Apr 2016 16:08:04 +0000 Subject: [PATCH] Use common FIT build templates. --- packages/base/armel/fit/buildroot/PKG.yml | 24 +----------------- .../armel/fit/buildroot/builds/.gitignore | 2 +- .../base/armel/fit/buildroot/builds/Makefile | 11 ++------ packages/base/armel/fit/loader/PKG.yml | 24 +----------------- .../base/armel/fit/loader/builds/.gitignore | 3 ++- .../base/armel/fit/loader/builds/Makefile | 11 ++------ packages/base/powerpc/fit/buildroot/PKG.yml | 24 +----------------- .../powerpc/fit/buildroot/builds/Makefile | 11 ++------ packages/base/powerpc/fit/loader/PKG.yml | 25 +------------------ .../base/powerpc/fit/loader/builds/Makefile | 12 +-------- 10 files changed, 14 insertions(+), 133 deletions(-) diff --git a/packages/base/armel/fit/buildroot/PKG.yml b/packages/base/armel/fit/buildroot/PKG.yml index 10da94c7..f8ad9566 100644 --- a/packages/base/armel/fit/buildroot/PKG.yml +++ b/packages/base/armel/fit/buildroot/PKG.yml @@ -1,23 +1 @@ -prerequisites: - packages: - - onl-buildroot-initrd:powerpc - -common: - arch: powerpc - version: 1.0.0 - copyright: Copyright 2013, 2014, 2015 Big Switch Networks - maintainer: support@bigswitch.com - -packages: - - name: onl-buildroot-fit - version: 1.0.0 - summary: Open Network Linux FIT Buildroot Image - - files: - builds/onl-buildroot-fit.itb : $$PKG_INSTALL/ - - changelog: Change changes changes., - - - - +!include $ONL/packages/base/any/fit/buildroot/APKG.yml ARCH=armel diff --git a/packages/base/armel/fit/buildroot/builds/.gitignore b/packages/base/armel/fit/buildroot/builds/.gitignore index 126b5b2f..3950078a 100644 --- a/packages/base/armel/fit/buildroot/builds/.gitignore +++ b/packages/base/armel/fit/buildroot/builds/.gitignore @@ -1,4 +1,4 @@ kernel-* *.itb *.its -loader-initrd-powerpc +loader-initrd-armel diff --git a/packages/base/armel/fit/buildroot/builds/Makefile b/packages/base/armel/fit/buildroot/builds/Makefile index 939a337d..ec20e1bb 100644 --- a/packages/base/armel/fit/buildroot/builds/Makefile +++ b/packages/base/armel/fit/buildroot/builds/Makefile @@ -1,9 +1,2 @@ -.PHONY: onl-buildroot-fit.itb onl-buildroot-fit.its - -onl-buildroot-fit.itb: - $(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:armel,onl-buildroot-initrd-armel.cpio.gz --arch armel --add-platform all --itb $@ - -onl-buildroot-fit.its: - $(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:armel,onl-buildroot-initrd-armel.cpio.gz --arch armel --add-platform all --its $@ - -its: onl-buildroot-fit.its +include $(ONL)/make/config.armel.mk +include $(ONL)/packages/base/any/fit/buildroot/builds/Makefile diff --git a/packages/base/armel/fit/loader/PKG.yml b/packages/base/armel/fit/loader/PKG.yml index 6c024bce..8022f98e 100644 --- a/packages/base/armel/fit/loader/PKG.yml +++ b/packages/base/armel/fit/loader/PKG.yml @@ -1,23 +1 @@ -prerequisites: - packages: - - onl-loader-initrd:powerpc - -common: - arch: powerpc - version: 1.0.0 - copyright: Copyright 2013, 2014, 2015 Big Switch Networks - maintainer: support@bigswitch.com - -packages: - - name: onl-loader-fit - version: 1.0.0 - summary: Open Network Linux FIT Loader Image - - files: - builds/onl-loader-fit.itb : $$PKG_INSTALL/ - - changelog: Change changes changes., - - - - +!include $ONL/packages/base/any/fit/loader/APKG.yml ARCH=armel diff --git a/packages/base/armel/fit/loader/builds/.gitignore b/packages/base/armel/fit/loader/builds/.gitignore index 126b5b2f..e56a5193 100644 --- a/packages/base/armel/fit/loader/builds/.gitignore +++ b/packages/base/armel/fit/loader/builds/.gitignore @@ -1,4 +1,5 @@ kernel-* *.itb *.its -loader-initrd-powerpc +loader-initrd-armel +manifest.json diff --git a/packages/base/armel/fit/loader/builds/Makefile b/packages/base/armel/fit/loader/builds/Makefile index 33dfab55..8cffe5a3 100644 --- a/packages/base/armel/fit/loader/builds/Makefile +++ b/packages/base/armel/fit/loader/builds/Makefile @@ -1,9 +1,2 @@ -.PHONY: onl-loader-fit.itb onl-loader-fit.its - -onl-loader-fit.itb: - $(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:armel,onl-loader-initrd-armel.cpio.gz --arch armel --add-platform initrd --itb $@ - -onl-loader-fit.its: - $(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:armel,onl-loader-initrd-armel.cpio.gz --arch armel --add-platform initrd --its $@ - -its: onl-loader-fit.its +include $(ONL)/make/config.armel.mk +include $(ONL)/packages/base/any/fit/loader/builds/Makefile diff --git a/packages/base/powerpc/fit/buildroot/PKG.yml b/packages/base/powerpc/fit/buildroot/PKG.yml index 10da94c7..866c2ac7 100644 --- a/packages/base/powerpc/fit/buildroot/PKG.yml +++ b/packages/base/powerpc/fit/buildroot/PKG.yml @@ -1,23 +1 @@ -prerequisites: - packages: - - onl-buildroot-initrd:powerpc - -common: - arch: powerpc - version: 1.0.0 - copyright: Copyright 2013, 2014, 2015 Big Switch Networks - maintainer: support@bigswitch.com - -packages: - - name: onl-buildroot-fit - version: 1.0.0 - summary: Open Network Linux FIT Buildroot Image - - files: - builds/onl-buildroot-fit.itb : $$PKG_INSTALL/ - - changelog: Change changes changes., - - - - +!include $ONL/packages/base/any/fit/buildroot/APKG.yml ARCH=powerpc diff --git a/packages/base/powerpc/fit/buildroot/builds/Makefile b/packages/base/powerpc/fit/buildroot/builds/Makefile index c50aadcc..3fb5a5fd 100644 --- a/packages/base/powerpc/fit/buildroot/builds/Makefile +++ b/packages/base/powerpc/fit/buildroot/builds/Makefile @@ -1,9 +1,2 @@ -.PHONY: onl-buildroot-fit.itb onl-buildroot-fit.its - -onl-buildroot-fit.itb: - $(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:powerpc,onl-buildroot-initrd-powerpc.cpio.gz --arch powerpc --add-platform all --itb $@ - -onl-buildroot-fit.its: - $(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:powerpc,onl-buildroot-initrd-powerpc.cpio.gz --arch powerpc --add-platform all --its $@ - -its: onl-buildroot-fit.its +include $(ONL)/make/config.powerpc.mk +include $(ONL)/packages/base/any/fit/buildroot/builds/Makefile diff --git a/packages/base/powerpc/fit/loader/PKG.yml b/packages/base/powerpc/fit/loader/PKG.yml index fa89821f..2eeb242f 100644 --- a/packages/base/powerpc/fit/loader/PKG.yml +++ b/packages/base/powerpc/fit/loader/PKG.yml @@ -1,24 +1 @@ -prerequisites: - packages: - - onl-loader-initrd:powerpc - -common: - arch: powerpc - version: 1.0.0 - copyright: Copyright 2013, 2014, 2015 Big Switch Networks - maintainer: support@bigswitch.com - -packages: - - name: onl-loader-fit - version: 1.0.0 - summary: Open Network Linux FIT Loader Image - - files: - builds/onl-loader-fit.itb : /etc/onl/upgrade/ppc/ - builds/manifest.json : /etc/onl/upgrade/ppc/ - - changelog: Change changes changes., - - - - +!include $ONL/packages/base/any/fit/loader/APKG.yml ARCH=powerpc diff --git a/packages/base/powerpc/fit/loader/builds/Makefile b/packages/base/powerpc/fit/loader/builds/Makefile index 3739adb2..869d4b03 100644 --- a/packages/base/powerpc/fit/loader/builds/Makefile +++ b/packages/base/powerpc/fit/loader/builds/Makefile @@ -1,12 +1,2 @@ include $(ONL)/make/config.powerpc.mk - -.PHONY: onl-loader-fit.itb onl-loader-fit.its - -onl-loader-fit.itb: - $(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:powerpc,onl-loader-initrd-powerpc.cpio.gz --arch powerpc --add-platform initrd --itb $@ - $(ONLPM) --copy-file onl-loader-initrd:powerpc manifest.json . - -onl-loader-fit.its: - $(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:powerpc,onl-loader-initrd-powerpc.cpio.gz --arch powerpc --add-platform initrd --its $@ - -its: onl-loader-fit.its +include $(ONL)/packages/base/any/fit/loader/builds/Makefile