summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch19
-rw-r--r--meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp (renamed from meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp)0
-rw-r--r--meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb (renamed from meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb)7
3 files changed, 3 insertions, 23 deletions
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
deleted file mode 100644
index 77722b064..000000000
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1pptp.c and version.c depend on config.h
2
3Upstream-Status: Backport
4
5Upstream has already similar fixes. Will be available on next release.
6
7Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
8
9--- a/Makefile 2013-02-27 17:09:24.431226665 +0800
10+++ b/Makefile 2013-02-27 17:09:03.442075550 +0800
11@@ -43,6 +43,8 @@
12 pptpsetup.8: pptpsetup
13 pod2man $? > $@
14
15+pptp.o version.o: config.h
16+
17 config.h:
18 echo "/* text added by Makefile target config.h */" > config.h
19 echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp
index f446e22a6..f446e22a6 100644
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.8.0/options.pptp
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb
index 003361c75..bc8b2cb2b 100644
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.8.0.bb
@@ -7,17 +7,16 @@ DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \
7HOMEPAGE = "http://pptpclient.sourceforge.net" 7HOMEPAGE = "http://pptpclient.sourceforge.net"
8SECTION = "net" 8SECTION = "net"
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" 10LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
11 11
12PR = "r1" 12PR = "r1"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
15 file://options.pptp \ 15 file://options.pptp \
16 file://fix-parallel-build.patch \
17" 16"
18 17
19SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857" 18SRC_URI[md5sum] = "4efce9f263e2c3f38d79d9df222476de"
20SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc" 19SRC_URI[sha256sum] = "e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda"
21 20
22S = "${WORKDIR}/pptp-${PV}" 21S = "${WORKDIR}/pptp-${PV}"
23 22