pass SYSFS setting down for extras builds
PATCH 1/1 pass SYSFS setting down for extras builds
Modify SYSFS to specify the full path, and pass it down for the extras builds.
Change the scsi_id Makefile so it will work with and without udev.
=== Makefile 1.191 vs edited ==--- 1.191/Makefile Wed Oct 13 17:43:35 2004
+++ edited/Makefile Thu Oct 14 13:33:24 2004
@@ -183,6 +183,7 @@
echo $$target ; \
$(MAKE) prefix=$(prefix) \
LD="$(LD)" \
+ SYSFS="$(SYSFS)" \
KERNEL_DIR="$(KERNEL_DIR)" \
-C $$target $@ ; \
done ; \
@@ -198,13 +199,13 @@
TDB = tdb/tdb.o \
tdb/spinlock.o
-SYSFS = libsysfs/sysfs_bus.o \
- libsysfs/sysfs_class.o \
- libsysfs/sysfs_device.o \
- libsysfs/sysfs_dir.o \
- libsysfs/sysfs_driver.o \
- libsysfs/sysfs_utils.o \
- libsysfs/dlist.o
+SYSFS = $(PWD)/libsysfs/sysfs_bus.o \
+ $(PWD)/libsysfs/sysfs_class.o \
+ $(PWD)/libsysfs/sysfs_device.o \
+ $(PWD)/libsysfs/sysfs_dir.o \
+ $(PWD)/libsysfs/sysfs_driver.o \
+ $(PWD)/libsysfs/sysfs_utils.o \
+ $(PWD)/libsysfs/dlist.o
OBJS = udev_lib.o \
udev_config.o \
=== extras/scsi_id/Makefile 1.8 vs edited ==--- 1.8/extras/scsi_id/Makefile Wed Oct 13 16:38:08 2004
+++ edited/extras/scsi_id/Makefile Thu Oct 14 13:34:38 2004
@@ -31,14 +31,8 @@
override CFLAGS+=-Wall -fno-builtin
PROG=scsi_id
+SYSFS=-lsysfs
-SYSFS = ../../libsysfs/sysfs_bus.o \
- ../../libsysfs/sysfs_class.o \
- ../../libsysfs/sysfs_device.o \
- ../../libsysfs/sysfs_dir.o \
- ../../libsysfs/sysfs_driver.o \
- ../../libsysfs/sysfs_utils.o \
- ../../libsysfs/dlist.o
#
# Built static and stripped when built with udev. #
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal Use IT products in your business? Tell us what you think of them. Give us Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 2 lines · Patrick Mansfield
Modify SYSFS to specify the full path, and pass it down for the extras builds.
No, this reverts the change I made yesterday in order to get the build to look properly with the new "pretty" build system.
Now, if you want to fix up the ccdv program to properly pick out the file name so that I can apply this patch, I'd be glad to take that fix... :)
thanks,
greg k-h
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal Use IT products in your business? Tell us what you think of them. Give us Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 10 lines · Greg KH
Quoted 2 lines · Patrick Mansfield
Modify SYSFS to specify the full path, and pass it down for the extras builds.
No, this reverts the change I made yesterday in order to get the build to look properly with the new "pretty" build system.
Now, if you want to fix up the ccdv program to properly pick out the file name so that I can apply this patch, I'd be glad to take that fix... :)
What did I revert?
It does not look pretty for extras builds with or without my patch; the udev portion of the builds looks the same.
I just pulled and didn't see any updates.
Here's my build output (cut and pasted), it is the same with and without my patch applied:
[elm3b79 udev-bk]$ make EXTRAS=extras/scsi_id -j9
Creating udev_version.h
Building ccdv
Compiling udev.c: [OK] Compiling udev_lib.c: [OK] Compiling udev_remove.c: [OK] Compiling udevdb.c: [OK] Compiling udevstart.c: [OK] Compiling udev_config.c: [OK] Compiling dev_d.c: [OK] Compiling udev_add.c: [OK] udev_add.c:108: warning: declaration of `major' shadows global declaration udev_add.c:108: warning: declaration of `minor' shadows global declaration udev_add.c: In function `make_node': udev_add.c:109: warning: declaration of `minor' shadows global declaration udev_add.c:109: warning: declaration of `major' shadows global declaration Compiling namedev_parse.c: [OK] Compiling dlist.c: [OK] Compiling sysfs_bus.c: [OK] Compiling sysfs_driver.c: [OK] Compiling sysfs_class.c: [OK] Compiling namedev.c: [OK] Compiling spinlock.c: [OK] Compiling sysfs_utils.c: [OK] Compiling udevsend.c: [OK] Compiling sysfs_device.c: [OK] Compiling sysfs_dir.c: [OK] Compiling udevtest.c: [OK] Compiling wait_for_sysfs.c: [OK] wait_for_sysfs.c: In function `main': wait_for_sysfs.c:280: warning: `class_dev' might be used uninitialized in thi s function Compiling udevinfo.c: [OK] Compiling udevd.c: [OK] Compiling tdb.c: [OK] Linking udevd: [OK] Linking udevsend: [OK] Running strip: [OK] Running strip: [OK] Linking udev: [OK] Linking wait_for_sysfs: [OK] Linking udevinfo: [OK] Linking udevtest: [OK] Running strip: [OK] Running strip: [OK] Running strip: [OK] Running strip: [OK]
extras/scsi_id
make[1]: Entering directory `/home/patman/linux/src/udev-bk/extras/scsi_id'
gcc -pipe -DUSE_SPINLOCKS -DINTEL_SPINLOCKS -DLOG -Os -fomit-frame-pointer -D_GNU_SOURCE -Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -I/usr/lib/gcc-lib/i386-linux/2.95.4/include -I/home/patman/linux/src/udev-bk/libsysfs -Wall -fno-builtin -c -o scsi_id.o scsi_id.c
gcc -pipe -DUSE_SPINLOCKS -DINTEL_SPINLOCKS -DLOG -Os -fomit-frame-pointer -D_GNU_SOURCE -Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -I/usr/lib/gcc-lib/i386-linux/2.95.4/include -I/home/patman/linux/src/udev-bk/libsysfs -Wall -fno-builtin -c -o scsi_serial.o scsi_serial.c
gcc -o scsi_id scsi_id.o scsi_serial.o ../../libsysfs/sysfs_bus.o ../../libsysfs/sysfs_class.o ../../libsysfs/sysfs_device.o ../../libsysfs/sysfs_dir.o ../../libsysfs/sysfs_driver.o ../../libsysfs/sysfs_utils.o ../../libsysfs/dlist.o -lc make[1]: Leaving directory `/home/patman/linux/src/udev-bk/extras/scsi_id'
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal Use IT products in your business? Tell us what you think of them. Give us Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 5 lines · Patrick Mansfield
Quoted 4 lines · Greg KH
Quoted 2 lines · Patrick Mansfield
Modify SYSFS to specify the full path, and pass it down for the extras builds.
Quoted 8 lines
Quoted 6 lines
No, this reverts the change I made yesterday in order to get the build to look properly with the new "pretty" build system.
Now, if you want to fix up the ccdv program to properly pick out the file name so that I can apply this patch, I'd be glad to take that fix... :)
What did I revert?
A change I made to the Makefile in order to get the extras/ stuff to build again...
Quoted 7 lines
It does not look pretty for extras builds with or without my patch; the udev portion of the builds looks the same.
I just pulled and didn't see any updates.
Here's my build output (cut and pasted), it is the same with and without my patch applied:
<snip>
Hm, I have no idea why this works for you, and not me.
But I've fixed up the ccdv.c program now, and applied your patch.
I also just commited a patch that made the scsi_id and volume_id programs build in the same "pretty" manner as the main udev program. It should not break your ability to build scsi_id out side of the build tree at all.
thanks,
greg k-h
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal Use IT products in your business? Tell us what you think of them. Give us Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel