diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-11-22 21:45:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-22 21:45:00 +0000 |
| commit | 756b88af7a194c5e8b78f2ecd97fc3fd596e4b99 (patch) | |
| tree | a28fec82e6464a064167a9bf9a60004e1dfa2a4f /patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch | |
| parent | 866c3830822449cd92554ce7a9e2918fad6281c0 (diff) | |
| parent | be47a44974d86554c08b3440fa6b9530b0e5bd46 (diff) | |
Merge changes from topic 'bugfix/ARMBAND-167-stable/colorado' into stable/colorado
* changes:
fuel-plugin-opendaylight: Prebuilt leveldbjni DEB
f_odlpluginbuild: Armband prereq in packages.yaml
Diffstat (limited to 'patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch')
| -rw-r--r-- | patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch b/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch new file mode 100644 index 00000000..8a42f66e --- /dev/null +++ b/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch @@ -0,0 +1,39 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Sat, 19 Nov 2016 20:39:35 +0100 +Subject: [PATCH] f_odlpluginbuild: Armband prereq in packages.yaml + +We need to explicitily add our Armband leveldb patching prereq to +the ODL plugin's packages.yaml, so they are included in the +offline Ubuntu/MOS mirrors. + +After ARMBAND-114 was implemented, the dependency list is only: +- armband-odl-leveldb-fix (for patching leveldbjni); +- libasound2 (openjdk-8-jre amos version additional dep); + +Note: armband-odl-leveldb-fix MUST be also added to MOS mirror +package list, since it's not present in Ubuntu repos. + +JIRA: ARMBAND-167 +JIRA: ARMBAND-114 + +FIXME: These are only required for arm64, so maybe later we could +filter out other archs by extending the packages.yaml with an <arch> +field. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/f_isoroot/f_odlpluginbuild/packages.yaml | 5 +++++ + 1 file changed, 5 insertions(+) + create mode 100644 build/f_isoroot/f_odlpluginbuild/packages.yaml + +diff --git a/build/f_isoroot/f_odlpluginbuild/packages.yaml b/build/f_isoroot/f_odlpluginbuild/packages.yaml +new file mode 100644 +index 0000000..b1bf086 +--- /dev/null ++++ b/build/f_isoroot/f_odlpluginbuild/packages.yaml +@@ -0,0 +1,5 @@ ++# Armband: openjdk-8-jre depends on libasound2 ++# Armband: leveldb patching requires armband-odl-leveldb-fix ++packages: ++ - armband-odl-leveldb-fix ++ - libasound2 |