Skip to contentSkip to conversation

package/lzlib: bump to version 0.4.3

PATCH New Jörg Krause 2 participants 4 messages Oct 8, 2015 – Mar 6, 2016

lore
Share & tools
lore

Jörg Krause

author
#0 lore raw

PATCH v2 1/1 package/lzlib: bump to version 0.4.3

Switch to more recent github repository.

Signed-off-by J?rg Krause <[email protected]>

---
Changes v1 -> v2:
- fix install paths for lib and lua files

---
 package/lzlib/Config.in  | 2 +-
 package/lzlib/lzlib.hash | 2 --
 package/lzlib/lzlib.mk   | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 package/lzlib/lzlib.hash
package/lzlib/Config.in +1 -1
index c123019..f7fae15 100644
@@ -7,4 +7,4 @@ config BR2_PACKAGE_LZLIB
 	  functions and also to read/write gzip files using an
 	  interface similar to the base io package.
 
-	  http://luaforge.net/projects/lzlib/
+	  https://github.com/LuaDist/lzlib
package/lzlib/lzlib.hash deleted +0 -2
deleted file mode 100644
index d823e8b..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256	c10055bde2c0a0ed14f22c1ee0701910b0b9885245baf7911201ab4dfd3b828c  lzlib-0.4.work3-1.src.rock
package/lzlib/lzlib.mk +5 -3
index ec37842..91f380a 100644
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-LZLIB_VERSION = 0.4.work3-1
-LZLIB_SUBDIR = lzlib-0.4-work3
+LZLIB_VERSION = 0.4.3
+LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION))
 LZLIB_DEPENDENCIES = zlib
 LZLIB_LICENSE = MIT
+LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
+	-DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
 
-$(eval $(luarocks-package))
+$(eval $(cmake-package))
Signature · 1 line
2.6.1
#1 lore raw

PATCH v2 1/1 package/lzlib: bump to version 0.4.3

Fran?ois,

The patch below is touching a Lua package, can you review/test/ack ?

Thanks a lot!

Thomas

Quoted 50 lines · J?rg Krause

Switch to more recent github repository.

Signed-off-by J?rg Krause <[email protected]>

---
Changes v1 -> v2:
- fix install paths for lib and lua files

---
 package/lzlib/Config.in  | 2 +-
 package/lzlib/lzlib.hash | 2 --
 package/lzlib/lzlib.mk   | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 package/lzlib/lzlib.hash
package/lzlib/Config.in +1 -1
index c123019..f7fae15 100644
@@ -7,4 +7,4 @@ config BR2_PACKAGE_LZLIB
 	  functions and also to read/write gzip files using an
 	  interface similar to the base io package.
 
-	  http://luaforge.net/projects/lzlib/
+	  https://github.com/LuaDist/lzlib
package/lzlib/lzlib.hash deleted +0 -2
deleted file mode 100644
index d823e8b..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256	c10055bde2c0a0ed14f22c1ee0701910b0b9885245baf7911201ab4dfd3b828c  lzlib-0.4.work3-1.src.rock
package/lzlib/lzlib.mk +5 -3
index ec37842..91f380a 100644
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-LZLIB_VERSION = 0.4.work3-1
-LZLIB_SUBDIR = lzlib-0.4-work3
+LZLIB_VERSION = 0.4.3
+LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION))
 LZLIB_DEPENDENCIES = zlib
 LZLIB_LICENSE = MIT
+LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
+	-DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
 
-$(eval $(luarocks-package))
+$(eval $(cmake-package))
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 package/lzlib: bump to version 0.4.3

Fran?ois,

Another ping about this patch. It is moving away from the luarocks infrastructure to the cmake-package infra, so I'd like to have your Lua expert agreement.

Thanks!

Thomas

Quoted 62 lines · Thomas Petazzoni

Fran?ois,

The patch below is touching a Lua package, can you review/test/ack ?

Thanks a lot!

Thomas

Quoted 50 lines · J?rg Krause

Switch to more recent github repository.

Signed-off-by J?rg Krause <[email protected]>

---
Changes v1 -> v2:
- fix install paths for lib and lua files

---
 package/lzlib/Config.in  | 2 +-
 package/lzlib/lzlib.hash | 2 --
 package/lzlib/lzlib.mk   | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 package/lzlib/lzlib.hash
package/lzlib/Config.in +1 -1
index c123019..f7fae15 100644
@@ -7,4 +7,4 @@ config BR2_PACKAGE_LZLIB
 	  functions and also to read/write gzip files using an
 	  interface similar to the base io package.
 
-	  http://luaforge.net/projects/lzlib/
+	  https://github.com/LuaDist/lzlib
package/lzlib/lzlib.hash deleted +0 -2
deleted file mode 100644
index d823e8b..0000000
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256	c10055bde2c0a0ed14f22c1ee0701910b0b9885245baf7911201ab4dfd3b828c  lzlib-0.4.work3-1.src.rock
package/lzlib/lzlib.mk +5 -3
index ec37842..91f380a 100644
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-LZLIB_VERSION = 0.4.work3-1
-LZLIB_SUBDIR = lzlib-0.4-work3
+LZLIB_VERSION = 0.4.3
+LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION))
 LZLIB_DEPENDENCIES = zlib
 LZLIB_LICENSE = MIT
+LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
+	-DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
 
-$(eval $(luarocks-package))
+$(eval $(cmake-package))
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v2 1/1 package/lzlib: bump to version 0.4.3

In reply to Jörg Krause

Dear J?rg Krause,

Quoted 6 lines · J?rg Krause

Switch to more recent github repository.

Signed-off-by J?rg Krause <[email protected]>

---
Changes v1 -> v2:
- fix install paths for lib and lua files

Quoted 6 lines
---
 package/lzlib/Config.in  | 2 +-
 package/lzlib/lzlib.hash | 2 --
 package/lzlib/lzlib.mk   | 8 +++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 package/lzlib/lzlib.hash

Since Fran?ois never gave any feedback, I applied your patch to master. I've re-added a hash file since we now add hash files for Github-sourced packages.

Thanks!

Thomas

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