diff --git a/pre_checkin.sh b/pre_checkin.sh index 5dcacf8..5738100 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -44,11 +44,11 @@ mx53loco*|mx6qsabrelite*|efika*) BINEND=imx ;; XLOADER=1 ;; *arndale*) BINEND=bin ARNDALE_SPL=1 ;; -*Cubieboard*|Cubietruck*) BINEND=bin +*Cubieboard*|Cubietruck*) BINEND=img SUNXI_SPL=1 ;; -*Mele_A1000*) BINEND=bin +*Mele_A1000*) BINEND=img SUNXI_SPL=1 ;; -*Hyundai_A7HD*) BINEND=bin +*Hyundai_A7HD*) BINEND=img SUNXI_SPL=1 ;; *snow*) BINEND=img ;; mx6_cubox-i*) BINEND=img diff --git a/u-boot-am335xevm.changes b/u-boot-am335xevm.changes index cfb8917..c8479b2 100644 --- a/u-boot-am335xevm.changes +++ b/u-boot-am335xevm.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-am335xevm.spec b/u-boot-am335xevm.spec index 67c5f3e..d0ddc28 100644 --- a/u-boot-am335xevm.spec +++ b/u-boot-am335xevm.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-arndale.changes b/u-boot-arndale.changes index cfb8917..c8479b2 100644 --- a/u-boot-arndale.changes +++ b/u-boot-arndale.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-arndale.spec b/u-boot-arndale.spec index 346feb8..41ffd90 100644 --- a/u-boot-arndale.spec +++ b/u-boot-arndale.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-colibrit20iris.changes b/u-boot-colibrit20iris.changes index cfb8917..c8479b2 100644 --- a/u-boot-colibrit20iris.changes +++ b/u-boot-colibrit20iris.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-colibrit20iris.spec b/u-boot-colibrit20iris.spec index 8f27e1b..10853a8 100644 --- a/u-boot-colibrit20iris.spec +++ b/u-boot-colibrit20iris.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" colibri_t20_iris_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-cubieboard.changes b/u-boot-cubieboard.changes index cfb8917..c8479b2 100644 --- a/u-boot-cubieboard.changes +++ b/u-boot-cubieboard.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-cubieboard.spec b/u-boot-cubieboard.spec index b04764a..4219671 100644 --- a/u-boot-cubieboard.spec +++ b/u-boot-cubieboard.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,15 +103,14 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-cubieboard2.changes b/u-boot-cubieboard2.changes index cfb8917..c8479b2 100644 --- a/u-boot-cubieboard2.changes +++ b/u-boot-cubieboard2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-cubieboard2.spec b/u-boot-cubieboard2.spec index 8ca8cba..d543262 100644 --- a/u-boot-cubieboard2.spec +++ b/u-boot-cubieboard2.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,15 +103,14 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-cubietruck.changes b/u-boot-cubietruck.changes index cfb8917..c8479b2 100644 --- a/u-boot-cubietruck.changes +++ b/u-boot-cubietruck.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-cubietruck.spec b/u-boot-cubietruck.spec index 405af15..79fbf26 100644 --- a/u-boot-cubietruck.spec +++ b/u-boot-cubietruck.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,15 +103,14 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-highbank.changes b/u-boot-highbank.changes index cfb8917..c8479b2 100644 --- a/u-boot-highbank.changes +++ b/u-boot-highbank.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-highbank.spec b/u-boot-highbank.spec index ef29366..59de53d 100644 --- a/u-boot-highbank.spec +++ b/u-boot-highbank.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-melea1000.changes b/u-boot-melea1000.changes index cfb8917..c8479b2 100644 --- a/u-boot-melea1000.changes +++ b/u-boot-melea1000.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-melea1000.spec b/u-boot-melea1000.spec index db0a5f5..bffa278 100644 --- a/u-boot-melea1000.spec +++ b/u-boot-melea1000.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,15 +103,14 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then - install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin -elif [ -f u-boot-dtb.bin ]; then - install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot-dtb-tegra.img %{buildroot}/boot/u-boot.img +elif [ -f u-boot-dtb.img ]; then + install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img else - install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin + install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img fi %if %x_loader == 1 install -D -m 0755 MLO %{buildroot}/boot/MLO @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-mx53loco.changes b/u-boot-mx53loco.changes index cfb8917..c8479b2 100644 --- a/u-boot-mx53loco.changes +++ b/u-boot-mx53loco.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-mx53loco.spec b/u-boot-mx53loco.spec index 713408d..fc6977f 100644 --- a/u-boot-mx53loco.spec +++ b/u-boot-mx53loco.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.imx %{buildroot}/boot/u-boot.imx # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-mx6qsabrelite.changes b/u-boot-mx6qsabrelite.changes index cfb8917..c8479b2 100644 --- a/u-boot-mx6qsabrelite.changes +++ b/u-boot-mx6qsabrelite.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-mx6qsabrelite.spec b/u-boot-mx6qsabrelite.spec index 3a3be04..4499f28 100644 --- a/u-boot-mx6qsabrelite.spec +++ b/u-boot-mx6qsabrelite.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.imx %{buildroot}/boot/u-boot.imx # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-omap3beagle.changes b/u-boot-omap3beagle.changes index cfb8917..c8479b2 100644 --- a/u-boot-omap3beagle.changes +++ b/u-boot-omap3beagle.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-omap3beagle.spec b/u-boot-omap3beagle.spec index 9a3d842..b65b9f1 100644 --- a/u-boot-omap3beagle.spec +++ b/u-boot-omap3beagle.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-omap4panda.changes b/u-boot-omap4panda.changes index cfb8917..c8479b2 100644 --- a/u-boot-omap4panda.changes +++ b/u-boot-omap4panda.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-omap4panda.spec b/u-boot-omap4panda.spec index e1ce60b..bc496a4 100644 --- a/u-boot-omap4panda.spec +++ b/u-boot-omap4panda.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-paz00.changes b/u-boot-paz00.changes index cfb8917..c8479b2 100644 --- a/u-boot-paz00.changes +++ b/u-boot-paz00.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-paz00.spec b/u-boot-paz00.spec index 9811f27..dc27c4c 100644 --- a/u-boot-paz00.spec +++ b/u-boot-paz00.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" paz00_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-rpib.changes b/u-boot-rpib.changes index cfb8917..c8479b2 100644 --- a/u-boot-rpib.changes +++ b/u-boot-rpib.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-rpib.spec b/u-boot-rpib.spec index 38486d7..6c2354e 100644 --- a/u-boot-rpib.spec +++ b/u-boot-rpib.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-rpmlintrc b/u-boot-rpmlintrc index 9c35900..cfde5ca 100644 --- a/u-boot-rpmlintrc +++ b/u-boot-rpmlintrc @@ -6,4 +6,3 @@ addFilter("name-repeated-in-summary") addFilter("incorrect-fsf-address") addFilter("file-contains-date-and-time") addFilter("strict-aliasing-punning") -addFilter("no-rpm-opt-flags") diff --git a/u-boot-snow.changes b/u-boot-snow.changes index cfb8917..c8479b2 100644 --- a/u-boot-snow.changes +++ b/u-boot-snow.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-snow.spec b/u-boot-snow.spec index 345c391..f35edcd 100644 --- a/u-boot-snow.spec +++ b/u-boot-snow.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" snow_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot-vexpressaemv8a.changes b/u-boot-vexpressaemv8a.changes index cfb8917..c8479b2 100644 --- a/u-boot-vexpressaemv8a.changes +++ b/u-boot-vexpressaemv8a.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot-vexpressaemv8a.spec b/u-boot-vexpressaemv8a.spec index 666931a..683cfa3 100644 --- a/u-boot-vexpressaemv8a.spec +++ b/u-boot-vexpressaemv8a.spec @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" vexpress_aemv8a_defconfig -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin diff --git a/u-boot.changes b/u-boot.changes index cfb8917..c8479b2 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net + +- Add u-boot-with-sunxi-spl.bin for sunxi boards + +------------------------------------------------------------------- +Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org + +- Make use of RPM_OPT_FLAGS during make + +------------------------------------------------------------------- +Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org + +- Fix sunxi boards (use u-boot.img instead of u-boot.bin) +- Remove duplicated default install line + ------------------------------------------------------------------- Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org diff --git a/u-boot.spec b/u-boot.spec index 6dab5e7..39698d6 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -54,7 +54,7 @@ mkimage- a tool that creates kernel bootable images for u-boot. # needed for include/config/auto.conf make defconfig make silentoldconfig -make USE_PRIVATE_LIBGG=yes tools-only +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes tools-only %install install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage diff --git a/u-boot.spec.in b/u-boot.spec.in index cc18f68..9c4ab82 100644 --- a/u-boot.spec.in +++ b/u-boot.spec.in @@ -95,9 +95,7 @@ rm -rf board/Marvell %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG -# temporary disable of --build-id -#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes -make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes +make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" # Chromebook ARM (snow) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) @@ -105,7 +103,6 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %install -install -D -m 0644 u-boot.BINEND %{buildroot}/boot/u-boot.BINEND # Some times u-boot needs a dtb to configure itself appended to the binary. # In that case prefer the one with a working dtb already appended. if [ -f u-boot-dtb-tegra.bin ]; then @@ -127,6 +124,7 @@ install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img %endif %if %sunxi_spl == 1 install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin +install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin