More package updates

PATCH In review Petter Mabäcker 2 participants 4 messages Jul 19, 2015

lore

Share & tools

lore

Petter Mabäcker

author

2015-07-19 09:11 UTC #0 lore raw

cover More package updates

The following changes since commit c8532df1c2e4812b3520d32ed49be943bea2edd9:

If SERIAL_CONSOLE is already define by another layer, this value may not be good. (2015-06-05 16:38:14 +0200)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib petmab/rpi_redmine_60_more_updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/rpi_redmine_60_more_updates

Petter Mabäcker (2):
omxplayer: Bump SRCREV
wiringpi: Bump SRCREV

 .../0001-Add-initial-cross-compile-support.patch   | 429 +++++++++++++++++++++
 .../wiringPi/files/Makefiles-install.patch         | 202 ----------
 recipes-devtools/wiringPi/wiringpi_git.bb          |  10 +-
 recipes-multimedia/omxplayer/omxplayer_git.bb      |   4 +-
 4 files changed, 437 insertions(+), 208 deletions(-)
 create mode 100644 recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch
 delete mode 100644 recipes-devtools/wiringPi/files/Makefiles-install.patch

Signature · 1 line

1.9.1

Petter Mabäcker

author

2015-07-19 09:11 UTC #1 lore raw

PATCH 1/2 omxplayer: Bump SRCREV

