Skip to contentSkip to conversation

Add new package apr-util

PATCH Superseded Rico Bachmann 2 participants 3 messages Apr 24, 2012 – Apr 25, 2012

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 Add new package apr-util

---
v1: Add package apr-util
Add patch to remove check for apr
because check for apr search for ./apr and not for defined folder
v2: Change spaces to tab in *.mk
v3: Add Signed-off-by and comments to package-patch
---

---
 package/Config.in                                  |    1 +
 package/apr-util/Config.in                         |    7 +++++++
 .../apr-util/apr-util-1.4.1-remove-checkapr.patch  |   17 +++++++++++++++++
 package/apr-util/apr-util.mk                       |   14 ++++++++++++++
 4 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 package/apr-util/Config.in
 create mode 100644 package/apr-util/apr-util-1.4.1-remove-checkapr.patch
 create mode 100644 package/apr-util/apr-util.mk
package/Config.in +1 -0
index 5ae1c81..805f56a 100644
@@ -375,6 +375,7 @@ endmenu
 
 menu "Other"
 source "package/apr/Config.in"
+source "package/apr-util/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
package/apr-util/Config.in new file +7 -0
new file mode 100644
index 0000000..a4411ba
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_APR_UTIL
+	bool "apr-util"
+	select BR2_PACKAGE_APR
+	help
+	  The utility library for the apache runtime project
+
+	  http://apr.apache.org/
package/apr-util/apr-util-1.4.1-remove-checkapr.patch new file +17 -0
new file mode 100644
index 0000000..128a1b0
@@ -0,0 +1,17 @@
+Signed-off-by: Rico Bachmann <[email protected]>
+---
+disable the check for APU_FIND_APR because the check only looks into folders
+named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
+---
+diff -rupN apr-util-1.4.1/configure.in apr-util-1.4.1-fix/configure.in
+--- apr-util-1.4.1/configure.in	2009-12-17 20:15:19.000000000 +0100
++++ apr-util-1.4.1-fix/configure.in	2012-04-24 10:10:32.000000000 +0200
+@@ -99,7 +99,7 @@ fi
+ dnl
+ dnl Find the APR includes directory and (possibly) the source (base) dir.
+ dnl
+-APU_FIND_APR
++dnl APU_FIND_APR
+ 
+ dnl
+ dnl even though we use apr_rules.mk for building apr-util, we need
package/apr-util/apr-util.mk new file +14 -0
new file mode 100644
index 0000000..f5f4d80
@@ -0,0 +1,14 @@
+#############################################################
+#
+# apr-util
+#
+#############################################################
+APR_UTIL_VERSION = 1.4.1
+APR_UTIL_SITE = http://archive.apache.org/dist/apr
+APR_UTIL_INSTALL_STAGING = YES
+APR_UTIL_DEPENDENCIES = apr
+APR_UTIL_CONF_OPT = \
+	--prefix=/usr \
+	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION)
+
+$(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH v3 1/1 Add new package apr-util

Hello Rico,

Le Tue, 24 Apr 2012 13:55:24 +0200,
Rico Bachmann <[email protected]> a ?crit :

Quoted 9 lines

---
v1: Add package apr-util
Add patch to remove check for apr
because check for apr search for ./apr and not for defined folder
v2: Change spaces to tab in *.mk
v3: Add Signed-off-by and comments to package-patch
---
---

Those two lines with '---' are useless.

package/apr-util/apr-util-1.4.1-remove-checkapr.patch line 5

Quoted 11 lines
package/apr-util/apr-util-1.4.1-remove-checkapr.patch new file +5 -0
new file mode 100644
index 0000000..128a1b0
@@ -0,0 +1,17 @@
+Signed-off-by: Rico Bachmann <[email protected]>
+---
+disable the check for APU_FIND_APR because the check only looks into folders
+named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
+---

The description should be *before* the Signed-off-by, and not separated by ---.

It seems like you misunderstand what the format of a patch should be. Here is an explanation that I hope will clarify things:

------------------------8<-------------------
This is the title, should be less than ~80 chars

This is a long description that explains what the patch is doing, why, how, and all other details that are useful. This description (and the title above, and the above Signed-off-by line) will be part of the commit log and remain in the Git history. Therefore, it should *not* contain any changelog information about the patch, or other "personal" messages. The title and the description must be separated by one empty line.

---
This is some text that will *not* be included in the Git history, so it is typically used for the changelog.

 package/Config.in                                  |    1 +
 package/apr-util/Config.in                         |    7 +++++++
 .../apr-util/apr-util-1.4.1-remove-checkapr.patch  |   17 +++++++++++++++++
 package/apr-util/apr-util.mk                       |   14 ++++++++++++++
 4 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 package/apr-util/Config.in
 create mode 100644 package/apr-util/apr-util-1.4.1-remove-checkapr.patch
 create mode 100644 package/apr-util/apr-util.mk
package/Config.in +1 -0
index 5ae1c81..805f56a 100644
@@ -375,6 +375,7 @@ endmenu
 
 menu "Other"
 source "package/apr/Config.in"
+source "package/apr-util/Config.in"
 source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"

------------------------8<-------------------

Regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH v3 1/1 Add new package apr-util

Hi Thomas

Am 24.04.2012, 14:05 Uhr, schrieb Thomas Petazzoni <[email protected]>:

Quoted 35 lines

Hello Rico,

Le Tue, 24 Apr 2012 13:55:24 +0200,
Rico Bachmann <[email protected]> a ?crit :

Quoted 9 lines

---
v1: Add package apr-util
Add patch to remove check for apr
because check for apr search for ./apr and not for defined folder
v2: Change spaces to tab in *.mk
v3: Add Signed-off-by and comments to package-patch
---
---

Those two lines with '---' are useless.

Quoted 10 lines
package/apr-util/apr-util-1.4.1-remove-checkapr.patch new file +3 -0
new file mode 100644
index 0000000..128a1b0
@@ -0,0 +1,17 @@
+Signed-off-by: Rico Bachmann <[email protected]>
+---
+disable the check for APU_FIND_APR because the check only looks into  
Quoted 4 lines

folders
+named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6)
+---

