Skip to contentSkip to conversation

lua-periphery: bump version to 1.0.5, remove dependency on c-periphery

PATCH Superseded Vanya Sergeev 3 participants 8 messages May 27, 2015 – Jul 8, 2015

lore
Share & tools
lore

Vanya Sergeev

author
#0 lore raw

PATCH 1/3 lua-periphery: bump version to 1.0.5, remove dependency on c-periphery

The new version of the lua-periphery LuaRocks package handles fetching the c-periphery dependency, so that it no longer needs to be cloned during the lua-periphery build process. Consequently, this removes the need for selecting c-periphery as a package dependency in buildroot and the need for the patches that modify lua-periphery to be built against an external c-periphery.

Signed-off-by Vanya Sergeev <[email protected]>
---
 ...01-Makefile-don-t-clone-build-c-periphery.patch | 32 --------
 package/lua-periphery/0002-Fix-include-paths.patch | 89 ----------------------
 package/lua-periphery/Config.in                    |  1 -
 package/lua-periphery/lua-periphery.mk             |  4 +-
 4 files changed, 2 insertions(+), 124 deletions(-)
 delete mode 100644 package/lua-periphery/0001-Makefile-don-t-clone-build-c-periphery.patch
 delete mode 100644 package/lua-periphery/0002-Fix-include-paths.patch
package/lua-periphery/0001-Makefile-don-t-clone-build-c-periphery.patch deleted +0 -32
deleted file mode 100644
index f6d3f27..0000000
@@ -1,32 +0,0 @@
-From 395bb4cb37612a4ac94346531b13ff0e901ed05e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 5 May 2015 23:59:17 +0200
-Subject: [PATCH 1/2] Makefile: don't clone/build c-periphery
-
-This patch adjusts lua-periphery Makefile to not clone and build the
-c-periphery library by itself, and instead use the already available
-c-periphery library.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lua-periphery/Makefile b/lua-periphery/Makefile
-index bed9b32..a4c68eb 100644
---- a/lua-periphery/Makefile
-+++ b/lua-periphery/Makefile
-@@ -36,8 +36,8 @@ install:
- 
- ###########################################################################
- 
--$(LIB): $(C_PERIPHERY_LIB) $(SRCS)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) $(C_PERIPHERY_LIB) -o $@
-+$(LIB): $(SRCS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -lc-periphery -o $@
- 
- $(C_PERIPHERY_LIB): $(C_PERIPHERY)/Makefile
- 	cd $(C_PERIPHERY); $(MAKE)
--- 
-2.1.0
-
package/lua-periphery/0002-Fix-include-paths.patch deleted +0 -89

89 lines not on this page · raw message

package/lua-periphery/Config.in +0 -1
index df0546f..de5a716 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_PERIPHERY
 	bool "lua-periphery"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	select BR2_PACKAGE_C_PERIPHERY
 	help
 	  A library for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O
 	  interface access in userspace Linux with Lua.
package/lua-periphery/lua-periphery.mk +2 -2
index 99e1dbe..f820408 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.4
-LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1
+LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.5
+LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-2
 LUA_PERIPHERY_SUBDIR = lua-periphery
 LUA_PERIPHERY_DEPENDENCIES = c-periphery
 LUA_PERIPHERY_LICENSE = MIT
Signature · 1 line
2.4.1
author
#1 lore raw

PATCH 2/3 lua-periphery: add hash file

Signed-off-by Vanya Sergeev <[email protected]>
---
 package/lua-periphery/lua-periphery.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/lua-periphery/lua-periphery.hash
package/lua-periphery/lua-periphery.hash new file +2 -0
new file mode 100644
index 0000000..39209df
@@ -0,0 +1,2 @@
+# Locally computed
+sha256  f94f4af342e531ff25b037b8b7c127db50b7464c0bbce4c5ea3b49fd215ada60    lua-periphery-1.0.5-2.src.rock
Signature · 1 line
2.4.1
Applied
#2 lore raw

PATCH 2/3 lua-periphery: add hash file

Dear Vanya Sergeev,

Quoted 5 lines · Vanya Sergeev
Signed-off-by Vanya Sergeev <[email protected]>
---
 package/lua-periphery/lua-periphery.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/lua-periphery/lua-periphery.hash

Applied, thanks.

Thomas

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

PATCH 3/3 c-periphery: bump version to 1.0.3

In reply to Vanya Sergeev
Signed-off-by Vanya Sergeev <[email protected]>
---
 package/c-periphery/c-periphery.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/c-periphery/c-periphery.mk +1 -1
index 68193d7..730b3bc 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_PERIPHERY_VERSION = 0fdfac3264f1dce32991f4ec30d084e34b35181d
+C_PERIPHERY_VERSION = v1.0.3
 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,$(C_PERIPHERY_VERSION))
 C_PERIPHERY_INSTALL_STAGING = YES
 # only a static library
Signature · 1 line
2.4.1
Applied
#4 lore raw

PATCH 3/3 c-periphery: bump version to 1.0.3

Dear Vanya Sergeev,

Quoted 4 lines · Vanya Sergeev
Signed-off-by Vanya Sergeev <[email protected]>
---
 package/c-periphery/c-periphery.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
#5 lore raw

PATCH 1/3 lua-periphery: bump version to 1.0.5, remove dependency on c-periphery

In reply to Vanya Sergeev

Hi Vanya,

