Merge branch 'master' of https://git.joeyh.name/git/propellor into sbuild-overhaul

10 files changed, 38 insertions, 0 deletions

diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot.mdwn b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy.mdwn
index 8887f438..8887f438 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot.mdwn
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy.mdwn
diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_1_59ac4661a896a514ce953a0069341869._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_1_59ac4661a896a514ce953a0069341869._comment
index b4e411b7..b4e411b7 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_1_59ac4661a896a514ce953a0069341869._comment
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_1_59ac4661a896a514ce953a0069341869._comment
diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_2_579894632e567a08d83e306be5e355b2._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_2_579894632e567a08d83e306be5e355b2._comment
index 53595ad2..53595ad2 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_2_579894632e567a08d83e306be5e355b2._comment
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_2_579894632e567a08d83e306be5e355b2._comment
diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_3_6aeee8ba74b363d26a49d6773c5d5014._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_3_6aeee8ba74b363d26a49d6773c5d5014._comment
index 12d59028..12d59028 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_3_6aeee8ba74b363d26a49d6773c5d5014._comment
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_3_6aeee8ba74b363d26a49d6773c5d5014._comment
diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_4_f6c386dddf408d522841fd3bde699d15._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_4_f6c386dddf408d522841fd3bde699d15._comment
index 17c99e16..17c99e16 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_4_f6c386dddf408d522841fd3bde699d15._comment
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_4_f6c386dddf408d522841fd3bde699d15._comment
diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_5_060b3ab57e525669c44192bbfdc730a4._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_5_060b3ab57e525669c44192bbfdc730a4._comment
index 2578ef8e..2578ef8e 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_5_060b3ab57e525669c44192bbfdc730a4._comment
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_5_060b3ab57e525669c44192bbfdc730a4._comment
diff --git a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_6_9d6536b85cd3fd3ca3b0128aff56d797._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_6_9d6536b85cd3fd3ca3b0128aff56d797._comment
index 32427cef..32427cef 100644
--- a/doc/forum/Sbuild_chroot_are_not_compatible_with_schroot/comment_6_9d6536b85cd3fd3ca3b0128aff56d797._comment
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_6_9d6536b85cd3fd3ca3b0128aff56d797._comment
diff --git a/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_7_571220abc9991ddc940c2cb150543fd2._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_7_571220abc9991ddc940c2cb150543fd2._comment
new file mode 100644
index 00000000..419b746c
--- /dev/null
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_7_571220abc9991ddc940c2cb150543fd2._comment
@@ -0,0 +1,22 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb"
+ subject="Reassigning this bug to the Chroot and Debootstrap infrastructure"
+ date="2017-11-18T17:57:22Z"
+ content="""
+I'm almost done with my branch, and I now think that this bug applies to the `Chroot` and `Debootstrap` modules.  This is how the new sbuild module will work:
+
+    & Apt.useLocalCacher
+    & Sbuild.built Sbuild.UseCcache $ props
+    	& osDebian Unstable X86_32
+    	& Sbuild.update `period` Weekly 1
+    	& Sbuild.useHostProxy
+    & Sbuild.usableBy (User \"spwhitton\")
+    & Schroot.overlaysInTmpfs
+
+As you can see, the propagation of the host's Apt proxy into the chroot is controlled by a property of the chroot, for maximum flexibility.  For example, you could replace `Sbuild.useHostProxy` with a call to `Apt.proxy`.
+
+However, the properties of the sbuild chroot will not be applied until after the chroot is built.  So, in order to resolve Fred's issue, it is the invocation of debootstrap by the `Chroot`/`Debootstrap` modules that needs to be taught to use the host's Apt proxy, if one is set.
+
+(w.r.t. unpropelling: I'm not going to do any cleanup because /usr/local/propellor is not likely to interfere with the build.  What matters is installed build-deps, and we've established there won't be any.)
+"""]]
diff --git a/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_8_ac79ac661bfafcaade6b0e6d592c8c48._comment b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_8_ac79ac661bfafcaade6b0e6d592c8c48._comment
new file mode 100644
index 00000000..ec3a6f8b
--- /dev/null
+++ b/doc/todo/Debootstrap_module_should_respect_a_configured_Apt.proxy/comment_8_ac79ac661bfafcaade6b0e6d592c8c48._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 8"""
+ date="2017-11-18T20:02:46Z"
+ content="""
+I agree that it would make sense for propellor's debootstrap properties
+to use the host's apt proxy setting.
+
+debootstrap does not have an option to use a proxy, but I think that
+setting `http_proxy` in the environment will probably make it work.
+"""]]
diff --git a/doc/todo/Host_could_have_partition_table_in_Info.mdwn b/doc/todo/Host_could_have_partition_table_in_Info.mdwn
new file mode 100644
index 00000000..5ca20cc7
--- /dev/null
+++ b/doc/todo/Host_could_have_partition_table_in_Info.mdwn
@@ -0,0 +1,5 @@
+Currently, building an Image for a Host requires a partition table to be
+specified separately. However, Propellor.Property.Machine often knows
+things about the partition table (eg that there needs to be a separate EXT2
+/boot partition). So, why not let properties put something in Info and
+let the partition table be derived from that. --[[Joey]]