commit ab80d5564b510b02c9e5f563fb99b37d41919661
author Peter Nordström <pnordstrom@google.com> Wed Jan 13 15:14:16 2021 -0800
committer Peter Nordström <pnordstrom@google.com> Wed Jan 13 23:34:42 2021 +0000
tree da05129fcb316e510c2abe7e17111a33dbda6ab8
parent 5686861758d5120fe8452dcd73f94a022e450bb7

Fix problem with multiple versions of uboot

If multiple versions of the uboot deb package exist on the apt
repo the makefile would barf when trying to unpack multiple files

Change-Id: Iede2280375d9fb9cf2ac3baece0f929785af516b

bootloader.mk

diff --git a/bootloader.mk b/bootloader.mk
index 3f01535..815e1c6 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -34,7 +34,8 @@
 $(PRODUCT_OUT)/u-boot.imx: fetch-uboot | out-dirs
 endif
 	$(LOG) u-boot extract
-	find $(PRODUCT_OUT)/packages -name 'uboot-imx*$(USERSPACE_ARCH)*.deb' | xargs \
+	find $(PRODUCT_OUT)/packages -name 'uboot-imx*$(USERSPACE_ARCH)*.deb' | \
+	sort -n | tail -1 | xargs \
 	dpkg --fsys-tarfile | \
 	tar --strip-components 2 -C $(PRODUCT_OUT) -xf - ./boot/u-boot.imx
 	$(LOG) u-boot finished