From 07af4392c630b7f93c0ed1a63482c07e4b08324f2ca3d96f42c8db1a92298e69 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Mon, 1 Mar 2021 12:50:06 +0000 Subject: [PATCH 1/4] Accepting request 875980 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/875980 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=130 --- u-boot.changes | 6 ++++++ u-boot.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/u-boot.changes b/u-boot.changes index 597a1db..1b8e01c 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 1 09:36:17 UTC 2021 - Guillaume GARDET + +- Build with arm-trusted-firmware for Tumbleweed +- Drop unused uboot_atf_pine64 option + ------------------------------------------------------------------- Tue Feb 16 19:58:28 UTC 2021 - Matthias Brugger diff --git a/u-boot.spec b/u-boot.spec index e74ab41..0824733 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -206,8 +206,12 @@ ExclusiveArch: do_not_build %endif %endif %endif +%if 0%{?suse_version} > 1500 +# arm-trusted-firmware is only in Tumbleweed +%bcond_without uboot_atf +%else %bcond_with uboot_atf -%bcond_with uboot_atf_pine64 +%endif Version: 2021.01 Release: 0 Summary: The U-Boot firmware for the %target platform From 056bfead3a0db2e46d0c5133856c60bce825ce46affa7a3dee1bd6b0af3012e7 Mon Sep 17 00:00:00 2001 From: Matthias Brugger Date: Mon, 1 Mar 2021 15:55:53 +0000 Subject: [PATCH 2/4] Accepting request 875994 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/875994 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=131 --- u-boot.changes | 6 ++++++ update_git.sh | 15 ++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/u-boot.changes b/u-boot.changes index 1b8e01c..09877e3 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 1 13:13:54 UTC 2021 - Matthias Gerstner + +- update_git.sh: use safe tmp directories, use authenticated https:// + procotol. + ------------------------------------------------------------------- Mon Mar 1 09:36:17 UTC 2021 - Guillaume GARDET diff --git a/update_git.sh b/update_git.sh index a5e6081..448f8bd 100644 --- a/update_git.sh +++ b/update_git.sh @@ -11,15 +11,14 @@ set -e -GIT_TREE=git://github.com/openSUSE/u-boot.git +GIT_TREE=https://github.com/openSUSE/u-boot.git GIT_LOCAL_TREE=~/src/opensuse/u-boot GIT_BRANCH=tumbleweed-2021.01 GIT_UPSTREAM_TAG=v2021.01 -GIT_DIR=/dev/shm/u-boot-factory-git-dir -CMP_DIR=/dev/shm/u-boot-factory-cmp-dir +GIT_DIR=`mktemp -d -p /dev/shm` +CMP_DIR=`mktemp -d -p /dev/shm` -rm -rf $GIT_DIR -rm -rf $CMP_DIR +trap 'rm -rf "$GIT_DIR" "$CMP_DIR"' EXIT if [ -d "$GIT_LOCAL_TREE" ] || [ -L "$GIT_LOCAL_TREE" ]; then echo "Processing $GIT_BRANCH branch of local git tree, using tag:" \ @@ -57,7 +56,6 @@ fi UBOOT_VERSION="${UBOOT_VERSION}${UBOOT_EXTRAVERSION}" echo "U-Boot version: $UBOOT_VERSION" -rm -rf $GIT_DIR ( CHANGED_COUNT=0 @@ -70,9 +68,10 @@ rm -rf $GIT_DIR # Process patches to eliminate useless differences: limit file names to 40 chars # before extension and remove git signature. ('32' below gets us past dir prefix) for i in $CMP_DIR/*; do + base=`basename "$i"` # format-patch may append a signature, which per default contains the git version # wipe everything starting from the signature tag - sed '/^-- $/Q' $i > $CMP_DIR/${i:32:40}.patch + sed '/^-- $/Q' $i > $CMP_DIR/${base:0:40}.patch rm $i done @@ -128,8 +127,6 @@ rm -rf $GIT_DIR echo " added: $ADDED_COUNT" ) -rm -rf $CMP_DIR - echo "Updating patch list" # Handle patch list automatically in spec file patch_list=`ls 0*.patch` From 50f90b9f8489b1d58d146cccd1ba91fa2cc42c08ca46459b8e1d7ef04d3455a5 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Thu, 4 Mar 2021 11:05:08 +0000 Subject: [PATCH 3/4] Accepting request 876718 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/876718 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=132 --- u-boot.changes | 6 ++++++ u-boot.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/u-boot.changes b/u-boot.changes index 09877e3..e8940ee 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 4 10:51:38 UTC 2021 - Guillaume GARDET + +- Guard 'export BL31' for sun50i_h6 and sun50i_a64 with + '%{with uboot_atf}' condition + ------------------------------------------------------------------- Mon Mar 1 13:13:54 UTC 2021 - Matthias Gerstner diff --git a/u-boot.spec b/u-boot.spec index 0824733..fc82aa4 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -408,11 +408,15 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" tools-only %else export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/u-boot.changes | tail -n 1 | cut -d- -f1 )" +%s) %if 0%{?is_a64} || 0%{?is_h5} +%if %{with uboot_atf} export BL31=%{_datadir}/arm-trusted-firmware-sun50i_a64/bl31.bin +%endif export SCP=/dev/null %endif %if 0%{?is_h6} +%if %{with uboot_atf} export BL31=%{_datadir}/arm-trusted-firmware-sun50i_h6/bl31.bin +%endif export SCP=/dev/null %endif %if "%{name}" == "u-boot-qemu-riscv64spl" From bf5141ec8c0856f2820422807433b1de701e601e135fde982b15099ea034cd5a Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Thu, 4 Mar 2021 16:04:37 +0000 Subject: [PATCH 4/4] Accepting request 876771 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/876771 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=133 --- u-boot.changes | 7 ++++++- u-boot.spec | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/u-boot.changes b/u-boot.changes index e8940ee..328b429 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,8 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 4 14:59:52 UTC 2021 - Matthias Brugger + +- Fix confname assignment for zynqmp and zynq case (bsc#1182962) + ------------------------------------------------------------------- Thu Mar 4 10:51:38 UTC 2021 - Guillaume GARDET - Guard 'export BL31' for sun50i_h6 and sun50i_a64 with - '%{with uboot_atf}' condition + '%{with uboot_atf}' condition (bsc#1182962) ------------------------------------------------------------------- Mon Mar 1 13:13:54 UTC 2021 - Matthias Gerstner diff --git a/u-boot.spec b/u-boot.spec index fc82aa4..eb77dca 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -437,11 +437,13 @@ cp %{_datadir}/arm-trusted-firmware-rk3399/bl31.elf . %if %{is_zynq} confname="xilinx_zynq_virt_defconfig" -%elif %{is_zynqmp} +%else +%if %{is_zynqmp} confname="xilinx_zynqmp_virt_defconfig" %else confname=$(ls configs | perl -ne '$l=lc; $l=~ s,_,,g; $l eq "%{target}defconfig\n" && print;') %endif +%endif %if "%target" == "avnetultra96rev1" export DEVICE_TREE=avnet-ultra96-rev1