posted v2 of this with an extra patch please ignore
On Thu, 6 Jun 2019 at 16:18, Nicola Lunghi <[email protected]> wrote: > > - add missing DESCRIPTION, AUTHOR, HOMEPAGE > - cleanup DEPENDS > - fix variable ordering as per https://www.openembedded.org/wiki/Styleguide > - remove unneeded checks for systemd, sysvinit in do_install > > Signed-off-by: Nicola Lunghi <[email protected]> > --- > .../rng-tools/rng-tools_6.6.bb | 63 ++++++++++--------- > 1 file changed, 33 insertions(+), 30 deletions(-) > > diff --git a/meta/recipes-support/rng-tools/rng-tools_6.6.bb > b/meta/recipes-support/rng-tools/rng-tools_6.6.bb > index 6796c9be9e..41959a2695 100644 > --- a/meta/recipes-support/rng-tools/rng-tools_6.6.bb > +++ b/meta/recipes-support/rng-tools/rng-tools_6.6.bb > @@ -1,58 +1,61 @@ > SUMMARY = "Random number generator daemon" > +DESCRIPTION = "Check and feed random data from hardware device to kernel" > +AUTHOR = "Philipp Rumpf, Jeff Garzik <[email protected]>, \ > + Henrique de Moraes Holschuh <[email protected]>" > +HOMEPAGE = "https://github.com/nhorman/rng-tools"; > +BUGTRACKER = "https://github.com/nhorman/rng-tools/issues"; > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > - > -SRC_URI = "git://github.com/nhorman/rng-tools.git \ > - file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ > - file://0002-Add-argument-to-control-the-libargp-dependency.patch \ > - file://underquote.patch \ > - file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ > - file://0001-configure.ac-fix-typo.patch \ > - file://init \ > - file://default \ > - file://rngd.service \ > +DEPENDS = "sysfsutils" > + > +SRC_URI = "\ > + git://github.com/nhorman/rng-tools.git \ > + file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ > + file://0002-Add-argument-to-control-the-libargp-dependency.patch \ > + file://underquote.patch \ > + file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ > + file://0001-configure.ac-fix-typo.patch \ > + file://init \ > + file://default \ > + file://rngd.service \ > " > SRCREV = "4ebc21d6f387bb7b4b3f6badc429e27b21c0a6ee" > + > S = "${WORKDIR}/git" > > inherit autotools update-rc.d systemd pkgconfig > > -DEPENDS = " \ > - sysfsutils \ > - " > - > PACKAGECONFIG ??= "libgcrypt libjitterentropy" > PACKAGECONFIG_libc-musl = "libargp libjitterentropy" > + > PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," > PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," > PACKAGECONFIG[libjitterentropy] = > "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" > PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl > libxml2 openssl" > > +INITSCRIPT_NAME = "rng-tools" > +INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." > + > +SYSTEMD_SERVICE_${PN} = "rngd.service" > + > # Refer autogen.sh in rng-tools > do_configure_prepend() { > cp ${S}/README.md ${S}/README > } > > do_install_append() { > - # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. > - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', > d)}; then > - install -d "${D}${sysconfdir}/init.d" > - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools > - sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ > - ${D}${sysconfdir}/init.d/rng-tools > + install -d "${D}${sysconfdir}/init.d" > + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools > + sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ > + ${D}${sysconfdir}/init.d/rng-tools > > + # Only install the default script when 'sysvinit' is in DISTRO_FEATURES. > + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', > d)}; then > install -d "${D}${sysconfdir}/default" > install -m 0644 ${WORKDIR}/default > ${D}${sysconfdir}/default/rng-tools > fi > > - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', > d)}; then > - install -d ${D}${systemd_unitdir}/system > - install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system > - sed -i -e 's,@SBINDIR@,${sbindir},g' > ${D}${systemd_unitdir}/system/rngd.service > - fi > + install -d ${D}${systemd_unitdir}/system > + install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system > + sed -i -e 's,@SBINDIR@,${sbindir},g' > ${D}${systemd_unitdir}/system/rngd.service > } > - > -INITSCRIPT_NAME = "rng-tools" > -INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." > - > -SYSTEMD_SERVICE_${PN} = "rngd.service" > -- > 2.20.1 > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
