diff options
author | Petter Mabäcker <petter@technux.se> | 2015-08-28 08:27:16 +0200 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2015-09-24 01:28:59 +0300 |
commit | bdbe28d7f39813f6f7305d48240c8c7d57102d57 (patch) | |
tree | 78b1fd39c9e1173c9de9e08103ae8dbd04fef25f /recipes-devtools | |
parent | 16718000cfb6edc8a9fdc57cb378814ff1d1582a (diff) | |
download | meta-raspberrypi-bdbe28d7f39813f6f7305d48240c8c7d57102d57.tar.gz |
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>
Diffstat (limited to 'recipes-devtools')
3 files changed, 1 insertions, 56 deletions
diff --git a/recipes-devtools/pi-blaster/files/0001-handle-install-data-hook-when-cross-compile.patch b/recipes-devtools/pi-blaster/files/0001-handle-install-data-hook-when-cross-compile.patch deleted file mode 100644 index 2f2a7f4..0000000 --- a/recipes-devtools/pi-blaster/files/0001-handle-install-data-hook-when-cross-compile.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 28e4bc3216f8845cf278f0fbc6b2c30eebcc35aa Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se> | ||
3 | Date: Sun, 7 Jun 2015 17:17:01 +0200 | ||
4 | Subject: [PATCH] handle install-data-hook when cross compile | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Avoid doing 'install-data-hook' when cross compiling since it isn't | ||
10 | suitable to update rc.d or run the service when cross | ||
11 | compiling. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Petter Mabäcker <petter@technux.se> | ||
16 | --- | ||
17 | Makefile.am | 4 +++- | ||
18 | configure.ac | 1 + | ||
19 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/Makefile.am b/Makefile.am | ||
22 | index 6693d46..935288f 100644 | ||
23 | --- a/Makefile.am | ||
24 | +++ b/Makefile.am | ||
25 | @@ -13,6 +13,7 @@ else | ||
26 | init_ddir = $(sysconfdir)/init.d | ||
27 | init_d_SCRIPTS = pi-blaster.boot.sh | ||
28 | |||
29 | +if !CROSS_COMPILING | ||
30 | install-data-hook: | ||
31 | update-rc.d pi-blaster.boot.sh defaults | ||
32 | $(init_ddir)/pi-blaster.boot.sh start | ||
33 | @@ -20,4 +21,5 @@ install-data-hook: | ||
34 | uninstall-hook: | ||
35 | update-rc.d pi-blaster.boot.sh remove | ||
36 | killall pi-blaster | ||
37 | -endif | ||
38 | +endif # !CROSS_COMPILING | ||
39 | +endif # !HAVE_SYSTEMD | ||
40 | diff --git a/configure.ac b/configure.ac | ||
41 | index 5d0c1fa..aaf4465 100644 | ||
42 | --- a/configure.ac | ||
43 | +++ b/configure.ac | ||
44 | @@ -23,6 +23,7 @@ if test "x$with_systemdsystemunitdir" != xno; then | ||
45 | AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) | ||
46 | fi | ||
47 | AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) | ||
48 | +AM_CONDITIONAL(CROSS_COMPILING, [test x"$cross_compiling" = x"yes" ]) | ||
49 | |||
50 | # Checks for programs. | ||
51 | AC_PROG_CC | ||
52 | -- | ||
53 | 1.9.1 | ||
54 | |||
diff --git a/recipes-devtools/pi-blaster/pi-blaster.inc b/recipes-devtools/pi-blaster/pi-blaster.inc index 1f4cc2f..a3beccc 100644 --- a/recipes-devtools/pi-blaster/pi-blaster.inc +++ b/recipes-devtools/pi-blaster/pi-blaster.inc | |||
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=157;endline=170;md5=f20832f311266 | |||
6 | 6 | ||
7 | SRC_URI = "git://github.com/sarfata/pi-blaster \ | 7 | SRC_URI = "git://github.com/sarfata/pi-blaster \ |
8 | file://remove-initscript-lsb-dependency.patch \ | 8 | file://remove-initscript-lsb-dependency.patch \ |
9 | file://0001-handle-install-data-hook-when-cross-compile.patch \ | ||
10 | " | 9 | " |
11 | 10 | ||
12 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
diff --git a/recipes-devtools/pi-blaster/pi-blaster_git.bb b/recipes-devtools/pi-blaster/pi-blaster_git.bb index 3ae7c49..01a55ca 100644 --- a/recipes-devtools/pi-blaster/pi-blaster_git.bb +++ b/recipes-devtools/pi-blaster/pi-blaster_git.bb | |||
@@ -1,3 +1,3 @@ | |||
1 | require pi-blaster.inc | 1 | require pi-blaster.inc |
2 | 2 | ||
3 | SRCREV = "cd318cd63031a30249a4c08435b97263fa76d7b7" | 3 | SRCREV = "bce7c1b4c53b0dd12665e46bdebd3b7cb0987e3d" |