Has the issue been raised with upstream? Would be good to include a link to that into the patch: any new 'inappropriate' patch is a support burden.
Alex On Mon, 23 May 2022 at 08:53, leimaohui <[email protected]> wrote: > > - Added a patch to avoid excute fipshmac command. Because *.hmac > file should be created on target instead of on build environment. > - Added pkg_postinst_ontarget to make sure necessary files are > created on target. > > Signed-off-by: Lei Maohui <[email protected]> > --- > ...ile-should-be-excuted-in-target-envi.patch | 28 +++++++++++++++++++ > meta/recipes-support/gnutls/gnutls_3.7.5.bb | 24 +++++++++++++++- > 2 files changed, 51 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch > > diff --git > a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch > > b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch > new file mode 100644 > index 0000000000..7a0e2fd474 > --- /dev/null > +++ > b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch > @@ -0,0 +1,28 @@ > +From b729a356538d499fe25e82bfc78ea663bdaca0a8 Mon Sep 17 00:00:00 2001 > +From: Lei Maohui <[email protected]> > +Date: Mon, 23 May 2022 10:44:43 +0900 > +Subject: [PATCH] Creating .hmac file should be excuted in target environment, > + so deleted it from build process. > + > +Upstream-Status: Inappropriate [Embedded] > +Signed-off-by: Lei Maohui <[email protected]> > +--- > + lib/Makefile.am | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/lib/Makefile.am b/lib/Makefile.am > +index 0b43ef9..cf263f0 100644 > +--- a/lib/Makefile.am > ++++ b/lib/Makefile.am > +@@ -206,8 +206,7 @@ hmac_files = .libs/.gnutls.hmac > + > + all-local: $(hmac_files) > + > +-.libs/.gnutls.hmac: libgnutls.la fipshmac > +- $(AM_V_GEN) $(builddir)/fipshmac > $@-t && mv $@-t $@ > ++.libs/.gnutls.hmac: > + > + CLEANFILES = $(hmac_files) > + endif > +-- > +2.25.1 > diff --git a/meta/recipes-support/gnutls/gnutls_3.7.5.bb > b/meta/recipes-support/gnutls/gnutls_3.7.5.bb > index 5feedb7fdc..b796494b8d 100644 > --- a/meta/recipes-support/gnutls/gnutls_3.7.5.bb > +++ b/meta/recipes-support/gnutls/gnutls_3.7.5.bb > @@ -21,6 +21,7 @@ SHRT_VER = > "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" > > SRC_URI = > "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ > file://arm_eabi.patch \ > + > file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ > " > > SRC_URI[sha256sum] = > "1f85028475b4f255cc5b480af0c37e61eab43024c1507c8b75d6be506c0553ad" > @@ -36,6 +37,7 @@ PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" > PACKAGECONFIG[libtasn1] = > "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" > PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" > PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" > +PACKAGECONFIG[fips] = "--enable-fips140-mode > --with-libdl-prefix=${STAGING_BASELIBDIR}" > > EXTRA_OECONF = " \ > --enable-doc \ > @@ -59,10 +61,30 @@ do_configure:prepend() { > done > } > > -PACKAGES =+ "${PN}-openssl ${PN}-xx" > +do_install:append:class-target() { > + if ${@bb.utils.contains('PACKAGECONFIG', 'fips', 'true', 'false', > d)}; then > + install -d ${D}${bindir}/bin > + install -m 0755 ${B}/lib/.libs/fipshmac ${D}/${bindir}/ > + fi > +} > + > +PACKAGES =+ "${PN}-openssl ${PN}-xx ${PN}-fips" > > FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" > FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" > FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" > +FILES:${PN}-fips = "${bindir}/fipshmac" > > BBCLASSEXTEND = "native nativesdk" > + > +pkg_postinst_ontarget:${PN}-fips () { > + if test -x ${bindir}/fipshmac > + then > + mkdir ${sysconfdir}/gnutls > + touch ${sysconfdir}/gnutls/config > + ${bindir}/fipshmac ${libdir}/libgnutls.so.30.*.* > > ${libdir}/.libgnutls.so.30.hmac > + ${bindir}/fipshmac ${libdir}/libnettle.so.8.* > > ${libdir}/.libnettle.so.8.hmac > + ${bindir}/fipshmac ${libdir}/libgmp.so.10.*.* > > ${libdir}/.libgmp.so.10.hmac > + ${bindir}/fipshmac ${libdir}/libhogweed.so.6.* > > ${libdir}/.libhogweed.so.6.hmac > + fi > +} > -- > 2.25.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165998): https://lists.openembedded.org/g/openembedded-core/message/165998 Mute This Topic: https://lists.openembedded.org/mt/91283368/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
