From owner-acpi-jp@jp.freebsd.org  Sat Aug  5 22:40:08 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA99629;
	Sat, 5 Aug 2000 22:40:08 +0900 (JST)
	(envelope-from owner-acpi-jp@jp.FreeBSD.org)
Received: from tasogare.imasy.or.jp (daemon@tasogare.imasy.or.jp [202.227.24.5])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA99624
	for <acpi-jp@jp.freebsd.org>; Sat, 5 Aug 2000 22:40:08 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
Received: from localhost (iwasaki.imasy.or.jp [202.227.24.92])
	by tasogare.imasy.or.jp (8.10.1+3.3W/3.7W-tasogare/smtpfeed 1.07) with ESMTP id e75De5p72245
	for <acpi-jp@jp.freebsd.org>; Sat, 5 Aug 2000 22:40:06 +0900 (JST)
	(envelope-from iwasaki@jp.FreeBSD.org)
To: acpi-jp@jp.freebsd.org
In-Reply-To: <20000805033116U.iwasaki@jp.FreeBSD.org>
References: <20000805033116U.iwasaki@jp.FreeBSD.org>
X-Mailer: Mew version 1.94.1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <20000805224001M.iwasaki@jp.FreeBSD.org>
Date: Sat, 05 Aug 2000 22:40:01 +0900
From: Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
X-Dispatcher: imput version 20000228(IM140)
Lines: 116
Reply-To: acpi-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: acpi-jp 529
Subject: [acpi-jp 529] Re: Really merging to FreeBSD (was Re: merging to
 FreeBSD)
Errors-To: owner-acpi-jp@jp.freebsd.org
Sender: owner-acpi-jp@jp.freebsd.org
X-Originator: iwasaki@jp.freebsd.org

> -D 200000804 $B$N(B kernel $B$O5W$7$V$j$KNI$$$G$9!#LdBjL5$1$l$P(B 8/6 0$B;~$K(B 
> import $B:n6H3+;O$7$^$9!#(B

FYI $B$G$9!#FC$KH?BPL5$$$h$&$J$N$G!":#Lk(B 0 $B;~$KE:IU$N(B script $B$rN.$7$F(B
$B%3!<%I%Y!<%9$r(B -D 20000804 $B>uBV$K$7$^$9!#(B


#!/bin/sh

FREEBSDCVS=/home/ncvs
JPCVS=/home/cvs

# import recent CURRENT sys tree
cd
rm -rf work
mkdir work
cd work
cvs -R -d $FREEBSDCVS export -D 20000804 src/sys
cd src/sys
cvs -d $JPCVS import -ko -m 'Import CURRENT sys/ tree as of 20000804.' ACPI/sys FREEBSD_CURRENT CURRENT_20000804

# merge changes into ACPI HEAD from previous import
cd
rm -rf work
mkdir work
cd work
cvs -q -d $JPCVS co -P ACPI/sys
cd ACPI/sys
cvs -q -d $JPCVS update -jCURRENT_20000528 -jCURRENT_20000804
cvs -q -d $JPCVS commit -m 'Update ACPI/sys tree based on CURRENT 20000804.'

# prepare and apply patchs for ACPI/sys HEAD
sed 's/^X//' > $HOME/acpi-sys.diff << 'END_OF_HEREDOC'
X--- conf/files-	Sat Aug  5 21:31:51 2000
X+++ conf/files	Sat Aug  5 21:34:15 2000
X@@ -71,7 +71,7 @@
X ddb/db_variables.c	optional ddb
X ddb/db_watch.c		optional ddb
X ddb/db_write_cmd.c	optional ddb
X-dev/acpi/acpi.c			optional	acpi
X+dev/acpi/acpi.c		count acpi
X dev/acpi/aml/aml_amlmem.c	optional	acpi
X dev/acpi/aml/aml_common.c	optional	acpi
X dev/acpi/aml/aml_evalobj.c	optional	acpi
X@@ -81,7 +81,6 @@
X dev/acpi/aml/aml_parse.c	optional	acpi
X dev/acpi/aml/aml_store.c	optional	acpi
X dev/acpi/aml/aml_region.c	optional	acpi
X-dev/advansys/adv_isa.c		optional	adv isa
X dev/advansys/adv_eisa.c	optional adv eisa
X dev/advansys/adv_pci.c	optional adv pci
X dev/advansys/advansys.c	optional adv
X--- conf/options-	Fri Aug  4 15:28:26 2000
X+++ conf/options	Fri Aug  4 15:28:38 2000
X@@ -448,12 +448,9 @@
X FDC_DEBUG		opt_fdc.h
X PCFCLOCK_VERBOSE	opt_pcfclock.h
X PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
X-<<<<<<< options
X+TDFX_LINUX opt_tdfx.h
X 
X # options for ACPI support
X ACPI_DEBUG		opt_acpi.h
X AML_DEBUG		opt_acpi.h
X ACPI_NO_OSDFUNC_INLINE	opt_acpi.h
X-=======
X-TDFX_LINUX opt_tdfx.h
X->>>>>>> 1.1.1.3
X--- i386/conf/NOTES-	Fri Aug  4 05:58:44 2000
X+++ i386/conf/NOTES	Fri Aug  4 02:34:30 2000
X@@ -1193,6 +1193,12 @@
X # Flag 0x08 automatically disables the i586 optimized routines.
X #
X 
X+# ACPI Experimental Driver
X+device		acpi
X+options		ACPI_DEBUG
X+options		AML_DEBUG
X+options		ACPI_NO_OSDFUNC_INLINE
X+
X #
X # Optional devices:
X #
X--- i386/i386/bios.c-	Fri Aug  4 15:29:04 2000
X+++ i386/i386/bios.c	Fri Aug  4 15:30:01 2000
X@@ -49,16 +49,10 @@
X #include <isa/isavar.h>
X #include <isa/pnpreg.h>
X #include <isa/pnpvar.h>
X-<<<<<<< bios.c
X-#if NISA > 0
X-#include <isa/isavar.h>
X-#endif
X 
X #if NACPI > 0
X #include <sys/acpi.h>
X #endif
X-=======
X->>>>>>> 1.1.1.3
X 
X #define BIOS_START	0xe0000
X #define BIOS_SIZE	0x20000
X@@ -154,7 +148,7 @@
X 	    printf("pnpbios: Bad PnP BIOS data checksum\n");
X 	}
X     }
X-#if NACPI>0
X+#if NACPI > 0
X     /*
X      * ACPI BIOS
X      * acpi_rsdp is GLOBAL and holds RSD PTR signature
END_OF_HEREDOC

cd work/ACPI/sys
patch < $HOME/acpi-sys.diff
cvs -q -d $JPCVS commit -m 'Apply ACPI patches to current sys/ tree.'
