diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-11-21 22:42:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-21 22:42:05 +0000 |
| commit | 572381de2421d62b14028cf5d4efa721ee434832 (patch) | |
| tree | 6e8985cdb2fd70d3c1f09b49427e9d138ef4ead5 /patches/opnfv-fuel | |
| parent | bcabec81668ba401743ab317171e10f5c06d93e8 (diff) | |
| parent | 5a374b37c9104976a4ebf56c190cf637566ecd6a (diff) | |
Merge "fuel-plugin-opendaylight: Prebuilt leveldbjni DEB"
Diffstat (limited to 'patches/opnfv-fuel')
| -rw-r--r-- | patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch | 31 |
1 files changed, 15 insertions, 16 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 index 3f98e1cd..8a42f66e 100644 --- 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 @@ -2,14 +2,19 @@ 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 -tools, like maven, git, make etc. to the ODL plugin's packages.yaml, -so they are included in the offline Ubuntu mirror. +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. -While at it, also add openjdk-8-jre amos version additional dep: -- libasound2 +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> @@ -17,8 +22,8 @@ field. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - build/f_isoroot/f_odlpluginbuild/packages.yaml | 11 +++++++++++ - 1 file changed, 11 insertions(+) + 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 @@ -26,15 +31,9 @@ new file mode 100644 index 0000000..b1bf086 --- /dev/null +++ b/build/f_isoroot/f_odlpluginbuild/packages.yaml -@@ -0,0 +1,11 @@ +@@ -0,0 +1,5 @@ +# Armband: openjdk-8-jre depends on libasound2 -+# Armband: leveldb patching requires the other ++# Armband: leveldb patching requires armband-odl-leveldb-fix +packages: -+ - git -+ - build-essential -+ - automake -+ - make -+ - libsnappy-dev -+ - patch -+ - maven ++ - armband-odl-leveldb-fix + - libasound2 |