| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From d139474f2a6d87c1cd20dfbb916fe650bfcce968 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> |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 29 | [OP: Rebase to 0.9.3] |
| 30 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 31 | --- |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 32 | Makefile.inc | 11 ----------- |
| 33 | 1 file changed, 11 deletions(-) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 34 | |
| 35 | diff --git a/Makefile.inc b/Makefile.inc |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 36 | index 34f2cc6d..ee6a4c9f 100644 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | --- a/Makefile.inc |
| 38 | +++ b/Makefile.inc |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 39 | @@ -42,17 +42,6 @@ ifndef RUN |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | endif |
| 41 | endif |
| 42 | |
| 43 | -ifndef SYSTEMD |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 44 | - ifeq ($(shell $(PKGCONFIG) --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) |
| 45 | - SYSTEMD = $(shell $(PKGCONFIG) --modversion libsystemd | awk '{print $$1}') |
| Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 46 | - else |
| 47 | - ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) |
| 48 | - SYSTEMD = $(shell systemctl --version 2> /dev/null | \ |
| 49 | - sed -n 's/systemd \([0-9]*\).*/\1/p') |
| 50 | - endif |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 51 | - endif |
| 52 | -endif |
| 53 | - |
| 54 | ifndef SYSTEMDPATH |
| 55 | SYSTEMDPATH=usr/lib |
| 56 | endif |
| 57 | -- |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 58 | 2.38.1 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 59 | |