0
0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-12-22 11:03:48 +01:00

Upload firmware images to updates directory (currently not versioned).

This commit is contained in:
Wouter R 2013-10-16 19:04:33 +02:00
parent b5d8f7895a
commit ff4abc71c0
2 changed files with 37 additions and 2 deletions

View File

@ -1,11 +1,20 @@
#!/bin/sh #!/bin/sh
#prevent being run as root (which is dangerous)
if [ "$(id -u)" == "0" ]; then
echo "Don't run this script as root, it is potentially dangerous." 1>&2
exit 1
fi
OPENWRT_BASE=. OPENWRT_BASE=.
PKG_SRC_DIR=$OPENWRT_BASE/bin/ar71xx/packages PKG_SRC_DIR=$OPENWRT_BASE/bin/ar71xx/packages
PKG_DEST_SUBPATH=updates PKG_DEST_SUBPATH=updates
MAKE_INDEX_SCRIPT=$OPENWRT_BASE/scripts/ipkg-make-index.sh MAKE_INDEX_SCRIPT=$OPENWRT_BASE/scripts/ipkg-make-index.sh
INDEX_FILE=Packages INDEX_FILE=Packages
INDEX_GZ_FILE=Packages.gz INDEX_GZ_FILE=Packages.gz
DEVICE_TYPES="tl-mr3020 tl-wr703"
MAX_GOOD_IMAGE_SIZE=3500000
IMAGE_BASENAME="doodle3d-wifibox"
COMPRESS_RESULT=0 COMPRESS_RESULT=0
PKG_DEST_BASE=. PKG_DEST_BASE=.
@ -54,6 +63,27 @@ rm -f $PKG_FEED_DIR/$INDEX_FILE
rm -f $PKG_FEED_DIR/$INDEX_GZ_FILE rm -f $PKG_FEED_DIR/$INDEX_GZ_FILE
#copy and rename images
if [ ! -d $PKG_IMG_DIR ]; then mkdir $PKG_IMG_DIR; fi
for devtype in $DEVICE_TYPES; do
IMG_SRC_PATH=$OPENWRT_BASE/bin/ar71xx
if [ -f $IMG_SRC_PATH/openwrt-ar71xx-generic-${devtype}-v1-squashfs-sysupgrade.bin ]; then
sysupgrade_name=$IMG_SRC_PATH/openwrt-ar71xx-generic-${devtype}-v1-squashfs-sysupgrade.bin
factory_name=$IMG_SRC_PATH/openwrt-ar71xx-generic-${devtype}-v1-squashfs-factory.bin
sysupgrade_size=`stat -f %z $sysupgrade_name`
factory_size=`stat -f %z $factory_name`
echo "Copying images for device '${devtype}' (sysupgrade size: ${sysupgrade_size}, factory size: ${factory_size})"
if [ $sysupgrade_size -gt $MAX_GOOD_IMAGE_SIZE ]; then
echo "WARNING: the sysupgrade is larger than $MAX_GOOD_IMAGE_SIZE bytes, which probably means it will cause read/write problems when flashed to a device"
fi
cp $sysupgrade_name $PKG_IMG_DIR/$IMAGE_BASENAME-${devtype}-sysupgrade.bin
cp $factory_name $PKG_IMG_DIR/$IMAGE_BASENAME-${devtype}-factory.bin
fi
done
# NOTE: the aliasing construct in the indexing script does not work (and even then, the md5 command defaults to a different output format), so we hack around it here. # NOTE: the aliasing construct in the indexing script does not work (and even then, the md5 command defaults to a different output format), so we hack around it here.
MD5_HACK_ENABLED=0 MD5_HACK_ENABLED=0
which md5sum >/dev/null 2>&1 which md5sum >/dev/null 2>&1
@ -72,9 +102,9 @@ fi
#this cwd juggling is required to have the package indexer generate correct paths (i.e. no paths) in the Packages file #this cwd juggling is required to have the package indexer generate correct paths (i.e. no paths) in the Packages file
OPENWRT_DIR=`pwd` OPENWRT_DIR=`pwd`
pushd $PKG_FEED_DIR pushd $PKG_FEED_DIR > /dev/null
$OPENWRT_DIR/$MAKE_INDEX_SCRIPT . > $PKG_FEED_DIR/$INDEX_FILE $OPENWRT_DIR/$MAKE_INDEX_SCRIPT . > $PKG_FEED_DIR/$INDEX_FILE
popd popd > /dev/null
if [ $MD5_HACK_ENABLED -eq 1 ]; then if [ $MD5_HACK_ENABLED -eq 1 ]; then
rm $TEMPBIN_DIR/md5sum rm $TEMPBIN_DIR/md5sum

View File

@ -34,6 +34,11 @@ for arg in "$@"; do
done done
$WIFIBOX_BASE_DIR/extra/scripts/create-wifibox-updates-dir.sh $OPTIONS $WIFIBOX_BASE_DIR/extra/scripts/create-wifibox-updates-dir.sh $OPTIONS
RETURN_VALUE=$?
if [ $RETURN_VALUE -ne 0 ]; then
echo "create-wifibox-updates-dir.sh returned an error (${RETURN_VALUE}), exiting"
exit $RETURN_VALUE
fi
if [ $UPLOAD_FILES -eq 1 ]; then if [ $UPLOAD_FILES -eq 1 ]; then
UPLOAD_PATH=$BASE_URL:public_html/updates UPLOAD_PATH=$BASE_URL:public_html/updates