From 9e42b330540124361e0a48534d81586c3e790059 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 27 Feb 2020 15:37:07 -0600 Subject: [PATCH] distro: rip out the whole MD5SUM/TEST_MD5SUM network bandwith is cheaper then me maintaining these... Signed-off-by: Robert Nelson --- lib/distro.conf | 20 +++++--------------- mk_mmc.sh | 17 ++--------------- 2 files changed, 7 insertions(+), 30 deletions(-) diff --git a/lib/distro.conf b/lib/distro.conf index 7ef6357..e5e9715 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -3,46 +3,36 @@ unset UBOOTWRAPPER case "${DISTARCH}-${debian_boot}" in trusty-armhf-netboot) - #15-Apr-2014 #http://ports.ubuntu.com/dists/trusty/main/installer-armhf/ - NETIMAGE="20101020ubuntu318" - TEST_MD5SUM="0888e3e43b6eb93638101cbe0c7f0730" + NETIMAGE="current" HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" BASE_IMAGE="generic/netboot" NETINSTALL="initrd.gz" ;; xenial-armhf-netboot) - #20-Apr-2016 #http://ports.ubuntu.com/dists/xenial/main/installer-armhf/ - NETIMAGE="20101020ubuntu451" - TEST_MD5SUM="5d3660f70577ee27e894b2623f0f6fc2" + NETIMAGE="current" HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" BASE_IMAGE="generic/netboot" NETINSTALL="initrd.gz" ;; bionic-armhf-netboot) - #2018-04-25 #http://ports.ubuntu.com/dists/bionic/main/installer-armhf/ - NETIMAGE="20101020ubuntu543" - TEST_MD5SUM="358cbf828db6322a56c448222d1847ce" + NETIMAGE="current" HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" BASE_IMAGE="generic/netboot" NETINSTALL="initrd.gz" ;; jessie-armhf-netboot) - #2018-06-19 #http://ftp.us.debian.org/debian/dists/jessie/main/installer-armhf/ - NETIMAGE="20150422+deb8u5" - TEST_MD5SUM="f4b0a74e850cbfdb4caac2f748cea206" + NETIMAGE="current" HTTP_IMAGE="http://ftp.debian.org/debian/dists" BASE_IMAGE="netboot" NETINSTALL="initrd.gz" ;; stretch-armhf-netboot) - #2019-10-08 #http://ftp.us.debian.org/debian/dists/stretch/main/installer-armhf/ - NETIMAGE="20170615+deb9u7+b2" - TEST_MD5SUM="ba3036be463687930932387afff0df17" + NETIMAGE="current" HTTP_IMAGE="http://ftp.debian.org/debian/dists" BASE_IMAGE="netboot" NETINSTALL="initrd.gz" diff --git a/mk_mmc.sh b/mk_mmc.sh index f0ca15c..e8f6cf9 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -287,20 +287,6 @@ actually_dl_netinstall () { fi } -check_dl_netinstall () { - MD5SUM=$(md5sum "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | awk '{print $1}') - if [ "x${TEST_MD5SUM}" != "x${MD5SUM}" ] ; then - echo "Note: NetInstall md5sum has changed: ${MD5SUM}" - echo "-----------------------------" - rm -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" || true - actually_dl_netinstall - else - if [ "${UBOOTWRAPPER}" ] ; then - remove_uboot_wrapper - fi - fi -} - dl_netinstall_image () { echo "" echo "Downloading NetInstall Image" @@ -311,7 +297,8 @@ dl_netinstall_image () { . "${DIR}/lib/distro.conf" if [ -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" ] ; then - check_dl_netinstall + rm -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" || true + actually_dl_netinstall else actually_dl_netinstall fi