diff options
Diffstat (limited to 'meta-networking/recipes-protocols/xl2tpd')
3 files changed, 5 insertions, 66 deletions
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd-1.3.1/cflags.patch b/meta-networking/recipes-protocols/xl2tpd/xl2tpd-1.3.1/cflags.patch deleted file mode 100644 index 35508122d..000000000 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd-1.3.1/cflags.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From 678d71e3b50f566776dbc29db49a1128be89caf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Fri, 26 Oct 2012 10:07:31 +0100 | ||
4 | Subject: [PATCH] Adjust CFLAGS for building within OE | ||
5 | |||
6 | Updated version of cflags.patch from OE-Classic written by | ||
7 | Vladimir Sorokin <sorokin@altell.ru>. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
12 | --- | ||
13 | Makefile | 8 +++++--- | ||
14 | 1 files changed, 5 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index 6f6481f..c7602db 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -62,7 +62,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/ | ||
21 | # are packages seperately (eg kernel-headers on Fedora) | ||
22 | # Note: 2.6.23+ support still needs some changes in the xl2tpd source | ||
23 | # | ||
24 | -#OSFLAGS+= -DUSE_KERNEL | ||
25 | +OSFLAGS+= -DUSE_KERNEL | ||
26 | # | ||
27 | # | ||
28 | # Uncomment the next line for FreeBSD | ||
29 | @@ -90,7 +90,6 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include/ | ||
30 | |||
31 | IPFLAGS?= -DIP_ALLOCATION | ||
32 | |||
33 | -CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(IPFLAGS) | ||
34 | HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h | ||
35 | OBJS=xl2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o | ||
36 | SRCS=${OBJS:.o=.c} ${HDRS} | ||
37 | @@ -110,6 +109,9 @@ all: $(EXEC) pfc $(CONTROL_EXEC) | ||
38 | clean: | ||
39 | rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC) | ||
40 | |||
41 | +%.o: %.c | ||
42 | + $(CC) $(CFLAGS) $(DFLAGS) -O2 -DSANITY $(OSFLAGS) $(IPFLAGS) -o $@ -c $< | ||
43 | + | ||
44 | $(EXEC): $(OBJS) $(HDRS) | ||
45 | $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) | ||
46 | |||
47 | @@ -117,7 +119,7 @@ $(CONTROL_EXEC): $(CONTROL_SRCS) | ||
48 | $(CC) $(CONTROL_SRCS) -o $@ | ||
49 | |||
50 | pfc: | ||
51 | - $(CC) $(CFLAGS) -c contrib/pfc.c | ||
52 | + $(CC) $(CFLAGS) $(DFLAGS) -O2 -DSANITY $(OSFLAGS) $(IPFLAGS) -c contrib/pfc.c | ||
53 | $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS) | ||
54 | |||
55 | romfs: | ||
56 | -- | ||
57 | 1.7.1 | ||
58 | |||
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.1.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.1.bb deleted file mode 100644 index 5321d6a7a..000000000 --- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.1.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require xl2tpd.inc | ||
2 | PR = "${INC_PR}.0" | ||
3 | |||
4 | # 95445fc9aaeaf709d54c1cd934d4bed4467e910d corresponds to 1.3.1 tag | ||
5 | SRCREV = "95445fc9aaeaf709d54c1cd934d4bed4467e910d" | ||
6 | |||
7 | SRC_URI += " file://cflags.patch" | ||
8 | |||
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb new file mode 100644 index 000000000..bd084aa00 --- /dev/null +++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require xl2tpd.inc | ||
2 | PR = "${INC_PR}.0" | ||
3 | |||
4 | SRCREV = "df7e30eb199fc5710faa83866381aea18b66e60c" | ||
5 | |||