[Support #60]

Signed-off-by Petter Mabäcker <[email protected]>

---
 recipes-multimedia/omxplayer/omxplayer_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

recipes-multimedia/omxplayer/omxplayer_git.bb +2 -2

index c71a743..f4839a9 100644
@@ -8,9 +8,9 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh"
-PR = "r3"
+PR = "r4"
 
-SRCREV = "18f051d64d9c837edbf718bc4935204583cfa030"
+SRCREV = "4d8ffd13153bfef2966671cb4fb484afeaf792a8"
 SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
            file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
            file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \

Signature · 1 line

1.9.1

Petter Mabäcker

author

2015-07-19 09:11 UTC #2 lore raw

PATCH 2/2 wiringpi: Bump SRCREV

In reply to Petter Mabäcker

Update wiringpi to latest revision. Due to a refactoring of the build procedure in wiringpi the integration patch 'makefile-install.patch' didn't apply anymore. While migrating that patch it was simplified and generated using 'git format-patch' instead, to make it easier to maintain the patch in the future.

[Support #60]

Signed-off-by Petter Mabäcker <[email protected]>

---
 .../0001-Add-initial-cross-compile-support.patch   | 429 +++++++++++++++++++++
 .../wiringPi/files/Makefiles-install.patch         | 202 ----------
 recipes-devtools/wiringPi/wiringpi_git.bb          |  10 +-
 3 files changed, 435 insertions(+), 206 deletions(-)
 create mode 100644 recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch
 delete mode 100644 recipes-devtools/wiringPi/files/Makefiles-install.patch

recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch new file +429 -0

new file mode 100644
index 0000000..c5ba270
@@ -0,0 +1,429 @@
+From b0d82bc7cc90db41aa4f7012bbe3009f0b8ab11d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <[email protected]>
+Date: Sat, 18 Jul 2015 23:20:05 +0200
+Subject: [PATCH] Add initial cross compile support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Petter Mabäcker <[email protected]>
+---
+ devLib/Makefile             | 58 +++++++++++++++++++++++++--------------------
+ examples/Gertboard/Makefile | 22 ++++++++++-------
+ examples/Makefile           | 19 +++++++++------
+ examples/PiFace/Makefile    | 22 ++++++++++-------
+ examples/PiGlow/Makefile    |  4 ++--
+ examples/q2w/Makefile       |  5 ++--
+ gpio/Makefile               | 31 +++++++++++++-----------
+ wiringPi/Makefile           | 56 ++++++++++++++++++++++++-------------------
+ 8 files changed, 124 insertions(+), 93 deletions(-)
+
+diff --git a/devLib/Makefile b/devLib/Makefile
+index d62b532..c7c7884 100644
+--- a/devLib/Makefile
++++ b/devLib/Makefile
+@@ -22,18 +22,22 @@
+ #################################################################################
+ 
+ VERSION=$(shell cat ../VERSION)
+-DESTDIR=/usr
+-PREFIX=/local
++DESTDIR?=/usr
++PREFIX?=/local
+ 
+-STATIC=libwiringPiDev.a
+-DYNAMIC=libwiringPiDev.so.$(VERSION)
++INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
++LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
+ 
+-#DEBUG	= -g -O0
+-DEBUG	= -O2
+-CC	= gcc
+-INCLUDE	= -I.
+-DEFS	= -D_GNU_SOURCE
+-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
++BASE_NAME=libwiringPiDev
++STATIC=$(BASE_NAME).a
++DYNAMIC=$(BASE_NAME).so.$(VERSION)
++
++#DEBUG	?= -g -O0
++DEBUG	?= -O2
++CC	?= gcc
++INCLUDE	?= -I.
++DEFS	?= -D_GNU_SOURCE
++CFLAGS	?= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+ 
+ LIBS    =
+ 
+@@ -60,16 +64,16 @@ $(STATIC):	$(OBJ)
+ 
+ $(DYNAMIC):	$(OBJ)
+ 	@echo "[Link (Dynamic)]"
+-	@$(CC) -shared -Wl,-soname,libwiringPiDev.so -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ)
++	@$(CC) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so -lpthread $(OBJ)
+ 
+ .c.o:
+ 	@echo [Compile] $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	@$(CC) -c $(CFLAGS) -fPIC $< -o $@
+ 
+ .PHONY:	clean
+ clean:
+ 	@echo "[Clean]"
+-	@rm -f $(OBJ) $(OBJ_I2C) *~ core tags Makefile.bak libwiringPiDev.*
++	@rm -f $(OBJ) $(OBJ_I2C) *~ core tags Makefile.bak $(BASE_NAME).so* $(BASE_NAME).a
+ 
+ .PHONY:	tags
+ tags:	$(SRC)
+@@ -80,22 +84,22 @@ tags:	$(SRC)
+ .PHONY:	install
+ install:	$(DYNAMIC)
+ 	@echo "[Install Headers]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+-	@install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
++	@install -m 0755 -d						$(INCLUDE_DIR)
++	@install -m 0644 $(HEADERS)					$(INCLUDE_DIR)
+ 	@echo "[Install Dynamic Lib]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	@install -m 0755 libwiringPiDev.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
+-	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)	$(DESTDIR)/lib/libwiringPiDev.so
+-	@ldconfig
++	@install -m 0755 -d						$(LIB_DIR)
++	@install -m 0755 $(BASE_NAME).so	$(LIB_DIR)/$(DYNAMIC)
++	@ln -sf $(DYNAMIC)			$(LIB_DIR)/$(BASE_NAME).so
++	@ln -sf $(DYNAMIC)			$(LIB_DIR)/$(BASE_NAME).so.$(DYN_VERS_MAJ)
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
+ 	@echo "[Install Headers]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+-	@install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
++	@install -m 0755 -d						$(INCLUDE_DIR)
++	@install -m 0644 $(HEADERS)					$(INCLUDE_DIR)
+ 	@echo "[Install Static Lib]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	@install -m 0755 libwiringPiDev.a				$(DESTDIR)$(PREFIX)/lib
++	@install -m 0755 -d						$(LIB_DIR)
++	@install -m 0644 $(STATIC)					$(LIB_DIR)
+ 
+ .PHONY:	install-deb
+ install-deb:	$(DYNAMIC)
+@@ -110,9 +114,11 @@ install-deb:	$(DYNAMIC)
+ .PHONY:	uninstall
+ uninstall:
+ 	@echo "[UnInstall]"
+-	@cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
+-	@cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPiDev.*
+-	@ldconfig
++	@cd $(INCLUDE_DIR) && rm -f $(HEADERS)
++	@rm -f $(LIB_DIR)/$(STATIC)
++	@rm -f $(LIB_DIR)/$(DYNAMIC)
++	@rm -f $(LIB_DIR)/$(BASE_NAME).so
++	@rm -f $(LIB_DIR)/$(BASE_NAME).so.$(DYN_VERS_MAJ)
+ 
+ 
+ .PHONY:	depend
+diff --git a/examples/Gertboard/Makefile b/examples/Gertboard/Makefile
+index 7569261..b0c32e0 100644
+--- a/examples/Gertboard/Makefile
++++ b/examples/Gertboard/Makefile
+@@ -5,14 +5,20 @@
+ #	Copyright (c) 2013 Gordon Henderson
+ #################################################################################
+ 
+-#DEBUG	= -g -O0
+-DEBUG	= -O3
+-CC	= gcc
+-INCLUDE	= -I/usr/local/include
+-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+-
+-LDFLAGS	= -L/usr/local/lib
+-LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
++DESTDIR?=/usr
++PREFIX?=/local
++
++INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
++LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
++
++#DEBUG	?= -g -O0
++DEBUG	?= -O3
++CC	?= gcc
++INCLUDE	?= -I$(INCLUDE_DIR)
++CFLAGS	?= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++
++LDFLAGS	?= -L$(LIB_DIR)
++LDLIBS    ?= -lwiringPi -lwiringPiDev -lpthread -lm
+ 
+ # Should not alter anything below this line
+ ###############################################################################
+diff --git a/examples/Makefile b/examples/Makefile
+index c9967dc..c2f8b9d 100644
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -22,15 +22,20 @@
+ #    along with wiringPi.  If not, see <http://www.gnu.org/licenses/>.
+ #################################################################################
+ 
++DESTDIR?=/usr
++PREFIX?=/local
+ 
+-#DEBUG	= -g -O0
+-DEBUG	= -O3
+-CC	= gcc
+-INCLUDE	= -I/usr/local/include
+-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
++LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
+ 
+-LDFLAGS	= -L/usr/local/lib
+-LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
++#DEBUG	?= -g -O0
++DEBUG	?= -O3
++CC	?= gcc
++INCLUDE	?= -I$(INCLUDE_DIR)
++CFLAGS	?= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++
++LDFLAGS	?= -L$(LIB_DIR)
++LDLIBS    ?= -lwiringPi -lwiringPiDev -lpthread -lm
+ 
+ # Should not alter anything below this line
+ ###############################################################################
+diff --git a/examples/PiFace/Makefile b/examples/PiFace/Makefile
+index 0bde334..fc14c0c 100644
+--- a/examples/PiFace/Makefile
++++ b/examples/PiFace/Makefile
+@@ -23,14 +23,20 @@
+ #################################################################################
+ 
+ 
+-#DEBUG	= -g -O0
+-DEBUG	= -O3
+-CC	= gcc
+-INCLUDE	= -I/usr/local/include
+-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+-
+-LDFLAGS	= -L/usr/local/lib
+-LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
++DESTDIR?=/usr
++PREFIX?=/local
++
++INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
++LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
++
++#DEBUG	?= -g -O0
++DEBUG	?= -O3
++CC	?= gcc
++INCLUDE	?= -I$(INCLUDE_DIR)
++CFLAGS	?= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++
++LDFLAGS	?= -L$(LIB_DIR)
++LDLIBS    ?= -lwiringPi -lwiringPiDev -lpthread -lm
+ 
+ # Should not alter anything below this line
+ ###############################################################################
+diff --git a/examples/PiGlow/Makefile b/examples/PiGlow/Makefile
+index 8d31141..482c9e7 100644
+--- a/examples/PiGlow/Makefile
++++ b/examples/PiGlow/Makefile
+@@ -26,10 +26,10 @@
+ #DEBUG	= -g -O0
+ DEBUG	= -O3
+ CC	= gcc
+-INCLUDE	= -I/usr/local/include
++INCLUDE	= -I../wiringPi -I../wiringPiDev
+ CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+ 
+-LDFLAGS	= -L/usr/local/lib
++LDFLAGS	= -L../wiringPi -L../wiringPiDev
+ LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
+ 
+ # Should not alter anything below this line
+diff --git a/examples/q2w/Makefile b/examples/q2w/Makefile
+index 150c825..0544aa3 100644
+--- a/examples/q2w/Makefile
++++ b/examples/q2w/Makefile
+@@ -22,14 +22,13 @@
+ #    along with wiringPi.  If not, see <http://www.gnu.org/licenses/>.
+ #################################################################################
+ 
+-
+ #DEBUG	= -g -O0
+ DEBUG	= -O3
+ CC	= gcc
+-INCLUDE	= -I/usr/local/include
++INCLUDE	= -I../wiringPi -I../devLib
+ CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+ 
+-LDFLAGS	= -L/usr/local/lib
++LDFLAGS	= -L../wiringPi -L../devLib
+ LDLIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
+ 
+ ###############################################################################
+diff --git a/gpio/Makefile b/gpio/Makefile
+index 449986e..95af1ad 100644
+--- a/gpio/Makefile
++++ b/gpio/Makefile
+@@ -23,16 +23,20 @@
+ #    along with wiringPi.  If not, see <http://www.gnu.org/licenses/>.
+ #################################################################################
+ 
+-DESTDIR=/usr
+-PREFIX=/local
++DESTDIR?=/usr
++PREFIX?=/local
+ 
+-#DEBUG	= -g -O0
+-DEBUG	= -O2
+-CC	= gcc
+-INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
+-CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
++LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
++BIN_DIR?=$(DESTDIR)$(PREFIX)/bin
+ 
+-LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
++#DEBUG	?= -g -O0
++DEBUG	?= -O2
++CC	?= gcc
++INCLUDE	?= -I$(INCLUDE_DIR)
++CFLAGS	?= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++
++LDFLAGS	= -L$(LIB_DIR)
+ LIBS    = -lwiringPi -lwiringPiDev -lpthread -lm
+ 
+ # May not need to  alter anything below this line
+@@ -68,11 +72,10 @@ tags:	$(SRC)
+ .PHONY:	install
+ install: gpio
+ 	@echo "[Install]"
+-	@cp gpio		$(DESTDIR)$(PREFIX)/bin
+-	@chown root.root	$(DESTDIR)$(PREFIX)/bin/gpio
+-	@chmod 4755		$(DESTDIR)$(PREFIX)/bin/gpio
+-	@mkdir -p		$(DESTDIR)$(PREFIX)/man/man1
+-	@cp gpio.1		$(DESTDIR)$(PREFIX)/man/man1
++	@install -d $(BIN_DIR)
++	@install -m 4755 -o root -g root gpio $(BIN_DIR)
++	@install -d $(DESTDIR)$(PREFIX)/share/man/man1
++	@install -m 644 -o root -g root gpio.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 
+ .PHONY:	install-deb
+ install-deb:	gpio
+@@ -83,7 +86,7 @@ install-deb:	gpio
+ .PHONY:	uninstall
+ uninstall:
+ 	@echo "[UnInstall]"
+-	@rm -f $(DESTDIR)$(PREFIX)/bin/gpio
++	@rm -f $(BIN_DIR)/gpio
+ 	@rm -f $(DESTDIR)$(PREFIX)/man/man1/gpio.1
+ 
+ .PHONY:	depend
+diff --git a/wiringPi/Makefile b/wiringPi/Makefile
+index 015a894..5fc0659 100644
+--- a/wiringPi/Makefile
++++ b/wiringPi/Makefile
+@@ -22,18 +22,22 @@
+ #################################################################################
+ 
+ VERSION=$(shell cat ../VERSION)
+-DESTDIR=/usr
+-PREFIX=/local
++DESTDIR?=/usr
++PREFIX?=/local
++INCLUDE_DIR?=$(DESTDIR)$(PREFIX)/include
++LIB_DIR?=$(DESTDIR)$(PREFIX)/lib
+ 
+-STATIC=libwiringPi.a
+-DYNAMIC=libwiringPi.so.$(VERSION)
++BASE_NAME=libwiringPi
++STATIC=$(BASE_NAME).a
++DYNAMIC=$(BASE_NAME).so.$(VERSION)
+ 
+-#DEBUG	= -g -O0
+-DEBUG	= -O2
+-CC	= gcc
+-INCLUDE	= -I.
+-DEFS	= -D_GNU_SOURCE
++#DEBUG	?= -g -O0
+ CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
++DEBUG	?= -O2
++CC	?= gcc
++DEFS	= -D_GNU_SOURCE
++INCLUDE	?= -I.
++CFLAGS	?= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+ 
+ LIBS    =
+ 
+@@ -83,17 +87,17 @@ $(STATIC):	$(OBJ)
+ 
+ $(DYNAMIC):	$(OBJ)
+ 	@echo "[Link (Dynamic)]"
+-	@$(CC) -shared -Wl,-soname,libwiringPi.so -o libwiringPi.so.$(VERSION) -lpthread $(OBJ)
++	@$(CC) -shared -Wl,-soname,$(BASE_NAME).so.$(DYN_VERS_MAJ) -o $(BASE_NAME).so -lpthread $(OBJ)
+ 
+ .c.o:
+ 	@echo [Compile] $<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	@$(CC) -c $(CFLAGS) -fPIC $< -o $@
+ 
+ 
+ .PHONY:	clean
+ clean:
+ 	@echo "[Clean]"
+-	@rm -f $(OBJ) $(OBJ_I2C) *~ core tags Makefile.bak libwiringPi.*
++	@rm -f $(OBJ) $(OBJ_I2C) *~ core tags Makefile.bak $(BASE_NAME).so* $(BASE_NAME).a
+ 
+ .PHONY:	tags
+ tags:	$(SRC)
+@@ -104,22 +108,22 @@ tags:	$(SRC)
+ .PHONY:	install
+ install:	$(DYNAMIC)
+ 	@echo "[Install Headers]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+-	@install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
++	@install -m 0755 -d						$(INCLUDE_DIR)
++	@install -m 0644 $(HEADERS)					$(INCLUDE_DIR)
+ 	@echo "[Install Dynamic Lib]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	@install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
+-	@ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)	$(DESTDIR)/lib/libwiringPi.so
+-	@ldconfig
++	@install -m 0755 -d						$(LIB_DIR)
++	@install -m 0755 $(BASE_NAME).so	$(LIB_DIR)/$(DYNAMIC)
++	@ln -sf $(DYNAMIC)			$(LIB_DIR)/$(BASE_NAME).so
++	@ln -sf $(DYNAMIC)			$(LIB_DIR)/$(BASE_NAME).so.$(DYN_VERS_MAJ)
+ 
+ .PHONY:	install-static
+ install-static:	$(STATIC)
+ 	@echo "[Install Headers]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/include
+-	@install -m 0644 $(HEADERS)					$(DESTDIR)$(PREFIX)/include
++	@install -m 0755 -d						$(INCLUDE_DIR)
++	@install -m 0644 $(HEADERS)					$(INCLUDE_DIR)
+ 	@echo "[Install Static Lib]"
+-	@install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
+-	@install -m 0755 libwiringPi.a					$(DESTDIR)$(PREFIX)/lib
++	@install -m 0755 -d						$(LIB_DIR)
++	@install -m 0644 $(STATIC)					$(LIB_DIR)
+ 
+ .PHONY:	install-deb
+ install-deb:	$(DYNAMIC)
+@@ -134,9 +138,11 @@ install-deb:	$(DYNAMIC)
+ .PHONY:	uninstall
+ uninstall:
+ 	@echo "[UnInstall]"
+-	@cd $(DESTDIR)$(PREFIX)/include/ && rm -f $(HEADERS)
+-	@cd $(DESTDIR)$(PREFIX)/lib/     && rm -f libwiringPi.*
+-	@ldconfig
++	@cd $(INCLUDE_DIR) && rm -f $(HEADERS)
++	@rm -f $(LIB_DIR)/$(STATIC)
++	@rm -f $(LIB_DIR)/$(DYNAMIC)
++	@rm -f $(LIB_DIR)/$(BASE_NAME).so
++	@rm -f $(LIB_DIR)/$(BASE_NAME).so.$(DYN_VERS_MAJ)
+ 
+ 
+ .PHONY:	depend
+-- 
+1.9.1
+

