Skip to contentSkip to conversation

luarocks: bump to version 2.2.1

PATCH New Francois Perrad 3 participants 10 messages Mar 17, 2015 – Mar 20, 2015

lore
Share & tools
lore

Francois Perrad

author
#0 lore raw

PATCH 1/3 luarocks: bump to version 2.2.1

Signed-off-by Francois Perrad <[email protected]>
---
 package/luarocks/luarocks.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/luarocks/luarocks.mk +1 -1
index 40fdc91..12a1f08 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUAROCKS_VERSION = 2.2.0
+LUAROCKS_VERSION = 2.2.1
 LUAROCKS_SITE = http://luarocks.org/releases
 LUAROCKS_LICENSE = MIT
 LUAROCKS_LICENSE_FILES = COPYING
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 2/3 ljlinenoise: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Signed-off-by Francois Perrad <[email protected]>
---
 package/ljlinenoise/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/ljlinenoise/Config.in +2 -3
index 17be1be..ce1a156 100644
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LJLINENOISE
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
 	# ljsyscall is only available for some target architectures
-	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	help
 	  ljlinenoise is a pure LuaJIT port of linenoise,
 	  a small alternative to readline and libedit.

@@ -13,5 +13,4 @@ config BR2_PACKAGE_LJLINENOISE
 	  http://fperrad.github.io/ljlinenoise/
 
 comment "ljlinenoise needs LuaJIT"
-	depends on !BR2_PACKAGE_LUAJIT
-	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+	depends on !BR2_PACKAGE_LUAJIT && !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
Signature · 1 line
2.1.0
#2 lore raw

PATCH 2/3 ljlinenoise: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Dear Francois Perrad,

Quoted 10 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
---
 package/ljlinenoise/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/ljlinenoise/Config.in +0 -0
index 17be1be..ce1a156 100644

package/ljlinenoise/Config.in config BR2_PACKAGE_LJLINENOISE · line 8

Quoted 5 lines
package/ljlinenoise/Config.in +1 -1
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LJLINENOISE
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
 	# ljsyscall is only available for some target architectures
-	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Are you sure?

BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is clearly not the same as "BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb". For example, mips/mipsel are supported in LuaJIT, but not in the current condition of ljlinenoise.

Thomas

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

PATCH 2/3 ljlinenoise: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

2015-03-17 21:32 GMT+01:00 Thomas Petazzoni <
[email protected]>:

Quoted 19 lines

Dear Francois Perrad,

Review

Quoted 6 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
---
 package/ljlinenoise/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/package/ljlinenoise/Config.in

package/ljlinenoise/Config.in config BR2_PACKAGE_LJLINENOISE · line 8

Quoted 8 lines

index 17be1be..ce1a156 100644

package/ljlinenoise/Config.in +0 -1
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LJLINENOISE
      # ljsyscall is specifically for LuaJIT, not Lua.
      depends on BR2_PACKAGE_LUAJIT
      # ljsyscall is only available for some target architectures
-     depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm ||

BR2_armeb

Quoted 10 lines

package/ljlinenoise/Config.in config BR2_PACKAGE_LJLINENOISE · line 8

Quoted 1 line
package/ljlinenoise/Config.in +1 -0
+     depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Are you sure?

BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is clearly not the same as "BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb". For example, mips/mipsel are supported in LuaJIT, but not in the current condition of ljlinenoise.

This package is based on ljsyscall, so see the discussion in [patch 3/3] ljsyscall

Fran?ois

Quoted 6 lines

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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150318/1bd185ba/attachment.html>

author
#4 lore raw

PATCH 3/3 ljsyscall: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

In reply to Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
---
 package/ljsyscall/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ljsyscall/Config.in +2 -2
index dcbd521..b9ff04d 100644
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LJSYSCALL
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
 	# ljsyscall is only available for some target architectures
-	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	help
 	  An FFI implementation of the Linux and NetBSD kernel ABIs for LuaJIT.
 
 	  http://github.com/justincormack/ljsyscall
 
 comment "ljsyscall needs LuaJIT"
-	depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
+	depends on !BR2_PACKAGE_LUAJIT && !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
Signature · 1 line
2.1.0
#5 lore raw

PATCH 3/3 ljsyscall: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Dear Francois Perrad,

2015-03-17 21:04 GMT+01:00 Francois Perrad <[email protected]>:

Reviewed-by Angelo Compagnucci <[email protected]>
Quoted 2 lines
Signed-off-by Francois Perrad <[email protected]>

---

Patch is fine for me. Nothing to add.

Quoted 29 lines
 package/ljsyscall/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/ljsyscall/Config.in +2 -3
index dcbd521..b9ff04d 100644
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LJSYSCALL
        # ljsyscall is specifically for LuaJIT, not Lua.
        depends on BR2_PACKAGE_LUAJIT
        # ljsyscall is only available for some target architectures
-       depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+       depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
        help
          An FFI implementation of the Linux and NetBSD kernel ABIs for LuaJIT.
 
          http://github.com/justincormack/ljsyscall
 
 comment "ljsyscall needs LuaJIT"
-       depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
+       depends on !BR2_PACKAGE_LUAJIT && !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 
--

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 1 line
Profile: http://it.linkedin.com/in/compagnucciangelo
#6 lore raw

PATCH 3/3 ljsyscall: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Dear Francois Perrad,

2015-03-17 22:45 GMT+01:00 Angelo Compagnucci <[email protected]>:

Quoted 13 lines

