Merge lp:~sergiusens/goget-ubuntu-touch/byeByeFlashAssets into lp:goget-ubuntu-touch

[Sergio Schvezov]

Remove legacy FlashAsset handling.

[John Lenton (chipaca)]

review: Approve

[lp:~sergiusens/goget-ubuntu-touch/byeByeFlashAssets]

206. By Sergio Schvezov on 2015-06-24

Merged assetsGeneric into byeByeFlashAssets.

=== modified file 'diskimage/core_uboot.go'
--- diskimage/core_uboot.go	2015-06-24 12:57:49 +0000
+++ diskimage/core_uboot.go	2015-06-24 12:57:49 +0000
@@ -107,7 +107,6 @@
 	bootPath := filepath.Join(img.baseMount, string(bootDir))
 	bootAPath := filepath.Join(bootPath, "a")
 	bootBPath := filepath.Join(bootPath, "b")
-	bootuEnvPath := filepath.Join(bootPath, "uEnv.txt")
 	bootSnappySystemPath := filepath.Join(bootPath, "snappy-system.txt")
 
 	// origins
@@ -154,16 +153,8 @@
 		return err
 	}
 
-	// if the oem package provides BootAssets use it directly, if not
-	// provisionUenv for backwards compatibility.
-	if bootAssets := img.oem.OEM.Hardware.BootAssets; bootAssets != nil {
-		if err := setupBootAssetFiles(bootPath, oemRoot, bootAssets.Files); err != nil {
-			return err
-		}
-	} else {
-		if err := img.provisionUenv(bootuEnvPath); err != nil {
-			return err
-		}
+	if err := setupBootAssetFiles(bootPath, oemRoot, img.oem.OEM.Hardware.BootAssets.Files); err != nil {
+		return err
 	}
 
 	// create /boot/uboot
@@ -192,37 +183,6 @@
 	return nil
 }
 
-func (img CoreUBootImage) provisionUenv(bootuEnvPath string) error {
-	platform := img.oem.Platform()
-
-	if platform != "" {
-		printOut("No platform select, not searching for uEnv.txt")
-		return nil
-	}
-
-	flashAssetsPath := filepath.Join(img.baseMount, "flashtool-assets", platform)
-	uEnvPath := filepath.Join(flashAssetsPath, "uEnv.txt")
-
-	if _, err := os.Stat(flashAssetsPath); os.IsNotExist(err) {
-		printOut("No flash assets path available")
-		return nil
-	} else if err != nil {
-		return err
-	}
-
-	// if a uEnv.txt is provided in the flashtool-assets, use it
-	if _, err := os.Stat(uEnvPath); err == nil {
-		printOut("Adding uEnv.txt to", bootuEnvPath)
-		if err := sysutils.CopyFile(uEnvPath, bootuEnvPath); err != nil {
-			return err
-		}
-	} else {
-		printOut("Can't copy", uEnvPath, "to", bootuEnvPath, "due to:", err)
-	}
-
-	return nil
-}
-
 func (img CoreUBootImage) provisionDtbs(bootDtbPath string) error {
 	dtbsPath := filepath.Join(img.baseMount, img.hardware.Dtbs)