diff --git a/README.md b/README.md index 58b6a6c49..1c56d6bd0 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ Currently, besides authorized DNS server of DNSPod, there are various products i #### Nginx - cd app/nginx-1.11.10 + cd app/nginx-1.16.1 bash ./configure --prefix=/usr/local/nginx_fstack --with-ff_module make make install diff --git a/doc/F-Stack_Build_Guide.md b/doc/F-Stack_Build_Guide.md index 2df1d3646..4b128468f 100644 --- a/doc/F-Stack_Build_Guide.md +++ b/doc/F-Stack_Build_Guide.md @@ -24,7 +24,7 @@ $ cd /data/f-stack/lib $ make # Compile Nginx -$ cd ../app/nginx-1.11.10 +$ cd ../app/nginx-1.16.1 $ ./configure --prefix=/usr/local/nginx_fstack --with-ff_module $ make $ make install @@ -42,14 +42,7 @@ $ cd ../examples $ make ``` -## Compile Nginx in Ubuntu - -- before make Nginx, remove -Werror from CFLAGS at app/nginx-1.11.10/objs/Makefile line 3. (you should run ./configure command first to generate Makefile) (fixed in 2018/07/23) - -``` -- CFLAGS = -pipe -Os -W -Wall -Wpointer-arith -Wno-unused-parameter -Werror -g -+ CFLAGS = -pipe -Os -W -Wall -Wpointer-arith -Wno-unused-parameter -g -``` +## Compile tools in Ubuntu - remove '\\' in statement printf at f-stack/tools/netstat/Makefile line 70, now it should be: @@ -58,32 +51,6 @@ $ make + printf("#define\tN%s\t%s\n", toupper($$2), i++); ``` -## Compile Redis in Ubuntu 18.04 (fixed in 2018/07/10) - -- add an extra Macros to STD in f-stack/app/redis-3.2.8/src/Makefile line 28, and now it should be: - -``` -- STD=-std=c99 -pedantic -DREDIS_STATIC='' -+ STD=-std=c99 -pedantic -DREDIS_STATIC='' -D_POSIX_C_SOURCE=199506L -``` - -## Compile Nginx in Ubuntu 18.04 - -- there will be a lot of warnings when compiling Nginx in Ubuntu 18.04, and sometimes it may fail, you'd better configure with the following command: - -``` - ./configure --prefix=/usr/local/nginx_fstack --with-ff_module --with-cc-opt="-Wno-implicit-fallthrough -Wno-unused-result" -``` - -## Compile DPDK in CentOS 7.5 and RHEL 7.5 - -- struct member 'ndo_change_mtu' in struct net_device_ops has been renamed to 'ndo_change_mtu_rh74', f-stack/dpdk/lib/librte_eal/linuxapp/kni/kni_net.c line 704 should also be updated: - -``` -- .ndo_change_mtu = kni_net_change_mtu, -+ .ndo_change_mtu_rh74 = kni_net_change_mtu, -``` - ## Compile dpdk in virtual machine - f-stack/dpdk/lib/librte_eal/linuxapp/igb_uio/igb_uio.c line 279: diff --git a/doc/F-Stack_Development_Guide.md b/doc/F-Stack_Development_Guide.md index da6ff3fdb..9516d49c5 100644 --- a/doc/F-Stack_Development_Guide.md +++ b/doc/F-Stack_Development_Guide.md @@ -13,7 +13,7 @@ F-Stack is an open source high performant network framework based on DPDK with t ## Structure of F-Stack code - ├── app -- Nginx(1.11.10)/Redis(3.2.8)/Microthread framework + ├── app -- Nginx(1.16.1)/Redis(3.2.8)/Microthread framework ├── config.ini ├── doc ├── dpdk -- Intel DPDK(16.07) directory diff --git a/doc/F-Stack_Nginx_APP_Guide.md b/doc/F-Stack_Nginx_APP_Guide.md index fea1e0419..e667b0f1b 100644 --- a/doc/F-Stack_Nginx_APP_Guide.md +++ b/doc/F-Stack_Nginx_APP_Guide.md @@ -4,7 +4,7 @@ F-Stack is an open source network framework based on DPDK. F-Stack supports stan ## How does Nginx use F-Stack? - Nginx APP is in `app/nginx-1.11.10` directory. + Nginx APP is in `app/nginx-1.16.1` directory. ``` diff --git a/doc/F-Stack_Quick_Start_Guide.md b/doc/F-Stack_Quick_Start_Guide.md index 909364f37..f419f5b43 100644 --- a/doc/F-Stack_Quick_Start_Guide.md +++ b/doc/F-Stack_Quick_Start_Guide.md @@ -61,7 +61,7 @@ The mount point can be made permanent across reboots, by adding the following li ### Compile Nginx cd ../ - cd app/nginx-1.11.10 + cd app/nginx-1.16.1 ./configure --prefix=/usr/local/nginx_fstack --with-ff_module make make install diff --git a/doc/Launch_F-Stack_on_AWS_EC2_in_one_minute.md b/doc/Launch_F-Stack_on_AWS_EC2_in_one_minute.md index a50d04751..04b70052c 100644 --- a/doc/Launch_F-Stack_on_AWS_EC2_in_one_minute.md +++ b/doc/Launch_F-Stack_on_AWS_EC2_in_one_minute.md @@ -60,7 +60,7 @@ make # Compile Nginx - cd ../app/nginx-1.11.10 + cd ../app/nginx-1.16.1 ./configure --prefix=/usr/local/nginx_fstack --with-ff_module make make install