From c3078a4fa2bbfaade5275bc78092bfbd5681dd0c Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 1 Dec 2015 05:15:02 +0000 Subject: [PATCH] Rootfs and SWI Build Cleanup The rootfs and SWI packages are now stored separately from the base packages. The base and platform packages are designed as inputs for the system integrator and are separated for use by those building their own systems. The rootfs, SWI (and soon to be installer) parts of the builds are productizations of those inputs. When ONL is integrated as part of a larger project these rootfs and SWI packages are not used directly. --- builds/.gitignore | 2 ++ builds/Makefile | 1 + builds/amd64/rootfs/.gitignore | 1 + builds/amd64/rootfs/Makefile | 1 + builds/amd64/rootfs/PKG.yml | 1 + builds/amd64/rootfs/builds/.gitignore | 1 + builds/amd64/rootfs/builds/Makefile | 16 +++++++++ builds/amd64/swi/Makefile | 1 + builds/amd64/swi/PKG.yml | 2 ++ .../{swi/amd64 => amd64/swi/builds}/Makefile | 0 builds/any/rootfs/APKG.yml | 23 ++++++++++++ builds/any/swi/APKG.yml | 35 +++++++++++++++++++ builds/powerpc/rootfs/Makefile | 1 + builds/powerpc/rootfs/PKG.yml | 1 + builds/powerpc/rootfs/builds/.gitignore | 2 ++ builds/powerpc/rootfs/builds/Makefile | 16 +++++++++ builds/powerpc/swi/Makefile | 1 + builds/powerpc/swi/PKG.yml | 2 ++ .../powerpc => powerpc/swi/builds}/Makefile | 0 builds/swi/.gitignore | 2 -- 20 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 builds/.gitignore create mode 100644 builds/Makefile create mode 100644 builds/amd64/rootfs/.gitignore create mode 100644 builds/amd64/rootfs/Makefile create mode 100644 builds/amd64/rootfs/PKG.yml create mode 100644 builds/amd64/rootfs/builds/.gitignore create mode 100644 builds/amd64/rootfs/builds/Makefile create mode 100644 builds/amd64/swi/Makefile create mode 100644 builds/amd64/swi/PKG.yml rename builds/{swi/amd64 => amd64/swi/builds}/Makefile (100%) create mode 100644 builds/any/rootfs/APKG.yml create mode 100644 builds/any/swi/APKG.yml create mode 100644 builds/powerpc/rootfs/Makefile create mode 100644 builds/powerpc/rootfs/PKG.yml create mode 100644 builds/powerpc/rootfs/builds/.gitignore create mode 100644 builds/powerpc/rootfs/builds/Makefile create mode 100644 builds/powerpc/swi/Makefile create mode 100644 builds/powerpc/swi/PKG.yml rename builds/{swi/powerpc => powerpc/swi/builds}/Makefile (100%) delete mode 100644 builds/swi/.gitignore diff --git a/builds/.gitignore b/builds/.gitignore new file mode 100644 index 00000000..35e70f99 --- /dev/null +++ b/builds/.gitignore @@ -0,0 +1,2 @@ +*.swi +*.md5sum diff --git a/builds/Makefile b/builds/Makefile new file mode 100644 index 00000000..003238cf --- /dev/null +++ b/builds/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk \ No newline at end of file diff --git a/builds/amd64/rootfs/.gitignore b/builds/amd64/rootfs/.gitignore new file mode 100644 index 00000000..b2918169 --- /dev/null +++ b/builds/amd64/rootfs/.gitignore @@ -0,0 +1 @@ +*.d/ diff --git a/builds/amd64/rootfs/Makefile b/builds/amd64/rootfs/Makefile new file mode 100644 index 00000000..dc1e7b86 --- /dev/null +++ b/builds/amd64/rootfs/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/builds/amd64/rootfs/PKG.yml b/builds/amd64/rootfs/PKG.yml new file mode 100644 index 00000000..8afda98f --- /dev/null +++ b/builds/amd64/rootfs/PKG.yml @@ -0,0 +1 @@ +!include $ONL/builds/any/rootfs/APKG.yml ARCH=amd64 diff --git a/builds/amd64/rootfs/builds/.gitignore b/builds/amd64/rootfs/builds/.gitignore new file mode 100644 index 00000000..2ddf5f27 --- /dev/null +++ b/builds/amd64/rootfs/builds/.gitignore @@ -0,0 +1 @@ +manifest.json diff --git a/builds/amd64/rootfs/builds/Makefile b/builds/amd64/rootfs/builds/Makefile new file mode 100644 index 00000000..aa896dda --- /dev/null +++ b/builds/amd64/rootfs/builds/Makefile @@ -0,0 +1,16 @@ +include $(ONL)/make/config.amd64.mk + +# +# Default to include all available amd64 platforms. +# You override this with you own list or yaml file. +# +export PLATFORM_LIST=$(shell onlpm --list-platforms --arch amd64 --csv ) + +RFS_CONFIG := $(ONL)/packages/base/any/rootfs/standard/standard.yml +RFS_DIR := rootfs-amd64.d +RFS_CPIO := rootfs-amd64.cpio.gz +RFS_SQUASH := rootfs-amd64.sqsh + +include $(ONL)/make/rfs.mk + + diff --git a/builds/amd64/swi/Makefile b/builds/amd64/swi/Makefile new file mode 100644 index 00000000..003238cf --- /dev/null +++ b/builds/amd64/swi/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk \ No newline at end of file diff --git a/builds/amd64/swi/PKG.yml b/builds/amd64/swi/PKG.yml new file mode 100644 index 00000000..ef9b0f97 --- /dev/null +++ b/builds/amd64/swi/PKG.yml @@ -0,0 +1,2 @@ +!include $ONL/builds/any/swi/APKG.yml ARCH=amd64 + diff --git a/builds/swi/amd64/Makefile b/builds/amd64/swi/builds/Makefile similarity index 100% rename from builds/swi/amd64/Makefile rename to builds/amd64/swi/builds/Makefile diff --git a/builds/any/rootfs/APKG.yml b/builds/any/rootfs/APKG.yml new file mode 100644 index 00000000..114d10c2 --- /dev/null +++ b/builds/any/rootfs/APKG.yml @@ -0,0 +1,23 @@ +prerequisites: + broken: true + +common: + arch: $ARCH + version: $FNAME_RELEASE_ID + copyright: Copyright 2013, 2014, 2015 Big Switch Networks + maintainer: support@bigswitch.com + +packages: + - name: onl-rootfs + summary: Open Network Linux Root Filesystem + + files: + builds/rootfs-$ARCH.cpio.gz : $$PKG_INSTALL/ + builds/rootfs-$ARCH.sqsh : $$PKG_INSTALL/ + builds/manifest.json : $$PKG_INSTALL/ + + changelog: Change changes changes., + + + + diff --git a/builds/any/swi/APKG.yml b/builds/any/swi/APKG.yml new file mode 100644 index 00000000..73267f4a --- /dev/null +++ b/builds/any/swi/APKG.yml @@ -0,0 +1,35 @@ + +prerequisites: + broken: true + packages: [ "onl-rootfs:$ARCH" ] + +common: + arch: $ARCH + version: $FNAME_RELEASE_ID + copyright: Copyright 2013, 2014, 2015 Big Switch Networks + maintainer: support@bigswitch.com + +packages: + - name: onl-swi + summary: Open Network Linux Switch Image (All $ARCH) Platforms) + + files: + builds/*.swi : $$PKG_INSTALL/ + builds/*.md5sum : $$PKG_INSTALL/ + + changelog: Change changes changes., + + +release: + - builds/*.swi : $ARCH/ + - builds/*.md5sum : $ARCH/ + + + + + + + + + + diff --git a/builds/powerpc/rootfs/Makefile b/builds/powerpc/rootfs/Makefile new file mode 100644 index 00000000..dc1e7b86 --- /dev/null +++ b/builds/powerpc/rootfs/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk diff --git a/builds/powerpc/rootfs/PKG.yml b/builds/powerpc/rootfs/PKG.yml new file mode 100644 index 00000000..c256419f --- /dev/null +++ b/builds/powerpc/rootfs/PKG.yml @@ -0,0 +1 @@ +!include $ONL/builds/any/rootfs/APKG.yml ARCH=powerpc diff --git a/builds/powerpc/rootfs/builds/.gitignore b/builds/powerpc/rootfs/builds/.gitignore new file mode 100644 index 00000000..ea55cee3 --- /dev/null +++ b/builds/powerpc/rootfs/builds/.gitignore @@ -0,0 +1,2 @@ +*.d/ +manifest.json diff --git a/builds/powerpc/rootfs/builds/Makefile b/builds/powerpc/rootfs/builds/Makefile new file mode 100644 index 00000000..77e9b471 --- /dev/null +++ b/builds/powerpc/rootfs/builds/Makefile @@ -0,0 +1,16 @@ +include $(ONL)/make/config.powerpc.mk + +# +# Default to include all available powerpc platforms. +# You override this with you own list or yaml file. +# +export PLATFORM_LIST=$(shell onlpm --list-platforms --arch powerpc --csv ) + +RFS_CONFIG := $(ONL)/packages/base/any/rootfs/standard/standard.yml +RFS_DIR := rootfs-powerpc.d +RFS_CPIO := rootfs-powerpc.cpio.gz +RFS_SQUASH := rootfs-powerpc.sqsh + +include $(ONL)/make/rfs.mk + + diff --git a/builds/powerpc/swi/Makefile b/builds/powerpc/swi/Makefile new file mode 100644 index 00000000..003238cf --- /dev/null +++ b/builds/powerpc/swi/Makefile @@ -0,0 +1 @@ +include $(ONL)/make/pkg.mk \ No newline at end of file diff --git a/builds/powerpc/swi/PKG.yml b/builds/powerpc/swi/PKG.yml new file mode 100644 index 00000000..3aac1ca1 --- /dev/null +++ b/builds/powerpc/swi/PKG.yml @@ -0,0 +1,2 @@ +!include $ONL/builds/any/swi/APKG.yml ARCH=powerpc + diff --git a/builds/swi/powerpc/Makefile b/builds/powerpc/swi/builds/Makefile similarity index 100% rename from builds/swi/powerpc/Makefile rename to builds/powerpc/swi/builds/Makefile diff --git a/builds/swi/.gitignore b/builds/swi/.gitignore deleted file mode 100644 index e231f9df..00000000 --- a/builds/swi/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.swi -*.swi.md5sum