Hello community, here is the log from the commit of package dtb-source for openSUSE:Factory checked in at 2016-11-20 18:20:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dtb-source (Old) and /work/SRC/openSUSE:Factory/.dtb-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dtb-source" Changes: -------- dtb-armv6l.changes: same change dtb-armv7l.changes: same change --- /work/SRC/openSUSE:Factory/dtb-source/dtb-source.changes 2016-11-14 20:14:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dtb-source.new/dtb-source.changes 2016-11-20 18:20:38.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 20 14:05:07 UTC 2016 - dmuel...@suse.com + +- fix last change, package each symlink only once + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.1XwKCG/_old 2016-11-20 18:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1XwKCG/_new 2016-11-20 18:20:39.000000000 +0100 @@ -265,7 +265,10 @@ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir - ln -s $target.dtb %{buildroot}%{dtbdir}/$(basename $target).dtb + baselink=%{dtbdir}/$(basename $target).dtb + vendordir=$(basename $(dirname $target)) + ln -s $target.dtb %{buildroot}$baselink + echo $baselink >> ../dtb-$vendordir.list %endif done cd - @@ -417,236 +420,257 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%ifarch aarch64 +%files -n dtb-al -f dtb-al.list +%else %files -n dtb-al +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/al %{dtbdir}/al/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-altera -f dtb-altera.list +%else %files -n dtb-altera +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/altera %{dtbdir}/altera/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-amd -f dtb-amd.list +%else %files -n dtb-amd +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/amd %{dtbdir}/amd/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-amlogic -f dtb-amlogic.list +%else %files -n dtb-amlogic +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/amlogic %{dtbdir}/amlogic/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-apm -f dtb-apm.list +%else %files -n dtb-apm +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/apm %{dtbdir}/apm/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-arm -f dtb-arm.list +%else %files -n dtb-arm +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/arm %{dtbdir}/arm/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-broadcom -f dtb-broadcom.list +%else %files -n dtb-broadcom +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/broadcom %{dtbdir}/broadcom/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-cavium -f dtb-cavium.list +%else %files -n dtb-cavium +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/cavium %{dtbdir}/cavium/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-exynos -f dtb-exynos.list +%else %files -n dtb-exynos +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/exynos %{dtbdir}/exynos/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-freescale -f dtb-freescale.list +%else %files -n dtb-freescale +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/freescale %{dtbdir}/freescale/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-hisilicon -f dtb-hisilicon.list +%else %files -n dtb-hisilicon +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/hisilicon %{dtbdir}/hisilicon/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-lg -f dtb-lg.list +%else %files -n dtb-lg +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/lg %{dtbdir}/lg/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-marvell -f dtb-marvell.list +%else %files -n dtb-marvell +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/marvell %{dtbdir}/marvell/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-mediatek -f dtb-mediatek.list +%else %files -n dtb-mediatek +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/mediatek %{dtbdir}/mediatek/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-nvidia -f dtb-nvidia.list +%else %files -n dtb-nvidia +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/nvidia %{dtbdir}/nvidia/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-qcom -f dtb-qcom.list +%else %files -n dtb-qcom +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/qcom %{dtbdir}/qcom/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-renesas -f dtb-renesas.list +%else %files -n dtb-renesas +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/renesas %{dtbdir}/renesas/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-rockchip -f dtb-rockchip.list +%else %files -n dtb-rockchip +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/rockchip %{dtbdir}/rockchip/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-socionext -f dtb-socionext.list +%else %files -n dtb-socionext +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/socionext %{dtbdir}/socionext/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sprd -f dtb-sprd.list +%else %files -n dtb-sprd +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/sprd %{dtbdir}/sprd/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-xilinx -f dtb-xilinx.list +%else %files -n dtb-xilinx +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/xilinx %{dtbdir}/xilinx/*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif %else cat - > README <<EOF ++++++ dtb-armv6l.spec ++++++ --- /var/tmp/diff_new_pack.1XwKCG/_old 2016-11-20 18:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1XwKCG/_new 2016-11-20 18:20:39.000000000 +0100 @@ -80,7 +80,10 @@ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir - ln -s $target.dtb %{buildroot}%{dtbdir}/$(basename $target).dtb + baselink=%{dtbdir}/$(basename $target).dtb + vendordir=$(basename $(dirname $target)) + ln -s $target.dtb %{buildroot}$baselink + echo $baselink >> ../dtb-$vendordir.list %endif done cd - @@ -92,15 +95,16 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%ifarch aarch64 +%files -n dtb-bcm2835 -f dtb-bcm2835.list +%else %files -n dtb-bcm2835 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/bcm2835*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif %else cat - > README <<EOF ++++++ dtb-armv7l.spec ++++++ --- /var/tmp/diff_new_pack.1XwKCG/_old 2016-11-20 18:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1XwKCG/_new 2016-11-20 18:20:39.000000000 +0100 @@ -442,7 +442,10 @@ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir - ln -s $target.dtb %{buildroot}%{dtbdir}/$(basename $target).dtb + baselink=%{dtbdir}/$(basename $target).dtb + vendordir=$(basename $(dirname $target)) + ln -s $target.dtb %{buildroot}$baselink + echo $baselink >> ../dtb-$vendordir.list %endif done cd - @@ -734,415 +737,456 @@ # Unless /boot/dtb exists as real directory, create a symlink. [ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb +%ifarch aarch64 +%files -n dtb-am335x -f dtb-am335x.list +%else %files -n dtb-am335x +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/am335x-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-am3517 -f dtb-am3517.list +%else %files -n dtb-am3517 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/am3517*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-am57xx -f dtb-am57xx.list +%else %files -n dtb-am57xx +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/am57xx-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-armada-370 -f dtb-armada-370.list +%else %files -n dtb-armada-370 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-370-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-armada-375 -f dtb-armada-375.list +%else %files -n dtb-armada-375 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-375-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-armada-385 -f dtb-armada-385.list +%else %files -n dtb-armada-385 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-385-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-armada-388 -f dtb-armada-388.list +%else %files -n dtb-armada-388 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-388-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-armada-398 -f dtb-armada-398.list +%else %files -n dtb-armada-398 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-398-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-armada-xp -f dtb-armada-xp.list +%else %files -n dtb-armada-xp +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-xp-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-bcm2836 -f dtb-bcm2836.list +%else %files -n dtb-bcm2836 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/bcm2836*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-dove -f dtb-dove.list +%else %files -n dtb-dove +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/dove-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-exynos4 -f dtb-exynos4.list +%else %files -n dtb-exynos4 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/exynos4*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-exynos5 -f dtb-exynos5.list +%else %files -n dtb-exynos5 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/exynos5*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-imx5 -f dtb-imx5.list +%else %files -n dtb-imx5 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/imx5*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-imx6 -f dtb-imx6.list +%else %files -n dtb-imx6 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/imx6*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-imx7 -f dtb-imx7.list +%else %files -n dtb-imx7 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/imx7*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-keystone -f dtb-keystone.list +%else %files -n dtb-keystone +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/keystone-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-meson6 -f dtb-meson6.list +%else %files -n dtb-meson6 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/meson6-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-meson8 -f dtb-meson8.list +%else %files -n dtb-meson8 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/meson8-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-meson8b -f dtb-meson8b.list +%else %files -n dtb-meson8b +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/meson8b-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-omap3 -f dtb-omap3.list +%else %files -n dtb-omap3 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/omap3*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-omap4 -f dtb-omap4.list +%else %files -n dtb-omap4 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/omap4*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-omap5 -f dtb-omap5.list +%else %files -n dtb-omap5 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/omap5*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-qcom -f dtb-qcom.list +%else %files -n dtb-qcom +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/qcom-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-rk3 -f dtb-rk3.list +%else %files -n dtb-rk3 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/rk3*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-ste -f dtb-ste.list +%else %files -n dtb-ste +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/ste-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sun4i -f dtb-sun4i.list +%else %files -n dtb-sun4i +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun4i-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sun5i -f dtb-sun5i.list +%else %files -n dtb-sun5i +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun5i-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sun6i -f dtb-sun6i.list +%else %files -n dtb-sun6i +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun6i-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sun7i -f dtb-sun7i.list +%else %files -n dtb-sun7i +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun7i-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sun8i -f dtb-sun8i.list +%else %files -n dtb-sun8i +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun8i-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-sun9i -f dtb-sun9i.list +%else %files -n dtb-sun9i +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun9i-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-tegra2 -f dtb-tegra2.list +%else %files -n dtb-tegra2 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra20-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-tegra3 -f dtb-tegra3.list +%else %files -n dtb-tegra3 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra30-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-tegra114 -f dtb-tegra114.list +%else %files -n dtb-tegra114 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra114-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-tegra124 -f dtb-tegra124.list +%else %files -n dtb-tegra124 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra124-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-vexpress -f dtb-vexpress.list +%else %files -n dtb-vexpress +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/vexpress-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-vf500 -f dtb-vf500.list +%else %files -n dtb-vf500 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/vf500-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-vf6 -f dtb-vf6.list +%else %files -n dtb-vf6 +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/vf610-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-xenvm -f dtb-xenvm.list +%else %files -n dtb-xenvm +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/xenvm-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif +%ifarch aarch64 +%files -n dtb-zynq -f dtb-zynq.list +%else %files -n dtb-zynq +%endif %defattr(-,root,root) %doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/zynq-*.dtb -%ifarch aarch64 -%{dtbdir}/*.dtb -%endif %else cat - > README <<EOF ++++++ dtb-source.spec ++++++ --- /var/tmp/diff_new_pack.1XwKCG/_old 2016-11-20 18:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1XwKCG/_new 2016-11-20 18:20:39.000000000 +0100 @@ -71,7 +71,10 @@ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir - ln -s $target.dtb %{buildroot}%{dtbdir}/$(basename $target).dtb + baselink=%{dtbdir}/$(basename $target).dtb + vendordir=$(basename $(dirname $target)) + ln -s $target.dtb %{buildroot}$baselink + echo $baselink >> ../dtb-$vendordir.list %endif done cd - ++++++ dtb.spec.in ++++++ --- /var/tmp/diff_new_pack.1XwKCG/_old 2016-11-20 18:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1XwKCG/_new 2016-11-20 18:20:39.000000000 +0100 @@ -71,7 +71,10 @@ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir - ln -s $target.dtb %{buildroot}%{dtbdir}/$(basename $target).dtb + baselink=%{dtbdir}/$(basename $target).dtb + vendordir=$(basename $(dirname $target)) + ln -s $target.dtb %{buildroot}$baselink + echo $baselink >> ../dtb-$vendordir.list %endif done cd - ++++++ pre_checkin.pl ++++++ --- /var/tmp/diff_new_pack.1XwKCG/_old 2016-11-20 18:20:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1XwKCG/_new 2016-11-20 18:20:39.000000000 +0100 @@ -151,16 +151,17 @@ } $subpkg_files .= + "%ifarch aarch64\n" . + "%files -n $PKG_NAME -f $PKG_NAME.list\n" . + "%else\n" . "%files -n $PKG_NAME\n" . + "%endif\n" . "%defattr(-,root,root)\n" . "%doc COPYING\n" . "%ghost /boot/dtb\n" . "%dir %{dtbdir}\n" . $dtb_subdir . "%{dtbdir}/$bin_supported_dtb\n" . - "%ifarch aarch64\n" . - "%{dtbdir}/*.dtb\n" . - "%endif\n" . "\n"; $all_supported_dtb .= "$SUPPORTED_DTB ";