diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-03 14:59:04 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-07-05 12:57:26 +0200 |
| commit | f90ee3550bf6e78e8afed67de9b682023eba6af4 (patch) | |
| tree | 89ed2256c81caabceacb38e984e92cdd403467d7 /Makefile | |
| parent | 85aac3b146542b61d1fd3121ddeb6e66b0a371ae (diff) | |
ODL: Rework opnfv-quagga building/packaging.
My initial goal was to split the ODL patch in two patches:
- leveldb + leveldbjni arm64 support;
- opnfv-quagga building/packing for multiple archs (UBUNTU_ARCH);
However, due to the design of opnfv-packaging repo, it is easier to:
- patch upstream sources to support native arm64 builds (see [1]);
- add prebuilt arm64 binaries to output dir in git repo (like amd64),
submitted as pull request upstream [2];
Until above OPNFV-QUAGGA changes land upstream or are refactored,
rely on forked repository that contains above patches [3] on
branch "stable/colorado".
opnfv-quagga patch adding UBUNTU_ARCH parsing is more or less there
to detect missing DEBs, rather than filter prebuilt DEBs, which for
now only cover "amd64 arm64".
[1] https://github.com/nikolas-hermanns/opnfv-quagga-packaging/pull/1
[2] https://github.com/nikolas-hermanns/opnfv-quagga-packaging/pull/2
[3] https://github.com/alexandruavadanii/opnfv-quagga-packaging
Change-Id: I022c1e82531d82422486f2041c70a3f50b6ca386
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -65,20 +65,21 @@ build: BUILD_FUEL_PLUGINS=f_odlpluginbuild \ UBUNTU_ARCH="amd64 arm64" \ FUELLIB_REPO=${root}/upstream/fuel-library \ + FUELLIB_COMMIT=HEAD \ NAILGUN_REPO=${root}/upstream/fuel-web \ + NAILGUN_COMMIT=HEAD \ FUEL_AGENT_REPO=${root}/upstream/fuel-agent \ + FUEL_AGENT_COMMIT=HEAD \ FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \ + FUEL_NAILGUN_AGENT_COMMIT=HEAD \ FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \ + FUEL_MIRROR_COMMIT=HEAD \ ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \ + ODL_BRANCH=armband-workbench \ ODL_CHANGE= \ + OPNFV_QUAGGE_PACKAGING_REPO="https://github.com/alexandruavadanii/opnfv-quagga-packaging" \ OVS_NSH_DPDK_REPO=${root}/upstream/fuel-plugin-ovs \ OVS_NSH_DPDK_BRANCH=HEAD \ - FUELLIB_COMMIT=HEAD \ - NAILGUN_COMMIT=HEAD \ - FUEL_AGENT_COMMIT=HEAD \ - FUEL_NAILGUN_AGENT_COMMIT=HEAD \ - FUEL_MIRROR_COMMIT=HEAD \ - ODL_BRANCH=armband-workbench \ VSPERF_REPO=${root}/upstream/vswitchperf \ VSPERF_BRANCH=armband-workbench \ VSPERF_CHANGE= \ @@ -87,7 +88,6 @@ build: YARDSTICK_CHANGE= \ EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10" \ MIRROR_MOS_UBUNTU=linux.enea.com \ - JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \ $(EXTRA_PARAMS) \ iso 2>&1 | tee ${root}/build.log |