diff --git a/coreboot-utils.changes b/coreboot-utils.changes index 6ea243a..01d11d9 100644 --- a/coreboot-utils.changes +++ b/coreboot-utils.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 2 20:04:06 CEST 2009 - kernel01@hailfinger.org - -- Update flashrom to from 0.9.1-rc1 to 0.9.1 - * Bug fixes and documentation fixes only -- Update nvramtool to r4625 - * Fix HIGH_TABLES - * Install manpage in section 8 instead of section 1 - -------------------------------------------------------------------- -Mon Aug 24 13:26:37 CEST 2009 - kernel01@hailfinger.org - -- Update flashrom description -- Add nvramtool description -- Use RPM_OPT_FLAGS, drop custom CFLAGS/LDFLAGS -- Install nvramtool in sbin because it's only usable as root - ------------------------------------------------------------------- Tue Aug 18 20:32:39 CEST 2009 - kernel01@hailfinger.org diff --git a/coreboot-utils.spec b/coreboot-utils.spec index 5b97c42..12ab5e2 100644 --- a/coreboot-utils.spec +++ b/coreboot-utils.spec @@ -21,12 +21,13 @@ Name: coreboot-utils Url: http://coreboot.org/ Summary: A universal flashrom programming utility -Version: 0.9.1 +Version: 0.9.0 Release: 1 -%define nvramtool_version r4625 +%define flashrom_svnrevision r687 +%define nvramtool_version r3852 License: GPL v2 only ; GPL v2 or later Group: Development/Tools/Other -Source0: flashrom-%{version}.tar.bz2 +Source0: flashrom-%{version}-%{flashrom_svnrevision}.tar.bz2 Source1: nvramtool-svn-%{nvramtool_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pciutils-devel zlib-devel @@ -35,25 +36,9 @@ Obsoletes: flashrom < %{version} ExclusiveArch: %ix86 x86_64 %description -flashrom is a utility for reading, writing, verifying and erasing flash ROM -chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system -using a supported mainboard, but it also supports flashing of network -cards (NICs), SATA controller cards, and other external devices which can -program flash chips. - -It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and -TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, -or SPI. - -nvramtool is a utility for reading/writing coreboot parameters and -displaying information from the coreboot table. It is intended for x86-based -systems (both 32-bit and 64-bit) that use coreboot. - -The coreboot table resides in low physical memory, and may be accessed -through the /dev/mem interface. It is created at boot time by coreboot, and -contains various system information such as the type of mainboard in use. It -specifies locations in the CMOS (nonvolatile RAM) where the coreboot -parameters are stored. +flashrom is a universal flash programming utility for DIP, PLCC, or +SPI flash ROM chips. It can be used to flash BIOS/LinuxBIOS/firmware +images, for example. @@ -79,28 +64,30 @@ Authors: Uwe Hermann Wang Qingpei Yinghai Lu - David S. Peterson some others %prep -%setup -q -n flashrom-%{version} -a 1 +%setup -q -n flashrom-%{version}-%{flashrom_svnrevision} -a 1 %build make %{?jobs:-j%jobs} \ - CFLAGS="$RPM_OPT_FLAGS" + CFLAGS="$RPM_OPT_FLAGS -Os -Wall " gzip flashrom.8 cd nvramtool-svn-%{nvramtool_version} make %{?jobs:-j%jobs} \ - CFLAGS="$RPM_OPT_FLAGS" + CFLAGS="$RPM_OPT_FLAGS -Os -Wall -DDISABLE_DOC " \ + LDFLAGS="-lpci -lz" gzip nvramtool.8 %install +mkdir -p %{buildroot}%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_sbindir} +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 install -m 0755 flashrom $RPM_BUILD_ROOT/%{_sbindir} install -m 0644 flashrom.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 cd nvramtool-svn-%{nvramtool_version} -install -m 0755 nvramtool $RPM_BUILD_ROOT/%{_sbindir} +install -m 0755 nvramtool $RPM_BUILD_ROOT/%{_bindir} install -m 0644 nvramtool.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8 cd - cp README README.flashrom @@ -119,7 +106,7 @@ rm -rf %{buildroot} %doc README.flashrom ChangeLog.flashrom serprog-protocol.txt %doc DISCLAIMER.nvramtool ChangeLog.nvramtool README.nvramtool %{_sbindir}/flashrom -%{_sbindir}/nvramtool +%{_bindir}/nvramtool %{_mandir}/man8/nvramtool.8.gz %{_mandir}/man8/flashrom.8.gz diff --git a/flashrom-0.9.0-r687.tar.bz2 b/flashrom-0.9.0-r687.tar.bz2 new file mode 100644 index 0000000..6c93898 --- /dev/null +++ b/flashrom-0.9.0-r687.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:073d64fc6bcf5191fd73b3739b224d86f2d4daece5cc91484b36e71232633c5e +size 140648 diff --git a/flashrom-0.9.1.tar.bz2 b/flashrom-0.9.1.tar.bz2 deleted file mode 100644 index 372dc71..0000000 --- a/flashrom-0.9.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88db7a739d315f25e10f318b1dee070af57124965b5edcbfc17239d080aeafe0 -size 143890 diff --git a/nvramtool-svn-r3852.tar.bz2 b/nvramtool-svn-r3852.tar.bz2 new file mode 100644 index 0000000..600e044 --- /dev/null +++ b/nvramtool-svn-r3852.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b4afa51e6a91fcb081c29d4419e63bd2f41d3994f720db38fb1199cef62d4ea +size 50406 diff --git a/nvramtool-svn-r4625.tar.bz2 b/nvramtool-svn-r4625.tar.bz2 deleted file mode 100644 index 93ecb3e..0000000 --- a/nvramtool-svn-r4625.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8be08411da2bd3170c0f8b8e3581ab8ae6397da398c1e5feb1eaacede3dc8a4f -size 50949