rpms/hdparm/devel hdparm-6.3-idestruct.patch,1.1,1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Oct 25 13:06:00 UTC 2005


Author: karsten

Update of /cvs/dist/rpms/hdparm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25664

Modified Files:
	hdparm-6.3-idestruct.patch 
Log Message:
trim down patch

hdparm-6.3-idestruct.patch:
 hdparm.h |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+)

Index: hdparm-6.3-idestruct.patch
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/hdparm-6.3-idestruct.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hdparm-6.3-idestruct.patch	25 Oct 2005 12:42:12 -0000	1.1
+++ hdparm-6.3-idestruct.patch	25 Oct 2005 13:05:46 -0000	1.2
@@ -1,22 +1,3 @@
-diff -urN hdparm-6.3/hdparm.c hdparm-6.3_new/hdparm.c
---- hdparm-6.3/hdparm.c	2005-10-25 12:36:19.000000000 +0200
-+++ hdparm-6.3_new/hdparm.c	2005-10-25 12:32:50.000000000 +0200
-@@ -982,10 +982,11 @@
- #endif
- 		int err;
- 		const char *description;
--		struct request_s {
--			ide_task_request_t req	__attribute__((packed));
--			char data[512]		__attribute__((packed));
--		} request;
-+        struct request_s {
-+            ide_task_request_t req	__attribute__((packed));
-+            char data[512]		__attribute__((packed));
-+        } request;
-+
- 		memset(&request, 0, sizeof(request));
- 		((task_struct_t *)(&request.req.io_ports))->command = security_command;
- 		request.req.data_phase	= TASKFILE_OUT;
 diff -urN hdparm-6.3/hdparm.h hdparm-6.3_new/hdparm.h
 --- hdparm-6.3/hdparm.h	2005-10-25 12:36:19.000000000 +0200
 +++ hdparm-6.3_new/hdparm.h	2005-10-25 12:34:21.000000000 +0200
@@ -74,15 +55,3 @@
 +
  #define IDE_DRIVE_TASK_OUT            3
  #define __le16_to_cpus(x) do {} while (0)
-diff -urN hdparm-6.3/Makefile hdparm-6.3_new/Makefile
---- hdparm-6.3/Makefile	2005-10-25 12:36:19.000000000 +0200
-+++ hdparm-6.3_new/Makefile	2005-10-25 12:15:45.000000000 +0200
-@@ -13,7 +13,7 @@
- ifndef CC
- CC = gcc
- endif
--CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
-+CFLAGS := -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
- 
- 
- LDFLAGS =




More information about the fedora-cvs-commits mailing list