path: root/doc/forum/to_teach_propellor_about_other_ARM_boards.mdwn
diff options
authorstappers@eb96885816da287c29f6f699999434d5321492342018-01-01 21:44:49 +0000
committeradmin2018-01-01 21:44:49 +0000
commit64d7e39ef0ca23f84e2f34aced3ee98e05254637 (patch)
tree6034054d4bad3a940274ec9c41549429f9d22dad /doc/forum/to_teach_propellor_about_other_ARM_boards.mdwn
parent71dbfbed13a65a1d134e115c3145e3aed79d0a8d (diff)
Diffstat (limited to 'doc/forum/to_teach_propellor_about_other_ARM_boards.mdwn')
1 files changed, 33 insertions, 0 deletions
diff --git a/doc/forum/to_teach_propellor_about_other_ARM_boards.mdwn b/doc/forum/to_teach_propellor_about_other_ARM_boards.mdwn
new file mode 100644
index 00000000..aef3c59f
--- /dev/null
+++ b/doc/forum/to_teach_propellor_about_other_ARM_boards.mdwn
@@ -0,0 +1,33 @@
+Inspirated by <>
+I started to teach propellor about other ARM boards.
+(After having a clean build for a supported ARM board)
+Using two directories, a `~/.propellor` with my hosts and `src/propellor` with propellor source code.
+In the code directory I modified `src/Propellor/Property/Machine.hs`,
+compiled with `debuild -uc -us` and installed with `dpkg -i ../propellor*.deb`.
+Then using my hosts directory to get a WTF moment
+ $ propellor --spin
+ Auto-merging src/Propellor/Property/Machine.hs
+ Auto-merging propellor.cabal
+ Auto-merging debian/changelog
+ Auto-merging config.hs
+ CONFLICT (add/add): Merge conflict in config.hs
+ Automatic merge failed; fix conflicts and then commit the result.
+ propellor: Failed to run git ["merge","279b9267952b598914037983f74606d4f9c4ff6e","-s",
+ "recursive","-Xtheirs","--quiet","-m","merging upstream version"
+ ,"--allow-unrelated-histories"]
+ CallStack (from HasCallStack):
+ error, called at src/Propellor/DotDir.hs:425:17 in main:Propellor.DotDir
+What did connect both directories and why?
+More important:
+What directory setup and workflow to use
+to teach propellor about other ARM boards?