From 1259186ab86163f76d78d2a3fe5af4bf787ecac7 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Nov 24 2015 14:50:30 +0000 Subject: New git snapshot Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 7e89e3f..6bcb3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2 /bios_extract-d65284d.tar.bz2 +/bios_extract-0.tar.xz diff --git a/bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch b/bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch index eb71d2e..ca56915 100644 --- a/bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch +++ b/bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch @@ -1,26 +1,18 @@ -From a2c2c7e3c10859a701c11d903d7f4ffea3768cbf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 2 Aug 2009 14:30:05 +0400 -Subject: [PATCH 1/1] Identification of some more Award BIOS images. +Subject: [PATCH] Identification of some more Award BIOS images. Signed-off-by: Peter Lemenkov ---- - bios_extract.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/bios_extract.c b/bios_extract.c -index 0bd4dd9..ec4eacf 100644 +index 1368578..1ddc109 100644 --- a/bios_extract.c +++ b/bios_extract.c -@@ -100,6 +100,8 @@ static struct { - {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract}, - {"Phoenix ServerBIOS 3", "BCPSEGMENT", PhoenixExtract}, - {"Phoenix TrustedCore", "BCPSEGMENT", PhoenixExtract}, -+ /* some award modules - not sure this is a good solution */ -+ {"Award Modular BIOS", "Award Software Inc", AwardExtract}, - {NULL, NULL, NULL}, - }; - --- -1.7.3.4 - +@@ -96,6 +96,7 @@ static struct { + "$ASUSAMI$", "AMIBIOSC", AMI95Extract}, { + "AMIEBBLK", "AMIBIOSC", AMI95Extract}, { + "Award BootBlock", "= Award Decompression Bios =", AwardExtract}, { ++ "Award Modular BIOS", "Award Software Inc", AwardExtract}, { + "Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract}, { + "PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract}, { + "PhoenixBIOS Version", "BCPSEGMENT", PhoenixExtract}, { diff --git a/bios_extract.spec b/bios_extract.spec index 91b4846..433fc76 100644 --- a/bios_extract.spec +++ b/bios_extract.spec @@ -1,26 +1,30 @@ -%global git_commit d65284d -%global git_commit_date 20101207 +%global git_commit a257643 +%global git_commit_date 20150611 + Name: bios_extract Version: 0 -Release: 0.14.%{git_commit_date}git%{git_commit}%{?dist} +Release: 0.15.%{git_commit_date}git%{git_commit}%{?dist} Summary: Tools to extract the different submodules of common legacy bioses - Group: Applications/System License: GPLv2+ -URL: http://cgit.freedesktop.org/~libv/bios_extract -Source0: http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2 +URL: http://review.coreboot.org/gitweb?p=bios_extract.git;a=summary +# git clone --no-checkout http://review.coreboot.org/p/bios_extract.git +# cd %{name} +# git archive --prefix=%{name}-%{version}/ %{git_commit} | xz > %{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz # recognized more Award bios images (patch will be sent upstream) Patch1: bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + %description Tools to extract the different submodules of common legacy bioses. %prep -%setup -q -n %{name}-%{git_commit} +%setup -q %patch1 -p1 -b .more_award_types +install -p -m 0644 xfv/README.txt README-xfv.txt %build @@ -28,24 +32,40 @@ CFLAGS="%{optflags} -fpack-struct" make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +# We don't install insyde tools (yet). install -p -m 0755 -D %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} install -p -m 0755 -D ami_slab $RPM_BUILD_ROOT%{_bindir}/ami_slab install -p -m 0755 -D bcpvpd $RPM_BUILD_ROOT%{_bindir}/bcpvpd - -%clean -rm -rf $RPM_BUILD_ROOT - +install -p -m 0755 -D change-mcp55-mac.pl $RPM_BUILD_ROOT%{_bindir}/change-mcp55-mac.pl +install -p -m 0755 -D csmcoreparse.py $RPM_BUILD_ROOT%{_bindir}/csmcoreparse.py +install -p -m 0755 -D decap.sh $RPM_BUILD_ROOT%{_bindir}/decap.sh +install -p -m 0755 -D dell_inspiron_1100_unpacker.py $RPM_BUILD_ROOT%{_bindir}/dell_inspiron_1100_unpacker.py +install -p -m 0755 -D hp_6715b_nc6320_unpacker.py $RPM_BUILD_ROOT%{_bindir}/hp_6715b_nc6320_unpacker.py +install -p -m 0755 -D microcode_extract.py $RPM_BUILD_ROOT%{_bindir}/microcode_extract.py +install -p -m 0755 -D phoenix_extract.py $RPM_BUILD_ROOT%{_bindir}/phoenix_extract.py +install -p -m 0755 -D xfv/efidecomp $RPM_BUILD_ROOT%{_bindir}/efidecomp +install -p -m 0755 -D xfv/xfv.py $RPM_BUILD_ROOT%{_bindir}/xfv.py %files -%defattr(-,root,root,-) -%doc README +%doc COPYING README README-xfv.txt %{_bindir}/%{name} %{_bindir}/ami_slab %{_bindir}/bcpvpd +%{_bindir}/change-mcp55-mac.pl +%{_bindir}/csmcoreparse.py +%{_bindir}/decap.sh +%{_bindir}/dell_inspiron_1100_unpacker.py +%{_bindir}/efidecomp +%{_bindir}/hp_6715b_nc6320_unpacker.py +%{_bindir}/microcode_extract.py +%{_bindir}/phoenix_extract.py +%{_bindir}/xfv.py %changelog +* Mon Nov 23 2015 Peter Lemenkov - 0-0.15.20150611gita257643 +- New git snapshot + * Wed Jun 17 2015 Fedora Release Engineering - 0-0.14.20101207gitd65284d - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index fdd9322..318275c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7ff6438dea0a81aee1d449811ffc1bd bios_extract-d65284d.tar.bz2 +91c4b5b86addaa523f69db64b2f696db bios_extract-0.tar.xz