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 --- ...re_build_hook-Introduce-USE_DOCKER-option.patch | 77 ---------------------- 1 file changed, 77 deletions(-) delete mode 100644 patches/fuel-plugin-ovs/0005-pre_build_hook-Introduce-USE_DOCKER-option.patch (limited to 'patches/fuel-plugin-ovs/0005-pre_build_hook-Introduce-USE_DOCKER-option.patch') diff --git a/patches/fuel-plugin-ovs/0005-pre_build_hook-Introduce-USE_DOCKER-option.patch b/patches/fuel-plugin-ovs/0005-pre_build_hook-Introduce-USE_DOCKER-option.patch deleted file mode 100644 index dbbfefcf..00000000 --- a/patches/fuel-plugin-ovs/0005-pre_build_hook-Introduce-USE_DOCKER-option.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Alexandru Avadanii -Date: Sun, 26 Jun 2016 20:00:22 +0200 -Subject: [PATCH] pre_build_hook: Introduce USE_DOCKER option - -The build system uses Ubuntu Trusty, which is not properly supported -by Docker on AArch64 architecture. -Introduce a new environment variable for enabling/disabling build -containerization, and disable by default said variable for AArch64. - -This requires a slight rework of the pre_build_hook script. - -NOTE: Setting USE_DOCKER to false will build the packages on the host -machine directly. - -AArch64 WARNING: This build will install packages automatically! - -Change-Id: Ib1294949ecc1767f12631a82e2c7099c45fcb615 -Signed-off-by: Alexandru Avadanii ---- - pre_build_hook | 33 +++++++++++++++++++++++---------- - 1 file changed, 23 insertions(+), 10 deletions(-) - -diff --git a/pre_build_hook b/pre_build_hook -index 63cf7b4..b9ae6bb 100755 ---- a/pre_build_hook -+++ b/pre_build_hook -@@ -3,27 +3,40 @@ - set -eux - - BUILD_FOR=${BUILD_FOR:-ubuntu} -+USE_DOCKER=${USE_DOCKER:-true} - DIR="$(dirname `readlink -f $0`)" - -+if [ `uname -m` = 'aarch64' ]; then -+ USE_DOCKER=false -+fi -+ - function build_pkg { - case $1 in - ubuntu) -- rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu -+ DEB_DIR=${DIR}/deb-ovs-dpdk -+ DEB_DIR_NSH=${DIR}/deb-ovs-nsh-dpdk -+ -+ rm -rf ${DIR}/repositories/ubuntu ${DEB_DIR} ${DEB_DIR_NSH} -+ mkdir -p ${DIR}/repositories/ubuntu ${DEB_DIR} ${DEB_DIR_NSH} -+ sudo chmod -R 777 ${DEB_DIR} ${DEB_DIR_NSH} - - cd ${DIR}/ovs_build -- sudo docker build -t ovs_build . -+ if [ "${USE_DOCKER}" = true ]; then -+ sudo docker build -t ovs_build . -+ sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh -+ sudo docker run -v ${DEB_DIR_NSH}:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh -+ else -+ rm -rf /tmp/ovs-build-{,nsh-}dpdk; mkdir -p /tmp/ovs-build-{,nsh-}dpdk -+ BUILD_HOME=/tmp/ovs-build-dpdk BUILD_DEB=${DEB_DIR} ./build-ovs-dpdk.sh -+ BUILD_HOME=/tmp/ovs-build-nsh-dpdk BUILD_DEST=${DEB_DIR_NSH} ./build-ovs-nsh-dpdk.sh -+ rm -rf /tmp/ovs-build-{,nsh-}dpdk -+ fi - -- DEB_DIR=${DIR}/deb-ovs-dpdk -- rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; -- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh - cd ${DEB_DIR}; tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .; - cd ..; rm -rf ${DEB_DIR} - -- DEB_DIR=${DIR}/deb-ovs-nsh-dpdk -- rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; -- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh -- cd ${DEB_DIR}; tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .; -- cd ..; rm -rf ${DEB_DIR} -+ cd ${DEB_DIR_NSH}; tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .; -+ cd ..; rm -rf ${DEB_DIR_NSH} - - ;; - *) echo "Not supported system"; exit 1;; -- cgit 1.2.3-korg