diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/udev | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r-- | meta/recipes-core/udev/eudev/permissions.rules | 6 | ||||
-rw-r--r-- | meta/recipes-core/udev/eudev_3.2.10.bb | 24 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf_1.1.bb | 12 |
3 files changed, 21 insertions, 21 deletions
diff --git a/meta/recipes-core/udev/eudev/permissions.rules b/meta/recipes-core/udev/eudev/permissions.rules index 205b733292..bfdff4f8ce 100644 --- a/meta/recipes-core/udev/eudev/permissions.rules +++ b/meta/recipes-core/udev/eudev/permissions.rules | |||
@@ -10,9 +10,9 @@ SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" | |||
10 | SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" | 10 | SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" |
11 | 11 | ||
12 | # devices needed to load the drivers providing them | 12 | # devices needed to load the drivers providing them |
13 | KERNEL=="tun", OPTIONS+="ignore_remove" | 13 | KERNEL=="tun", OPTIONS+="ignore:remove" |
14 | KERNEL=="ppp", OPTIONS+="ignore_remove" | 14 | KERNEL=="ppp", OPTIONS+="ignore:remove" |
15 | KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" | 15 | KERNEL=="loop[0-9]*", OPTIONS+="ignore:remove" |
16 | 16 | ||
17 | # default permissions for block devices | 17 | # default permissions for block devices |
18 | SUBSYSTEM=="block", GROUP="disk" | 18 | SUBSYSTEM=="block", GROUP="disk" |
diff --git a/meta/recipes-core/udev/eudev_3.2.10.bb b/meta/recipes-core/udev/eudev_3.2.10.bb index a5d2115f80..347495cbdb 100644 --- a/meta/recipes-core/udev/eudev_3.2.10.bb +++ b/meta/recipes-core/udev/eudev_3.2.10.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "eudev is a fork of systemd's udev" | |||
2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" | 2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" |
3 | DESCRIPTION = "eudev is Gentoo's fork of udev, systemd's device file manager for the Linux kernel. It manages device nodes in /dev and handles all user space actions when adding or removing devices." | 3 | DESCRIPTION = "eudev is Gentoo's fork of udev, systemd's device file manager for the Linux kernel. It manages device nodes in /dev and handles all user space actions when adding or removing devices." |
4 | LICENSE = "GPLv2.0+ & LGPL-2.1+" | 4 | LICENSE = "GPLv2.0+ & LGPL-2.1+" |
5 | LICENSE_libudev = "LGPL-2.1+" | 5 | LICENSE:libudev = "LGPL-2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
7 | 7 | ||
8 | DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" | 8 | DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" |
@@ -38,7 +38,7 @@ EXTRA_OECONF = " \ | |||
38 | PACKAGECONFIG ??= "hwdb" | 38 | PACKAGECONFIG ??= "hwdb" |
39 | PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" | 39 | PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" |
40 | 40 | ||
41 | do_install_append() { | 41 | do_install:append() { |
42 | install -d ${D}${sysconfdir}/init.d | 42 | install -d ${D}${sysconfdir}/init.d |
43 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | 43 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev |
44 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev | 44 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev |
@@ -57,7 +57,7 @@ do_install_append() { | |||
57 | ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm | 57 | ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm |
58 | } | 58 | } |
59 | 59 | ||
60 | do_install_prepend_class-target () { | 60 | do_install:prepend:class-target () { |
61 | # Remove references to buildmachine | 61 | # Remove references to buildmachine |
62 | sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ | 62 | sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ |
63 | ${B}/src/udev/keyboard-keys-from-name.h | 63 | ${B}/src/udev/keyboard-keys-from-name.h |
@@ -70,21 +70,21 @@ PACKAGES =+ "libudev" | |||
70 | PACKAGES =+ "eudev-hwdb" | 70 | PACKAGES =+ "eudev-hwdb" |
71 | 71 | ||
72 | 72 | ||
73 | FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" | 73 | FILES:${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" |
74 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | 74 | FILES:${PN}-dev = "${datadir}/pkgconfig/udev.pc \ |
75 | ${includedir}/libudev.h ${libdir}/libudev.so \ | 75 | ${includedir}/libudev.h ${libdir}/libudev.so \ |
76 | ${includedir}/udev.h ${libdir}/libudev.la \ | 76 | ${includedir}/udev.h ${libdir}/libudev.la \ |
77 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" | 77 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" |
78 | FILES_libudev = "${base_libdir}/libudev.so.*" | 78 | FILES:libudev = "${base_libdir}/libudev.so.*" |
79 | FILES_eudev-hwdb = "${sysconfdir}/udev/hwdb.d" | 79 | FILES:eudev-hwdb = "${sysconfdir}/udev/hwdb.d" |
80 | 80 | ||
81 | RDEPENDS_eudev-hwdb += "eudev" | 81 | RDEPENDS:eudev-hwdb += "eudev" |
82 | 82 | ||
83 | RPROVIDES_${PN} = "hotplug udev" | 83 | RPROVIDES:${PN} = "hotplug udev" |
84 | RPROVIDES_eudev-hwdb += "udev-hwdb" | 84 | RPROVIDES:eudev-hwdb += "udev-hwdb" |
85 | 85 | ||
86 | PACKAGE_WRITE_DEPS += "qemu-native" | 86 | PACKAGE_WRITE_DEPS += "qemu-native" |
87 | pkg_postinst_eudev-hwdb () { | 87 | pkg_postinst:eudev-hwdb () { |
88 | if test -n "$D"; then | 88 | if test -n "$D"; then |
89 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} | 89 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} |
90 | else | 90 | else |
@@ -92,6 +92,6 @@ pkg_postinst_eudev-hwdb () { | |||
92 | fi | 92 | fi |
93 | } | 93 | } |
94 | 94 | ||
95 | pkg_prerm_eudev-hwdb () { | 95 | pkg_prerm:eudev-hwdb () { |
96 | rm -f $D${sysconfdir}/udev/hwdb.bin | 96 | rm -f $D${sysconfdir}/udev/hwdb.bin |
97 | } | 97 | } |
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 90f933d981..2ba35b0df6 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb | |||
@@ -35,11 +35,11 @@ do_install() { | |||
35 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | 35 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts |
36 | } | 36 | } |
37 | 37 | ||
38 | FILES_${PN} = "${sysconfdir}/udev" | 38 | FILES:${PN} = "${sysconfdir}/udev" |
39 | RDEPENDS_${PN} = "udev" | 39 | RDEPENDS:${PN} = "udev" |
40 | CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist" | 40 | CONFFILES:${PN} = "${sysconfdir}/udev/mount.blacklist" |
41 | 41 | ||
42 | # to replace udev-extra-rules from meta-oe | 42 | # to replace udev-extra-rules from meta-oe |
43 | RPROVIDES_${PN} = "udev-extra-rules" | 43 | RPROVIDES:${PN} = "udev-extra-rules" |
44 | RREPLACES_${PN} = "udev-extra-rules" | 44 | RREPLACES:${PN} = "udev-extra-rules" |
45 | RCONFLICTS_${PN} = "udev-extra-rules" | 45 | RCONFLICTS:${PN} = "udev-extra-rules" |