git: Add missing patch, apply it only when version >= 1.5.3

Hi,

Git-native fails to build (angstrom-2008.1 on stable branch) because aa patch is missing in the packages/git/files folder.
According to this message [1], the missing patch is not needed for the version being build, but is needed for newer version

Regards,
Chris

[1]
http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-November/006910.html

From 1902d8abb10e718db2e79e9902dc800505745715 Mon Sep 17 00:00:00 2001
From: Christian Gagneraud <[email protected]>
Date: Sun, 16 Aug 2009 18:23:26 +0100
Subject: [stable][patch] Add missing patch, apply it only when version >= 1.5.3

Signed-off-by Christian Gagneraud <[email protected]>

---
 .../files/git-gui-install-mode-arg-spaces.patch    |   32 ++++++++++++++++++++
 packages/git/git-native_1.5.2.3.bb                 |    2 +
 packages/git/git-native_1.5.3.bb                   |    3 ++
 packages/git/git.inc                               |    1 -
 4 files changed, 37 insertions(+), 1 deletions(-)
 create mode 100644 packages/git/files/git-gui-install-mode-arg-spaces.patch

packages/git/files/git-gui-install-mode-arg-spaces.patch new file +32 -0

new file mode 100644
index 0000000..10e4eb2
@@ -0,0 +1,32 @@
+--- git/git-gui/Makefile.orig	2007-12-26 17:16:42.000000000 +1030
++++ git/git-gui/Makefile	2007-12-26 17:17:16.000000000 +1030
+@@ -31,11 +31,11 @@
+ 	INSTALL = install
+ endif
+ 
+-INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
++INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
+ INSTALL_D1 =
+-INSTALL_R0 = $(INSTALL) -m644 # space is required here
++INSTALL_R0 = $(INSTALL) -m 644 # space is required here
+ INSTALL_R1 =
+-INSTALL_X0 = $(INSTALL) -m755 # space is required here
++INSTALL_X0 = $(INSTALL) -m 755 # space is required here
+ INSTALL_X1 =
+ INSTALL_L0 = rm -f # space is required here
+ INSTALL_L1 = && ln # space is required here
+@@ -50,11 +50,11 @@
+ 	QUIET_2DEVNULL = 2>/dev/null
+ 
+ 	INSTALL_D0 = dir=
+-	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
++	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
+ 	INSTALL_R0 = src=
+-	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
++	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
+ 	INSTALL_X0 = src=
+-	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
++	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
+ 
+ 	INSTALL_L0 = dst=
+ 	INSTALL_L1 = && src=

packages/git/git-native_1.5.2.3.bb +2 -0

index 7ddfee0..e701b29 100644
@@ -2,5 +2,7 @@
 inherit native
 require git_${PV}.bb
 
+SRC_URI += "file://git-gui-install-mode-arg-spaces.patch;patch=1"
+
 DEPENDS = "openssl-native curl-native zlib-native expat-native"
 RDEPENDS = ""

packages/git/git-native_1.5.3.bb +3 -0

index 935c773..ea397be 100644
@@ -1,4 +1,7 @@
 require git.inc
+
+SRC_URI += "file://git-gui-install-mode-arg-spaces.patch;patch=1"
+
 inherit native
 DEPENDS = "openssl-native curl-native zlib-native expat-native"
 PR = "r1"

packages/git/git.inc +0 -1

index 3a80c5d..62f2d0c 100644
@@ -4,7 +4,6 @@ LICENSE = "GPL"
 
 SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
            file://autotools.patch;patch=1 \
-           file://git-gui-install-mode-arg-spaces.patch;patch=1 \
 	   "
 S = "${WORKDIR}/git-${PV}"
 

Signature · 7 lines

1.6.2


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Quoted 4 lines · Christian Gagneraud

Hi,

Git-native fails to build (angstrom-2008.1 on stable branch) because aa patch is missing in the packages/git/files folder. According to this message [1], the missing patch is not needed for the version being build, but is needed for newer version

1.6.0.4 is the only version of git available from both .dev and stable branches for quite some time now and it does not require that patch. All the older versions were removed. Please make sure you are looking at the right stable branch - stable/2009:

http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=stable/2009