From eb23a39a317d7fcdad6ac48a105d1a7a9bd88b09ec5fdfcc002b004ed1d06dad Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Sep 2016 19:24:33 +0000 Subject: [PATCH] Accepting request 424787 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/424787 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=79 --- u-boot-a10-olinuxino-lime.changes | 6 ++++++ u-boot-a10-olinuxino-lime.spec | 19 +++++++++++++++++-- u-boot-a13-olinuxino.changes | 6 ++++++ u-boot-a13-olinuxino.spec | 19 +++++++++++++++++-- u-boot-a13-olinuxinom.changes | 6 ++++++ u-boot-a13-olinuxinom.spec | 19 +++++++++++++++++-- u-boot-a20-olinuxino-lime.changes | 6 ++++++ u-boot-a20-olinuxino-lime.spec | 19 +++++++++++++++++-- u-boot-a20-olinuxino-lime2.changes | 6 ++++++ u-boot-a20-olinuxino-lime2.spec | 19 +++++++++++++++++-- u-boot-a20-olinuxinomicro.changes | 6 ++++++ u-boot-a20-olinuxinomicro.spec | 19 +++++++++++++++++-- u-boot-am335xboneblack.changes | 6 ++++++ u-boot-am335xboneblack.spec | 19 +++++++++++++++++-- u-boot-am335xevm.changes | 6 ++++++ u-boot-am335xevm.spec | 19 +++++++++++++++++-- u-boot-am57xxevm.changes | 6 ++++++ u-boot-am57xxevm.spec | 19 +++++++++++++++++-- u-boot-am57xxevmnodt.changes | 6 ++++++ u-boot-am57xxevmnodt.spec | 19 +++++++++++++++++-- u-boot-arndale.changes | 6 ++++++ u-boot-arndale.spec | 19 +++++++++++++++++-- u-boot-bananapi.changes | 6 ++++++ u-boot-bananapi.spec | 19 +++++++++++++++++-- u-boot-clearfog.changes | 6 ++++++ u-boot-clearfog.spec | 19 +++++++++++++++++-- u-boot-colibrit20.changes | 6 ++++++ u-boot-colibrit20.spec | 19 +++++++++++++++++-- u-boot-cubieboard.changes | 6 ++++++ u-boot-cubieboard.spec | 19 +++++++++++++++++-- u-boot-cubieboard2.changes | 6 ++++++ u-boot-cubieboard2.spec | 19 +++++++++++++++++-- u-boot-cubietruck.changes | 6 ++++++ u-boot-cubietruck.spec | 19 +++++++++++++++++-- u-boot-dragonboard410c.changes | 6 ++++++ u-boot-dragonboard410c.spec | 19 +++++++++++++++++-- u-boot-firefly-rk3288.changes | 6 ++++++ u-boot-firefly-rk3288.spec | 19 +++++++++++++++++-- u-boot-highbank.changes | 6 ++++++ u-boot-highbank.spec | 19 +++++++++++++++++-- u-boot-hyundaia7hd.changes | 6 ++++++ u-boot-hyundaia7hd.spec | 19 +++++++++++++++++-- u-boot-jetson-tk1.changes | 6 ++++++ u-boot-jetson-tk1.spec | 19 +++++++++++++++++-- u-boot-melea1000.changes | 6 ++++++ u-boot-melea1000.spec | 19 +++++++++++++++++-- u-boot-merriia80optimus.changes | 6 ++++++ u-boot-merriia80optimus.spec | 19 +++++++++++++++++-- u-boot-mx53loco.changes | 6 ++++++ u-boot-mx53loco.spec | 19 +++++++++++++++++-- u-boot-mx6cuboxi.changes | 6 ++++++ u-boot-mx6cuboxi.spec | 19 +++++++++++++++++-- u-boot-mx6qsabrelite.changes | 6 ++++++ u-boot-mx6qsabrelite.spec | 19 +++++++++++++++++-- u-boot-odroid-c2.changes | 6 ++++++ u-boot-odroid-c2.spec | 19 +++++++++++++++++-- u-boot-odroid-xu3.changes | 6 ++++++ u-boot-odroid-xu3.spec | 19 +++++++++++++++++-- u-boot-odroid.changes | 6 ++++++ u-boot-odroid.spec | 19 +++++++++++++++++-- u-boot-omap3beagle.changes | 6 ++++++ u-boot-omap3beagle.spec | 19 +++++++++++++++++-- u-boot-omap4panda.changes | 6 ++++++ u-boot-omap4panda.spec | 19 +++++++++++++++++-- u-boot-orangepipc.changes | 6 ++++++ u-boot-orangepipc.spec | 19 +++++++++++++++++-- u-boot-p2371-2180.changes | 6 ++++++ u-boot-p2371-2180.spec | 19 +++++++++++++++++-- u-boot-paz00.changes | 6 ++++++ u-boot-paz00.spec | 19 +++++++++++++++++-- u-boot-pcm051rev3.changes | 6 ++++++ u-boot-pcm051rev3.spec | 19 +++++++++++++++++-- u-boot-pine64plus.changes | 6 ++++++ u-boot-pine64plus.spec | 19 +++++++++++++++++-- u-boot-qemu-ppce500.changes | 6 ++++++ u-boot-qemu-ppce500.spec | 19 +++++++++++++++++-- u-boot-rpi.changes | 6 ++++++ u-boot-rpi.spec | 19 +++++++++++++++++-- u-boot-rpi2.changes | 6 ++++++ u-boot-rpi2.spec | 19 +++++++++++++++++-- u-boot-rpi3.changes | 6 ++++++ u-boot-rpi3.spec | 19 +++++++++++++++++-- u-boot-snow.changes | 6 ++++++ u-boot-snow.spec | 19 +++++++++++++++++-- u-boot-spring.changes | 6 ++++++ u-boot-spring.spec | 19 +++++++++++++++++-- u-boot-udoo.changes | 6 ++++++ u-boot-udoo.spec | 19 +++++++++++++++++-- u-boot.changes | 6 ++++++ u-boot.spec.in | 15 +++++++++++++++ 90 files changed, 1033 insertions(+), 88 deletions(-) diff --git a/u-boot-a10-olinuxino-lime.changes b/u-boot-a10-olinuxino-lime.changes index 4ede840..5ccd6be 100644 --- a/u-boot-a10-olinuxino-lime.changes +++ b/u-boot-a10-olinuxino-lime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-a10-olinuxino-lime.spec b/u-boot-a10-olinuxino-lime.spec index 9abff37..278a606 100644 --- a/u-boot-a10-olinuxino-lime.spec +++ b/u-boot-a10-olinuxino-lime.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A10-OLinuXino-Lime_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-a13-olinuxino.changes b/u-boot-a13-olinuxino.changes index 4ede840..5ccd6be 100644 --- a/u-boot-a13-olinuxino.changes +++ b/u-boot-a13-olinuxino.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-a13-olinuxino.spec b/u-boot-a13-olinuxino.spec index 30ea376..eb4c7a1 100644 --- a/u-boot-a13-olinuxino.spec +++ b/u-boot-a13-olinuxino.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A13-OLinuXino_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-a13-olinuxinom.changes b/u-boot-a13-olinuxinom.changes index 4ede840..5ccd6be 100644 --- a/u-boot-a13-olinuxinom.changes +++ b/u-boot-a13-olinuxinom.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-a13-olinuxinom.spec b/u-boot-a13-olinuxinom.spec index a5b1664..4ca23a2 100644 --- a/u-boot-a13-olinuxinom.spec +++ b/u-boot-a13-olinuxinom.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A13-OLinuXinoM_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-a20-olinuxino-lime.changes b/u-boot-a20-olinuxino-lime.changes index 4ede840..5ccd6be 100644 --- a/u-boot-a20-olinuxino-lime.changes +++ b/u-boot-a20-olinuxino-lime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-a20-olinuxino-lime.spec b/u-boot-a20-olinuxino-lime.spec index 5d06c7d..5009b0b 100644 --- a/u-boot-a20-olinuxino-lime.spec +++ b/u-boot-a20-olinuxino-lime.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-a20-olinuxino-lime2.changes b/u-boot-a20-olinuxino-lime2.changes index 4ede840..5ccd6be 100644 --- a/u-boot-a20-olinuxino-lime2.changes +++ b/u-boot-a20-olinuxino-lime2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-a20-olinuxino-lime2.spec b/u-boot-a20-olinuxino-lime2.spec index f5b2b1f..12be9ca 100644 --- a/u-boot-a20-olinuxino-lime2.spec +++ b/u-boot-a20-olinuxino-lime2.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-a20-olinuxinomicro.changes b/u-boot-a20-olinuxinomicro.changes index 4ede840..5ccd6be 100644 --- a/u-boot-a20-olinuxinomicro.changes +++ b/u-boot-a20-olinuxinomicro.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-a20-olinuxinomicro.spec b/u-boot-a20-olinuxinomicro.spec index 65043fa..a3c3f53 100644 --- a/u-boot-a20-olinuxinomicro.spec +++ b/u-boot-a20-olinuxinomicro.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino_MICRO_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-am335xboneblack.changes b/u-boot-am335xboneblack.changes index 4ede840..5ccd6be 100644 --- a/u-boot-am335xboneblack.changes +++ b/u-boot-am335xboneblack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-am335xboneblack.spec b/u-boot-am335xboneblack.spec index b6531ec..83b5fe3 100644 --- a/u-boot-am335xboneblack.spec +++ b/u-boot-am335xboneblack.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am335x_boneblack_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-am335xevm.changes b/u-boot-am335xevm.changes index 4ede840..5ccd6be 100644 --- a/u-boot-am335xevm.changes +++ b/u-boot-am335xevm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-am335xevm.spec b/u-boot-am335xevm.spec index 36a596f..5c58d72 100644 --- a/u-boot-am335xevm.spec +++ b/u-boot-am335xevm.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-am57xxevm.changes b/u-boot-am57xxevm.changes index 4ede840..5ccd6be 100644 --- a/u-boot-am57xxevm.changes +++ b/u-boot-am57xxevm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-am57xxevm.spec b/u-boot-am57xxevm.spec index 42bfce3..fb4a99a 100644 --- a/u-boot-am57xxevm.spec +++ b/u-boot-am57xxevm.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am57xx_evm_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-am57xxevmnodt.changes b/u-boot-am57xxevmnodt.changes index 4ede840..5ccd6be 100644 --- a/u-boot-am57xxevmnodt.changes +++ b/u-boot-am57xxevmnodt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-am57xxevmnodt.spec b/u-boot-am57xxevmnodt.spec index c8158ca..6f622c5 100644 --- a/u-boot-am57xxevmnodt.spec +++ b/u-boot-am57xxevmnodt.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" am57xx_evm_nodt_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-arndale.changes b/u-boot-arndale.changes index 4ede840..5ccd6be 100644 --- a/u-boot-arndale.changes +++ b/u-boot-arndale.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-arndale.spec b/u-boot-arndale.spec index abbbd47..6783b72 100644 --- a/u-boot-arndale.spec +++ b/u-boot-arndale.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" arndale_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-bananapi.changes b/u-boot-bananapi.changes index 4ede840..5ccd6be 100644 --- a/u-boot-bananapi.changes +++ b/u-boot-bananapi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-bananapi.spec b/u-boot-bananapi.spec index 9e2ecb1..1087a23 100644 --- a/u-boot-bananapi.spec +++ b/u-boot-bananapi.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Bananapi_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-clearfog.changes b/u-boot-clearfog.changes index 4ede840..5ccd6be 100644 --- a/u-boot-clearfog.changes +++ b/u-boot-clearfog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-clearfog.spec b/u-boot-clearfog.spec index e1a5caa..ab20572 100644 --- a/u-boot-clearfog.spec +++ b/u-boot-clearfog.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" clearfog_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-colibrit20.changes b/u-boot-colibrit20.changes index 4ede840..5ccd6be 100644 --- a/u-boot-colibrit20.changes +++ b/u-boot-colibrit20.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-colibrit20.spec b/u-boot-colibrit20.spec index 0868250..e70489e 100644 --- a/u-boot-colibrit20.spec +++ b/u-boot-colibrit20.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" colibri_t20_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-cubieboard.changes b/u-boot-cubieboard.changes index 4ede840..5ccd6be 100644 --- a/u-boot-cubieboard.changes +++ b/u-boot-cubieboard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-cubieboard.spec b/u-boot-cubieboard.spec index 43d1e28..317f4f9 100644 --- a/u-boot-cubieboard.spec +++ b/u-boot-cubieboard.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-cubieboard2.changes b/u-boot-cubieboard2.changes index 4ede840..5ccd6be 100644 --- a/u-boot-cubieboard2.changes +++ b/u-boot-cubieboard2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-cubieboard2.spec b/u-boot-cubieboard2.spec index e0a93b9..149bb78 100644 --- a/u-boot-cubieboard2.spec +++ b/u-boot-cubieboard2.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-cubietruck.changes b/u-boot-cubietruck.changes index 4ede840..5ccd6be 100644 --- a/u-boot-cubietruck.changes +++ b/u-boot-cubietruck.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-cubietruck.spec b/u-boot-cubietruck.spec index 05c7bb1..4f6411d 100644 --- a/u-boot-cubietruck.spec +++ b/u-boot-cubietruck.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-dragonboard410c.changes b/u-boot-dragonboard410c.changes index 4ede840..5ccd6be 100644 --- a/u-boot-dragonboard410c.changes +++ b/u-boot-dragonboard410c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-dragonboard410c.spec b/u-boot-dragonboard410c.spec index efb5f35..61a55f9 100644 --- a/u-boot-dragonboard410c.spec +++ b/u-boot-dragonboard410c.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" dragonboard410c_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-firefly-rk3288.changes b/u-boot-firefly-rk3288.changes index 4ede840..5ccd6be 100644 --- a/u-boot-firefly-rk3288.changes +++ b/u-boot-firefly-rk3288.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-firefly-rk3288.spec b/u-boot-firefly-rk3288.spec index c38154b..1bf8a45 100644 --- a/u-boot-firefly-rk3288.spec +++ b/u-boot-firefly-rk3288.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" firefly-rk3288_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-highbank.changes b/u-boot-highbank.changes index 4ede840..5ccd6be 100644 --- a/u-boot-highbank.changes +++ b/u-boot-highbank.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-highbank.spec b/u-boot-highbank.spec index df7dda9..d249fbf 100644 --- a/u-boot-highbank.spec +++ b/u-boot-highbank.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" highbank_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-hyundaia7hd.changes b/u-boot-hyundaia7hd.changes index 4ede840..5ccd6be 100644 --- a/u-boot-hyundaia7hd.changes +++ b/u-boot-hyundaia7hd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-hyundaia7hd.spec b/u-boot-hyundaia7hd.spec index 51b1a5b..7e22838 100644 --- a/u-boot-hyundaia7hd.spec +++ b/u-boot-hyundaia7hd.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Hyundai_A7HD_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-jetson-tk1.changes b/u-boot-jetson-tk1.changes index 4ede840..5ccd6be 100644 --- a/u-boot-jetson-tk1.changes +++ b/u-boot-jetson-tk1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-jetson-tk1.spec b/u-boot-jetson-tk1.spec index 0633be4..1ed05ac 100644 --- a/u-boot-jetson-tk1.spec +++ b/u-boot-jetson-tk1.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" jetson-tk1_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-melea1000.changes b/u-boot-melea1000.changes index 4ede840..5ccd6be 100644 --- a/u-boot-melea1000.changes +++ b/u-boot-melea1000.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-melea1000.spec b/u-boot-melea1000.spec index 7842f33..b7d5109 100644 --- a/u-boot-melea1000.spec +++ b/u-boot-melea1000.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-merriia80optimus.changes b/u-boot-merriia80optimus.changes index 4ede840..5ccd6be 100644 --- a/u-boot-merriia80optimus.changes +++ b/u-boot-merriia80optimus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-merriia80optimus.spec b/u-boot-merriia80optimus.spec index 3bf510e..6d99e87 100644 --- a/u-boot-merriia80optimus.spec +++ b/u-boot-merriia80optimus.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" Merrii_A80_Optimus_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-mx53loco.changes b/u-boot-mx53loco.changes index 4ede840..5ccd6be 100644 --- a/u-boot-mx53loco.changes +++ b/u-boot-mx53loco.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-mx53loco.spec b/u-boot-mx53loco.spec index b219280..3ec10d6 100644 --- a/u-boot-mx53loco.spec +++ b/u-boot-mx53loco.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.imx /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-mx6cuboxi.changes b/u-boot-mx6cuboxi.changes index 4ede840..5ccd6be 100644 --- a/u-boot-mx6cuboxi.changes +++ b/u-boot-mx6cuboxi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-mx6cuboxi.spec b/u-boot-mx6cuboxi.spec index 6768fb6..0bd6cc9 100644 --- a/u-boot-mx6cuboxi.spec +++ b/u-boot-mx6cuboxi.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" mx6cuboxi_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-mx6qsabrelite.changes b/u-boot-mx6qsabrelite.changes index 4ede840..5ccd6be 100644 --- a/u-boot-mx6qsabrelite.changes +++ b/u-boot-mx6qsabrelite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-mx6qsabrelite.spec b/u-boot-mx6qsabrelite.spec index ee0d12e..ec61b68 100644 --- a/u-boot-mx6qsabrelite.spec +++ b/u-boot-mx6qsabrelite.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.imx /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-odroid-c2.changes b/u-boot-odroid-c2.changes index 4ede840..5ccd6be 100644 --- a/u-boot-odroid-c2.changes +++ b/u-boot-odroid-c2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-odroid-c2.spec b/u-boot-odroid-c2.spec index 55e7b4b..369de89 100644 --- a/u-boot-odroid-c2.spec +++ b/u-boot-odroid-c2.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" odroid-c2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-odroid-xu3.changes b/u-boot-odroid-xu3.changes index 4ede840..5ccd6be 100644 --- a/u-boot-odroid-xu3.changes +++ b/u-boot-odroid-xu3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-odroid-xu3.spec b/u-boot-odroid-xu3.spec index c739103..e516fcb 100644 --- a/u-boot-odroid-xu3.spec +++ b/u-boot-odroid-xu3.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" odroid-xu3_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-odroid.changes b/u-boot-odroid.changes index 4ede840..5ccd6be 100644 --- a/u-boot-odroid.changes +++ b/u-boot-odroid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-odroid.spec b/u-boot-odroid.spec index 2e8c060..ddd1eef 100644 --- a/u-boot-odroid.spec +++ b/u-boot-odroid.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" odroid_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-omap3beagle.changes b/u-boot-omap3beagle.changes index 4ede840..5ccd6be 100644 --- a/u-boot-omap3beagle.changes +++ b/u-boot-omap3beagle.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-omap3beagle.spec b/u-boot-omap3beagle.spec index d6b5da2..5cb87ca 100644 --- a/u-boot-omap3beagle.spec +++ b/u-boot-omap3beagle.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-omap4panda.changes b/u-boot-omap4panda.changes index 4ede840..5ccd6be 100644 --- a/u-boot-omap4panda.changes +++ b/u-boot-omap4panda.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-omap4panda.spec b/u-boot-omap4panda.spec index 8a6ecdc..3408ba2 100644 --- a/u-boot-omap4panda.spec +++ b/u-boot-omap4panda.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-orangepipc.changes b/u-boot-orangepipc.changes index 4ede840..5ccd6be 100644 --- a/u-boot-orangepipc.changes +++ b/u-boot-orangepipc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-orangepipc.spec b/u-boot-orangepipc.spec index f5517a6..0b1b1ed 100644 --- a/u-boot-orangepipc.spec +++ b/u-boot-orangepipc.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" orangepi_pc_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-p2371-2180.changes b/u-boot-p2371-2180.changes index 4ede840..5ccd6be 100644 --- a/u-boot-p2371-2180.changes +++ b/u-boot-p2371-2180.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-p2371-2180.spec b/u-boot-p2371-2180.spec index 9d9c371..87c9754 100644 --- a/u-boot-p2371-2180.spec +++ b/u-boot-p2371-2180.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" p2371-2180_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-paz00.changes b/u-boot-paz00.changes index 4ede840..5ccd6be 100644 --- a/u-boot-paz00.changes +++ b/u-boot-paz00.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-paz00.spec b/u-boot-paz00.spec index b810dcb..8744045 100644 --- a/u-boot-paz00.spec +++ b/u-boot-paz00.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" paz00_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-pcm051rev3.changes b/u-boot-pcm051rev3.changes index 4ede840..5ccd6be 100644 --- a/u-boot-pcm051rev3.changes +++ b/u-boot-pcm051rev3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-pcm051rev3.spec b/u-boot-pcm051rev3.spec index d30f97a..595ae69 100644 --- a/u-boot-pcm051rev3.spec +++ b/u-boot-pcm051rev3.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" pcm051_rev3_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-pine64plus.changes b/u-boot-pine64plus.changes index 4ede840..5ccd6be 100644 --- a/u-boot-pine64plus.changes +++ b/u-boot-pine64plus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-pine64plus.spec b/u-boot-pine64plus.spec index 953d7a5..474380d 100644 --- a/u-boot-pine64plus.spec +++ b/u-boot-pine64plus.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" pine64_plus_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-qemu-ppce500.changes b/u-boot-qemu-ppce500.changes index 4ede840..5ccd6be 100644 --- a/u-boot-qemu-ppce500.changes +++ b/u-boot-qemu-ppce500.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-qemu-ppce500.spec b/u-boot-qemu-ppce500.spec index 03b88a2..fb4c399 100644 --- a/u-boot-qemu-ppce500.spec +++ b/u-boot-qemu-ppce500.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" qemu-ppce500_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-rpi.changes b/u-boot-rpi.changes index 4ede840..5ccd6be 100644 --- a/u-boot-rpi.changes +++ b/u-boot-rpi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-rpi.spec b/u-boot-rpi.spec index 7976a3d..199df4c 100644 --- a/u-boot-rpi.spec +++ b/u-boot-rpi.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-rpi2.changes b/u-boot-rpi2.changes index 4ede840..5ccd6be 100644 --- a/u-boot-rpi2.changes +++ b/u-boot-rpi2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-rpi2.spec b/u-boot-rpi2.spec index a6ac977..58a5d12 100644 --- a/u-boot-rpi2.spec +++ b/u-boot-rpi2.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_2_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-rpi3.changes b/u-boot-rpi3.changes index 4ede840..5ccd6be 100644 --- a/u-boot-rpi3.changes +++ b/u-boot-rpi3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-rpi3.spec b/u-boot-rpi3.spec index 936b8ed..cac1fb0 100644 --- a/u-boot-rpi3.spec +++ b/u-boot-rpi3.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" rpi_3_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-snow.changes b/u-boot-snow.changes index 4ede840..5ccd6be 100644 --- a/u-boot-snow.changes +++ b/u-boot-snow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-snow.spec b/u-boot-snow.spec index f93b556..21bc6cd 100644 --- a/u-boot-snow.spec +++ b/u-boot-snow.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" snow_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-spring.changes b/u-boot-spring.changes index 4ede840..5ccd6be 100644 --- a/u-boot-spring.changes +++ b/u-boot-spring.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-spring.spec b/u-boot-spring.spec index 575b338..94e0ecd 100644 --- a/u-boot-spring.spec +++ b/u-boot-spring.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" spring_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot-udoo.changes b/u-boot-udoo.changes index 4ede840..5ccd6be 100644 --- a/u-boot-udoo.changes +++ b/u-boot-udoo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot-udoo.spec b/u-boot-udoo.spec index 44951eb..01f8f34 100644 --- a/u-boot-udoo.spec +++ b/u-boot-udoo.spec @@ -71,6 +71,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -114,7 +116,7 @@ This package contains documentation for U-Boot firmware. %patch0018 -p1 %build -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" udoo_defconfig make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" @@ -129,7 +131,7 @@ done %endif %install -export SOURCE_DATE_EPOCH=1471010869 +export SOURCE_DATE_EPOCH=1472858744 export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true %define uboot_dir /boot @@ -188,6 +190,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/* diff --git a/u-boot.changes b/u-boot.changes index 4ede840..5ccd6be 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de + +- Add post-install script for Raspberry Pi to install to /boot/efi + where needed. (bsc#996064) + ------------------------------------------------------------------- Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com diff --git a/u-boot.spec.in b/u-boot.spec.in index ee7cf4c..1cee105 100644 --- a/u-boot.spec.in +++ b/u-boot.spec.in @@ -54,6 +54,8 @@ Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" # Owns /boot/vc directory BuildRequires: raspberrypi-firmware +# For mountpoint +Requires(post): util-linux %endif Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) @@ -154,6 +156,19 @@ install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin %endif +%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2" || "%{name}" == "u-boot-rpi3" +%post +# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. +# It needs to be on the first FAT partition, wherever we mounted it. +# a) Unmounted, then do nothing. +# b) Mounted as /boot/vc, then they're in the right place already. +# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. +# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. +if mountpoint -q /boot/efi; then + [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.BINEND /boot/efi/ +fi +%endif + %files %defattr(-,root,root) %{uboot_dir}/*