From 7a26a5dbf9de6b5c57d16307dc7e4c2201739e2e Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 14 Mar 2013 13:40:10 +0000 Subject: [PATCH 1/3] fix path in RootCommands srclib --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9e7b2f9b..286491d1 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1323,7 +1323,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): vcs = getvcs('git', 'https://github.com/dschuermann/root-commands.git', sdir, sdk_path) vcs.gotorevision(ref) - libdir = os.path.join(sdir, 'RootCommands Library') + libdir = os.path.join(sdir, 'RootCommands-Library') if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), 'update', 'project', '-p', libdir]) != 0: From 2ec7334048ec9a784c67db84860919fbeb302116 Mon Sep 17 00:00:00 2001 From: David Black Date: Fri, 15 Mar 2013 15:29:29 +0000 Subject: [PATCH 2/3] iptables srclib --- fdroidserver/common.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 286491d1..b2df1111 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1586,6 +1586,13 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): vcs.gotorevision(ref) return sdir + if name == 'iptables': + sdir = os.path.join(extlib_dir, 'iptables') + vcs = getvcs('git', + 'https://android.googlesource.com/platform/external/iptables', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + raise BuildException('Unknown srclib ' + name) From cbfa2d35a4eb60f569a5d9aabf2607299fa837cd Mon Sep 17 00:00:00 2001 From: David Black Date: Fri, 15 Mar 2013 15:41:47 +0000 Subject: [PATCH 3/3] LockPattern srclib --- fdroidserver/common.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index b2df1111..9c045293 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1593,6 +1593,20 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): vcs.gotorevision(ref) return sdir + if name == 'LockPattern': + sdir = os.path.join(extlib_dir, 'LockPattern') + vcs = getvcs('hg', + 'https://code.google.com/p/android-lockpattern', sdir, sdk_path) + vcs.gotorevision(ref) + libdir = os.path.join(sdir, 'code') + if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), + 'update', 'project', '-p', + libdir]) != 0: + raise BuildException('Error updating LockPattern project') + if basepath: + return sdir + return libdir + raise BuildException('Unknown srclib ' + name)