Author: blogic Date: 2015-11-23 08:14:38 +0100 (Mon, 23 Nov 2015) New Revision: 47604
Added: branches/chaos_calmer/target/linux/brcm2708/base-files/lib/preinit/79_move_config branches/chaos_calmer/target/linux/brcm2708/base-files/lib/upgrade/ branches/chaos_calmer/target/linux/brcm2708/base-files/lib/upgrade/platform.sh Modified: branches/chaos_calmer/target/linux/brcm2708/image/Makefile Log: CC: brcm2708: Add sysupgrade support for Raspberry Pi Also create .gz images if configured to do so. This is equivalent, but different to what we have in trunk, as the image creation has been rewritten there. Signed-off-by: Bruno Randolf <[email protected]> Added: branches/chaos_calmer/target/linux/brcm2708/base-files/lib/preinit/79_move_config =================================================================== --- branches/chaos_calmer/target/linux/brcm2708/base-files/lib/preinit/79_move_config (rev 0) +++ branches/chaos_calmer/target/linux/brcm2708/base-files/lib/preinit/79_move_config 2015-11-23 07:14:38 UTC (rev 47604) @@ -0,0 +1,18 @@ +#!/bin/sh +# Copyright (C) 2015 OpenWrt.org + +BOOTPART=/dev/mmcblk0p1 + +move_config() { + if [ -b $BOOTPART ]; then + insmod nls_cp437 + insmod nls_iso8859-1 + insmod fat + insmod vfat + mount -t vfat -o rw,noatime $BOOTPART /mnt + [ -f /mnt/sysupgrade.tgz ] && mv -f /mnt/sysupgrade.tgz / + umount /mnt + fi +} + +boot_hook_add preinit_mount_root move_config Added: branches/chaos_calmer/target/linux/brcm2708/base-files/lib/upgrade/platform.sh =================================================================== --- branches/chaos_calmer/target/linux/brcm2708/base-files/lib/upgrade/platform.sh (rev 0) +++ branches/chaos_calmer/target/linux/brcm2708/base-files/lib/upgrade/platform.sh 2015-11-23 07:14:38 UTC (rev 47604) @@ -0,0 +1,17 @@ +platform_check_image() { + # i know no way to verify the image + return 0; +} + +platform_do_upgrade() { + sync + get_image "$1" | dd of=/dev/mmcblk0 bs=2M conv=fsync + sleep 1 +} + +platform_copy_config() { + mount -t vfat -o rw,noatime /dev/mmcblk0p1 /mnt + cp -af "$CONF_TAR" /mnt/ + sync + umount /mnt +} Modified: branches/chaos_calmer/target/linux/brcm2708/image/Makefile =================================================================== --- branches/chaos_calmer/target/linux/brcm2708/image/Makefile 2015-11-22 21:59:22 UTC (rev 47603) +++ branches/chaos_calmer/target/linux/brcm2708/image/Makefile 2015-11-23 07:14:38 UTC (rev 47604) @@ -28,6 +28,9 @@ mcopy -i $(KDIR)/boot.img $(KDIR)/Image ::kernel.img # Copy OpenWrt built kernel ./gen_rpi_sdcard_img.sh $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img $(KDIR)/boot.img $(KDIR)/root.$(1) \ $(CONFIG_BRCM2708_SD_BOOT_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) + ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) + gzip -9n -c $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img > $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img.gz + endif endef define Image/Build _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
