Improve submodules management

2 files changed, 5 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15bebb1e8485..9e6d5d18e312 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Mar  2 08:40:04 UTC 2016
+# Wed Mar  2 16:06:16 UTC 2016
 pkgbase = darling-git
 	pkgdesc = A Darwin/OS X emulation layer for Linux
 	pkgver = 1195.2ad7ce5
@@ -27,94 +27,6 @@ pkgbase = darling-git
 	depends = bzip2
 	depends = libxslt
 	source = git+https://github.com/darlinghq/darling.git
-	source = git+https://github.com/darlinghq/darling-adv_cmds.git
-	source = git+https://github.com/darlinghq/darling-apr.git
-	source = git+https://github.com/darlinghq/darling-appkit.git
-	source = git+https://github.com/darlinghq/darling-awk.git
-	source = git+https://github.com/darlinghq/darling-bash.git
-	source = git+https://github.com/darlinghq/darling-bzip2.git
-	source = git+https://github.com/darlinghq/darling-cfnetwork.git
-	source = git+https://github.com/darlinghq/darling-compiler-rt.git
-	source = git+https://github.com/darlinghq/darling-corefoundation.git
-	source = git+https://github.com/darlinghq/darling-coretls.git
-	source = git+https://github.com/darlinghq/darling-curl.git
-	source = git+https://github.com/darlinghq/darling-dmg.git
-	source = git+https://github.com/darlinghq/darling-expat.git
-	source = git+https://github.com/darlinghq/darling-file.git
-	source = git+https://github.com/darlinghq/darling-file_cmds.git
-	source = git+https://github.com/darlinghq/darling-foundation.git
-	source = git+https://github.com/darlinghq/darling-gnudiff.git
-	source = git+https://github.com/darlinghq/darling-gnutar.git
-	source = git+https://github.com/darlinghq/darling-gpatch.git
-	source = git+https://github.com/darlinghq/darling-grep.git
-	source = git+https://github.com/darlinghq/darling-icu.git
-	source = git+https://github.com/darlinghq/darling-installer.git
-	source = git+https://github.com/darlinghq/darling-less.git
-	source = git+https://github.com/darlinghq/darling-libarchive.git
-	source = git+https://github.com/darlinghq/darling-libauto.git
-	source = git+https://github.com/darlinghq/darling-libcxx.git
-	source = git+https://github.com/darlinghq/darling-libcxxabi.git
-	source = git+https://github.com/darlinghq/darling-libdispatch.git
-	source = git+https://github.com/darlinghq/darling-libkqueue.git
-	source = git+https://github.com/darlinghq/darling-liblzma.git
-	source = git+https://github.com/darlinghq/darling-libobjc2.git
-	source = git+https://github.com/darlinghq/darling-libxml2.git
-	source = git+https://github.com/darlinghq/darling-libxpc.git
-	source = git+https://github.com/darlinghq/darling-libxslt.git
-	source = git+https://github.com/darlinghq/darling-nano.git
-	source = git+https://github.com/darlinghq/darling-openssl.git
-	source = git+https://github.com/darlinghq/darling-pcre.git
-	source = git+https://github.com/darlinghq/darling-python.git
-	source = git+https://github.com/darlinghq/darling-security.git
-	source = git+https://github.com/darlinghq/darling-shell_cmds.git
-	source = git+https://github.com/darlinghq/darling-sqlite.git
-	source = git+https://github.com/darlinghq/darling-text_cmds.git
-	source = git+https://github.com/darlinghq/darling-zip.git
-	source = git+https://github.com/darlinghq/darling-zlib.git
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
 	md5sums = SKIP
 	depends_x86_64 = lib32-systemd
 	depends_x86_64 = lib32-libffi
