From 05c52c50d5c4e29ba9d950747f1de25f27835216bf9fc2758fa73b8ce1736e23 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 24 May 2013 13:32:51 +0000 Subject: [PATCH 1/3] Accepting request 176484 from Virtualization Replace %make_install with %makeinstall, to allow building for SLE_11_SP2 OBS-URL: https://build.opensuse.org/request/show/176484 OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=11 --- dtc.changes | 5 +++++ dtc.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dtc.changes b/dtc.changes index 1141c91..08082fd 100644 --- a/dtc.changes +++ b/dtc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 24 12:00:09 UTC 2013 - afaerber@suse.de + +- Use %makeinstall in place of %make_install, for SLE_11_SP2 + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/dtc.spec b/dtc.spec index 28b5db5..45ac8d4 100644 --- a/dtc.spec +++ b/dtc.spec @@ -1,7 +1,7 @@ # # spec file for package dtc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,14 +16,14 @@ # - Name: dtc Url: http://git.jdl.com/gitweb/?p=dtc.git;a=summary Version: 1.3.0 -Release: 1 -BuildRequires: bison flex +Release: 0 +BuildRequires: bison +BuildRequires: flex Summary: Device-tree compiler -License: GPLv2+ +License: GPL-2.0+ Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: dtc-%{version}.tar.bz2 @@ -69,7 +69,7 @@ This package provides development files for libfdt make %{?_smp_mflags} %install -%make_install PREFIX=/usr LIBDIR=%{_libdir} +%makeinstall PREFIX=/usr LIBDIR=%{_libdir} rm -f %{buildroot}/%{_libdir}/*.a %files From 19a3aa61e46f36b8c63d21c470e8ccc6bc271e5d4201d997c8609e965bde0927 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 18 Jun 2013 08:58:51 +0000 Subject: [PATCH 2/3] Accepting request 179370 from home:a_faerber:branches:Base:System Install libfdt_env.h header, which recent Git versions of dtc seem to install. This lets QEMU detect our libfdt1-devel package rather than relying on its Git submodule. OBS-URL: https://build.opensuse.org/request/show/179370 OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=12 --- dtc.changes | 6 ++++++ dtc.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/dtc.changes b/dtc.changes index 08082fd..327a0ac 100644 --- a/dtc.changes +++ b/dtc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 18 00:58:27 UTC 2013 - afaerber@suse.de + +- Recent Git versions of dtc install libfdt_env.h, so that + QEMU 1.6.0 will require this file. Install it for compatibility. + ------------------------------------------------------------------- Thu May 24 12:00:09 UTC 2013 - afaerber@suse.de diff --git a/dtc.spec b/dtc.spec index 45ac8d4..24eb6c3 100644 --- a/dtc.spec +++ b/dtc.spec @@ -70,6 +70,7 @@ make %{?_smp_mflags} %install %makeinstall PREFIX=/usr LIBDIR=%{_libdir} +install -m 644 libfdt/libfdt_env.h $RPM_BUILD_ROOT/%{_includedir} rm -f %{buildroot}/%{_libdir}/*.a %files From 6e7abb032cab25620defa3fb386344754f8e92b0012b0fc492cb314ac9c11a7c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 19 Jun 2013 06:58:39 +0000 Subject: [PATCH 3/3] - rename ftdump to dtc-ftdump to avoid conflict with ft2demos OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=13 --- dtc.changes | 5 +++++ dtc.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dtc.changes b/dtc.changes index 327a0ac..048c677 100644 --- a/dtc.changes +++ b/dtc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 19 06:58:23 UTC 2013 - dmueller@suse.com + +- rename ftdump to dtc-ftdump to avoid conflict with ft2demos + ------------------------------------------------------------------- Tue Jun 18 00:58:27 UTC 2013 - afaerber@suse.de diff --git a/dtc.spec b/dtc.spec index 24eb6c3..70ac277 100644 --- a/dtc.spec +++ b/dtc.spec @@ -71,12 +71,16 @@ make %{?_smp_mflags} %install %makeinstall PREFIX=/usr LIBDIR=%{_libdir} install -m 644 libfdt/libfdt_env.h $RPM_BUILD_ROOT/%{_includedir} +mv %{buildroot}/%{_bindir}/ftdump %{buildroot}/%{_bindir}/dtc-ftdump rm -f %{buildroot}/%{_libdir}/*.a %files %defattr(-,root,root) %doc README.license Documentation/manual.txt -%{_bindir}/* +%{_bindir}/convert-dtsv0 +%{_bindir}/dtc +%{_bindir}/dtdiff +%{_bindir}/dtc-ftdump %files -n libfdt1 %defattr(-,root,root,-)