From 4c248dd06c589a7e2e2dbdcdc97723fed73eee40 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 9 Jun 2014 15:58:38 -0700 Subject: [PATCH] feat(profiles): New generic/dev and generic/prod profiles. The dev images are going to become complete build environments. Keeping track of the differences between the two via profiles will be easier than making the current prod and dev image scripts even more complex. --- .../profiles/coreos/amd64/generic/dev/parent | 2 ++ .../profiles/coreos/amd64/generic/prod/parent | 2 ++ .../profiles/coreos/targets/generic/dev/README | 7 +++++++ .../profiles/coreos/targets/generic/prod/README | 7 +++++++ .../src/third_party/coreos-overlay/profiles/profiles.desc | 2 ++ 5 files changed, 20 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/dev/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/prod/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/README create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/README diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/dev/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/dev/parent new file mode 100644 index 0000000000..35ac69992e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/dev/parent @@ -0,0 +1,2 @@ +.. +:coreos/targets/generic/dev diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/prod/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/prod/parent new file mode 100644 index 0000000000..89b629a19e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/prod/parent @@ -0,0 +1,2 @@ +.. +:coreos/targets/generic/prod diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/README new file mode 100644 index 0000000000..40537d4fcd --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/README @@ -0,0 +1,7 @@ +Profile settings specific to "dev" images and containers. + +Settings here must *ONLY* influence installing binary packages and never +change build time settings like USE or CFLAGS because binary packages +are shared between dev and prod, dev just includes more stuff. + +For example, INSTALL_MASK and package.provided are ok. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/README new file mode 100644 index 0000000000..a7b67190ee --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/README @@ -0,0 +1,7 @@ +Profile settings specific to "prod" images. + +Settings here must *ONLY* influence installing binary packages and never +change build time settings like USE or CFLAGS because binary packages +are shared between dev and prod, dev just includes more stuff. + +For example, INSTALL_MASK and package.provided are ok. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc index 0eb87270f8..0385f806b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc @@ -1,4 +1,6 @@ amd64 coreos/amd64/generic dev +amd64 coreos/amd64/generic/dev dev +amd64 coreos/amd64/generic/prod dev amd64 coreos/amd64/sdk dev amd64 default/linux/amd64/10.0 dev amd64 default/linux/amd64/10.0/coreos dev