rpms/kernel/F-10 linux-2.6-compile-fixes.patch,1.180,1.181

Chuck Ebbert cebbert at fedoraproject.org
Fri Jan 30 00:35:45 UTC 2009


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12501

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
another build fix from rawhide

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- linux-2.6-compile-fixes.patch	30 Jan 2009 00:24:47 -0000	1.180
+++ linux-2.6-compile-fixes.patch	30 Jan 2009 00:35:45 -0000	1.181
@@ -75,3 +75,647 @@
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 Please read the FAQ at  http://www.tux.org/lkml/
 
+From e2efba5a3a087933a6e372fef4934c71f9b1365f Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at minerva.i.cabal.ca>
+Date: Fri, 9 Jan 2009 11:54:51 -0500
+Subject: Revert "fix modules_install via NFS"
+
+This reverts commit 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6.
+---
+ firmware/.gitignore |    1 +
+ firmware/Makefile   |   10 +-
+ firmware/ihex2fw.c  |  268 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ scripts/.gitignore  |    1 -
+ scripts/Makefile    |    3 +-
+ scripts/ihex2fw.c   |  268 ---------------------------------------------------
+ 6 files changed, 276 insertions(+), 275 deletions(-)
+ create mode 100644 firmware/ihex2fw.c
+ delete mode 100644 scripts/ihex2fw.c
+
+diff --git a/firmware/.gitignore b/firmware/.gitignore
+index f89a21f..d9c6901 100644
+--- a/firmware/.gitignore
++++ b/firmware/.gitignore
+@@ -3,3 +3,4 @@
+ *.bin
+ *.csp
+ *.dsp
++ihex2fw
+diff --git a/firmware/Makefile b/firmware/Makefile
+index ea1d28f..aae5129 100644
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -101,10 +101,10 @@ quiet_cmd_ihex  = IHEX    $@
+       cmd_ihex  = $(OBJCOPY) -Iihex -Obinary $< $@
+ 
+ quiet_cmd_ihex2fw  = IHEX2FW $@
+-      cmd_ihex2fw  = $(objtree)/scripts/ihex2fw $< $@
++      cmd_ihex2fw  = $(objtree)/$(obj)/ihex2fw $< $@
+ 
+ quiet_cmd_h16tofw  = H16TOFW $@
+-      cmd_h16tofw  = $(objtree)/scripts/ihex2fw -w $< $@
++      cmd_h16tofw  = $(objtree)/$(obj)/ihex2fw -w $< $@
+ 
+ quiet_cmd_fwbin = MK_FW   $@
+       cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)";		     \
+@@ -167,11 +167,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
+ # is actually meaningful, because the firmware has to be loaded in a certain
+ # order rather than as a single binary blob. Thus, we convert them into our
+ # more compact binary representation of ihex records (<linux/ihex.h>)
+-$(obj)/%.fw: $(obj)/%.HEX  | $(objtree)/$(obj)/$$(dir %)
++$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
+ 	$(call cmd,ihex2fw)
+ 
+ # .H16 is our own modified form of Intel HEX, with 16-bit length for records.
+-$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %)
++$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
+ 	$(call cmd,h16tofw)
+ 
+ $(firmware-dirs):
+@@ -188,3 +188,5 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
+ # Without this, built-in.o won't be created when it's empty, and the
+ # final vmlinux link will fail.
+ obj-n := dummy
++
++hostprogs-y := ihex2fw
+diff --git a/firmware/ihex2fw.c b/firmware/ihex2fw.c
+new file mode 100644
+index 0000000..8f7fdaa
+--- /dev/null
++++ b/firmware/ihex2fw.c
+@@ -0,0 +1,268 @@
++/*
++ * Parser/loader for IHEX formatted data.
++ *
++ * Copyright © 2008 David Woodhouse <dwmw2 at infradead.org>
++ * Copyright © 2005 Jan Harkes <jaharkes at cs.cmu.edu>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <stdint.h>
++#include <arpa/inet.h>
++#include <stdio.h>
++#include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++#include <string.h>
++#include <unistd.h>
++#include <stdlib.h>
++#define _GNU_SOURCE
++#include <getopt.h>
++
++
++struct ihex_binrec {
++	struct ihex_binrec *next; /* not part of the real data structure */
++        uint32_t addr;
++        uint16_t len;
++        uint8_t data[];
++};
++
++/**
++ * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
++ **/
++static uint8_t nybble(const uint8_t n)
++{
++       if      (n >= '0' && n <= '9') return n - '0';
++       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
++       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
++       return 0;
++}
++
++static uint8_t hex(const uint8_t *data, uint8_t *crc)
++{
++       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
++       *crc += val;
++       return val;
++}
++
++static int process_ihex(uint8_t *data, ssize_t size);
++static void file_record(struct ihex_binrec *record);
++static int output_records(int outfd);
++
++static int sort_records = 0;
++static int wide_records = 0;
++
++int usage(void)
++{
++	fprintf(stderr, "ihex2fw: Convert ihex files into binary "
++		"representation for use by Linux kernel\n");
++	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
++	fprintf(stderr, "       -w: wide records (16-bit length)\n");
++	fprintf(stderr, "       -s: sort records by address\n");
++	return 1;
++}
++
++int main(int argc, char **argv)
++{
++	int infd, outfd;
++	struct stat st;
++	uint8_t *data;
++	int opt;
++
++	while ((opt = getopt(argc, argv, "ws")) != -1) {
++		switch (opt) {
++		case 'w':
++			wide_records = 1;
++			break;
++		case 's':
++			sort_records = 1;
++			break;
++		default:
++			return usage();
++		}
++	}
++
++	if (optind + 2 != argc)
++		return usage();
++
++	if (!strcmp(argv[optind], "-"))
++	    infd = 0;
++	else
++		infd = open(argv[optind], O_RDONLY);
++	if (infd == -1) {
++		fprintf(stderr, "Failed to open source file: %s",
++			strerror(errno));
++		return usage();
++	}
++	if (fstat(infd, &st)) {
++		perror("stat");
++		return 1;
++	}
++	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
++	if (data == MAP_FAILED) {
++		perror("mmap");
++		return 1;
++	}
++
++	if (!strcmp(argv[optind+1], "-"))
++	    outfd = 1;
++	else
++		outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
++	if (outfd == -1) {
++		fprintf(stderr, "Failed to open destination file: %s",
++			strerror(errno));
++		return usage();
++	}
++	if (process_ihex(data, st.st_size))
++		return 1;
++
++	output_records(outfd);
++	return 0;
++}
++
++static int process_ihex(uint8_t *data, ssize_t size)
++{
++	struct ihex_binrec *record;
++	uint32_t offset = 0;
++	uint8_t type, crc = 0, crcbyte = 0;
++	int i, j;
++	int line = 1;
++	int len;
++
++	i = 0;
++next_record:
++	/* search for the start of record character */
++	while (i < size) {
++		if (data[i] == '\n') line++;
++		if (data[i++] == ':') break;
++	}
++
++	/* Minimum record length would be about 10 characters */
++	if (i + 10 > size) {
++		fprintf(stderr, "Can't find valid record at line %d\n", line);
++		return -EINVAL;
++	}
++
++	len = hex(data + i, &crc); i += 2;
++	if (wide_records) {
++		len <<= 8;
++		len += hex(data + i, &crc); i += 2;
++	}
++	record = malloc((sizeof (*record) + len + 3) & ~3);
++	if (!record) {
++		fprintf(stderr, "out of memory for records\n");
++		return -ENOMEM;
++	}
++	memset(record, 0, (sizeof(*record) + len + 3) & ~3);
++	record->len = len;
++
++	/* now check if we have enough data to read everything */
++	if (i + 8 + (record->len * 2) > size) {
++		fprintf(stderr, "Not enough data to read complete record at line %d\n",
++			line);
++		return -EINVAL;
++	}
++
++	record->addr  = hex(data + i, &crc) << 8; i += 2;
++	record->addr |= hex(data + i, &crc); i += 2;
++	type = hex(data + i, &crc); i += 2;
++
++	for (j = 0; j < record->len; j++, i += 2)
++		record->data[j] = hex(data + i, &crc);
++
++	/* check CRC */
++	crcbyte = hex(data + i, &crc); i += 2;
++	if (crc != 0) {
++		fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
++			line, crcbyte, (unsigned char)(crcbyte-crc));
++		return -EINVAL;
++	}
++
++	/* Done reading the record */
++	switch (type) {
++	case 0:
++		/* old style EOF record? */
++		if (!record->len)
++			break;
++
++		record->addr += offset;
++		file_record(record);
++		goto next_record;
++
++	case 1: /* End-Of-File Record */
++		if (record->addr || record->len) {
++			fprintf(stderr, "Bad EOF record (type 01) format at line %d",
++				line);
++			return -EINVAL;
++		}
++		break;
++
++	case 2: /* Extended Segment Address Record (HEX86) */
++	case 4: /* Extended Linear Address Record (HEX386) */
++		if (record->addr || record->len != 2) {
++			fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
++				type, line);
++			return -EINVAL;
++		}
++
++		/* We shouldn't really be using the offset for HEX86 because
++		 * the wraparound case is specified quite differently. */
++		offset = record->data[0] << 8 | record->data[1];
++		offset <<= (type == 2 ? 4 : 16);
++		goto next_record;
++
++	case 3: /* Start Segment Address Record */
++	case 5: /* Start Linear Address Record */
++		if (record->addr || record->len != 4) {
++			fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
++				type, line);
++			return -EINVAL;
++		}
++
++		/* These records contain the CS/IP or EIP where execution
++		 * starts. Don't really know what to do with them. */
++		goto next_record;
++
++	default:
++		fprintf(stderr, "Unknown record (type %02X)\n", type);
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++static struct ihex_binrec *records;
++
++static void file_record(struct ihex_binrec *record)
++{
++	struct ihex_binrec **p = &records;
++
++	while ((*p) && (!sort_records || (*p)->addr < record->addr))
++		p = &((*p)->next);
++
++	record->next = *p;
++	*p = record;
++}
++
++static int output_records(int outfd)
++{
++	unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
++	struct ihex_binrec *p = records;
++
++	while (p) {
++		uint16_t writelen = (p->len + 9) & ~3;
++
++		p->addr = htonl(p->addr);
++		p->len = htons(p->len);
++		write(outfd, &p->addr, writelen);
++		p = p->next;
++	}
++	/* EOF record is zero length, since we don't bother to represent
++	   the type field in the binary version */
++	write(outfd, zeroes, 6);
++	return 0;
++}
+diff --git a/scripts/.gitignore b/scripts/.gitignore
+index 09e2406..b939fbd 100644
+--- a/scripts/.gitignore
++++ b/scripts/.gitignore
+@@ -1,7 +1,6 @@
+ #
+ # Generated files
+ #
+-ihex2fw
+ conmakehash
+ kallsyms
+ pnmtologo
+diff --git a/scripts/Makefile b/scripts/Makefile
+index 035182e..aafdf06 100644
+--- a/scripts/Makefile
++++ b/scripts/Makefile
+@@ -2,12 +2,11 @@
+ # scripts contains sources for various helper programs used throughout
+ # the kernel for the build process.
+ # ---------------------------------------------------------------------------
+-# ihex2fw:       Parser/loader for IHEX formatted data
+ # kallsyms:      Find all symbols in vmlinux
+ # pnmttologo:    Convert pnm files to logo files
++# conmakehash:   Create chartable
+ # conmakehash:	 Create arrays for initializing the kernel console tables
+ 
+-hostprogs-y                      := ihex2fw
+ hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
+ hostprogs-$(CONFIG_LOGO)         += pnmtologo
+ hostprogs-$(CONFIG_VT)           += conmakehash
+diff --git a/scripts/ihex2fw.c b/scripts/ihex2fw.c
+deleted file mode 100644
+index 8f7fdaa..0000000
+--- a/scripts/ihex2fw.c
++++ /dev/null
+@@ -1,268 +0,0 @@
+-/*
+- * Parser/loader for IHEX formatted data.
+- *
+- * Copyright © 2008 David Woodhouse <dwmw2 at infradead.org>
+- * Copyright © 2005 Jan Harkes <jaharkes at cs.cmu.edu>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+- * published by the Free Software Foundation.
+- */
+-
+-#include <stdint.h>
+-#include <arpa/inet.h>
+-#include <stdio.h>
+-#include <errno.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <sys/mman.h>
+-#include <fcntl.h>
+-#include <string.h>
+-#include <unistd.h>
+-#include <stdlib.h>
+-#define _GNU_SOURCE
+-#include <getopt.h>
+-
+-
+-struct ihex_binrec {
+-	struct ihex_binrec *next; /* not part of the real data structure */
+-        uint32_t addr;
+-        uint16_t len;
+-        uint8_t data[];
+-};
+-
+-/**
+- * nybble/hex are little helpers to parse hexadecimal numbers to a byte value
+- **/
+-static uint8_t nybble(const uint8_t n)
+-{
+-       if      (n >= '0' && n <= '9') return n - '0';
+-       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
+-       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
+-       return 0;
+-}
+-
+-static uint8_t hex(const uint8_t *data, uint8_t *crc)
+-{
+-       uint8_t val = (nybble(data[0]) << 4) | nybble(data[1]);
+-       *crc += val;
+-       return val;
+-}
+-
+-static int process_ihex(uint8_t *data, ssize_t size);
+-static void file_record(struct ihex_binrec *record);
+-static int output_records(int outfd);
+-
+-static int sort_records = 0;
+-static int wide_records = 0;
+-
+-int usage(void)
+-{
+-	fprintf(stderr, "ihex2fw: Convert ihex files into binary "
+-		"representation for use by Linux kernel\n");
+-	fprintf(stderr, "usage: ihex2fw [<options>] <src.HEX> <dst.fw>\n");
+-	fprintf(stderr, "       -w: wide records (16-bit length)\n");
+-	fprintf(stderr, "       -s: sort records by address\n");
+-	return 1;
+-}
+-
+-int main(int argc, char **argv)
+-{
+-	int infd, outfd;
+-	struct stat st;
+-	uint8_t *data;
+-	int opt;
+-
+-	while ((opt = getopt(argc, argv, "ws")) != -1) {
+-		switch (opt) {
+-		case 'w':
+-			wide_records = 1;
+-			break;
+-		case 's':
+-			sort_records = 1;
+-			break;
+-		default:
+-			return usage();
+-		}
+-	}
+-
+-	if (optind + 2 != argc)
+-		return usage();
+-
+-	if (!strcmp(argv[optind], "-"))
+-	    infd = 0;
+-	else
+-		infd = open(argv[optind], O_RDONLY);
+-	if (infd == -1) {
+-		fprintf(stderr, "Failed to open source file: %s",
+-			strerror(errno));
+-		return usage();
+-	}
+-	if (fstat(infd, &st)) {
+-		perror("stat");
+-		return 1;
+-	}
+-	data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, infd, 0);
+-	if (data == MAP_FAILED) {
+-		perror("mmap");
+-		return 1;
+-	}
+-
+-	if (!strcmp(argv[optind+1], "-"))
+-	    outfd = 1;
+-	else
+-		outfd = open(argv[optind+1], O_TRUNC|O_CREAT|O_WRONLY, 0644);
+-	if (outfd == -1) {
+-		fprintf(stderr, "Failed to open destination file: %s",
+-			strerror(errno));
+-		return usage();
+-	}
+-	if (process_ihex(data, st.st_size))
+-		return 1;
+-
+-	output_records(outfd);
+-	return 0;
+-}
+-
+-static int process_ihex(uint8_t *data, ssize_t size)
+-{
+-	struct ihex_binrec *record;
+-	uint32_t offset = 0;
+-	uint8_t type, crc = 0, crcbyte = 0;
+-	int i, j;
+-	int line = 1;
+-	int len;
+-
+-	i = 0;
+-next_record:
+-	/* search for the start of record character */
+-	while (i < size) {
+-		if (data[i] == '\n') line++;
+-		if (data[i++] == ':') break;
+-	}
+-
+-	/* Minimum record length would be about 10 characters */
+-	if (i + 10 > size) {
+-		fprintf(stderr, "Can't find valid record at line %d\n", line);
+-		return -EINVAL;
+-	}
+-
+-	len = hex(data + i, &crc); i += 2;
+-	if (wide_records) {
+-		len <<= 8;
+-		len += hex(data + i, &crc); i += 2;
+-	}
+-	record = malloc((sizeof (*record) + len + 3) & ~3);
+-	if (!record) {
+-		fprintf(stderr, "out of memory for records\n");
+-		return -ENOMEM;
+-	}
+-	memset(record, 0, (sizeof(*record) + len + 3) & ~3);
+-	record->len = len;
+-
+-	/* now check if we have enough data to read everything */
+-	if (i + 8 + (record->len * 2) > size) {
+-		fprintf(stderr, "Not enough data to read complete record at line %d\n",
+-			line);
+-		return -EINVAL;
+-	}
+-
+-	record->addr  = hex(data + i, &crc) << 8; i += 2;
+-	record->addr |= hex(data + i, &crc); i += 2;
+-	type = hex(data + i, &crc); i += 2;
+-
+-	for (j = 0; j < record->len; j++, i += 2)
+-		record->data[j] = hex(data + i, &crc);
+-
+-	/* check CRC */
+-	crcbyte = hex(data + i, &crc); i += 2;
+-	if (crc != 0) {
+-		fprintf(stderr, "CRC failure at line %d: got 0x%X, expected 0x%X\n",
+-			line, crcbyte, (unsigned char)(crcbyte-crc));
+-		return -EINVAL;
+-	}
+-
+-	/* Done reading the record */
+-	switch (type) {
+-	case 0:
+-		/* old style EOF record? */
+-		if (!record->len)
+-			break;
+-
+-		record->addr += offset;
+-		file_record(record);
+-		goto next_record;
+-
+-	case 1: /* End-Of-File Record */
+-		if (record->addr || record->len) {
+-			fprintf(stderr, "Bad EOF record (type 01) format at line %d",
+-				line);
+-			return -EINVAL;
+-		}
+-		break;
+-
+-	case 2: /* Extended Segment Address Record (HEX86) */
+-	case 4: /* Extended Linear Address Record (HEX386) */
+-		if (record->addr || record->len != 2) {
+-			fprintf(stderr, "Bad HEX86/HEX386 record (type %02X) at line %d\n",
+-				type, line);
+-			return -EINVAL;
+-		}
+-
+-		/* We shouldn't really be using the offset for HEX86 because
+-		 * the wraparound case is specified quite differently. */
+-		offset = record->data[0] << 8 | record->data[1];
+-		offset <<= (type == 2 ? 4 : 16);
+-		goto next_record;
+-
+-	case 3: /* Start Segment Address Record */
+-	case 5: /* Start Linear Address Record */
+-		if (record->addr || record->len != 4) {
+-			fprintf(stderr, "Bad Start Address record (type %02X) at line %d\n",
+-				type, line);
+-			return -EINVAL;
+-		}
+-
+-		/* These records contain the CS/IP or EIP where execution
+-		 * starts. Don't really know what to do with them. */
+-		goto next_record;
+-
+-	default:
+-		fprintf(stderr, "Unknown record (type %02X)\n", type);
+-		return -EINVAL;
+-	}
+-
+-	return 0;
+-}
+-
+-static struct ihex_binrec *records;
+-
+-static void file_record(struct ihex_binrec *record)
+-{
+-	struct ihex_binrec **p = &records;
+-
+-	while ((*p) && (!sort_records || (*p)->addr < record->addr))
+-		p = &((*p)->next);
+-
+-	record->next = *p;
+-	*p = record;
+-}
+-
+-static int output_records(int outfd)
+-{
+-	unsigned char zeroes[6] = {0, 0, 0, 0, 0, 0};
+-	struct ihex_binrec *p = records;
+-
+-	while (p) {
+-		uint16_t writelen = (p->len + 9) & ~3;
+-
+-		p->addr = htonl(p->addr);
+-		p->len = htons(p->len);
+-		write(outfd, &p->addr, writelen);
+-		p = p->next;
+-	}
+-	/* EOF record is zero length, since we don't bother to represent
+-	   the type field in the binary version */
+-	write(outfd, zeroes, 6);
+-	return 0;
+-}
+-- 
+1.6.0.6
+




More information about the fedora-extras-commits mailing list