diff options
| author | Sona Sarmadi <sona.sarmadi@enea.com> | 2018-07-13 15:21:00 +0200 |
|---|---|---|
| committer | Adrian Dudau <adrian.dudau@enea.com> | 2018-07-23 10:23:30 +0200 |
| commit | a2869908b91fc0440b7073bfb583993a5826ef3f (patch) | |
| tree | b99353e83a3c24cb065caf57856f651fc8198f12 | |
| parent | 9a868e02cda6ea6a73e9c820fc00b20a568d2a54 (diff) | |
| download | el_manifests-nfv-access-a2869908b91fc0440b7073bfb583993a5826ef3f.tar.gz | |
Freeze rocko branch on upstream layers
Also bring back common_manifest.xml to store layers common to all
targets.
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
| -rw-r--r-- | atom-c3000/manifest_template.xml | 8 | ||||
| -rw-r--r-- | common/common_manifest.xml | 21 | ||||
| -rw-r--r-- | qemux86-64/manifest_template.xml | 8 | ||||
| -rw-r--r-- | xeon-d/manifest_template.xml | 8 |
4 files changed, 27 insertions, 18 deletions
diff --git a/atom-c3000/manifest_template.xml b/atom-c3000/manifest_template.xml index 337bfad..3c59993 100644 --- a/atom-c3000/manifest_template.xml +++ b/atom-c3000/manifest_template.xml | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | <manifest> | 1 | <manifest> |
| 2 | <!--Manifest template for atom-c3000, virtualization profile --> | 2 | <!--Manifest template for atom-c3000, virtualization profile --> |
| 3 | 3 | ||
| 4 | <include name="common/common_manifest.xml"/> | ||
| 5 | |||
| 4 | <remote name="git-enea" fetch="ssh://git@git.enea.com"/> | 6 | <remote name="git-enea" fetch="ssh://git@git.enea.com"/> |
| 5 | 7 | ||
| 6 | <default revision="rocko" remote="git-enea"/> | 8 | <default revision="rocko" remote="git-enea"/> |
| @@ -14,11 +16,5 @@ | |||
| 14 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | 16 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> |
| 15 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> | 17 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> |
| 16 | <project name="linux/meta-enea-virtualization" path="poky/meta-enea-virtualization"/> | 18 | <project name="linux/meta-enea-virtualization" path="poky/meta-enea-virtualization"/> |
| 17 | <project name="linux/meta-intel" path="poky/meta-intel"/> | ||
| 18 | <project name="linux/meta-dpdk" path="poky/meta-dpdk" revision="master"/> | ||
| 19 | <project name="linux/meta-openembedded" path="poky/meta-openembedded"/> | ||
| 20 | <project name="linux/meta-virtualization" path="poky/meta-virtualization"/> | ||
| 21 | <project name="linux/meta-cloud-services" path="poky/meta-cloud-services"/> | ||
| 22 | <project name="linux/meta-java" path="poky/meta-java"/> | ||
| 23 | 19 | ||
| 24 | </manifest> | 20 | </manifest> |
diff --git a/common/common_manifest.xml b/common/common_manifest.xml new file mode 100644 index 0000000..fe09829 --- /dev/null +++ b/common/common_manifest.xml | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <manifest> | ||
| 3 | <!--Common parts of the manifest template for virtualization profile --> | ||
| 4 | |||
| 5 | <remote name="git-enea" fetch="ssh://git@git.enea.com/"/> | ||
| 6 | |||
| 7 | <default revision="rocko" remote="git-enea"/> | ||
| 8 | |||
| 9 | <project name="linux/poky" path="poky" revision="7e7ee662f5dea4d090293045f7498093322802cc" upstream="rocko"/> | ||
| 10 | <linkfile src="../.repo/manifests/README" dest="README"/> | ||
| 11 | </project> | ||
| 12 | |||
| 13 | <project name="linux/meta-intel" path="poky/meta-intel" revision="f66ce51d059d291a441d896854be8db70de5a554" upstream="rocko"/> | ||
| 14 | <project name="linux/meta-dpdk" path="poky/meta-dpdk" revision="9d2d7a606278131479cc5b6c8cad65ddea3ff9f6" upstream="rocko"/> | ||
| 15 | <project name="linux/meta-dpdk" path="poky/meta-dpdk" revision="9d2d7a606278131479cc5b6c8cad65ddea3ff9f6" upstream="master"/> | ||
| 16 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="dacfa2b1920e285531bec55cd2f08743390aaf57" upstream="rocko"/> | ||
| 17 | <project name="linux/meta-virtualization" path="poky/meta-virtualization" revision="bd77388f31929f38e7d4cc9c711f0f83f563007e" upstream="rocko"/> | ||
| 18 | <project name="linux/meta-cloud-services" path="poky/meta-cloud-services" revision="62f3fed67f8cf07de5e342f57e4faf911f001c12" upstream="rocko"/> | ||
| 19 | <project name="linux/meta-java" path="poky/meta-java" revision="fbe0b0eb30d93f5fa2101fb015f20c1dc118b4a6" upstream="rocko"/> | ||
| 20 | |||
| 21 | </manifest> | ||
diff --git a/qemux86-64/manifest_template.xml b/qemux86-64/manifest_template.xml index 6f9f7f8..3c8128a 100644 --- a/qemux86-64/manifest_template.xml +++ b/qemux86-64/manifest_template.xml | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | <manifest> | 1 | <manifest> |
| 2 | <!--Manifest template for inteld1521, virtualization profile --> | 2 | <!--Manifest template for inteld1521, virtualization profile --> |
| 3 | 3 | ||
| 4 | <include name="common/common_manifest.xml"/> | ||
| 5 | |||
| 4 | <remote name="git-enea" fetch="ssh://git@git.enea.com"/> | 6 | <remote name="git-enea" fetch="ssh://git@git.enea.com"/> |
| 5 | 7 | ||
| 6 | <default revision="rocko" remote="git-enea"/> | 8 | <default revision="rocko" remote="git-enea"/> |
| @@ -14,11 +16,5 @@ | |||
| 14 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | 16 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> |
| 15 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> | 17 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> |
| 16 | <project name="linux/meta-enea-virtualization" path="poky/meta-enea-virtualization"/> | 18 | <project name="linux/meta-enea-virtualization" path="poky/meta-enea-virtualization"/> |
| 17 | <project name="linux/meta-intel" path="poky/meta-intel"/> | ||
| 18 | <project name="linux/meta-dpdk" path="poky/meta-dpdk" revision="master"/> | ||
| 19 | <project name="linux/meta-openembedded" path="poky/meta-openembedded"/> | ||
| 20 | <project name="linux/meta-virtualization" path="poky/meta-virtualization"/> | ||
| 21 | <project name="linux/meta-cloud-services" path="poky/meta-cloud-services"/> | ||
| 22 | <project name="linux/meta-java" path="poky/meta-java"/> | ||
| 23 | 19 | ||
| 24 | </manifest> | 20 | </manifest> |
diff --git a/xeon-d/manifest_template.xml b/xeon-d/manifest_template.xml index 2815bea..3fc3b38 100644 --- a/xeon-d/manifest_template.xml +++ b/xeon-d/manifest_template.xml | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | <manifest> | 1 | <manifest> |
| 2 | <!--Manifest template for xeon-d, virtualization profile --> | 2 | <!--Manifest template for xeon-d, virtualization profile --> |
| 3 | 3 | ||
| 4 | <include name="common/common_manifest.xml"/> | ||
| 5 | |||
| 4 | <remote name="git-enea" fetch="ssh://git@git.enea.com"/> | 6 | <remote name="git-enea" fetch="ssh://git@git.enea.com"/> |
| 5 | 7 | ||
| 6 | <default revision="rocko" remote="git-enea"/> | 8 | <default revision="rocko" remote="git-enea"/> |
| @@ -14,11 +16,5 @@ | |||
| 14 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | 16 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> |
| 15 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> | 17 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> |
| 16 | <project name="linux/meta-enea-virtualization" path="poky/meta-enea-virtualization"/> | 18 | <project name="linux/meta-enea-virtualization" path="poky/meta-enea-virtualization"/> |
| 17 | <project name="linux/meta-intel" path="poky/meta-intel"/> | ||
| 18 | <project name="linux/meta-dpdk" path="poky/meta-dpdk" revision="master"/> | ||
| 19 | <project name="linux/meta-openembedded" path="poky/meta-openembedded"/> | ||
| 20 | <project name="linux/meta-virtualization" path="poky/meta-virtualization"/> | ||
| 21 | <project name="linux/meta-cloud-services" path="poky/meta-cloud-services"/> | ||
| 22 | <project name="linux/meta-java" path="poky/meta-java"/> | ||
| 23 | 19 | ||
| 24 | </manifest> | 20 | </manifest> |