From e69884288a2660ed6565508ccf2a619459a002a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=AD=A3=E6=AD=A6?= Date: Tue, 11 Jun 2019 11:44:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?OCT=20REM=EF=BC=9A=2011111111111111111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.zzw | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.zzw diff --git a/test.zzw b/test.zzw new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test.zzw @@ -0,0 +1 @@ +test \ No newline at end of file From 0d1c773928c08c4c513be83c806f008ddb20eae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=AD=A3=E6=AD=A6?= Date: Tue, 11 Jun 2019 11:44:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?OCT=20REM=EF=BC=9A=2011111111111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.zzw | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.zzw diff --git a/test.zzw b/test.zzw deleted file mode 100644 index 30d74d258..000000000 --- a/test.zzw +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file From eb4bfc1e3f2bd4e28c24c582de47750eebf447f0 Mon Sep 17 00:00:00 2001 From: xusaiqun Date: Tue, 11 Jun 2019 15:06:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Mod=20aaa-12=20=E6=8F=8F=E8=BF=B0=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9makfile=E8=B7=AF=E5=BE=84=20RCA=EF=BC=9A=20SO?= =?UTF-8?q?L=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Axusaiqun=20?= =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Axusaiqun=20Signed-off-by:?= =?UTF-8?q?=20xusaiqun=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Platform/modules/cfgrcv/Makefile | 5 +++-- Platform/modules/pdelivery/Makefile | 10 ++++++---- Platform/user/cfg2kernel/Makefile | 2 +- Platform/user/netlink_uapi/Makefile | 2 +- Platform/user/pdeliv_u/Makefile | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Platform/modules/cfgrcv/Makefile b/Platform/modules/cfgrcv/Makefile index aca109446..34d2c49c2 100755 --- a/Platform/modules/cfgrcv/Makefile +++ b/Platform/modules/cfgrcv/Makefile @@ -2,12 +2,13 @@ export HUACHENG_LINUX_KERNEL DEFINES := -INCLUDE := -I../lib -I../common +INCLUDE := -I../lib -I../../../Common LIB := obj-m :=cfgrcv.o cfgrcv-objs := cfgrcv_kinit.o -KERNEL :=$(HUACHENG_LINUX_KERNEL) +#KERNEL :=$(HUACHENG_LINUX_KERNEL) +KERNEL :=/usr/src/linux PWD :=$(shell pwd) modules : echo $HUACHENG_LINUX_KERNEL diff --git a/Platform/modules/pdelivery/Makefile b/Platform/modules/pdelivery/Makefile index 30c557d75..f38fd6d70 100644 --- a/Platform/modules/pdelivery/Makefile +++ b/Platform/modules/pdelivery/Makefile @@ -2,16 +2,18 @@ export HUACHENG_LINUX_KERNEL DEFINES := -INCLUDE := -I../lib -I../common +#INCLUDE := -I../lib -I../../../Common LIB := +EXTRA_CFLAGS := -I../../../Common obj-m :=pdeliv.o pdeliv-objs := pdeliverynl_kinit.o -KERNEL :=$(HUACHENG_LINUX_KERNEL) +#KERNEL :=$(HUACHENG_LINUX_KERNEL) +KERNEL :=/usr/src/linux + PWD :=$(shell pwd) modules : - echo $HUACHENG_LINUX_KERNEL - $(MAKE) $(INCLUDE) -C $(KERNEL) M=$(PWD) modules + $(MAKE) -C $(KERNEL) M=$(PWD) modules .PHONEY:clean clean : rm -rf *.o *.mod.c *.ko *.symvers *.order *.makers .*.cmd *.cmd .tmp_versions .cache.mk diff --git a/Platform/user/cfg2kernel/Makefile b/Platform/user/cfg2kernel/Makefile index 6a38e6aa9..dd10ffc85 100644 --- a/Platform/user/cfg2kernel/Makefile +++ b/Platform/user/cfg2kernel/Makefile @@ -16,7 +16,7 @@ CC := gcc LIBS := -L../lib -lnetlinku LDFLAGS := DEFINES := -INCLUDE := -I../lib -I../../common +INCLUDE := -I../lib -I../../../Common -I../netlink_uapi CFLAGS := -g -Wall -O3 $(DEFINES) $(INCLUDE) CXXFLAGS:= $(CFLAGS) -DHAVE_CONFIG_H diff --git a/Platform/user/netlink_uapi/Makefile b/Platform/user/netlink_uapi/Makefile index 65db4c08a..8c0b17d22 100644 --- a/Platform/user/netlink_uapi/Makefile +++ b/Platform/user/netlink_uapi/Makefile @@ -1,6 +1,6 @@ LIBDIR = -L/usr/local/lib PTHREAD = -lpthread -INC = -I/usr/local/include -I../../common +INC = -I/usr/local/include -I../../../Common CC = gcc CFLAGS = -Isub -Iadd diff --git a/Platform/user/pdeliv_u/Makefile b/Platform/user/pdeliv_u/Makefile index 07f41220c..642ba0818 100644 --- a/Platform/user/pdeliv_u/Makefile +++ b/Platform/user/pdeliv_u/Makefile @@ -16,7 +16,7 @@ CC := gcc LIBS := -L../lib -lnetlinku LDFLAGS := DEFINES := -INCLUDE := -I../lib -I../../common +INCLUDE := -I../lib -I../../../Common -I../netlink_uapi CFLAGS := -g -Wall -O3 $(DEFINES) $(INCLUDE) CXXFLAGS:= $(CFLAGS) -DHAVE_CONFIG_H From 170966f98caccd95f8311ec709f408495303c8bd Mon Sep 17 00:00:00 2001 From: xusaiqun Date: Tue, 11 Jun 2019 15:29:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Mod=20aaa-12=20=E6=8F=8F=E8=BF=B0=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E6=A0=B8=E6=A8=A1=E5=9D=97makfile?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=EF=BC=9Axusaiqun=20=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E4=BA=BA=EF=BC=9Axusaiqun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xusaiqun --- Platform/modules/cfgrcv/Makefile | 2 +- Platform/modules/pdelivery/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/modules/cfgrcv/Makefile b/Platform/modules/cfgrcv/Makefile index 34d2c49c2..0eb45850f 100755 --- a/Platform/modules/cfgrcv/Makefile +++ b/Platform/modules/cfgrcv/Makefile @@ -6,7 +6,7 @@ INCLUDE := -I../lib -I../../../Common LIB := obj-m :=cfgrcv.o -cfgrcv-objs := cfgrcv_kinit.o +cfgrcv-objs := cfgrcv_kinit.o ../netlink_api/libnetlink_k.o #KERNEL :=$(HUACHENG_LINUX_KERNEL) KERNEL :=/usr/src/linux PWD :=$(shell pwd) diff --git a/Platform/modules/pdelivery/Makefile b/Platform/modules/pdelivery/Makefile index f38fd6d70..44d5313dd 100644 --- a/Platform/modules/pdelivery/Makefile +++ b/Platform/modules/pdelivery/Makefile @@ -6,7 +6,7 @@ DEFINES := LIB := EXTRA_CFLAGS := -I../../../Common -obj-m :=pdeliv.o +obj-m :=pdeliv.o ../netlink_api/libnetlink_k.o pdeliv-objs := pdeliverynl_kinit.o #KERNEL :=$(HUACHENG_LINUX_KERNEL) KERNEL :=/usr/src/linux