Hello community, here is the log from the commit of package JeOS for openSUSE:Leap:15.2:ARM:Images checked in at 2020-02-18 14:26:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2:ARM:Images/JeOS (Old) and /work/SRC/openSUSE:Leap:15.2:ARM:Images/.JeOS.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "JeOS" Tue Feb 18 14:26:35 2020 rev:16 rq:774989 version:2020.02.17 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2:ARM:Images/JeOS/JeOS.changes 2020-02-17 16:39:17.303287787 +0100 +++ /work/SRC/openSUSE:Leap:15.2:ARM:Images/.JeOS.new.26092/JeOS.changes 2020-02-18 14:26:38.954876351 +0100 @@ -1,0 +2,6 @@ +Mon Feb 17 19:15:56 UTC 2020 - Guillaume GARDET <[email protected]> + +- Backport from Tumbleweed JeOS: + * Handle u-boot-dtb.imx file (for sabrelite) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ E20-arndale.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.354889909 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.354889909 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> E20-chromebook.kiwi: same change E20-cuboxi.kiwi: same change ++++++ E20-efi.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.390889975 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.390889975 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> E20-efi.x86_64.kiwi: same change ++++++ E20-hikey.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.418890027 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.418890027 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> E20-paz00.kiwi: same change E20-raspberrypi2.kiwi: same change E20-raspberrypi3.aarch64.kiwi: same change E20-raspberrypi4.aarch64.kiwi: same change ++++++ E20-rootfs.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.486890153 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.486890153 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ E20-rootfs.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.498890175 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.498890175 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ E20-rootfs.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.510890197 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.510890197 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ E20-rootfs.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.522890219 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.522890219 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ E20-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.534890242 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.538890249 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> E20-sinovoipbpim2plus.kiwi: same change GNOME-arndale.kiwi: same change GNOME-chromebook.kiwi: same change GNOME-cuboxi.kiwi: same change ++++++ GNOME-efi.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.602890367 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.602890367 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> GNOME-efi.x86_64.kiwi: same change ++++++ GNOME-hikey.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.634890427 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.638890434 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> GNOME-paz00.kiwi: same change GNOME-raspberrypi2.kiwi: same change GNOME-raspberrypi3.aarch64.kiwi: same change GNOME-raspberrypi4.aarch64.kiwi: same change ++++++ GNOME-rootfs.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.714890575 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.714890575 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ GNOME-rootfs.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.730890604 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.730890604 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ GNOME-rootfs.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.746890634 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.746890634 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ GNOME-rootfs.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.766890670 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.766890670 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ GNOME-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:46.782890700 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:46.782890700 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> GNOME-sinovoipbpim2plus.kiwi: same change JeOS-a13olinuxino.kiwi: same change JeOS-a20olinuxinolime.kiwi: same change JeOS-a20olinuxinomicro.kiwi: same change JeOS-arndale.kiwi: same change JeOS-bananapi.kiwi: same change JeOS-beagle.kiwi: same change JeOS-beaglebone.kiwi: same change JeOS-chromebook.kiwi: same change JeOS-clearfog.kiwi: same change JeOS-cubieboard.kiwi: same change JeOS-cubieboard2.kiwi: same change JeOS-cubietruck.kiwi: same change JeOS-cubox.kiwi: same change JeOS-cuboxi.kiwi: same change ++++++ JeOS-efi-devel.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.034891166 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.038891174 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> JeOS-efi-devel.x86_64.kiwi: same change JeOS-efi-pxe.aarch64.kiwi: same change JeOS-efi-pxe.kiwi: same change JeOS-efi-pxe.x86_64.kiwi: same change JeOS-efi-vmx.aarch64.kiwi: same change JeOS-efi.aarch64.kiwi: same change JeOS-efi.x86_64.kiwi: same change ++++++ JeOS-fireflyrk3288.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.158891395 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.158891395 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> JeOS-hikey.kiwi: same change JeOS-loco.kiwi: same change JeOS-m400-pxe.kiwi: same change JeOS-midway-pxe.kiwi: same change JeOS-nanopik2.kiwi: same change JeOS-nanopineo.kiwi: same change JeOS-nanopineoair.kiwi: same change JeOS-odroid.kiwi: same change JeOS-odroidc2.kiwi: same change JeOS-odroidxu3.kiwi: same change JeOS-olinuxinolime.kiwi: same change JeOS-olinuxinolime2.kiwi: same change JeOS-panda.kiwi: same change JeOS-paz00.kiwi: same change ++++++ JeOS-pine64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.390891824 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.390891824 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS-raspberrypi2.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.410891861 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.410891861 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> JeOS-raspberrypi3.aarch64.kiwi: same change JeOS-raspberrypi4.aarch64.kiwi: same change ++++++ JeOS-rock64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.446891928 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.446891928 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS-rootfs-devel.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.458891950 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.462891958 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.478891987 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.478891987 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> JeOS-sinovoipbpim2plus.kiwi: same change JeOS-socfpgade0nanosoc.kiwi: same change JeOS-tinker.kiwi: same change JeOS-udooneo.kiwi: same change ++++++ JeOS-ultra96.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.546892113 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.550892120 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS-wega.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.558892135 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.562892143 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS-zynqmp.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.570892157 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.574892164 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.586892187 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.586892187 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.598892209 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.598892209 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.614892238 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.614892238 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ JeOS.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.626892261 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.626892261 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ KDE-arndale.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.638892283 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.638892283 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> KDE-chromebook.kiwi: same change KDE-cuboxi.kiwi: same change ++++++ KDE-efi.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.674892349 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.678892356 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> KDE-efi.x86_64.kiwi: same change ++++++ KDE-hikey.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.706892409 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.706892409 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> KDE-paz00.kiwi: same change KDE-raspberrypi2.kiwi: same change KDE-raspberrypi3.aarch64.kiwi: same change KDE-raspberrypi4.aarch64.kiwi: same change ++++++ KDE-rootfs.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.770892527 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.770892527 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ KDE-rootfs.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.786892556 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.786892556 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ KDE-rootfs.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.798892579 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.798892579 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ KDE-rootfs.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.814892608 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.814892608 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ KDE-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.830892638 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.830892638 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> KDE-sinovoipbpim2plus.kiwi: same change LXQT-arndale.kiwi: same change LXQT-chromebook.kiwi: same change LXQT-cuboxi.kiwi: same change ++++++ LXQT-efi.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.894892756 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.898892763 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> LXQT-efi.x86_64.kiwi: same change ++++++ LXQT-hikey.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.918892801 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.922892808 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> LXQT-paz00.kiwi: same change LXQT-raspberrypi2.kiwi: same change LXQT-raspberrypi3.aarch64.kiwi: same change LXQT-raspberrypi4.aarch64.kiwi: same change ++++++ LXQT-rootfs.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.978892912 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.978892912 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ LXQT-rootfs.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.986892926 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.990892933 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ LXQT-rootfs.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:47.998892948 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:47.998892948 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ LXQT-rootfs.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.010892971 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.010892971 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ LXQT-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.022892993 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.022892993 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> LXQT-sinovoipbpim2plus.kiwi: same change X11-arndale.kiwi: same change X11-chromebook.kiwi: same change X11-cuboxi.kiwi: same change ++++++ X11-efi.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.090893119 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.090893119 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> X11-efi.x86_64.kiwi: same change ++++++ X11-hikey.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.118893170 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.118893170 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> X11-paz00.kiwi: same change X11-raspberrypi2.kiwi: same change X11-raspberrypi3.aarch64.kiwi: same change X11-raspberrypi4.aarch64.kiwi: same change ++++++ X11-rootfs.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.186893296 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.186893296 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ X11-rootfs.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.198893318 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.198893318 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ X11-rootfs.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.210893340 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.210893340 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ X11-rootfs.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.222893363 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.222893363 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ X11-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.238893392 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.238893392 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> X11-sinovoipbpim2plus.kiwi: same change XFCE-arndale.kiwi: same change XFCE-chromebook.kiwi: same change XFCE-cuboxi.kiwi: same change ++++++ XFCE-efi.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.302893511 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.302893511 +0100 @@ -35,7 +35,7 @@ <volume name="var" copy_on_write="false"/> </systemdisk> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> XFCE-efi.x86_64.kiwi: same change ++++++ XFCE-hikey.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.338893577 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.338893577 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> XFCE-paz00.kiwi: same change XFCE-raspberrypi2.kiwi: same change XFCE-raspberrypi3.aarch64.kiwi: same change XFCE-raspberrypi4.aarch64.kiwi: same change ++++++ XFCE-rootfs.aarch64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.414893717 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.414893717 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: aarch64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ XFCE-rootfs.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.430893747 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.430893747 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: armv7l armv7hl --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ XFCE-rootfs.riscv64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.454893791 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.458893799 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: riscv64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ XFCE-rootfs.x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.470893821 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.470893821 +0100 @@ -19,7 +19,7 @@ <!-- OBS-ExclusiveArch: x86_64 --> <preferences> <type image="tbz" primary="true"/> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> ++++++ XFCE-sabrelite.kiwi ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.482893843 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.482893843 +0100 @@ -25,7 +25,7 @@ <oem-skip-verify>true</oem-skip-verify> </oemconfig> </type> - <version>2020.02.15</version> + <version>2020.02.17</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> <keytable>us.map.gz</keytable> XFCE-sinovoipbpim2plus.kiwi: same change ++++++ uboot-image-a13olinuxino-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.794894420 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.798894428 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-a20olinuxinolime-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.818894464 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.818894464 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-a20olinuxinomicro-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.834894494 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.838894501 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-arndale-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.858894539 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.858894539 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-bananapi-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.870894560 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.870894560 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-beagle-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.886894590 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.886894590 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-beaglebone-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.898894613 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.898894613 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-chromebook-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.906894627 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.910894634 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-clearfog-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.922894657 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.922894657 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-cubieboard-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.930894672 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.934894679 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-cubieboard2-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.950894708 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.950894708 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-cubietruck-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.966894738 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.970894746 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-cubox-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:48.990894782 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:48.990894782 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-cuboxi-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.006894812 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.006894812 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-efi-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.018894834 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.018894834 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-fireflyrk3288-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.030894856 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.030894856 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-hikey-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.042894879 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.042894879 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-install.in ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.054894900 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.054894900 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-loco-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.062894915 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.062894915 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-m400-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.078894945 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.078894945 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-midway-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.094894975 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.094894975 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-nanopik2-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.110895005 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.110895005 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-nanopineo-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.122895026 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.122895026 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-nanopineoair-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.142895064 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.142895064 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-odroid-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.162895100 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.162895100 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-odroidc2-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.182895138 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.182895138 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-odroidxu3-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.194895159 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.194895159 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-olinuxinolime-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.210895189 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.210895189 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-olinuxinolime2-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.226895218 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.230895226 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-panda-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.246895256 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.246895256 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-paz00-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.254895271 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.254895271 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-pine64-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.270895300 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.270895300 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-raspberrypi2-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.278895315 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.278895315 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-raspberrypi3-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.286895330 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.286895330 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-raspberrypi4-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.294895344 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.298895351 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-rock64-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.322895396 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.322895396 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-sabrelite-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.334895418 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.334895418 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-sinovoipbpim2plus-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.350895448 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.350895448 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-socfpgade0nanosoc-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.362895470 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.362895470 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-tinker-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.370895485 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.374895492 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-udooneo-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.382895507 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.382895507 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-ultra96-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.398895536 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.398895536 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-wega-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.414895566 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.414895566 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi ++++++ uboot-image-zynqmp-install ++++++ --- /var/tmp/diff_new_pack.hnsKxt/_old 2020-02-18 14:26:49.422895581 +0100 +++ /var/tmp/diff_new_pack.hnsKxt/_new 2020-02-18 14:26:49.426895589 +0100 @@ -61,7 +61,7 @@ force_mbr=1 fi - if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" ]; then + if [ -f "boot/imx6-spl.bin" -o -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then # SPL goes at sector 2, overlapping GPT force_mbr=1 fi @@ -385,14 +385,15 @@ #========================================== # install i.MX 5/6 U-Boot as raw #------------------------------------------ -if [ -f "boot/u-boot.imx" ]; then +if [ -f "boot/u-boot.imx" -o -f "boot/u-boot-dtb.imx" ]; then if [ ! "$is_firstboot" ]; then pushd /usr/src/packages/KIWIROOT-oem/ else pushd / fi - echo "Installing U-Boot..." - if ! dd if=boot/u-boot.imx of=$diskname bs=512 seek=2 conv=notrunc; then + imx_file=`ls boot/u-boot*.imx | head -n 1` + echo "Installing U-Boot: $imx_file..." + if ! dd if=$imx_file of=$diskname bs=512 seek=2 conv=notrunc; then echo "Couldn't install U-Boot on $diskname" exit 1 fi
