[elbe-devel] [PATCH 3/6] examples/beaglebone: Remove stretch versions

bage at linutronix.de bage at linutronix.de
Tue Mar 17 11:27:28 CET 2020


From: Bastian Germann <bage at linutronix.de>

The beaglebone example builds without errors even though elbe cannot copy
some files in its finetuning section which contain a stretch kernel version.
Move existing files version independent using glob (*).

Fixes #219.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 examples/armhf-ti-beaglebone-black.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/armhf-ti-beaglebone-black.xml b/examples/armhf-ti-beaglebone-black.xml
index 6bbc98fb8..8ac4c309f 100644
--- a/examples/armhf-ti-beaglebone-black.xml
+++ b/examples/armhf-ti-beaglebone-black.xml
@@ -89,16 +89,18 @@
 			<cp path="/usr/lib/u-boot/am335x_boneblack/MLO">/boot/MLO</cp>
 			<!-- move the 2nd stage bootloader to the path where the 1 stage expects it -->
 			<cp path="/usr/lib/u-boot/am335x_boneblack/u-boot.img">/boot/u-boot.img</cp>
-			<!-- move the devicetree to the path where the bootloader expects it -->
-			<cp path="/usr/lib/linux-image-4.9.0-3-armmp/am335x-boneblack.dtb">/boot/dtb-4.9.0-3-armmp</cp>
+			<!-- move boot files to the path where the bootloader expects them to be -->
+			<mv path="/usr/lib/linux-image-*-armmp/am335x-boneblack.dtb">/boot/am335x-boneblack.dtb</mv>
+			<mv path="/boot/initrd.img-*-armmp">/boot/initrd.img-armmp</mv>
+			<mv path="/boot/vmlinuz-*-armmp">/boot/vmlinuz-armmp</mv>
 			<!-- set a proper u-boot environment -->
-			<command>echo "uenvcmd=setenv bootargs 'console=ttyO0,115200 root=/dev/mmcblk0p2';load mmc 0:1 0x84000000 vmlinuz-4.9.0-3-armmp;load mmc 0:1 0x82000000 dtb-4.9.0-3-armmp;load mmc 0:1 0x88000000 initrd.img-4.9.0-3-armmp;bootz 0x84000000 0x88000000:\${filesize} 0x82000000" > /boot/uEnv.txt</command>
+			<command>echo "uenvcmd=setenv bootargs 'console=ttyO0,115200 root=/dev/mmcblk0p2';load mmc 0:1 0x84000000 vmlinuz-armmp;load mmc 0:1 0x82000000 am335x-boneblack.dtb;load mmc 0:1 0x88000000 initrd.img-armmp;bootz 0x84000000 0x88000000:\${filesize} 0x82000000" > /boot/uEnv.txt</command>
 			<!-- shrink target image -->
 			<rm>/var/cache/apt/archives/*.deb</rm>
 			<rm>/var/cache/apt/*.bin</rm>
 			<rm>/var/lib/apt/lists/ftp*</rm>
 			<artifact>/usr/lib/u-boot/am335x_boneblack/MLO</artifact>
-			<artifact>/usr/lib/linux-image-4.9.0-3-armmp/am335x-boneblack.dtb</artifact>
+			<artifact>/boot/am335x-boneblack.dtb</artifact>
 		</finetuning>
 		<!-- generate a pbuilder environment (before image will be built) -->
 		<pbuilder>
-- 
2.20.1




More information about the elbe-devel mailing list