From aa745de0bbdfec3a2e23f4d76b081664d5d24673 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Tue, 11 Feb 2020 17:44:31 +0000 Subject: firmware: de-dup firmware list parsing Edit: There were four copies of the same logic to keep in sync; Originally this patch deduplicated each file, but leaving a copy of the new function in each, thus reducing the duplication but not eliminating it. A later patch moved it into a shared function file following further enhancements to the code in question. This has since been revised to have the function moved to a shared file here, which simplifies and gives a cleaner diff. Gbp-Dch: Short Closes: #952908 --- functions/firmwarelists.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 functions/firmwarelists.sh (limited to 'functions') diff --git a/functions/firmwarelists.sh b/functions/firmwarelists.sh new file mode 100755 index 000000000..5c552fc98 --- /dev/null +++ b/functions/firmwarelists.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +## live-build(7) - System Build Scripts +## Copyright (C) 2006-2015 Daniel Baumann +## +## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +## This is free software, and you are welcome to redistribute it +## under certain conditions; see COPYING for details. + +# Updates FIRMWARE_PACKAGES with list of packages determined from specified +# archive areas of specified distro, based upon reading archive content file. +# +# Shared by chroot_firmware and installer_debian-installer +# +# Assumption: firmware packages install files into /lib/firmware +Firmware_List_From_Contents () { + local MIRROR_CHROOT="${1}" + local DISTRO_CHROOT="${2}" + local ARCHIVE_AREAS="${3}" + + local CONTENTS_FILE="cache/contents.chroot/contents.${DISTRO_CHROOT}.${LB_ARCHITECTURES}" + + # Ensure fresh + rm -f "${CONTENTS_FILE}" + + for _ARCHIVE_AREA in ${ARCHIVE_AREAS} + do + local CONTENTS_URL="${MIRROR_CHROOT}/dists/${DISTRO_CHROOT}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz" + + wget ${WGET_OPTIONS} "${CONTENTS_URL}" -O - | gunzip -c >> "${CONTENTS_FILE}" + done + + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' "${CONTENTS_FILE}" | sort -u)" + + # Don't waste disk space preserving since always getting fresh + rm -f "${CONTENTS_FILE}" +} -- cgit v1.2.3