Advertisement
ryzhov_al

[asuswrt-merlin] Difference with GPL nvram code

Mar 27th, 2014
474
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.71 KB | None | 0 0
  1. $ diff -ur ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram ./asuswrt-merlin/release/src-rt/router/nvram
  2. diff -ur ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/Makefile ./asuswrt-merlin/release/src-rt/router/nvram/Makefile
  3. --- ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/Makefile     2014-02-13 13:52:39.000000000 +0400
  4. +++ ./asuswrt-merlin/release/src-rt/router/nvram/Makefile       2014-03-27 12:06:23.765267913 +0400
  5. @@ -1,21 +1,15 @@
  6.  include ../common.mak
  7.  
  8. -CFLAGS  += -I. -I$(SRCBASE)/include -Wall -fPIC $(EXTRACFLAGS)
  9. -#CFLAGS += -g -DDEBUG
  10. -CFLAGS  += -s
  11. -ifeq ($(CONFIG_RTR_OPTIMIZE_SIZE),y)
  12. -CFLAGS  += -Os
  13. -else
  14. -CFLAGS  += -O2
  15. -endif
  16. -LDFLAGS += -L. -L$(TOP)/shared -lshared
  17. -
  18. -CFLAGS += -I$(TOP)/shared
  19. -
  20. +CFLAGS = -O2 -Wall $(EXTRACFLAGS) -fPIC
  21. +CFLAGS += -I$(TOP)/shared -I$(SRCBASE)/include -I.
  22.  ifeq ($(STATIC),1)
  23.  CFLAGS += -static
  24.  endif
  25.  
  26. +ifeq ($(RTCONFIG_DSL),y)
  27. +CFLAGS += -DRTCONFIG_DSL
  28. +endif
  29. +
  30.  all: libnvram.so libnvram.a nvram
  31.  
  32.  libnvram.so: nvram_linux.o nvram_convert.o
  33. 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
  34. --- ./GPL_RT_N66U_30043744422/asuswrt/release/src-rt/router/nvram/nvram_linux.c2014-02-13 13:52:39.000000000 +0400
  35. +++ ./asuswrt-merlin/release/src-rt/router/nvram/nvram_linux.c  2014-03-27 12:06:23.765267913 +0400
  36. @@ -192,13 +192,6 @@
  37.  {
  38.         int r = 0;
  39.         FILE *fp;
  40. -
  41. -       if (nvram_get(ASUS_STOP_COMMIT) != NULL)
  42. -       {
  43. -               cprintf("# skip nvram commit #\n");
  44. -               return r;
  45. -       }
  46. -
  47.         fp = fopen("/var/log/commit_ret", "w");
  48.  
  49.         if (wait_action_idle(10)) {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement