shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

[PATCH] pass SYSFS setting down for extras builds

Browse Source 
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.
This commit is contained in:
patmans@us.ibm.com 2004-10-15 18:42:53 -07:00 committed by Greg KH
parent f837727408
commit 125930b454
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -183,6 +183,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS)
echo $$target ; \
$(MAKE) prefix=$(prefix) \
LD="$(LD)" \
SYSFS="$(SYSFS)" \
KERNEL_DIR="$(KERNEL_DIR)" \
-C $$target $@ ; \
done ; \
@ -198,13 +199,13 @@ $(CRT0):
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 \

8
extras/scsi_id/Makefile
View File

@ -31,14 +31,8 @@ INSTALL_DATA = ${INSTALL} -m 644
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.
#