rpms/e2fsprogs/devel e2fsprogs-1.38-dm.patch, 1.1, 1.2 e2fsprogs.spec, 1.41, 1.42

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jan 4 21:30:51 UTC 2006 

Author: pjones

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25824

Modified Files:
	e2fsprogs-1.38-dm.patch e2fsprogs.spec 
Log Message:
- fix some dm errors
- update to 1.38-4


e2fsprogs-1.38-dm.patch:
 e2fsck/Makefile.in    |    2 
 lib/blkid/Makefile.in |   22 +++----
 lib/blkid/blkidP.h    |    1 
 lib/blkid/devname.c   |  147 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 160 insertions(+), 12 deletions(-)

Index: e2fsprogs-1.38-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-dm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2fsprogs-1.38-dm.patch	4 Jan 2006 03:30:33 -0000	1.1
+++ e2fsprogs-1.38-dm.patch	4 Jan 2006 21:30:35 -0000	1.2
@@ -1,5 +1,5 @@
 --- e2fsprogs-1.38/e2fsck/Makefile.in.dm	2005-06-29 13:42:20.000000000 -0400
-+++ e2fsprogs-1.38/e2fsck/Makefile.in	2006-01-03 22:00:06.000000000 -0500
++++ e2fsprogs-1.38/e2fsck/Makefile.in	2006-01-04 15:51:47.000000000 -0500
 @@ -20,7 +20,7 @@
  DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
  
@@ -9,8 +9,18 @@
  STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
  	$(DEPSTATIC_LIBUUID)
  
+--- e2fsprogs-1.38/lib/blkid/blkidP.h.dm	2005-05-07 14:16:09.000000000 -0400
++++ e2fsprogs-1.38/lib/blkid/blkidP.h	2006-01-04 15:51:47.000000000 -0500
+@@ -118,6 +118,7 @@
+ /*
+  * Priority settings for different types of devices
+  */
++#define BLKID_PRI_DM	40
+ #define BLKID_PRI_EVMS	30
+ #define BLKID_PRI_LVM	20
+ #define BLKID_PRI_MD	10
 --- e2fsprogs-1.38/lib/blkid/devname.c.dm	2005-05-07 15:26:03.000000000 -0400
-+++ e2fsprogs-1.38/lib/blkid/devname.c	2006-01-03 22:00:06.000000000 -0500
++++ e2fsprogs-1.38/lib/blkid/devname.c	2006-01-04 16:15:01.000000000 -0500
 @@ -11,6 +11,8 @@
   * %End-Header%
   */
@@ -20,7 +30,25 @@
  #include <stdio.h>
  #include <string.h>
  #if HAVE_UNISTD_H
-@@ -137,6 +139,146 @@
+@@ -75,6 +77,8 @@
+ 	return dev;
+ }
+ 
++static int dm_device_is_leaf(const dev_t dev);
++
+ /*
+  * Probe a single block device to add to the device cache.
+  */
+@@ -90,6 +94,8 @@
+ 	list_for_each(p, &cache->bic_devs) {
+ 		blkid_dev tmp = list_entry(p, struct blkid_struct_dev,
+ 					   bid_devs);
++		if (!dm_device_is_leaf(devno))
++			continue;
+ 		if (tmp->bid_devno == devno) {
+ 			if (only_if_new)
+ 				return;
+@@ -137,6 +143,146 @@
  	return;
  }
  
@@ -146,18 +174,18 @@
 +
 +		rc = asprintf(&device, "/dev/mapper/%s", names->name);
 +		if (rc < 0)
-+			continue;
++			goto try_next;
 +
 +		dev = dm_get_devno(names->name);
 +		if (dev == 0)
-+			continue;
++			goto try_next;
 +
-+		if (!dm_device_is_leaf(dev))
-+			continue;
++		if (!dm_device_is_leaf(dev)) 
++			goto try_next;
 +
++		probe_one(cache, device, dev, BLKID_PRI_DM, only_if_new);
 +
-+		probe_one(cache, device, dev, BLKID_PRI_LVM, only_if_new);
-+
++try_next:
 +		next = names->next;
 +	} while (next);
 +
@@ -167,16 +195,16 @@
  #define PROC_PARTITIONS "/proc/partitions"
  #define VG_DIR		"/proc/lvm/VGs"
  
-@@ -290,6 +432,7 @@
+@@ -290,6 +436,7 @@
  		return 0;
  
  	blkid_read_cache(cache);
-+        dm_probe_all(cache, only_if_new);
++	dm_probe_all(cache, only_if_new);
  	evms_probe_all(cache, only_if_new);
  #ifdef VG_DIR
  	lvm_probe_all(cache, only_if_new);
---- e2fsprogs-1.38/lib/blkid/Makefile.in.dm	2006-01-03 22:03:00.000000000 -0500
-+++ e2fsprogs-1.38/lib/blkid/Makefile.in	2006-01-03 22:02:40.000000000 -0500
+--- e2fsprogs-1.38/lib/blkid/Makefile.in.dm	2005-06-29 13:39:54.000000000 -0400
++++ e2fsprogs-1.38/lib/blkid/Makefile.in	2006-01-04 16:18:38.000000000 -0500
 @@ -37,7 +37,7 @@
  ELF_IMAGE = libblkid
  ELF_MYDIR = blkid
@@ -186,3 +214,57 @@
  
  BSDLIB_VERSION = 2.0
  BSDLIB_IMAGE = libblkid
+@@ -74,43 +74,43 @@
+ 
+ tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+-	@$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
++	@$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol
+ 
+ ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h
+ 	@echo "	CC $@"


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- e2fsprogs.spec	4 Jan 2006 03:30:33 -0000	1.41
+++ e2fsprogs.spec	4 Jan 2006 21:30:35 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -293,10 +293,14 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
-* Tue Jan 03 2006 Peter Jones <pjones at redhat.com> 1.38-3
+* Wed Jan  4 2006 Peter Jones <pjones at redhat.com> 1.38-4
+- fix a logic error in dm probing
+- add priority group for dm devices, so they'll be preferred
+
+* Tue Jan  3 2006 Peter Jones <pjones at redhat.com> 1.38-3
 - added support for device-mapper devices
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Fri Dec  9 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
 * Thu Nov 10 2005 Thomas Woerner <twoerner at redhat.com> 1.38-2.1

More information about the fedora-cvs-commits mailing list