rpms/bios_extract/devel bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch, NONE, 1.1 bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch, NONE, 1.1 bios_extract-0003-Allow-CFLAGS-override.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 bios_extract.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 bios_extract--ami_endian.diff, 1.1, NONE bios_extract--phoenix_and_lh5_endian.diff, 1.1, NONE bios_extract--recognition_of_more_bios_types.diff, 1.1, NONE
Peter Lemenkov
peter at fedoraproject.org
Sat Apr 24 17:17:35 UTC 2010
- Previous message: File bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2 uploaded to lookaside cache by peter
- Next message: rpms/bios_extract/F-13 bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch, NONE, 1.1 bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch, NONE, 1.1 bios_extract-0003-Allow-CFLAGS-override.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 bios_extract.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 bios_extract--ami_endian.diff, 1.1, NONE bios_extract--phoenix_and_lh5_endian.diff, 1.1, NONE bios_extract--recognition_of_more_bios_types.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/bios_extract/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv778/devel
Modified Files:
.cvsignore bios_extract.spec import.log sources
Added Files:
bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch
bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch
bios_extract-0003-Allow-CFLAGS-override.patch
Removed Files:
bios_extract--ami_endian.diff
bios_extract--phoenix_and_lh5_endian.diff
bios_extract--recognition_of_more_bios_types.diff
Log Message:
New snapshot with several fixes and new BIOS types
bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch:
bios_extract.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch ---
>From 3bf81db29ad350f3ccab94d3416526e685d71321 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun, 2 Aug 2009 14:30:05 +0400
Subject: [PATCH 1/3] Identification of some more Award BIOS images.
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
bios_extract.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/bios_extract.c b/bios_extract.c
index cd87ee8..6c65532 100644
--- a/bios_extract.c
+++ b/bios_extract.c
@@ -92,6 +92,8 @@ static struct {
{"Phoenix FirstBIOS", "BCPSEGMENT", PhoenixExtract},
{"PhoenixBIOS 4.0", "BCPSEGMENT", PhoenixExtract},
{"Phoenix TrustedCore", "BCPSEGMENT", PhoenixTrustedExtract},
+ /* some award modules - not sure this is a good solution */
+ {"Award Modular BIOS", "Award Software Inc", AwardExtract},
{NULL, NULL, NULL},
};
--
1.6.6.1
bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch:
bios_extract.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch ---
>From 319d5265d21f95599cb6ead2f3683fbd0fe2dac8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
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 <lemenkov at gmail.com>
---
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
bios_extract-0003-Allow-CFLAGS-override.patch:
Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE bios_extract-0003-Allow-CFLAGS-override.patch ---
>From 15173400b14d0644b8348ab0300e13841f26493c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 2 Apr 2010 17:48:08 +0400
Subject: [PATCH 3/3] Allow CFLAGS override
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 23 Jul 2009 16:51:04 -0000 1.2
+++ .cvsignore 24 Apr 2010 17:17:35 -0000 1.3
@@ -1 +1 @@
-bios_extract-17ca1c5e6a8df6b5663e899504d197862c286d1e.tar.bz2
+bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2
Index: bios_extract.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/devel/bios_extract.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bios_extract.spec 1 Aug 2009 19:07:51 -0000 1.3
+++ bios_extract.spec 24 Apr 2010 17:17:35 -0000 1.4
@@ -1,21 +1,21 @@
-%define git_commit 17ca1c5e6a8df6b5663e899504d197862c286d1e
-%define git_commit_date 20090713
+%global git_commit 6ed57e5682e50088766faaaa680767d16be537a2
+%global git_commit_date 20100423
Name: bios_extract
Version: 0
-Release: 0.4.%{git_commit_date}git%{?dist}
+Release: 0.5.%{git_commit_date}git%{?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
-# fix for extraction of Award and Phoenix bios-images on BigEndian platforms (patch sent upstream)
-Patch0: bios_extract--ami_endian.diff
-# fix for extraction of AMI bios-images on BigEndian platforms (patch sent upstream)
-Patch1: bios_extract--phoenix_and_lh5_endian.diff
-# recognized more bios images (ASUS for example) (patch sent upstream)
-Patch2: bios_extract--recognition_of_more_bios_types.diff
+# 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
@@ -24,19 +24,19 @@ Tools to extract the different submodule
%prep
%setup -q -n %{name}-%{git_commit}
-sed -i s/^CFLAGS.*$// Makefile
-%patch0 -p1 -b .big_endian
-%patch1 -p1 -b .ami_big_endian
-%patch2 -p1 -b .more_images
+%patch1 -p1 -b .more_award_types
+%patch2 -p1 -b .replace_shash_with_backslash
+%patch3 -p1 -b .cflags_override
%build
-CFLAGS="%{optflags}" make %{?_smp_mflags}
+CFLAGS="%{optflags} -fpack-struct" make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
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
@@ -47,10 +47,17 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
+%{_bindir}/ami_slab
%{_bindir}/bcpvpd
%changelog
+* Sat Apr 24 2010 Peter Lemenkov <lemenkov at gmail.com> 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 <lemenkov at gmail.com> 0-0.4.20090713git
- Fixed work on BigEndian platforms
- More bios-types recognized
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 1 Aug 2009 19:07:51 -0000 1.2
+++ import.log 24 Apr 2010 17:17:35 -0000 1.3
@@ -1,2 +1,3 @@
bios_extract-0-0_2_20090713git_fc11:HEAD:bios_extract-0-0.2.20090713git.fc11.src.rpm:1248367822
bios_extract-0-0_4_20090713git_fc11:HEAD:bios_extract-0-0.4.20090713git.fc11.src.rpm:1249153598
+bios_extract-0-0_5_20100423git_fc12:HEAD:bios_extract-0-0.5.20100423git.fc12.src.rpm:1272129385
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bios_extract/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 23 Jul 2009 16:51:04 -0000 1.2
+++ sources 24 Apr 2010 17:17:35 -0000 1.3
@@ -1 +1 @@
-538704606cbd27a85a0f2aaa74592862 bios_extract-17ca1c5e6a8df6b5663e899504d197862c286d1e.tar.bz2
+40ec009e6a92c83f5390dbbf7d43f9fe bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2
--- bios_extract--ami_endian.diff DELETED ---
--- bios_extract--phoenix_and_lh5_endian.diff DELETED ---
--- bios_extract--recognition_of_more_bios_types.diff DELETED ---
- Previous message: File bios_extract-6ed57e5682e50088766faaaa680767d16be537a2.tar.bz2 uploaded to lookaside cache by peter
- Next message: rpms/bios_extract/F-13 bios_extract-0001-Identification-of-some-more-Award-BIOS-images.patch, NONE, 1.1 bios_extract-0002-Fixed-issue-with-modules-filenames-containing-slash.patch, NONE, 1.1 bios_extract-0003-Allow-CFLAGS-override.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 bios_extract.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 bios_extract--ami_endian.diff, 1.1, NONE bios_extract--phoenix_and_lh5_endian.diff, 1.1, NONE bios_extract--recognition_of_more_bios_types.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list