Patchwork commiting recipe for batctl

login
register
mail settings
Submitter Todd Kempel
Date Nov. 11, 2011, 9:17 p.m.
Message ID <1321046272-3745-1-git-send-email-todd.kempel@gmail.com>
Download mbox | patch
Permalink /patch/14863/
State Rejected
Headers show

Comments

Todd Kempel - Nov. 11, 2011, 9:17 p.m.
From: Todd Kempel <todd@todd-VirtualBox.(none)>

Signed-off-by: Todd Kempel <todd@todd-VirtualBox.(none)>
---
 recipes/batctl/batctl-2011.3.0/makefile-fix.patch |   18 +++++++++++++
 recipes/batctl/batctl.inc                         |   28 +++++++++++++++++++++
 recipes/batctl/batctl_2011.3.0.bb                 |    6 ++++
 recipes/batctl/files/makefile-fix.patch           |   18 +++++++++++++
 4 files changed, 70 insertions(+), 0 deletions(-)
 create mode 100644 recipes/batctl/batctl-2011.3.0/makefile-fix.patch
 create mode 100644 recipes/batctl/batctl.inc
 create mode 100644 recipes/batctl/batctl_2011.3.0.bb
 create mode 100644 recipes/batctl/files/makefile-fix.patch
Paul Menzel - Nov. 11, 2011, 9:42 p.m.
Dear Todd,


thank you for your contribution.


Am Freitag, den 11.11.2011, 15:17 -0600 schrieb Todd Kempel:
> From: Todd Kempel <todd@todd-VirtualBox.(none)>

Please use a real email address.

	git config user.email todd.kempel@gmail.com

The commit summary should be the following

	batctl: Add version 2011.3.0 (initial recipe)

Please also add a short description how you tested this recipe and if
everything works. Did you also try a uClibc based build?

There are some guide lines in the OE wiki [1][2][3].

> Signed-off-by: Todd Kempel <todd@todd-VirtualBox.(none)>
> ---
>  recipes/batctl/batctl-2011.3.0/makefile-fix.patch |   18 +++++++++++++
>  recipes/batctl/batctl.inc                         |   28 +++++++++++++++++++++
>  recipes/batctl/batctl_2011.3.0.bb                 |    6 ++++
>  recipes/batctl/files/makefile-fix.patch           |   18 +++++++++++++
>  4 files changed, 70 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/batctl/batctl-2011.3.0/makefile-fix.patch
>  create mode 100644 recipes/batctl/batctl.inc
>  create mode 100644 recipes/batctl/batctl_2011.3.0.bb
>  create mode 100644 recipes/batctl/files/makefile-fix.patch
> 
> diff --git a/recipes/batctl/batctl-2011.3.0/makefile-fix.patch b/recipes/batctl/batctl-2011.3.0/makefile-fix.patch
> new file mode 100644
> index 0000000..45bd69e
> --- /dev/null
> +++ b/recipes/batctl/batctl-2011.3.0/makefile-fix.patch

Please add a patch header [3]. Like what problem does that patch fix and
did you send it upstream?

> @@ -0,0 +1,18 @@
> +--- batctl-2011.3.0.orig/Makefile	2011-11-09 16:22:58.088166320 -0600
> ++++ batctl-2011.3.0/Makefile	2011-11-09 16:33:21.181006028 -0600
> +@@ -24,7 +24,6 @@
> + MANPAGE = man/batctl.8
> + 
> + # batctl flags and options
> +-CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD

Why does not that work? Do you have an idea?

> + LDLIBS += -lm
> + 
> + # disable verbose output
> +@@ -38,7 +37,6 @@
> + endif
> + 
> + # standard build tools
> +-CC ?= gcc

Does `oe_runmake` not overwrite that?

> + RM ?= rm -f
> + INSTALL ?= install
> + MKDIR ?= mkdir -p
> diff --git a/recipes/batctl/batctl.inc b/recipes/batctl/batctl.inc
> new file mode 100644
> index 0000000..71dd948
> --- /dev/null
> +++ b/recipes/batctl/batctl.inc
> @@ -0,0 +1,28 @@
> +DESCRIPTION = "Routing protocol daemon for multi-hop ad-hoc mesh networks."
> +SECTION = "console/network"
> +PRIORITY = "optional"
> +LICENSE = "GPL"
> +HOMEPAGE = "http://www.open-mesh.net/"

`HOMEPAGE` goes below the description please [4].

> +
> +INC_PR = "r2"

Start with `r0` please when committing it upstream.

> +
> +RDEPENDS_${PN} = "kernel-module-tun"
> +
> +SRC_URI = "http://downloads.open-mesh.net/batman/stable/sources/batctl/batctl-${PV}.tar.gz \
> +           file://makefile-fix.patch \
> +          "
> +
> +S = "${WORKDIR}/batctl-${PV}"

That should be the default?

> +
> +do_compile() {
> +  oe_runmake
> +}
> +
> +do_stage() {
> +  :
> +}

`do_stage` is deprecated [5].

> +
> +do_install() {
> +  install -d ${D}${bindir}
> +  install -m 0755 batctl ${D}${bindir}
> +}
> diff --git a/recipes/batctl/batctl_2011.3.0.bb b/recipes/batctl/batctl_2011.3.0.bb
> new file mode 100644
> index 0000000..2b32e63
> --- /dev/null
> +++ b/recipes/batctl/batctl_2011.3.0.bb
> @@ -0,0 +1,6 @@
> +require batctl.inc
> +PR = "${INC_PR}.1"

