Hello community, here is the log from the commit of package dtb-source for openSUSE:Factory checked in at 2015-07-14 17:43:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-23 07:27:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dtb-source.new/dtb-aarch64.changes 2015-07-14 17:44:15.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Feb 18 15:46:59 UTC 2015 - [email protected] + +- add thunderx dtbs +- adjust for kernel 3.19 +- require kernel version to to trigger automatic rebuild + +------------------------------------------------------------------- +Mon Sep 1 18:42:46 UTC 2014 - [email protected] + +- add armv7l vexpress dtbs + +------------------------------------------------------------------- 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.3Dq0pg/_old 2015-07-14 17:44:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3Dq0pg/_new 2015-07-14 17:44:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dtb-aarch64 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,8 @@ Name: dtb-aarch64 BuildRequires: kernel-source -Version: %(rpm -q --qf "%{VERSION}" kernel-source | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is not") +Version: %kernel_version Release: 0 Summary: Device Tree files for $MACHINES License: GPL-2.0 @@ -28,6 +29,7 @@ Source99: pre_checkin.pl %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: kernel = %kernel_version BuildRequires: cpp BuildRequires: dtc >= 1.4.0 BuildRequires: xz @@ -43,6 +45,13 @@ %description -n dtb-apm-mustang Device Tree Files for APM X-Gene Mustang board. +%package -n dtb-thunder-88xx +Summary: Cavium ThunderX CN88XX +Group: System/Boot + +%description -n dtb-thunder-88xx +Device Tree Files for Cavium ThunderX CN88XX. + %package -n dtb-foundation-v8 Summary: Foundation-V8A (compatible with Vexpress64) Group: System/Boot @@ -72,9 +81,10 @@ mkdir -p %{buildroot}/boot/dtb cd linux/arch/arm64/boot/dts -for dts in apm-mustang.dts foundation-v8.dts rtsm_ve-aemv8a.dts ; do +for dts in apm/apm-mustang.dts cavium/thunder-88xx.dts arm/foundation-v8.dts arm/rtsm_ve-aemv8a.dts ; do target=${dts%*.dts} cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $target.dts.tmp + install -m 700 -d %{buildroot}/boot/dtb/$(dirname $target) dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}/boot/dtb/$target.dtb $target.dts.tmp done cd - @@ -83,19 +93,29 @@ %defattr(-,root,root) %doc COPYING %dir /boot/dtb/ -/boot/dtb/apm-mustang.dtb +%dir /boot/dtb/apm +/boot/dtb/apm/apm-mustang.dtb + +%files -n dtb-thunder-88xx +%defattr(-,root,root) +%doc COPYING +%dir /boot/dtb/ +%dir /boot/dtb/cavium +/boot/dtb/cavium/thunder-88xx.dtb %files -n dtb-foundation-v8 %defattr(-,root,root) %doc COPYING %dir /boot/dtb/ -/boot/dtb/foundation-v8.dtb +%dir /boot/dtb/arm +/boot/dtb/arm/foundation-v8.dtb %files -n dtb-rtsm_ve-aemv8a %defattr(-,root,root) %doc COPYING %dir /boot/dtb/ -/boot/dtb/rtsm_ve-aemv8a.dtb +%dir /boot/dtb/arm +/boot/dtb/arm/rtsm_ve-aemv8a.dtb %endif ++++++ dtb-armv6l.spec ++++++ --- /var/tmp/diff_new_pack.3Dq0pg/_old 2015-07-14 17:44:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3Dq0pg/_new 2015-07-14 17:44:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dtb-armv6l # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,8 @@ Name: dtb-armv6l BuildRequires: kernel-source -Version: %(rpm -q --qf "%{VERSION}" kernel-source | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is not") +Version: %kernel_version Release: 0 Summary: Device Tree files for $MACHINES License: GPL-2.0 @@ -28,6 +29,7 @@ Source99: pre_checkin.pl %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: kernel = %kernel_version BuildRequires: cpp BuildRequires: dtc >= 1.4.0 BuildRequires: xz @@ -61,6 +63,7 @@ for dts in bcm2835*.dts ; do target=${dts%*.dts} cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $target.dts.tmp + install -m 700 -d %{buildroot}/boot/dtb/$(dirname $target) dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}/boot/dtb/$target.dtb $target.dts.tmp done cd - ++++++ dtb-armv7l.spec ++++++ --- /var/tmp/diff_new_pack.3Dq0pg/_old 2015-07-14 17:44:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3Dq0pg/_new 2015-07-14 17:44:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dtb-armv7l # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,8 @@ Name: dtb-armv7l BuildRequires: kernel-source -Version: %(rpm -q --qf "%{VERSION}" kernel-source | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is not") +Version: %kernel_version Release: 0 Summary: Device Tree files for $MACHINES License: GPL-2.0 @@ -28,6 +29,7 @@ Source99: pre_checkin.pl %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: kernel = %kernel_version BuildRequires: cpp BuildRequires: dtc >= 1.4.0 BuildRequires: xz @@ -169,6 +171,13 @@ %description -n dtb-xenvm Device Tree Files for Xen virtual machines. +%package -n dtb-vexpress +Summary: ARM versatile express machines +Group: System/Boot + +%description -n dtb-vexpress +Device Tree Files for ARM versatile express machines. + %package -n dtb-ste Summary: ST Ericsson based systems Group: System/Boot @@ -219,9 +228,10 @@ mkdir -p %{buildroot}/boot/dtb cd linux/arch/arm/boot/dts -for dts in *omap3*.dts *omap4*.dts *omap5*.dts *am335x*.dts k2hk-evm.dts *exynos4*.dts *exynos5*.dts *imx5*.dts *imx6*.dts *vf6*.dts *tegra2*.dts *tegra3*.dts tegra114-*.dts tegra124-*.dts *sun4i*.dts *sun5i*.dts *sun6i*.dts *sun7i*.dts *xenvm*.dts ste*.dts dove*.dts armada-370*.dts armada-xp*.dts rk3*.dts ; do +for dts in *omap3*.dts *omap4*.dts *omap5*.dts *am335x*.dts k2hk-evm.dts *exynos4*.dts *exynos5*.dts *imx5*.dts *imx6*.dts *vf6*.dts *tegra2*.dts *tegra3*.dts tegra114-*.dts tegra124-*.dts *sun4i*.dts *sun5i*.dts *sun6i*.dts *sun7i*.dts *xenvm*.dts vexpress*.dts ste*.dts dove*.dts armada-370*.dts armada-xp*.dts rk3*.dts ; do target=${dts%*.dts} cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $target.dts.tmp + install -m 700 -d %{buildroot}/boot/dtb/$(dirname $target) dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}/boot/dtb/$target.dtb $target.dts.tmp done cd - @@ -340,6 +350,12 @@ %dir /boot/dtb/ /boot/dtb/*xenvm*.dtb +%files -n dtb-vexpress +%defattr(-,root,root) +%doc COPYING +%dir /boot/dtb/ +/boot/dtb/vexpress*.dtb + %files -n dtb-ste %defattr(-,root,root) %doc COPYING ++++++ dtb-source.spec ++++++ --- /var/tmp/diff_new_pack.3Dq0pg/_old 2015-07-14 17:44:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3Dq0pg/_new 2015-07-14 17:44:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dtb-source # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,8 @@ Name: dtb-source BuildRequires: kernel-source -Version: %(rpm -q --qf "%{VERSION}" kernel-source | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is not") +Version: %kernel_version Release: 0 Summary: Device Tree files for $MACHINES License: GPL-2.0 @@ -28,6 +29,7 @@ Source99: pre_checkin.pl %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: kernel = %kernel_version BuildRequires: cpp BuildRequires: dtc >= 1.4.0 BuildRequires: xz @@ -53,6 +55,7 @@ for dts in ; do target=${dts%*.dts} cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $target.dts.tmp + install -m 700 -d %{buildroot}/boot/dtb/$(dirname $target) dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}/boot/dtb/$target.dtb $target.dts.tmp done cd - ++++++ dtb.spec.in ++++++ --- /var/tmp/diff_new_pack.3Dq0pg/_old 2015-07-14 17:44:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3Dq0pg/_new 2015-07-14 17:44:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package $NAME # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,8 @@ Name: $NAME BuildRequires: kernel-source -Version: %(rpm -q --qf "%{VERSION}" kernel-source | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is not") +Version: %kernel_version Release: 0 Summary: Device Tree files for $MACHINES License: GPL-2.0 @@ -28,6 +29,7 @@ Source99: pre_checkin.pl %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: kernel = %kernel_version BuildRequires: cpp BuildRequires: dtc >= 1.4.0 BuildRequires: xz @@ -54,6 +56,7 @@ for dts in $ALL_SUPPORTED_DTB; do target=${dts%*.dts} cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I./include/ -P $target.dts -o $target.dts.tmp + install -m 700 -d %{buildroot}/boot/dtb/$(dirname $target) dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}/boot/dtb/$target.dtb $target.dts.tmp done cd - ++++++ pre_checkin.pl ++++++ --- /var/tmp/diff_new_pack.3Dq0pg/_old 2015-07-14 17:44:16.000000000 +0200 +++ /var/tmp/diff_new_pack.3Dq0pg/_new 2015-07-14 17:44:16.000000000 +0200 @@ -26,6 +26,7 @@ ['dtb-sun6i', '*sun6i*.dts', "Allwinner sun6i based systems"], ['dtb-sun7i', '*sun7i*.dts', "Allwinner sun7i based systems"], ['dtb-xenvm', '*xenvm*.dts', "Xen virtual machines"], + ['dtb-vexpress', 'vexpress*.dts', "ARM versatile express machines"], ['dtb-ste', 'ste*.dts', "ST Ericsson based systems"], ['dtb-dove', 'dove*.dts', "Marvell dove based systems"], ['dtb-armada-370', 'armada-370*.dts', "Armada 370 based systems"], @@ -40,9 +41,10 @@ # DTB packages names my @aarch64_package_list = ( - ['dtb-apm-mustang', 'apm-mustang.dts', "APM X-Gene Mustang board"], - ['dtb-foundation-v8', 'foundation-v8.dts', "Foundation-V8A (compatible with Vexpress64)"], - ['dtb-rtsm_ve-aemv8a', 'rtsm_ve-aemv8a.dts', "RTSM VE AEMv8A board (compatible with Vexpress64)"], + ['dtb-apm-mustang', 'apm/apm-mustang.dts', "APM X-Gene Mustang board"], + ['dtb-thunder-88xx', 'cavium/thunder-88xx.dts', "Cavium ThunderX CN88XX"], + ['dtb-foundation-v8', 'arm/foundation-v8.dts', "Foundation-V8A (compatible with Vexpress64)"], + ['dtb-rtsm_ve-aemv8a', 'arm/rtsm_ve-aemv8a.dts', "RTSM VE AEMv8A board (compatible with Vexpress64)"], ); sub generate_spec($$$) @@ -81,11 +83,17 @@ my $bin_supported_dtb = $SUPPORTED_DTB; $bin_supported_dtb =~ s/\.dts/\.dtb/g; + my $dtb_subdir = ""; + if ($bin_supported_dtb =~ /(.*)\/[^\/]+$/) { + $dtb_subdir = "%dir /boot/dtb/$1\n"; + } + $subpkg_files .= "%files -n $PKG_NAME\n" . "%defattr(-,root,root)\n" . "%doc COPYING\n" . "%dir /boot/dtb/\n" . + $dtb_subdir . "/boot/dtb/$bin_supported_dtb\n" . "\n";
