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/0004-build-apt-force-yes.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/0004-build-apt-force-yes.patch')
-rw-r--r-- | patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch b/patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch deleted file mode 100644 index 5b5712d0..00000000 --- a/patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch +++ /dev/null @@ -1,87 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sat, 3 Sep 2016 20:52:05 +0200 -Subject: [PATCH] build: apt: --force-yes. - -For arm64 builds, some packages are fetched from linux.enea.com, -leading to package version being reported as "older", although in -fact it is newer (dpkg version comparison is not that great with -suffixes). Also, since we don't explicitly add the GPG key of -the linux.enea.com repo yet, apt is complaining about unverified -package sources. - -Bypass the above by using "--force-yes", next to "-y". - -Change-Id: I4899fe62aaad9a13f8b2f9ffbdf2f3631ecba164 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ovs_build/build-ovs-dpdk.sh | 8 ++++---- - ovs_build/build-ovs-nsh-dpdk.sh | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh -index 9e92014..75904f2 100755 ---- a/ovs_build/build-ovs-dpdk.sh -+++ b/ovs_build/build-ovs-dpdk.sh -@@ -10,7 +10,7 @@ BUILD_DEST=${BUILD_DEST:-/tmp/ovs-dpdk} - - export DEB_BUILD_OPTIONS='parallel=8 nocheck' - --sudo apt-get -y install devscripts dpkg-dev wget -+sudo apt-get -y --force-yes install devscripts dpkg-dev wget - - rm -rf ${BUILD_DEST}; mkdir -p ${BUILD_DEST} - -@@ -21,7 +21,7 @@ cd dpdk-16.07 - cp -r ${BUILD_SRC}/dpdk_16.07/debian . - - # copy from debian/control --sudo apt-get install -y debhelper \ -+sudo apt-get install -y --force-yes debhelper \ - dh-python \ - dh-systemd \ - doxygen \ -@@ -41,9 +41,9 @@ cd ${BUILD_DEST} - sudo dpkg -i *.deb - apt-get download libxenstore3.0 - --sudo apt-get build-dep openvswitch -y -+sudo apt-get build-dep openvswitch -y --force-yes - # copy from debian/control --sudo apt-get install -y autoconf \ -+sudo apt-get install -y --force-yes autoconf \ - automake \ - bzip2 \ - debhelper \ -diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh -index ec5eef4..3b84f4c 100755 ---- a/ovs_build/build-ovs-nsh-dpdk.sh -+++ b/ovs_build/build-ovs-nsh-dpdk.sh -@@ -11,8 +11,8 @@ 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 wget -+sudo apt-get build-dep openvswitch -y --force-yes -+sudo apt-get -y --force-yes install devscripts dpkg-dev wget - - rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME} - -@@ -20,7 +20,7 @@ cd ${BUILD_HOME} - dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/dpdk_2.2.0-0ubuntu8.dsc - - # copy from debian/control --sudo apt-get install -y debhelper \ -+sudo apt-get install -y --force-yes debhelper \ - dh-python \ - dh-systemd \ - doxygen \ -@@ -49,7 +49,7 @@ cd ${BUILD_HOME} - dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/openvswitch-dpdk_2.4.0-0ubuntu1.dsc - - # copy from debian/control --sudo apt-get install -y autoconf \ -+sudo apt-get install -y --force-yes autoconf \ - automake \ - bzip2 \ - debhelper \ |