| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From c3436ec8a502a40579abf62be0a479fa9d7888ad Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Changqing Li <changqing.li@windriver.com> |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 3 | Date: Tue, 4 Jun 2019 11:39:39 +0800 |
| 4 | Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
| 6 | Do not look for systemd info on the host, and allow us to pass in CFLAGS |
| 7 | using the OPTFLAGS variable. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [embedded specific] |
| 10 | |
| 11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 12 | |
| 13 | Update for version 0.5.0-144-g770e6d0 |
| 14 | |
| 15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 16 | |
| 17 | Update for version 0.7.1 |
| 18 | |
| 19 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 20 | |
| 21 | update for version 0.7.7 |
| 22 | |
| 23 | remove change about CFLAGS part, since patch 0024 already have similar function. |
| 24 | |
| 25 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 26 | |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 27 | update for version 0.8.1 |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | --- |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 30 | Makefile.inc | 11 ----------- |
| 31 | 1 file changed, 11 deletions(-) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | |
| 33 | diff --git a/Makefile.inc b/Makefile.inc |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 34 | index 661f141..3f9fd28 100644 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 35 | --- a/Makefile.inc |
| 36 | +++ b/Makefile.inc |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 37 | @@ -35,17 +35,6 @@ ifndef RUN |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 38 | endif |
| 39 | endif |
| 40 | |
| 41 | -ifndef SYSTEMD |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 42 | - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) |
| 43 | - SYSTEMD = $(shell pkg-config --modversion libsystemd) |
| 44 | - else |
| 45 | - ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) |
| 46 | - SYSTEMD = $(shell systemctl --version 2> /dev/null | \ |
| 47 | - sed -n 's/systemd \([0-9]*\).*/\1/p') |
| 48 | - endif |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 49 | - endif |
| 50 | -endif |
| 51 | - |
| 52 | ifndef SYSTEMDPATH |
| 53 | SYSTEMDPATH=usr/lib |
| 54 | endif |
| 55 | -- |
| 56 | 2.7.4 |
| 57 | |