aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-01 13:18:11 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-09 16:33:43 +0200
commit42f8585ebb8fffad19a89314659ab9129176c3e9 (patch)
treee2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch
parent6f3a054fc95622f0c002f72c0fac6074bb36c36f (diff)
build: Rework patch mechanism for Fuel submodules
While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch')
-rw-r--r--patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch b/patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch
deleted file mode 100644
index 818203f3..00000000
--- a/patches/fuel-plugin-ovs/0010-HACK-build-prebuilt-DEBs-src-bin-ver-mismatch.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 15 Sep 2016 19:41:58 +0200
-Subject: [PATCH] HACK: build: prebuilt DEBs: src/bin ver mismatch
-
-Our debian source version is not always in sync with the debian
-binaries versions, see related bug for a complete description of
-this issue.
-
-This is a temporary chance which should be dropped once the package
-versions are aligned.
-
-Related-bug: ARMBAND-89
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- ovs_build/build-ovs-armband-fetch.sh | 16 ++++++++++++----
- ovs_build/build-ovs-nsh-dpdk.sh | 2 +-
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/ovs_build/build-ovs-armband-fetch.sh b/ovs_build/build-ovs-armband-fetch.sh
-index a810b93..8ab22cc 100755
---- a/ovs_build/build-ovs-armband-fetch.sh
-+++ b/ovs_build/build-ovs-armband-fetch.sh
-@@ -17,7 +17,7 @@ set -eux
- # dists/mos9.0-fuel-plugin-ovs/main/binary-arm64/Packages
- function armband_fetch() {
- local name=$1
-- local ver=${2//\+/\\\+}
-+ local src_ver=${2//\+/\\\+}
- local repo_base_url=${3:-http://linux.enea.com/mos-repos/ubuntu/9.0}
- local repo_Sources_url=${4:-dists/mos9.0-fuel-plugin-ovs/main/source/Sources}
- local repo_Packages_url=${5:-dists/mos9.0-fuel-plugin-ovs/main/binary-arm64/Packages}
-@@ -30,16 +30,24 @@ function armband_fetch() {
- wget -c "${repo_base_url}/${repo_Packages_url}"
- fi
-
-- L=$(grep -Pzo "(?s)(?<=^Package: ${name}\n^Binary: )(\N*?)(?=\n^Version: ${ver})" \
-+ L=$(grep -Pzo "(?s)(?<=^Package: ${name}\n^Binary: )(\N*?)(?=\n^Version: ${src_ver})" \
- Sources | tr -d ',')
- for deb_binary in ${L}; do
-- D=$(grep -Po "(?<=^Filename: )(.*?\/${deb_binary}_${ver}_.*?\.deb)" Packages) || true
-+ # FIXME(armband): https://jira.opnfv.org/browse/ARMBAND-89
-+ # Until we align source and binaries versions for nsh, convert on the fly
-+ # e.g.: debian source 2.5.90~04.05-1.nsh+amos2 => debian binary 2.5.90-1.nsh
-+ deb_ver=${src_ver}
-+ if [[ ${deb_ver} == *~*-* ]]; then
-+ deb_ver=${deb_ver//~*-/-}
-+ deb_ver=${deb_ver%\\\+*}
-+ fi
-+ D=$(grep -Po "(?<=^Filename: )(.*?\/${deb_binary}_${deb_ver}_.*?\.deb)" Packages) || true
- if [ -n "${D}" ]; then
- wget -c "${repo_base_url}/${D}" && found=true
- fi
- done
- if [ ${found} = false ]; then
-- echo "ERROR: Could not find DEBs for pkg/ver: ${name}/${ver}"
-+ echo "ERROR: Could not find DEBs for pkg|src_ver|deb_ver: ${name}|${src_ver}|${deb_ver}"
- exit 1
- fi
- }
-diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
-index 9d8a837..aebcb94 100755
---- a/ovs_build/build-ovs-nsh-dpdk.sh
-+++ b/ovs_build/build-ovs-nsh-dpdk.sh
-@@ -12,7 +12,7 @@ DIR="$(dirname `readlink -f $0`)"
- export DEB_BUILD_OPTIONS='parallel=8 nocheck'
-
- # AArch64 specifics, repository base URL, debian build versions
--AARCH64_OVS_NSH_DEBV=${AARCH64_OVS_NSH_DEBV:-'2.5.90-1.nsh'}
-+AARCH64_OVS_NSH_DEBV=${AARCH64_OVS_NSH_DEBV:-'2.5.90~04.05-1.nsh+amos2'}
-
- # Keep track of native arch (BUILD_ARCH) and target arch(s) (UBUNTU_ARCH)
- # All archs should be represented in `dpkg --print-architecture` format