Hello community,
here is the log from the commit of package dtb-source for openSUSE:Factory
checked in at 2016-02-09 16:49:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-05
21:54:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dtb-source.new/dtb-aarch64.changes
2016-02-09 16:50:06.000000000 +0100
@@ -1,0 +2,35 @@
+Mon Feb 8 15:06:25 UTC 2016 - dmuel...@suse.com
+
+- fix build for non-ARM architectures
+- remove builddeps from dtb-source package
+
+-------------------------------------------------------------------
+Sun Jan 31 13:10:10 UTC 2016 - dmuel...@suse.com
+
+- add dtb-bcm2836 (RPi2 upstream version)
+
+-------------------------------------------------------------------
+Fri Jan 22 00:34:58 UTC 2016 - stefan.bru...@rwth-aachen.de
+
+- Do not copy kernel source but build out-of-tree
+
+-------------------------------------------------------------------
+Wed Jan 20 18:59:08 UTC 2016 - afaer...@suse.de
+
+- Re-enable meson8b, new in kernel 4.4
+
+-------------------------------------------------------------------
+Fri Jan 15 16:03:34 UTC 2016 - stefan.bru...@rwth-aachen.de
+
+- Change summary/description for bcm2835 from RPi B to RPi 1, to
+ distinguish between RPi 2 B and RPi B (original version). Also
+ list models (A+, B, B+) to make it easier to find the right
+ package.
+ Support for A+ and B+ is new in Kernel 4.4.0
+
+-------------------------------------------------------------------
+Wed Jan 13 15:59:26 UTC 2016 - ag...@suse.com
+
+- Add dtb-hisilicon64 package for 64bit hisilicon SoCs
+
+-------------------------------------------------------------------
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.x8GZJa/_old 2016-02-09 16:50:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x8GZJa/_new 2016-02-09 16:50:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dtb-aarch64
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,25 +16,25 @@
#
-Name: dtb-aarch64
-BuildRequires: kernel-source
%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is
not")
%define kernel_release %(rpm -q --qf "%{RELEASE}" kernel-source | grep -v "is
not" | cut -d. -f 1)
-Version: %kernel_version
+Name: dtb-aarch64
+Version: %{kernel_version}
Release: 0
Summary: Device Tree files for $MACHINES
License: GPL-2.0
Group: System/Boot
Url: http://www.kernel.org/
+BuildRequires: kernel-source
+ExclusiveArch: aarch64
%if "dtb-aarch64" == "dtb-source"
Source99: pre_checkin.pl
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: kernel = %kernel_version
+%else
BuildRequires: cpp
BuildRequires: dtc >= 1.4.0
BuildRequires: xz
-ExclusiveArch: aarch64
+Requires: kernel = %{kernel_version}
+%endif
%description
Device Tree files for $MACHINES.
@@ -75,28 +75,45 @@
%description -n dtb-rtsm_ve-aemv8a
Device Tree Files for RTSM VE AEMv8A board (compatible with Vexpress64).
+%package -n dtb-hisilicon64
+Summary: HiSilicon based arm64 systems
+Group: System/Boot
+Provides: multiversion(dtb)
+Requires(post): coreutils
+
+%description -n dtb-hisilicon64
+Device Tree Files for HiSilicon based arm64 systems.
+
%prep
%build
-cp /usr/src/linux/COPYING .
-cp -r /usr/src/linux/ .
-chmod -R ug+rw linux
+cp %{_prefix}/src/linux/COPYING .
+%if "dtb-aarch64" != "dtb-source"
+mkdir pp
+PPDIR=`pwd`/pp
+export DTC_FLAGS="-R 4 -p 0x1000"
+
+cd %{_prefix}/src/linux/arch/arm64/boot/dts
+for dts in apm/apm-mustang.dts cavium/thunder-88xx.dts arm/foundation-v8.dts
arm/rtsm_ve-aemv8a.dts hisilicon/*.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
+ dtc $DTC_FLAGS -I dts -O dtb -i ./$(dirname $target) -o
$PPDIR/$target.dtb $PPDIR/$target.dts
+done
+%endif
%define dtbdir /boot/dtb-%{kernel_version}-%{kernel_release}
%install
%if "dtb-aarch64" != "dtb-source"
-export DTC_FLAGS="-R 4 -p 0x1000"
-mkdir -p %{buildroot}%{dtbdir}
-cd linux/arch/arm64/boot/dts
-for dts in apm/apm-mustang.dts cavium/thunder-88xx.dts arm/foundation-v8.dts
arm/rtsm_ve-aemv8a.dts ; do
+cd pp
+for dts in apm/apm-mustang.dts cavium/thunder-88xx.dts arm/foundation-v8.dts
arm/rtsm_ve-aemv8a.dts hisilicon/*.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}%{dtbdir}/$(dirname $target)
- dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}%{dtbdir}/$target.dtb
$target.dts.tmp
+ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target)
done
cd -
@@ -128,6 +145,13 @@
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb
+%post -n dtb-hisilicon64
+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
+
%files -n dtb-apm-mustang
%defattr(-,root,root)
%doc COPYING
@@ -160,6 +184,23 @@
%dir %{dtbdir}/arm
%{dtbdir}/arm/rtsm_ve-aemv8a.dtb
+%files -n dtb-hisilicon64
+%defattr(-,root,root)
+%doc COPYING
+%ghost /boot/dtb
+%dir %{dtbdir}
+%dir %{dtbdir}/hisilicon
+%{dtbdir}/hisilicon/*.dtb
+
+%else
+cat - > README <<EOF
+This package only consists for convenience reason to pass openSUSE Factory
+review bots. Please take a look at the dtb-%{_arch}.src.rpm instead.
+EOF
+
+%files
+%doc README COPYING
+
%endif
%changelog
++++++ dtb-armv6l.spec ++++++
--- /var/tmp/diff_new_pack.x8GZJa/_old 2016-02-09 16:50:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x8GZJa/_new 2016-02-09 16:50:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dtb-armv6l
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,60 +16,68 @@
#
-Name: dtb-armv6l
-BuildRequires: kernel-source
%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is
not")
%define kernel_release %(rpm -q --qf "%{RELEASE}" kernel-source | grep -v "is
not" | cut -d. -f 1)
-Version: %kernel_version
+Name: dtb-armv6l
+Version: %{kernel_version}
Release: 0
Summary: Device Tree files for $MACHINES
License: GPL-2.0
Group: System/Boot
Url: http://www.kernel.org/
+BuildRequires: kernel-source
+ExclusiveArch: armv6l armv6hl
%if "dtb-armv6l" == "dtb-source"
Source99: pre_checkin.pl
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: kernel = %kernel_version
+%else
BuildRequires: cpp
BuildRequires: dtc >= 1.4.0
BuildRequires: xz
-ExclusiveArch: armv6l armv6hl
+Requires: kernel = %{kernel_version}
+%endif
%description
Device Tree files for $MACHINES.
%package -n dtb-bcm2835
-Summary: Raspberry Pi B
+Summary: Raspberry Pi 1 (A+, B, B+)
Group: System/Boot
Provides: multiversion(dtb)
Requires(post): coreutils
%description -n dtb-bcm2835
-Device Tree Files for Raspberry Pi B.
+Device Tree Files for Raspberry Pi 1 (A+, B, B+).
%prep
%build
-cp /usr/src/linux/COPYING .
-cp -r /usr/src/linux/ .
-chmod -R ug+rw linux
+cp %{_prefix}/src/linux/COPYING .
+%if "dtb-armv6l" != "dtb-source"
+mkdir pp
+PPDIR=`pwd`/pp
+export DTC_FLAGS="-R 4 -p 0x1000"
+
+cd %{_prefix}/src/linux/arch/arm/boot/dts
+for dts in bcm2835*.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
+ dtc $DTC_FLAGS -I dts -O dtb -i ./$(dirname $target) -o
$PPDIR/$target.dtb $PPDIR/$target.dts
+done
+%endif
%define dtbdir /boot/dtb-%{kernel_version}-%{kernel_release}
%install
%if "dtb-armv6l" != "dtb-source"
-export DTC_FLAGS="-R 4 -p 0x1000"
-mkdir -p %{buildroot}%{dtbdir}
-cd linux/arch/arm/boot/dts
+cd pp
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}%{dtbdir}/$(dirname $target)
- dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}%{dtbdir}/$target.dtb
$target.dts.tmp
+ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target)
done
cd -
@@ -87,6 +95,15 @@
%dir %{dtbdir}
%{dtbdir}/bcm2835*.dtb
+%else
+cat - > README <<EOF
+This package only consists for convenience reason to pass openSUSE Factory
+review bots. Please take a look at the dtb-%{_arch}.src.rpm instead.
+EOF
+
+%files
+%doc README COPYING
+
%endif
%changelog
++++++ dtb-armv7l.spec ++++++
--- /var/tmp/diff_new_pack.x8GZJa/_old 2016-02-09 16:50:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x8GZJa/_new 2016-02-09 16:50:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dtb-armv7l
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,25 +16,25 @@
#
-Name: dtb-armv7l
-BuildRequires: kernel-source
%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is
not")
%define kernel_release %(rpm -q --qf "%{RELEASE}" kernel-source | grep -v "is
not" | cut -d. -f 1)
-Version: %kernel_version
+Name: dtb-armv7l
+Version: %{kernel_version}
Release: 0
Summary: Device Tree files for $MACHINES
License: GPL-2.0
Group: System/Boot
Url: http://www.kernel.org/
+BuildRequires: kernel-source
+ExclusiveArch: armv7l armv7hl
%if "dtb-armv7l" == "dtb-source"
Source99: pre_checkin.pl
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: kernel = %kernel_version
+%else
BuildRequires: cpp
BuildRequires: dtc >= 1.4.0
BuildRequires: xz
-ExclusiveArch: armv7l armv7hl
+Requires: kernel = %{kernel_version}
+%endif
%description
Device Tree files for $MACHINES.
@@ -120,6 +120,15 @@
%description -n dtb-armada-xp
Device Tree Files for Armada XP based systems.
+%package -n dtb-bcm2836
+Summary: Raspberry Pi 2 Model B
+Group: System/Boot
+Provides: multiversion(dtb)
+Requires(post): coreutils
+
+%description -n dtb-bcm2836
+Device Tree Files for Raspberry Pi 2 Model B.
+
%package -n dtb-dove
Summary: Marvell dove based systems
Group: System/Boot
@@ -219,6 +228,15 @@
%description -n dtb-meson8
Device Tree Files for Amlogic Meson 8 based systems.
+%package -n dtb-meson8b
+Summary: Amlogic Meson 8b based systems
+Group: System/Boot
+Provides: multiversion(dtb)
+Requires(post): coreutils
+
+%description -n dtb-meson8b
+Device Tree Files for Amlogic Meson 8b based systems.
+
%package -n dtb-omap3
Summary: TI OMAP3 based systems
Group: System/Boot
@@ -413,23 +431,31 @@
%prep
%build
-cp /usr/src/linux/COPYING .
-cp -r /usr/src/linux/ .
-chmod -R ug+rw linux
+cp %{_prefix}/src/linux/COPYING .
+%if "dtb-armv7l" != "dtb-source"
+mkdir pp
+PPDIR=`pwd`/pp
+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
+ 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
+ dtc $DTC_FLAGS -I dts -O dtb -i ./$(dirname $target) -o
$PPDIR/$target.dtb $PPDIR/$target.dts
+done
+%endif
%define dtbdir /boot/dtb-%{kernel_version}-%{kernel_release}
%install
%if "dtb-armv7l" != "dtb-source"
-export DTC_FLAGS="-R 4 -p 0x1000"
-mkdir -p %{buildroot}%{dtbdir}
-cd 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 dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts
imx7*.dts k2e-*.dts k2hk-*.dts k2l-*.dts meson6-*.dts meson8-*.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
+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
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}%{dtbdir}/$(dirname $target)
- dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}%{dtbdir}/$target.dtb
$target.dts.tmp
+ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target)
done
cd -
@@ -496,6 +522,13 @@
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb
+%post -n dtb-bcm2836
+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-dove
cd /boot
# If /boot/dtb is a symlink, remove it, so that we can replace it.
@@ -573,6 +606,13 @@
# Unless /boot/dtb exists as real directory, create a symlink.
[ -d dtb ] || ln -sf dtb-%{kernel_version}-%{kernel_release} dtb
+%post -n dtb-meson8b
+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-omap3
cd /boot
# If /boot/dtb is a symlink, remove it, so that we can replace it.
@@ -783,6 +823,13 @@
%dir %{dtbdir}
%{dtbdir}/armada-xp-*.dtb
+%files -n dtb-bcm2836
+%defattr(-,root,root)
+%doc COPYING
+%ghost /boot/dtb
+%dir %{dtbdir}
+%{dtbdir}/bcm2836*.dtb
+
%files -n dtb-dove
%defattr(-,root,root)
%doc COPYING
@@ -860,6 +907,13 @@
%dir %{dtbdir}
%{dtbdir}/meson8-*.dtb
+%files -n dtb-meson8b
+%defattr(-,root,root)
+%doc COPYING
+%ghost /boot/dtb
+%dir %{dtbdir}
+%{dtbdir}/meson8b-*.dtb
+
%files -n dtb-omap3
%defattr(-,root,root)
%doc COPYING
@@ -1007,6 +1061,15 @@
%dir %{dtbdir}
%{dtbdir}/zynq-*.dtb
+%else
+cat - > README <<EOF
+This package only consists for convenience reason to pass openSUSE Factory
+review bots. Please take a look at the dtb-%{_arch}.src.rpm instead.
+EOF
+
+%files
+%doc README COPYING
+
%endif
%changelog
++++++ dtb-source.spec ++++++
--- /var/tmp/diff_new_pack.x8GZJa/_old 2016-02-09 16:50:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x8GZJa/_new 2016-02-09 16:50:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dtb-source
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,24 +16,25 @@
#
-Name: dtb-source
-BuildRequires: kernel-source
%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is
not")
%define kernel_release %(rpm -q --qf "%{RELEASE}" kernel-source | grep -v "is
not" | cut -d. -f 1)
-Version: %kernel_version
+Name: dtb-source
+Version: %{kernel_version}
Release: 0
Summary: Device Tree files for $MACHINES
License: GPL-2.0
Group: System/Boot
Url: http://www.kernel.org/
+BuildRequires: kernel-source
+
%if "dtb-source" == "dtb-source"
Source99: pre_checkin.pl
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: kernel = %kernel_version
+%else
BuildRequires: cpp
BuildRequires: dtc >= 1.4.0
BuildRequires: xz
+Requires: kernel = %{kernel_version}
+%endif
%description
Device Tree files for $MACHINES.
@@ -43,26 +44,43 @@
%prep
%build
-cp /usr/src/linux/COPYING .
-cp -r /usr/src/linux/ .
-chmod -R ug+rw linux
+cp %{_prefix}/src/linux/COPYING .
+%if "dtb-source" != "dtb-source"
+mkdir pp
+PPDIR=`pwd`/pp
+export DTC_FLAGS="-R 4 -p 0x1000"
+
+cd %{_prefix}/src/linux/arch/arm/boot/dts
+for dts in ; 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
+ dtc $DTC_FLAGS -I dts -O dtb -i ./$(dirname $target) -o
$PPDIR/$target.dtb $PPDIR/$target.dts
+done
+%endif
%define dtbdir /boot/dtb-%{kernel_version}-%{kernel_release}
%install
%if "dtb-source" != "dtb-source"
-export DTC_FLAGS="-R 4 -p 0x1000"
-mkdir -p %{buildroot}%{dtbdir}
-cd linux/arch/arm/boot/dts
+cd pp
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}%{dtbdir}/$(dirname $target)
- dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}%{dtbdir}/$target.dtb
$target.dts.tmp
+ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target)
done
cd -
+%else
+cat - > README <<EOF
+This package only consists for convenience reason to pass openSUSE Factory
+review bots. Please take a look at the dtb-%{_arch}.src.rpm instead.
+EOF
+
+%files
+%doc README COPYING
+
%endif
%changelog
++++++ dtb.spec.in ++++++
--- /var/tmp/diff_new_pack.x8GZJa/_old 2016-02-09 16:50:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x8GZJa/_new 2016-02-09 16:50:07.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package $NAME
+# spec file for package dtb.spec
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,25 +16,25 @@
#
-Name: $NAME
-BuildRequires: kernel-source
%define kernel_version %(rpm -q --qf "%{VERSION}" kernel-source | grep -v "is
not")
%define kernel_release %(rpm -q --qf "%{RELEASE}" kernel-source | grep -v "is
not" | cut -d. -f 1)
-Version: %kernel_version
+Name: $NAME
+Version: %{kernel_version}
Release: 0
Summary: Device Tree files for $MACHINES
License: GPL-2.0
Group: System/Boot
Url: http://www.kernel.org/
+BuildRequires: kernel-source
+$ARCH_RESTRICTIONS
%if "$NAME" == "dtb-source"
Source99: pre_checkin.pl
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: kernel = %kernel_version
+%else
BuildRequires: cpp
BuildRequires: dtc >= 1.4.0
BuildRequires: xz
-$ARCH_RESTRICTIONS
+Requires: kernel = %{kernel_version}
+%endif
%description
Device Tree files for $MACHINES.
@@ -44,28 +44,45 @@
%prep
%build
-cp /usr/src/linux/COPYING .
-cp -r /usr/src/linux/ .
-chmod -R ug+rw linux
+cp %{_prefix}/src/linux/COPYING .
+%if "$NAME" != "dtb-source"
+mkdir pp
+PPDIR=`pwd`/pp
+export DTC_FLAGS="-R 4 -p 0x1000"
+
+cd %{_prefix}/src/$DTS_folder
+for dts in $ALL_SUPPORTED_DTB; 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
+ dtc $DTC_FLAGS -I dts -O dtb -i ./$(dirname $target) -o
$PPDIR/$target.dtb $PPDIR/$target.dts
+done
+%endif
%define dtbdir /boot/dtb-%{kernel_version}-%{kernel_release}
%install
%if "$NAME" != "dtb-source"
-export DTC_FLAGS="-R 4 -p 0x1000"
-mkdir -p %{buildroot}%{dtbdir}
-cd $DTS_folder
+cd pp
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}%{dtbdir}/$(dirname $target)
- dtc $DTC_FLAGS -I dts -O dtb -o %{buildroot}%{dtbdir}/$target.dtb
$target.dts.tmp
+ install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target)
done
cd -
$SUBPKG_POST
$SUBPKG_FILES
+%else
+cat - > README <<EOF
+This package only consists for convenience reason to pass openSUSE Factory
+review bots. Please take a look at the dtb-%{_arch}.src.rpm instead.
+EOF
+
+%files
+%doc README COPYING
+
%endif
%changelog
++++++ pre_checkin.pl ++++++
--- /var/tmp/diff_new_pack.x8GZJa/_old 2016-02-09 16:50:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x8GZJa/_new 2016-02-09 16:50:07.000000000 +0100
@@ -16,6 +16,7 @@
['dtb-armada-388', 'armada-388-*.dts', "Armada 388 based systems"],
['dtb-armada-398', 'armada-398-*.dts', "Armada 398 based systems"],
['dtb-armada-xp', 'armada-xp-*.dts', "Armada XP based systems"],
+ ['dtb-bcm2836', 'bcm2836*.dts', "Raspberry Pi 2 Model B"],
['dtb-dove', 'dove-*.dts', "Marvell dove based systems"],
['dtb-exynos4', 'exynos4*.dts', "Samsung Exynos 4 based systems"],
['dtb-exynos5', 'exynos5*.dts', "Samsung Exynos 5 based systems"],
@@ -27,7 +28,7 @@
['dtb-k2l', 'k2l-*.dts', "TI Keystone 2 Lamarr 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"],
+ ['dtb-meson8b', 'meson8b-*.dts', "Amlogic Meson 8b based systems"],
['dtb-omap3', 'omap3*.dts', "TI OMAP3 based systems"],
['dtb-omap4', 'omap4*.dts', "TI OMAP4 based systems"],
['dtb-omap5', 'omap5*.dts', "TI OMAP5 based systems"],
@@ -53,7 +54,7 @@
# DTB packages names
my @armv6l_package_list = (
- ['dtb-bcm2835', 'bcm2835*.dts', "Raspberry Pi B"],
+ ['dtb-bcm2835', 'bcm2835*.dts', "Raspberry Pi 1 (A+, B, B+)"],
);
# DTB packages names
@@ -62,6 +63,7 @@
['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)"],
+ ['dtb-hisilicon64', 'hisilicon/*.dts', "HiSilicon based arm64 systems"],
);
sub generate_spec($$$)
