From 86b1ebcfe57dcb7088ca93a230561f56cca157f8 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 9 Jan 2013 18:55:19 +0000 Subject: [PATCH] Update udev-lfs scripts Update to systemd-197 Reformat 'Rebooting the System' recommendations git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10093 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 29 ++++++++++++++--------------- chapter06/systemd.xml | 4 ---- chapter09/reboot.xml | 25 +++++++++++++++++++++---- general.ent | 4 ++-- packages.ent | 12 ++++++------ udev-lfs/Makefile.lfs | 19 +++++++++++++++---- udev-lfs/cfg.h | 7 ++++++- 7 files changed, 64 insertions(+), 36 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 84a3671a9..f608b1df0 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,20 @@ --> + + 2013-01-09 + + + [bdubbs] - Reformat 'Rebooting the System' + recommendations. + + + [bdubbs] - Update udev-lfs scripts. Update to + systemd-197. + + + + 2013-01-02 @@ -58,21 +72,6 @@ - - 2013-01-01 - - - [bdubbs] - Add additional recommendations for - additional packages in the 'Rebooting the System' - section. - - - [bdubbs] - Remove obsolete --enable-mpbsd from gmp - instructions. Thanks to hauradou for the report. - - - - 2012-12-31 diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 5bfa5d6db..de5d3b968 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -53,10 +53,6 @@ tar -xvf ../&udev-lfs;.tar.bz2 - Fix a typo in the udevadm usage output: - -sed -i -e 's/create/update/' src/udev/udevadm-hwdb.c - Compile the package: make -f &udev-lfs;/Makefile.lfs diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml index 6ab7d1c52..7700b2e93 100644 --- a/chapter09/reboot.xml +++ b/chapter09/reboot.xml @@ -49,17 +49,34 @@ url='&blfs-root;/view/svn/postlfs/openssl.html'>openssl. + To make fetching files over the internet easier, install + wget. + + If one or more of your disk drives have a GUID partition table (GPT), either gptfdisk or parted will be useful. - Finally, a review of configuration files such as - /etc/vimrc, /etc/dircolors, /etc/profile, /etc/bashrc, /etc/hosts, - /etc/inputrc, /etc/resolv.conf, /root/.bash_profile, and /root/.bashrc is - also appropriate at this point. + Finally, a review of the following configuration files + is also appropriate at this point. + + /etc/bashrc + /etc/dircolors + /etc/fstab + /etc/hosts + /etc/inputrc + /etc/profile + /etc/resolv.conf + /etc/vimrc + /root/.bash_profile + /root/.bashrc + /etc/sysconfig/network + /etc/sysconfig/ifconfig.eth0 + + Now that we have said that, lets move on to booting our shiny new LFS diff --git a/general.ent b/general.ent index e1c0bad5c..710daff68 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 608962241..de8da51e8 100644 --- a/packages.ent +++ b/packages.ent @@ -524,10 +524,10 @@ - - + + - + @@ -540,10 +540,10 @@ - - + + - + diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs index 64e17b3f1..c998d9e13 100644 --- a/udev-lfs/Makefile.lfs +++ b/udev-lfs/Makefile.lfs @@ -4,8 +4,8 @@ # vim: tabstop=3 SHELL=/bin/bash -SYSTEMD_VERSION=196 -VERSION=196-3 +SYSTEMD_VERSION=197 +VERSION=197-1 ifeq ($(V),) VB = @ @@ -79,7 +79,8 @@ COMMON_SRCS = log.c \ util.c \ dev-setup.c \ sd-login.c \ - sd-daemon.c + sd-daemon.c \ + time-util.c COMMON_OBJS := $(addprefix build/, $(COMMON_SRCS:.c=.o)) @@ -146,6 +147,14 @@ SED_PROCESS = \ -e 's|@includedir@|/usr/include|g' \ < $< > $@ +SECURE = $(shell if nm /lib/libc.so.6 | grep -q " secure_getenv"; \ +then echo yes; fi) + +ifeq "$(SECURE)" "yes" + SECURE_GETENV = SECURE_GETENV +else + SECURE_GETENV = __SECURE_GETENV +endif udev: common \ build/$(COMMON_LIB) \ @@ -163,7 +172,9 @@ udev: common \ build/libudev.pc cfg.h: udev-lfs-$(VERSION)/cfg.h - sed -e 's/LFS-VERSION/$(SYSTEMD_VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h + sed -e 's/LFS-VERSION/$(SYSTEMD_VERSION)/' \ + -e 's/SECURE_GETENV/$(SECURE_GETENV)/' \ + udev-lfs-$(VERSION)/cfg.h > ./cfg.h @mkdir -p build common: cfg.h diff --git a/udev-lfs/cfg.h b/udev-lfs/cfg.h index e12dabfc8..cec845d6c 100644 --- a/udev-lfs/cfg.h +++ b/udev-lfs/cfg.h @@ -1,3 +1,5 @@ +/* Custom udev (from systemd) configuration header file for LFS */ + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -13,6 +15,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the `secure_getenv' function. */ +/* For glibc before 2.17, this should be HAVE___SECURE_GETENV */ +#define HAVE_SECURE_GETENV 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -56,4 +62,3 @@ #define HAVE_DECL_PIVOT_ROOT 0 #define HAVE_DECL_GETTID 0 #define HAVE_NAME_TO_HANDLE_AT 1 -#define HAVE___SECURE_GETENV 1