diff mbox

[2/3] iprutils: update patches for the new version

Message ID 1410974363-43368-2-git-send-email-Vincent.Riera@imgtec.com
State Superseded
Headers show

Commit Message

Vicente Olivert Riera Sept. 17, 2014, 5:19 p.m. UTC 
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 .../iprutils/iprutils-0001-Don-t-use-gettext.patch |   32 ++++++++++++++++++++
 ...low-CFLAGS-to-be-extended-from-the-enviro.patch |   31 +++++++++++++++++++
 .../iprutils/iprutils-01-dont-use-gettext.patch    |   30 ------------------
 .../iprutils-02-use-environment-cflags.patch       |   20 ------------
 4 files changed, 63 insertions(+), 50 deletions(-)
 create mode 100644 package/iprutils/iprutils-0001-Don-t-use-gettext.patch
 create mode 100644 package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
 delete mode 100644 package/iprutils/iprutils-01-dont-use-gettext.patch
 delete mode 100644 package/iprutils/iprutils-02-use-environment-cflags.patch

Comments

Gustavo Zacarias Sept. 17, 2014, 6:41 p.m. UTC | #1 
On 09/17/2014 02:19 PM, Vicente Olivert Riera wrote:

> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  .../iprutils/iprutils-0001-Don-t-use-gettext.patch |   32 ++++++++++++++++++++
>  ...low-CFLAGS-to-be-extended-from-the-enviro.patch |   31 +++++++++++++++++++
>  .../iprutils/iprutils-01-dont-use-gettext.patch    |   30 ------------------
>  .../iprutils-02-use-environment-cflags.patch       |   20 ------------
>  4 files changed, 63 insertions(+), 50 deletions(-)
>  create mode 100644 package/iprutils/iprutils-0001-Don-t-use-gettext.patch
>  create mode 100644 package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
>  delete mode 100644 package/iprutils/iprutils-01-dont-use-gettext.patch
>  delete mode 100644 package/iprutils/iprutils-02-use-environment-cflags.patch

Hi.
The patch updates should be part of the first (bump) patch, otherwise
it's just an extra commit that fixes breakage because the patches don't
apply/work.
It's like adding a new package that needs patches and said patches are
part of a second patch ("these make it work for real").
Regards.
Vicente Olivert Riera Sept. 18, 2014, 9:24 a.m. UTC | #2 
On 09/17/2014 07:41 PM, Gustavo Zacarias wrote:
> On 09/17/2014 02:19 PM, Vicente Olivert Riera wrote:
>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> ---
>>   .../iprutils/iprutils-0001-Don-t-use-gettext.patch |   32 ++++++++++++++++++++
>>   ...low-CFLAGS-to-be-extended-from-the-enviro.patch |   31 +++++++++++++++++++
>>   .../iprutils/iprutils-01-dont-use-gettext.patch    |   30 ------------------
>>   .../iprutils-02-use-environment-cflags.patch       |   20 ------------
>>   4 files changed, 63 insertions(+), 50 deletions(-)
>>   create mode 100644 package/iprutils/iprutils-0001-Don-t-use-gettext.patch
>>   create mode 100644 package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
>>   delete mode 100644 package/iprutils/iprutils-01-dont-use-gettext.patch
>>   delete mode 100644 package/iprutils/iprutils-02-use-environment-cflags.patch
>
> Hi.
> The patch updates should be part of the first (bump) patch, otherwise
> it's just an extra commit that fixes breakage because the patches don't
> apply/work.
> It's like adding a new package that needs patches and said patches are
> part of a second patch ("these make it work for real").
> Regards.
>

Fixed. v2 patches sent.
diff mbox

Patch

