From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manolis Ragkousis Subject: [PATCH] daemon: Check for HAVE_CHROOT instead of CHROOT_ENABLED. Date: Mon, 10 Aug 2015 21:15:10 +0300 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11347b1856b7aa051cf8f72b Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZOrbN-0003uK-Sw for Guix-devel@gnu.org; Mon, 10 Aug 2015 14:15:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZOrbM-0004oa-FE for Guix-devel@gnu.org; Mon, 10 Aug 2015 14:15:13 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Guix-devel --001a11347b1856b7aa051cf8f72b Content-Type: text/plain; charset=UTF-8 Hello everyone, There is an issue with the chrooted builds on Hurd. In nix/libstore/build.cc CHROOT_ENABLED is false because HAVE_UNSHARE && HAVE_SYS_MOUNT_H are not defined on Hurd. The part that we are interested from build.cc is at line 1768. The part of the code in that if, is used by the daemon for chrooted builds. At this specific part of the daemon we only need HAVE_CHROOT to be defined, which is true on hurd, for the builds to work. With this workaround, things seem to work for me until now. WDYT? I am sending this patch in order to discuss what could be done and see if anyone has any better ideas. Manolis --001a11347b1856b7aa051cf8f72b Content-Type: text/x-patch; charset=US-ASCII; name="0001-daemon-Check-for-HAVE_CHROOT-instead-of-CHROOT_ENABL.patch" Content-Disposition: attachment; filename="0001-daemon-Check-for-HAVE_CHROOT-instead-of-CHROOT_ENABL.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_id68k59x0 RnJvbSA5ZmQ5MWMxOTFkNDdkNzdmNGFiZWVlNDFjNjg0NjQ2MmJhZGI1NzYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYW5vbGlzIFJhZ2tvdXNpcyA8bWFub2xpczgzN0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMTAgQXVnIDIwMTUgMjA6NTY6MDMgKzAzMDAKU3ViamVjdDogW1BBVENI XSBkYWVtb246IENoZWNrIGZvciBIQVZFX0NIUk9PVCBpbnN0ZWFkIG9mIENIUk9PVF9FTkFCTEVE LgoKKiBuaXgvbGlic3RvcmUvYnVpbGQuY2MgKERlcml2YXRpb25Hb2FsOjpzdGFydEJ1aWxkZXIp OiBDaGVjayBvbmx5IGlmIEhBVkVfQ0hST09UIGlzCiAgZGVmaW5lZCBpbiBvcmRlciB0byBlbmFi bGUgY2hyb290ZWQgYnVpbGRzIG9uIEh1cmQuCi0tLQogbml4L2xpYnN0b3JlL2J1aWxkLmNjIHwg MyArKy0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRp ZmYgLS1naXQgYS9uaXgvbGlic3RvcmUvYnVpbGQuY2MgYi9uaXgvbGlic3RvcmUvYnVpbGQuY2MK aW5kZXggYTllZWRjZS4uZGI4NWRmMyAxMDA2NDQKLS0tIGEvbml4L2xpYnN0b3JlL2J1aWxkLmNj CisrKyBiL25peC9saWJzdG9yZS9idWlsZC5jYwpAQCAtMTc2NSw3ICsxNzY1LDggQEAgdm9pZCBE ZXJpdmF0aW9uR29hbDo6c3RhcnRCdWlsZGVyKCkKICAgICB1c2VDaHJvb3QgPSBzZXR0aW5ncy51 c2VDaHJvb3Q7CiAKICAgICBpZiAodXNlQ2hyb290KSB7Ci0jaWYgQ0hST09UX0VOQUJMRUQKKyNp ZiBIQVZFX0NIUk9PVCAvKiBXZSBvbmx5IG5lZWQgY2hyb290IGF0IHRoaXMgdGltZSBhbmQgd2l0 aCB0aGlzIGNocm9vdCBidWlsZHMgYXJlIAorICAgICAgICAgICAgICAgICAgIGVuYWJsZWQgb24g SHVyZCovCiAgICAgICAgIC8qIENyZWF0ZSBhIHRlbXBvcmFyeSBkaXJlY3RvcnkgaW4gd2hpY2gg d2Ugc2V0IHVwIHRoZSBjaHJvb3QKICAgICAgICAgICAgZW52aXJvbm1lbnQgdXNpbmcgYmluZC1t b3VudHMuICBXZSBwdXQgaXQgaW4gdGhlIE5peCBzdG9yZQogICAgICAgICAgICB0byBlbnN1cmUg dGhhdCB3ZSBjYW4gY3JlYXRlIGhhcmQtbGlua3MgdG8gbm9uLWRpcmVjdG9yeQotLSAKMi41LjAK Cg== --001a11347b1856b7aa051cf8f72b--