From 42f8585ebb8fffad19a89314659ab9129176c3e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Oct 2016 13:18:11 +0200 Subject: 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 --- ...01-ci-build-vsperf-make-qemu-system-name-arch-indep.patch | 6 +++--- .../0002-s-u-build_base_machine-Arch-indep-libdir-s.patch | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'patches/vswitchperf') diff --git a/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch b/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch index 29e8a1d3..0fd972cc 100644 --- a/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch +++ b/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch @@ -10,7 +10,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh -index 5370898..fc38747 100755 +index a02de00..fa0d46a 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -87,14 +87,15 @@ TEST_REPORT_LOG_DIR="${HOME}/opnfv/$PROJECT/results/$BRANCH" @@ -22,7 +22,7 @@ index 5370898..fc38747 100755 sudo pkill python3 &> /dev/null - sudo killall -9 qemu-system-x86_64 &> /dev/null + sudo killall -9 "${qemu_system_name}" &> /dev/null - + # sometimes qemu resists to terminate, so wait a bit and kill it again - if pgrep qemu-system-x86_64 &> /dev/null ; then + if pgrep "${qemu_system_name}" &> /dev/null ; then @@ -31,4 +31,4 @@ index 5370898..fc38747 100755 + sudo killall -9 "${qemu_system_name}" &> /dev/null sleep 5 fi - + diff --git a/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch b/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch index 0a92144f..f82aaae7 100644 --- a/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch +++ b/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch @@ -10,21 +10,21 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/systems/ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh -index a2b48a2..7cbe78e 100755 +index 1b42a79..b0f3740 100755 --- a/systems/ubuntu/build_base_machine.sh +++ b/systems/ubuntu/build_base_machine.sh -@@ -52,11 +52,12 @@ apt-get -y install libfuse-dev +@@ -54,11 +54,12 @@ apt-get -y install libnuma-dev # packages related to VM - + # a few manual fix up on a ubuntu -cd /lib/x86_64-linux-gnu +local arch=$(uname -m) +cd /lib/${arch}-linux-gnu ln -sf libssl.so.1.0.0 libssl.so ln -sf libcrypto.so.1.0.0 libcrypto.so - + -cd /usr/lib/x86_64-linux-gnu +cd /usr/lib/${arch}-linux-gnu ln -sf libxml2.so.2 libxml2.so - - + + -- cgit 1.2.3-korg