Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Baptiste Jonglez]

On Sat, Feb 27, 2016 at 01:32:52AM +, Karl Palsson wrote:
> This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2,
> which was released September 2012.

I find this annoying, since Debian wheezy only has git 1.7.10.4.
Actually, sometimes I use a squeeze box for building, and it works
perfectly fine.

> Signed-off-by: Darik Horn 
> Signed-off-by: Karl Palsson 
> ---
>  include/download.mk | 5 +++--
>  include/prereq-build.mk | 4 ++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> 
> Note: this does NOT help with CONFIG_SRC_TREE_OVERRIDE=y!
> 
> diff --git a/include/download.mk b/include/download.mk
> index 8619734..a118aad 100644
> --- a/include/download.mk
> +++ b/include/download.mk
> @@ -90,8 +90,9 @@ define DownloadMethod/git
>   cd $(TMP_DIR)/dl && \
>   rm -rf $(SUBDIR) && \
>   [ \! -d $(SUBDIR) ] && \
> - git clone $(URL) $(SUBDIR) --recursive && \
> - (cd $(SUBDIR) && git checkout $(VERSION) && git submodule 
> update) && \
> + git clone $(URL) $(SUBDIR) && \
> + (cd $(SUBDIR) && git checkout $(VERSION) && \
> + git submodule update --init --recursive) && \
>   echo "Packing checkout..." && \
>   rm -rf $(SUBDIR)/.git && \
>   $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
> diff --git a/include/prereq-build.mk b/include/prereq-build.mk
> index bcb2103..23a5b93 100644
> --- a/include/prereq-build.mk
> +++ b/include/prereq-build.mk
> @@ -154,8 +154,8 @@ $(eval $(call SetupHostCommand,python,Please install 
> Python 2.x, \
>  $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
>   svn --version | grep Subversion))
>  
> -$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \
> - git clone 2>&1 | grep -- --recursive))
> +$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 
> 1.7.12.2, \
> + git submodule update --help 2>&1 | grep -- --recursive))
>  
>  $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
>   file --version 2>&1 | grep file))


signature.asc
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Karl Palsson]

Move the `--recursive` switch from `git clone` to `git submodule`
so that submodules are cloned for upstream branches where the
PKG_SOURCE_VERSION commit-ish has a different .gitmodules
configuration than the repository default.

This is, for example, required when the master branch for a source
package does not use submodules, but its topic branch for OpenWRT
does.

This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2,
which was released September 2012.

Signed-off-by: Darik Horn 
Signed-off-by: Karl Palsson 
---
 include/download.mk | 5 +++--
 include/prereq-build.mk | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)


Note: this does NOT help with CONFIG_SRC_TREE_OVERRIDE=y!

diff --git a/include/download.mk b/include/download.mk
index 8619734..a118aad 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -90,8 +90,9 @@ define DownloadMethod/git
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
-   git clone $(URL) $(SUBDIR) --recursive && \
-   (cd $(SUBDIR) && git checkout $(VERSION) && git submodule 
update) && \
+   git clone $(URL) $(SUBDIR) && \
+   (cd $(SUBDIR) && git checkout $(VERSION) && \
+   git submodule update --init --recursive) && \
echo "Packing checkout..." && \
rm -rf $(SUBDIR)/.git && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index bcb2103..23a5b93 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -154,8 +154,8 @@ $(eval $(call SetupHostCommand,python,Please install Python 
2.x, \
 $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
svn --version | grep Subversion))
 
-$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \
-   git clone 2>&1 | grep -- --recursive))
+$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
+   git submodule update --help 2>&1 | grep -- --recursive))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
file --version 2>&1 | grep file))
-- 
1.9.3
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Darik Horn]

On Fri, Jul 17, 2015 at 3:43 AM, Gert Doering g...@greenie.muc.de wrote:

 git send-email is what you really want.

Okay, I will get email access on my development machines.  Thanks for
looking at the patch nevertheless.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Gert Doering]

Hi,

On Thu, Jul 16, 2015 at 09:12:02PM -0400, Darik Horn wrote:
  Patch is badly whitespace mangled and does not apply.
 
 Okay, I've rebased the this patch to HEAD and am resending it with a
 different MUA.  (First Gmail, now Outlook.)

git send-email is what you really want.

gert
-- 
USENET is *not* the non-clickable part of WWW!
   //www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025g...@net.informatik.tu-muenchen.de


pgpgX6iDB49Qz.pgp
Description: PGP signature
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Darik Horn]

 -Original Message-
 From: Felix Fietkau [mailto:n...@openwrt.org] 
 Sent: Wednesday, July 15, 2015 04:09
 To: Darik Horn dajh...@vanadac.com; openwrt-devel@lists.openwrt.org
 Subject: Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule
handling for packages
 
 Patch is badly whitespace mangled and does not apply.