diff --git a/PKGBUILD b/PKGBUILD
index 44af00dd7605..da781eb99a8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,56 +13,8 @@ depends=('xz' 'fuse' 'libxml2' 'icu' 'openssl' 'lbzip2' 'zlib' 'libunwind' 'curl
 depends_x86_64=('lib32-systemd' 'lib32-libffi' 'lib32-bzip2' 'lib32-libxslt')
 makedepends=('git' 'clang' 'bison' 'flex' "$_kernel-headers")
 install=$pkgname.install
-source=('git+https://github.com/darlinghq/darling.git'
-	'git+https://github.com/darlinghq/darling-adv_cmds.git'
-	'git+https://github.com/darlinghq/darling-apr.git'
-	'git+https://github.com/darlinghq/darling-appkit.git'
-	'git+https://github.com/darlinghq/darling-awk.git'
-	'git+https://github.com/darlinghq/darling-bash.git'
-	'git+https://github.com/darlinghq/darling-bzip2.git'
-	'git+https://github.com/darlinghq/darling-cfnetwork.git'
-	'git+https://github.com/darlinghq/darling-compiler-rt.git'
-	'git+https://github.com/darlinghq/darling-corefoundation.git'
-	'git+https://github.com/darlinghq/darling-coretls.git'
-	'git+https://github.com/darlinghq/darling-curl.git'
-	'git+https://github.com/darlinghq/darling-dmg.git'
-	'git+https://github.com/darlinghq/darling-expat.git'
-	'git+https://github.com/darlinghq/darling-file.git'
-	'git+https://github.com/darlinghq/darling-file_cmds.git'
-	'git+https://github.com/darlinghq/darling-foundation.git'
-	'git+https://github.com/darlinghq/darling-gnudiff.git'
-	'git+https://github.com/darlinghq/darling-gnutar.git'
-	'git+https://github.com/darlinghq/darling-gpatch.git'
-	'git+https://github.com/darlinghq/darling-grep.git'
-	'git+https://github.com/darlinghq/darling-icu.git'
-	'git+https://github.com/darlinghq/darling-installer.git'
-	'git+https://github.com/darlinghq/darling-less.git'
-	'git+https://github.com/darlinghq/darling-libarchive.git'
-	'git+https://github.com/darlinghq/darling-libauto.git'
-	'git+https://github.com/darlinghq/darling-libcxx.git'
-	'git+https://github.com/darlinghq/darling-libcxxabi.git'
-	'git+https://github.com/darlinghq/darling-libdispatch.git'
-	'git+https://github.com/darlinghq/darling-libkqueue.git'
-	'git+https://github.com/darlinghq/darling-liblzma.git'
-	'git+https://github.com/darlinghq/darling-libobjc2.git'
-	'git+https://github.com/darlinghq/darling-libxml2.git'
-	'git+https://github.com/darlinghq/darling-libxpc.git'
-	'git+https://github.com/darlinghq/darling-libxslt.git'
-	'git+https://github.com/darlinghq/darling-nano.git'
-	'git+https://github.com/darlinghq/darling-openssl.git'
-	'git+https://github.com/darlinghq/darling-pcre.git'
-	'git+https://github.com/darlinghq/darling-python.git'
-	'git+https://github.com/darlinghq/darling-security.git'
-	'git+https://github.com/darlinghq/darling-shell_cmds.git'
-	'git+https://github.com/darlinghq/darling-sqlite.git'
-	'git+https://github.com/darlinghq/darling-text_cmds.git'
-	'git+https://github.com/darlinghq/darling-zip.git'
-	'git+https://github.com/darlinghq/darling-zlib.git')
-md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+source=('git+https://github.com/darlinghq/darling.git')
+md5sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/$_gitname"
@@ -73,12 +25,8 @@ prepare() {
 	cd "$srcdir/$_gitname"
 
 	msg2 "Initialize git submodules..."
-	git submodule init
-	for submodule in $(grep submodule ".gitmodules" | awk -F '"' '{ print $2 }'); do
-		path=$(git config --list | grep $submodule | head -n1)
-		git config submodule.$submodule.url "$srcdir/$(basename $path .git)"
-		git submodule update $submodule
-	done
+	sed -i 's|url = ../|url = https://github.com/darlinghq/|g' .gitmodules
+	git submodule update --init --recursive
 
 	msg2 "Make build directories..."
 	mkdir -pv "build/"{i386,x86-64}