Ubuntu Pastebin

Paste from egon at Fri, 12 Jun 2015 07:17:19 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
diff -u goget-ubuntu-touch-0.23/debian/changelog goget-ubuntu-touch-0.23/debian/changelog
--- goget-ubuntu-touch-0.23/debian/changelog
+++ goget-ubuntu-touch-0.23/debian/changelog
@@ -1,3 +1,9 @@
+goget-ubuntu-touch (0.23-0ubuntu3) wily; urgency=low
+
+  * add --seb-channel param
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 12 Jun 2015 08:37:58 +0200
+
 goget-ubuntu-touch (0.23-0ubuntu2) wily; urgency=medium
 
   * No change rebuild for latest ubuntu-snappy
only in patch2:
unchanged:
--- goget-ubuntu-touch-0.23.orig/diskimage/core_grub.go
+++ goget-ubuntu-touch-0.23/diskimage/core_grub.go
@@ -113,8 +113,8 @@
 
 	parted.addPart(grubLabel, "", fsNone, 4)
 	parted.addPart(bootLabel, bootDir, fsFat32, 64)
-	parted.addPart(systemALabel, systemADir, fsExt4, 1024)
-	parted.addPart(systemBLabel, systemBDir, fsExt4, 1024)
+	parted.addPart(systemALabel, systemADir, fsExt4, 4096)
+	parted.addPart(systemBLabel, systemBDir, fsExt4, 4096)
 	parted.addPart(writableLabel, writableDir, fsExt4, -1)
 
 	parted.setBoot(2)
only in patch2:
unchanged:
--- goget-ubuntu-touch-0.23.orig/ubuntu-device-flash/core.go
+++ goget-ubuntu-touch-0.23/ubuntu-device-flash/core.go
@@ -136,7 +136,13 @@
 		return err
 	}
 
-	channel := systemImageChannel("ubuntu-core", coreCmd.Positional.Release, coreCmd.Channel)
+	ubuntuCore := os.Getenv("UDF_UBUNTU_CORE_NAME")
+	println(ubuntuCore)
+	if ubuntuCore == "" {
+		ubuntuCore = "ubuntu-core"
+	}
+	channel := systemImageChannel(ubuntuCore, coreCmd.Positional.Release, coreCmd.Channel)
+
 	// TODO: remove once azure channel is gone
 	var device string
 	if coreCmd.Deprecated.Device != "" {
Download as text