propellor

propellor config for hosts.
git clone git://git.ricketyspace.net/propellor.git
Log | Files | Refs | LICENSE

to_teach_propellor_about_other_ARM_boards.mdwn (1245B)


      1 Inspirated by <http://joeyh.name/blog/entry/custom_ARM_disk_image_generation_with_propellor/>
      2 I started to teach propellor about other ARM boards.
      3 (After having a clean build for a supported ARM board)
      4 
      5 
      6 Using two directories, a `~/.propellor` with my hosts and `src/propellor` with propellor source code.
      7 
      8 In the code directory I modified `src/Propellor/Property/Machine.hs`,
      9 compiled with `debuild -uc -us` and installed with `dpkg -i ../propellor*.deb`.
     10 
     11 Then using my hosts directory to get a WTF moment
     12 
     13 	$ propellor --spin paddy.gpm.stappers.nl
     14 	Auto-merging src/Propellor/Property/Machine.hs
     15 	Auto-merging propellor.cabal
     16 	Auto-merging debian/changelog
     17 	Auto-merging config.hs
     18 	CONFLICT (add/add): Merge conflict in config.hs
     19 	Automatic merge failed; fix conflicts and then commit the result.
     20 	propellor: Failed to run git ["merge","279b9267952b598914037983f74606d4f9c4ff6e","-s",
     21 		"recursive","-Xtheirs","--quiet","-m","merging upstream version"
     22 		,"--allow-unrelated-histories"]
     23 	CallStack (from HasCallStack):
     24 	  error, called at src/Propellor/DotDir.hs:425:17 in main:Propellor.DotDir
     25 
     26 
     27 What did connect both directories and why?
     28 
     29 
     30 More important:
     31 
     32 What directory setup and workflow to use
     33 to teach propellor about other ARM boards?