瀏覽代碼

Update udev-lfs for sytemd-190

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9997 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 13 年之前
父節點
當前提交
a764ff2e68
共有 2 個文件被更改,包括 12 次插入6 次删除
  1. 6 5
      udev-lfs/Makefile.lfs
  2. 6 1
      udev-lfs/cfg.h

+ 6 - 5
udev-lfs/Makefile.lfs

@@ -4,7 +4,7 @@
 # vim: tabstop=3
 
 SHELL=/bin/bash
-VERSION=188
+VERSION=190
 
 ifeq ($(V),)
  VB = @
@@ -94,7 +94,8 @@ UDEVD_SRCS = udev-ctrl.c             \
              udev-builtin-kmod.c     \
              udev-builtin-uaccess.c  \
              udev-builtin-usb_id.c   \
-             udev-builtin-input_id.c
+             udev-builtin-input_id.c \
+             udev-builtin-btrfs.c
 
 UDEVD_OBJS := $(addprefix build/, $(UDEVD_SRCS:.c=.o))
 
@@ -119,7 +120,8 @@ UDEV_ADMIN_SRCS = udevadm.c               \
                   udev-builtin-kmod.c     \
                   udev-builtin-uaccess.c  \
                   udev-builtin-usb_id.c   \
-                  udev-builtin-input_id.c
+                  udev-builtin-input_id.c \
+                  udev-builtin-btrfs.c
 
 UDEV_ADMIN_OBJS := $(addprefix build/, $(UDEV_ADMIN_SRCS:.c=.o))
 
@@ -204,8 +206,7 @@ build/udevd: build/$(COMMON_LIB) build/udevd.o
 
 build/udevadm: $(UDEV_ADMIN_OBJS)
 	@echo LINK $@
-	$(VB)gcc $(UDEV_ADMIN_OBJS) -o $@ $(LDFLAGS2) build/$(COMMON_LIB) \
-      build/udev-local.a
+	$(VB)gcc $(UDEV_ADMIN_OBJS) -o $@ $(LDFLAGS2) build/$(COMMON_LIB)
 	$(VB)strip --strip-unneeded $@
 
 build/accelerometer: build/accelerometer.o build/$(COMMON_LIB)

+ 6 - 1
udev-lfs/cfg.h

@@ -39,6 +39,11 @@
 
 /* Enable GNU extensions on systems that have them.  */
 # define _GNU_SOURCE 1
+
 /* Version number of package */
-#define VERSION "188"
+#define VERSION "190"
 
+#define HAVE_DECL_PIVOT_ROOT 0
+#define HAVE_DECL_GETTID 0
+#define HAVE_NAME_TO_HANDLE_AT 1
+#define HAVE___SECURE_GETENV 1