rpms/ppc64-utils/devel ppc64-utils.spec,1.26,1.27

Mon Aug 27 17:45:53 UTC 2007

Author: dcantrel

Update of /cvs/pkgs/rpms/ppc64-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12857

Modified Files:
	ppc64-utils.spec 
Log Message:
* Mon Aug 27 2007 David Cantrell <dcantrell at redhat.com> - 0.11-5
- Spec file style cleanup
- BR dtc now for ps3.dtb since Core/Extras merge is complete
- BR kernel-devel
- Pass kernel include path for ps3pf_utils-1.0.9 build



Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27

--- ppc64-utils.spec	21 Aug 2007 15:39:58 -0000	1.26
+++ ppc64-utils.spec	27 Aug 2007 17:45:21 -0000	1.27
@@ -3,11 +3,12 @@
 %define ps3pfutilsver 1.0.9
 
 Summary: Linux/PPC64 specific utilities
-Name: ppc64-utils
+Name:    ppc64-utils
 Version: 0.11
 Release: 5%{?dist}
 License: GPL and OSL
-Group: System Environment/Base
+Group:   System Environment/Base
+
 Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
 Source1: addRamDisk.c
 Source2: addSystemMap.c
@@ -18,7 +19,7 @@
 Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
 Source9: zImage-wrapper.tar.gz
 Source10: ps3.dts
-Source11: ps3.dtb
+
 Patch0: pmac-utils-0.4-cell.patch
 Patch1: ppc64-utils-1.1-64k.patch
 Patch2: ps3pf_utils-1.0.9-types.patch
@@ -26,8 +27,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 ExclusiveArch: ppc ppc64
 Requires: binutils yaboot
-BuildRequires: linuxdoc-tools
-BuildRequires: librtas-devel
+BuildRequires: linuxdoc-tools librtas-devel kernel-devel dtc
 Provides: powerpc-utils = %{powerpcutilsver}
 Provides: powerpc-utils-papr = %{powerpcutilsver}
 Provides: ps3pf-utils = %{ps3pfutilsver}
@@ -38,51 +38,59 @@
 
 %prep
 %setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8 -a 9
-cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
+%{__cp} %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 %patch0 -p0 -b .cell
 %patch1 -p1 -b .64k
 %patch2 -p0
+
 %build
-make
-find -type f -exec perl -pi -e "s,/usr/sbin/ibmras,%{_sbindir},g" {} \;
-cc -O -fno-builtin -DSTDC_HEADERS addRamDisk.c -o addRamDisk
-cc -O -fno-builtin -DSTDC_HEADERS addSystemMap.c -o addSystemMap
-make -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
-CFLAGS="$RPM_OPT_FLAGS" make -C powerpc-utils-papr-%{powerpcutilsver}
-make -C zImage-boot zImage.stub
-make -C zImage-wrapper CFLAGS="$RPM_OPT_FLAGS"
-make -C ps3pf_utils-%{ps3pfutilsver}
-# After Core/Extras merge, we can require dtc and...
-# dtc -O dtb %{SOURCE10} -o ps3.dtb
+%{__make} %{?_smp_mflags}
+find -type f -exec %{__perl} -pi -e "s,/usr/sbin/ibmras,%{_sbindir},g" {} \;
+
+%{__cc} -O -fno-builtin -DSTDC_HEADERS addRamDisk.c -o addRamDisk
+%{__cc} -O -fno-builtin -DSTDC_HEADERS addSystemMap.c -o addSystemMap
+
+%{__make} -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
+
+CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} -C powerpc-utils-papr-%{powerpcutilsver}
+
+%{__make} %{?_smp_mflags} -C zImage-boot zImage.stub
+
+KVER="$(ls -1 /usr/src/kernels | head -n 1)"
+KINCLUDES="/usr/src/kernels/${KVER}/include"
+%{__make} %{?_smp_mflags} -C zImage-wrapper CFLAGS="%{optflags} -I${KINCLUDES}"
+%{__make} %{?_smp_mflags} -C ps3pf_utils-%{ps3pfutilsver} CFLAGS="%{optflags} -I${KINCLUDES}"
+
+dtc -O dtb %{SOURCE10} -o ps3.dtb
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make LIB_DIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8
-mkdir -p $RPM_BUILD_ROOT/usr/share/ppc64-utils
-install -m 755 mkzimage $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 addRamDisk $RPM_BUILD_ROOT/sbin
-install -m 755 addSystemMap $RPM_BUILD_ROOT/sbin
-install -m 644 zImage-boot/zImage.lds $RPM_BUILD_ROOT/usr/share/ppc64-utils
-install -m 644 zImage-boot/zImage.stub $RPM_BUILD_ROOT/usr/share/ppc64-utils
+%{__rm} -rf %{buildroot}
+%{__make} LIB_DIR=%{_libdir} DESTDIR=%{buildroot} install
+%{__mkdir} -p %{buildroot}/sbin
+%{__mkdir} -p %{buildroot}%{_bindir}
+%{__mkdir} -p %{buildroot}%{_mandir}/man8
+%{__mkdir} -p %{buildroot}%{_datadir}/%{name}
+%{__install} -m 755 mkzimage %{buildroot}/%{_bindir}
+%{__install} -m 755 addRamDisk %{buildroot}/sbin
+%{__install} -m 755 addSystemMap %{buildroot}/sbin
+%{__install} -m 644 zImage-boot/zImage.lds %{buildroot}%{_datadir}/%{name}
+%{__install} -m 644 zImage-boot/zImage.stub %{buildroot}%{_datadir}/%{name}
 pushd pmac-utils-%{pmacutilsver}
