[oe-commits] org.oe.dev device-mapper: Patch insanity out of Makefiles

[rpurdie commit]

device-mapper: Patch insanity out of Makefiles

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: ec7727330366d4b666a322522faeb4313627d8e0
ViewMTN: http://monotone.openembedded.org/revision/info/ec7727330366d4b666a322522faeb4313627d8e0
Files:
1
packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch
packages/device-mapper/device-mapper_1.01.05.bb
Diffs:

#
# mt diff -rc3810124d7d58edd0720d203e8736b38264ea542 -rec7727330366d4b666a322522faeb4313627d8e0
#
#
#
# add_file "packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch"
#  content [2434ff0194208989e31e1f5cb95c4330d39e1e46]
# 
# patch "packages/device-mapper/device-mapper_1.01.05.bb"
#  from [8142b29dfc0ad5e0987fe2e4d42164ce45c9a45f]
#    to [f1464b25cbdaa7e5f63661fedb9d0958576e86dd]
#
============================================================
--- packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch	2434ff0194208989e31e1f5cb95c4330d39e1e46
+++ packages/device-mapper/device-mapper-1.01.05/remove_insanity.patch	2434ff0194208989e31e1f5cb95c4330d39e1e46
@@ -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
============================================================
--- packages/device-mapper/device-mapper_1.01.05.bb	8142b29dfc0ad5e0987fe2e4d42164ce45c9a45f
+++ packages/device-mapper/device-mapper_1.01.05.bb	f1464b25cbdaa7e5f63661fedb9d0958576e86dd
@@ -3,12 +3,13 @@ LICENSE = "GPL"
 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