[PATCH] udev use new libsysfs header file location

Use the new location of libsysfs header files.

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 75a342bb1265c10c896f291b231ae45ef4bdb01f..27543819765a5259ddb99bd0ccdedccf6d03f1ba 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -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"
 

diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 80a1d5163516785f92ada6515b876234efa7f821..9fb0f05e61ee657fbd70eac23089f9f7556f798b 100644 (file)
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -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"
 

diff --git a/libsysfs/sysfs_bus.c b/libsysfs/sysfs_bus.c
index aca392875ea47b999253532e2dccf9f6be75570c..87318c0029c99336ce41720f6954d75e7b4a1792 100644 (file)
--- a/libsysfs/sysfs_bus.c
+++ b/libsysfs/sysfs_bus.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_dev(void *dev)

diff --git a/libsysfs/sysfs_class.c b/libsysfs/sysfs_class.c
index cd86912142791246a846ef7c3932b18cb2e83632..05305056dd9ce195bae5347850af2d604f2127b7 100644 (file)
--- a/libsysfs/sysfs_class.c
+++ b/libsysfs/sysfs_class.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_cls_dev(void *dev)

diff --git a/libsysfs/sysfs_device.c b/libsysfs/sysfs_device.c
index bfd761b885c37d3a8aa7e19fc1afb9cf43048dae..06b8d2d99ac95d9a58c407729acc63a8c60a298d 100644 (file)
--- a/libsysfs/sysfs_device.c
+++ b/libsysfs/sysfs_device.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 /**

diff --git a/libsysfs/sysfs_dir.c b/libsysfs/sysfs_dir.c
index ce01669754160dfa652e29f5e7dd6462cae845ae..050e6740389fa874066f45986fe2a228c9df9150 100644 (file)
--- a/libsysfs/sysfs_dir.c
+++ b/libsysfs/sysfs_dir.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 /**

diff --git a/libsysfs/sysfs_driver.c b/libsysfs/sysfs_driver.c
index a4440cfdf9f9e5daa4a7f42c1f4682e8192b0de8..cd202d9f23cc78ea4605bce63b798ae8067791c5 100644 (file)
--- a/libsysfs/sysfs_driver.c
+++ b/libsysfs/sysfs_driver.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_driver_device(void *device)

diff --git a/libsysfs/sysfs_utils.c b/libsysfs/sysfs_utils.c
index f1f82361d024f7eaa9dbc1becc7a78df027e0cea..2509c73c98969a3f81f12643e2fe203cb8ed7699 100644 (file)
--- a/libsysfs/sysfs_utils.c
+++ b/libsysfs/sysfs_utils.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "libsysfs.h"
+#include "sysfs/libsysfs.h"
 #include "sysfs.h"
 #ifndef __KLIBC__
 #include <mntent.h>

diff --git a/namedev.c b/namedev.c
index 90c85d41e4d8571926bae2233adc8559cfa3c919..89513934ff4e483a49d60f621c973ddfd77d49f0 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -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);

diff --git a/udev-add.c b/udev-add.c
index a3bc0df579270abaa619e2b1b300c4928c39756b..87cf57c3b662a5a786a1d8c8542552da24d58f21 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -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"
 
 /* 

diff --git a/udev.c b/udev.c
index ce6d6ce9df22a7b2cb9ab3bb84133d25906d2d18..f3fab18b29e3fe000f214f38d0cfd0dfc8ee88fa 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -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;

diff --git a/udev.h b/udev.h
index 1cd07852b41eea82e4361443e0694faba7b714e8..b5088b90c69e136d84e6ecd23dc165829e211e5c 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -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>
 

diff --git a/udev_config.c b/udev_config.c
index 6714c1b73d50857a72e38870b466e047db554e29..1d05a3fb13cfb55a11b23e51968ccb6384955133 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -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];

diff --git a/udevdb.c b/udevdb.c
index e657fedcb2018ec8b67ac310f42ee85eb23f5482..bfd5b4bd697d47e0673d090c2e3494b876f950f7 100644 (file)
--- a/udevdb.c
+++ b/udevdb.c
@@ -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;
 

diff --git a/udevinfo.c b/udevinfo.c
index e4ea69811125f8b5edbe976a48574e1c1403562a..7991855b2812de55bec6567b27d9452f87ae36d0 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -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

diff --git a/udevtest.c b/udevtest.c
index dd8375aa5cfe774814fa3c7872cbec5bd2924dd1..175f14326977256d37b053d9ee3190e3ff8c82fb 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -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;