-install -m 755 nvsetenv $RPM_BUILD_ROOT/sbin
-install -m 755 nvsetenv.8 $RPM_BUILD_ROOT/%{_mandir}/man8
+%{__install} -m 755 nvsetenv %{buildroot}/sbin
+%{__install} -m 755 nvsetenv.8 %{buildroot}/%{_mandir}/man8
 popd
 pushd powerpc-utils-papr-%{powerpcutilsver}
-make LIB_DIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/etc/init.d
-install -m 644 scripts/ibmvscsis.sh $RPM_BUILD_ROOT/usr/share/ppc64-utils
+%{__make} LIB_DIR=%{_libdir} DESTDIR=%{buildroot} install
+%{__rm} -rf %{buildroot}/etc/init.d
+%{__install} -m 0644 scripts/ibmvscsis.sh %{buildroot}%{_datadir}/%{name}
 popd
-make -C zImage-wrapper DESTDIR=$RPM_BUILD_ROOT install
-make -C ps3pf_utils-%{ps3pfutilsver} DESTDIR=$RPM_BUILD_ROOT install
-install -m0644 %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT/usr/share/ppc64-utils/wrapper
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/packages
+%{__make} -C zImage-wrapper DESTDIR=%{buildroot} install
+%{__make} -C ps3pf_utils-%{ps3pfutilsver} DESTDIR=%{buildroot} install
+%{__install} -m 0644 %{SOURCE10} ps3.dtb %{buildroot}%{_datadir}/%{name}
+%{__rm} -rf %{buildroot}/%{_docdir}/packages
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -90,12 +98,15 @@
 /sbin/*
 %{_sbindir}/*
 %{_bindir}/*
-/usr/share/ppc64-utils/
+%{_datadir}/%{name}/
 %{_mandir}/man8/*
 
 %changelog
-* Tue Aug 21 2007 David Cantrell <dcantrell at redhat.com> - 0.11-5
-- Rebuild
+* Mon Aug 27 2007 David Cantrell <dcantrell at redhat.com> - 0.11-5
+- Spec file style cleanup
+- BR dtc now for ps3.dtb since Core/Extras merge is complete
+- BR kernel-devel
+- Pass kernel include path for ps3pf_utils-1.0.9 build
 
 * Mon Apr 16 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-4
 - Fix handling of PS3 secondary PPU in bootwrapper


