Date: Wed, 9 Aug 2006 22:39:52 +0600 (YEKST) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ambrisko@FreeBSD.org Subject: ports/101721: [PATCH] net/etherboot: update to 5.2.6, fix build on 4.x Message-ID: <20060809163952.241A612C63@fonon.realnet> Resent-Message-ID: <200608091850.k79Io970044055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101721
>Category: ports
>Synopsis: [PATCH] net/etherboot: update to 5.2.6, fix build on 4.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 09 18:50:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD
>Description:
- Update to 5.2.6
- Fix build on 4.x
The following files was added:
- files/gcc34-patch
- files/patch-c99
I removed the following files:
- files/patch-ab
- files/patch-gcc34
ChangeLog:
- Support for FILO
- Support for USB disks
- btext console
- Fixes for eepro100, rtl8139, sis900, tlan, tulip and via-rhine drivers
- Added drivers for mtd80x and Davicom based cards
Copy of this message was sent to (ambrisko@freebsd.org).
>How-To-Repeat:
>Fix:
--- etherboot-5.2.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/etherboot/Makefile /var/tmp/ruby/etherboot/Makefile
--- /usr/ports/net/etherboot/Makefile Thu Feb 2 03:36:09 2006
+++ /var/tmp/ruby/etherboot/Makefile Wed Aug 9 22:37:03 2006
@@ -6,8 +6,8 @@
#
PORTNAME= etherboot
-PORTVERSION= 5.2.4
-PORTREVISION= 1
+PORTVERSION= 5.2.6
+PORTREVISION= 0
CATEGORIES= net
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
#MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@
http://etherboot.berlios.de/dist/
MAINTAINER= ambrisko@freebsd.org
-COMMENT= Network boot of FreeBSD a.out/ELF kernels. Replaces/improves netboot.
+COMMENT= Network boot of FreeBSD a.out/ELF kernels (improved netboot)
NO_PACKAGE= lots of configuration necessary
USE_BZIP2= 1
@@ -25,9 +25,15 @@
USE_PERL5_BUILD=yes
ONLY_FOR_ARCHS= i386
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500000
+EXTRA_PATCHES= ${PATCHDIR}/gcc34-patch
+.endif
+
do-install:
@${ECHO} Refer ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for how to
@${ECHO} build and install the rom/floppy image.
- @exit 1
+ @${FALSE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/net/etherboot/distinfo /var/tmp/ruby/etherboot/distinfo
--- /usr/ports/net/etherboot/distinfo Thu Feb 2 03:46:08 2006
+++ /var/tmp/ruby/etherboot/distinfo Wed Aug 9 16:48:24 2006
@@ -1,3 +1,3 @@
-MD5 (etherboot-5.2.4.tar.bz2) = 932260ae1f14a2fc8f3f81823406d254
-SHA256 (etherboot-5.2.4.tar.bz2) = 42a3b5c9eaffceaad9c6ba8f86e654ad82a9a0139e886cf96da54a0738e00cab
-SIZE (etherboot-5.2.4.tar.bz2) = 765452
+MD5 (etherboot-5.2.6.tar.bz2) = af5ae9150beda715deb22a5904a0c8e4
+SHA256 (etherboot-5.2.6.tar.bz2) = f7de9d265347ee27680b436edc4b97fb2a5936bbc9f57bf2a3f8ead9d92d01c6
+SIZE (etherboot-5.2.6.tar.bz2) = 926924
diff -ruN --exclude=CVS /usr/ports/net/etherboot/files/gcc34-patch /var/tmp/ruby/etherboot/files/gcc34-patch
--- /usr/ports/net/etherboot/files/gcc34-patch Thu Jan 1 05:00:00 1970
+++ /var/tmp/ruby/etherboot/files/gcc34-patch Wed Aug 9 16:47:46 2006
@@ -0,0 +1,27 @@
+--- ./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 -ruN --exclude=CVS /usr/ports/net/etherboot/files/patch-ab /var/tmp/ruby/etherboot/files/patch-ab
--- /usr/ports/net/etherboot/files/patch-ab Thu Jul 1 03:52:50 2004
+++ /var/tmp/ruby/etherboot/files/patch-ab Thu Jan 1 05:00:00 1970
@@ -1,33 +0,0 @@
-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
diff -ruN --exclude=CVS /usr/ports/net/etherboot/files/patch-af /var/tmp/ruby/etherboot/files/patch-af
--- /usr/ports/net/etherboot/files/patch-af Wed Dec 8 23:31:42 2004
+++ /var/tmp/ruby/etherboot/files/patch-af Wed Aug 9 22:19:28 2006
@@ -1,17 +1,3 @@
---- ./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
diff -ruN --exclude=CVS /usr/ports/net/etherboot/files/patch-c99 /var/tmp/ruby/etherboot/files/patch-c99
--- /usr/ports/net/etherboot/files/patch-c99 Thu Jan 1 05:00:00 1970
+++ /var/tmp/ruby/etherboot/files/patch-c99 Wed Aug 9 22:35:59 2006
@@ -0,0 +1,24 @@
+--- 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");
+
diff -ruN --exclude=CVS /usr/ports/net/etherboot/files/patch-gcc34 /var/tmp/ruby/etherboot/files/patch-gcc34
--- /usr/ports/net/etherboot/files/patch-gcc34 Sat Oct 8 03:54:29 2005
+++ /var/tmp/ruby/etherboot/files/patch-gcc34 Thu Jan 1 05:00:00 1970
@@ -1,27 +0,0 @@
---- ./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+=
--- etherboot-5.2.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060809163952.241A612C63>