rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bsp/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch
View File

@@ -1,4 +1,4 @@
From a16012bf4ea63f714468d80ebe101481c917e4b8 Mon Sep 17 00:00:00 2001
From 10d5bde8d628a93993dd7305dc9a406da69f65a9 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Wed, 2 Dec 2015 00:22:26 +0100
Subject: [PATCH] Adjust for buildroot build.
@@ -14,12 +14,12 @@ Subject: [PATCH] Adjust for buildroot build.
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
devLib/Makefile | 9 +++++----
gpio/Makefile | 12 ++++++++----
gpio/Makefile | 14 +++++++++-----
wiringPi/Makefile | 7 ++++---
3 files changed, 17 insertions(+), 11 deletions(-)
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/devLib/Makefile b/devLib/Makefile
index 0fb0033..3117479 100644
index 1b1ebe0..84b4d2a 100644
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
@@ -36,7 +36,7 @@ index 0fb0033..3117479 100644
LIBS =
@@ -67,6 +67,7 @@ $(STATIC): $(OBJ)
@@ -69,6 +69,7 @@ $(STATIC): $(OBJ)
$(DYNAMIC): $(OBJ)
$Q echo "[Link (Dynamic)]"
$Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ)
@@ -44,7 +44,7 @@ index 0fb0033..3117479 100644
.c.o:
$Q echo [Compile] $<
@@ -91,7 +92,7 @@ install: $(DYNAMIC)
@@ -93,7 +94,7 @@ install: $(DYNAMIC)
$Q echo "[Install Dynamic Lib]"
$Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib
$Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
@@ -54,7 +54,7 @@ index 0fb0033..3117479 100644
.PHONY: install-static
diff --git a/gpio/Makefile b/gpio/Makefile
index 7dcd090..e8e43f9 100644
index 7dcd090..dc4be72 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -32,11 +32,11 @@ endif
@@ -73,19 +73,23 @@ index 7dcd090..e8e43f9 100644
LIBS = -lwiringPi -lwiringPiDev -lpthread
# May not need to alter anything below this line
@@ -55,6 +55,10 @@ gpio: $(OBJ)
$Q echo [Link]
@@ -52,9 +52,13 @@ version.h: ../VERSION
$Q echo Need to run newVersion above.
gpio: $(OBJ)
- $Q echo [Link]
+ $Q echo "[Link (Dynamic)]"
$Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS)
+gpio-static: $(OBJ)
+ $Q echo [Link]
+ $Q $(CC) -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread
+ $Q echo "[Link (Static)]"
+ $Q $(CC) -static -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread
+
.c.o:
$Q echo [Compile] $<
$Q $(CC) -c $(CFLAGS) $< -o $@
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 6bbcc5d..e0ccc52 100644
index acb6e58..8b84dc6 100644
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
@@ -119,5 +123,5 @@ index 6bbcc5d..e0ccc52 100644
.PHONY: install-static
--
2.1.4
2.11.0

2
bsp/buildroot/package/wiringpi/wiringpi.hash
View File

@@ -1,2 +1,2 @@
# locally computed
sha256 00a4770c113a1a5f52480a30bcfad00d2087f42854f1791204af2e60ffe1ac8c wiringpi-78b5c323b74de782df58ee558c249e4e4fadd25f.tar.gz
sha256 0775e3bfa2df2131746c75d611ad354e5c884661be0d9de9fd786fc96f6ad918 wiringPi-2.32.tar.gz

20
bsp/buildroot/package/wiringpi/wiringpi.mk
View File

@@ -4,16 +4,8 @@
#
################################################################################
# original site is down (2016-06-03)
#
# WIRINGPI_VERSION = 2.31
# WIRINGPI_SITE = git://git.drogon.net/wiringPi
#
# so change to alternative location (verifyed that commit 78b5c323
# has the same content as local copy of wiringpi-2.31.tar.gz)
#
WIRINGPI_VERSION = 78b5c323b74de782df58ee558c249e4e4fadd25f
WIRINGPI_SITE = $(call github,WiringPi,WiringPi,$(WIRINGPI_VERSION))
WIRINGPI_VERSION = 2.32
WIRINGPI_SITE = git://git.drogon.net/wiringPi
WIRINGPI_LICENSE = LGPLv3+
WIRINGPI_LICENSE_FILES = COPYING.LESSER
@@ -40,13 +32,13 @@ define WIRINGPI_BUILD_CMDS
endef
define WIRINGPI_INSTALL_STAGING_CMDS
$(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
$(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
endef
define WIRINGPI_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
$(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
$(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio
$(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest
endef