From 80431fe0439ec404878d0a236f277d8d9b684329 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Feb 2017 15:28:28 -0400 Subject: review --- ...ent_1_8e39dc177e21e9e20c1b74b59b9926d2._comment | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/todo/Arch_Linux_Port/comment_1_8e39dc177e21e9e20c1b74b59b9926d2._comment (limited to 'doc/todo/Arch_Linux_Port') diff --git a/doc/todo/Arch_Linux_Port/comment_1_8e39dc177e21e9e20c1b74b59b9926d2._comment b/doc/todo/Arch_Linux_Port/comment_1_8e39dc177e21e9e20c1b74b59b9926d2._comment new file mode 100644 index 00000000..11869a2a --- /dev/null +++ b/doc/todo/Arch_Linux_Port/comment_1_8e39dc177e21e9e20c1b74b59b9926d2._comment @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-02-03T19:14:41Z" + content=""" +Wow, nice work! + +Seems that Propellor.Property.Partition.formatted' is still a DebianLike +property really, since it only supports using apt to install the mkfs +programs. It will fail at runtime on Arch. So, I think best to keep it +DebianLike until that's dealt with -- and then the type will be +`DebianLike + ArchLinux` rather than `LinuxLike` + +Same for Propellor.Property.Partition.kpartx. + +Several properties that were changed from DebianLike to Linux really +only support DebianLike and ArchLinux, not all linux distros, so their +types ought to be `DebianLike + ArchLinux`. This includes Docker.installed, +Parted.installed, Rsync.installed. + +A nicer way to inplement those multi-distro `installed` properties is like +this: + + installed :: Property (Debian + ArchLinux) + installed = Apt.installed ["foo"] `pickOS` Pacman.installed ["foo"] + +Make those changes and I will merge it. +"""]] -- cgit v1.3-2-g0d8e From 59626c761d2303c13553a0e6b425863c9985436e Mon Sep 17 00:00:00 2001 From: wzhd Date: Sat, 4 Feb 2017 01:53:49 +0000 Subject: Added a comment --- ...comment_2_cc4623c156a0d12c88461bc5deec07cd._comment | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/todo/Arch_Linux_Port/comment_2_cc4623c156a0d12c88461bc5deec07cd._comment (limited to 'doc/todo/Arch_Linux_Port') diff --git a/doc/todo/Arch_Linux_Port/comment_2_cc4623c156a0d12c88461bc5deec07cd._comment b/doc/todo/Arch_Linux_Port/comment_2_cc4623c156a0d12c88461bc5deec07cd._comment new file mode 100644 index 00000000..dc6e3eb1 --- /dev/null +++ b/doc/todo/Arch_Linux_Port/comment_2_cc4623c156a0d12c88461bc5deec07cd._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="wzhd" + avatar="http://cdn.libravatar.org/avatar/d5a499b7c476ca9960cc8dccdf455bae" + subject="comment 2" + date="2017-02-04T01:53:49Z" + content=""" +Thanks! + + +I didn't find the right way to do it; `pickOS` is so much easier than `withOS` ! + + +`Propellor.Property.Partition` was modified to get rid of some compiling errors in DiskImage and didn't support anything new. So I removed the changes. + + +Instead, I changed some properties in DiskImage from Linux to DebianLike. Is it the correct way to do it? + +"""]] -- cgit v1.3-2-g0d8e From 2f50e5f3d1a556b8445fdcb7ac239f85cfe43f6c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 4 Feb 2017 17:18:26 -0400 Subject: Arch Linux is now supported by Propellor! Thanks to Zihao Wang for this port. * Arch Linux is now supported by Propellor! Thanks to Zihao Wang for this port. * Added Propellor.Property.Pacman for Arch's package manager. Maintained by Zihao Wang. * The types of some properties changed; eg from Property DebianLike to Property (DebianLike + ArchLinux). This could require updates to code using those properties, so is a minor API change. --- debian/changelog | 11 ++++++++-- doc/todo/Arch_Linux_Port.mdwn | 2 ++ ...ent_3_d917de766dfe7fded7317d7614d1467f._comment | 25 ++++++++++++++++++++++ propellor.cabal | 3 ++- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment (limited to 'doc/todo/Arch_Linux_Port') diff --git a/debian/changelog b/debian/changelog index 81360402..3a12ca70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -propellor (3.2.4) UNRELEASED; urgency=medium - +propellor (3.3.0) UNRELEASED; urgency=medium + + * Arch Linux is now supported by Propellor! + Thanks to Zihao Wang for this port. + * Added Propellor.Property.Pacman for Arch's package manager. + Maintained by Zihao Wang. + * The types of some properties changed; eg from Property DebianLike + to Property (DebianLike + ArchLinux). This could require updates + to code using those properties, so is a minor API change. * GHC's fileSystemEncoding is used for all String IO, to avoid encoding-related crashes in eg, Propellor.Property.File. * Add --build option to simply build config.hs. diff --git a/doc/todo/Arch_Linux_Port.mdwn b/doc/todo/Arch_Linux_Port.mdwn index a899dbb3..ac3ee4dc 100644 --- a/doc/todo/Arch_Linux_Port.mdwn +++ b/doc/todo/Arch_Linux_Port.mdwn @@ -12,3 +12,5 @@ I've made some addtional minor changes to make propellor compile without errors: - Rsync.installed and Docker.installed now supports Pacman as well Hope you enjoy it! + +> [[merged|done]]; it was indeed enjoyable. thank you! --[[Joey]] diff --git a/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment b/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment new file mode 100644 index 00000000..27ef8078 --- /dev/null +++ b/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2017-02-04T20:55:02Z" + content=""" +> Instead, I changed some properties in DiskImage from Linux to +> DebianLike. Is it the correct way to do it? + +Looking at it, kpartx is DebianLike-specific, so imageBuiltFrom which uses it +should be too. The only reason it wasn't marked as DebianLike already and +was type Linux is because Linux used to be the same as DebianLike and so +the type checker didn't see a difference. No longer, thanks to your patch. + +So, it makes complete sense that you have to change this. You're paying +the price of blazing the trail of the first non-DebianLike Linux distro in +Propellor.. + +--- + +Looks like your [[!commit 25f6871e1dda3de252fbc6c8ac6962eb0cd9311a]] +dealt with all my review suggestions. And so, I've merged it. + +Unless you have anything else that needs to be done, I'll release +propellor soon with the added Arch Linux support. Thank you very much! +"""]] diff --git a/propellor.cabal b/propellor.cabal index 1b5c46d6..a33b9824 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 3.2.3 +Version: 3.3.0 Cabal-Version: >= 1.8 License: BSD2 Maintainer: Joey Hess @@ -128,6 +128,7 @@ Library Propellor.Property.Obnam Propellor.Property.OpenId Propellor.Property.OS + Propellor.Property.Pacman Propellor.Property.Parted Propellor.Property.Partition Propellor.Property.Postfix -- cgit v1.3-2-g0d8e From 5bacfe57915631be8b1ca5452bbfde1a6d073e57 Mon Sep 17 00:00:00 2001 From: wzhd Date: Sun, 5 Feb 2017 00:59:18 +0000 Subject: Added a comment --- .../comment_4_924c73c0ab6fb39c9b25ae51facf6bb6._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/todo/Arch_Linux_Port/comment_4_924c73c0ab6fb39c9b25ae51facf6bb6._comment (limited to 'doc/todo/Arch_Linux_Port') diff --git a/doc/todo/Arch_Linux_Port/comment_4_924c73c0ab6fb39c9b25ae51facf6bb6._comment b/doc/todo/Arch_Linux_Port/comment_4_924c73c0ab6fb39c9b25ae51facf6bb6._comment new file mode 100644 index 00000000..f69e2c80 --- /dev/null +++ b/doc/todo/Arch_Linux_Port/comment_4_924c73c0ab6fb39c9b25ae51facf6bb6._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="wzhd" + avatar="http://cdn.libravatar.org/avatar/d5a499b7c476ca9960cc8dccdf455bae" + subject="comment 4" + date="2017-02-05T00:59:18Z" + content=""" +That's great! Thank you so much! +"""]] -- cgit v1.3-2-g0d8e From da400e7af20bf418c13de4456822303d91af83a3 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/8E0H4z8LxusTHab4gc2Y8vCD_ObsJE6JVG2Co64SEnICbAtrisRuZjznurYBvSKkr8V5ALg-#075db" Date: Mon, 13 Feb 2017 15:49:21 +0000 Subject: removed --- ...ent_3_d917de766dfe7fded7317d7614d1467f._comment | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment (limited to 'doc/todo/Arch_Linux_Port') diff --git a/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment b/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment deleted file mode 100644 index 27ef8078..00000000 --- a/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment +++ /dev/null @@ -1,25 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 3""" - date="2017-02-04T20:55:02Z" - content=""" -> Instead, I changed some properties in DiskImage from Linux to -> DebianLike. Is it the correct way to do it? - -Looking at it, kpartx is DebianLike-specific, so imageBuiltFrom which uses it -should be too. The only reason it wasn't marked as DebianLike already and -was type Linux is because Linux used to be the same as DebianLike and so -the type checker didn't see a difference. No longer, thanks to your patch. - -So, it makes complete sense that you have to change this. You're paying -the price of blazing the trail of the first non-DebianLike Linux distro in -Propellor.. - ---- - -Looks like your [[!commit 25f6871e1dda3de252fbc6c8ac6962eb0cd9311a]] -dealt with all my review suggestions. And so, I've merged it. - -Unless you have anything else that needs to be done, I'll release -propellor soon with the added Arch Linux support. Thank you very much! -"""]] -- cgit v1.3-2-g0d8e From b29bab35747e6345a4818e5a77c53d029562e3c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Feb 2017 12:29:50 -0400 Subject: Revert "removed" This reverts commit da400e7af20bf418c13de4456822303d91af83a3. No idea why this comment was removed. Going to assume it was an accident unless it happens again.. --- ...ent_3_d917de766dfe7fded7317d7614d1467f._comment | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment (limited to 'doc/todo/Arch_Linux_Port') diff --git a/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment b/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment new file mode 100644 index 00000000..27ef8078 --- /dev/null +++ b/doc/todo/Arch_Linux_Port/comment_3_d917de766dfe7fded7317d7614d1467f._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2017-02-04T20:55:02Z" + content=""" +> Instead, I changed some properties in DiskImage from Linux to +> DebianLike. Is it the correct way to do it? + +Looking at it, kpartx is DebianLike-specific, so imageBuiltFrom which uses it +should be too. The only reason it wasn't marked as DebianLike already and +was type Linux is because Linux used to be the same as DebianLike and so +the type checker didn't see a difference. No longer, thanks to your patch. + +So, it makes complete sense that you have to change this. You're paying +the price of blazing the trail of the first non-DebianLike Linux distro in +Propellor.. + +--- + +Looks like your [[!commit 25f6871e1dda3de252fbc6c8ac6962eb0cd9311a]] +dealt with all my review suggestions. And so, I've merged it. + +Unless you have anything else that needs to be done, I'll release +propellor soon with the added Arch Linux support. Thank you very much! +"""]] -- cgit v1.3-2-g0d8e