device-mapper: Patch insanity out of Makefiles

diff --git a/packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch b/packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch
new file mode 100644 (file)
index 0000000..1bc846e
--- /dev/null
+++ b/packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch
@@ -0,0 +1,33 @@
+Index: device-mapper.1.01.05/dmsetup/Makefile.in
+===================================================================
+--- device-mapper.1.01.05.orig/dmsetup/Makefile.in     2008-03-26 09:17:23.000000000 +0000
++++ device-mapper.1.01.05/dmsetup/Makefile.in  2008-03-26 09:18:01.000000000 +0000
+@@ -31,11 +31,11 @@
+ 
+ dmsetup: $(OBJECTS) $(interfacedir)/libdevmapper.$(LIB_SUFFIX)
+       $(CC) -o $@ $(OBJECTS) $(LDFLAGS) \
+-            -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS)
++            -L$(interfacedir) -ldevmapper $(LIBS)
+ 
+ dmsetup.static: $(OBJECTS) $(interfacedir)/libdevmapper.a
+       $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -static \
+-            -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS)
++            -L$(interfacedir) -ldevmapper $(LIBS)
+ 
+ install: $(INSTALL_TYPE)
+ 
+Index: device-mapper.1.01.05/make.tmpl.in
+===================================================================
+--- device-mapper.1.01.05.orig/make.tmpl.in    2008-03-26 09:18:44.000000000 +0000
++++ device-mapper.1.01.05/make.tmpl.in 2008-03-26 09:19:10.000000000 +0000
+@@ -91,10 +91,6 @@
+ 
+ INCLUDES += -I. -I$(top_srcdir)/include
+ 
+-ifdef DESTDIR
+-  INCLUDES += -I$(DESTDIR)/usr/include
+-endif
+-
+ ifneq ("@missingkernel@", "yes")
+   INCLUDES += -I$(kerneldir)/include
+ endif

diff --git a/packages/device-mapper/device-mapper_1.01.05.bb b/packages/device-mapper/device-mapper_1.01.05.bb
index 1626f01..bc02e6a 100644 (file)
--- a/packages/device-mapper/device-mapper_1.01.05.bb
+++ b/packages/device-mapper/device-mapper_1.01.05.bb
@@ -3,12 +3,13 @@ DESCRIPTION = "The Device-mapper is a new component of the linux kernel \
 that supports logical volume management. It is required by LVM2 and EVMS. \
 The original LVM (included in stock 2.4 kernels) does not use it."
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/${PN}.${PV}"
 
 SRC_URI = "ftp://sources.redhat.com/pub/dm/device-mapper.${PV}.tgz \
-          file://devmap-mknod-busybox.patch;patch=1"
+          file://devmap-mknod-busybox.patch;patch=1 \
+          file://remove_insanity.patch;patch=1 "
 
 inherit autotools update-rc.d