diff options
Diffstat (limited to 'meta/recipes-core/udev/udev-extraconf_1.1.bb')
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf_1.1.bb | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 90f933d981..a3e5d12b81 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | SUMMARY = "Extra machine specific configuration files" | 1 | SUMMARY = "Extra machine specific configuration files" |
2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" | 2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" |
3 | DESCRIPTION = "Extra machine specific configuration files for udev, specifically blacklist information." | 3 | DESCRIPTION = "Extra machine specific configuration files for udev, specifically information on devices to ignore." |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | file://automount.rules \ | 8 | file://automount.rules \ |
9 | file://mount.sh \ | 9 | file://mount.sh \ |
10 | file://mount.blacklist \ | 10 | file://mount.ignorelist \ |
11 | file://autonet.rules \ | 11 | file://autonet.rules \ |
12 | file://network.sh \ | 12 | file://network.sh \ |
13 | file://localextra.rules \ | 13 | file://localextra.rules \ |
@@ -15,31 +15,44 @@ SRC_URI = " \ | |||
15 | 15 | ||
16 | S = "${WORKDIR}" | 16 | S = "${WORKDIR}" |
17 | 17 | ||
18 | MOUNT_BASE = "/run/media" | ||
18 | 19 | ||
19 | do_install() { | 20 | do_install() { |
20 | install -d ${D}${sysconfdir}/udev/rules.d | 21 | install -d ${D}${sysconfdir}/udev/rules.d |
21 | 22 | ||
22 | install -m 0644 ${WORKDIR}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules | 23 | install -m 0644 ${S}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules |
23 | install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules | 24 | install -m 0644 ${S}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules |
24 | install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules | 25 | install -m 0644 ${S}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules |
25 | 26 | ||
26 | install -d ${D}${sysconfdir}/udev/mount.blacklist.d | 27 | install -d ${D}${sysconfdir}/udev/mount.ignorelist.d |
27 | install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ | 28 | install -m 0644 ${S}/mount.ignorelist ${D}${sysconfdir}/udev/ |
28 | 29 | ||
29 | install -d ${D}${sysconfdir}/udev/scripts/ | 30 | install -d ${D}${sysconfdir}/udev/scripts/ |
30 | 31 | ||
31 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | 32 | install -m 0755 ${S}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh |
32 | sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 33 | sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
33 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 34 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
35 | sed -i 's|@MOUNT_BASE@|${MOUNT_BASE}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | ||
34 | 36 | ||
35 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | 37 | install -m 0755 ${S}/network.sh ${D}${sysconfdir}/udev/scripts |
36 | } | 38 | } |
37 | 39 | ||
38 | FILES_${PN} = "${sysconfdir}/udev" | 40 | pkg_postinst:${PN} () { |
39 | RDEPENDS_${PN} = "udev" | 41 | if [ -e $D${systemd_unitdir}/system/systemd-udevd.service ]; then |
40 | CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist" | 42 | sed -i "/\[Service\]/aMountFlags=shared" $D${systemd_unitdir}/system/systemd-udevd.service |
43 | fi | ||
44 | } | ||
45 | |||
46 | pkg_postrm:${PN} () { | ||
47 | if [ -e $D${systemd_unitdir}/system/systemd-udevd.service ]; then | ||
48 | sed -i "/MountFlags=shared/d" $D${systemd_unitdir}/system/systemd-udevd.service | ||
49 | fi | ||
50 | } | ||
51 | |||
52 | RDEPENDS:${PN} = "udev util-linux-blkid ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'util-linux-lsblk', '', d)}" | ||
53 | CONFFILES:${PN} = "${sysconfdir}/udev/mount.ignorelist" | ||
41 | 54 | ||
42 | # to replace udev-extra-rules from meta-oe | 55 | # to replace udev-extra-rules from meta-oe |
43 | RPROVIDES_${PN} = "udev-extra-rules" | 56 | RPROVIDES:${PN} = "udev-extra-rules" |
44 | RREPLACES_${PN} = "udev-extra-rules" | 57 | RREPLACES:${PN} = "udev-extra-rules" |
45 | RCONFLICTS_${PN} = "udev-extra-rules" | 58 | RCONFLICTS:${PN} = "udev-extra-rules" |