From 6a193719c257033a80f45afb0153881b15a1daa7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 28 Feb 2020 13:55:27 -0600
Subject: [PATCH] mk_mmc.sh: drop lib/distro.conf

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 lib/distro.conf | 14 --------------
 mk_mmc.sh       | 18 +++++-------------
 2 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100755 lib/distro.conf

diff --git a/lib/distro.conf b/lib/distro.conf
deleted file mode 100755
index bf44ce3..0000000
--- a/lib/distro.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-unset UBOOTWRAPPER
-NETIMAGE="current"
-NETINSTALL="initrd.gz"
-case "${DISTARCH}-${debian_boot}" in
-stretch-armhf-netboot|buster-armhf-netboot)
-	#http://ftp.us.debian.org/debian/dists/stretch/main/installer-armhf/
-	#http://ftp.us.debian.org/debian/dists/buster/main/installer-armhf/
-	HTTP_IMAGE="http://ftp.debian.org/debian/dists"
-	BASE_IMAGE="netboot"
-	;;
-esac
-#
diff --git a/mk_mmc.sh b/mk_mmc.sh
index ae92de3..a635d7c 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -274,21 +274,9 @@ dl_kernel_image () {
 	echo "Using Kernel: ${ACTUAL_DEB_FILE}"
 }
 
-remove_uboot_wrapper () {
-	echo "Note: NetInstall has u-boot header, removing..."
-	echo "-----------------------------"
-	dd if="${DIR}/dl/${DISTARCH}/${NETINSTALL}" bs=64 skip=1 of="${DIR}/dl/${DISTARCH}/initrd.gz"
-	echo "-----------------------------"
-	NETINSTALL="initrd.gz"
-	unset UBOOTWRAPPER
-}
-
 actually_dl_netinstall () {
 	${dl} --directory-prefix="${DIR}/dl/${DISTARCH}" "${HTTP_IMAGE}/${DIST}/main/installer-${ARCH}/${NETIMAGE}/images/${BASE_IMAGE}/${NETINSTALL}"
 	MD5SUM=$(md5sum "${DIR}/dl/${DISTARCH}/${NETINSTALL}" | awk '{print $1}')
-	if [ "${UBOOTWRAPPER}" ] ; then
-		remove_uboot_wrapper
-	fi
 }
 
 dl_netinstall_image () {
@@ -298,7 +286,11 @@ dl_netinstall_image () {
 
 	##FIXME: "network-console" support...
 	debian_boot="netboot"
-	. "${DIR}/lib/distro.conf"
+
+	NETIMAGE="current"
+	NETINSTALL="initrd.gz"
+	HTTP_IMAGE="http://ftp.debian.org/debian/dists"
+	BASE_IMAGE="netboot"
 
 	if [ -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" ] ; then
 		rm -f "${DIR}/dl/${DISTARCH}/${NETINSTALL}" || true