On 07/14/2012 10:49 PM, Bruce Dubbs wrote:
I'll take a look. Thanks for the suggestions.
-- Bruce
Here are some corrections to your work. I've defined path to usb.ids and
pci.ids, added common library to shared libudev because there are
undefined references later when linking against that one. Also, I've
modified installation to install gtk-doc htmldocs that are present there.
--- udev-lfs.orig/Makefile.lfs 2012-07-14 01:11:56.000000000 +0200
+++ udev-lfs/Makefile.lfs 2012-07-14 22:45:16.973865448 +0200
@@ -25,6 +25,8 @@
OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
-fno-strict-aliasing -ffunction-sections -fdata-sections -fPIC
+OPTIONS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+
OPTIONS2 := $(OPTIONS) -fvisibility=hidden
LDFLAGS = -pthread -lrt -Wl,--as-needed -Wl,--gc-sections
@@ -33,8 +35,8 @@
DEF = -include cfg.h \
-DSYSCONFDIR=\"/etc\" \
-DFIRMWARE_PATH="\"/lib/firmware/updates/\", \"/lib/firmware/\"" \
- -DUSB_DATABASE=0 \
- -DPCI_DATABASE=0 \
+ -DUSB_DATABASE=\"/usr/share/misc/usb.ids\" \
+ -DPCI_DATABASE=\"/usr/share/misc/pci.ids\" \
-DROOTPREFIX= \
-DUDEVLIBEXECDIR=\"/lib/udev\"
@@ -163,10 +165,10 @@
$(VB)gcc -c $(WARN) $(OPTIONS) $(INCLUDE) $(DEF) -o $@ $<
# Build the dynamic library
-build/$(LIBUDEV_REAL_NAME): $(LIBUDEV_OBJS)
- @echo LINK $<
+build/$(LIBUDEV_REAL_NAME): $(LIBUDEV_OBJS) build/$(COMMON_LIB)
+ @echo LINK $@
$(VB)gcc -shared -Wl,--export-dynamic -Wl,-soname,$(LIBUDEV_LINK_NAME) \
- -o build/$(LIBUDEV_REAL_NAME) $(LIBUDEV_OBJS)
+ -o build/$(LIBUDEV_REAL_NAME) $(LIBUDEV_OBJS) build/$(COMMON_LIB)
ln -sfn $(LIBUDEV_REAL_NAME) build/$(LIBUDEV_LINK_NAME)
ln -sfn $(LIBUDEV_REAL_NAME) build/$(LIBUDEV_SONAME)
@@ -178,25 +180,25 @@
build/udevd: build/$(COMMON_LIB) build/udevd.o
@echo LINK $@
$(VB)gcc build/udevd.o $(UDEVD_OBJS) -o $@ $(LDFLAGS2) \
- build/udev-local.a build/$(COMMON_LIB)
+ build/udev-local.a build/$(COMMON_LIB)
$(VB)strip --strip-unneeded $@
build/udevadm: $(UDEV_ADMIN_OBJS)
@echo LINK $@
$(VB)gcc $(UDEV_ADMIN_OBJS) -o $@ $(LDFLAGS2) build/$(COMMON_LIB) \
- build/udev-local.a
+ build/udev-local.a
$(VB)strip --strip-unneeded $@
build/accelerometer: build/accelerometer.o build/$(COMMON_LIB)
@echo LINK $@
$(VB)gcc build/accelerometer.o -o $@ \
- build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS) -lm
+ build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS) -lm
$(VB)strip --strip-unneeded $@
build/scsi_id: build/scsi_id.o build/scsi_serial.o build/$(COMMON_LIB)
@echo LINK $@
$(VB)gcc build/scsi_id.o build/scsi_serial.o -o $@ \
- build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS)
+ build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS)
$(VB)strip --strip-unneeded $@
build/ata_id: build/ata_id.o build/$(COMMON_LIB)
@@ -217,7 +219,7 @@
build/mtd_probe: build/mtd_probe.o build/probe_smartmedia.o build/$(COMMON_LIB)
@echo LINK $@
$(VB)gcc build/mtd_probe.o build/probe_smartmedia.o -o $@ \
- build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS)
+ build/udev-local.a build/$(COMMON_LIB) $(LDFLAGS)
$(VB)strip --strip-unneeded $@
build/collect: build/collect.o build/$(COMMON_LIB)
@@ -226,16 +228,16 @@
$(VB)strip --strip-unneeded $@
install: udev
- @mkdir -pv $(DESTDIR)/lib/udev/devices/pts $(DESTDIR)/lib/udev/rules.d \
- $(DESTDIR){,/usr}/lib/firmware $(DESTDIR)/sbin \
- $(DESTDIR)/usr/lib/pkgconfig $(DESTDIR)/etc/udev/rules.d \
- $(DESTDIR)/usr/share/doc/udev/lfs \
+ @mkdir -pv $(DESTDIR)/lib/udev/devices/pts $(DESTDIR)/lib/udev/rules.d \
+ $(DESTDIR){,/usr}/lib/firmware $(DESTDIR)/sbin \
+ $(DESTDIR)/usr/lib/pkgconfig $(DESTDIR)/etc/udev/rules.d \
+ $(DESTDIR)/usr/share/doc/udev/lfs $(DESTDIR)/usr/share/gtk-doc/html/libudev \
$(DESTDIR)/usr/share/man/man{7,8}
# Copy executables
@cp -v build/udevadm $(DESTDIR)/sbin
@cp -v build/{udevd,accelerometer,ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} \
- $(DESTDIR)/lib/udev
+ $(DESTDIR)/lib/udev
@cp -v udev-lfs-$(VERSION)/write* $(DESTDIR)/lib/udev
@cp -v udev-lfs-$(VERSION)/*functions $(DESTDIR)/lib/udev
@@ -244,8 +246,8 @@
@cp -v udev-lfs-$(VERSION)/*.la $(DESTDIR)/usr/lib
@cp -v build/$(LIBUDEV_REAL_NAME) $(DESTDIR)/usr/lib
- @ln -svfn $(DESTDIR)/usr/lib/$(LIBUDEV_REAL_NAME) $(LIBUDEV_SONAME)
- @ln -svfn $(DESTDIR)/usr/lib/$(LIBUDEV_REAL_NAME) $(LIBUDEV_LINK_NAME)
+ @ln -svfn $(LIBUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBUDEV_SONAME)
+ @ln -svfn $(LIBUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBUDEV_LINK_NAME)
# Create null device and copy rules
@rm -f $(DESTDIR)/lib/udev/devices/null
@@ -258,12 +260,11 @@
@cp -v man/udev.7 $(DESTDIR)/usr/share/man/man7
@cp -v man/udevadm.8 $(DESTDIR)/usr/share/man/man8
@cp -v man/systemd-udevd.8 $(DESTDIR)/usr/share/man/man8/udevd.8
- @cp -v man/udev*.html $(DESTDIR)/usr/share/doc/udev
@cp -v udev-lfs-$(VERSION)/doc/* $(DESTDIR)/usr/share/doc/udev/lfs
+ @cp -v docs/libudev/html/* $(DESTDIR)/usr/share/gtk-doc/html/libudev
clean:
rm -rf build
rm -f cfg.h
.PHONY: clean
-
--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