Quoted 17 lines · Vanya Sergeev
package/lua-periphery/Config.in +0 -1
index df0546f..de5a716 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_PERIPHERY
 	bool "lua-periphery"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	select BR2_PACKAGE_C_PERIPHERY
 	help
 	  A library for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O
 	  interface access in userspace Linux with Lua.
package/lua-periphery/lua-periphery.mk +0 -0
index 99e1dbe..f820408 100644

package/lua-periphery/lua-periphery.mk line 10

Quoted 9 lines
package/lua-periphery/lua-periphery.mk +2 -2
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.4
-LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1
+LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.5
+LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-2
 LUA_PERIPHERY_SUBDIR = lua-periphery
 LUA_PERIPHERY_DEPENDENCIES = c-periphery

Since you removed the c-periphery select above, you should also remove it from here.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#6 lore raw

PATCH v2 1/1 lua-periphery: bump version to 1.0.5, remove dependency on c-periphery

The new version of the lua-periphery LuaRocks package handles fetching the c-periphery dependency, so that it no longer needs to be cloned during the lua-periphery build process. Consequently, this removes the need for selecting c-periphery as a package dependency in buildroot and the need for the patches that modify lua-periphery to be built against an external c-periphery.

Signed-off-by Vanya Sergeev <[email protected]>
---
 ...01-Makefile-don-t-clone-build-c-periphery.patch | 32 --------
 package/lua-periphery/0002-Fix-include-paths.patch | 89 ----------------------
 package/lua-periphery/Config.in                    |  1 -
 package/lua-periphery/lua-periphery.mk             |  5 +-
 4 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 package/lua-periphery/0001-Makefile-don-t-clone-build-c-periphery.patch
 delete mode 100644 package/lua-periphery/0002-Fix-include-paths.patch
package/lua-periphery/0001-Makefile-don-t-clone-build-c-periphery.patch deleted +0 -32
deleted file mode 100644
index f6d3f27..0000000
@@ -1,32 +0,0 @@
-From 395bb4cb37612a4ac94346531b13ff0e901ed05e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 5 May 2015 23:59:17 +0200
-Subject: [PATCH 1/2] Makefile: don't clone/build c-periphery
-
-This patch adjusts lua-periphery Makefile to not clone and build the
-c-periphery library by itself, and instead use the already available
-c-periphery library.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lua-periphery/Makefile b/lua-periphery/Makefile
-index bed9b32..a4c68eb 100644
---- a/lua-periphery/Makefile
-+++ b/lua-periphery/Makefile
-@@ -36,8 +36,8 @@ install:
- 
- ###########################################################################
- 
--$(LIB): $(C_PERIPHERY_LIB) $(SRCS)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) $(C_PERIPHERY_LIB) -o $@
-+$(LIB): $(SRCS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -lc-periphery -o $@
- 
- $(C_PERIPHERY_LIB): $(C_PERIPHERY)/Makefile
- 	cd $(C_PERIPHERY); $(MAKE)
--- 
-2.1.0
-
package/lua-periphery/0002-Fix-include-paths.patch deleted +0 -89

89 lines not on this page · raw message

package/lua-periphery/Config.in +0 -1
index df0546f..de5a716 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUA_PERIPHERY
 	bool "lua-periphery"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	select BR2_PACKAGE_C_PERIPHERY
 	help
 	  A library for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O
 	  interface access in userspace Linux with Lua.
package/lua-periphery/lua-periphery.mk +2 -3
index 99e1dbe..541079f 100644
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.4
-LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1
+LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.5
+LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-2
 LUA_PERIPHERY_SUBDIR = lua-periphery
-LUA_PERIPHERY_DEPENDENCIES = c-periphery
 LUA_PERIPHERY_LICENSE = MIT
 LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE
Signature · 1 line
2.4.1
#7 lore raw

PATCH 1/3 lua-periphery: bump version to 1.0.5, remove dependency on c-periphery

In reply to Vanya Sergeev

Dear Vanya Sergeev,

Quoted 7 lines · Vanya Sergeev

The new version of the lua-periphery LuaRocks package handles fetching the c-periphery dependency, so that it no longer needs to be cloned during the lua-periphery build process. Consequently, this removes the need for selecting c-periphery as a package dependency in buildroot and the need for the patches that modify lua-periphery to be built against an external c-periphery.

Signed-off-by Vanya Sergeev <[email protected]>
Quoted 8 lines
---
 ...01-Makefile-don-t-clone-build-c-periphery.patch | 32 --------
 package/lua-periphery/0002-Fix-include-paths.patch | 89 ----------------------
 package/lua-periphery/Config.in                    |  1 -
 package/lua-periphery/lua-periphery.mk             |  4 +-
 4 files changed, 2 insertions(+), 124 deletions(-)
 delete mode 100644 package/lua-periphery/0001-Makefile-don-t-clone-build-c-periphery.patch
 delete mode 100644 package/lua-periphery/0002-Fix-include-paths.patch

I've applied, after fixing the dependency as noticed by Baruch. I also had to add a patch to make lua-periphery build properly with uClibc:
-std=c99 -D_DEFAULT_SOURCE doesn't work well with uClibc, since it hides the struct timespec and nanosleep() definitions from <time.h>. Replaced by -std=gnu99.

See
http://git.buildroot.net/buildroot/commit/?id=bdebcd39025bd6413d920b4993f7f70a94934387

Maybe you should look into this and merge a fix upstream?

Thanks a lot!

Thomas

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