[cowdancer] 02/11: qemubuilder.c: Build inside /build

[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 8c1cf669afee908f463f6466e1e07afa8e8257c6
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Sun May 1 22:35:33 2016 +0100

    qemubuilder.c: Build inside /build
---
 qemubuilder.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/qemubuilder.c b/qemubuilder.c
index a53d4fe..faa5e8a 100755
--- a/qemubuilder.c
+++ b/qemubuilder.c
@@ -40,9 +40,8 @@
 #include "qemuarch.h"
 #include "file.h"
 
-#define BUILDDIR "/tmp/buildd"
-#define MOUNTPOINT "/var/cache/pbuilder/pbuilder-mnt"
-#define CHROOT_HOOKDIR MOUNTPOINT"/hooks"
+#define BUILDDIR "/build"
+#define CHROOT_HOOKDIR BUILDDIR"/hooks"
 
 #define EXECUTE_HOOKS_INDENT(indent, prefix) \
 indent"if [ -d \""CHROOT_HOOKDIR"\" ]; then\n" \
@@ -57,8 +56,7 @@ indent"                ;;\n" \
 indent"            *)\n" \
 indent"                if [ -x \"$fn\" ]; then\n" \
 indent"                    echo \"I: user script $fn starting\"\n" \
-indent"                    BUILDDIR=\""BUILDDIR"\" \\\n" \
-indent"                        \""CHROOT_HOOKDIR"/$(basename \"$fn\")\"\n" \
+indent"                    \""CHROOT_HOOKDIR"/$(basename \"$fn\")\"\n" \
 indent"                    echo \"I: user script $fn finished\"\n" \
 indent"                else\n" \
 indent"                    if [ -f \"$fn\" ]; then\n" \
@@ -241,7 +239,7 @@ static int copy_file_contents_in_temp(FILE *f,
   fprintf(f,
 	  "echo \"I: copying %s%s%s from temporary location\"\n"
 	  "mkdir -p %s\n"
-	  "cp $PBUILDER_MOUNTPOINT/%s %s%s%s || echo \"E: Copy failed\"\n",
+	  "cp $BUILDDIR/%s %s%s%s || echo \"E: Copy failed\"\n",
 	  targetdir, sep, targetname,
 	  targetdir,
 	  tempname,
@@ -681,10 +679,10 @@ static void write_first_stage(FILE *f, const struct pbuilderconfig* pc)
 	  "chmod 01777 /dev/shm\n"
 	  "mount -t tmpfs tmpfs /dev/shm\n"
 	  "ln -s /proc/mounts /etc/mtab\n"
-	  "export PBUILDER_MOUNTPOINT="MOUNTPOINT"\n"
-	  "mkdir -p $PBUILDER_MOUNTPOINT\n"
-	  "mount -n -t ext3 /dev/%sb $PBUILDER_MOUNTPOINT \n"
-	  "$PBUILDER_MOUNTPOINT/input/pbuilder-run \n",
+	  "export BUILDDIR="BUILDDIR"\n"
+	  "mkdir -p $BUILDDIR\n"
+	  "mount -n -t ext3 /dev/%sb $BUILDDIR \n"
+	  "$BUILDDIR/input/pbuilder-run \n",
 	  qemu_arch_diskdevice(pc)
 	  );
 }
@@ -760,7 +758,7 @@ static int run_second_stage_script
 	  "dhclient $IFNAME\n"
 	  "mkdir -p \""BUILDDIR"\"\n"
 	  "%s\n"
-	  "$PBUILDER_MOUNTPOINT/input/run-copyfiles\n"
+	  "$BUILDDIR/input/run-copyfiles\n"
 	  "hostname pbuilder-$(cat /etc/hostname)\n"
 	  "%s\n"
 	  //TODO: I can mount /var/cache/apt/archives from some scratch space to not need this:
@@ -1056,7 +1054,7 @@ int cpbuilder_create(const struct pbuilderconfig* pc)
 	  "mount -n devpts /dev/pts -t devpts\n"
 	  "dhclient eth0\n"
 	  "%s\n"
-	  "$PBUILDER_MOUNTPOINT/input/run-copyfiles\n"
+	  "$BUILDDIR/input/run-copyfiles\n"
 	  "hostname pbuilder-$(cat /etc/hostname)\n"
 	  //TODO: installaptlines
 	  "echo '%s' > /etc/apt/sources.list.d/other.list\n"
@@ -1153,13 +1151,13 @@ int cpbuilder_build(const struct pbuilderconfig* pc, const char* dscfile)
 
   asprintf(&commandline,
 	   EXECUTE_HOOKS("D")
-	   "ALLOWUNTRUSTED=%s /usr/lib/pbuilder/pbuilder-satisfydepends --control $PBUILDER_MOUNTPOINT/*.dsc --internal-chrootexec 'chroot . ' %s \n"
+	   "ALLOWUNTRUSTED=%s /usr/lib/pbuilder/pbuilder-satisfydepends --control $BUILDDIR/*.dsc --internal-chrootexec 'chroot . ' %s \n"
 	   "apt-get install %s -y %s\n"
-	   "cd $PBUILDER_MOUNTPOINT; /usr/bin/dpkg-source -x $(basename %s) \n"
+	   "cd $BUILDDIR; /usr/bin/dpkg-source -x $(basename %s) \n"
 	   "echo ' -> Building the package'\n"
 	   EXECUTE_HOOKS("A")
 	   "if ! (\n"
-	   "    cd $PBUILDER_MOUNTPOINT/*-*/\n"
+	   "    cd $BUILDDIR/*-*/\n"
 	   "    dpkg-buildpackage -us -uc %s\n"
 	   "); then\n"
 	   EXECUTE_HOOKS_INDENT("    ", "C")
@@ -1240,7 +1238,7 @@ int cpbuilder_execute(const struct pbuilderconfig* pc, char** av)
   asprintf(&runcommandline,
 	   EXECUTE_HOOKS("H")
 	   EXECUTE_HOOKS("F")
-	   "sh $PBUILDER_MOUNTPOINT/input/runscript");
+	   "sh $BUILDDIR/input/runscript");
   ret=run_second_stage_script(pc->save_after_login,
 			      0,
 			      runcommandline,

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