From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- ...aster-Include-sys-sysmacros.h-for-makedev.patch | 32 +++++++++++++++ .../recipes-devtools/pi-blaster/pi-blaster_git.bb | 7 ++-- .../0001-Add-initial-cross-compile-support.patch | 46 +++++++++------------- .../recipes-devtools/wiringpi/wiringpi_git.bb | 6 ++- 4 files changed, 59 insertions(+), 32 deletions(-) create mode 100644 meta-raspberrypi/recipes-devtools/pi-blaster/files/0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch (limited to 'meta-raspberrypi/recipes-devtools') diff --git a/meta-raspberrypi/recipes-devtools/pi-blaster/files/0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch b/meta-raspberrypi/recipes-devtools/pi-blaster/files/0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch new file mode 100644 index 000000000..b4bc4b289 --- /dev/null +++ b/meta-raspberrypi/recipes-devtools/pi-blaster/files/0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch @@ -0,0 +1,32 @@ +From 6a6b705ff5cba960c54bdb4d4bcdaa3b00a854a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 11 Aug 2018 10:24:24 -0700 +Subject: [PATCH] pi-blaster: Include sys/sysmacros.h for makedev() + +In glibc 2.28+ this header is not included indirectly anymore + +fixes + +ld: pi-blaster.o: in function `mbox_open': +pi-blaster.c:(.text+0x28): undefined reference to `makedev' +collect2: error: ld returned 1 exit status + +Upstream-Status: Submitted [https://github.com/sarfata/pi-blaster/pull/100] + +Signed-off-by: Khem Raj +--- + pi-blaster.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pi-blaster.c b/pi-blaster.c +index 6cfd010..fc4e686 100644 +--- a/pi-blaster.c ++++ b/pi-blaster.c +@@ -41,6 +41,7 @@ static char VERSION[] = "SNAPSHOT"; + #include + #include + #include ++#include + #include + #include + #include "mailbox.h" diff --git a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb index 274845985..9cedf5ec8 100644 --- a/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb +++ b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb @@ -2,15 +2,16 @@ DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspbe HOMEPAGE = "https://github.com/sarfata/pi-blaster/" SECTION = "devel/libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;beginline=225;endline=252;md5=a012868ef5f83b9f257af253d7cb07a3" +LIC_FILES_CHKSUM = "file://README.md;beginline=244;endline=268;md5=86d10e4bcf4b4014d306dde7c1d2a80d" SRC_URI = "git://github.com/sarfata/pi-blaster \ file://remove-initscript-lsb-dependency.patch \ -" + file://0001-pi-blaster-Include-sys-sysmacros.h-for-makedev.patch \ + " S = "${WORKDIR}/git" -SRCREV = "1035ad7dffb270c40eec1bb3a654171a755fba98" +SRCREV = "e981aa5d7624c75a4d4afcddcbd235f25e32ffe4" inherit update-rc.d autotools diff --git a/meta-raspberrypi/recipes-devtools/wiringpi/files/0001-Add-initial-cross-compile-support.patch b/meta-raspberrypi/recipes-devtools/wiringpi/files/0001-Add-initial-cross-compile-support.patch index 01e054634..d97bbef0d 100644 --- a/meta-raspberrypi/recipes-devtools/wiringpi/files/0001-Add-initial-cross-compile-support.patch +++ b/meta-raspberrypi/recipes-devtools/wiringpi/files/0001-Add-initial-cross-compile-support.patch @@ -1,8 +1,11 @@ -From ca25788e2563bad0d554deb9f4300d1e7d062825 Mon Sep 17 00:00:00 2001 -From: Aurelian Zanoschi -Date: Mon, 31 Jul 2017 20:25:15 +0300 +From 9a47fd5da546d148886c8890cd48249ebe826948 Mon Sep 17 00:00:00 2001 +From: Daniel Rank +Date: Wed, 1 Aug 2018 23:32:00 -0700 Subject: [PATCH] Add initial cross compile support +Upstream-Status: Pending +Signed-off-by: Daniel Rank + --- devLib/Makefile | 54 +++++++++++++++++++++++++-------------------- examples/Gertboard/Makefile | 22 +++++++++++------- @@ -11,8 +14,8 @@ Subject: [PATCH] Add initial cross compile support examples/PiGlow/Makefile | 4 ++-- examples/q2w/Makefile | 4 ++-- gpio/Makefile | 29 ++++++++++++------------ - wiringPi/Makefile | 52 ++++++++++++++++++++++++------------------- - 8 files changed, 120 insertions(+), 89 deletions(-) + wiringPi/Makefile | 46 +++++++++++++++++++++----------------- + 8 files changed, 117 insertions(+), 86 deletions(-) diff --git a/devLib/Makefile b/devLib/Makefile index cf665d6..040c03a 100644 @@ -248,7 +251,7 @@ index 8f773bf..14aa6e4 100644 ############################################################################### diff --git a/gpio/Makefile b/gpio/Makefile -index f41a005..22753ee 100644 +index 9ec160d..a294242 100644 --- a/gpio/Makefile +++ b/gpio/Makefile @@ -30,13 +30,17 @@ ifneq ($V,1) @@ -284,8 +287,8 @@ index f41a005..22753ee 100644 - $Q chown root.root $(DESTDIR)$(PREFIX)/bin/gpio - $Q chmod 4755 $(DESTDIR)$(PREFIX)/bin/gpio -endif -- $Q mkdir -p $(DESTDIR)$(PREFIX)/man/man1 -- $Q cp gpio.1 $(DESTDIR)$(PREFIX)/man/man1 +- $Q mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 +- $Q cp gpio.1 $(DESTDIR)$(PREFIX)/share/man/man1 + $Q install -d $(BIN_DIR) + $Q install -m 4755 -o root -g root gpio $(BIN_DIR) + $Q install -d $(DESTDIR)$(PREFIX)/share/man/man1 @@ -299,14 +302,14 @@ index f41a005..22753ee 100644 $Q echo "[UnInstall]" - $Q rm -f $(DESTDIR)$(PREFIX)/bin/gpio + $Q rm -f $(BIN_DIR)/gpio - $Q rm -f $(DESTDIR)$(PREFIX)/man/man1/gpio.1 + $Q rm -f $(DESTDIR)$(PREFIX)/share/man/man1/gpio.1 .PHONY: depend diff --git a/wiringPi/Makefile b/wiringPi/Makefile -index e1868b9..750d290 100644 +index 287fa58..670a6db 100644 --- a/wiringPi/Makefile +++ b/wiringPi/Makefile -@@ -25,21 +25,25 @@ VERSION=$(shell cat ../VERSION) +@@ -25,22 +25,26 @@ VERSION=$(shell cat ../VERSION) DESTDIR?=/usr PREFIX?=/local @@ -335,11 +338,13 @@ index e1868b9..750d290 100644 +INCLUDE ?= -I. DEFS = -D_GNU_SOURCE -CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC +-#CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC +CFLAGS = $(DEBUG) $(DEFS) $(INCLUDE) -Wformat=2 -Wall -Wextra -Winline -pipe -fPIC ++#CFLAGS = $(DEBUG) $(DEFS) $(INCLUDE) -Wformat=2 -Wall -Wextra -Wconversion -Winline -pipe -fPIC LIBS = -lm -lpthread -lrt -lcrypt -@@ -78,17 +82,17 @@ $(STATIC): $(OBJ) +@@ -75,17 +79,17 @@ static: $(DYNAMIC): $(OBJ) $Q echo "[Link (Dynamic)]" @@ -360,7 +365,7 @@ index e1868b9..750d290 100644 .PHONY: tags tags: $(SRC) -@@ -99,22 +103,22 @@ tags: $(SRC) +@@ -96,13 +100,13 @@ tags: $(SRC) .PHONY: install install: $(DYNAMIC) $Q echo "[Install Headers]" @@ -378,22 +383,9 @@ index e1868b9..750d290 100644 + $Q ln -sf $(DYNAMIC) $(LIB_DIR)/$(BASE_NAME).so + $Q ln -sf $(DYNAMIC) $(LIB_DIR)/$(BASE_NAME).so.$(DYN_VERS_MAJ) - .PHONY: install-static - install-static: $(STATIC) - $Q echo "[Install Headers]" -- $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/include -- $Q install -m 0644 $(HEADERS) $(DESTDIR)$(PREFIX)/include -+ $Q install -m 0755 -d $(INCLUDE_DIR) -+ $Q install -m 0644 $(HEADERS) $(INCLUDE_DIR) - $Q echo "[Install Static Lib]" -- $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib -- $Q install -m 0755 libwiringPi.a $(DESTDIR)$(PREFIX)/lib -+ $Q install -m 0755 -d $(LIB_DIR) -+ $Q install -m 0755 $(STATIC) $(LIB_DIR) - .PHONY: install-deb install-deb: $(DYNAMIC) -@@ -129,9 +133,11 @@ install-deb: $(DYNAMIC) +@@ -117,9 +121,11 @@ install-deb: $(DYNAMIC) .PHONY: uninstall uninstall: $Q echo "[UnInstall]" diff --git a/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb b/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb index f1b01dbe5..e78c58a29 100644 --- a/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb +++ b/meta-raspberrypi/recipes-devtools/wiringpi/wiringpi_git.bb @@ -4,8 +4,10 @@ SECTION = "devel/libs" LICENSE = "LGPLv3+" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" -# tag 2.44 -SRCREV = "96344ff7125182989f98d3be8d111952a8f74e15" +DEPENDS += "virtual/crypt" + +# tag 2.46 +SRCREV = "8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a" S = "${WORKDIR}/git" -- cgit v1.2.3