diff options
author | Vladimir Sorokin <sorokin@altell.ru> | 2010-09-27 13:52:30 +0400 |
---|---|---|
committer | Roman I Khimov <khimov@altell.ru> | 2010-09-30 23:51:38 +0400 |
commit | 56de66f9af6ab779ee73932b9488311583b898fe (patch) | |
tree | 3b917be6feadbd7cfc0fb7fd6c4b81fefa0c4a8d | |
parent | 8809a602b9baa1eb6ff7419e322d7e7e25d9d6c0 (diff) | |
download | openembedded-56de66f9af6ab779ee73932b9488311583b898fe.tar.gz |
xl2tpd: build with kernel headers, update version to 1.2.6
Signed-off-by: Vladimir Sorokin <sorokin@altell.ru>
Signed-off-by: Roman I Khimov <khimov@altell.ru>
-rw-r--r-- | recipes/xl2tpd/xl2tpd-1.2.6/cflags.patch | 36 | ||||
-rw-r--r-- | recipes/xl2tpd/xl2tpd.inc | 8 | ||||
-rw-r--r-- | recipes/xl2tpd/xl2tpd_1.2.4.bb | 6 | ||||
-rw-r--r-- | recipes/xl2tpd/xl2tpd_1.2.6.bb | 8 |
4 files changed, 50 insertions, 8 deletions
diff --git a/recipes/xl2tpd/xl2tpd-1.2.6/cflags.patch b/recipes/xl2tpd/xl2tpd-1.2.6/cflags.patch new file mode 100644 index 0000000000..3f9b8e828e --- /dev/null +++ b/recipes/xl2tpd/xl2tpd-1.2.6/cflags.patch @@ -0,0 +1,36 @@ +diff -rupN xl2tpd-1.2.4/Makefile new/Makefile +--- xl2tpd-1.2.4/Makefile 2009-03-09 02:25:30.000000000 +0300 ++++ new/Makefile 2010-09-16 16:02:33.000000000 +0400 +@@ -62,7 +62,7 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include + # are packages seperately (eg kernel-headers on Fedora) + # Note: 2.6.23+ support still needs some changes in the xl2tpd source + # +-#OSFLAGS+= -DUSE_KERNEL ++OSFLAGS+= -DUSE_KERNEL + # + # + # Uncomment the next line for FreeBSD +@@ -90,7 +90,6 @@ OSFLAGS?= -DLINUX -I$(KERNELSRC)/include + + FFLAGS= -DIP_ALLOCATION + +-CFLAGS+= $(DFLAGS) -O2 -fno-builtin -Wall -DSANITY $(OSFLAGS) $(FFLAGS) + HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h + 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 + SRCS=${OBJS:.o=.c} ${HDRS} +@@ -108,11 +107,14 @@ all: $(EXEC) pfc + clean: + rm -f $(OBJS) $(EXEC) pfc.o pfc + ++%.o: %.c ++ $(CC) $(CFLAGS) $(DFLAGS) -DSANITY $(OSFLAGS) $(FFLAGS) -o $@ -c $< ++ + $(EXEC): $(OBJS) $(HDRS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) + + pfc: +- $(CC) $(CFLAGS) -c contrib/pfc.c ++ $(CC) $(CFLAGS) $(DFLAGS) -DSANITY $(OSFLAGS) $(FFLAGS) -c contrib/pfc.c + $(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o + + romfs: diff --git a/recipes/xl2tpd/xl2tpd.inc b/recipes/xl2tpd/xl2tpd.inc index da47d7e90b..5649f97ae4 100644 --- a/recipes/xl2tpd/xl2tpd.inc +++ b/recipes/xl2tpd/xl2tpd.inc @@ -4,14 +4,16 @@ LICENSE = "GPLv2" HOMEPAGE = "http://www.xelerance.com/software/xl2tpd/" SECTION = "network" -INC_PR = "r0" +INC_PR = "r1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "http://www.xelerance.com/software/xl2tpd/xl2tpd-${PV}.tar.gz" S = "${WORKDIR}/xl2tpd-${PV}" do_compile () { - oe_runmake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" PREFIX="${prefix}" all + oe_runmake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" PREFIX="/usr" KERNELSRC=${STAGING_KERNEL_DIR} all } do_install () { @@ -25,3 +27,5 @@ do_install () { } CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" +FILES_${PN} += "${bindir} ${sbindir}" +FILES_${PN}-doc += "${sharedir}" diff --git a/recipes/xl2tpd/xl2tpd_1.2.4.bb b/recipes/xl2tpd/xl2tpd_1.2.4.bb deleted file mode 100644 index 7796b6e5b1..0000000000 --- a/recipes/xl2tpd/xl2tpd_1.2.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -PR = "${INC_PR}.0" -require xl2tpd.inc - -SRC_URI[md5sum] = "d94fc8a13596f12a561240dfcea9f977" -SRC_URI[sha256sum] = "3e6b4314a5100a576dd075684873b1e8b84b58f7f5ceb10731fabd3ebefaa8c4" - diff --git a/recipes/xl2tpd/xl2tpd_1.2.6.bb b/recipes/xl2tpd/xl2tpd_1.2.6.bb new file mode 100644 index 0000000000..9eb0fb08f5 --- /dev/null +++ b/recipes/xl2tpd/xl2tpd_1.2.6.bb @@ -0,0 +1,8 @@ +require xl2tpd.inc +PR = "${INC_PR}.0" + +SRC_URI += " file://cflags.patch" + +SRC_URI[md5sum] = "8122d6daf53856b5b3b5425ea947c245" +SRC_URI[sha256sum] = "c807c243ee91e344f4f46718fd45565c1242463b4945c1428a4d1c513a418c15" + |