Attachment #69531 for bug #101721

View | Details | Raw Unified | Return to bug 101721
Collapse All | Expand All

Lines 6-13 Link Here

(-)/var/tmp/ruby/etherboot/Makefile (-5 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= etherboot	8	PORTNAME= etherboot
9	PORTVERSION= 5.2.4	9	PORTVERSION= 5.2.6
10	PORTREVISION= 1	10	PORTREVISION= 0
11	CATEGORIES= net	11	CATEGORIES= net
12	#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	#MASTER_SITE_SUBDIR= ${PORTNAME}	13	#MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-22 Link Here
16	http://etherboot.berlios.de/dist/	16	http://etherboot.berlios.de/dist/
17		17
18	MAINTAINER= ambrisko@freebsd.org	18	MAINTAINER= ambrisko@freebsd.org
19	COMMENT= Network boot of FreeBSD a.out/ELF kernels. Replaces/improves netboot.	19	COMMENT= Network boot of FreeBSD a.out/ELF kernels (improved netboot)
20		20
21	NO_PACKAGE= lots of configuration necessary	21	NO_PACKAGE= lots of configuration necessary
22	USE_BZIP2= 1	22	USE_BZIP2= 1
Lines 25-33 Link Here
25	USE_PERL5_BUILD=yes	25	USE_PERL5_BUILD=yes
26	ONLY_FOR_ARCHS= i386	26	ONLY_FOR_ARCHS= i386
27		27
		28	.include <bsd.port.pre.mk>
		29
		30	.if ${OSVERSION} > 500000
		31	EXTRA_PATCHES= ${PATCHDIR}/gcc34-patch
		32	.endif
		33
28	do-install:	34	do-install:
29	@${ECHO} Refer ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for how to	35	@${ECHO} Refer ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for how to
30	@${ECHO} build and install the rom/floppy image.	36	@${ECHO} build and install the rom/floppy image.
31	@exit 1	37	@${FALSE}
32		38
33	.include <bsd.port.mk>	39	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/var/tmp/ruby/etherboot/distinfo (-3 / +3 lines)
1	MD5 (etherboot-5.2.4.tar.bz2) = 932260ae1f14a2fc8f3f81823406d254	1	MD5 (etherboot-5.2.6.tar.bz2) = af5ae9150beda715deb22a5904a0c8e4
2	SHA256 (etherboot-5.2.4.tar.bz2) = 42a3b5c9eaffceaad9c6ba8f86e654ad82a9a0139e886cf96da54a0738e00cab	2	SHA256 (etherboot-5.2.6.tar.bz2) = f7de9d265347ee27680b436edc4b97fb2a5936bbc9f57bf2a3f8ead9d92d01c6
3	SIZE (etherboot-5.2.4.tar.bz2) = 765452	3	SIZE (etherboot-5.2.6.tar.bz2) = 926924




--- ./arch/i386/Config.orig	Mon Feb 23 02:26:09 2004
+++ ./arch/i386/Config		Wed Feb  2 17:32:30 2005
@@ -101,11 +101,11 @@
 # LCONFIG+=	-DBBS_BUT_NOT_PNP_COMPLIANT
 # LCONFIG+=	-DBOOT_INT18H
 
-CFLAGS+= -fstrength-reduce -fomit-frame-pointer -mcpu=i386 -march=i386
+CFLAGS+= -fstrength-reduce -fomit-frame-pointer -march=i386
 # Squeeze the code in as little space as possible.
 # These old options generate warnings from gcc 3.3,
 # but I can't get rid of them until everybody upgrades
-CFLAGS+=	-malign-jumps=1 -malign-loops=1 -malign-functions=1
+CFLAGS+=	-falign-jumps=1 -falign-loops=1 -falign-functions=1
 
 LDFLAGS+=	-N -Ttext $(RELOCADDR)
 
--- ./Config.orig		Wed Feb  2 17:30:16 2005
+++ ./Config			Wed Feb  2 17:30:27 2005
@@ -327,7 +327,7 @@
 RANLIB=		ranlib
 OBJCOPY=	objcopy
 
-CFLAGS+=	-Os -ffreestanding 
+CFLAGS+=	-O -ffreestanding 
 CFLAGS+=	-Wall -W -Wno-format
 ASFLAGS+=
 LDFLAGS+=




diff -urp ./arch/i386/core/freebsd_loader.c /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/arch/i386/core/freebsd_loader.c
--- ./arch/i386/core/freebsd_loader.c	Sun Feb 22 17:26:09 2004
+++ /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/arch/i386/core/freebsd_loader.c	Wed Jun 30 13:53:10 2004
@@ -168,7 +168,7 @@ static int elf_freebsd_debug_loader(unsi
 					for (j=0; j < estate.e.elf32.e_phnum; j++)
 					{
 						/* Check only for loaded sections */
-						if ((estate.p.phdr32[i].p_type | 0x80) == (PT_LOAD | 0x80))
+						if ((estate.p.phdr32[j].p_type | 0x80) == (PT_LOAD | 0x80))
 						{
 							/* Only the extra symbols */
 							if ((shdr[i].sh_offset >= estate.p.phdr32[j].p_offset) &&
@@ -288,7 +290,7 @@ static void elf_freebsd_boot(unsigned lo
 		/* Assumes size of long is a power of 2... */
 		bsdinfo.bi_esymtab = (symstr_load +
 			sizeof(long) +
-			*((long *)symstr_load) +
+			*((long *)phys_to_virt(symstr_load)) +
 			sizeof(long) - 1) & ~(sizeof(long) - 1);
 		
 		/* Where we will build the meta data... */
diff -urp ./core/elf_loader.c /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/core/elf_loader.c
--- ./core/elf_loader.c	Sun Feb 22 17:26:09 2004
+++ /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/core/elf_loader.c	Wed Jun 30 11:38:53 2004
@@ -268,6 +268,7 @@ static sector_t elf32_download(unsigned 
 		}
 		if (estate.segment == -1) {
 			if (elf_freebsd_debug_loader(offset)) {
+				estate.segment = 0; /* -1 makes it not read anymore */
 				continue;
 			}
 			/* No more segments to be loaded, so just start the
Only in /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/core: elf_loader.c.orig




--- ./arch/i386/include/bits/string.h.orig	Sat Dec  4 09:31:24 2004
+++ ./arch/i386/include/bits/string.h	Sat Dec  4 09:33:37 2004
@@ -65,9 +65,10 @@ __asm__ __volatile__(
 return dest;
 }
 
+#ifndef __FreeBSD__
 #define memcmp __builtin_memcmp
 #define __HAVE_ARCH_MEMCMP
-
+#endif
 
 #define __HAVE_ARCH_MEMSET
 static inline void *memset(void *s, int c,size_t count)
--- drivers/disk/ide_disk.c.orig	Sat Dec  4 09:24:19 2004
+++ drivers/disk/ide_disk.c	Sat Dec  4 15:57:18 2004
@@ -592,7 +592,8 @@ static int init_drive(struct harddisk_in




--- filo/usb/ohci.c.orig	Wed Aug  9 22:33:30 2006
+++ filo/usb/ohci.c	Wed Aug  9 22:34:47 2006
@@ -1155,10 +1155,10 @@
 
         int timeout = 30;
         int smm_timeout = 50; /* 0,5 sec */
+        ohci_t *ohci = &_ohci_x[controller];
         
         debug("Resetting OHCI\n");
         ohci_regs = (ohci_regs_t *)hc_base[controller];
-        ohci_t *ohci = &_ohci_x[controller];
 
 #ifndef __hppa__
         /* PA-RISC doesn't have SMM, but PDC might leave IR set */
@@ -1204,8 +1204,8 @@
 	u32 mask;
 	unsigned int fminterval;
 	int delaytime;
-	ohci_regs = (ohci_regs_t *)hc_base[controller];
 	ohci_t *ohci = &_ohci_x[controller];
+	ohci_regs = (ohci_regs_t *)hc_base[controller];
 	
         debug("Starting OHCI\n");
 	




--- ./arch/i386/Config.orig	Mon Feb 23 02:26:09 2004
+++ ./arch/i386/Config		Wed Feb  2 17:32:30 2005
@@ -101,11 +101,11 @@
 # LCONFIG+=	-DBBS_BUT_NOT_PNP_COMPLIANT
 # LCONFIG+=	-DBOOT_INT18H
 
-CFLAGS+= -fstrength-reduce -fomit-frame-pointer -mcpu=i386 -march=i386
+CFLAGS+= -fstrength-reduce -fomit-frame-pointer -march=i386
 # Squeeze the code in as little space as possible.
 # These old options generate warnings from gcc 3.3,
 # but I can't get rid of them until everybody upgrades
-CFLAGS+=	-malign-jumps=1 -malign-loops=1 -malign-functions=1
+CFLAGS+=	-falign-jumps=1 -falign-loops=1 -falign-functions=1
 
 LDFLAGS+=	-N -Ttext $(RELOCADDR)
 
--- ./Config.orig		Wed Feb  2 17:30:16 2005
+++ ./Config			Wed Feb  2 17:30:27 2005
@@ -327,7 +327,7 @@
 RANLIB=		ranlib
 OBJCOPY=	objcopy
 
-CFLAGS+=	-Os -ffreestanding 
+CFLAGS+=	-O -ffreestanding 
 CFLAGS+=	-Wall -W -Wno-format
 ASFLAGS+=
 LDFLAGS+=

Return to bug 101721

Line 0 Link Here

(-)/var/tmp/ruby/etherboot/files/gcc34-patch (+27 lines)
	1	--- ./arch/i386/Config.orig Mon Feb 23 02:26:09 2004
	2	+++ ./arch/i386/Config Wed Feb 2 17:32:30 2005
	3	@@ -101,11 +101,11 @@
	4	# LCONFIG+= -DBBS_BUT_NOT_PNP_COMPLIANT
	5	# LCONFIG+= -DBOOT_INT18H
	6
	7	-CFLAGS+= -fstrength-reduce -fomit-frame-pointer -mcpu=i386 -march=i386
	8	+CFLAGS+= -fstrength-reduce -fomit-frame-pointer -march=i386
	9	# Squeeze the code in as little space as possible.
	10	# These old options generate warnings from gcc 3.3,
	11	# but I can't get rid of them until everybody upgrades
	12	-CFLAGS+= -malign-jumps=1 -malign-loops=1 -malign-functions=1
	13	+CFLAGS+= -falign-jumps=1 -falign-loops=1 -falign-functions=1
	14
	15	LDFLAGS+= -N -Ttext $(RELOCADDR)
	16
	17	--- ./Config.orig Wed Feb 2 17:30:16 2005
	18	+++ ./Config Wed Feb 2 17:30:27 2005
	19	@@ -327,7 +327,7 @@
	20	RANLIB= ranlib
	21	OBJCOPY= objcopy
	22
	23	-CFLAGS+= -Os -ffreestanding
	24	+CFLAGS+= -O -ffreestanding
	25	CFLAGS+= -Wall -W -Wno-format
	26	ASFLAGS+=
	27	LDFLAGS+=

Lines 1-33 Link Here

(-)/var/tmp/ruby/etherboot/files/patch-ab (-33 lines)
1	diff -urp ./arch/i386/core/freebsd_loader.c /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/arch/i386/core/freebsd_loader.c
2	--- ./arch/i386/core/freebsd_loader.c Sun Feb 22 17:26:09 2004
3	+++ /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/arch/i386/core/freebsd_loader.c Wed Jun 30 13:53:10 2004
4	@@ -168,7 +168,7 @@ static int elf_freebsd_debug_loader(unsi
5	for (j=0; j < estate.e.elf32.e_phnum; j++)
6	{
7	/* Check only for loaded sections */
8	- if ((estate.p.phdr32[i].p_type \| 0x80) == (PT_LOAD \| 0x80))
9	+ if ((estate.p.phdr32[j].p_type \| 0x80) == (PT_LOAD \| 0x80))
10	{
11	/* Only the extra symbols */
12	if ((shdr[i].sh_offset >= estate.p.phdr32[j].p_offset) &&
13	@@ -288,7 +290,7 @@ static void elf_freebsd_boot(unsigned lo
14	/* Assumes size of long is a power of 2... */
15	bsdinfo.bi_esymtab = (symstr_load +
16	sizeof(long) +
17	- ((long )symstr_load) +
18	+ ((long )phys_to_virt(symstr_load)) +
19	sizeof(long) - 1) & ~(sizeof(long) - 1);
20
21	/* Where we will build the meta data... */
22	diff -urp ./core/elf_loader.c /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/core/elf_loader.c
23	--- ./core/elf_loader.c Sun Feb 22 17:26:09 2004
24	+++ /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/core/elf_loader.c Wed Jun 30 11:38:53 2004
25	@@ -268,6 +268,7 @@ static sector_t elf32_download(unsigned
26	}
27	if (estate.segment == -1) {
28	if (elf_freebsd_debug_loader(offset)) {
29	+ estate.segment = 0; /* -1 makes it not read anymore */
30	continue;
31	}
32	/* No more segments to be loaded, so just start the
33	Only in /data/home/ambrisko/stable/usr/ports/net/etherboot/work.good/etherboot-5.2.4/src/core: elf_loader.c.orig

Lines 1-17 Link Here

(-)/var/tmp/ruby/etherboot/files/patch-af (-14 lines)
1	--- ./arch/i386/include/bits/string.h.orig Sat Dec 4 09:31:24 2004
2	+++ ./arch/i386/include/bits/string.h Sat Dec 4 09:33:37 2004
3	@@ -65,9 +65,10 @@ __asm__ __volatile__(
4	return dest;
5	}
6
7	+#ifndef __FreeBSD__
8	#define memcmp __builtin_memcmp
9	#define __HAVE_ARCH_MEMCMP
10	-
11	+#endif
12
13	#define __HAVE_ARCH_MEMSET
14	static inline void memset(void s, int c,size_t count)
15	--- drivers/disk/ide_disk.c.orig Sat Dec 4 09:24:19 2004	1	--- drivers/disk/ide_disk.c.orig Sat Dec 4 09:24:19 2004
16	+++ drivers/disk/ide_disk.c Sat Dec 4 15:57:18 2004	2	+++ drivers/disk/ide_disk.c Sat Dec 4 15:57:18 2004
17	@@ -592,7 +592,8 @@ static int init_drive(struct harddisk_in	3	@@ -592,7 +592,8 @@ static int init_drive(struct harddisk_in

Line 0 Link Here

(-)/var/tmp/ruby/etherboot/files/patch-c99 (+24 lines)
	1	--- filo/usb/ohci.c.orig Wed Aug 9 22:33:30 2006
	2	+++ filo/usb/ohci.c Wed Aug 9 22:34:47 2006
	3	@@ -1155,10 +1155,10 @@
	4
	5	int timeout = 30;
	6	int smm_timeout = 50; /* 0,5 sec */
	7	+ ohci_t *ohci = &_ohci_x[controller];
	8
	9	debug("Resetting OHCI\n");
	10	ohci_regs = (ohci_regs_t *)hc_base[controller];
	11	- ohci_t *ohci = &_ohci_x[controller];
	12
	13	#ifndef __hppa__
	14	/* PA-RISC doesn't have SMM, but PDC might leave IR set */
	15	@@ -1204,8 +1204,8 @@
	16	u32 mask;
	17	unsigned int fminterval;
	18	int delaytime;
	19	- ohci_regs = (ohci_regs_t *)hc_base[controller];
	20	ohci_t *ohci = &_ohci_x[controller];
	21	+ ohci_regs = (ohci_regs_t *)hc_base[controller];
	22
	23	debug("Starting OHCI\n");
	24

Lines 1-27 Link Here

(-)/var/tmp/ruby/etherboot/files/patch-gcc34 (-27 lines)
1	--- ./arch/i386/Config.orig Mon Feb 23 02:26:09 2004
2	+++ ./arch/i386/Config Wed Feb 2 17:32:30 2005
3	@@ -101,11 +101,11 @@
4	# LCONFIG+= -DBBS_BUT_NOT_PNP_COMPLIANT
5	# LCONFIG+= -DBOOT_INT18H
6
7	-CFLAGS+= -fstrength-reduce -fomit-frame-pointer -mcpu=i386 -march=i386
8	+CFLAGS+= -fstrength-reduce -fomit-frame-pointer -march=i386
9	# Squeeze the code in as little space as possible.
10	# These old options generate warnings from gcc 3.3,
11	# but I can't get rid of them until everybody upgrades
12	-CFLAGS+= -malign-jumps=1 -malign-loops=1 -malign-functions=1
13	+CFLAGS+= -falign-jumps=1 -falign-loops=1 -falign-functions=1
14
15	LDFLAGS+= -N -Ttext $(RELOCADDR)
16
17	--- ./Config.orig Wed Feb 2 17:30:16 2005
18	+++ ./Config Wed Feb 2 17:30:27 2005
19	@@ -327,7 +327,7 @@
20	RANLIB= ranlib
21	OBJCOPY= objcopy
22
23	-CFLAGS+= -Os -ffreestanding
24	+CFLAGS+= -O -ffreestanding
25	CFLAGS+= -Wall -W -Wno-format
26	ASFLAGS+=
27	LDFLAGS+=