diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2013-01-09 18:55:19 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2013-01-09 18:55:19 +0000 |
| commit | 86b1ebcfe57dcb7088ca93a230561f56cca157f8 (patch) | |
| tree | 337212275547104af5baa095067de9385fa29e31 /udev-lfs | |
| parent | 56dfe5b9fb5cabb9777f953af7807ccd6846a280 (diff) | |
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
Diffstat (limited to 'udev-lfs')
| -rw-r--r-- | udev-lfs/Makefile.lfs | 19 | ||||
| -rw-r--r-- | udev-lfs/cfg.h | 7 |
2 files changed, 21 insertions, 5 deletions
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 <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 @@ -13,6 +15,10 @@ /* 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. */ #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 |