Changeset 6a5ec49 for udev-lfs

Timestamp:

07/27/2013 08:49:15 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.4, 7.5, 7.6, 7.7, 7.8, 7.9, 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:

25d0483

Parents:

7e3a289

Message:

Update to systemd-206/udev-lfs-206-1

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10307 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

udev-lfs

Files:

• Makefile.lfs (modified) (4 diffs)
• keyboard-keys-from-name.h (added)
• keyboard-keys-to-name.h (added)
• makefile-incl.keymap (modified) (1 diff)

udev-lfs/Makefile.lfs

@@ -5 +5 @@
 
 SHELL=/bin/bash
-SYSTEMD_VERSION=205
+SYSTEMD_VERSION=206
 VERSION=$(SYSTEMD_VERSION)-1
 
@@ -42 +42 @@
       -DHAVE_FIRMWARE
 
-INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd -I src/core
+INCLUDE = -I src/libudev -I src/shared -I src -I src/login -I src/systemd \
+          -I src/core    -I udev-lfs-206-1
 
 LIBUDEV_SRCS = libudev-device-private.c \
@@ -98 +99 @@
              udev-builtin-blkid.c    \
              udev-builtin-firmware.c \
+             udev-builtin-keyboard.c \
              udev-builtin-path_id.c  \
              udev-builtin-hwdb.c     \
@@ -125 +127 @@
                   udev-builtin.c          \
                   udev-builtin-blkid.c    \
+                  udev-builtin-keyboard.c \
                   udev-builtin-firmware.c \
                   udev-builtin-path_id.c  \

udev-lfs/makefile-incl.keymap

@@ -48 +48 @@
    }' $< > $@
 
-build/keymap: src/udev/keymap/keymap.c build/$(COMMON_LIB) $(KEYMAP_DEPS)
-        @echo LINK $@
-        $(VB)gcc $< -o $@ -I src/udev/keymap $(WARN) $(OPTIONS2) $(INCLUDE) $(DEF) \
-      build/$(COMMON_LIB) $(LDFLAGS)
-        $(VB)strip --strip-unneeded $@
-
-keymap: build/keymap
-
-install-keymap: keymap
-        @mkdir -pv $(DESTDIR)/lib/udev/keymaps/force-release \
-              $(DESTDIR)/lib/udev/rules.d               \
-              $(DESTDIR)/usr/share/doc/udev
-
-        @cp -v build/keymap  $(DESTDIR)/lib/udev
-
-        @cp -v $(KEYMAPS)    $(DESTDIR)/lib/udev/keymaps
-        @cp -v $(KEYMAPS_FR) $(DESTDIR)/lib/udev/keymaps/force-release
-
-        @cp -v src/udev/keymap/*.rules       $(DESTDIR)/lib/udev/rules.d
-        @cp -v src/udev/keymap/findkeyboards $(DESTDIR)/lib/udev
-
-        @cp -v src/udev/keymap/*.txt $(DESTDIR)/usr/share/doc/udev
-
-        @sed -e 's|@udevlibexecdir@|/lib/udev|g'              \
-            src/udev/keymap/keyboard-force-release.sh.in \
-            > $(DESTDIR)/lib/udev/keyboard-force-release.sh
-
-        @chmod 0755 $(DESTDIR)/lib/udev/keyboard-force-release.sh
-
-clean-keymap:
-        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 build/keymap
-
-.PHONY: clean-keymap
+keymap:
+        echo "keymap is now built into udevadm/udevd"