merged to both. thanks armin
On 6/12/20 7:19 PM, Jeremy Puhlman wrote: > From: Jeremy Puhlman <[email protected]> > > Signed-off-by: Jeremy Puhlman <[email protected]> > --- > recipes-scanners/clamav/clamav_0.101.5.bb | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/recipes-scanners/clamav/clamav_0.101.5.bb > b/recipes-scanners/clamav/clamav_0.101.5.bb > index f4625b1..2ea2c9b 100644 > --- a/recipes-scanners/clamav/clamav_0.101.5.bb > +++ b/recipes-scanners/clamav/clamav_0.101.5.bb > @@ -25,7 +25,7 @@ S = "${WORKDIR}/git" > LEAD_SONAME = "libclamav.so" > SO_VER = "9.0.2" > > -inherit autotools pkgconfig useradd systemd > +inherit autotools pkgconfig useradd systemd multilib_header multilib_script > > CLAMAV_UID ?= "clamav" > CLAMAV_GID ?= "clamav" > @@ -45,6 +45,8 @@ PACKAGECONFIG[bz2] = > "--with-libbz2-prefix=${CLAMAV_USR_DIR}, --disable-bzip2, b > PACKAGECONFIG[ncurses] = "--with-libncurses-prefix=${CLAMAV_USR_DIR}, > --without-libncurses-prefix, ncurses, " > PACKAGECONFIG[systemd] = > "--with-systemdsystemunitdir=${systemd_unitdir}/system/, > --without-systemdsystemunitdir, " > > +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/clamav-config > ${PN}-cvd:${localstatedir}/lib/clamav/mirrors.dat" > + > EXTRA_OECONF_CLAMAV = "--without-libcheck-prefix --disable-unrar \ > --disable-mempool \ > --program-prefix="" \ > @@ -93,6 +95,7 @@ do_install_append_class-target () { > install -d ${D}${sysconfdir}/tmpfiles.d > install -m 0644 ${WORKDIR}/tmpfiles.clamav > ${D}${sysconfdir}/tmpfiles.d/clamav.conf > fi > + oe_multilib_header clamav-types.h > } > > pkg_postinst_ontarget_${PN} () { > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#49702): https://lists.yoctoproject.org/g/yocto/message/49702 Mute This Topic: https://lists.yoctoproject.org/mt/74852100/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