diff --git a/package/iprutils/iprutils-0001-Don-t-use-gettext.patch b/package/iprutils/iprutils-0001-Don-t-use-gettext.patch
new file mode 100644
index 0000000..a80cc87
--- /dev/null
+++ b/package/iprutils/iprutils-0001-Don-t-use-gettext.patch
@@ -0,0 +1,32 @@ 
+From 34fb0785f1d66ba1f79b470223426031f6258782 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Wed, 17 Sep 2014 17:48:54 +0100
+Subject: [PATCH 1/3] iprutils: Don't use gettext
+
+... since we don't have any translation.
+
+Based on the former patch by Jeremy Kerr.
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ iprconfig.h |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/iprconfig.h b/iprconfig.h
+index cad591a..4a1fa0d 100644
+--- a/iprconfig.h
++++ b/iprconfig.h
+@@ -11,9 +11,7 @@
+  *
+  **/
+ 
+-#include <libintl.h>
+-
+-#define _(string) gettext(string)
++#define _(string) (string)
+ #define __(string) (string)
+ #define EXIT_FLAG		0x8000	/* stops at given screen on exit call */
+ #define CANCEL_FLAG		0x4000	/* stops at given screen on quit call */
+-- 
+1.7.1
+
diff --git a/package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch b/package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
new file mode 100644
index 0000000..dbfa008
--- /dev/null
+++ b/package/iprutils/iprutils-0002-Allow-CFLAGS-to-be-extended-from-the-enviro.patch
@@ -0,0 +1,31 @@ 
+From 9a46afebdc63ba67cd95748f898969d6c622a129 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Wed, 17 Sep 2014 18:08:31 +0100
+Subject: [PATCH 1/2] iprutils: Allow CFLAGS to be extended from the environment
+
+We also remove -g, since we don't necessarily want to build with
+debugging symbols. Buildroot will add -g if needed.
+
+Based on the former patch by Thomas Petazzoni.
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c4e2427..66c4942 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ CC = gcc
+ 
+ include version.mk
+ 
+-CFLAGS += -g -Wall $(IPR_DEFINES)
++override CFLAGS += -Wall $(IPR_DEFINES)
+ UTILS_VER = $(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL)
+ TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude .git --exclude CVS --exclude applied-patches --exclude series --exclude txt --exclude pc --exclude patches --exclude debug --exclude *~* iprutils
+ 
+-- 
+1.7.1
+
diff --git a/package/iprutils/iprutils-01-dont-use-gettext.patch b/package/iprutils/iprutils-01-dont-use-gettext.patch
deleted file mode 100644
index 8d3d5dd..0000000
--- a/package/iprutils/iprutils-01-dont-use-gettext.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From 0aa3952890e14f5447147ae4d0d37c515e4fefea Mon Sep 17 00:00:00 2001
-From: Jeremy Kerr <jk@ozlabs.org>
-Date: Fri, 26 Jul 2013 13:07:22 +0800
-Subject: [PATCH] iprconfig: Don't use gettext
-
-... since we don't have any translations.
-
-Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
----
- iprconfig.h |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/iprconfig.h b/iprconfig.h
-index 867b5ac..a9cdf5e 100644
---- a/iprconfig.h
-+++ b/iprconfig.h
-@@ -11,9 +11,7 @@
-  *
-  **/
- 
--#include <libintl.h>
--
--#define _(string) gettext(string)
-+#define _(string) (string)
- #define __(string) (string)
- #define EXIT_FLAG		0x8000	/* stops at given screen on exit call */
- #define CANCEL_FLAG		0x4000	/* stops at given screen on quit call */
--- 
-1.7.10.4
-
diff --git a/package/iprutils/iprutils-02-use-environment-cflags.patch b/package/iprutils/iprutils-02-use-environment-cflags.patch
deleted file mode 100644
index 8eab450..0000000
--- a/package/iprutils/iprutils-02-use-environment-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-Allow CFLAGS to be extended from the environment
-
-We also remove -g, since we don't necessarily want to build with
-debugging symbols. Buildroot will add -g if needed.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,7 @@
- 
- include version.mk
- 
--CFLAGS = -g -Wall $(IPR_DEFINES)
-+override CFLAGS += -Wall $(IPR_DEFINES)
- UTILS_VER = $(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL)
- TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude CVS --exclude applied-patches --exclude series --exclude txt --exclude pc --exclude patches --exclude debug --exclude *~* iprutils
-