diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-01 13:18:11 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-09 16:33:43 +0200 |
commit | 42f8585ebb8fffad19a89314659ab9129176c3e9 (patch) | |
tree | e2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-plugin-ovs/0003-Cleanup-Drop-git-dependency.patch | |
parent | 6f3a054fc95622f0c002f72c0fac6074bb36c36f (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/0003-Cleanup-Drop-git-dependency.patch')
-rw-r--r-- | patches/fuel-plugin-ovs/0003-Cleanup-Drop-git-dependency.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/patches/fuel-plugin-ovs/0003-Cleanup-Drop-git-dependency.patch b/patches/fuel-plugin-ovs/0003-Cleanup-Drop-git-dependency.patch deleted file mode 100644 index 89cab56a..00000000 --- a/patches/fuel-plugin-ovs/0003-Cleanup-Drop-git-dependency.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sat, 3 Sep 2016 20:42:06 +0200 -Subject: [PATCH] Cleanup: Drop git dependency - -We only use git to fetch upstream contents, this can be achieved -with a simple wget. - -Change-Id: I07f681e44253cc1f390943eb121a694bf2c9d95f -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ovs_build/build-ovs-dpdk.sh | 10 +++++----- - ovs_build/build-ovs-nsh-dpdk.sh | 12 ++++++------ - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh -index aeb5eb7..9e92014 100755 ---- a/ovs_build/build-ovs-dpdk.sh -+++ b/ovs_build/build-ovs-dpdk.sh -@@ -3,14 +3,14 @@ - set -eux - - OVS_COMMIT=9f4ecd654dbcb88b15a424445184591fc887537e --URL_OVS=https://github.com/openvswitch/ovs.git -+URL_OVS_ARCHIVE=https://github.com/openvswitch/ovs/archive - BUILD_DEB=${BUILD_DEB:-/deb} - BUILD_SRC="$(dirname `readlink -f $0`)" - BUILD_DEST=${BUILD_DEST:-/tmp/ovs-dpdk} - - export DEB_BUILD_OPTIONS='parallel=8 nocheck' - --sudo apt-get -y install devscripts dpkg-dev git wget -+sudo apt-get -y install devscripts dpkg-dev wget - - rm -rf ${BUILD_DEST}; mkdir -p ${BUILD_DEST} - -@@ -62,9 +62,9 @@ sudo apt-get install -y autoconf \ - python-zopeinterface \ - python-six - --git clone https://github.com/openvswitch/ovs.git --cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git --cd ${BUILD_DEST}; cp -r ovs ovs-dpdk -+wget -c ${URL_OVS_ARCHIVE}/${OVS_COMMIT}.tar.gz -+tar xzf ${OVS_COMMIT}.tar.gz; mv ovs-${OVS_COMMIT} ovs -+cp -r ovs ovs-dpdk - - cd ovs-dpdk - cp -r ${BUILD_SRC}/openvswitch-dpdk_2.5.90/debian . -diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh -index 3d7edea..ec5eef4 100755 ---- a/ovs_build/build-ovs-nsh-dpdk.sh -+++ b/ovs_build/build-ovs-nsh-dpdk.sh -@@ -3,7 +3,7 @@ - set -eux - - OVS_COMMIT=7d433ae57ebb90cd68e8fa948a096f619ac4e2d8 --URL_OVS=https://github.com/openvswitch/ovs.git -+URL_OVS_ARCHIVE=https://github.com/openvswitch/ovs/archive - OVS_VER=${OVS_VER:-2.5.90} - BUILD_HOME=$HOME/nsh - BUILD_DEST=${BUILD_DEST:-/deb} -@@ -12,7 +12,7 @@ DIR="$(dirname `readlink -f $0`)" - export DEB_BUILD_OPTIONS='parallel=8 nocheck' - - sudo apt-get build-dep openvswitch -y --sudo apt-get -y install devscripts dpkg-dev git wget -+sudo apt-get -y install devscripts dpkg-dev wget - - rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME} - -@@ -35,7 +35,7 @@ sudo apt-get install -y debhelper \ - texlive-fonts-recommended \ - texlive-latex-extra - --cd dpdk-2.2.0; rm -rf debian/patches/; -+cd dpdk-2.2.0; rm -rf debian/patches/ - cat << EOF > debian/changelog - dpdk (2.2.0-1) unstable; urgency=low - * DPDK 2.2.0 -@@ -68,8 +68,8 @@ sudo apt-get install -y autoconf \ - python-zopeinterface \ - python-six - --git clone https://github.com/openvswitch/ovs.git --cd ovs; git checkout ${OVS_COMMIT} -+wget -c ${URL_OVS_ARCHIVE}/${OVS_COMMIT}.tar.gz -+tar xzf ${OVS_COMMIT}.tar.gz; mv ovs-${OVS_COMMIT} ovs - PATCHES=$(cd ${DIR}/patches; echo *patch) - for patch in ${PATCHES} - do -@@ -82,7 +82,7 @@ cd ../openvswitch-dpdk-${OVS_VER} - sed -i "s/include\/rte_config.h/include\/dpdk\/rte_config.h/" acinclude.m4 - sed -i 's/DPDK_INCLUDE=.*/DPDK_INCLUDE=$RTE_SDK\/include\/dpdk/' acinclude.m4 - autoreconf --install --rm -rf debian/patches/ .git; -+rm -rf debian/patches/ - cat << EOF > debian/changelog - openvswitch-dpdk (${OVS_VER}-1.nsh) unstable; urgency=low - * Support NSH |