Re: [oe] [PATCH] libxml: Deleted patch that is already applied in source tarball
Dear Joel,
Am Mittwoch, den 06.07.2011, 20:41 -0500 schrieb Joel A Fernandes:
Sorry I am unable to reply to your email on libxml2 as I'm a
digest-mode subscriber so I have started another thread. Could I be
kept on the CC-list by replying-to-all?
I will try to remember that. By the way, you do not have to put me into
CC as I am reading the list. ;-)
My build configuration is:
DISTRO=angstrom-2010.x
MACHINE=beagleboard
git branch: org.openembedded.dev
You can use master as this name is just there for historical reasons.
Uncompressing the sources from the downloaded archive
libxml2-2.7.8.tar.gz shows that the patch in
recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch
has already been applied to xpath.c
Still it is strange, that it does not complain on my end.
Could your build configuration be pulling a different recipe?
It does not look like it.
$ bitbake -c patch libxml2
NOTE: Out of date cache found, rebuilding...
[…]
Parsing recipes: 100% |#| Time:
00:01:29
Parsing of 7201 .bb files complete (0 cached, 7201 parsed). 7857
targets, 309 skipped, 0 masked, 0 errors.
Build Configuration:
BB_VERSION= 1.12.0
METADATA_BRANCH = master
METADATA_REVISION = 529b445
TARGET_ARCH = arm
TARGET_OS = linux-gnueabi
MACHINE = beagleboard
DISTRO= angstrom
DISTRO_VERSION= v2011.07
TARGET_FPU= hard
NOTE: Resolving any missing task queue dependencies
NOTE: Preparing runqueue
NOTE: Executing RunQueue Tasks
NOTE: Removing stamps:
/oe/build-angstrom-next/angstrom-dev/stamps/armv7a-angstrom-linux-gnueabi/libxml2-2.7.8-r9.1.*
NOTE: Running task 10 of 13 (ID: 3,
/oe/openembedded/recipes/libxml/libxml2_2.7.8.bb, do_setscene)
NOTE: package libxml2-2.7.8-r9.1: task do_setscene: Started
NOTE: package libxml2-2.7.8-r9.1: task do_setscene: Succeeded
NOTE: Running task 11 of 13 (ID: 2,
/oe/openembedded/recipes/libxml/libxml2_2.7.8.bb, do_fetch)
NOTE: package libxml2-2.7.8-r9.1: task do_fetch: Started
NOTE: package libxml2-2.7.8-r9.1: task do_fetch: Succeeded
NOTE: Running task 12 of 13 (ID: 0,
/oe/openembedded/recipes/libxml/libxml2_2.7.8.bb, do_unpack)
NOTE: package libxml2-2.7.8-r9.1: task do_unpack: Started
NOTE: package libxml2-2.7.8-r9.1: task do_unpack: Succeeded
NOTE: Running task 13 of 13 (ID: 1,
/oe/openembedded/recipes/libxml/libxml2_2.7.8.bb, do_patch)
NOTE: package libxml2-2.7.8-r9.1: task do_patch: Started
NOTE: package libxml2-2.7.8-r9.1: task do_patch: Succeeded
NOTE: Tasks Summary: Attempted 13 tasks of which 9 didn't need to be
rerun and 0 failed.
Here is my check.
$ md5sum libxml2-2.7.8.tar.gz
8127a65e8c3b08856093099b52599c86 libxml2-2.7.8.tar.gz
$ tar xvf libxml2-2.7.8.tar.gz
[…]
$ zless -N libxml2-2.7.8/xpath.c
3575 } else if (cur-nodeNr == cur-nodeMax) {
3576 xmlNodePtr *temp;
3577
3578 cur-nodeMax *= 2;
3579 temp = (xmlNodePtr *) xmlRealloc(cur-nodeTab,
cur-nodeMax *
3580 sizeof(xmlNodePtr));
3581 if (temp == NULL) {
3582 xmlXPathErrMemory(NULL, growing nodeset\n);
3583 return;
3584 }
3585 cur-nodeTab = temp;
3586 }
Please remember that the sources are patched in the build directory
after the task patch has been executed.
Thanks,
Paul
signature.asc
Description: This is a digitally signed message part
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] libxml: Deleted patch that is already applied in source tarball
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.j...@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
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..000
---
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 veill...@redhat.com
-Date: Mon, 15 Nov 2010 11:06:29 +
-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 \
--
1.7.0.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] libxml: Deleted patch that is already applied in source tarball
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.j...@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 signature.asc Description: This is a digitally signed message part ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
