Skip to contentSkip to conversation

monkey: new package

PATCH Superseded Julien CORJON 3 participants 3 messages Jun 26, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Julien CORJON

author
#0 lore raw

PATCH 1/1 monkey: new package

From: Morgan Delestre <[email protected]>

Signed-off-by Morgan Delestre <[email protected]>
Signed-off-by Julien Corjon <[email protected]>
---
 package/Config.in                                   |  1 +
 package/monkey/0001-Configure-accept-all-conf.patch | 13 +++++++++++++
 package/monkey/Config.in                            | 11 +++++++++++
 package/monkey/monkey.mk                            | 20 ++++++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 package/monkey/0001-Configure-accept-all-conf.patch
 create mode 100644 package/monkey/Config.in
 create mode 100644 package/monkey/monkey.mk
package/Config.in +1 -0
index fac632f..3f5d853 100644
@@ -1224,6 +1224,7 @@ endif
 	source "package/modem-manager/Config.in"
 	source "package/mongoose/Config.in"
 	source "package/mongrel2/Config.in"
+	source "package/monkey/Config.in"
 	source "package/mosquitto/Config.in"
 	source "package/mrouted/Config.in"
 	source "package/mtr/Config.in"
package/monkey/0001-Configure-accept-all-conf.patch new file +13 -0
new file mode 100644
index 0000000..471e25b
@@ -0,0 +1,13 @@
+Index: monkey-1.5.6/configure
+===================================================================
+--- monkey-1.5.6.orig/configure
++++ monkey-1.5.6/configure
+@@ -1204,7 +1204,7 @@ for arg in $*; do
+			;;
+		--with-libtool-sysroot*)
+			;;
+-		*)
++		--help)
+			echo "Usage: ./configure [OPTION]... [VAR=VALUE]..."
+			echo
+			echo -e $bldwht"Optional Commands:" $txtrst
package/monkey/Config.in new file +11 -0
new file mode 100644
index 0000000..519fd65
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MONKEY
+        bool "monkey"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+        help
+          Money Server is a fast and lightweight web server for Linux platforms.
+
+          http://monkey-project.com/
+
+comment "monkey needs an (e)glibc toolchain w/ threads, headers >= 2.6"
+        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
package/monkey/monkey.mk new file +20 -0
new file mode 100644
index 0000000..20ce048
@@ -0,0 +1,20 @@
+#############################################################
+#
+# monkey
+#
+#############################################################
+MONKEY_VERSION_MAJOR = 1
+MONKEY_VERSION_MINOR = 5
+MONKEY_VERSION_PATCH = 6
+MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR).$(MONKEY_VERSION_PATCH)
+MONKEY_SOURCE = monkey-$(MONKEY_VERSION).tar.gz
+MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR)/
+MONKEY_INSTALL_STAGING = YES
+MONKEY_INSTALL_TARGET = YES
+
+# Monkey default memory allocator should be jemalloc
+# but monkey configure script does not handle
+# cross-compilation in a good way
+MONKEY_CONF_OPTS =--malloc-libc
+
+$(eval $(call autotools-package))
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 monkey: new package

Hi,

package/monkey/Config.in line 6

Quoted 12 lines · Julien CORJON
package/monkey/Config.in new file +6 -0
new file mode 100644
index 0000000..519fd65
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MONKEY
+        bool "monkey"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+        help
+          Money Server is a fast and lightweight web server for Linux platforms.

         Typo -^
Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 monkey: new package

In reply to Julien CORJON

Julien, Morgan,

package/monkey/0001-Configure-accept-all-conf.patch

Quoted 5 lines · Julien CORJON
package/monkey/0001-Configure-accept-all-conf.patch new file +0 -0
new file mode 100644
index 0000000..471e25b

All patches should have a description + Signed-off-by. See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches.

package/monkey/Config.in line 4

Quoted 10 lines
package/monkey/Config.in new file +4 -0
new file mode 100644
index 0000000..519fd65
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MONKEY
+        bool "monkey"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_USES_GLIBC

Wrong indentation, should be one tab.

package/monkey/Config.in line 10

Quoted 6 lines
package/monkey/Config.in new file +6 -0
+        help
+          Money Server is a fast and lightweight web server for Linux platforms.
+
+          http://monkey-project.com/
+
+comment "monkey needs an (e)glibc toolchain w/ threads, headers >= 2.6"

No need to indicate headers >= 2.6.

package/monkey/monkey.mk line 5

Quoted 12 lines
package/monkey/Config.in new file +1 -0
+        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
package/monkey/monkey.mk new file +5 -0
new file mode 100644
index 0000000..20ce048
@@ -0,0 +1,20 @@
+#############################################################
+#
+# monkey
+#
+#############################################################

Wrong number of # signs, there should be 80 of them.

package/monkey/monkey.mk line 9

Quoted 4 lines
package/monkey/monkey.mk new file +4 -0
+MONKEY_VERSION_MAJOR = 1
+MONKEY_VERSION_MINOR = 5
+MONKEY_VERSION_PATCH = 6
+MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR).$(MONKEY_VERSION_PATCH)

No need to split that much:

MONKEY_VERSION_MAJOR = 1.5
MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).6

package/monkey/monkey.mk line 11

Quoted 2 lines
package/monkey/monkey.mk new file +2 -0
+MONKEY_SOURCE = monkey-$(MONKEY_VERSION).tar.gz
+MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR).$(MONKEY_VERSION_MINOR)/

And:

MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR)/

package/monkey/monkey.mk line 13

Quoted 2 lines
package/monkey/monkey.mk new file +2 -0
+MONKEY_INSTALL_STAGING = YES
+MONKEY_INSTALL_TARGET = YES

MONKEY_INSTALL_TARGET = YES is not needed, that's the default.

package/monkey/monkey.mk line 20

Quoted 7 lines
package/monkey/monkey.mk new file +7 -0
+
+# Monkey default memory allocator should be jemalloc
+# but monkey configure script does not handle
+# cross-compilation in a good way
+MONKEY_CONF_OPTS =--malloc-libc
+
+$(eval $(call autotools-package))

No need for $(eval $(call ...)), just $(eval $(autotools-package)).

Also, this package is not using the autotools, so please don't use autotools-package but generic-package instead. This way, your patch will also no longer be needed.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com