From: Patrick Mansfield <patmans@us.ibm.com>
Date: Tue, 17 Feb 2004 21:34:03 +0000
Subject: [PATCH] udev use new libsysfs header file location
Message-Id: <20040217133403.A11793@beaverton.ibm.com>
List-Id: <linux-hotplug.vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: linux-hotplug@vger.kernel.org

Use the new location of libsysfs header files.

=== namedev.c 1.108 vs edited ==--- 1.108/namedev.c	Mon Feb 16 17:52:32 2004
+++ edited/namedev.c	Tue Feb 17 13:15:35 2004
@@ -32,13 +32,13 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sysfs/libsysfs.h>
 
 #include "list.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
=== udev-add.c 1.47 vs edited ==--- 1.47/udev-add.c	Mon Feb 16 13:58:24 2004
+++ edited/udev-add.c	Tue Feb 17 13:15:56 2004
@@ -33,6 +33,7 @@
 #ifndef __KLIBC__
 #include <pwd.h>
 #endif
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -40,7 +41,6 @@
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 #include "klibc_fixups.h"
 
 /* 
=== udev.c 1.45 vs edited ==--- 1.45/udev.c	Thu Feb 12 12:19:20 2004
+++ edited/udev.c	Tue Feb 17 13:16:03 2004
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -33,7 +34,6 @@
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
=== udev.h 1.41 vs edited ==--- 1.41/udev.h	Sun Feb 15 20:17:27 2004
+++ edited/udev.h	Tue Feb 17 12:07:49 2004
@@ -23,7 +23,7 @@
 #ifndef UDEV_H
 #define UDEV_H
 
-#include "libsysfs/libsysfs.h"
+#include <sysfs/libsysfs.h>
 #include <stddef.h>
 #include <sys/param.h>
 
=== udev_config.c 1.9 vs edited ==--- 1.9/udev_config.c	Wed Feb 11 14:10:26 2004
+++ edited/udev_config.c	Tue Feb 17 13:16:08 2004
@@ -31,12 +31,12 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char sysfs_path[SYSFS_PATH_MAX];
=== udevdb.c 1.20 vs edited ==--- 1.20/udevdb.c	Thu Feb 12 09:46:14 2004
+++ edited/udevdb.c	Tue Feb 17 13:16:16 2004
@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <signal.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev_version.h"
 #include "udev.h"
@@ -39,7 +40,6 @@
 #include "namedev.h"
 #include "udevdb.h"
 #include "tdb/tdb.h"
-#include "libsysfs/libsysfs.h"
 
 static TDB_CONTEXT *udevdb;
 
=== udevinfo.c 1.11 vs edited ==--- 1.11/udevinfo.c	Mon Feb 16 17:26:34 2004
+++ edited/udevinfo.c	Tue Feb 17 13:16:25 2004
@@ -26,12 +26,12 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udevdb.h"
-#include "libsysfs/libsysfs.h"
 
 
 # define SYSFS_VALUE_MAX 200
=== udevtest.c 1.2 vs edited ==--- 1.2/udevtest.c	Thu Feb 12 12:19:20 2004
+++ edited/udevtest.c	Tue Feb 17 13:16:29 2004
@@ -26,12 +26,12 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
+#include <sysfs/libsysfs.h>
 
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "libsysfs/libsysfs.h"
 
 /* global variables */
 char **main_argv;
=== extras/scsi_id/scsi_id.c 1.5 vs edited ==--- 1.5/extras/scsi_id/scsi_id.c	Tue Jan 13 08:25:46 2004
+++ edited/extras/scsi_id/scsi_id.c	Tue Feb 17 12:08:10 2004
@@ -32,14 +32,8 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/stat.h>
-#ifdef __KLIBC__
-/*
- * Assume built under udev with KLIBC
- */
-#include <libsysfs.h>
-#else
 #include <sysfs/libsysfs.h>
-#endif
+
 #include "scsi_id_version.h"
 #include "scsi_id.h"
 
