Procházet zdrojové kódy

Combine xz command into a single line

Bob Mottram před 6 roky
rodič
revize
0c20a62fdd
1 změnil soubory, kde provedl 14 přidání a 14 odebrání
  1. 14
    14
      src/freedombone-image-makefile

+ 14
- 14
src/freedombone-image-makefile Zobrazit soubor

@@ -45,7 +45,7 @@ ifeq ("$CONTINUOUS_INTEGRATION", "")
45 45
 	XZ =
46 46
 	SIGN =
47 47
 else
48
-    XZ = xz --no-warn --verbose --keep --threads=0 -3
48
+    XZ = xz --no-warn --verbose --keep --threads=0 -3 $(IMAGE)
49 49
     SIGN = -gpg --output $(SIGNATURE) --detach-sig $(ARCHIVE)
50 50
 endif
51 51
 
@@ -95,7 +95,7 @@ beaglebone: prep
95 95
 	$(eval MACHINE = beaglebone)
96 96
 	$(MAKE_IMAGE)
97 97
 	@rm -f $(ARCHIVE)
98
-	$(XZ) $(IMAGE)
98
+	$(XZ)
99 99
 	@echo ""
100 100
 	$(SIGN)
101 101
 	@echo "Build complete."
@@ -106,7 +106,7 @@ cubieboard2: prep
106 106
 	$(eval MACHINE = cubieboard2)
107 107
 	$(MAKE_IMAGE)
108 108
 	@rm -f $(ARCHIVE)
109
-	$(XZ) $(IMAGE)
109
+	$(XZ)
110 110
 	@echo ""
111 111
 	$(SIGN)
112 112
 	@echo "Build complete."
@@ -117,7 +117,7 @@ pcduino3: prep
117 117
 	$(eval MACHINE = pcduino3)
118 118
 	$(MAKE_IMAGE)
119 119
 	@rm -f $(ARCHIVE)
120
-	$(XZ) $(IMAGE)
120
+	$(XZ)
121 121
 	@echo ""
122 122
 	$(SIGN)
123 123
 	@echo "Build complete."
@@ -128,7 +128,7 @@ cubietruck: prep
128 128
 	$(eval MACHINE = cubietruck)
129 129
 	$(MAKE_IMAGE)
130 130
 	@rm -f $(ARCHIVE)
131
-	$(XZ) $(IMAGE)
131
+	$(XZ)
132 132
 	@echo ""
133 133
 	$(SIGN)
134 134
 	@echo "Build complete."
@@ -140,7 +140,7 @@ a20-olinuxino-lime: prep
140 140
 	$(eval IMAGE = $(NAME).img)
141 141
 	$(MAKE_IMAGE)
142 142
 	rm -f $(ARCHIVE)
143
-	$(XZ) $(IMAGE)
143
+	$(XZ)
144 144
 	@echo ""
145 145
 	$(SIGN)
146 146
 
@@ -150,7 +150,7 @@ a20-olinuxino-lime2: prep
150 150
 	$(eval MACHINE = a20-olinuxino-lime2)
151 151
 	$(MAKE_IMAGE)
152 152
 	@rm -f $(ARCHIVE)
153
-	$(XZ) $(IMAGE)
153
+	$(XZ)
154 154
 	@echo ""
155 155
 	$(SIGN)
156 156
 	@echo "Build complete."
@@ -161,7 +161,7 @@ a20-olinuxino-micro: prep
161 161
 	$(eval MACHINE = a20-olinuxino-micro)
162 162
 	$(MAKE_IMAGE)
163 163
 	@rm -f $(ARCHIVE)
164
-	$(XZ) $(IMAGE)
164
+	$(XZ)
165 165
 	@echo ""
166 166
 	$(SIGN)
167 167
 	@echo "Build complete."
@@ -172,7 +172,7 @@ i386: prep
172 172
 	$(eval MACHINE = all)
173 173
 	$(MAKE_IMAGE)
174 174
 	@rm -f $(ARCHIVE)
175
-	$(XZ) $(IMAGE)
175
+	$(XZ)
176 176
 	@echo ""
177 177
 	$(SIGN)
178 178
 	@echo "Build complete."
@@ -183,7 +183,7 @@ i686: prep
183 183
 	$(eval MACHINE = all)
184 184
 	$(MAKE_IMAGE)
185 185
 	@rm -f $(ARCHIVE)
186
-	$(XZ) $(IMAGE)
186
+	$(XZ)
187 187
 	@echo ""
188 188
 	$(SIGN)
189 189
 	@echo "Build complete."
@@ -194,7 +194,7 @@ amd64: prep
194 194
 	$(eval MACHINE = all)
195 195
 	$(MAKE_IMAGE)
196 196
 	@rm -f $(ARCHIVE)
197
-	$(XZ) $(IMAGE)
197
+	$(XZ)
198 198
 	@echo ""
199 199
 	$(SIGN)
200 200
 	@echo "Build complete."
@@ -205,7 +205,7 @@ apu: prep
205 205
 	$(eval MACHINE = all)
206 206
 	$(MAKE_IMAGE)
207 207
 	@rm -f $(ARCHIVE)
208
-	$(XZ) $(IMAGE)
208
+	$(XZ)
209 209
 	@echo ""
210 210
 	$(SIGN)
211 211
 	@echo "Build complete."
@@ -220,7 +220,7 @@ qemu-i386: prep
220 220
 	# Convert image to qemu format
221 221
 	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
222 222
 	@rm -f $(ARCHIVE)
223
-	$(XZ) $(IMAGE)
223
+	$(XZ)
224 224
 	@echo ""
225 225
 	$(SIGN)
226 226
 	@echo "Build complete."
@@ -232,7 +232,7 @@ qemu-x86_64: prep
232 232
 	# Convert image to qemu format
233 233
 	qemu-img convert -O qcow2 $(NAME).img $(NAME).qcow2
234 234
 	@rm -f $(ARCHIVE)
235
-	$(XZ) $(IMAGE)
235
+	$(XZ)
236 236
 	@echo ""
237 237
 	$(SIGN)
238 238
 	@echo "Build complete."