From 1ca6398dc591c54a1688ca689bb74bcc256d6141 Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Sat, 12 Dec 2020 21:25:32 +0100 Subject: [PATCH 1/3] openct: remove lines that resulted in a no-op MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also remove /run/openct/status from FILES_${PN}, which isn't being created at all by the recipe – even openct's configure script references it as /var/run/openct/. Fixes: 387824f1763c573fd05c (2016-02-28, "openct: Fix rootfs creation errors") Fixes: 8e61ff98e9fd83aad1a5 (2019-11-21, "openct: merge do_install and do_install_append") Signed-off-by: Roland Hieber --- meta-oe/recipes-support/openct/openct_0.6.20.bb | 7 ------- 1 file changed, 7 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 1514c7a958b..f647786e2b5 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -46,7 +46,6 @@ FILES_${PN} += " \ ${nonarch_base_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ - /run/openct/status \ " FILES_${PN}-dbg += " \ @@ -79,10 +78,4 @@ do_install () { so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf - - install -dm 755 ${D}${localstatedir}/run/openct - touch ${D}${localstatedir}/run/openct/status - chmod 644 ${D}${localstatedir}/run/openct/status - - rm -r ${D}/${localstatedir}/run } From 0787dabe75ad6834faf4c0332e30659cc652303d Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Sat, 12 Dec 2020 21:29:57 +0100 Subject: [PATCH 2/3] 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 --- .../recipes-support/openct/openct_0.6.20.bb | 24 +++++++++---------- 1 file 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 f647786e2b5..7ea0d4174fd 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=" \ --enable-pcsc \ --enable-doc \ --enable-api-doc \ - --with-udev=${nonarch_base_libdir}/udev \ + --with-udev=${nonarch_libdir}/udev \ --with-bundle=${libdir}/pcsc/drivers \ " @@ -43,7 +43,7 @@ inherit autotools pkgconfig FILES_${PN} += " \ ${libdir}/ctapi \ - ${nonarch_base_libdir}/udev \ + ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ " @@ -55,10 +55,10 @@ FILES_${PN}-dbg += " \ INSANE_SKIP_${PN} += "dev-deps" +do_install[cleandirs] += "${D}" + do_install () { - rm -rf ${D} - install -d ${D}/etc - install -dm 755 ${D}${nonarch_base_libdir}/udev + install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ ${WORKDIR}/openct.service ${WORKDIR}/openct.init @@ -66,16 +66,16 @@ do_install () { oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ - install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules - install -pm 644 etc/openct.conf ${D}/etc/openct.conf + install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules + install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct + install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf - install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf + install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } From d70eb9ccfcd21792eda3b9b0545762a36bbb6f5d Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Sat, 12 Dec 2020 21:57:07 +0100 Subject: [PATCH 3/3] openct: allow building as native package Signed-off-by: Roland Hieber --- meta-oe/recipes-support/openct/openct_0.6.20.bb | 2 ++ 1 file changed, 2 insertions(+) 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 7ea0d4174fd..3976f777005 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -79,3 +79,5 @@ do_install () { sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } + +BBCLASSEXTEND="native"