summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfunctions/firmwarelists.sh21
1 files changed, 11 insertions, 10 deletions
diff --git a/functions/firmwarelists.sh b/functions/firmwarelists.sh
index 5c552fc98..3c1f9a936 100755
--- a/functions/firmwarelists.sh
+++ b/functions/firmwarelists.sh
@@ -18,20 +18,21 @@ Firmware_List_From_Contents () {
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_FILE="cache/contents.chroot/contents.${DISTRO_CHROOT}.${LB_ARCHITECTURES}.gz"
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
+ # Ensure fresh
+ rm -f "${CONTENTS_FILE}"
- FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' "${CONTENTS_FILE}" | sort -u)"
+ wget ${WGET_OPTIONS} "${CONTENTS_URL}" -O "${CONTENTS_FILE}"
- # Don't waste disk space preserving since always getting fresh
- rm -f "${CONTENTS_FILE}"
+ local PACKAGES
+ PACKAGES="$(gunzip -c "${CONTENTS_FILE}" | awk '/^lib\/firmware/ { print $2 }' | sort -u )"
+ FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} ${PACKAGES}"
+
+ # Don't waste disk space preserving since always getting fresh
+ rm -f "${CONTENTS_FILE}"
+ done
}