Okay, I've rebased the this patch to HEAD and am resending it with a
different MUA.  (First Gmail, now Outlook.)

The topic branch is also available at:

* https://github.com/dajhorn/openwrt/tree/patchwork_472796 
$ git pull https://github.com/dajhorn/openwrt.git patchwork_472796


From 5a3fd904c3c03ac5f4c88de2d409bb39120c86c6 Mon Sep 17 00:00:00 2001
From: Darik Horn dajh...@vanadac.com
Date: Fri, 15 May 2015 09:47:34 -0400
Subject: [PATCH] buildroot: improve git submodule handling for packages

Move the `--recursive` switch from `git clone` to `git submodule`
so that submodules are cloned for upstream branches where the
PKG_SOURCE_VERSION commit-ish has a different .gitmodules
configuration than the repository default.

This is, for example, required when the master branch for a source
package does not use submodules, but its topic branch for OpenWRT
does.

This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2,
which was released September 2012.

Signed-off-by: Darik Horn dajh...@vanadac.com
---
 include/download.mk | 5 +++--
 include/prereq-build.mk | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/download.mk b/include/download.mk
index adaa2e6..d593344 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -88,8 +88,9 @@ define DownloadMethod/git
cd $(TMP_DIR)/dl  \
rm -rf $(SUBDIR)  \
[ \! -d $(SUBDIR) ]  \
-   git clone $(URL) $(SUBDIR) --recursive  \
-   (cd $(SUBDIR)  git checkout $(VERSION)  git submodule
update)  \
+   git clone $(URL) $(SUBDIR)  \
+   (cd $(SUBDIR)  git checkout $(VERSION)  \
+ git submodule update --init --recursive)  \
echo Packing checkout...  \
rm -rf $(SUBDIR)/.git  \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR))  \
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 211201a..c06adaf 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -144,8 +144,8 @@ $(eval $(call SetupHostCommand,python,Please install
Python 2.x, \
 $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
svn --version | grep Subversion))
 
-$(eval $(call SetupHostCommand,git,Please install Git (git-core) = 1.6.5,
\
-   git clone 21 | grep -- --recursive))
+$(eval $(call SetupHostCommand,git,Please install Git (git-core) =
1.7.12.2, \
+   git submodule update --help 21 | grep -- --recursive))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
file --version 21 | grep file))
-- 
1.9.1


0001-buildroot-improve-git-submodule-handling-for-package.patch
Description: Binary data
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Felix Fietkau]

On 2015-05-15 16:25, Darik Horn wrote:
 Move the `--recursive` switch from `git clone` to `git submodule`
 so that submodules are cloned for upstream branches where the
 PKG_SOURCE_VERSION commit-ish has a different .gitmodules
 configuration than the repository default.
 
 This is, for example, required when the master branch for a source
 package does not use submodules, but its topic branch for OpenWRT
 does.
 
 This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2,
 which was released September 2012.
 
 Signed-off-by: Darik Horn dajh...@vanadac.com
 ---
Patch is badly whitespace mangled and does not apply.

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages

[Darik Horn]

Move the `--recursive` switch from `git clone` to `git submodule`
so that submodules are cloned for upstream branches where the
PKG_SOURCE_VERSION commit-ish has a different .gitmodules
configuration than the repository default.

This is, for example, required when the master branch for a source
package does not use submodules, but its topic branch for OpenWRT
does.

This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2,
which was released September 2012.

Signed-off-by: Darik Horn dajh...@vanadac.com
---
 include/download.mk | 5 +++--
 include/prereq-build.mk | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/download.mk b/include/download.mk
index adaa2e6..d593344 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -88,8 +88,9 @@ define DownloadMethod/git
  cd $(TMP_DIR)/dl  \
  rm -rf $(SUBDIR)  \
  [ \! -d $(SUBDIR) ]  \
- git clone $(URL) $(SUBDIR) --recursive  \
- (cd $(SUBDIR)  git checkout $(VERSION)  git submodule update)  \
+ git clone $(URL) $(SUBDIR)  \
+ (cd $(SUBDIR)  git checkout $(VERSION)  \
+  git submodule update --init --recursive)  \
  echo Packing checkout...  \
  rm -rf $(SUBDIR)/.git  \
  $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR))  \
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 211201a..c06adaf 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -144,8 +144,8 @@ $(eval $(call SetupHostCommand,python,Please
install Python 2.x, \
 $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
  svn --version | grep Subversion))

-$(eval $(call SetupHostCommand,git,Please install Git (git-core) = 1.6.5, \
- git clone 21 | grep -- --recursive))
+$(eval $(call SetupHostCommand,git,Please install Git (git-core) = 1.7.12.2, \
+ git submodule update --help 21 | grep -- --recursive))

 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
  file --version 21 | grep file))
-- 
1.9.1


0001-buildroot-improve-git-submodule-handling-for-package.patch
Description: Binary data
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel