| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | The makefile assumes building locally. |
| 2 | |
| 3 | Upstream Status: Inappropriate [Native] |
| 4 | |
| 5 | The configure is not auto-make based |
| 6 | |
| 7 | Signed-of-by: Armin Kuster <akuster@mvista.com> |
| 8 | |
| 9 | Index: LINUX/netmap.mak.in |
| 10 | =================================================================== |
| 11 | --- a/LINUX/netmap.mak.in |
| 12 | +++ b/LINUX/netmap.mak.in |
| 13 | @@ -12,10 +12,9 @@ SRCDIR:=@SRCDIR@ |
| 14 | # The following commands are needed to build the modules as out-of-tree, |
| 15 | # in fact the kernel sources path must be specified. |
| 16 | |
| 17 | -PWD ?= $(CURDIR) |
| 18 | |
| 19 | # Additional compile flags (e.g. header location) |
| 20 | -EXTRA_CFLAGS := -I$(PWD) -I$(SRCDIR) -I$(SRCDIR)/../sys -I$(SRCDIR)/../sys/dev -DCONFIG_NETMAP |
| 21 | +EXTRA_CFLAGS := -I$(SRCDIR) -I$(SRCDIR)/../sys -I$(SRCDIR)/../sys/dev -DCONFIG_NETMAP |
| 22 | EXTRA_CFLAGS += -Wno-unused-but-set-variable |
| 23 | EXTRA_CFLAGS += $(foreach s,$(SUBSYS),-DCONFIG_NETMAP_$(shell echo $s|tr a-z- A-Z_)) |
| 24 | |
| 25 | Index: LINUX/configure |
| 26 | =================================================================== |
| 27 | --- a/LINUX/configure |
| 28 | +++ b/LINUX/configure |
| 29 | @@ -349,52 +349,6 @@ reset_tests() { |
| 30 | EOF |
| 31 | } |
| 32 | |
| 33 | -# run_tests: run all accumulated tests and exec the pertinent |
| 34 | -# success/failure actions for each one. |
| 35 | -run_tests() { |
| 36 | - local t= # prevent -EOF to eat the make TAB |
| 37 | - cat > $TMPDIR/Makefile <<-EOF |
| 38 | - ifneq (\$(KERNELRELEASE),) |
| 39 | - obj-m := $TESTOBJS |
| 40 | - else |
| 41 | - S_DRIVERS := $(drv print) |
| 42 | - all: \$(S_DRIVERS:%=get-%) |
| 43 | - $t \$(MAKE) -C $ksrc M=\$\$PWD $kopts |
| 44 | - |
| 45 | - -include $TOPDIR/drivers.mak |
| 46 | - EOF |
| 47 | - for d in $(drv print); do |
| 48 | - cat >> $TMPDIR/Makefile <<-EOF |
| 49 | - get-$d: |
| 50 | - $t [ -z "\$($d-src)" ] || cp -Rp \$($d-src) \$(if \$($d-dst),\$($d-dst),.) |
| 51 | - $t touch get-$d |
| 52 | - EOF |
| 53 | - done |
| 54 | - echo endif >> $TMPDIR/Makefile |
| 55 | - { |
| 56 | - cat <<-EOF |
| 57 | -############################################################################## |
| 58 | -## BEGIN RUNNING TESTS: $(date) |
| 59 | -############################################################################## |
| 60 | -## Makefile: |
| 61 | - EOF |
| 62 | - cat $TMPDIR/Makefile |
| 63 | - cat <<-EOF |
| 64 | -############################################################################## |
| 65 | - EOF |
| 66 | - } >> config.log |
| 67 | - ( |
| 68 | - cd $TMPDIR |
| 69 | - make -k -j $(grep -c processor /proc/cpuinfo) |
| 70 | - ) >> config.log |
| 71 | - eval "$TESTPOSTPROC" |
| 72 | - cat >> config.log <<-EOF |
| 73 | -############################################################################## |
| 74 | -## END RUNNING TESTS: $(date) |
| 75 | -############################################################################## |
| 76 | - EOF |
| 77 | -} |
| 78 | - |
| 79 | configh=netmap_linux_config.h |
| 80 | # succes/failure actions are expected to write some macros |
| 81 | # in netma_linux_config.h. The following functions can be |
| 82 | @@ -619,7 +573,6 @@ configuration. Please check 'config.log' |
| 83 | reset_tests |
| 84 | rm -f drivers.mak |
| 85 | add_test true broken_buildsystem < /dev/null |
| 86 | -run_tests |
| 87 | |
| 88 | drvname2config() { |
| 89 | local name=$1 |
| 90 | @@ -1280,7 +1233,6 @@ cat > $configh <<-EOF |
| 91 | EOF |
| 92 | |
| 93 | # the TESTPOSTPROC script will add macros to $configh |
| 94 | -run_tests |
| 95 | |
| 96 | define DRIVER_SUFFIX \"$drvsuffix\" |
| 97 | |