The description should be *before* the Signed-off-by, and not separated by ---.

Quoted 2 lines

It seems like you misunderstand what the format of a patch should be. Here is an explanation that I hope will clarify things:

I'm really not that into patches... no diffrence if it is the patch format or patches at all... At the moment, I'm learning by doing...

Thanks for your explanation.

Quoted 40 lines

------------------------8<-------------------
This is the title, should be less than ~80 chars

This is a long description that explains what the patch is doing, why, how, and all other details that are useful. This description (and the title above, and the above Signed-off-by line) will be part of the commit log and remain in the Git history. Therefore, it should *not* contain any changelog information about the patch, or other "personal" messages. The title and the description must be separated by one empty line.

---
This is some text that will *not* be included in the Git history, so it is typically used for the changelog.

 package/Config.in                                  |    1 +
 package/apr-util/Config.in                         |    7 +++++++
 .../apr-util/apr-util-1.4.1-remove-checkapr.patch  |   17  
+++++++++++++++++
 package/apr-util/apr-util.mk                       |   14 ++++++++++++++
 4 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 package/apr-util/Config.in
 create mode 100644 package/apr-util/apr-util-1.4.1-remove-checkapr.patch
 create mode 100644 package/apr-util/apr-util.mk
package/Config.in +0 -0
index 5ae1c81..805f56a 100644
@@ -375,6 +375,7 @@ endmenu

menu "Other"
source "package/apr/Config.in"
+source "package/apr-util/Config.in"
source "package/fftw/Config.in"
source "package/libargtable2/Config.in"
source "package/argp-standalone/Config.in"
------------------------8<-------------------

Quoted 3 lines

Regards,

Thomas

I'll try to send a proper formated patch today. As soon as I find time.

And I do my best to get my next patch in the right format from beginning!

so long
Rico

Signature · 1 line
Erstellt mit Operas revolution?rem E-Mail-Modul: http://www.opera.com/mail/