diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch index a16a854052..803e52c10c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/always-use-libdevmapper-kpartx.patch @@ -1,4 +1,7 @@ -Always use devmapper for kpartx +From 7267cf235fc052eaa1ca36e437096576edacb131 Mon Sep 17 00:00:00 2001 +From: Aws Ismail <aws.ismail@windriver.com> +Date: Mon, 22 Sep 2014 17:22:32 -0700 +Subject: [PATCH] Always use devmapper for kpartx Do not try to compute the LIBDM_API_COOKIE make variable from host information when cross-compiling. @@ -7,23 +10,27 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Aws Ismail <aws.ismail@windriver.com> Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + kpartx/Makefile | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kpartx/Makefile b/kpartx/Makefile -index 2a07334..24bdabc 100644 +index e8a59f2..e694a65 100644 --- a/kpartx/Makefile +++ b/kpartx/Makefile -@@ -4,13 +4,7 @@ - # - include ../Makefile.inc +@@ -7,11 +7,7 @@ CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + + LIBDEPS += -ldevmapper --CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -- -LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) - -ifneq ($(strip $(LIBDM_API_COOKIE)),0) - CFLAGS += -DLIBDM_API_COOKIE -endif -+CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLIBDM_API_COOKIE ++CFLAGS += -DLIBDM_API_COOKIE - LDFLAGS = -ldevmapper OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ + gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o +-- +2.11.0 + |