Changeset 86b1ebc for udev-lfs

Timestamp:

01/09/2013 06:55:19 PM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

cdd87ad

Parents:

56dfe5b

Message:

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

Location:

udev-lfs

Files:

• Makefile.lfs (modified) (4 diffs)
• cfg.h (modified) (3 diffs)

udev-lfs/Makefile.lfs

@@ -5 +5 @@
 
 SHELL=/bin/bash
-SYSTEMD_VERSION=196
-VERSION=196-3
+SYSTEMD_VERSION=197
+VERSION=197-1
 
 ifeq ($(V),)
@@ -80 +80 @@
               dev-setup.c   \
               sd-login.c    \
-              sd-daemon.c
+              sd-daemon.c   \
+              time-util.c
 
 COMMON_OBJS := $(addprefix build/, $(COMMON_SRCS:.c=.o))
@@ -147 +148 @@
         < $< > $@
 
+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                     \
@@ -164 +173 @@
 
 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
 

udev-lfs/cfg.h

@@ +1 @@
+/* Custom udev (from systemd) configuration header file for LFS */
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -13 +15 @@
 /* Define to 1 if you have the <memory.h> 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 <stdint.h> header file. */
@@ -57 +63 @@
 #define HAVE_DECL_GETTID 0
 #define HAVE_NAME_TO_HANDLE_AT 1
-#define HAVE___SECURE_GETENV 1