From aeb26bfef509e1a435a072339c4f9496b440660d Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 2 Feb 2017 14:34:26 +0200 Subject: ostree: add patch/workaround for gtkdocize build issue Poky 2.2 uses gtk-doc (instead of stub in previous branches). This causes build break in ostree's autogen.sh script as gtkdocize script uses wrong docdir variable. Pass docdir and srcdir variables to gtkdocize in ostree's autogen.sh. Change-Id: Ie500ad6d9b9abfd2b39829774760ec2fc5097c60 Reviewed-by: Samuli Piippo --- recipes/ostree/ostree.bb | 1 + ...around-gtkdocize-configure-issue-in-autog.patch | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index 6a4323d..267289a 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb @@ -45,6 +45,7 @@ SRC_URI = " \ file://Create-firmware-convenience-symlinks.patch \ file://Print-pull-progress-also-when-not-on-console.patch \ file://Workaround-the-SIGCHLD-handler-issue.patch \ + file://workaround-gtkdocize-configure-issue-in-autog.patch \ " SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" diff --git a/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch b/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch new file mode 100644 index 0000000..5f19007 --- /dev/null +++ b/recipes/ostree/ostree/workaround-gtkdocize-configure-issue-in-autog.patch @@ -0,0 +1,26 @@ +From 0b6711e10d36060d80962472c892c60e8a403422 Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff +Date: Thu, 2 Feb 2017 13:38:54 +0200 +Subject: [PATCH] ostree: workaround gtkdocize configure issue in autogen.sh + +Building meta-boot2qt morty branch content with poky 2.2.1 causes +build break in ostree autogen.sh. Called gtkdocize script uses wrong +docdir thus causing error trying to remove gtk-doc.make in wrong +location +--- + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 0f32089..f473fdc 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -25,7 +25,7 @@ EXTRA_DIST = + CLEANFILES = + EOF + else +- gtkdocize ++ gtkdocize --docdir $srcdir --srcdir $srcdir + fi + + cd $olddir -- cgit v1.2.3-54-g00ecf