diff options
Diffstat (limited to 'extras')
26 files changed, 407 insertions, 80 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am new file mode 100644 index 0000000000..f72e0b1f5f --- /dev/null +++ b/extras/Makefile.am @@ -0,0 +1,16 @@ +SUBDIRS = \ + ata_id \ + cdrom_id \ + edd_id \ + path_id \ + firmware \ + collect \ + floppy \ + fstab_import \ + rule_generator \ + scsi_id \ + usb_id \ + volume_id + +distclean-local: + rm -f Makefile.in diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am new file mode 100644 index 0000000000..81332dd3f6 --- /dev/null +++ b/extras/ata_id/Makefile.am @@ -0,0 +1,20 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + ata_id + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +ata_id_SOURCES = \ + ata_id.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +dist_man_MANS = \ + ata_id.8 + +distclean-local: + rm -f Makefile.in + diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c index 6d3c2330b4..125c3f3dd7 100644 --- a/extras/ata_id/ata_id.c +++ b/extras/ata_id/ata_id.c @@ -26,7 +26,7 @@ #include <linux/types.h> #include <linux/hdreg.h> -#include "../../udev.h" +#include "../../udev/udev.h" #ifdef USE_LOG void log_message(int priority, const char *format, ...) diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am new file mode 100644 index 0000000000..88de1379cd --- /dev/null +++ b/extras/cdrom_id/Makefile.am @@ -0,0 +1,24 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + cdrom_id + +udevrulesdir = $(udev_prefix)/lib/udev/rules.d +dist_udevrules_DATA = \ + 60-cdrom_id.rules + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +cdrom_id_SOURCES = \ + cdrom_id.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +dist_man_MANS = \ + cdrom_id.8 + +distclean-local: + rm -f Makefile.in + diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c index a1135665a9..acf7a97e41 100644 --- a/extras/cdrom_id/cdrom_id.c +++ b/extras/cdrom_id/cdrom_id.c @@ -37,7 +37,8 @@ #include <sys/time.h> #include <sys/ioctl.h> #include <linux/cdrom.h> -#include "../../udev.h" + +#include "../../udev/udev.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am new file mode 100644 index 0000000000..a92f4aa9f5 --- /dev/null +++ b/extras/collect/Makefile.am @@ -0,0 +1,11 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + collect + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +distclean-local: + rm -f Makefile.in + diff --git a/extras/collect/collect.c b/extras/collect/collect.c index ce49b9f410..14184a5e05 100644 --- a/extras/collect/collect.c +++ b/extras/collect/collect.c @@ -31,9 +31,9 @@ #include <sys/types.h> #include <sys/stat.h> -#include "../../list.h" +#include "../../udev/list.h" -#define TMPFILE "/dev/.udev/collect" +#define TMPFILE UDEV_PREFIX "/dev/.udev/collect" #define BUFSIZE 16 #define UDEV_ALARM_TIMEOUT 180 diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am new file mode 100644 index 0000000000..fa4f18c9fb --- /dev/null +++ b/extras/edd_id/Makefile.am @@ -0,0 +1,24 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + edd_id + +udevrulesdir = $(udev_prefix)/lib/udev/rules.d +dist_udevrules_DATA = \ + 61-persistent-storage-edd.rules + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +edd_id_SOURCES = \ + edd_id.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +dist_man_MANS = \ + edd_id.8 + +distclean-local: + rm -f Makefile.in + diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c index 4a177709a8..9d745c505a 100644 --- a/extras/edd_id/edd_id.c +++ b/extras/edd_id/edd_id.c @@ -23,7 +23,7 @@ #include <dirent.h> #include <stdint.h> -#include "../../udev.h" +#include "../../udev/udev.h" #ifdef USE_LOG void log_message(int priority, const char *format, ...) diff --git a/extras/firmware/Makefile.am b/extras/firmware/Makefile.am new file mode 100644 index 0000000000..0c69de9161 --- /dev/null +++ b/extras/firmware/Makefile.am @@ -0,0 +1,7 @@ +udevhomedir = $(udev_prefix)/lib/udev +dist_udevhome_SCRIPTS = \ + firmware.sh + +distclean-local: + rm -f Makefile.in + diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am new file mode 100644 index 0000000000..4854d5245b --- /dev/null +++ b/extras/floppy/Makefile.am @@ -0,0 +1,29 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + create_floppy_devices + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +create_floppy_devices_SOURCES = \ + create_floppy_devices.c \ + ../../udev/udev_config.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c \ + ../../udev/udev_utils_file.c +if USE_SELINUX +create_floppy_devices_SOURCES += \ + ../../udev/udev_selinux.c + +create_floppy_devices_LDADD = \ + $(SELINUX_LIBS) +endif + +dist_man_MANS = \ + create_floppy_devices.8 + +distclean-local: + rm -f Makefile.in + diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c index d79a782abf..3e73aa83c3 100644 --- a/extras/floppy/create_floppy_devices.c +++ b/extras/floppy/create_floppy_devices.c @@ -24,8 +24,8 @@ #include <pwd.h> #include <grp.h> -#include "../../udev.h" -#include "../../udev_selinux.h" +#include "../../udev/udev.h" +#include "../../udev/udev_selinux.h" static char *table[] = { "", "d360", "h1200", "u360", "u720", "h360", "h720", diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am new file mode 100644 index 0000000000..0ee7efb9ce --- /dev/null +++ b/extras/fstab_import/Makefile.am @@ -0,0 +1,21 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + fstab_import + +udevrulesdir = $(udev_prefix)/lib/udev/rules.d +dist_udevrules_DATA = \ + 79-fstab_import.rules + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +fstab_import_SOURCES = \ + fstab_import.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +distclean-local: + rm -f Makefile.in + diff --git a/extras/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c index a8de067b38..2d24cfb38a 100644 --- a/extras/fstab_import/fstab_import.c +++ b/extras/fstab_import/fstab_import.c @@ -24,7 +24,7 @@ #include <mntent.h> #include <sys/stat.h> -#include "../../udev.h" +#include "../../udev/udev.h" static int debug; static char root[PATH_SIZE] = "/dev"; diff --git a/extras/path_id/Makefile.am b/extras/path_id/Makefile.am new file mode 100644 index 0000000000..966a03dfaf --- /dev/null +++ b/extras/path_id/Makefile.am @@ -0,0 +1,10 @@ +udevhomedir = $(udev_prefix)/lib/udev +dist_udevhome_SCRIPTS = \ + path_id + +dist_man_MANS = \ + path_id.8 + +distclean-local: + rm -f Makefile.in + diff --git a/extras/rule_generator/Makefile.am b/extras/rule_generator/Makefile.am new file mode 100644 index 0000000000..1f0248b215 --- /dev/null +++ b/extras/rule_generator/Makefile.am @@ -0,0 +1,16 @@ +udevhomedir = $(udev_prefix)/lib/udev +dist_udevhome_SCRIPTS = \ + write_cd_rules \ + write_net_rules + +dist_udevhome_DATA = \ + rule_generator.functions + +udevrulesdir = $(udev_prefix)/lib/udev/rules.d +dist_udevrules_DATA = \ + 75-cd-aliases-generator.rules \ + 75-persistent-net-generator.rules + +distclean-local: + rm -f Makefile.in + diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am new file mode 100644 index 0000000000..7f890b04cf --- /dev/null +++ b/extras/scsi_id/Makefile.am @@ -0,0 +1,27 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + scsi_id + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +scsi_id_SOURCES = \ + scsi_id.c \ + scsi_serial.c \ + scsi.h \ + scsi_id.h \ + bsg.h \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +dist_sysconf_DATA = \ + scsi_id.config + +dist_man_MANS = \ + scsi_id.8 + +distclean-local: + rm -f Makefile.in + diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c index bc942fac58..23bcb9468e 100644 --- a/extras/scsi_id/scsi_id.c +++ b/extras/scsi_id/scsi_id.c @@ -14,6 +14,8 @@ * Free Software Foundation version 2 of the License. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -27,9 +29,8 @@ #include <getopt.h> #include <sys/stat.h> -#include "../../udev.h" +#include "../../udev/udev.h" #include "scsi_id.h" -#include "scsi_id_version.h" static const struct option options[] = { { "device", 1, NULL, 'd' }, @@ -51,7 +52,7 @@ static const char dev_short_options[] = "bgp:"; static int all_good; static int dev_specified; -static char config_file[MAX_PATH_LEN] = SCSI_ID_CONFIG_FILE; +static char config_file[MAX_PATH_LEN] = SYSCONFDIR "/scsi_id.config"; static enum page_code default_page_code; static int sg_version = 4; static int use_stderr; @@ -468,7 +469,7 @@ static int set_options(int argc, char **argv, const char *short_opts, break; case 'V': - printf("%s\n", SCSI_ID_VERSION); + printf("%s\n", VERSION); exit(0); break; diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c index 016075c3ea..104db3d95f 100644 --- a/extras/scsi_id/scsi_serial.c +++ b/extras/scsi_id/scsi_serial.c @@ -30,10 +30,9 @@ /* #include <linux/bsg.h> */ #include "bsg.h" -#include "../../udev.h" +#include "../../udev/udev.h" #include "scsi.h" #include "scsi_id.h" -#include "scsi_id_version.h" /* * A priority based list of id, naa, and binary/ascii for the identifier diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am new file mode 100644 index 0000000000..0de004a228 --- /dev/null +++ b/extras/usb_id/Makefile.am @@ -0,0 +1,18 @@ +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + usb_id + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +usb_id_SOURCES = \ + usb_id.c \ + ../../udev/udev_sysfs.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +distclean-local: + rm -f Makefile.in + diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index fed6631b90..5b78b975d8 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -20,7 +20,7 @@ #include <errno.h> #include <getopt.h> -#include "../../udev.h" +#include "../../udev/udev.h" #define MAX_PATH_LEN 512 #define MAX_SERIAL_LEN 256 diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am new file mode 100644 index 0000000000..bc1b262f27 --- /dev/null +++ b/extras/volume_id/Makefile.am @@ -0,0 +1,33 @@ +SUBDIRS = \ + lib + +udevhomedir = $(udev_prefix)/lib/udev +udevhome_PROGRAMS = \ + vol_id + +AM_CPPFLAGS = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DUDEV_PREFIX=\""$(udev_prefix)"\" + +vol_id_SOURCES = \ + vol_id.c \ + ../../udev/udev_sysdeps.c \ + ../../udev/udev_utils.c \ + ../../udev/udev_utils_string.c + +vol_id_LDADD = \ + lib/libvolume_id.la + +dist_man_MANS = \ + vol_id.8 + +EXTRA_DIST = \ + vol_id.xml + +%.7 %.8 : %.xml + $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + +distclean-local: + rm -f Makefile.in + rm -f $(dist_man_MANS) + diff --git a/extras/volume_id/lib/Makefile.am b/extras/volume_id/lib/Makefile.am new file mode 100644 index 0000000000..de37f9e8b8 --- /dev/null +++ b/extras/volume_id/lib/Makefile.am @@ -0,0 +1,69 @@ +rootlibdir = $(exec_prefix)/$(libdir_name) +rootlib_LTLIBRARIES = \ + libvolume_id.la + +include_HEADERS =\ + libvolume_id.h + +libvolume_id_la_SOURCES =\ + ext.c \ + fat.c \ + hfs.c \ + highpoint.c \ + isw_raid.c \ + lsi_raid.c \ + via_raid.c \ + silicon_raid.c \ + nvidia_raid.c \ + promise_raid.c \ + adaptec_raid.c \ + jmicron_raid.c \ + ddf_raid.c \ + iso9660.c \ + jfs.c \ + linux_raid.c \ + linux_swap.c \ + lvm.c \ + ntfs.c \ + reiserfs.c \ + udf.c \ + ufs.c \ + xfs.c \ + cramfs.c \ + hpfs.c \ + romfs.c \ + sysv.c \ + minix.c \ + gfs.c \ + luks.c \ + ocfs.c \ + vxfs.c \ + squashfs.c \ + netware.c \ + oracleasm.c \ + volume_id.c \ + util.h \ + util.c + +libvolume_id_la_LDFLAGS = \ + -version-info $(VOLID_LT_CURRENT):$(VOLID_LT_REVISION):$(VOLID_LT_AGE) \ + -export-symbols $(top_srcdir)/extras/volume_id/lib/exported_symbols + +# move devel files to $(prefix)$(libdir_name) if needed +install-data-hook: + rm $(DESTDIR)$(rootlibdir)/libvolume_id.la + if test "$(prefix)" != "$(exec_prefix)"; then \ + rm $(DESTDIR)$(rootlibdir)/libvolume_id.so; \ + mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \ + ln -sf $(rootlibdir)/libvolume_id.so.$(VOLID_LT_CURRENT).$(VOLID_LT_AGE).$(VOLID_LT_REVISION) \ + $(DESTDIR)$(prefix)/$(libdir_name)/libvolume_id.so; \ + fi + +EXTRA_DIST = \ + exported_symbols + +pkgconfigdir = $(prefix)/$(libdir_name)/pkgconfig +pkgconfig_DATA = libvolume_id.pc + +distclean-local: + rm -f Makefile.in diff --git a/extras/volume_id/lib/exported_symbols b/extras/volume_id/lib/exported_symbols index 05b6e52bc4..55b0265825 100644 --- a/extras/volume_id/lib/exported_symbols +++ b/extras/volume_id/lib/exported_symbols @@ -1,64 +1,55 @@ -{ global: - volume_id_log_fn; - - volume_id_get_label; - volume_id_get_label_raw; - volume_id_get_uuid; - volume_id_get_uuid_raw; - volume_id_get_usage; - volume_id_get_type; - volume_id_get_type_version; - - volume_id_open_fd; - volume_id_close; - volume_id_probe_all; - volume_id_probe_filesystem; - volume_id_probe_raid; - volume_id_all_probers; - volume_id_get_prober_by_type; - volume_id_encode_string; - - volume_id_open_node; - - volume_id_probe_linux_swap; - volume_id_probe_luks; - volume_id_probe_cramfs; - volume_id_probe_ext; - volume_id_probe_vfat; - volume_id_probe_hfs_hfsplus; - volume_id_probe_hpfs; - volume_id_probe_iso9660; - volume_id_probe_jfs; - volume_id_probe_minix; - volume_id_probe_ntfs; - volume_id_probe_ocfs1; - volume_id_probe_ocfs2; - volume_id_probe_reiserfs; - volume_id_probe_romfs; - volume_id_probe_sysv; - volume_id_probe_udf; - volume_id_probe_ufs; - volume_id_probe_vxfs; - volume_id_probe_xfs; - volume_id_probe_squashfs; - volume_id_probe_netware; - volume_id_probe_gfs; - volume_id_probe_gfs2; - - volume_id_probe_linux_raid; - volume_id_probe_lvm1; - volume_id_probe_lvm2; - volume_id_probe_ddf_raid; - volume_id_probe_intel_software_raid; - volume_id_probe_highpoint_37x_raid; - volume_id_probe_highpoint_45x_raid; - volume_id_probe_lsi_mega_raid; - volume_id_probe_nvidia_raid; - volume_id_probe_promise_fasttrack_raid; - volume_id_probe_silicon_medley_raid; - volume_id_probe_via_raid; - volume_id_probe_adaptec_raid; - volume_id_probe_jmicron_raid; -local: - *; -}; +volume_id_log_fn +volume_id_get_label +volume_id_get_label_raw +volume_id_get_uuid +volume_id_get_uuid_raw +volume_id_get_usage +volume_id_get_type +volume_id_get_type_version +volume_id_open_fd +volume_id_close +volume_id_probe_all +volume_id_probe_filesystem +volume_id_probe_raid +volume_id_all_probers +volume_id_get_prober_by_type +volume_id_encode_string +volume_id_open_node +volume_id_probe_linux_swap +volume_id_probe_luks +volume_id_probe_cramfs +volume_id_probe_ext +volume_id_probe_vfat +volume_id_probe_hfs_hfsplus +volume_id_probe_hpfs +volume_id_probe_iso9660 +volume_id_probe_jfs +volume_id_probe_minix +volume_id_probe_ntfs +volume_id_probe_ocfs1 +volume_id_probe_ocfs2 +volume_id_probe_reiserfs +volume_id_probe_romfs +volume_id_probe_sysv +volume_id_probe_udf +volume_id_probe_ufs +volume_id_probe_vxfs +volume_id_probe_xfs +volume_id_probe_squashfs +volume_id_probe_netware +volume_id_probe_gfs +volume_id_probe_gfs2 +volume_id_probe_linux_raid +volume_id_probe_lvm1 +volume_id_probe_lvm2 +volume_id_probe_ddf_raid +volume_id_probe_intel_software_raid +volume_id_probe_highpoint_37x_raid +volume_id_probe_highpoint_45x_raid +volume_id_probe_lsi_mega_raid +volume_id_probe_nvidia_raid +volume_id_probe_promise_fasttrack_raid +volume_id_probe_silicon_medley_raid +volume_id_probe_via_raid +volume_id_probe_adaptec_raid +volume_id_probe_jmicron_raid diff --git a/extras/volume_id/lib/libvolume_id.pc.in b/extras/volume_id/lib/libvolume_id.pc.in new file mode 100644 index 0000000000..5a1e1b77ba --- /dev/null +++ b/extras/volume_id/lib/libvolume_id.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@prefix@ +libdir=@prefix@/@libdir_name@ +includedir=@prefix@/include + +Name: libvolume_id +Description: Library for reading metadata, label, uuid from various filesystems +Version: @VERSION@ +Libs: -L${libdir} -lvolume_id +Cflags: -I${includedir} diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 5c4e05d794..60428ab582 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -34,7 +34,7 @@ #include <fcntl.h> #include <sys/ioctl.h> -#include "../../udev.h" +#include "../../udev/udev.h" #include "lib/libvolume_id.h" #define BLKGETSIZE64 _IOR(0x12,114,size_t) |