diff options
author | Roland Hieber <rhi@pengutronix.de> | 2020-12-12 21:29:57 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-12-13 22:05:00 -0800 |
commit | b79ab49b3ee03c57f0b11bf419b09216e96d9058 (patch) | |
tree | fdcb9a3abefb0b26e7ba6b2c6eba7057800a48d1 /meta-oe/recipes-support/openct/openct_0.6.20.bb | |
parent | 2757d6d1f6e5834467697e571bde8fec564439a7 (diff) | |
download | meta-openembedded-b79ab49b3ee03c57f0b11bf419b09216e96d9058.tar.gz |
openct: clean up do_install
* Use sysconfdir and nonarch_libdir instead of hard-coded paths, and be
consistent with the slashes after ${D}
* Install udev rules into /usr/lib/udev instead of /etc/udev so they can
be overwritten in /etc, which has higher priority. Also use /usr/lib
instead of /lib, latter of which isn't searched by udev [1].
* Don't create /usr/lib/udev, it is already created by install -D later
with the default umask, which is fine
* Make use of do_install[cleandirs]
[1]: https://www.freedesktop.org/software/systemd/man/udev.html
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/openct/openct_0.6.20.bb')
-rw-r--r-- | meta-oe/recipes-support/openct/openct_0.6.20.bb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index f647786e2..7ea0d4174 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb | |||
@@ -35,7 +35,7 @@ EXTRA_OECONF=" \ | |||
35 | --enable-pcsc \ | 35 | --enable-pcsc \ |
36 | --enable-doc \ | 36 | --enable-doc \ |
37 | --enable-api-doc \ | 37 | --enable-api-doc \ |
38 | --with-udev=${nonarch_base_libdir}/udev \ | 38 | --with-udev=${nonarch_libdir}/udev \ |
39 | --with-bundle=${libdir}/pcsc/drivers \ | 39 | --with-bundle=${libdir}/pcsc/drivers \ |
40 | " | 40 | " |
41 | 41 | ||
@@ -43,7 +43,7 @@ inherit autotools pkgconfig | |||
43 | 43 | ||
44 | FILES_${PN} += " \ | 44 | FILES_${PN} += " \ |
45 | ${libdir}/ctapi \ | 45 | ${libdir}/ctapi \ |
46 | ${nonarch_base_libdir}/udev \ | 46 | ${nonarch_libdir}/udev \ |
47 | ${libdir}/openct-ifd.so \ | 47 | ${libdir}/openct-ifd.so \ |
48 | ${libdir}/pcsc \ | 48 | ${libdir}/pcsc \ |
49 | " | 49 | " |
@@ -55,10 +55,10 @@ FILES_${PN}-dbg += " \ | |||
55 | 55 | ||
56 | INSANE_SKIP_${PN} += "dev-deps" | 56 | INSANE_SKIP_${PN} += "dev-deps" |
57 | 57 | ||
58 | do_install[cleandirs] += "${D}" | ||
59 | |||
58 | do_install () { | 60 | do_install () { |
59 | rm -rf ${D} | 61 | install -d ${D}${sysconfdir} |
60 | install -d ${D}/etc | ||
61 | install -dm 755 ${D}${nonarch_base_libdir}/udev | ||
62 | # fix up hardcoded paths | 62 | # fix up hardcoded paths |
63 | sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ | 63 | sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ |
64 | ${WORKDIR}/openct.service ${WORKDIR}/openct.init | 64 | ${WORKDIR}/openct.service ${WORKDIR}/openct.init |
@@ -66,16 +66,16 @@ do_install () { | |||
66 | oe_runmake install DESTDIR=${D} | 66 | oe_runmake install DESTDIR=${D} |
67 | install -dm 755 ${D}${libdir}/ctapi/ | 67 | install -dm 755 ${D}${libdir}/ctapi/ |
68 | mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ | 68 | mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ |
69 | install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules | 69 | install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules |
70 | install -pm 644 etc/openct.conf ${D}/etc/openct.conf | 70 | install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf |
71 | 71 | ||
72 | install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct | 72 | install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct |
73 | install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct | 73 | install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct |
74 | 74 | ||
75 | install -d ${D}/${systemd_unitdir}/system | 75 | install -d ${D}${systemd_unitdir}/system |
76 | install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system | 76 | install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system |
77 | 77 | ||
78 | so=$(find ${D} -name \*.so | sed "s|^${D}||") | 78 | so=$(find ${D} -name \*.so | sed "s|^${D}||") |
79 | sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf | 79 | sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf |
80 | install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf | 80 | install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf |
81 | } | 81 | } |