blob: 4fa7960b1746dcbd850948a6fe32ed19033fdb32 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From a805b601fcf4bb9e269566a8d25e48d9e60915c0 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Changqing Li <changqing.li@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -04003Date: Mon, 26 Nov 2018 11:14:24 +0800
4Subject: [PATCH] From 8bdd4481d822b6625d8bf719431ca74ed1b5e021 Mon Sep 17
5 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 16
6 Jul 2018 15:56:37 +0800 Subject: [PATCH] multipath-tools: modify Makefile.inc
7 for cross-compilation
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08008
9Do not look for systemd info on the host, and allow us to pass in CFLAGS
10using the OPTFLAGS variable.
11
12Upstream-Status: Inappropriate [embedded specific]
13
14Signed-off-by: Joe Slater <joe.slater@windriver.com>
15
16Update for version 0.5.0-144-g770e6d0
17
18Signed-off-by: Kai Kang <kai.kang@windriver.com>
19
20Update for version 0.7.1
21
22Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
23
24update for version 0.7.7
25
26remove change about CFLAGS part, since patch 0024 already have similar function.
27
28Signed-off-by: Changqing Li <changqing.li@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -040029
30update for version 0.7.9
31Signed-off-by: Changqing Li <changqing.li@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080032---
Brad Bishop19323692019-04-05 15:28:33 -040033 Makefile.inc | 6 ------
34 1 file changed, 6 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080035
36diff --git a/Makefile.inc b/Makefile.inc
Brad Bishop19323692019-04-05 15:28:33 -040037index 295afb9..7136db3 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080038--- a/Makefile.inc
39+++ b/Makefile.inc
40@@ -38,12 +38,6 @@ ifndef RUN
41 endif
42 endif
43
44-ifndef SYSTEMD
45- ifeq ($(shell systemctl --version > /dev/null 2>&1 && echo 1), 1)
46- SYSTEMD = $(shell systemctl --version 2> /dev/null | sed -n 's/systemd \([0-9]*\)/\1/p')
47- endif
48-endif
49-
50 ifndef SYSTEMDPATH
51 SYSTEMDPATH=usr/lib
52 endif
53--
542.7.4
55