Fails to patch RROR: ostree-2019.5-r0 do_patch: Command Error: 'quilt --quiltrc /mnt/b/yoe/build/tmp/work/aarch64-yoe-linux-musl/ostree/2019.5-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch patching file Makefile-ostree.am patching file configure.ac Hunk #1 FAILED at 192. 1 out of 1 hunk FAILED -- rejects in file configure.ac Patch 0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch does not apply (enforce with -f)
On Thu, Oct 31, 2019 at 10:57 PM Alex Kiernan <[email protected]> wrote: > > Signed-off-by: Alex Kiernan <[email protected]> > --- > > .../ostree/{ostree_2019.4.bb => ostree_2019.5.bb} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta-oe/recipes-extended/ostree/{ostree_2019.4.bb => > ostree_2019.5.bb} (99%) > > diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.4.bb > b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb > similarity index 99% > rename from meta-oe/recipes-extended/ostree/ostree_2019.4.bb > rename to meta-oe/recipes-extended/ostree/ostree_2019.5.bb > index 505c9fcccc59..efe1b3616f23 100644 > --- a/meta-oe/recipes-extended/ostree/ostree_2019.4.bb > +++ b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb > @@ -28,7 +28,7 @@ SRC_URI = " \ > file://0001-Always-enable-trivial-httpd-for-tests.patch \ > file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ > " > -SRCREV = "9d39e7d91e8497987cad69a3fbed5c5fc91eebdc" > +SRCREV = "980ca07b03b3aa7e0012729dd6c84b0878775d93" > > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" > > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
