Use common FIT build templates.

2025-12-25 17:27:01 +00:00 · 2016-04-05 16:08:04 +00:00
parent c7efc16573
commit 77c4bc6e8d
10 changed files with 14 additions and 133 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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