From dd8478d84eee9e593035f8df93870e3ddb3ab288 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Jun 28 2011 14:24:28 +0000 Subject: Update to new dtc release and add the libfdt subpackage --- diff --git a/dtc-check.patch b/dtc-check.patch new file mode 100644 index 0000000..f3560fd --- /dev/null +++ b/dtc-check.patch @@ -0,0 +1,65 @@ +From jwboyer@linux.vnet.ibm.com Tue Jun 28 08:47:09 2011 +Date: Tue, 28 Jun 2011 08:47:09 -0400 +From: Josh Boyer +To: Jon Loeliger +Cc: linuxppc-dev@lists.ozlabs.org +Subject: [PATCH] dtc: Remove unused check variable +Message-ID: <20110628124709.GC10237@zod.rchland.ibm.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: Mutt/1.5.21 (2010-09-15) +Status: RO +Content-Length: 1315 +Lines: 49 + +Commit 376ab6f2 removed the old style check functionality from DTC, +however the check option and variable were not removed. This leads to +build failures when -Werror=unused-but-set-variable is specified: + + dtc.c: In function 'main': + dtc.c:102:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable] + cc1: all warnings being treated as errors + make: *** [dtc.o] Error 1 + make: *** Waiting for unfinished jobs.... + +Remove the check variable. + +Signed-off-by: Josh Boyer + +--- + +t a/dtc.c b/dtc.c +index cbc0193..15d2fc2 100644 +--- a/dtc.c ++++ b/dtc.c +@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) + const char *inform = "dts"; + const char *outform = "dts"; + const char *outname = "-"; +- int force = 0, check = 0, sort = 0; ++ int force = 0, sort = 0; + const char *arg; + int opt; + FILE *outf = NULL; +@@ -111,7 +111,7 @@ int main(int argc, char *argv[]) + minsize = 0; + padsize = 0; + +- while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) { ++ while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fqb:vH:s")) != EOF) { + switch (opt) { + case 'I': + inform = optarg; +@@ -137,9 +137,6 @@ int main(int argc, char *argv[]) + case 'f': + force = 1; + break; +- case 'c': +- check = 1; +- break; + case 'q': + quiet++; + break; + + diff --git a/dtc-flattree.patch b/dtc-flattree.patch new file mode 100644 index 0000000..c8ba010 --- /dev/null +++ b/dtc-flattree.patch @@ -0,0 +1,52 @@ +From jwboyer@linux.vnet.ibm.com Tue Jun 28 09:42:53 2011 +Date: Tue, 28 Jun 2011 09:42:53 -0400 +From: Josh Boyer +To: jdl@jdl.com, david@gibson.dropbear.id.au +Cc: linuxppc-dev@lists.ozlabs.org +Subject: [PATCH] dtc: Remove unused variable in flat_read_mem_reserve +Message-ID: <20110628134253.GD10237@zod.rchland.ibm.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: Mutt/1.5.21 (2010-09-15) +Status: RO +Content-Length: 1865 +Lines: 68 + +The *p variable is declared and used to save inb->ptr, however p is +later never used. This has been the case since commit 6c0f3676 and can +lead to build failures with -Werror=unused-but-set-variable: + + flattree.c: In function 'flat_read_mem_reserve': + flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable] + cc1: all warnings being treated as errors + make: *** [flattree.o] Error 1 + +Remove the variable. + +Signed-off-by: Josh Boyer + +--- + +diff --git a/flattree.c b/flattree.c +index ead0332..28d0b23 100644 +--- a/flattree.c ++++ b/flattree.c +@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) + { + struct reserve_info *reservelist = NULL; + struct reserve_info *new; +- const char *p; + struct fdt_reserve_entry re; + + /* +@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb) + * + * First pass, count entries. + */ +- p = inb->ptr; + while (1) { + flat_read_chunk(inb, &re, sizeof(re)); + re.address = fdt64_to_cpu(re.address); + + diff --git a/dtc.spec b/dtc.spec index 83042d8..27adda4 100644 --- a/dtc.spec +++ b/dtc.spec @@ -1,11 +1,13 @@ Name: dtc -Version: 1.2.0 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Device Tree Compiler Group: Development/Tools License: GPLv2+ -URL: http://dtc.ozlabs.org/ +URL: http://git.jdl.com/gitweb/?p=dtc.git;a=summary Source: http://www.jdl.com/software/dtc-v%{version}.tgz +Patch0: dtc-check.patch +Patch1: dtc-flattree.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex, bison @@ -14,19 +16,34 @@ BuildRequires: flex, bison The Device Tree Compiler generates flattened Open Firmware style device trees for use with PowerPC machines that lack an Open Firmware implementation +%package -n libfdt +Summary: Device tree library +Group: Development/Libraries + +%description -n libfdt +libfdt is a library to process Open Firmware style device trees on various +architectures. + +%package -n libfdt-devel +Summary: Development headers for device tree library +Group: Development/Libraries +Requires: libfdt = %{version}-%{release} + +%description -n libfdt-devel +This package provides development files for libfdt + %prep %setup -q -n dtc-v%{version} +%patch0 -p1 +%patch1 -p1 %build make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr - -#remove the devel stuff. -rm -rf $RPM_BUILD_ROOT/usr/include/* -rm -rf $RPM_BUILD_ROOT/usr/lib/*.a +make install DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr LIBDIR=%{_libdir} +rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -36,7 +53,29 @@ rm -rf $RPM_BUILD_ROOT %doc GPL %{_bindir}/* +%files -n libfdt +%defattr(-,root,root,-) +%doc GPL +%{_libdir}/libfdt-%{version}.so +%{_libdir}/libfdt.so.* + +%files -n libfdt-devel +%defattr(-,root,root,-) +%{_libdir}/libfdt.so +%{_includedir}/* + +%post -n libfdt +/sbin/ldconfig + +%postun -n libfdt +/sbin/ldconfig + %changelog +* Tue Jun 28 2011 Josh Boyer +- Point to git tree for URL (#717217) +- Add libfdt subpackages based on patch from Paolo Bonzini (#443882) +- Update to latest release + * Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild