Hi Vincent, On 05/18/2015 11:39 PM, Vincent Cheng wrote: > On Mon, May 18, 2015 at 2:20 PM, Christian Seiler <christian@iwakd.de> wrote: >> Ah, I didn't know that was possible. I'd like to take you up on your >> offer then, since I believe the fix is going to be relatively simple (I >> just need to test it, in fact). I'm going to send you a separate, >> private email regarding this, thanks! > > Ok. Thanks a LOT for your help. I've successfully managed to build a package on the ia64 porterbox (and also verified that it still builds on amd64 & i386). I've uploaded it to mentors: http://mentors.debian.net/debian/pool/main/l/lxc/lxc_1.0.6-6~bpo70+2.dsc I've also attached a source debdiff against ~bpo70+1 to this email for your convenience. Could you please sponsor this upload? Thanks! Christian
diff -Nru lxc-1.0.6/debian/changelog lxc-1.0.6/debian/changelog
--- lxc-1.0.6/debian/changelog 2015-05-03 20:39:07.000000000 +0200
+++ lxc-1.0.6/debian/changelog 2015-05-19 08:39:38.000000000 +0200
@@ -1,3 +1,9 @@
+lxc (1:1.0.6-6~bpo70+2) wheezy-backports; urgency=medium
+
+ * Fix FTBFS on ia64
+
+ -- Christian Seiler <christian@iwakd.de> Tue, 19 May 2015 08:38:44 +0200
+
lxc (1:1.0.6-6~bpo70+1) wheezy-backports; urgency=medium
* Rebuild for wheezy-backports (no changes).
diff -Nru lxc-1.0.6/debian/patches/bpo-0001-fix-FTBFS-ia64.patch lxc-1.0.6/debian/patches/bpo-0001-fix-FTBFS-ia64.patch
--- lxc-1.0.6/debian/patches/bpo-0001-fix-FTBFS-ia64.patch 1970-01-01 01:00:00.000000000 +0100
+++ lxc-1.0.6/debian/patches/bpo-0001-fix-FTBFS-ia64.patch 2015-05-19 08:54:11.000000000 +0200
@@ -0,0 +1,23 @@
+Author: Christian Seiler <christian@iwakd.de>
+Description: Fix FTBFS on ia64 (clone vs. __clone2)
+
+--- a/src/tests/reboot.c
++++ b/src/tests/reboot.c
+@@ -45,11 +45,16 @@ static int do_reboot(void *arg)
+ static int test_reboot(int cmd, int sig)
+ {
+ long stack_size = 4096;
+- void *stack = alloca(stack_size) + stack_size;
++ void *stack = alloca(stack_size);
+ int status;
+ pid_t ret;
+
++#if defined(__ia64__)
++ ret = __clone2(do_reboot, stack, stack_size, CLONE_NEWPID | SIGCHLD, &cmd);
++#else
++ stack += stack_size;
+ ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
++#endif
+ if (ret < 0) {
+ printf("failed to clone: %m\n");
+ return -1;
diff -Nru lxc-1.0.6/debian/patches/series lxc-1.0.6/debian/patches/series
--- lxc-1.0.6/debian/patches/series 2015-01-05 19:25:05.000000000 +0100
+++ lxc-1.0.6/debian/patches/series 2015-05-19 08:39:38.000000000 +0200
@@ -15,3 +15,4 @@
0015-lxc-debian-systemd.patch
0016-lxc-debian-init.patch
0017-lxc-debian-mirror.patch
+bpo-0001-fix-FTBFS-ia64.patch
Attachment:
signature.asc
Description: OpenPGP digital signature