Commit bdebcd39 authored by Vanya Sergeev's avatar Vanya Sergeev Committed by Thomas Petazzoni
Browse files

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.

[Thomas:
  - remove dependency from .mk file, as noticed by Baruch
  - add patch to fix uClibc build]

Signed-off-by: default avatarVanya Sergeev <vsergeev@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent aee57627

package/lua-periphery/0001-Makefile-don-t-clone-build-c-periphery.patch

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
From 395bb4cb37612a4ac94346531b13ff0e901ed05e Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

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 <thomas.petazzoni@free-electrons.com>

---

 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/0001-fix-build-flags.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Fix build flags to build properly with uClibc



Building with -std=c99 -D_DEFAULT_SOURCE hides the struct timespec and

nanosleep() definitions from <time.h> in uClibc. Work around that by

using -std=gnu99 instead.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/lua-periphery/Makefile

===================================================================

--- a/lua-periphery/Makefile

+++ b/lua-periphery/Makefile

@@ -16,7 +16,7 @@

 

 ###########################################################################

 

-CFLAGS += -std=c99 -pedantic -D_DEFAULT_SOURCE

+CFLAGS += -std=gnu99 -pedantic

 CFLAGS += -Wall -Wextra -Wno-unused-parameter $(DEBUG) -fPIC -I. $(LUA_CFLAGS)

 LDFLAGS += -shared

package/lua-periphery/0002-Fix-include-paths.patch

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
From b0a48721c48e0857458eb46b36ae575281412c64 Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Date: Sat, 16 May 2015 15:12:30 +0200

Subject: [PATCH 2/2] Fix include paths for c-periphery



The lua-periphery source code is designed to have c-periphery cloned

and built internally, so the include paths are written with this

assumption.



This commit adjusts the header paths of the c-periphery headers to be

compatible with a separated build/installation of c-periphery.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 src/lua_gpio.c   | 2 +-

 src/lua_i2c.c    | 2 +-

 src/lua_mmio.c   | 2 +-

 src/lua_serial.c | 2 +-

 src/lua_spi.c    | 2 +-

 5 files changed, 5 insertions(+), 5 deletions(-)



diff --git a/lua-periphery/src/lua_gpio.c b/lua-periphery/src/lua_gpio.c

index cfeb03d..711d7e1 100644

--- a/lua-periphery/src/lua_gpio.c

+++ b/lua-periphery/src/lua_gpio.c

@@ -13,7 +13,7 @@

 #include <stdint.h>

 #include <errno.h>

 

-#include <c-periphery/src/gpio.h>

+#include <c-periphery/gpio.h>

 #include "lua_periphery.h"

 #include "lua_51compat.h"

 

diff --git a/lua-periphery/src/lua_i2c.c b/lua-periphery/src/lua_i2c.c

index ebdab79..7b38f6f 100644

--- a/lua-periphery/src/lua_i2c.c

+++ b/lua-periphery/src/lua_i2c.c

@@ -13,7 +13,7 @@

 #include <stdint.h>

 #include <errno.h>

 

-#include <c-periphery/src/i2c.h>

+#include <c-periphery/i2c.h>

 #include "lua_periphery.h"

 #include "lua_51compat.h"

 

diff --git a/lua-periphery/src/lua_mmio.c b/lua-periphery/src/lua_mmio.c

index 5ab1188..7dd399b 100644

--- a/lua-periphery/src/lua_mmio.c

+++ b/lua-periphery/src/lua_mmio.c

@@ -13,7 +13,7 @@

 #include <stdint.h>

 #include <errno.h>

 

-#include <c-periphery/src/mmio.h>

+#include <c-periphery/mmio.h>

 #include "lua_periphery.h"

 #include "lua_51compat.h"

 

diff --git a/lua-periphery/src/lua_serial.c b/lua-periphery/src/lua_serial.c

index 7d332af..85afa4a 100644

--- a/lua-periphery/src/lua_serial.c

+++ b/lua-periphery/src/lua_serial.c

@@ -13,7 +13,7 @@

 #include <stdint.h>

 #include <errno.h>

 

-#include <c-periphery/src/serial.h>

+#include <c-periphery/serial.h>

 #include "lua_periphery.h"

 #include "lua_51compat.h"

 

diff --git a/lua-periphery/src/lua_spi.c b/lua-periphery/src/lua_spi.c

index a4735a2..0c1e583 100644

--- a/lua-periphery/src/lua_spi.c

+++ b/lua-periphery/src/lua_spi.c

@@ -13,7 +13,7 @@

 #include <stdint.h>

 #include <errno.h>

 

-#include <c-periphery/src/spi.h>

+#include <c-periphery/spi.h>

 #include "lua_periphery.h"

 #include "lua_51compat.h"

 

-- 

2.1.0

package/lua-periphery/Config.in

+0 −1
Original line number Diff line number Diff line 
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
Original line number Diff line number Diff line
@@ -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