OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 47... Line 47...
47 define Build/eva-image 47 define Build/eva-image
48 $(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new 48 $(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new
49 mv $@.new $@ 49 mv $@.new $@
50 endef 50 endef
Line 51... Line -...
51   -  
52 define Build/seama -  
53 $(STAGING_DIR_HOST)/bin/seama -i $@ \ -  
54 -m "dev=/dev/mtdblock/$(SEAMA_MTDBLOCK)" -m "type=firmware" -  
55 mv $@.seama $@ -  
56 endef -  
57   -  
58 define Build/seama-seal -  
59 $(STAGING_DIR_HOST)/bin/seama -i $@ -s $@.seama \ -  
60 -m "signature=$(SEAMA_SIGNATURE)" -  
61 mv $@.seama $@ -  
62 endef -  
63   -  
64 define Build/zyxel-ras-image -  
65 let \ -  
66 newsize="$(subst k,* 1024,$(RAS_ROOTFS_SIZE))"; \ -  
67 $(STAGING_DIR_HOST)/bin/mkrasimage \ -  
68 -b $(RAS_BOARD) \ -  
69 -v $(RAS_VERSION) \ -  
70 -r $@ \ -  
71 -s $$newsize \ -  
72 -o $@.new \ -  
73 $(if $(findstring separate-kernel,$(word 1,$(1))),-k $(IMAGE_KERNEL)) \ -  
74 && mv $@.new $@ -  
75 endef -  
76   51  
77 define Build/netgear-chk 52 define Build/netgear-chk
78 $(STAGING_DIR_HOST)/bin/mkchkimg \ 53 $(STAGING_DIR_HOST)/bin/mkchkimg \
79 -o $@.new \ 54 -o $@.new \
80 -k $@ \ 55 -k $@ \
Line 100... Line 75...
100 -noappend -root-owned -be -nopad -b 65536 \ 75 -noappend -root-owned -be -nopad -b 65536 \
101 $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH)) 76 $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
102 cat $@.fakesquashfs >> $@ 77 cat $@.fakesquashfs >> $@
103 endef 78 endef
Line 104... Line -...
104   -  
105 define Build/append-string -  
106 echo -n $(1) >> $@ -  
107 endef -  
108   79  
109 # append a fake/empty uImage header, to fool bootloaders rootfs integrity check 80 # append a fake/empty uImage header, to fool bootloaders rootfs integrity check
110 # for example 81 # for example
111 define Build/append-uImage-fakehdr 82 define Build/append-uImage-fakehdr
112 touch $@.fakehdr 83 touch $@.fakehdr
Line 166... Line 137...
166 define Build/gzip 137 define Build/gzip
167 gzip -f -9n -c $@ $(1) > $@.new 138 gzip -f -9n -c $@ $(1) > $@.new
168 @mv $@.new $@ 139 @mv $@.new $@
169 endef 140 endef
Line 170... Line -...
170   -  
171 define Build/zip -  
172 mkdir $@.tmp -  
173 mv $@ $@.tmp/$(1) -  
174   -  
175 zip -j -X \ -  
176 $(if $(SOURCE_DATE_EPOCH),--mtime="$(SOURCE_DATE_EPOCH)") \ -  
177 $@ $@.tmp/$(if $(1),$(1),$@) -  
178 rm -rf $@.tmp -  
179 endef -  
180   141  
181 define Build/jffs2 142 define Build/jffs2
182 rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \ 143 rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
183 mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \ 144 mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
184 cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \ 145 cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \
Line 252... Line 213...
252 newsize='size + pad'; \ 213 newsize='size + pad'; \
253 dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync 214 dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync
254 mv $@.new $@ 215 mv $@.new $@
255 endef 216 endef
Line 256... Line -...
256   -  
257 define Build/xor-image -  
258 $(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1) -  
259 mv $@.xor $@ -  
260 endef -  
261   217  
262 define Build/check-size 218 define Build/check-size
263 @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \ 219 @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $@)" ] || { \
264 echo "WARNING: Image file $@ is too big" >&2; \ 220 echo "WARNING: Image file $@ is too big" >&2; \
265 rm -f $@; \ 221 rm -f $@; \
Line 272... Line 228...
272 "$@" \ 228 "$@" \
273 "$@.new" 229 "$@.new"
274 @mv $@.new $@ 230 @mv $@.new $@
275 endef 231 endef
Line 276... Line -...
276   -  
277 define Build/linksys-image -  
278 $(TOPDIR)/scripts/linksys-image.sh \ -  
279 "$(call param_get_default,type,$(1),$(DEVICE_NAME))" \ -  
280 $@ $@.new -  
281 mv $@.new $@ -  
282 endef -  
283   232  
284 define Build/openmesh-image 233 define Build/openmesh-image
285 $(TOPDIR)/scripts/om-fwupgradecfg-gen.sh \ 234 $(TOPDIR)/scripts/om-fwupgradecfg-gen.sh \
286 "$(call param_get_default,ce_type,$(1),$(DEVICE_NAME))" \ 235 "$(call param_get_default,ce_type,$(1),$(DEVICE_NAME))" \
287 "$@-fwupgrade.cfg" \ 236 "$@-fwupgrade.cfg" \
Line 292... Line 241...
292 "$@-fwupgrade.cfg" "fwupgrade.cfg" \ 241 "$@-fwupgrade.cfg" "fwupgrade.cfg" \
293 "$(call param_get_default,kernel,$(1),$(IMAGE_KERNEL))" "kernel" \ 242 "$(call param_get_default,kernel,$(1),$(IMAGE_KERNEL))" "kernel" \
294 "$(call param_get_default,rootfs,$(1),$@)" "rootfs" 243 "$(call param_get_default,rootfs,$(1),$@)" "rootfs"
295 endef 244 endef
Line 296... Line -...
296   -  
297 define Build/qsdk-ipq-factory-nand -  
298 $(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \ -  
299 $@.its ubi $@ -  
300 PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new -  
301 @mv $@.new $@ -  
302 endef -  
303   -  
304 define Build/qsdk-ipq-factory-nor -  
305 $(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh \ -  
306 $@.its hlos $(IMAGE_KERNEL) rootfs $(IMAGE_ROOTFS) -  
307 PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new -  
308 @mv $@.new $@ -  
309 endef -  
310   -  
311 define Build/senao-header -  
312 $(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new -  
313 mv $@.new $@ -  
314 endef -  
315   245  
316 define Build/sysupgrade-tar 246 define Build/sysupgrade-tar
317 sh $(TOPDIR)/scripts/sysupgrade-tar.sh \ 247 sh $(TOPDIR)/scripts/sysupgrade-tar.sh \
318 --board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \ 248 --board $(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)) \
319 --kernel $(call param_get_default,kernel,$(1),$(IMAGE_KERNEL)) \ 249 --kernel $(call param_get_default,kernel,$(1),$(IMAGE_KERNEL)) \
Line 364... Line 294...
364 } \ 294 } \
365 }' 295 }'
Line 366... Line 296...
366   296  
367 define Build/append-metadata 297 define Build/append-metadata
368 $(if $(SUPPORTED_DEVICES),-echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@) -  
369 [ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || { \ -  
370 cp "$(BUILD_KEY).ucert" "$@.ucert" ;\ -  
371 usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\ -  
372 ucert -A -c "$@.ucert" -x "$@.sig" ;\ -  
373 fwtool -S "$@.ucert" "$@" ;\ -  
374 } 298 $(if $(SUPPORTED_DEVICES),-echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
Line 375... Line 299...
375 endef 299 endef
376   300  
377 define Build/kernel2minor 301 define Build/kernel2minor