diff --git a/.gitignore b/.gitignore index 1b7b664..7e89e3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2 +/bios_extract-d65284d.tar.bz2 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 fe1bebe..eb71d2e 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,7 +1,7 @@ -From 3bf81db29ad350f3ccab94d3416526e685d71321 Mon Sep 17 00:00:00 2001 +From a2c2c7e3c10859a701c11d903d7f4ffea3768cbf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 2 Aug 2009 14:30:05 +0400 -Subject: [PATCH 1/3] Identification of some more Award BIOS images. +Subject: [PATCH 1/1] Identification of some more Award BIOS images. Signed-off-by: Peter Lemenkov --- @@ -9,18 +9,18 @@ Signed-off-by: Peter Lemenkov 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/bios_extract.c b/bios_extract.c -index cd87ee8..6c65532 100644 +index 0bd4dd9..ec4eacf 100644 --- a/bios_extract.c +++ b/bios_extract.c -@@ -92,6 +92,8 @@ static struct { - {"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract}, +@@ -100,6 +100,8 @@ static struct { {"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract}, - {"Phoenix TrustedCore", "BCPSEGMENT", PhoenixTrustedExtract}, + {"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.6.6.1 +1.7.3.4 diff --git a/bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch b/bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch deleted file mode 100644 index 622dbcc..0000000 --- a/bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 319d5265d21f95599cb6ead2f3683fbd0fe2dac8 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 4 Feb 2010 16:40:49 +0300 -Subject: [PATCH 2/3] Fixed issue with modules filenames, containing slash. - -Some modules have names, containing slash character(s), so we cannot -simply write them to disk w/o either replacing slash with something else -(backslash, for example) or until we create necessary directories. - -Signed-off-by: Peter Lemenkov ---- - bios_extract.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/bios_extract.c b/bios_extract.c -index 6c65532..4f0423d 100644 ---- a/bios_extract.c -+++ b/bios_extract.c -@@ -42,8 +42,14 @@ unsigned char * - MMapOutputFile(char *filename, int size) - { - unsigned char* Buffer; -+ char* tmp = NULL; - int fd; - -+ /* all slash signs '/' in filenames will be replaced by backslash sign '\' */ -+ tmp = filename; -+ while ((tmp = strchr(tmp, '/')) != NULL) -+ tmp[0] = '\\'; -+ - fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); - if (fd < 0) { - fprintf(stderr, "Error: unable to open %s: %s\n\n", --- -1.6.6.1 - diff --git a/bios_extract-0003-Allow-CFLAGS-override.patch b/bios_extract-0003-Allow-CFLAGS-override.patch deleted file mode 100644 index 59b28c6..0000000 --- a/bios_extract-0003-Allow-CFLAGS-override.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 15173400b14d0644b8348ab0300e13841f26493c Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 2 Apr 2010 17:48:08 +0400 -Subject: [PATCH 3/3] Allow CFLAGS override - -Signed-off-by: Peter Lemenkov ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 0313dad..5484387 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - MAKE = make --CFLAGS = -g -fpack-struct -Wall -O0 -+CFLAGS ?= -g -fpack-struct -Wall -O0 - CC = gcc - - all: bios_extract bcpvpd ami_slab --- -1.6.6.1 - diff --git a/bios_extract.spec b/bios_extract.spec index 4966d9b..0f436fb 100644 --- a/bios_extract.spec +++ b/bios_extract.spec @@ -1,9 +1,9 @@ -%global git_commit 6ed57e5682e50088766faaaa680767d16be537a2 -%global git_commit_date 20100423 +%global git_commit d65284d +%global git_commit_date 20101207 Name: bios_extract Version: 0 -Release: 0.5.%{git_commit_date}git%{?dist} +Release: 0.6.%{git_commit_date}git%{git_commit}%{?dist} Summary: Tools to extract the different submodules of common legacy bioses Group: Applications/System @@ -12,10 +12,6 @@ URL: http://cgit.freedesktop.org/~libv/bios_extract Source0: http://cgit.freedesktop.org/~libv/bios_extract/snapshot/%{name}-%{git_commit}.tar.bz2 # recognized more Award bios images (patch will be sent upstream) Patch1: bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch -# Fixed issue with incorrect filenames, containing slash(es). Patch was sent upstream. -Patch2: bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch -# Fedora-specific. Patch was sent upstream. -Patch3: bios_extract-0003-Allow-CFLAGS-override.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -25,8 +21,6 @@ Tools to extract the different submodules of common legacy bioses. %prep %setup -q -n %{name}-%{git_commit} %patch1 -p1 -b .more_award_types -%patch2 -p1 -b .replace_shash_with_backslash -%patch3 -p1 -b .cflags_override %build @@ -52,22 +46,26 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Apr 24 2010 Peter Lemenkov 0-0.5.20100423git +* Sat Jan 22 2011 Peter Lemenkov - 0-0.6.20101207gitd65284d +- New git snapshot +- Dropped upstreamed patches + +* Sat Apr 24 2010 Peter Lemenkov - 0-0.5.20100423git - Added more BIOS types - Added ami_slab utility - Added -fpack-struct to CFLAGS (required to properly parse some BIOS blobs) - Patches rebased (and dropped uptreamed ones) -* Sat Aug 1 2009 Peter Lemenkov 0-0.4.20090713git +* Sat Aug 1 2009 Peter Lemenkov - 0-0.4.20090713git - Fixed work on BigEndian platforms - More bios-types recognized * Fri Jul 24 2009 Fedora Release Engineering - 0-0.3.20090713git - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Wed Jul 22 2009 Peter Lemenkov 0-0.2.20090713git +* Wed Jul 22 2009 Peter Lemenkov - 0-0.2.20090713git - Small changes, based on Yanko Kaneti's suggestions. -* Wed Jul 22 2009 Peter Lemenkov 0-0.1.20090713git +* Wed Jul 22 2009 Peter Lemenkov - 0-0.1.20090713git - Initial package for Fedora diff --git a/sources b/sources index 9cd69d4..fdd9322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40ec009e6a92c83f5390dbbf7d43f9fe bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2 +f7ff6438dea0a81aee1d449811ffc1bd bios_extract-d65284d.tar.bz2