| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 1fe937835311a2d0afbc85ce4a4dbd3c9e0c912f 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 | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 3 | Date: Mon, 26 Nov 2018 11:19:45 +0800 |
| 4 | Subject: [PATCH] Subject: [PATCH] Always use devmapper for kpartx |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
| 6 | Do not try to compute the LIBDM_API_COOKIE make variable |
| 7 | from host information when cross-compiling. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [embedded specific] |
| 10 | |
| 11 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> |
| 12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 13 | |
| 14 | Rebase to 0.7.1 |
| 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 16 | |
| 17 | Rebase to 0.7.7 |
| 18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 19 | |
| 20 | Rebase to 0.7.9 |
| 21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 22 | --- |
| 23 | kpartx/Makefile | 4 +--- |
| 24 | 1 file changed, 1 insertion(+), 3 deletions(-) |
| 25 | |
| 26 | diff --git a/kpartx/Makefile b/kpartx/Makefile |
| 27 | index 7eb467e..c143321 100644 |
| 28 | --- a/kpartx/Makefile |
| 29 | +++ b/kpartx/Makefile |
| 30 | @@ -8,9 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) |
| 31 | |
| 32 | LIBDEPS += -ldevmapper |
| 33 | |
| 34 | -ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) |
| 35 | - CFLAGS += -DLIBDM_API_COOKIE |
| 36 | -endif |
| 37 | +CFLAGS += -DLIBDM_API_COOKIE |
| 38 | |
| 39 | OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ |
| 40 | gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o |
| 41 | -- |
| 42 | 2.7.4 |
| 43 | |