Hello community, here is the log from the commit of package dtb-source for openSUSE:Factory checked in at 2016-08-05 18:16:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dtb-source (Old) and /work/SRC/openSUSE:Factory/.dtb-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dtb-source" Changes: -------- --- /work/SRC/openSUSE:Factory/dtb-source/dtb-aarch64.changes 2016-06-20 11:07:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dtb-source.new/dtb-aarch64.changes 2016-08-05 18:16:38.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Jul 31 18:35:21 UTC 2016 - [email protected] + +- Update dtb-keystone to cover the renamed keystone-*.dts (4.7), + not just k2hk, and drop dtb-k2e, dtb-k2l packages +* Add dtb-k2e, dtb-k2l Provides to dtb-keystone +- Add Provides for previously updated arm64 packages +- Enable arm64 altera (v4.4), nvidia, renesas (v4.5) +- Package arm64 socionext (v4.5), al, amlogic (v4.6), lg (v4.7) +- Tidy subpackage description + +------------------------------------------------------------------- dtb-armv6l.changes: same change dtb-armv7l.changes: same change dtb-source.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.pRIgJD/_old 2016-08-05 18:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pRIgJD/_new 2016-08-05 18:16:40.000000000 +0200 @@ -39,6 +39,24 @@ %description Device Tree files for $MACHINES. +%package -n dtb-al +Summary: Alpine Labs based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-al +Device Tree files for Alpine Labs based arm64 systems. + +%package -n dtb-altera +Summary: Altera based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-altera +Device Tree files for Altera based arm64 systems. + %package -n dtb-amd Summary: AMD based arm64 systems Group: System/Boot @@ -46,25 +64,37 @@ Requires(post): coreutils %description -n dtb-amd -Device Tree Files for AMD based arm64 systems. +Device Tree files for AMD based arm64 systems. + +%package -n dtb-amlogic +Summary: Amlogic based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-amlogic +Device Tree files for Amlogic based arm64 systems. %package -n dtb-apm Summary: AppliedMicro based arm64 systems Group: System/Boot +Provides: dtb-apm-mustang = %version Provides: multiversion(dtb) Requires(post): coreutils %description -n dtb-apm -Device Tree Files for AppliedMicro based arm64 systems. +Device Tree files for AppliedMicro based arm64 systems. %package -n dtb-arm Summary: ARM Ltd. based arm64 systems Group: System/Boot +Provides: dtb-foundation-v8 = %version +Provides: dtb-rtsm_ve-aemv8a = %version Provides: multiversion(dtb) Requires(post): coreutils %description -n dtb-arm -Device Tree Files for ARM Ltd. based arm64 systems. +Device Tree files for ARM Ltd. based arm64 systems. %package -n dtb-broadcom Summary: Broadcom based arm64 systems @@ -73,16 +103,17 @@ Requires(post): coreutils %description -n dtb-broadcom -Device Tree Files for Broadcom based arm64 systems. +Device Tree files for Broadcom based arm64 systems. %package -n dtb-cavium Summary: Cavium based arm64 systems Group: System/Boot +Provides: dtb-thunder-88xx = %version Provides: multiversion(dtb) Requires(post): coreutils %description -n dtb-cavium -Device Tree Files for Cavium based arm64 systems. +Device Tree files for Cavium based arm64 systems. %package -n dtb-exynos Summary: Samsung Exynos based arm64 systems @@ -91,7 +122,7 @@ Requires(post): coreutils %description -n dtb-exynos -Device Tree Files for Samsung Exynos based arm64 systems. +Device Tree files for Samsung Exynos based arm64 systems. %package -n dtb-freescale Summary: NXP (Freescale) based arm64 systems @@ -100,16 +131,26 @@ Requires(post): coreutils %description -n dtb-freescale -Device Tree Files for NXP (Freescale) based arm64 systems. +Device Tree files for NXP (Freescale) based arm64 systems. %package -n dtb-hisilicon Summary: HiSilicon based arm64 systems Group: System/Boot +Provides: dtb-hisilicon64 = %version Provides: multiversion(dtb) Requires(post): coreutils %description -n dtb-hisilicon -Device Tree Files for HiSilicon based arm64 systems. +Device Tree files for HiSilicon based arm64 systems. + +%package -n dtb-lg +Summary: LG based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-lg +Device Tree files for LG based arm64 systems. %package -n dtb-marvell Summary: Marvell based arm64 systems @@ -118,7 +159,7 @@ Requires(post): coreutils %description -n dtb-marvell -Device Tree Files for Marvell based arm64 systems. +Device Tree files for Marvell based arm64 systems. %package -n dtb-mediatek Summary: MediaTek based arm64 systems @@ -127,7 +168,16 @@ Requires(post): coreutils %description -n dtb-mediatek -Device Tree Files for MediaTek based arm64 systems. +Device Tree files for MediaTek based arm64 systems. + +%package -n dtb-nvidia +Summary: Nvidia based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-nvidia +Device Tree files for Nvidia based arm64 systems. %package -n dtb-qcom Summary: Qualcomm based arm64 systems @@ -136,7 +186,16 @@ Requires(post): coreutils %description -n dtb-qcom -Device Tree Files for Qualcomm based arm64 systems. +Device Tree files for Qualcomm based arm64 systems. + +%package -n dtb-renesas +Summary: Renesas based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-renesas +Device Tree files for Renesas based arm64 systems. %package -n dtb-rockchip Summary: Rockchip based arm64 systems @@ -145,7 +204,16 @@ Requires(post): coreutils %description -n dtb-rockchip -Device Tree Files for Rockchip based arm64 systems. +Device Tree files for Rockchip based arm64 systems. + +%package -n dtb-socionext +Summary: Socionext based arm64 systems +Group: System/Boot +Provides: multiversion(dtb) +Requires(post): coreutils + +%description -n dtb-socionext +Device Tree files for Socionext based arm64 systems. %package -n dtb-sprd Summary: Spreadtrum based arm64 systems @@ -154,7 +222,7 @@ Requires(post): coreutils %description -n dtb-sprd -Device Tree Files for Spreadtrum based arm64 systems. +Device Tree files for Spreadtrum based arm64 systems. %package -n dtb-xilinx Summary: Xilinx based arm64 systems @@ -163,7 +231,7 @@ Requires(post): coreutils %description -n dtb-xilinx -Device Tree Files for Xilinx based arm64 systems. +Device Tree files for Xilinx based arm64 systems. @@ -177,7 +245,7 @@ export DTC_FLAGS="-R 4 -p 0x1000" cd %{_prefix}/src/linux/arch/arm64/boot/dts -for dts in amd/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts marvell/*.dts mediatek/*.dts qcom/*.dts rockchip/*.dts sprd/*.dts xilinx/*.dts ; do +for dts in al/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $PPDIR/$target.dts @@ -191,13 +259,27 @@ %if "dtb-aarch64" != "dtb-source" cd pp -for dts in amd/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts marvell/*.dts mediatek/*.dts qcom/*.dts rockchip/*.dts sprd/*.dts xilinx/*.dts ; do +for dts in al/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) done cd - +%post -n dtb-al +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + +%post -n dtb-altera +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + %post -n dtb-amd cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -205,6 +287,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%post -n dtb-amlogic +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + %post -n dtb-apm cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -254,6 +343,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%post -n dtb-lg +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + %post -n dtb-marvell cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -268,6 +364,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%post -n dtb-nvidia +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + %post -n dtb-qcom cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -275,6 +378,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%post -n dtb-renesas +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + %post -n dtb-rockchip cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -282,6 +392,13 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%post -n dtb-socionext +cd /boot +# If /boot/dtb is a symlink, remove it, so that we can replace it. +[ -d dtb ] && [ -L dtb ] && rm -f dtb +# Unless /boot/dtb exists as real directory, create a symlink. +[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb + %post -n dtb-sprd cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -296,6 +413,22 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%files -n dtb-al +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/al +%{dtbdir}/al/*.dtb + +%files -n dtb-altera +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/altera +%{dtbdir}/altera/*.dtb + %files -n dtb-amd %defattr(-,root,root) %doc COPYING @@ -304,6 +437,14 @@ %dir %{dtbdir}/amd %{dtbdir}/amd/*.dtb +%files -n dtb-amlogic +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/amlogic +%{dtbdir}/amlogic/*.dtb + %files -n dtb-apm %defattr(-,root,root) %doc COPYING @@ -360,6 +501,14 @@ %dir %{dtbdir}/hisilicon %{dtbdir}/hisilicon/*.dtb +%files -n dtb-lg +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/lg +%{dtbdir}/lg/*.dtb + %files -n dtb-marvell %defattr(-,root,root) %doc COPYING @@ -376,6 +525,14 @@ %dir %{dtbdir}/mediatek %{dtbdir}/mediatek/*.dtb +%files -n dtb-nvidia +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/nvidia +%{dtbdir}/nvidia/*.dtb + %files -n dtb-qcom %defattr(-,root,root) %doc COPYING @@ -384,6 +541,14 @@ %dir %{dtbdir}/qcom %{dtbdir}/qcom/*.dtb +%files -n dtb-renesas +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/renesas +%{dtbdir}/renesas/*.dtb + %files -n dtb-rockchip %defattr(-,root,root) %doc COPYING @@ -392,6 +557,14 @@ %dir %{dtbdir}/rockchip %{dtbdir}/rockchip/*.dtb +%files -n dtb-socionext +%defattr(-,root,root) +%doc COPYING +%ghost /boot/dtb +%dir %{dtbdir} +%dir %{dtbdir}/socionext +%{dtbdir}/socionext/*.dtb + %files -n dtb-sprd %defattr(-,root,root) %doc COPYING ++++++ dtb-armv6l.spec ++++++ --- /var/tmp/diff_new_pack.pRIgJD/_old 2016-08-05 18:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pRIgJD/_new 2016-08-05 18:16:40.000000000 +0200 @@ -46,7 +46,7 @@ Requires(post): coreutils %description -n dtb-bcm2835 -Device Tree Files for Raspberry Pi 1 (A+, B, B+). +Device Tree files for Raspberry Pi 1 (A+, B, B+). ++++++ dtb-armv7l.spec ++++++ --- /var/tmp/diff_new_pack.pRIgJD/_old 2016-08-05 18:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pRIgJD/_new 2016-08-05 18:16:40.000000000 +0200 @@ -46,7 +46,7 @@ Requires(post): coreutils %description -n dtb-am335x -Device Tree Files for TI AM335x based systems. +Device Tree files for TI AM335x based systems. %package -n dtb-am3517 Summary: TI AM3517 based systems @@ -55,7 +55,7 @@ Requires(post): coreutils %description -n dtb-am3517 -Device Tree Files for TI AM3517 based systems. +Device Tree files for TI AM3517 based systems. %package -n dtb-am57xx Summary: TI AM57xx based systems @@ -64,7 +64,7 @@ Requires(post): coreutils %description -n dtb-am57xx -Device Tree Files for TI AM57xx based systems. +Device Tree files for TI AM57xx based systems. %package -n dtb-armada-370 Summary: Armada 370 based systems @@ -73,7 +73,7 @@ Requires(post): coreutils %description -n dtb-armada-370 -Device Tree Files for Armada 370 based systems. +Device Tree files for Armada 370 based systems. %package -n dtb-armada-375 Summary: Armada 375 based systems @@ -82,7 +82,7 @@ Requires(post): coreutils %description -n dtb-armada-375 -Device Tree Files for Armada 375 based systems. +Device Tree files for Armada 375 based systems. %package -n dtb-armada-385 Summary: Armada 385 based systems @@ -91,7 +91,7 @@ Requires(post): coreutils %description -n dtb-armada-385 -Device Tree Files for Armada 385 based systems. +Device Tree files for Armada 385 based systems. %package -n dtb-armada-388 Summary: Armada 388 based systems @@ -100,7 +100,7 @@ Requires(post): coreutils %description -n dtb-armada-388 -Device Tree Files for Armada 388 based systems. +Device Tree files for Armada 388 based systems. %package -n dtb-armada-398 Summary: Armada 398 based systems @@ -109,7 +109,7 @@ Requires(post): coreutils %description -n dtb-armada-398 -Device Tree Files for Armada 398 based systems. +Device Tree files for Armada 398 based systems. %package -n dtb-armada-xp Summary: Armada XP based systems @@ -118,7 +118,7 @@ Requires(post): coreutils %description -n dtb-armada-xp -Device Tree Files for Armada XP based systems. +Device Tree files for Armada XP based systems. %package -n dtb-bcm2836 Summary: Raspberry Pi 2 Model B @@ -127,7 +127,7 @@ Requires(post): coreutils %description -n dtb-bcm2836 -Device Tree Files for Raspberry Pi 2 Model B. +Device Tree files for Raspberry Pi 2 Model B. %package -n dtb-dove Summary: Marvell dove based systems @@ -136,7 +136,7 @@ Requires(post): coreutils %description -n dtb-dove -Device Tree Files for Marvell dove based systems. +Device Tree files for Marvell dove based systems. %package -n dtb-exynos4 Summary: Samsung Exynos 4 based systems @@ -145,7 +145,7 @@ Requires(post): coreutils %description -n dtb-exynos4 -Device Tree Files for Samsung Exynos 4 based systems. +Device Tree files for Samsung Exynos 4 based systems. %package -n dtb-exynos5 Summary: Samsung Exynos 5 based systems @@ -154,7 +154,7 @@ Requires(post): coreutils %description -n dtb-exynos5 -Device Tree Files for Samsung Exynos 5 based systems. +Device Tree files for Samsung Exynos 5 based systems. %package -n dtb-imx5 Summary: Freescale i.MX51 and i.MX53 based systems @@ -163,7 +163,7 @@ Requires(post): coreutils %description -n dtb-imx5 -Device Tree Files for Freescale i.MX51 and i.MX53 based systems. +Device Tree files for Freescale i.MX51 and i.MX53 based systems. %package -n dtb-imx6 Summary: Freescale i.MX6 based systems @@ -172,7 +172,7 @@ Requires(post): coreutils %description -n dtb-imx6 -Device Tree Files for Freescale i.MX6 based systems. +Device Tree files for Freescale i.MX6 based systems. %package -n dtb-imx7 Summary: Freescale i.MX7 based systems @@ -181,34 +181,18 @@ Requires(post): coreutils %description -n dtb-imx7 -Device Tree Files for Freescale i.MX7 based systems. - -%package -n dtb-k2e -Summary: TI Keystone 2 Edison based systems -Group: System/Boot -Provides: multiversion(dtb) -Requires(post): coreutils - -%description -n dtb-k2e -Device Tree Files for TI Keystone 2 Edison based systems. +Device Tree files for Freescale i.MX7 based systems. %package -n dtb-keystone -Summary: TI Keystone 2 Hawking/Kepler based systems +Summary: TI Keystone 2 based systems Group: System/Boot +Provides: dtb-k2e = %version +Provides: dtb-k2l = %version Provides: multiversion(dtb) Requires(post): coreutils %description -n dtb-keystone -Device Tree Files for TI Keystone 2 Hawking/Kepler based systems. - -%package -n dtb-k2l -Summary: TI Keystone 2 Lamarr based systems -Group: System/Boot -Provides: multiversion(dtb) -Requires(post): coreutils - -%description -n dtb-k2l -Device Tree Files for TI Keystone 2 Lamarr based systems. +Device Tree files for TI Keystone 2 based systems. %package -n dtb-meson6 Summary: Amlogic Meson 6 based systems @@ -217,7 +201,7 @@ Requires(post): coreutils %description -n dtb-meson6 -Device Tree Files for Amlogic Meson 6 based systems. +Device Tree files for Amlogic Meson 6 based systems. %package -n dtb-meson8 Summary: Amlogic Meson 8 based systems @@ -226,7 +210,7 @@ Requires(post): coreutils %description -n dtb-meson8 -Device Tree Files for Amlogic Meson 8 based systems. +Device Tree files for Amlogic Meson 8 based systems. %package -n dtb-meson8b Summary: Amlogic Meson 8b based systems @@ -235,7 +219,7 @@ Requires(post): coreutils %description -n dtb-meson8b -Device Tree Files for Amlogic Meson 8b based systems. +Device Tree files for Amlogic Meson 8b based systems. %package -n dtb-omap3 Summary: TI OMAP3 based systems @@ -244,7 +228,7 @@ Requires(post): coreutils %description -n dtb-omap3 -Device Tree Files for TI OMAP3 based systems. +Device Tree files for TI OMAP3 based systems. %package -n dtb-omap4 Summary: TI OMAP4 based systems @@ -253,7 +237,7 @@ Requires(post): coreutils %description -n dtb-omap4 -Device Tree Files for TI OMAP4 based systems. +Device Tree files for TI OMAP4 based systems. %package -n dtb-omap5 Summary: TI OMAP5 based systems @@ -262,7 +246,7 @@ Requires(post): coreutils %description -n dtb-omap5 -Device Tree Files for TI OMAP5 based systems. +Device Tree files for TI OMAP5 based systems. %package -n dtb-qcom Summary: Qualcomm Snapdragon based systems @@ -271,7 +255,7 @@ Requires(post): coreutils %description -n dtb-qcom -Device Tree Files for Qualcomm Snapdragon based systems. +Device Tree files for Qualcomm Snapdragon based systems. %package -n dtb-rk3 Summary: Rockchip RK3xxx based systems @@ -280,7 +264,7 @@ Requires(post): coreutils %description -n dtb-rk3 -Device Tree Files for Rockchip RK3xxx based systems. +Device Tree files for Rockchip RK3xxx based systems. %package -n dtb-ste Summary: ST Ericsson based systems @@ -289,7 +273,7 @@ Requires(post): coreutils %description -n dtb-ste -Device Tree Files for ST Ericsson based systems. +Device Tree files for ST Ericsson based systems. %package -n dtb-sun4i Summary: Allwinner sun4i based systems @@ -298,7 +282,7 @@ Requires(post): coreutils %description -n dtb-sun4i -Device Tree Files for Allwinner sun4i based systems. +Device Tree files for Allwinner sun4i based systems. %package -n dtb-sun5i Summary: Allwinner sun5i based systems @@ -307,7 +291,7 @@ Requires(post): coreutils %description -n dtb-sun5i -Device Tree Files for Allwinner sun5i based systems. +Device Tree files for Allwinner sun5i based systems. %package -n dtb-sun6i Summary: Allwinner sun6i based systems @@ -316,7 +300,7 @@ Requires(post): coreutils %description -n dtb-sun6i -Device Tree Files for Allwinner sun6i based systems. +Device Tree files for Allwinner sun6i based systems. %package -n dtb-sun7i Summary: Allwinner sun7i based systems @@ -325,7 +309,7 @@ Requires(post): coreutils %description -n dtb-sun7i -Device Tree Files for Allwinner sun7i based systems. +Device Tree files for Allwinner sun7i based systems. %package -n dtb-sun8i Summary: Allwinner sun8i based systems @@ -334,7 +318,7 @@ Requires(post): coreutils %description -n dtb-sun8i -Device Tree Files for Allwinner sun8i based systems. +Device Tree files for Allwinner sun8i based systems. %package -n dtb-sun9i Summary: Allwinner sun9i based systems @@ -343,7 +327,7 @@ Requires(post): coreutils %description -n dtb-sun9i -Device Tree Files for Allwinner sun9i based systems. +Device Tree files for Allwinner sun9i based systems. %package -n dtb-tegra2 Summary: NVidia Tegra2 based systems @@ -352,7 +336,7 @@ Requires(post): coreutils %description -n dtb-tegra2 -Device Tree Files for NVidia Tegra2 based systems. +Device Tree files for NVidia Tegra2 based systems. %package -n dtb-tegra3 Summary: NVidia Tegra3 based systems @@ -361,7 +345,7 @@ Requires(post): coreutils %description -n dtb-tegra3 -Device Tree Files for NVidia Tegra3 based systems. +Device Tree files for NVidia Tegra3 based systems. %package -n dtb-tegra114 Summary: NVidia Tegra4 based systems @@ -370,7 +354,7 @@ Requires(post): coreutils %description -n dtb-tegra114 -Device Tree Files for NVidia Tegra4 based systems. +Device Tree files for NVidia Tegra4 based systems. %package -n dtb-tegra124 Summary: NVidia Tegra K1 based systems @@ -379,7 +363,7 @@ Requires(post): coreutils %description -n dtb-tegra124 -Device Tree Files for NVidia Tegra K1 based systems. +Device Tree files for NVidia Tegra K1 based systems. %package -n dtb-vexpress Summary: ARM Versatile Express machines @@ -388,7 +372,7 @@ Requires(post): coreutils %description -n dtb-vexpress -Device Tree Files for ARM Versatile Express machines. +Device Tree files for ARM Versatile Express machines. %package -n dtb-vf500 Summary: Freescale Vybrid VF500 based systems @@ -397,7 +381,7 @@ Requires(post): coreutils %description -n dtb-vf500 -Device Tree Files for Freescale Vybrid VF500 based systems. +Device Tree files for Freescale Vybrid VF500 based systems. %package -n dtb-vf6 Summary: Freescale Vybrid VF610 based systems @@ -406,7 +390,7 @@ Requires(post): coreutils %description -n dtb-vf6 -Device Tree Files for Freescale Vybrid VF610 based systems. +Device Tree files for Freescale Vybrid VF610 based systems. %package -n dtb-xenvm Summary: Xen virtual machines @@ -415,7 +399,7 @@ Requires(post): coreutils %description -n dtb-xenvm -Device Tree Files for Xen virtual machines. +Device Tree files for Xen virtual machines. %package -n dtb-zynq Summary: Xilinx Zynq based systems @@ -424,7 +408,7 @@ Requires(post): coreutils %description -n dtb-zynq -Device Tree Files for Xilinx Zynq based systems. +Device Tree files for Xilinx Zynq based systems. @@ -438,7 +422,7 @@ export DTC_FLAGS="-R 4 -p 0x1000" cd %{_prefix}/src/linux/arch/arm/boot/dts -for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts k2e-*.dts k2hk-*.dts k2l-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do +for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} mkdir -p $PPDIR/$(dirname $target) cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $PPDIR/$target.dts @@ -452,7 +436,7 @@ %if "dtb-armv7l" != "dtb-source" cd pp -for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts k2e-*.dts k2hk-*.dts k2l-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do +for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) @@ -571,13 +555,6 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb -%post -n dtb-k2e -cd /boot -# If /boot/dtb is a symlink, remove it, so that we can replace it. -[ -d dtb ] && [ -L dtb ] && rm -f dtb -# Unless /boot/dtb exists as real directory, create a symlink. -[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb - %post -n dtb-keystone cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -585,13 +562,6 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb -%post -n dtb-k2l -cd /boot -# If /boot/dtb is a symlink, remove it, so that we can replace it. -[ -d dtb ] && [ -L dtb ] && rm -f dtb -# Unless /boot/dtb exists as real directory, create a symlink. -[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb - %post -n dtb-meson6 cd /boot # If /boot/dtb is a symlink, remove it, so that we can replace it. @@ -872,26 +842,12 @@ %dir %{dtbdir} %{dtbdir}/imx7*.dtb -%files -n dtb-k2e -%defattr(-,root,root) -%doc COPYING -%ghost /boot/dtb -%dir %{dtbdir} -%{dtbdir}/k2e-*.dtb - %files -n dtb-keystone %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} -%{dtbdir}/k2hk-*.dtb - -%files -n dtb-k2l -%defattr(-,root,root) -%doc COPYING -%ghost /boot/dtb -%dir %{dtbdir} -%{dtbdir}/k2l-*.dtb +%{dtbdir}/keystone-*.dtb %files -n dtb-meson6 %defattr(-,root,root) ++++++ pre_checkin.pl ++++++ --- /var/tmp/diff_new_pack.pRIgJD/_old 2016-08-05 18:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.pRIgJD/_new 2016-08-05 18:16:40.000000000 +0200 @@ -23,9 +23,7 @@ ['dtb-imx5', 'imx5*.dts', "Freescale i.MX51 and i.MX53 based systems"], ['dtb-imx6', 'imx6*.dts', "Freescale i.MX6 based systems"], ['dtb-imx7', 'imx7*.dts', "Freescale i.MX7 based systems"], - ['dtb-k2e', 'k2e-*.dts', "TI Keystone 2 Edison based systems"], - ['dtb-keystone', 'k2hk-*.dts', "TI Keystone 2 Hawking/Kepler based systems"], - ['dtb-k2l', 'k2l-*.dts', "TI Keystone 2 Lamarr based systems"], + ['dtb-keystone', 'keystone-*.dts', "TI Keystone 2 based systems"], ['dtb-meson6', 'meson6-*.dts', "Amlogic Meson 6 based systems"], ['dtb-meson8', 'meson8-*.dts', "Amlogic Meson 8 based systems"], ['dtb-meson8b', 'meson8b-*.dts', "Amlogic Meson 8b based systems"], @@ -59,8 +57,10 @@ # DTB packages names my @aarch64_package_list = ( -# ['dtb-altera', 'altera/*.dts', "Altera based arm64 systems"], + ['dtb-al', 'al/*.dts', "Alpine Labs based arm64 systems"], + ['dtb-altera', 'altera/*.dts', "Altera based arm64 systems"], ['dtb-amd', 'amd/*.dts', "AMD based arm64 systems"], + ['dtb-amlogic', 'amlogic/*.dts', "Amlogic based arm64 systems"], ['dtb-apm', 'apm/*.dts', "AppliedMicro based arm64 systems"], ['dtb-arm', 'arm/*.dts', "ARM Ltd. based arm64 systems"], ['dtb-broadcom', 'broadcom/*.dts', "Broadcom based arm64 systems"], @@ -68,12 +68,14 @@ ['dtb-exynos', 'exynos/*.dts', "Samsung Exynos based arm64 systems"], ['dtb-freescale', 'freescale/*.dts', "NXP (Freescale) based arm64 systems"], ['dtb-hisilicon', 'hisilicon/*.dts', "HiSilicon based arm64 systems"], + ['dtb-lg', 'lg/*.dts', "LG based arm64 systems"], ['dtb-marvell', 'marvell/*.dts', "Marvell based arm64 systems"], ['dtb-mediatek', 'mediatek/*.dts', "MediaTek based arm64 systems"], -# ['dtb-nvidia', 'nvidia/*.dts', "Nvidia based arm64 systems"], + ['dtb-nvidia', 'nvidia/*.dts', "Nvidia based arm64 systems"], ['dtb-qcom', 'qcom/*.dts', "Qualcomm based arm64 systems"], -# ['dtb-renesas', 'renesas/*.dts', "Renesas based arm64 systems"], + ['dtb-renesas', 'renesas/*.dts', "Renesas based arm64 systems"], ['dtb-rockchip', 'rockchip/*.dts', "Rockchip based arm64 systems"], + ['dtb-socionext', 'socionext/*.dts', "Socionext based arm64 systems"], ['dtb-sprd', 'sprd/*.dts', "Spreadtrum based arm64 systems"], ['dtb-xilinx', 'xilinx/*.dts', "Xilinx based arm64 systems"], ); @@ -108,11 +110,29 @@ "%package -n $PKG_NAME\n" . "Summary: $MACHINES\n" . "Group: System/Boot\n" . - "Provides: multiversion(dtb)\n" . + "Provides: multiversion(dtb)\n"; + if ($PKG_NAME eq 'dtb-keystone' and $main_package eq 'dtb-armv7l') { + $subpkg_desc .= "Provides: dtb-k2e = %version\n" . + "Provides: dtb-k2l = %version\n"; + } + if ($PKG_NAME eq 'dtb-apm' and $main_package eq 'dtb-aarch64') { + $subpkg_desc .= "Provides: dtb-apm-mustang = %version\n"; + } + if ($PKG_NAME eq 'dtb-arm' and $main_package eq 'dtb-aarch64') { + $subpkg_desc .= "Provides: dtb-foundation-v8 = %version\n" . + "Provides: dtb-rtsm_ve-aemv8a = %version\n"; + } + if ($PKG_NAME eq 'dtb-cavium' and $main_package eq 'dtb-aarch64') { + $subpkg_desc .= "Provides: dtb-thunder-88xx = %version\n"; + } + if ($PKG_NAME eq 'dtb-hisilicon' and $main_package eq 'dtb-aarch64') { + $subpkg_desc .= "Provides: dtb-hisilicon64 = %version\n"; + } + $subpkg_desc .= "Requires(post): coreutils\n" . "\n" . "%description -n $PKG_NAME\n" . - "Device Tree Files for $MACHINES.\n\n"; + "Device Tree files for $MACHINES.\n\n"; $subpkg_post .= "%post -n $PKG_NAME\n" .
