Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ diff -ur ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram ./asuswrt-merlin/release/src-rt/router/nvram
- diff -ur ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/Makefile ./asuswrt-merlin/release/src-rt/router/nvram/Makefile
- --- ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/Makefile 2014-02-13 13:52:39.000000000 +0400
- +++ ./asuswrt-merlin/release/src-rt/router/nvram/Makefile 2014-03-27 12:06:23.765267913 +0400
- @@ -1,21 +1,15 @@
- include ../common.mak
- -CFLAGS += -I. -I$(SRCBASE)/include -Wall -fPIC $(EXTRACFLAGS)
- -#CFLAGS += -g -DDEBUG
- -CFLAGS += -s
- -ifeq ($(CONFIG_RTR_OPTIMIZE_SIZE),y)
- -CFLAGS += -Os
- -else
- -CFLAGS += -O2
- -endif
- -LDFLAGS += -L. -L$(TOP)/shared -lshared
- -
- -CFLAGS += -I$(TOP)/shared
- -
- +CFLAGS = -O2 -Wall $(EXTRACFLAGS) -fPIC
- +CFLAGS += -I$(TOP)/shared -I$(SRCBASE)/include -I.
- ifeq ($(STATIC),1)
- CFLAGS += -static
- endif
- +ifeq ($(RTCONFIG_DSL),y)
- +CFLAGS += -DRTCONFIG_DSL
- +endif
- +
- all: libnvram.so libnvram.a nvram
- libnvram.so: nvram_linux.o nvram_convert.o
- diff -ur ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/nvram_linux.c ./asuswrt-merlin/release/src-rt/router/nvram/nvram_linux.c
- --- ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/nvram_linux.c2014-02-13 13:52:39.000000000 +0400
- +++ ./asuswrt-merlin/release/src-rt/router/nvram/nvram_linux.c 2014-03-27 12:06:23.765267913 +0400
- @@ -192,13 +192,6 @@
- {
- int r = 0;
- FILE *fp;
- -
- - if (nvram_get(ASUS_STOP_COMMIT) != NULL)
- - {
- - cprintf("# skip nvram commit #\n");
- - return r;
- - }
- -
- fp = fopen("/var/log/commit_ret", "w");
- if (wait_action_idle(10)) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement