| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 8bdd4481d822b6625d8bf719431ca74ed1b5e021 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Mon, 16 Jul 2018 15:56:37 +0800 |
| 4 | Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation |
| 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> |
| 26 | --- |
| 27 | Makefile.inc | 8 ++------ |
| 28 | 1 file changed, 2 insertions(+), 6 deletions(-) |
| 29 | |
| 30 | diff --git a/Makefile.inc b/Makefile.inc |
| 31 | index 57a1835..0c403c7 100644 |
| 32 | --- a/Makefile.inc |
| 33 | +++ b/Makefile.inc |
| 34 | @@ -38,12 +38,6 @@ ifndef RUN |
| 35 | endif |
| 36 | endif |
| 37 | |
| 38 | -ifndef SYSTEMD |
| 39 | - ifeq ($(shell systemctl --version > /dev/null 2>&1 && echo 1), 1) |
| 40 | - SYSTEMD = $(shell systemctl --version 2> /dev/null | sed -n 's/systemd \([0-9]*\)/\1/p') |
| 41 | - endif |
| 42 | -endif |
| 43 | - |
| 44 | ifndef SYSTEMDPATH |
| 45 | SYSTEMDPATH=usr/lib |
| 46 | endif |
| 47 | -- |
| 48 | 2.7.4 |
| 49 | |