> -----Original Message----- > From: openembedded-core-boun...@lists.openembedded.org <openembedded- > core-boun...@lists.openembedded.org> On Behalf Of Douglas Royds > Sent: den 28 november 2018 05:53 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH 5/8] acl: Use install instead of cp > > Also, hard-tabs begone
Shell-code in OE-Core is expected to be indented using tabs, so don't do this. (For reference, OpenEmbedded uses four spaces to indent shell-code). Additionally, it makes it harder to see what you actually changed. > > Signed-off-by: Douglas Royds <douglas.ro...@taitradio.com> > --- > meta/recipes-support/attr/acl_2.2.52.bb | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/meta/recipes-support/attr/acl_2.2.52.bb > b/meta/recipes-support/attr/acl_2.2.52.bb > index 8b89de9b42..260975d93e 100644 > --- a/meta/recipes-support/attr/acl_2.2.52.bb > +++ b/meta/recipes-support/attr/acl_2.2.52.bb > @@ -27,27 +27,27 @@ require ea-acl.inc > > # avoid RPATH hardcode to staging dir > do_configure_append() { > - sed -i ${S}/config.status -e > s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', > - ${S}/config.status > + sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\', > + ${S}/config.status > } > > # libdir should point to .la > do_install_append() { > - sed -i ${D}${libdir}/libacl.la -e \ > - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', > + sed -i ${D}${libdir}/libacl.la \ > + -e s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\', > } > > inherit ptest > > do_install_ptest() { > - tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) > - mkdir ${D}${PTEST_PATH}/include > - cp ${S}/include/builddefs ${S}/include/buildmacros > ${S}/include/buildrules ${D}${PTEST_PATH}/include/ > - # Remove any build host references > - sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ > - -e 's:${HOSTTOOLS_DIR}/::g' \ > - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ > - -i ${D}${PTEST_PATH}/include/builddefs > + tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) > + install -d ${D}${PTEST_PATH}/include > + install -m 644 ${S}/include/builddefs ${S}/include/buildmacros > ${S}/include/buildrules ${D}${PTEST_PATH}/include/ > + # Remove any build host references > + sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \ > + -e 's:${HOSTTOOLS_DIR}/::g' \ > + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ > + -i ${D}${PTEST_PATH}/include/builddefs > } > > RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle > perl-module-getopt-std perl-module-posix shadow" > -- > 2.17.1 //Peter -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core