recipes-devtools/wiringPi/files/Makefiles-install.patch deleted +0 ~~-202~~

202 lines not on this page · raw message

recipes-devtools/wiringPi/wiringpi_git.bb +6 -4

index b2e3e91..21b5294 100644
@@ -4,28 +4,30 @@ SECTION = "devel/libs"
 LICENSE = "LGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-SRCREV = "98bcb20d9391ebde24f9eb1244f0d238fb1a1dab"
+SRCREV = "5edd177112c99416f68ba3e8c6c4db6ed942e796"
 
 S = "${WORKDIR}/git"
 
 SRC_URI = "\
           git://git.drogon.net/wiringPi \
-          file://Makefiles-install.patch \
+          file://0001-Add-initial-cross-compile-support.patch \
           "
 
 COMPATIBLE_MACHINE = "raspberrypi"
 
-CFLAGS_prepend = "-I${S}/wiringPi"
+CFLAGS_prepend = "-I${S}/wiringPi -I${S}/devLib"
 
 EXTRA_OEMAKE += "'INCLUDE_DIR=${D}${includedir}' 'LIB_DIR=${D}${libdir}'"
 EXTRA_OEMAKE += "'DESTDIR=${D}/usr' 'PREFIX=""'"
 
 do_compile() {
+    oe_runmake -C devLib
     oe_runmake -C wiringPi
-    oe_runmake -C gpio 'LDFLAGS=${LDFLAGS} -L${S}/wiringPi'
+    oe_runmake -C gpio 'LDFLAGS=${LDFLAGS} -L${S}/wiringPi -L${S}/devLib'
 }
 
 do_install() {
+    oe_runmake -C devLib install
     oe_runmake -C wiringPi install
     oe_runmake -C gpio install
 }

Signature · 1 line

1.9.1

Andrei Gherzan

2015-07-19 17:04 UTC #3 lore raw

In reply to Petter Mabäcker

Quoted 13 lines · Petter Mabäcker

The following changes since commit c8532df1c2e4812b3520d32ed49be943bea2edd9:
If SERIAL_CONSOLE is already define by another layer, this value may not be good. (2015-06-05 16:38:14 +0200)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/rpi_redmine_60_more_updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/rpi_redmine_60_more_updates
Petter Mabäcker (2):
omxplayer: Bump SRCREV
wiringpi: Bump SRCREV

Quoted 7 lines

 .../0001-Add-initial-cross-compile-support.patch   | 429 +++++++++++++++++++++
 .../wiringPi/files/Makefiles-install.patch         | 202 ----------
 recipes-devtools/wiringPi/wiringpi_git.bb          |  10 +-
 recipes-multimedia/omxplayer/omxplayer_git.bb      |   4 +-
 4 files changed, 437 insertions(+), 208 deletions(-)
 create mode 100644 recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch
 delete mode 100644 recipes-devtools/wiringPi/files/Makefiles-install.patch

Series tested and merged to master. Thanks.

--
Andrei Gherzan