diff options
| author | Adrian Mangeac <Adrian.Mangeac@enea.com> | 2019-09-13 10:55:51 +0200 |
|---|---|---|
| committer | Adrian Mangeac <Adrian.Mangeac@enea.com> | 2019-09-13 10:59:57 +0200 |
| commit | ba8f074a58b648f68c122f579afe08768d16f1c4 (patch) | |
| tree | 076d5a2ca72b0858fd478fba56aaae1fddc4bbe8 | |
| parent | b13fa0a411ce25d554ccc1852f9e67394b993114 (diff) | |
| download | el_manifests-standard-ba8f074a58b648f68c122f579afe08768d16f1c4.tar.gz | |
Code freeze the default manifests
Change-Id: I901715c55d33974480387e41b26272ba3dd0802e
Signed-off-by: Adrian Mangeac <Adrian.Mangeac@enea.com>
| -rw-r--r-- | common/common_manifest.xml | 8 | ||||
| -rw-r--r-- | intel-corei7-64/default.xml | 16 | ||||
| -rw-r--r-- | intel-corei7-64/manifest_template.xml | 3 | ||||
| -rw-r--r-- | qemuarm64/.README (renamed from qemuarm/.README) | 0 | ||||
| -rw-r--r-- | qemuarm64/README (renamed from qemuarm/README) | 0 | ||||
| -rw-r--r-- | qemuarm64/default.xml (renamed from qemuarm/default.xml) | 14 | ||||
| -rw-r--r-- | qemuarm64/eltf.conf (renamed from qemuarm/eltf.conf) | 0 | ||||
| -rw-r--r-- | qemuarm64/manifest_template.xml (renamed from qemuarm/manifest_template.xml) | 0 | ||||
| -rw-r--r-- | qemuppc/default.xml | 12 | ||||
| -rw-r--r-- | qemux86-64/.README (renamed from qemux86/.README) | 0 | ||||
| -rw-r--r-- | qemux86-64/README (renamed from qemux86/README) | 0 | ||||
| -rw-r--r-- | qemux86-64/default.xml | 17 | ||||
| -rw-r--r-- | qemux86-64/eltf.conf (renamed from qemux86/eltf.conf) | 0 | ||||
| -rw-r--r-- | qemux86-64/manifest_template.xml (renamed from qemux86/manifest_template.xml) | 2 | ||||
| -rw-r--r-- | qemux86/default.xml | 15 | ||||
| -rw-r--r-- | raspberrypi3-64/default.xml | 16 |
16 files changed, 54 insertions, 49 deletions
diff --git a/common/common_manifest.xml b/common/common_manifest.xml index b3caab3..d8276df 100644 --- a/common/common_manifest.xml +++ b/common/common_manifest.xml | |||
| @@ -5,13 +5,15 @@ | |||
| 5 | <remote name="git-enea" fetch="ssh://git@git.enea.com/"/> | 5 | <remote name="git-enea" fetch="ssh://git@git.enea.com/"/> |
| 6 | <remote name="gerrit-enea" fetch="ssh://gerrit.enea.se:29418/"/> | 6 | <remote name="gerrit-enea" fetch="ssh://gerrit.enea.se:29418/"/> |
| 7 | 7 | ||
| 8 | <default revision="warrior" remote="gerrit-enea"/> | 8 | <default remote="git-enea" upstream="warrior"/> |
| 9 | 9 | ||
| 10 | <project name="linux/meta-el-common" path="poky/meta-el-common"/> | 10 | <project name="linux/meta-el-common" path="poky/meta-el-common"/> |
| 11 | <project name="linux/meta-el-standard" path="poky/meta-el-standard"/> | 11 | <project name="linux/meta-el-standard" path="poky/meta-el-standard"/> |
| 12 | 12 | ||
| 13 | <!-- git.enea.com repos --> | 13 | <!-- git.enea.com repos --> |
| 14 | <project name="linux/poky" path="poky" upstream="warrior" remote="git-enea"/> | 14 | <project name="linux/poky" path="poky" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b"/> |
| 15 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" upstream="warrior" remote="git-enea"/> | 15 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="be79b8b111a968efdbe5e1482d0c246d0b24763e"/> |
| 16 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | ||
| 17 | <project name="linux/meta-el-common" path="poky/meta-el-common"/> | ||
| 16 | 18 | ||
| 17 | </manifest> | 19 | </manifest> |
diff --git a/intel-corei7-64/default.xml b/intel-corei7-64/default.xml index ce7eaa5..11edcc6 100644 --- a/intel-corei7-64/default.xml +++ b/intel-corei7-64/default.xml | |||
| @@ -3,13 +3,13 @@ | |||
| 3 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | 3 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> |
| 4 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | 4 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> |
| 5 | 5 | ||
| 6 | <default remote="gerrit-enea" revision="warrior"/> | 6 | <default remote="git-enea" upstream="warrior"/> |
| 7 | 7 | ||
| 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" upstream="warrior"/> | 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" revision="3a54ed3bfbcaa4373e3aa32ce2fc57494e198320"/> |
| 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" upstream="warrior"/> | 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" revision="5aaa1af25c828f2c55ea67e29e4eab5fbae3b2c6"/> |
| 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" upstream="warrior"/> | 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" revision="5e6f03365ba5c9c46efc9fe529c636daf3b5ace3"/> |
| 11 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86" upstream="warrior"/> | 11 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86" revision="b06d3b4c0bd8ef788db48f840d83035bbee12115"/> |
| 12 | <project name="linux/meta-intel" path="poky/meta-intel" remote="git-enea" upstream="warrior"/> | 12 | <project name="linux/meta-intel" path="poky/meta-intel" revision="f17dfeee1da8749fc4eec6892bc7578864c3664f"/> |
| 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" upstream="warrior"/> | 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0"/> |
| 14 | <project name="linux/poky" path="poky" remote="git-enea" upstream="warrior"/> | 14 | <project name="linux/poky" path="poky" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b"/> |
| 15 | </manifest> | 15 | </manifest> |
diff --git a/intel-corei7-64/manifest_template.xml b/intel-corei7-64/manifest_template.xml index edbe6f2..062ac6f 100644 --- a/intel-corei7-64/manifest_template.xml +++ b/intel-corei7-64/manifest_template.xml | |||
| @@ -4,9 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | <include name="common/common_manifest.xml"/> | 5 | <include name="common/common_manifest.xml"/> |
| 6 | 6 | ||
| 7 | <project name="linux/meta-intel" path="poky/meta-intel" upstream="warrior" remote="git-enea"/> | 7 | <project name="linux/meta-intel" path="poky/meta-intel" revision="f17dfeee1da8749fc4eec6892bc7578864c3664f"/> |
| 8 | 8 | ||
| 9 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | ||
| 10 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> | 9 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> |
| 11 | 10 | ||
| 12 | </manifest> | 11 | </manifest> |
diff --git a/qemuarm/.README b/qemuarm64/.README index 063596f..063596f 100644 --- a/qemuarm/.README +++ b/qemuarm64/.README | |||
diff --git a/qemuarm/README b/qemuarm64/README index cdbfd1f..cdbfd1f 100644 --- a/qemuarm/README +++ b/qemuarm64/README | |||
diff --git a/qemuarm/default.xml b/qemuarm64/default.xml index 2ec223a..14e6d7f 100644 --- a/qemuarm/default.xml +++ b/qemuarm64/default.xml | |||
| @@ -3,13 +3,13 @@ | |||
| 3 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | 3 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> |
| 4 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | 4 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> |
| 5 | 5 | ||
| 6 | <default remote="gerrit-enea" revision="warrior"/> | 6 | <default remote="git-enea" upstream="warrior"/> |
| 7 | 7 | ||
| 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" upstream="warrior"/> | 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" revision="3a54ed3bfbcaa4373e3aa32ce2fc57494e198320"/> |
| 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" upstream="warrior"/> | 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" revision="5aaa1af25c828f2c55ea67e29e4eab5fbae3b2c6"/> |
| 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" upstream="warrior"> | 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" revision="5e6f03365ba5c9c46efc9fe529c636daf3b5ace3"> |
| 11 | <linkfile dest="README" src="../../.repo/manifests/qemuarm/README"/> | 11 | <linkfile dest="README" src="../../.repo/manifests/qemuarm/README"/> |
| 12 | </project> | 12 | </project> |
| 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" upstream="warrior"/> | 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0"/> |
| 14 | <project name="linux/poky" path="poky" remote="git-enea" upstream="warrior"/> | 14 | <project name="linux/poky" path="poky" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b"/> |
| 15 | </manifest> | 15 | </manifest> |
diff --git a/qemuarm/eltf.conf b/qemuarm64/eltf.conf index b2df89a..b2df89a 100644 --- a/qemuarm/eltf.conf +++ b/qemuarm64/eltf.conf | |||
diff --git a/qemuarm/manifest_template.xml b/qemuarm64/manifest_template.xml index 3ffaac2..3ffaac2 100644 --- a/qemuarm/manifest_template.xml +++ b/qemuarm64/manifest_template.xml | |||
diff --git a/qemuppc/default.xml b/qemuppc/default.xml index 39eafdd..d9cfe15 100644 --- a/qemuppc/default.xml +++ b/qemuppc/default.xml | |||
| @@ -3,13 +3,13 @@ | |||
| 3 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | 3 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> |
| 4 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | 4 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> |
| 5 | 5 | ||
| 6 | <default remote="gerrit-enea" revision="warrior"/> | 6 | <default remote="git-enea" revision="warrior"/> |
| 7 | 7 | ||
| 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" upstream="warrior"/> | 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" revision="3a54ed3bfbcaa4373e3aa32ce2fc57494e198320"/> |
| 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" upstream="warrior"/> | 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" revision="5aaa1af25c828f2c55ea67e29e4eab5fbae3b2c6"/> |
| 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" upstream="warrior"> | 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" revision="5e6f03365ba5c9c46efc9fe529c636daf3b5ace3"> |
| 11 | <linkfile dest="README" src="../../.repo/manifests/qemuppc/README"/> | 11 | <linkfile dest="README" src="../../.repo/manifests/qemuppc/README"/> |
| 12 | </project> | 12 | </project> |
| 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" upstream="warrior"/> | 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0"/> |
| 14 | <project name="linux/poky" path="poky" remote="git-enea" upstream="warrior"/> | 14 | <project name="linux/poky" path="poky" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b"/> |
| 15 | </manifest> | 15 | </manifest> |
diff --git a/qemux86/.README b/qemux86-64/.README index e754c36..e754c36 100644 --- a/qemux86/.README +++ b/qemux86-64/.README | |||
diff --git a/qemux86/README b/qemux86-64/README index d706682..d706682 100644 --- a/qemux86/README +++ b/qemux86-64/README | |||
diff --git a/qemux86-64/default.xml b/qemux86-64/default.xml new file mode 100644 index 0000000..b6f57aa --- /dev/null +++ b/qemux86-64/default.xml | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <manifest> | ||
| 3 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | ||
| 4 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | ||
| 5 | |||
| 6 | <default remote="git-enea" upstream="warrior"/> | ||
| 7 | |||
| 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" revision="3a54ed3bfbcaa4373e3aa32ce2fc57494e198320"/> | ||
| 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" revision="5aaa1af25c828f2c55ea67e29e4eab5fbae3b2c6"/> | ||
| 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" revision="5e6f03365ba5c9c46efc9fe529c636daf3b5ace3"> | ||
| 11 | <linkfile dest="README" src="../../.repo/manifests/qemux86/README"/> | ||
| 12 | </project> | ||
| 13 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86" revision="b06d3b4c0bd8ef788db48f840d83035bbee12115"/> | ||
| 14 | <project name="linux/meta-intel" path="poky/meta-intel" revision="f17dfeee1da8749fc4eec6892bc7578864c3664f"/> | ||
| 15 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0"/> | ||
| 16 | <project name="linux/poky" path="poky" remote="git-enea" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b"/> | ||
| 17 | </manifest> | ||
diff --git a/qemux86/eltf.conf b/qemux86-64/eltf.conf index 24e9278..24e9278 100644 --- a/qemux86/eltf.conf +++ b/qemux86-64/eltf.conf | |||
diff --git a/qemux86/manifest_template.xml b/qemux86-64/manifest_template.xml index fd5fe47..d9fbbfb 100644 --- a/qemux86/manifest_template.xml +++ b/qemux86-64/manifest_template.xml | |||
| @@ -7,5 +7,7 @@ | |||
| 7 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"> | 7 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"> |
| 8 | <linkfile src="../../.repo/manifests/qemux86/README" dest="README"/> | 8 | <linkfile src="../../.repo/manifests/qemux86/README" dest="README"/> |
| 9 | </project> | 9 | </project> |
| 10 | <project name="linux/meta-intel" path="poky/meta-intel" revision="f17dfeee1da8749fc4eec6892bc7578864c3664f"/> | ||
| 11 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> | ||
| 10 | 12 | ||
| 11 | </manifest> | 13 | </manifest> |
diff --git a/qemux86/default.xml b/qemux86/default.xml deleted file mode 100644 index 8278858..0000000 --- a/qemux86/default.xml +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <manifest> | ||
| 3 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | ||
| 4 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | ||
| 5 | |||
| 6 | <default remote="gerrit-enea" revision="warrior"/> | ||
| 7 | |||
| 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" upstream="warrior"/> | ||
| 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" upstream="warrior"/> | ||
| 10 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" upstream="warrior"> | ||
| 11 | <linkfile dest="README" src="../../.repo/manifests/qemux86/README"/> | ||
| 12 | </project> | ||
| 13 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" upstream="warrior"/> | ||
| 14 | <project name="linux/poky" path="poky" remote="git-enea" upstream="warrior"/> | ||
| 15 | </manifest> | ||
diff --git a/raspberrypi3-64/default.xml b/raspberrypi3-64/default.xml index 04cb686..33f7849 100644 --- a/raspberrypi3-64/default.xml +++ b/raspberrypi3-64/default.xml | |||
| @@ -3,15 +3,15 @@ | |||
| 3 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | 3 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> |
| 4 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | 4 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> |
| 5 | 5 | ||
| 6 | <default remote="gerrit-enea" revision="warrior"/> | 6 | <default remote="git-enea" upstream="warrior"/> |
| 7 | 7 | ||
| 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" upstream="warrior"/> | 8 | <project name="linux/meta-el-common" path="poky/meta-el-common" revision="3a54ed3bfbcaa4373e3aa32ce2fc57494e198320"/> |
| 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" upstream="warrior"/> | 9 | <project name="linux/meta-el-standard" path="poky/meta-el-standard" revision="5aaa1af25c828f2c55ea67e29e4eab5fbae3b2c6"/> |
| 10 | <project name="linux/meta-enea-bsp-arm" path="poky/meta-enea-bsp-arm" upstream="warrior"/> | 10 | <project name="linux/meta-enea-bsp-arm" path="poky/meta-enea-bsp-arm" revision="455934c15968eb8c937d2314f2d62c7db25350e9"/> |
| 11 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" upstream="warrior"> | 11 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common" revision="5e6f03365ba5c9c46efc9fe529c636daf3b5ace3"> |
| 12 | <linkfile dest="README" src="../../.repo/manifests/raspberrypi3-64/README"/> | 12 | <linkfile dest="README" src="../../.repo/manifests/raspberrypi3-64/README"/> |
| 13 | </project> | 13 | </project> |
| 14 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" upstream="warrior"/> | 14 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0"/> |
| 15 | <project name="linux/meta-raspberrypi" path="poky/meta-raspberrypi" remote="git-enea" upstream="warrior"/> | 15 | <project name="linux/meta-raspberrypi" path="poky/meta-raspberrypi" revision="bfa90d0cf6b219fd2d5e86d4dbf096fa6ff135f3"/> |
| 16 | <project name="linux/poky" path="poky" remote="git-enea" upstream="warrior"/> | 16 | <project name="linux/poky" path="poky" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b"/> |
| 17 | </manifest> | 17 | </manifest> |