Message ID | 1444270374-11645-1-git-send-email-joerg.krause@embedded.rocks |
---|---|
State | Accepted |
Headers | show |
François, The patch below is touching a Lua package, can you review/test/ack ? Thanks a lot! Thomas On Thu, 8 Oct 2015 04:12:54 +0200, Jörg Krause wrote: > Switch to more recent github repository. > > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> > --- > 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 > > diff --git a/package/lzlib/Config.in b/package/lzlib/Config.in > index c123019..f7fae15 100644 > --- a/package/lzlib/Config.in > +++ b/package/lzlib/Config.in > @@ -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 > diff --git a/package/lzlib/lzlib.hash b/package/lzlib/lzlib.hash > deleted file mode 100644 > index d823e8b..0000000 > --- a/package/lzlib/lzlib.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 c10055bde2c0a0ed14f22c1ee0701910b0b9885245baf7911201ab4dfd3b828c lzlib-0.4.work3-1.src.rock > diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk > index ec37842..91f380a 100644 > --- a/package/lzlib/lzlib.mk > +++ b/package/lzlib/lzlib.mk > @@ -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))
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 On Sat, 10 Oct 2015 11:40:09 +0200, Thomas Petazzoni wrote: > François, > > The patch below is touching a Lua package, can you review/test/ack ? > > Thanks a lot! > > Thomas > > On Thu, 8 Oct 2015 04:12:54 +0200, Jörg Krause wrote: > > Switch to more recent github repository. > > > > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> > > --- > > 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 > > > > diff --git a/package/lzlib/Config.in b/package/lzlib/Config.in > > index c123019..f7fae15 100644 > > --- a/package/lzlib/Config.in > > +++ b/package/lzlib/Config.in > > @@ -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 > > diff --git a/package/lzlib/lzlib.hash b/package/lzlib/lzlib.hash > > deleted file mode 100644 > > index d823e8b..0000000 > > --- a/package/lzlib/lzlib.hash > > +++ /dev/null > > @@ -1,2 +0,0 @@ > > -# Locally calculated > > -sha256 c10055bde2c0a0ed14f22c1ee0701910b0b9885245baf7911201ab4dfd3b828c lzlib-0.4.work3-1.src.rock > > diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk > > index ec37842..91f380a 100644 > > --- a/package/lzlib/lzlib.mk > > +++ b/package/lzlib/lzlib.mk > > @@ -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)) > > >
Dear Jörg Krause, On Thu, 8 Oct 2015 04:12:54 +0200, Jörg Krause wrote: > Switch to more recent github repository. > > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> > --- > 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 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
diff --git a/package/lzlib/Config.in b/package/lzlib/Config.in index c123019..f7fae15 100644 --- a/package/lzlib/Config.in +++ b/package/lzlib/Config.in @@ -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 diff --git a/package/lzlib/lzlib.hash b/package/lzlib/lzlib.hash deleted file mode 100644 index d823e8b..0000000 --- a/package/lzlib/lzlib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c10055bde2c0a0ed14f22c1ee0701910b0b9885245baf7911201ab4dfd3b828c lzlib-0.4.work3-1.src.rock diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk index ec37842..91f380a 100644 --- a/package/lzlib/lzlib.mk +++ b/package/lzlib/lzlib.mk @@ -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))
Switch to more recent github repository. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> --- 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