* [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build
@ 2013-02-28 4:31 Jesse Zhang
2013-02-28 6:23 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: Jesse Zhang @ 2013-02-28 4:31 UTC (permalink / raw)
To: openembedded-devel, joe.macdonald
CQID: WIND00405538
Add dependency on the generated config.h file for pptp.c and version.c.
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
---
.../pptp-linux-1.7.2/fix-parallel-build.patch | 19 +++++++++++++++++++
recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb | 6 ++++--
2 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
diff --git a/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
new file mode 100644
index 0000000..77722b0
--- /dev/null
+++ b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
@@ -0,0 +1,19 @@
+pptp.c and version.c depend on config.h
+
+Upstream-Status: Backport
+
+Upstream has already similar fixes. Will be available on next release.
+
+Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
+
+--- a/Makefile 2013-02-27 17:09:24.431226665 +0800
++++ b/Makefile 2013-02-27 17:09:03.442075550 +0800
+@@ -43,6 +43,8 @@
+ pptpsetup.8: pptpsetup
+ pod2man $? > $@
+
++pptp.o version.o: config.h
++
+ config.h:
+ echo "/* text added by Makefile target config.h */" > config.h
+ echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
diff --git a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
index ac3f8f6..c173af4 100644
--- a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
+++ b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
@@ -9,10 +9,12 @@ SECTION = "network"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
- file://options.pptp"
+ file://options.pptp \
+ file://fix-parallel-build.patch \
+ "
SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build
2013-02-28 4:31 [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build Jesse Zhang
@ 2013-02-28 6:23 ` Khem Raj
2013-02-28 6:51 ` Jesse Zhang
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2013-02-28 6:23 UTC (permalink / raw)
To: openembedded-devel; +Cc: joe.macdonald
On Wed, Feb 27, 2013 at 8:31 PM, Jesse Zhang <sen.zhang@windriver.com> wrote:
> CQID: WIND00405538
what is this ?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build
2013-02-28 6:23 ` Khem Raj
@ 2013-02-28 6:51 ` Jesse Zhang
2013-03-18 19:24 ` Joe MacDonald
0 siblings, 1 reply; 4+ messages in thread
From: Jesse Zhang @ 2013-02-28 6:51 UTC (permalink / raw)
To: openembedded-devel; +Cc: joe.macdonald
On 02/28/2013 02:23 PM, Khem Raj wrote:
> On Wed, Feb 27, 2013 at 8:31 PM, Jesse Zhang <sen.zhang@windriver.com> wrote:
>> CQID: WIND00405538
>
> what is this ?
Ah, sorry. Sent from the wrong branch. That's our internal tracking code.
See below for the patch with corrected message.
jesse
From 908296fa5f2bd89c110b1ba072248305b28c3fb6 Mon Sep 17 00:00:00 2001
From: Jesse Zhang <sen.zhang@windriver.com>
Date: Wed, 27 Feb 2013 17:27:12 +0800
Subject: [PATCH] pptp-linux: Add dependency to fix parallel build
Add dependency on the generated config.h file for pptp.c and version.c.
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
---
.../pptp-linux-1.7.2/fix-parallel-build.patch | 19 +++++++++++++++++++
recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb | 6 ++++--
2 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
diff --git a/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
new file mode 100644
index 0000000..77722b0
--- /dev/null
+++ b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
@@ -0,0 +1,19 @@
+pptp.c and version.c depend on config.h
+
+Upstream-Status: Backport
+
+Upstream has already similar fixes. Will be available on next release.
+
+Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
+
+--- a/Makefile 2013-02-27 17:09:24.431226665 +0800
++++ b/Makefile 2013-02-27 17:09:03.442075550 +0800
+@@ -43,6 +43,8 @@
+ pptpsetup.8: pptpsetup
+ pod2man $? > $@
+
++pptp.o version.o: config.h
++
+ config.h:
+ echo "/* text added by Makefile target config.h */" > config.h
+ echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
diff --git a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
index ac3f8f6..c173af4 100644
--- a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
+++ b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
@@ -9,10 +9,12 @@ SECTION = "network"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
- file://options.pptp"
+ file://options.pptp \
+ file://fix-parallel-build.patch \
+ "
SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build
2013-02-28 6:51 ` Jesse Zhang
@ 2013-03-18 19:24 ` Joe MacDonald
0 siblings, 0 replies; 4+ messages in thread
From: Joe MacDonald @ 2013-03-18 19:24 UTC (permalink / raw)
To: Jesse Zhang; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2984 bytes --]
[Re: [oe] [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build] On 13.02.28 (Thu 14:51) Jesse Zhang wrote:
> On 02/28/2013 02:23 PM, Khem Raj wrote:
> > On Wed, Feb 27, 2013 at 8:31 PM, Jesse Zhang <sen.zhang@windriver.com> wrote:
> >> CQID: WIND00405538
> >
> > what is this ?
>
> Ah, sorry. Sent from the wrong branch. That's our internal tracking code.
Okay, merged this version.
Thanks Jesse.
-J.
>
> See below for the patch with corrected message.
>
> jesse
>
> From 908296fa5f2bd89c110b1ba072248305b28c3fb6 Mon Sep 17 00:00:00 2001
> From: Jesse Zhang <sen.zhang@windriver.com>
> Date: Wed, 27 Feb 2013 17:27:12 +0800
> Subject: [PATCH] pptp-linux: Add dependency to fix parallel build
>
> Add dependency on the generated config.h file for pptp.c and version.c.
>
> Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
> ---
> .../pptp-linux-1.7.2/fix-parallel-build.patch | 19 +++++++++++++++++++
> recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb | 6 ++++--
> 2 files changed, 23 insertions(+), 2 deletions(-)
> create mode 100644 recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
>
> diff --git a/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
> new file mode 100644
> index 0000000..77722b0
> --- /dev/null
> +++ b/recipes-protocols/pptp-linux/pptp-linux-1.7.2/fix-parallel-build.patch
> @@ -0,0 +1,19 @@
> +pptp.c and version.c depend on config.h
> +
> +Upstream-Status: Backport
> +
> +Upstream has already similar fixes. Will be available on next release.
> +
> +Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
> +
> +--- a/Makefile 2013-02-27 17:09:24.431226665 +0800
> ++++ b/Makefile 2013-02-27 17:09:03.442075550 +0800
> +@@ -43,6 +43,8 @@
> + pptpsetup.8: pptpsetup
> + pod2man $? > $@
> +
> ++pptp.o version.o: config.h
> ++
> + config.h:
> + echo "/* text added by Makefile target config.h */" > config.h
> + echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h
> diff --git a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
> index ac3f8f6..c173af4 100644
> --- a/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
> +++ b/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
> @@ -9,10 +9,12 @@ SECTION = "network"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
> - file://options.pptp"
> + file://options.pptp \
> + file://fix-parallel-build.patch \
> + "
>
> SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
> SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-18 19:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-28 4:31 [meta-networking][PATCH] pptp-linux: Add dependency to fix parallel build Jesse Zhang
2013-02-28 6:23 ` Khem Raj
2013-02-28 6:51 ` Jesse Zhang
2013-03-18 19:24 ` Joe MacDonald
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox