summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-11-20 21:48:32 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-11-20 22:45:23 +0100
commit5a374b37c9104976a4ebf56c190cf637566ecd6a (patch)
treeb75548beed41b4e0e5b16943e54c61e739d1b72f /patches/opnfv-fuel/0000-f_odlpluginbuild-Armband-prereq-in-packages.yaml.patch
parent5cddda3c710f72cc4d19d22a53ab999a758ab715 (diff)
fuel-plugin-opendaylight: Prebuilt leveldbjni DEB
Switch from deploy time building of leveldb + leveldbjni to using a prebuilt artifact, shipped as a DEB package from Armband repos. JIRA: ARMBAND-114 Change-Id: Ic7a52c78e803c1a6ebda1f127774959a0880a5a3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch31
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