Author: bdubbs
Date: Tue Apr 16 19:04:47 2013
New Revision: 10243
Log:
Update udev-lfs files for systemd-201
Deleted:
trunk/BOOK/udev-lfs/gudev/
Modified:
trunk/BOOK/udev-lfs/Makefile.lfs
trunk/BOOK/udev-lfs/makefile-incl.gudev
trunk/BOOK/udev-lfs/makefile-incl.keymap
trunk/BOOK/udev-lfs/udev.7
trunk/BOOK/udev-lfs/udevadm.8
trunk/BOOK/udev-lfs/udevd.8
Modified: trunk/BOOK/udev-lfs/Makefile.lfs
==============================================================================
--- trunk/BOOK/udev-lfs/Makefile.lfs Mon Apr 15 16:02:25 2013 (r10242)
+++ trunk/BOOK/udev-lfs/Makefile.lfs Tue Apr 16 19:04:47 2013 (r10243)
@@ -4,7 +4,7 @@
# vim: tabstop=3
SHELL=/bin/bash
-SYSTEMD_VERSION=200
+SYSTEMD_VERSION=201
VERSION=$(SYSTEMD_VERSION)-1
ifeq ($(V),)
@@ -24,12 +24,12 @@
-Werror=overflow -Wp,-D_FORTIFY_SOURCE=2 -Wno-long-long
OPTIONS = -O2 -pipe -ffast-math -fno-common -fdiagnostics-show-option \
--fno-strict-aliasing -ffunction-sections -fdata-sections -fPIC
+-fno-strict-aliasing -ffunction-sections -fdata-sections -fPIC -std=gnu99
OPTIONS2 := $(OPTIONS) -fvisibility=hidden
-LDFLAGS = -pthread -lrt -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined
-LDFLAGS2 := $(LDFLAGS) -lblkid -lkmod
+LDFLAGS1 = -pthread -lrt -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined
+LDFLAGS2 := $(LDFLAGS1) -lblkid -lkmod
DEF = -include cfg.h \
-DSYSCONFDIR=\"/etc\" \
@@ -38,7 +38,8 @@
-DROOTPREFIX= \
-DUDEVLIBEXECDIR=\"/lib/udev\" \
-D_LARGEFILE_SOURCE \
- -D_FILE_OFFSET_BITS=64
+ -D_FILE_OFFSET_BITS=64 \
+ -DHAVE_FIRMWARE
INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd
@@ -57,7 +58,7 @@
LIBUDEV = libudev
LIBUDEV_MAJOR = .1
-LIBUDEV_MINOR = .0
+LIBUDEV_MINOR = .3
LIBUDEV_PATCH = .2
LIBUDEV_SONAME := $(LIBUDEV).so
LIBUDEV_LINK_NAME := $(LIBUDEV_SONAME)$(LIBUDEV_MAJOR)
@@ -236,39 +237,39 @@
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) $(LDFLAGS1) -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) $(LDFLAGS1)
$(VB)strip --strip-unneeded $@
build/ata_id: build/ata_id.o build/$(COMMON_LIB)
@echo LINK $@
- $(VB)gcc build/ata_id.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS)
+ $(VB)gcc build/ata_id.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS1)
$(VB)strip --strip-unneeded $@
build/cdrom_id: build/cdrom_id.o build/$(COMMON_LIB)
@echo LINK $@
- $(VB)gcc build/cdrom_id.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS)
+ $(VB)gcc build/cdrom_id.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS1)
$(VB)strip --strip-unneeded $@
build/v4l_id: build/v4l_id.o build/$(COMMON_LIB)
@echo LINK $@
- $(VB)gcc build/v4l_id.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS)
+ $(VB)gcc build/v4l_id.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS1)
$(VB)strip --strip-unneeded $@
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) $(LDFLAGS1)
$(VB)strip --strip-unneeded $@
build/collect: build/collect.o build/$(COMMON_LIB)
@echo LINK $@
- $(VB)gcc build/collect.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS)
+ $(VB)gcc build/collect.o -o $@ build/udev-local.a build/$(COMMON_LIB)
$(LDFLAGS1)
$(VB)strip --strip-unneeded $@
build/%pc: %pc.in common
@@ -279,8 +280,9 @@
@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/include \
- $(DESTDIR)/usr/share/man/man{7,8}
+ $(DESTDIR)/usr/share/man/man{7,8} $(DESTDIR)/usr/include \
+ $(DESTDIR)/usr/share/doc/udev-$(SYSTEMD_VERSION)/lfs \
+ $(DESTDIR)/usr/share/gtk-doc/html/udev
# Copy executables
@cp -v build/udevadm $(DESTDIR)/sbin
@@ -313,8 +315,10 @@
@cp -v udev-lfs-$(VERSION)/udev.7 $(DESTDIR)/usr/share/man/man7
@cp -v udev-lfs-$(VERSION)/udevadm.8 $(DESTDIR)/usr/share/man/man8
@cp -v udev-lfs-$(VERSION)/udevd.8 $(DESTDIR)/usr/share/man/man8
- @cp -v udev-lfs-$(VERSION)/README $(DESTDIR)/usr/share/doc/udev/lfs
- @cp -v udev-lfs-$(VERSION)/*.txt $(DESTDIR)/usr/share/doc/udev/lfs
+ @cp -v udev-lfs-$(VERSION)/README
$(DESTDIR)/usr/share/doc/udev-$(SYSTEMD_VERSION)/lfs
+ @cp -v udev-lfs-$(VERSION)/*.txt
$(DESTDIR)/usr/share/doc/udev-$(SYSTEMD_VERSION)/lfs
+ @cp -v docs/libudev/*.{txt,types}
$(DESTDIR)/usr/share/doc/udev-$(SYSTEMD_VERSION)
+ @cp -v docs/libudev/html/*
$(DESTDIR)/usr/share/gtk-doc/html/udev
# Copy misc
@cp -v udev-lfs-$(VERSION)/init-net-rules.sh $(DESTDIR)/lib/udev
Modified: trunk/BOOK/udev-lfs/makefile-incl.gudev
==============================================================================
--- trunk/BOOK/udev-lfs/makefile-incl.gudev Mon Apr 15 16:02:25 2013
(r10242)
+++ trunk/BOOK/udev-lfs/makefile-incl.gudev Tue Apr 16 19:04:47 2013
(r10243)
@@ -44,7 +44,7 @@
LIBGUDEV = libgudev-1.0
LIBGUDEV_MAJOR = .0
LIBGUDEV_MINOR = .1
-LIBGUDEV_PATCH = .2
+LIBGUDEV_PATCH = .3
LIBGUDEV_SONAME := $(LIBGUDEV).so
LIBGUDEV_LINK_NAME := $(LIBGUDEV_SONAME)$(LIBGUDEV_MAJOR)
LIBGUDEV_REAL_NAME := $(LIBGUDEV_LINK_NAME)$(LIBGUDEV_MINOR)$(LIBGUDEV_PATCH)
@@ -104,5 +104,5 @@
@ln -svfn $(LIBGUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBGUDEV_LINK_NAME)
@cp -v build/gudev-1.0.pc $(DESTDIR)/usr/lib/pkgconfig
- @cp -v udev-lfs-$(VERSION)/gudev/*
$(DESTDIR)/usr/share/gtk-doc/html/gudev
+ @cp -v docs/gudev/html/*
$(DESTDIR)/usr/share/gtk-doc/html/gudev
Modified: trunk/BOOK/udev-lfs/makefile-incl.keymap
==============================================================================
--- trunk/BOOK/udev-lfs/makefile-incl.keymap Mon Apr 15 16:02:25 2013
(r10242)
+++ trunk/BOOK/udev-lfs/makefile-incl.keymap Tue Apr 16 19:04:47 2013
(r10243)
@@ -2,76 +2,8 @@
# vim: tabstop=3
-KEYMAPS = \
- keymaps/acer \
- keymaps/acer-aspire_5720 \
- keymaps/acer-aspire_5920g \
- keymaps/acer-aspire_6920 \
- keymaps/acer-aspire_8930 \
- keymaps/acer-travelmate_c300 \
- keymaps/asus \
- keymaps/compaq-e_evo \
- keymaps/dell \
- keymaps/dell-latitude-xt2 \
- keymaps/everex-xt5000 \
- keymaps/fujitsu-amilo_li_2732 \
- keymaps/fujitsu-amilo_pa_2548 \
- keymaps/fujitsu-amilo_pro_edition_v3505 \
- keymaps/fujitsu-amilo_pro_v3205 \
- keymaps/fujitsu-amilo_si_1520 \
- keymaps/fujitsu-esprimo_mobile_v5 \
- keymaps/fujitsu-esprimo_mobile_v6 \
- keymaps/genius-slimstar-320 \
- keymaps/hewlett-packard \
- keymaps/hewlett-packard-2510p_2530p \
- keymaps/hewlett-packard-compaq_elitebook \
- keymaps/hewlett-packard_elitebook-8440p \
- keymaps/hewlett-packard-hdx9494nr \
- keymaps/hewlett-packard-pavilion \
- keymaps/hewlett-packard-presario-2100 \
- keymaps/hewlett-packard-tablet \
- keymaps/hewlett-packard-tx2 \
- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
- keymaps/inventec-symphony_6.0_7.0 \
- keymaps/lenovo-3000 \
- keymaps/lenovo-ideapad \
- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
- keymaps/lenovo-thinkpad_x200_tablet \
- keymaps/lenovo-thinkpad_x6_tablet \
- keymaps/lg-x110 \
- keymaps/logitech-wave \
- keymaps/logitech-wave-cordless \
- keymaps/logitech-wave-pro-cordless \
- keymaps/maxdata-pro_7000 \
- keymaps/medion-fid2060 \
- keymaps/medionnb-a555 \
- keymaps/micro-star \
- keymaps/module-asus-w3j \
- keymaps/module-ibm \
- keymaps/module-lenovo \
- keymaps/module-sony \
- keymaps/module-sony-old \
- keymaps/module-sony-vgn \
- keymaps/module-sony-vpc \
- keymaps/olpc-xo \
- keymaps/onkyo \
- keymaps/oqo-model2 \
- keymaps/samsung-other \
- keymaps/samsung-series-9 \
- keymaps/samsung-sq1us \
- keymaps/samsung-sx20s \
- keymaps/toshiba-satellite_a100 \
- keymaps/toshiba-satellite_a110 \
- keymaps/toshiba-satellite_m30x \
- keymaps/zepto-znote
-
-KEYMAPS_FR = \
- keymaps-force-release/common-volume-keys \
- keymaps-force-release/dell-touchpad \
- keymaps-force-release/dell-xps \
- keymaps-force-release/hp-other \
- keymaps-force-release/samsung-other \
- keymaps-force-release/samsung-series-9 \
+KEYMAPS = $(shell ls keymaps/* | sort)
+KEYMAPS_FR = $(shell ls keymaps-force-release/* | sort)
KEYMAP_DEPS = common src/udev/keymap/keys-from-name.h
src/udev/keymap/keys-to-name.h
Modified: trunk/BOOK/udev-lfs/udev.7
==============================================================================
--- trunk/BOOK/udev-lfs/udev.7 Mon Apr 15 16:02:25 2013 (r10242)
+++ trunk/BOOK/udev-lfs/udev.7 Tue Apr 16 19:04:47 2013 (r10243)
@@ -1,5 +1,5 @@
'\" t
-.TH "UDEV" "7" "" "systemd 200" "udev"
+.TH "UDEV" "7" "" "systemd 201" "udev"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: trunk/BOOK/udev-lfs/udevadm.8
==============================================================================
--- trunk/BOOK/udev-lfs/udevadm.8 Mon Apr 15 16:02:25 2013 (r10242)
+++ trunk/BOOK/udev-lfs/udevadm.8 Tue Apr 16 19:04:47 2013 (r10243)
@@ -1,5 +1,5 @@
'\" t
-.TH "UDEVADM" "8" "" "systemd 200" "udevadm"
+.TH "UDEVADM" "8" "" "systemd 201" "udevadm"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Modified: trunk/BOOK/udev-lfs/udevd.8
==============================================================================
--- trunk/BOOK/udev-lfs/udevd.8 Mon Apr 15 16:02:25 2013 (r10242)
+++ trunk/BOOK/udev-lfs/udevd.8 Tue Apr 16 19:04:47 2013 (r10243)
@@ -1,5 +1,5 @@
'\" t
-.TH "SYSTEMD\-UDEVD\&.SERVICE" "8" "" "systemd 200" "udevd"
+.TH "SYSTEMD\-UDEVD\&.SERVICE" "8" "" "systemd 201" "udevd"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
