summaryrefslogtreecommitdiffstats
path: root/patches/fuel-plugin-ovs/0006-AArch64-Add-native-build-support.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/0006-AArch64-Add-native-build-support.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/0006-AArch64-Add-native-build-support.patch')
-rw-r--r--patches/fuel-plugin-ovs/0006-AArch64-Add-native-build-support.patch150
1 files changed, 150 insertions, 0 deletions
diff --git a/patches/fuel-plugin-ovs/0006-AArch64-Add-native-build-support.patch b/patches/fuel-plugin-ovs/0006-AArch64-Add-native-build-support.patch
new file mode 100644
index 00000000..b4ca8841
--- /dev/null
+++ b/patches/fuel-plugin-ovs/0006-AArch64-Add-native-build-support.patch
@@ -0,0 +1,150 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Mon, 5 Sep 2016 18:56:46 +0200
+Subject: [PATCH] AArch64: Add native build support
+
+FIXME: OVS-NSH-DPDK is not yet supported on arm64, see [1].
+
+[1] https://jira.opnfv.org/browse/ARMBAND-86
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ ovs_build/build-ovs-dpdk.sh | 19 ++++++++--
+ ovs_build/build-ovs-nsh-dpdk.sh | 48 ++++++++++++++----------
+ ovs_build/openvswitch-dpdk_2.5.90/debian/control | 2 +-
+ 3 files changed, 45 insertions(+), 24 deletions(-)
+
+diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
+index a14f5fd..a0c50e3 100755
+--- a/ovs_build/build-ovs-dpdk.sh
++++ b/ovs_build/build-ovs-dpdk.sh
+@@ -10,6 +10,10 @@ BUILD_DEST=${BUILD_DEST:-/tmp/ovs-dpdk}
+
+ export DEB_BUILD_OPTIONS='parallel=8 nocheck'
+
++# AArch64 specifics, repository base URL, debian build versions
++AARCH64_REPO=${AARCH64_REPO:-'https://linux.enea.com/mos-repos/ubuntu/9.0'}
++AARCH64_DPDK_DEBV=${AARCH64_DPDK_DEBV:-'0~u14.04+mos1+mos9.0+amos1'}
++
+ # Keep track of native arch (BUILD_ARCH) and target arch(s) (UBUNTU_ARCH)
+ # All archs should be represented in `dpkg --print-architecture` format
+ # UBUNTU_ARCH holds a space-separated list of target arch(s)
+@@ -24,10 +28,17 @@ for ARCH in ${UBUNTU_ARCH}; do
+ # Native building for: DPDK, OVS-DPDK, OVS
+ sudo apt-get -y --force-yes install devscripts dpkg-dev wget
+
+- wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
+- xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
+- cd dpdk-16.07
+- cp -r ${BUILD_SRC}/dpdk_16.07/debian .
++ if [ ${ARCH} = 'arm64' ]; then
++ # Armband: arm64 already has debian control archive for DPDK 16.07
++ dget -x -u ${AARCH64_REPO}/pool/main/d/dpdk/dpdk_16.07-${AARCH64_DPDK_DEBV}.dsc
++ cd dpdk-16.07
++ else
++ # Other archs will use the debian control archive in this repo
++ wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
++ xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
++ cd dpdk-16.07
++ cp -r ${BUILD_SRC}/dpdk_16.07/debian .
++ fi
+
+ # DPDK build-dep install: copy from debian/control
+ sudo apt-get install -y --force-yes debhelper \
+diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
+index a65a2bb..59d8a79 100755
+--- a/ovs_build/build-ovs-nsh-dpdk.sh
++++ b/ovs_build/build-ovs-nsh-dpdk.sh
+@@ -25,10 +25,12 @@ for ARCH in ${UBUNTU_ARCH}; do
+ # Native building for: DPDK, OVS-DPDK, OVS
+ sudo apt-get build-dep openvswitch -y --force-yes
+ sudo apt-get -y --force-yes install devscripts dpkg-dev wget
+- dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/dpdk_2.2.0-0ubuntu8.dsc
+
++ # FIXME(armband): OVS-NSH-DPDK is not yet supported on arm64
+ # DPDK build-dep install: copy from debian/control
+- sudo apt-get install -y --force-yes debhelper \
++ if [ ! ${ARCH} = 'arm64' ]; then
++ dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/dpdk_2.2.0-0ubuntu8.dsc
++ sudo apt-get install -y --force-yes debhelper \
+ dh-python \
+ dh-systemd \
+ doxygen \
+@@ -43,19 +45,20 @@ for ARCH in ${UBUNTU_ARCH}; do
+ texlive-fonts-recommended \
+ texlive-latex-extra
+
+- cd dpdk-2.2.0; rm -rf debian/patches/
+- cat << EOF > debian/changelog
++ 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
+ -- DPDK team <dev@dpdk.org> $(date --rfc-2822)
+ EOF
+- # DPDK build & install (required for following native build of OVS-NSH)
+- debian/rules build; fakeroot debian/rules binary
+- cd ${BUILD_HOME}; sudo dpkg -i *.deb
+- apt-get download libxenstore3.0
++ # DPDK build & install (required for following native build of OVS-NSH)
++ debian/rules build; fakeroot debian/rules binary
++ cd ${BUILD_HOME}; sudo dpkg -i *.deb
++ apt-get download libxenstore3.0
+
+- cd ${BUILD_HOME}
+- dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/openvswitch-dpdk_2.4.0-0ubuntu1.dsc
++ # OVS-NSH-DPDK build preparations: download sources, patch if needed
++ dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/openvswitch-dpdk_2.4.0-0ubuntu1.dsc
++ fi
+
+ # OVS-NSH build-dep install: copy from debian/control
+ sudo apt-get install -y --force-yes autoconf \
+@@ -88,20 +91,27 @@ EOF
+ patch -p1 < ${DIR}/patches/${patch}
+ done
+ cd ${BUILD_HOME}; tar czvf ovs.tar.gz ovs
+- rm -rf openvswitch-dpdk-${OVS_VER}*
+- cd openvswitch-dpdk-2.4.0; uupdate -v ${OVS_VER} ../ovs.tar.gz
+- 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/
+- cat << EOF > debian/changelog
++
++ # FIXME(armband): OVS-NSH-DPDK is not yet supported on arm64
++ if [ ! ${ARCH} = 'arm64' ]; then
++ rm -rf openvswitch-dpdk-${OVS_VER}{,.orig*}
++ cd openvswitch-dpdk-2.4.0
++ uupdate -v ${OVS_VER} ../ovs.tar.gz
++ cd ${BUILD_HOME}/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
++ rm -rf debian/patches/
++ autoreconf --install
++ # OVS-NSH-DPDK build
++ cat << EOF > debian/changelog
+ openvswitch-dpdk (${OVS_VER}-1.nsh) unstable; urgency=low
+ * Support NSH
+ -- Open vSwitch team <dev@openvswitch.org> $(date --rfc-2822)
+ EOF
+- debian/rules build; fakeroot debian/rules binary
++ debian/rules build; fakeroot debian/rules binary
++ fi
+
++ # OVS-NSH build
+ cd ${BUILD_HOME}/ovs
+ cat << EOF > debian/changelog
+ openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low
+diff --git a/ovs_build/openvswitch-dpdk_2.5.90/debian/control b/ovs_build/openvswitch-dpdk_2.5.90/debian/control
+index e7171b9..e0c27c5 100644
+--- a/ovs_build/openvswitch-dpdk_2.5.90/debian/control
++++ b/ovs_build/openvswitch-dpdk_2.5.90/debian/control
+@@ -27,7 +27,7 @@ Homepage: http://openvswitch.org/
+ XS-Testsuite: autopkgtest
+
+ Package: openvswitch-switch-dpdk
+-Architecture: i386 amd64
++Architecture: i386 amd64 arm64
+ Depends: dpdk,
+ openvswitch-switch (>= 2.4.0),
+ ${misc:Depends},