[cowdancer] 01/06: Add support for pbuilder's --binary-indep

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository cowdancer.

commit 9ed9e0fbfd910b58ab78100e021cf6eff807dabb
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Thu Apr 28 22:57:18 2016 +0100

    Add support for pbuilder's --binary-indep
---
 cowbuilder.c  |  4 ++++
 parameter.c   | 20 +++++++++++++++++++-
 parameter.h   |  1 +
 qemubuilder.c |  4 ++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/cowbuilder.c b/cowbuilder.c
index d0627b5..4581fd8 100755
--- a/cowbuilder.c
+++ b/cowbuilder.c
@@ -350,6 +350,10 @@ int cpbuilder_build(const struct pbuilderconfig* pc, const char* dscfile_)
     {
       PBUILDER_ADD_PARAM("--binary-arch");
     }
+  else if (pc->binary_indep)
+    {
+      PBUILDER_ADD_PARAM("--binary-indep");
+    }
   PBUILDER_ADD_PARAM("--no-targz");
   PBUILDER_ADD_PARAM("--internal-chrootexec");
   PBUILDER_ADD_PARAM(buf_chroot);
diff --git a/parameter.c b/parameter.c
index 491019d..33dd41e 100644
--- a/parameter.c
+++ b/parameter.c
@@ -176,7 +176,16 @@ int load_config_file(const char* config, pbuilderconfig* pc)
 	    }
 	  else if (!strcmp(buf, "BINARY_ARCH"))
 	    {
-	      pc->binary_arch=1;
+	      if (!strcmp(delim, "binary"))
+		{
+		  pc->binary_arch=1;
+		  pc->binary_indep=0;
+		}
+	      else if (!strcmp(delim, "all"))
+		{
+		  pc->binary_arch=0;
+		  pc->binary_indep=1;
+		}
 	    }
 	  else if (!strcmp(buf, "NO_COWDANCER_UPDATE"))
 	    {
@@ -244,6 +253,7 @@ int cpbuilder_dumpconfig(pbuilderconfig* pc)
   DUMPSTR(smp);
   DUMPSTR(debbuildopts);
   DUMPINT(binary_arch);
+  DUMPINT(binary_indep);
   DUMPSTR(http_proxy);
   DUMPSTRARRAY(inputfile);
   DUMPSTRARRAY(outputfile);
@@ -297,6 +307,7 @@ int parse_parameter(int ac, char** av,
     {"smp", required_argument, 0, 0},
     {"debbuildopts", required_argument, 0, 0},
     {"binary-arch", no_argument, 0, 0},
+    {"binary-indep", no_argument, 0, 0},
     {"inputfile", required_argument, 0, 0},
     {"outputfile", required_argument, 0, 0},
     {"architecture", required_argument, 0, 0},
@@ -532,6 +543,13 @@ int parse_parameter(int ac, char** av,
 	  else if (!strcmp(long_options[index_point].name,"binary-arch"))
 	    {
 	      pc.binary_arch=1;
+	      pc.binary_indep=0;
+	      PBUILDER_ADD_PARAM(cmdstr);
+	    }
+	  else if (!strcmp(long_options[index_point].name,"binary-indep"))
+	    {
+	      pc.binary_arch=0;
+	      pc.binary_indep=1;
 	      PBUILDER_ADD_PARAM(cmdstr);
 	    }
 	  else if (!strcmp(long_options[index_point].name,"allow-untrusted"))
diff --git a/parameter.h b/parameter.h
index d70cc47..768a383 100644
--- a/parameter.h
+++ b/parameter.h
@@ -41,6 +41,7 @@ typedef struct pbuilderconfig
   char* othermirror;
   char* debbuildopts;
   int binary_arch;
+  int binary_indep;
   char* http_proxy;
   int allow_untrusted;
 
diff --git a/qemubuilder.c b/qemubuilder.c
index 1a591dc..2140231 100755
--- a/qemubuilder.c
+++ b/qemubuilder.c
@@ -894,6 +894,10 @@ int cpbuilder_build(const struct pbuilderconfig* pc, const char* dscfile)
     asprintf(&debbuildopts_work, "%s -B", pc->debbuildopts);
     debbuildopts=debbuildopts_work;
     buildopt="--binary-arch";
+  } else if (pc->binary_indep) {
+    asprintf(&debbuildopts_work, "%s -A", pc->debbuildopts);
+    debbuildopts=debbuildopts_work;
+    buildopt="--binary-indep";
   } else {
     debbuildopts=pc->debbuildopts;
     buildopt="--binary-all";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/cowdancer.git