Patchwork libxml: Deleted patch that is already applied in source tarball

login
register
mail settings
Submitter Joel A Fernandes
Date July 6, 2011, 10:11 p.m.
Message ID <1309990305-4246-1-git-send-email-agnel.joel@gmail.com>
Download mbox | patch
Permalink /patch/7105/
State Superseded, archived
Headers show

Comments

Joel A Fernandes - July 6, 2011, 10:11 p.m.
This deletes a patch that appears to be already applied to the checked out source and is causing do_patch in libxml2
to fail when bitbaking beagleboard-validation-base-image

Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
---
Not sure if should bump the PR in this case? If not, please ignore this note

 .../0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch |   29 --------------------
 recipes/libxml/libxml2_2.7.8.bb                    |    1 -
 2 files changed, 0 insertions(+), 30 deletions(-)
 delete mode 100644 recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch
Paul Menzel - July 6, 2011, 10:31 p.m.
Am Mittwoch, den 06.07.2011, 17:11 -0500 schrieb Joel A Fernandes:
> This deletes a patch that appears to be already applied to the checked out source and is causing do_patch in libxml2
> to fail when bitbaking beagleboard-validation-base-image

This is strange. I do not get this error with `bitbake -k libxml2`. And
according to `git log recipes/libxml/` the patch has been there from the
beginning so somebody else should have hit this too already. Can you
check your set up and post exactly what branch and build configuration
you are using. It would be great if you could run another build with a
clean build (and download(?)) directory.

What do you mean by »checked out«? The downloaded archive?

> Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
> ---
> Not sure if should bump the PR in this case? If not, please ignore this note

If it really fixes a build error I guess no PR bump would be needed,
since the package content should not change.

[…]


Thanks,

Paul

Patch

diff --git a/recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch b/recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch
deleted file mode 100644
index f94350d..0000000
--- a/recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 15 Nov 2010 11:06:29 +0000
-Subject: Fix a potential memory access error
-
-in case of a previus allocation error
----
-diff --git a/xpath.c b/xpath.c
-index 4d6826d..81e33f6 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3575,13 +3575,13 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- 				      sizeof(xmlNodePtr));
- 	if (temp == NULL) {
- 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
- 	    return;
- 	}
-+        cur->nodeMax *= 2;
- 	cur->nodeTab = temp;
-     }
-     if (val->type == XML_NAMESPACE_DECL) {
---
-cgit v0.8.3.1
diff --git a/recipes/libxml/libxml2_2.7.8.bb b/recipes/libxml/libxml2_2.7.8.bb
index 1a71c2b..7d0c451 100644
--- a/recipes/libxml/libxml2_2.7.8.bb
+++ b/recipes/libxml/libxml2_2.7.8.bb
@@ -1,7 +1,6 @@ 
 require libxml2.inc
 
 SRC_URI += "\
-  file://0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch \
   file://df83c17e5a2646bd923f75e5e507bc80d73c9722.patch \
   file://fec31bcd452e77c10579467ca87a785b41115de6.patch \
   file://00819877651b87842ed878898ba17dba489820f0.patch \