b9 0.5.19 → 0.5.20
raw patch · 3 files changed
+16/−12 lines, 3 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_0ArtifactAssembly
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_0ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_0ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_0ArtifactTarget
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_0AssembledArtifact
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_0CloudInitType
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_1ArtifactAssembly
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_1ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_1ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_1ArtifactTarget
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_1CloudInitType
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_2ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_2ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_2CloudInitType
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_3ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_3ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_4ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_4ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_5ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_5ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Constructor B9.ArtifactGenerator.C1_6ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Datatype B9.ArtifactGenerator.D1ArtifactAssembly
- B9.ArtifactGenerator: instance GHC.Generics.Datatype B9.ArtifactGenerator.D1ArtifactGenerator
- B9.ArtifactGenerator: instance GHC.Generics.Datatype B9.ArtifactGenerator.D1ArtifactSource
- B9.ArtifactGenerator: instance GHC.Generics.Datatype B9.ArtifactGenerator.D1ArtifactTarget
- B9.ArtifactGenerator: instance GHC.Generics.Datatype B9.ArtifactGenerator.D1AssembledArtifact
- B9.ArtifactGenerator: instance GHC.Generics.Datatype B9.ArtifactGenerator.D1CloudInitType
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_0AST
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_1AST
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_2AST
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_3AST
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_4AST
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_5AST
- B9.Content.AST: instance GHC.Generics.Constructor B9.Content.AST.C1_6AST
- B9.Content.AST: instance GHC.Generics.Datatype B9.Content.AST.D1AST
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_0SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_1SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_2SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_3SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_4SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_5SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_6SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Constructor B9.Content.ErlTerms.C1_7SimpleErlangTerm
- B9.Content.ErlTerms: instance GHC.Generics.Datatype B9.Content.ErlTerms.D1SimpleErlangTerm
- B9.Content.ErlangPropList: instance GHC.Generics.Constructor B9.Content.ErlangPropList.C1_0ErlangPropList
- B9.Content.ErlangPropList: instance GHC.Generics.Datatype B9.Content.ErlangPropList.D1ErlangPropList
- B9.Content.Generator: instance GHC.Generics.Constructor B9.Content.Generator.C1_0Content
- B9.Content.Generator: instance GHC.Generics.Constructor B9.Content.Generator.C1_1Content
- B9.Content.Generator: instance GHC.Generics.Constructor B9.Content.Generator.C1_2Content
- B9.Content.Generator: instance GHC.Generics.Constructor B9.Content.Generator.C1_3Content
- B9.Content.Generator: instance GHC.Generics.Constructor B9.Content.Generator.C1_4Content
- B9.Content.Generator: instance GHC.Generics.Datatype B9.Content.Generator.D1Content
- B9.Content.StringTemplate: instance GHC.Generics.Constructor B9.Content.StringTemplate.C1_0SourceFile
- B9.Content.StringTemplate: instance GHC.Generics.Constructor B9.Content.StringTemplate.C1_0SourceFileConversion
- B9.Content.StringTemplate: instance GHC.Generics.Constructor B9.Content.StringTemplate.C1_1SourceFileConversion
- B9.Content.StringTemplate: instance GHC.Generics.Datatype B9.Content.StringTemplate.D1SourceFile
- B9.Content.StringTemplate: instance GHC.Generics.Datatype B9.Content.StringTemplate.D1SourceFileConversion
- B9.Content.YamlObject: instance GHC.Generics.Constructor B9.Content.YamlObject.C1_0YamlObject
- B9.Content.YamlObject: instance GHC.Generics.Datatype B9.Content.YamlObject.D1YamlObject
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0FileSystem
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0Image
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0ImageDestination
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0ImageResize
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0ImageSize
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0ImageSource
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0ImageTarget
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0ImageType
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0MountPoint
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0Partition
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0SharedImage
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_0SizeUnit
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1FileSystem
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1ImageDestination
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1ImageResize
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1ImageSource
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1ImageType
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1MountPoint
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1Partition
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_1SizeUnit
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_2FileSystem
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_2ImageDestination
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_2ImageResize
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_2ImageSource
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_2ImageType
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_2SizeUnit
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_3FileSystem
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_3ImageDestination
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_3ImageResize
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_3ImageSource
- B9.DiskImages: instance GHC.Generics.Constructor B9.DiskImages.C1_3SizeUnit
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1FileSystem
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1Image
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1ImageDestination
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1ImageResize
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1ImageSize
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1ImageSource
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1ImageTarget
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1ImageType
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1MountPoint
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1Partition
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1SharedImage
- B9.DiskImages: instance GHC.Generics.Datatype B9.DiskImages.D1SizeUnit
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_0CPUArch
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_0ExecEnv
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_0RamSize
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_0Resources
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_0SharedDirectory
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_1CPUArch
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_1RamSize
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_1SharedDirectory
- B9.ExecEnv: instance GHC.Generics.Constructor B9.ExecEnv.C1_2SharedDirectory
- B9.ExecEnv: instance GHC.Generics.Datatype B9.ExecEnv.D1CPUArch
- B9.ExecEnv: instance GHC.Generics.Datatype B9.ExecEnv.D1ExecEnv
- B9.ExecEnv: instance GHC.Generics.Datatype B9.ExecEnv.D1RamSize
- B9.ExecEnv: instance GHC.Generics.Datatype B9.ExecEnv.D1Resources
- B9.ExecEnv: instance GHC.Generics.Datatype B9.ExecEnv.D1SharedDirectory
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_0ExecEnv
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_0Resources
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_1ExecEnv
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_1Resources
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_2ExecEnv
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_2Resources
- B9.ExecEnv: instance GHC.Generics.Selector B9.ExecEnv.S1_0_3ExecEnv
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_0Cmd
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_0CmdVerbosity
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_0Ctx
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_0Cwd
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_0Script
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_0User
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_1CmdVerbosity
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_1Cwd
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_1Script
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_1User
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_2CmdVerbosity
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_2Script
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_3CmdVerbosity
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_3Script
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_4Script
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_5Script
- B9.ShellScript: instance GHC.Generics.Constructor B9.ShellScript.C1_6Script
- B9.ShellScript: instance GHC.Generics.Datatype B9.ShellScript.D1Cmd
- B9.ShellScript: instance GHC.Generics.Datatype B9.ShellScript.D1CmdVerbosity
- B9.ShellScript: instance GHC.Generics.Datatype B9.ShellScript.D1Ctx
- B9.ShellScript: instance GHC.Generics.Datatype B9.ShellScript.D1Cwd
- B9.ShellScript: instance GHC.Generics.Datatype B9.ShellScript.D1Script
- B9.ShellScript: instance GHC.Generics.Datatype B9.ShellScript.D1User
- B9.ShellScript: instance GHC.Generics.Selector B9.ShellScript.S1_0_0Ctx
- B9.ShellScript: instance GHC.Generics.Selector B9.ShellScript.S1_0_1Ctx
- B9.ShellScript: instance GHC.Generics.Selector B9.ShellScript.S1_0_2Ctx
- B9.ShellScript: instance GHC.Generics.Selector B9.ShellScript.S1_0_3Ctx
- B9.Vm: instance GHC.Generics.Constructor B9.Vm.C1_0VmScript
- B9.Vm: instance GHC.Generics.Constructor B9.Vm.C1_1VmScript
- B9.Vm: instance GHC.Generics.Datatype B9.Vm.D1VmScript
Files
- b9.cabal +2/−2
- prepare_release.sh +5/−5
- src/lib/B9/DiskImageBuilder.hs +9/−5
b9.cabal view
@@ -1,5 +1,5 @@ name: b9-version: 0.5.19+version: 0.5.20 synopsis: A tool and library for building virtual machine images. @@ -132,7 +132,7 @@ , CPP hs-source-dirs: src/lib default-language: Haskell2010- ghc-options: -with-rtsopts=-N -Wall+ ghc-options: -Wall -fwarn-unused-binds -fno-warn-unused-do-bind if impl(ghc >= 7.8.2) && impl(ghc <= 7.10) ghc-options: -fno-warn-amp
prepare_release.sh view
@@ -9,9 +9,9 @@ # set -eu -cabal clean-./build_and_test.sh-./build_haddock.sh-cabal check-cabal sdist+stack clean+stack build+stack test+stack haddock+stack sdist
src/lib/B9/DiskImageBuilder.hs view
@@ -237,15 +237,18 @@ (show imgType')) | otherwise = do let (Image imgFile imgFmt imgFs) = dest+ qemuImgOpts = conversionOptions imgFmt dbgL (printf- "Creating empty raw image '%s' with size %s"+ "Creating empty raw image '%s' with size %s and options %s" imgFile- (toQemuSizeOptVal imgSize))+ (toQemuSizeOptVal imgSize)+ qemuImgOpts) cmd (printf- "qemu-img create -f %s '%s' '%s'"+ "qemu-img create -f %s %s '%s' '%s'" (imageFileExtension imgFmt)+ qemuImgOpts imgFile (toQemuSizeOptVal imgSize)) case (imgFmt, imgFs) of@@ -343,8 +346,9 @@ liftIO (removeFile imgIn) conversionOptions :: ImageType -> String-conversionOptions Vmdk = " -o adapter_type=lsilogic "-conversionOptions _ = " "+conversionOptions Vmdk = " -o adapter_type=lsilogic "+conversionOptions QCow2 = " -o compat=1.1,preallocation=metadata,lazy_refcounts=on "+conversionOptions _ = " " toQemuSizeOptVal :: ImageSize -> String toQemuSizeOptVal (ImageSize amount u) = show amount ++ case u of