On 07/18/2014 06:25 PM, John Crispin wrote:
> 4) we make a script that we call after the build on the server that
> repackages the images
>
> how about that ?
Hmmm, I think it should not be done on the server, but as part of the
OpenWRT build - also if I compile locally I would like to get a
sysupgrade image to upgrade from AA to BB... Relying on server scripts
would exclude this possibility, and also make more awkward to maintain
your build server scripts (special cases for rare platforms).
It would be possible to create a special image for upgrade from AA,
something like
"openwrt-au1000-au1500-jffs2-128k-sysupgrade-from-12.09.bin", but I
think it's simpler to just add a symlink to the tar.gz in all cases,
like this:
diff --git a/target/linux/au1000/image/Makefile
b/target/linux/au1000/image/Makefile
index 63c0b03..060f87a 100644
--- a/target/linux/au1000/image/Makefile
+++ b/target/linux/au1000/image/Makefile
@@ -63,8 +63,11 @@ define Image/Build
$(CP) $(KDIR)/kernel.flash.srec
$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-flash.srec
$(CP) $(KDIR)/kernel.ram.srec
$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-ram.srec
$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1).fs
$(TMP_DIR)/$(IMG_PREFIX)-root.fs
+ # link for backwards compatibility with Attitude Adjustment
+ ln -sfn $(TMP_DIR)/$(IMG_PREFIX)-root.fs
$(TMP_DIR)/$(IMG_PREFIX)-jffs2-128k.fs
tar -C $(BIN_DIR) -cvzf
$(BIN_DIR)/$(IMG_PREFIX)-$(1)-sysupgrade.bin \
- $(IMG_PREFIX)-vmlinux.bin -C $(TMP_DIR)
$(IMG_PREFIX)-root.fs
+ $(IMG_PREFIX)-vmlinux.bin -C $(TMP_DIR)
$(IMG_PREFIX)-root.fs \
+ $(IMG_PREFIX)-jffs2-128k.fs
ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
$(call Image/Build/Initramfs)
endif
What do you think? If you agree I will post this as a properly formatted
patch.
bruno
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
