mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
pi-blaster: Bump SRCREV
Update to latest revision in order to get rid of the integration patch '0001-handle-install-data-hook-when-cross-compile.patch' that has been submitted upstream. Changes since cd318cd63031a30249a4c08435b97263fa76d7b7: bce7c1b Merge pull request #45 from Technux/dev/technux 74510ff Display an error message if unable to open mbox 53197ca handle install-data-hook when cross compile Signed-off-by: Petter Mabäcker <petter@technux.se>
This commit is contained in:
parent
16718000cf
commit
bdbe28d7f3
|
@ -1,54 +0,0 @@
|
||||||
From 28e4bc3216f8845cf278f0fbc6b2c30eebcc35aa Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
|
|
||||||
Date: Sun, 7 Jun 2015 17:17:01 +0200
|
|
||||||
Subject: [PATCH] handle install-data-hook when cross compile
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Avoid doing 'install-data-hook' when cross compiling since it isn't
|
|
||||||
suitable to update rc.d or run the service when cross
|
|
||||||
compiling.
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Petter Mabäcker <petter@technux.se>
|
|
||||||
---
|
|
||||||
Makefile.am | 4 +++-
|
|
||||||
configure.ac | 1 +
|
|
||||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index 6693d46..935288f 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -13,6 +13,7 @@ else
|
|
||||||
init_ddir = $(sysconfdir)/init.d
|
|
||||||
init_d_SCRIPTS = pi-blaster.boot.sh
|
|
||||||
|
|
||||||
+if !CROSS_COMPILING
|
|
||||||
install-data-hook:
|
|
||||||
update-rc.d pi-blaster.boot.sh defaults
|
|
||||||
$(init_ddir)/pi-blaster.boot.sh start
|
|
||||||
@@ -20,4 +21,5 @@ install-data-hook:
|
|
||||||
uninstall-hook:
|
|
||||||
update-rc.d pi-blaster.boot.sh remove
|
|
||||||
killall pi-blaster
|
|
||||||
-endif
|
|
||||||
+endif # !CROSS_COMPILING
|
|
||||||
+endif # !HAVE_SYSTEMD
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 5d0c1fa..aaf4465 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -23,6 +23,7 @@ if test "x$with_systemdsystemunitdir" != xno; then
|
|
||||||
AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
|
|
||||||
+AM_CONDITIONAL(CROSS_COMPILING, [test x"$cross_compiling" = x"yes" ])
|
|
||||||
|
|
||||||
# Checks for programs.
|
|
||||||
AC_PROG_CC
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=157;endline=170;md5=f20832f311266
|
||||||
|
|
||||||
SRC_URI = "git://github.com/sarfata/pi-blaster \
|
SRC_URI = "git://github.com/sarfata/pi-blaster \
|
||||||
file://remove-initscript-lsb-dependency.patch \
|
file://remove-initscript-lsb-dependency.patch \
|
||||||
file://0001-handle-install-data-hook-when-cross-compile.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require pi-blaster.inc
|
require pi-blaster.inc
|
||||||
|
|
||||||
SRCREV = "cd318cd63031a30249a4c08435b97263fa76d7b7"
|
SRCREV = "bce7c1b4c53b0dd12665e46bdebd3b7cb0987e3d"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user