Dear Francois Perrad,

2015-03-17 21:04 GMT+01:00 Francois Perrad <[email protected]>:

Reviewed-by Angelo Compagnucci <[email protected]>
Quoted 2 lines
Signed-off-by Francois Perrad <[email protected]>

---

Patch is fine for me. Nothing to add.

Quoted 3 lines
 package/ljsyscall/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 10 lines

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL · line 6

Quoted 10 lines
package/ljsyscall/Config.in +1 -1
index dcbd521..b9ff04d 100644
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LJSYSCALL
        # ljsyscall is specifically for LuaJIT, not Lua.
        depends on BR2_PACKAGE_LUAJIT
        # ljsyscall is only available for some target architectures
-       depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+       depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Sorry for not having spotted before but

BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS != BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb

Actually, BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is BR2_i386 has this condition more

((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT)

Are you sure LJSYSCALL package works on mips?

Quoted 21 lines
Quoted 12 lines
package/ljsyscall/Config.in +1 -2
        help
          An FFI implementation of the Linux and NetBSD kernel ABIs for LuaJIT.
 
          http://github.com/justincormack/ljsyscall
 
 comment "ljsyscall needs LuaJIT"
-       depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
+       depends on !BR2_PACKAGE_LUAJIT && !BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 
--

2.1.0

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--
Profile: http://it.linkedin.com/in/compagnucciangelo

Signature · 1 line
Profile: http://it.linkedin.com/in/compagnucciangelo
author
#7 lore raw

PATCH 3/3 ljsyscall: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

2015-03-17 23:37 GMT+01:00 Angelo Compagnucci <[email protected]> :

Quoted 35 lines

Dear Francois Perrad,

2015-03-17 22:45 GMT+01:00 Angelo Compagnucci <
angelo.compagnucci at gmail.com>:

Quoted 13 lines

Dear Francois Perrad,

2015-03-17 21:04 GMT+01:00 Francois Perrad <[email protected]>:

Reviewed-by Angelo Compagnucci <[email protected]>
Quoted 2 lines
Signed-off-by Francois Perrad <[email protected]>

---

Patch is fine for me. Nothing to add.

Quoted 3 lines
 package/ljsyscall/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 9 lines

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL · line 6

Quoted 9 lines
package/ljsyscall/Config.in +0 -1
index dcbd521..b9ff04d 100644
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LJSYSCALL
        # ljsyscall is specifically for LuaJIT, not Lua.
        depends on BR2_PACKAGE_LUAJIT
        # ljsyscall is only available for some target architectures
-       depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm ||

BR2_armeb

Quoted 1 line

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL · line 6

Quoted 1 line
package/ljsyscall/Config.in +1 -0
+       depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Sorry for not having spotted before but

BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS != BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb

Quoted 7 lines

Actually, BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS is BR2_i386 has this condition more

((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT)

Are you sure LJSYSCALL package works on mips?

there is a folder
http://github.com/justincormack/ljsyscall/tree/master/syscall/linux/mips
and the readme (section requirements) contains :
" On Linux ARM (soft or hard float), x86, AMD64, and PPC32 and MIPS32
(o32 ABI) architectures are supported; this is the complete set of architectures that LuaJIT supports. "

Fran?ois

Quoted 22 lines
Quoted 2 lines

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL · line 8

Quoted 2 lines
package/ljsyscall/Config.in +0 -0
        help
          An FFI implementation of the Linux and NetBSD kernel ABIs for

LuaJIT.

Quoted 5 lines

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL

Quoted 5 lines
package/ljsyscall/Config.in +0 -1
          http://github.com/justincormack/ljsyscall
 
 comment "ljsyscall needs LuaJIT"
-       depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 ||

BR2_powerpc || BR2_arm || BR2_armeb)

Quoted 1 line

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL · line 12

Quoted 1 line
package/ljsyscall/Config.in +1 -0
+       depends on !BR2_PACKAGE_LUAJIT &&

!BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Quoted 11 lines
Quoted 8 lines
package/ljsyscall/Config.in +0 -1
--

2.1.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 8 lines
Quoted 2 lines

--
Profile: http://it.linkedin.com/in/compagnucciangelo

--
Profile: http://it.linkedin.com/in/compagnucciangelo

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150318/b229e3a4/attachment.html>

#8 lore raw

PATCH 3/3 ljsyscall: refactor with BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

In reply to Francois Perrad

Dear Francois Perrad,

package/ljsyscall/Config.in config BR2_PACKAGE_LJSYSCALL · line 6

Quoted 10 lines · Francois Perrad
package/ljsyscall/Config.in +1 -1
index dcbd521..b9ff04d 100644
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LJSYSCALL
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
 	# ljsyscall is only available for some target architectures
-	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS

Since you say yourself in the discussion that the set of architectures supported by ljsyscall is the same as the set of architectures supported by LuaJIT, then this 'depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS' is not needed, because this package already 'depends on BR2_PACKAGE_LUAJIT'.

So if BR2_PACKAGE_LUAJIT has been enabled, BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS must be true. So adding this dependency does not make sense.

Can you rework the ljlinenoise and ljsyscall patches to remove this architecture dependency?

Thanks,

Thomas

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

PATCH 1/3 luarocks: bump to version 2.2.1

In reply to Francois Perrad

Dear Francois Perrad,

Quoted 4 lines · Francois Perrad
Signed-off-by Francois Perrad <[email protected]>
---
 package/luarocks/luarocks.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