Start with `.0` please.

> +
> +
> +SRC_URI[md5sum] = "8eb197896049bb04a6beef56015a16b6"
> +SRC_URI[sha256sum] = "94922fd167d2bca5193cc7465bfc212c2c3595da70e653506493dfc65e4410fb"
> diff --git a/recipes/batctl/files/makefile-fix.patch b/recipes/batctl/files/makefile-fix.patch
> new file mode 100644
> index 0000000..45bd69e
> --- /dev/null
> +++ b/recipes/batctl/files/makefile-fix.patch
> @@ -0,0 +1,18 @@
> +--- batctl-2011.3.0.orig/Makefile	2011-11-09 16:22:58.088166320 -0600
> ++++ batctl-2011.3.0/Makefile	2011-11-09 16:33:21.181006028 -0600
> +@@ -24,7 +24,6 @@
> + MANPAGE = man/batctl.8
> + 
> + # batctl flags and options
> +-CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD
> + LDLIBS += -lm
> + 
> + # disable verbose output
> +@@ -38,7 +37,6 @@
> + endif
> + 
> + # standard build tools
> +-CC ?= gcc
> + RM ?= rm -f
> + INSTALL ?= install
> + MKDIR ?= mkdir -p

This is already in the correct folder. Please commit just one patch. ;-)

Otherwise that looks nice. Please resubmit as `[PATCH v2]` [6].

	--subject-prefix="PATCH v2"


Thanks,

Paul


[1] http://www.openembedded.org/wiki/Commit_Policy
[2] http://www.openembedded.org/wiki/Commit_log_example
[3] http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
[4] http://www.openembedded.org/wiki/Styleguide
[5] http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

Patch

diff --git a/recipes/batctl/batctl-2011.3.0/makefile-fix.patch b/recipes/batctl/batctl-2011.3.0/makefile-fix.patch
new file mode 100644
index 0000000..45bd69e
--- /dev/null
+++ b/recipes/batctl/batctl-2011.3.0/makefile-fix.patch
@@ -0,0 +1,18 @@ 
+--- batctl-2011.3.0.orig/Makefile	2011-11-09 16:22:58.088166320 -0600
++++ batctl-2011.3.0/Makefile	2011-11-09 16:33:21.181006028 -0600
+@@ -24,7 +24,6 @@
+ MANPAGE = man/batctl.8
+ 
+ # batctl flags and options
+-CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD
+ LDLIBS += -lm
+ 
+ # disable verbose output
+@@ -38,7 +37,6 @@
+ endif
+ 
+ # standard build tools
+-CC ?= gcc
+ RM ?= rm -f
+ INSTALL ?= install
+ MKDIR ?= mkdir -p
diff --git a/recipes/batctl/batctl.inc b/recipes/batctl/batctl.inc
new file mode 100644
index 0000000..71dd948
--- /dev/null
+++ b/recipes/batctl/batctl.inc
@@ -0,0 +1,28 @@ 
+DESCRIPTION = "Routing protocol daemon for multi-hop ad-hoc mesh networks."
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.open-mesh.net/"
+
+INC_PR = "r2"
+
+RDEPENDS_${PN} = "kernel-module-tun"
+
+SRC_URI = "http://downloads.open-mesh.net/batman/stable/sources/batctl/batctl-${PV}.tar.gz \
+           file://makefile-fix.patch \
+          "
+
+S = "${WORKDIR}/batctl-${PV}"
+
+do_compile() {
+  oe_runmake
+}
+
+do_stage() {
+  :
+}
+
+do_install() {
+  install -d ${D}${bindir}
+  install -m 0755 batctl ${D}${bindir}
+}
diff --git a/recipes/batctl/batctl_2011.3.0.bb b/recipes/batctl/batctl_2011.3.0.bb
new file mode 100644
index 0000000..2b32e63
--- /dev/null
+++ b/recipes/batctl/batctl_2011.3.0.bb
@@ -0,0 +1,6 @@ 
+require batctl.inc
+PR = "${INC_PR}.1"
+
+
+SRC_URI[md5sum] = "8eb197896049bb04a6beef56015a16b6"
+SRC_URI[sha256sum] = "94922fd167d2bca5193cc7465bfc212c2c3595da70e653506493dfc65e4410fb"
diff --git a/recipes/batctl/files/makefile-fix.patch b/recipes/batctl/files/makefile-fix.patch
new file mode 100644
index 0000000..45bd69e
--- /dev/null
+++ b/recipes/batctl/files/makefile-fix.patch
@@ -0,0 +1,18 @@ 
+--- batctl-2011.3.0.orig/Makefile	2011-11-09 16:22:58.088166320 -0600
++++ batctl-2011.3.0/Makefile	2011-11-09 16:33:21.181006028 -0600
+@@ -24,7 +24,6 @@
+ MANPAGE = man/batctl.8
+ 
+ # batctl flags and options
+-CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD
+ LDLIBS += -lm
+ 
+ # disable verbose output
+@@ -38,7 +37,6 @@
+ endif
+ 
+ # standard build tools
+-CC ?= gcc
+ RM ?= rm -f
+ INSTALL ?= install
+ MKDIR ?= mkdir -p