=== extras/scsi_id/scsi_serial.c 1.3 vs edited ==--- 1.3/extras/scsi_id/scsi_serial.c	Mon Jan 12 02:23:59 2004
+++ edited/extras/scsi_id/scsi_serial.c	Tue Feb 17 12:08:18 2004
@@ -31,14 +31,8 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <scsi/sg.h>
-#ifdef __KLIBC__
-/*
- * Assume built under udev with KLIBC
- */
-#include <libsysfs.h>
-#else
 #include <sysfs/libsysfs.h>
-#endif
+
 #include "scsi_id.h"
 #include "scsi.h"
 
=== libsysfs/dlist.c 1.2 vs edited ==--- 1.2/libsysfs/dlist.c	Wed Oct 22 11:38:09 2003
+++ edited/libsysfs/dlist.c	Tue Feb 17 12:09:22 2004
@@ -28,7 +28,7 @@
 
 */
 #include <stdlib.h>
-#include "dlist.h"
+#include "sysfs/dlist.h"
 
 /*
  * Return pointer to node at marker.
=== libsysfs/sysfs_bus.c 1.7 vs edited ==--- 1.7/libsysfs/sysfs_bus.c	Tue Jan 13 22:29:58 2004
+++ edited/libsysfs/sysfs_bus.c	Tue Feb 17 12:10:33 2004
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
-#include "sysfs.h"
+#include "sysfs/libsysfs.h"
+#include "sysfs/sysfs.h"
 
 static void sysfs_close_dev(void *dev)
 {
=== libsysfs/sysfs_class.c 1.7 vs edited ==--- 1.7/libsysfs/sysfs_class.c	Tue Jan 13 22:47:29 2004
+++ edited/libsysfs/sysfs_class.c	Tue Feb 17 12:10:44 2004
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
-#include "sysfs.h"
+#include "sysfs/libsysfs.h"
+#include "sysfs/sysfs.h"
 
 static void sysfs_close_cls_dev(void *dev)
 {
=== libsysfs/sysfs_device.c 1.9 vs edited ==--- 1.9/libsysfs/sysfs_device.c	Tue Jan 13 22:29:58 2004
+++ edited/libsysfs/sysfs_device.c	Tue Feb 17 12:10:49 2004
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
-#include "sysfs.h"
+#include "sysfs/libsysfs.h"
+#include "sysfs/sysfs.h"
 
 /**
  * sysfs_get_device_bus: retrieves the bus name the device is on, checks path 
=== libsysfs/sysfs_dir.c 1.8 vs edited ==--- 1.8/libsysfs/sysfs_dir.c	Wed Jan 28 10:53:12 2004
+++ edited/libsysfs/sysfs_dir.c	Tue Feb 17 12:10:54 2004
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
-#include "sysfs.h"
+#include "sysfs/libsysfs.h"
+#include "sysfs/sysfs.h"
 
 /**
  * sysfs_del_attribute: routine for dlist integration
=== libsysfs/sysfs_driver.c 1.7 vs edited ==--- 1.7/libsysfs/sysfs_driver.c	Tue Jan 13 22:29:58 2004
+++ edited/libsysfs/sysfs_driver.c	Tue Feb 17 12:11:03 2004
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
-#include "sysfs.h"
+#include "sysfs/libsysfs.h"
+#include "sysfs/sysfs.h"
 
 static void sysfs_close_driver_device(void *device)
 {
=== libsysfs/sysfs_utils.c 1.9 vs edited ==--- 1.9/libsysfs/sysfs_utils.c	Tue Jan 13 22:29:58 2004
+++ edited/libsysfs/sysfs_utils.c	Tue Feb 17 12:11:07 2004
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
-#include "sysfs.h"
+#include "sysfs/libsysfs.h"
+#include "sysfs/sysfs.h"
 #ifndef __KLIBC__
 #include <mntent.h>
 #endif


-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id56&alloc_id438&op=click
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel