summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-31 10:15:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-02 17:55:01 +0000
commit32121906e704952fe122834c142da45012af40e8 (patch)
treed1e16c3236a21214100e4d0dd8968b274ce20538 /meta
parentadfa6c40dadebb18bfd457859300d8c093b007f7 (diff)
downloadpoky-32121906e704952fe122834c142da45012af40e8.tar.gz
subversion: upgrade from 1.6.13 to 1.6 15
Rebased this patch to the newer code modified: subversion/disable-revision-install.patch Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/subversion/subversion/disable-revision-install.patch24
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.6.15.bb (renamed from meta/recipes-devtools/subversion/subversion_1.6.13.bb)6
2 files changed, 21 insertions, 9 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
index a1c60654cb..ad716d05ff 100644
--- a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
+++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
@@ -1,6 +1,8 @@
1--- subversion-1.2.0-r0/Makefile.in.old 2005-07-17 22:28:21.898728312 +0200 1Index: subversion-1.6.15/Makefile.in
2+++ subversion-1.2.0-r0/Makefile.in 2005-07-17 22:30:05.361999504 +0200 2===================================================================
3@@ -260,7 +260,7 @@ 3--- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.000000000 -0800
4+++ subversion-1.6.15/Makefile.in 2011-01-31 10:11:07.358779686 -0800
5@@ -305,7 +305,7 @@
4 clean: external-clean local-clean 6 clean: external-clean local-clean
5 distclean: external-distclean local-distclean 7 distclean: external-distclean local-distclean
6 extraclean: external-extraclean local-extraclean 8 extraclean: external-extraclean local-extraclean
@@ -9,14 +11,24 @@
9 11
10 @INCLUDE_OUTPUTS@ 12 @INCLUDE_OUTPUTS@
11 13
12@@ -320,8 +320,8 @@ 14@@ -363,13 +363,13 @@
13 local-install: @INSTALL_RULES@ 15 local-install: @INSTALL_RULES@
14 16
15 ### HACK!! Find a better way to do this 17 ### HACK!! Find a better way to do this
16-revision-install: 18-revision-install:
17- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt 19- test -d $(DESTDIR)$(includedir)/subversion-1 || \
20- $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
21- (subversion/svnversion/svnversion $(top_srcdir) || \
22- svnversion $(top_srcdir) || \
23- echo "unknown"; \
24- ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
18+#revision-install: 25+#revision-install:
19+# subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt 26+# test -d $(DESTDIR)$(includedir)/subversion-1 || \
27+# $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
28+# (subversion/svnversion/svnversion $(top_srcdir) || \
29+# svnversion $(top_srcdir) || \
30+# echo "unknown"; \
31+# ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
20 32
21 install-static: @INSTALL_STATIC_RULES@ 33 install-static: @INSTALL_STATIC_RULES@
22 34
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.13.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index b535f06a61..de40863cf5 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.13.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -5,15 +5,15 @@ RDEPENDS_${PN} = "neon"
5LICENSE = "Apache BSD" 5LICENSE = "Apache BSD"
6HOMEPAGE = "http://subversion.tigris.org" 6HOMEPAGE = "http://subversion.tigris.org"
7 7
8PR = "r1" 8PR = "r0"
9 9
10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ 10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
11 file://disable-revision-install.patch;patch=1 \ 11 file://disable-revision-install.patch;patch=1 \
12 file://neon-detection.patch;patch=1 \ 12 file://neon-detection.patch;patch=1 \
13 file://libtool2.patch;patch=1" 13 file://libtool2.patch;patch=1"
14 14
15SRC_URI[md5sum] = "7ae1c827689f21cf975804005be30aeb" 15SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
16SRC_URI[sha256sum] = "3a30327bdb04109f369586196ee4a6993cdab2cfa85c3134549f02c229bf0d15" 16SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45"
17 17
18LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" 18LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
19 19