From 6b0448fab6a7160d3d4bff94f26f6bc8cdc0dba4 Mon Sep 17 00:00:00 2001 From: Dimitris Lampridis <dimitris.lampridis@cern.ch> Date: Tue, 3 Mar 2020 09:58:15 +0100 Subject: [PATCH] [svec] switch to hotfix branch while waiting for merge of patches to upstream --- patches/svec.diff | 13 ------------- scripts/svec_carrier_build.sh | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 patches/svec.diff diff --git a/patches/svec.diff b/patches/svec.diff deleted file mode 100644 index 3b9abf9..0000000 --- a/patches/svec.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/software/kernel/Kbuild b/software/kernel/Kbuild -index d8356a4..974c6cc 100644 ---- a/software/kernel/Kbuild -+++ b/software/kernel/Kbuild -@@ -11,7 +11,7 @@ endif - - ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)" - ccflags-y += -DVERSION=\"$(VERSION)\" --ccflags-y += -Wall -Werror -+ccflags-y += -Wall -Werror -Wframe-larger-than=2048 - - ccflags-y += -I$(VMEBRIDGE_ABS)/include - ccflags-y += -I$(FPGA_MGR_ABS)/include diff --git a/scripts/svec_carrier_build.sh b/scripts/svec_carrier_build.sh index 6e71352..e1b1dad 100644 --- a/scripts/svec_carrier_build.sh +++ b/scripts/svec_carrier_build.sh @@ -14,7 +14,7 @@ cd $BUILD_DIR [ -d $PROJECT ] || git clone https://ohwr.org/project/svec.git $PROJECT cd $PROJECT -git checkout -B release v1.4.7 +git checkout -f hotfix/respect_stack_frame_limit [ $SKIP_PATCH ] || [ -e $PATCH_DIR/$PROJECT.diff ] && patch -p1 < $PATCH_DIR/$PROJECT.diff export CHEBY="python $BUILD_DIR/cheby/proto/cheby.py" export FMC="$BUILD_DIR/fmc-sw" -- GitLab