瀏覽代碼

Combine xz command into a single line

Bob Mottram 7 年之前
父節點
當前提交
0c20a62fdd
共有 1 個文件被更改,包括 14 次插入14 次删除
  1. 14
    14
      src/freedombone-image-makefile

+ 14
- 14
src/freedombone-image-makefile 查看文件

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