gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-05 22:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to systemd-196/lfs-udev-196

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10050 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2012-11-22 23:50:54 +00:00
parent 5ee47cba93
commit f9d6f78f22
5 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chapter01/changelog.xml
View File

@ -36,6 +36,16 @@
</listitem>
-->
<listitem>
<para>2012-11-22</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Upgrade to systemd-196/lfs-udev-196. Fixes
<ulink url="&lfs-ticket-root;3233">#3233</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2012-11-18</para>
<itemizedlist>

4
chapter06/systemd.xml
View File

@ -53,6 +53,10 @@
<screen><userinput remap="pre">tar -xvf ../&udev-lfs;.tar.bz2</userinput></screen>
<para>Fix a typo in the <userinput>udevadm</userinput> usage output:</para>
<screen><userinput remap="pre">sed -i -e 's/create/update/' src/udev/udevadm-hwdb.c</userinput></screen>
<para>Compile the package:</para>
<screen><userinput remap="make">make -f udev-lfs-&systemd-version;/Makefile.lfs</userinput></screen>

4
general.ent
View File

@ -1,5 +1,5 @@
<!ENTITY version "SVN-20121118">
<!ENTITY releasedate "November 18, 2012">
<!ENTITY version "SVN-20121122">
<!ENTITY releasedate "November 22, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

12
packages.ent
View File

@ -524,12 +524,12 @@
<!ENTITY texinfo-ch6-du "24 MB">
<!ENTITY texinfo-ch6-sbu "0.2 SBU">
<!ENTITY systemd-version "195">
<!ENTITY systemd-size "1,412 KB">
<!ENTITY systemd-version "196">
<!ENTITY systemd-size "1,928 KB">
<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
<!ENTITY systemd-md5 "38e8c8144e7e6e5bc3ce32eb4260e680">
<!ENTITY systemd-md5 "05ebd7f108e420e2b4e4810ea4b3c810">
<!ENTITY systemd-home "http://www.freedesktop.org/wiki/Software/systemd/">
<!ENTITY systemd-ch6-du "18 MB">
<!ENTITY systemd-ch6-du "23 MB">
<!ENTITY systemd-ch6-sbu "0.1 SBU">
<!ENTITY tzdata-version "2012j">
@ -541,9 +541,9 @@
<!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
<!ENTITY udev-lfs "udev-lfs-&systemd-version;">
<!ENTITY udev-lfs-size "17 KB">
<!ENTITY udev-lfs-size "20 KB">
<!ENTITY udev-lfs-url "&anduin-other;&udev-lfs;.tar.bz2">
<!ENTITY udev-lfs-md5 "6e1c852e51646e42e4e9a02570050c71">
<!ENTITY udev-lfs-md5 "abfc9dad2075109ac9c08f40c6d2aae8">
<!ENTITY udev-lfs-home " ">
<!ENTITY util-linux-version "2.22.1">

40
udev-lfs/Makefile.lfs
View File

@ -4,7 +4,7 @@
# vim: tabstop=3
SHELL=/bin/bash
VERSION=195
VERSION=196
ifeq ($(V),)
VB = @
@ -33,8 +33,7 @@ LDFLAGS2 := $(LDFLAGS) -lblkid -lkmod
DEF = -include cfg.h \
-DSYSCONFDIR=\"/etc\" \
-DFIRMWARE_PATH="\"/lib/firmware/updates/\", \"/lib/firmware/\"" \
-DUSB_DATABASE=\"/usr/share/misc/usb.ids\" \
-DPCI_DATABASE=\"/usr/share/misc/pci.ids\" \
-DHWDB_BIN=\"/etc/udev/hwdb.bin\" \
-DROOTPREFIX= \
-DUDEVLIBEXECDIR=\"/lib/udev\" \
-D_LARGEFILE_SOURCE \
@ -45,6 +44,7 @@ INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd
LIBUDEV_SRCS = libudev-device-private.c \
libudev-device.c \
libudev-enumerate.c \
libudev-hwdb.c \
libudev-list.c \
libudev-monitor.c \
libudev-queue-private.c \
@ -94,6 +94,7 @@ UDEVD_SRCS = udev-ctrl.c \
udev-builtin-hwdb.c \
udev-builtin-kmod.c \
udev-builtin-uaccess.c \
udev-builtin-net_id.c \
udev-builtin-usb_id.c \
udev-builtin-input_id.c \
udev-builtin-btrfs.c
@ -104,6 +105,7 @@ UDEV_ADMIN_SRCS = udevadm.c \
udevadm-test.c \
udevadm-monitor.c \
udevadm-settle.c \
udevadm-hwdb.c \
udevadm-info.c \
udevadm-test-builtin.c \
udevadm-trigger.c \
@ -120,6 +122,7 @@ UDEV_ADMIN_SRCS = udevadm.c \
udev-builtin-hwdb.c \
udev-builtin-kmod.c \
udev-builtin-uaccess.c \
udev-builtin-net_id.c \
udev-builtin-usb_id.c \
udev-builtin-input_id.c \
udev-builtin-btrfs.c
@ -158,9 +161,12 @@ udev: common \
build/udev.pc \
build/libudev.pc
common: udev-lfs-$(VERSION)/cfg.h
@mkdir -p build
cfg.h: udev-lfs-$(VERSION)/cfg.h
sed -e 's/LFS-VERSION/$(VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h
@mkdir -p build
common: cfg.h
@touch common
build/%o: %c common
@echo CC $<
@ -281,6 +287,11 @@ install: udev
@rm -v $(DESTDIR)/lib/udev/rules.d/99*
@cp -v udev-lfs-$(VERSION)/*.rules $(DESTDIR)/etc/udev/rules.d
# Set up hardware DB
@mkdir -pv $(DESTDIR)/lib/udev/hwdb.d
@cp hwdb/* $(DESTDIR)/lib/udev/hwdb.d
@build/udevadm hwdb --update
# Copy documentation
@cp -v man/udev.7 $(DESTDIR)/usr/share/man/man7
@cp -v man/udevadm.8 $(DESTDIR)/usr/share/man/man8
@ -301,14 +312,15 @@ install-all: install install-keymap install-gudev install-gir-data
clean:
rm -rf build
rm -f cfg.h
rm -f src/gudev/gudevmarshal.h
rm -f src/gudev/gudevmarshal.c
rm -f src/gudev/gudevenumtypes.h
rm -f src/gudev/gudevenumtypes.c
rm -f src/udev/keymap/keys.txt
rm -f src/udev/keymap/keys-from-name.gperf
rm -f src/udev/keymap/keys-from-name.h
rm -f src/udev/keymap/keys-to-name.h
rm -f common
rm -f src/gudev/gudevmarshal.h
rm -f src/gudev/gudevmarshal.c
rm -f src/gudev/gudevenumtypes.h
rm -f src/gudev/gudevenumtypes.c
rm -f src/udev/keymap/keys.txt
rm -f src/udev/keymap/keys-from-name.gperf
rm -f src/udev/keymap/keys-from-name.h
rm -f src/udev/keymap/keys-to-name.h
.PHONY: clean build
.PHONY: clean