Skip to contentSkip to conversation

package/monkey: fix musl build

PATCH New Bernd Kuhls 3 participants 5 messages Jan 23, 2016 – Jan 26, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/monkey: fix musl build

Fixes
http://autobuild.buildroot.net/results/f69/f690cb1efece8a47fccdf3e782bbde4d1b2cd6b3/
http://autobuild.buildroot.net/results/21b/21b6fa8b2586f318ff071085f2b204bd555b425b/
http://autobuild.buildroot.net/results/0bf/0bf7a83a4ccbbcb3ff181ac962e6fdd0099a19f1/

---
 package/monkey/monkey.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/monkey/monkey.mk +1 -1
index 67c8f35..02c26c9 100644
@@ -30,7 +30,7 @@ MONKEY_CONF_OPTS += --uclib-mode --no-backtrace
 endif
 
 ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
-MONKEY_CONF_OPTS += --musl-mode
+MONKEY_CONF_OPTS += --musl-mode --no-backtrace
 endif
 
 ifeq ($(BR2_PACKAGE_MONKEY_SHARED),y)
Signature · 1 line
2.7.0.rc3
#1 lore raw

PATCH 2/2 package/monkey: bump version to 1.6.8

---
 package/monkey/monkey.hash | 6 +++---
 package/monkey/monkey.mk   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)
package/monkey/monkey.hash +3 -3
index 6c7eada..2f39945 100644
@@ -1,3 +1,3 @@
-# md5 from http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz.md5, sha256 locally computed:
-md5    9699e4c9ea6ce6b989907c252ae80254 				monkey-1.5.6.tar.gz
-sha256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22	monkey-1.5.6.tar.gz
+# md5 from http://monkey-project.com/releases/1.6/monkey-1.6.8.tar.gz.md5, sha256 locally computed:
+md5	aa9b95e16023a7fc062f00a197da059a					monkey-1.6.8.tar.gz
+sha256	936aa276d11dea77cda2703eb5d1b89ede1cf8d44440e1ec029cafb10effb3cf	monkey-1.6.8.tar.gz
package/monkey/monkey.mk +2 -4
index 02c26c9..da2a480 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-MONKEY_VERSION_MAJOR = 1.5
-MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).6
+MONKEY_VERSION_MAJOR = 1.6
+MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).8
 MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR)
 MONKEY_LICENSE = Apache-2.0
 MONKEY_LICENSE_FILES = LICENSE
@@ -17,11 +17,9 @@ MONKEY_LICENSE_FILES = LICENSE
 MONKEY_CONF_OPTS = \
 	--prefix=/usr \
 	--sysconfdir=/etc/monkey \
-	--datadir=/var/www \
 	--mandir=/usr/share/man \
 	--logdir=/var/log \
 	--pidfile=/var/run \
-	--plugdir=/usr/lib/monkey \
 	--malloc-libc
 
 # --uclib-mode is not a typo
Signature · 1 line
2.7.0.rc3
#2 lore raw

PATCH 2/2 package/monkey: bump version to 1.6.8

Dear Bernd,

Le 23/01/2016 23:56, Bernd Kuhls a ?crit :

Quoted 35 lines
---
  package/monkey/monkey.hash | 6 +++---
  package/monkey/monkey.mk   | 6 ++----
  2 files changed, 5 insertions(+), 7 deletions(-)
package/monkey/monkey.hash +3 -3
index 6c7eada..2f39945 100644
@@ -1,3 +1,3 @@
-# md5 from http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz.md5, sha256 locally computed:
-md5    9699e4c9ea6ce6b989907c252ae80254 				monkey-1.5.6.tar.gz
-sha256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22	monkey-1.5.6.tar.gz
+# md5 from http://monkey-project.com/releases/1.6/monkey-1.6.8.tar.gz.md5, sha256 locally computed:
+md5	aa9b95e16023a7fc062f00a197da059a					monkey-1.6.8.tar.gz
+sha256	936aa276d11dea77cda2703eb5d1b89ede1cf8d44440e1ec029cafb10effb3cf	monkey-1.6.8.tar.gz
package/monkey/monkey.mk +2 -2
index 02c26c9..da2a480 100644
@@ -4,8 +4,8 @@
  #
  ################################################################################
 
-MONKEY_VERSION_MAJOR = 1.5
-MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).6
+MONKEY_VERSION_MAJOR = 1.6
+MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).8
  MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR)
  MONKEY_LICENSE = Apache-2.0
  MONKEY_LICENSE_FILES = LICENSE
@@ -17,11 +17,9 @@ MONKEY_LICENSE_FILES = LICENSE
  MONKEY_CONF_OPTS = \

package/monkey/monkey.mk MONKEY_LICENSE_FILES = LICENSE · line 25

Quoted 10 lines
package/monkey/monkey.mk +0 -2
  	--prefix=/usr \
  	--sysconfdir=/etc/monkey \
-	--datadir=/var/www \
  	--mandir=/usr/share/man \
  	--logdir=/var/log \
  	--pidfile=/var/run \
-	--plugdir=/usr/lib/monkey \
  	--malloc-libc
 
  # --uclib-mode is not a typo

Since monkey-1.6.0 build process is based on cmake. configure script is now deprecated [1].

Also the monkey package loose the shared library option.
I had a quick chat with the maintainer (Eduardo Silva) last week and reintegrate this shared library option is part of his roadmap. I suggest to wait for this option (which i use) before doing the bump.

Regards,

Julien Corjon

[1] http://monkey-project.com/announcements/v1.6.0/

#3 lore raw

PATCH 2/2 package/monkey: bump version to 1.6.8

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 5 lines · Bernd Kuhls
---
 package/monkey/monkey.hash | 6 +++---
 package/monkey/monkey.mk   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

Following the feedback from Julien, I've marked your patch as Changes Requested.

Thanks!

Thomas

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

PATCH 1/2 package/monkey: fix musl build

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/f69/f690cb1efece8a47fccdf3e782bbde4d1b2cd6b3/
http://autobuild.buildroot.net/results/21b/21b6fa8b2586f318ff071085f2b204bd555b425b/
http://autobuild.buildroot.net/results/0bf/0bf7a83a4ccbbcb3ff181ac962e6fdd0099a19f1/

---
 package/monkey/monkey.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Thomas

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