NetBSD 絹の日記

I have some files patched from /dev/null, which will doulbly patched unless removing them.

   88  rm sys/arch/evbppc/conf/{KUROBOX,Makefile.kurobox.inc,files.kurobox,std.kurobox} 
          sys/arch/evbppc/include/{kurobox.h,openpicreg.h} 
          sys/dev/c/rtl8169.c*
   89  cvs update -dPA sys/arch/evbppc/ sys/dev/ic/rtl8169.c
   90  zcat  /e/kurobsd.z.ki.nu/home/ftp/
             pub/testing/evbppc/patch-current/.tmp/20120125.evbppc-current.diff.bz2 
             
   92  sudo ./build.sh -j 8 -m evbppc release |& tee ../log/20120125-log
   93  sudo ./build.sh      -m evbppc release |& tee ../log/20120125-j-1.log

Again, resulting

#   compile  KUROBOX/autoconf.o
 ..  (omit) ..
sys/arch/evbppc/kurobox/autoconf.c:197:1: error: redefinition of 'cpu_configure'
sys/arch/evbppc/kurobox/autoconf.c:67:1: note: previous definition of 'cpu_configure' was here
sys/arch/evbppc/kurobox/autoconf.c:217:1: error: redefinition of 'cpu_rootconf'
sys/arch/evbppc/kurobox/autoconf.c:87:1: note: previous definition of 'cpu_rootconf' was here
sys/arch/evbppc/kurobox/autoconf.c:227:8: error: redefinition of 'bootdev'
sys/arch/evbppc/kurobox/autoconf.c:97:8: note: previous definition of 'bootdev' was here

It turned out autoconf.c should also be removed before patch.

  103  mv   /export/src-20120117-patched/sys/arch/evbppc/kurobox/autoconf.c*  /tmp
  106  mkdir /tmp/x
  107  pushd /tmp/x
  108  zcat  /e/kurobsd.z.ki.nu/home/ftp/
       pub/testing/evbppc/patch-current/.tmp/20120125.evbppc-current.diff.bz2 | patch -s -p0
  110  find . -name autoconf.c
  112  popd
  114  cp /tmp/x/sys/arch/evbppc/kurobox/autoconf.c sys/arch/evbppc/kurobox/autoconf.c

I needed to remove following files before patching:

t-105@makoto 00:02:28/120127(/export/src-20120117-patched)% fc -fild -200 |grep rm
  127  2012-01-26 19:58  rm                              sys/arch/evbppc/kurobox/pci/pci_machdep.h
  131  2012-01-26 20:10  rm /export/src-20120117-patched/sys/arch/evbppc/kurobox/dev/com_eumb.c
  136  2012-01-26 20:54  rm                              sys/arch/evbppc/kurobox/disksubr.c
  140  2012-01-26 21:04  rm /export/src-20120117-patched/sys/arch/evbppc/kurobox/dev/eumb.c
  144  2012-01-26 21:12  rm /export/src-20120117-patched/sys/arch/evbppc/kurobox/machdep.c
  157  2012-01-26 22:20  rm /export/src-20120117-patched/sys/arch/evbppc/kurobox/pci/pchb.c
  165  2012-01-26 22:22  rm /export/src-20120117-patched/sys/arch/evbppc/kurobox/pci/pci_machdep.c
  195  2012-01-26 23:21  rm /export/src-20120117-patched/sys/arch/evbppc/kurobox/locore.S

===> Summary of results:
  build.sh command:    ./build.sh -u -j 8 -m evbppc release
  build.sh started:    Thu Jan 26 23:21:47 JST 2012
  NetBSD version:      5.99.60
  MACHINE:             evbppc
  MACHINE_ARCH:        powerpc
  Build platform:      NetBSD 5.1 amd64
  HOST_SH:             /bin/sh
  TOOLDIR path:        /export/src-20120117-patched/obj/tooldir.NetBSD-5.1-amd64
  DESTDIR path:        /export/src-20120117-patched/obj/destdir.evbppc
  RELEASEDIR path:     /export/src-20120117-patched/obj/releasedir
  Updated makewrapper: /export/src-20120117-patched/obj/tooldir.NetBSD-5.1-amd64/bin/nbmake-evbppc
  Successful make release
  build.sh ended:      Thu Jan 26 23:38:18 JST 2012
===> .

probably,

rm     sys/arch/evbppc/conf/{KUROBOX,Makefile.kurobox.inc,files.kurobox,std.kurobox} 
rm     sys/arch/evbppc/include/{kurobox.h,openpicreg.h} 
rm     sys/dev/c/rtl8169.c
rm -rf sys/arch/evbppc/kurobox/
cvs    update -dPA sys/arch/evbppc
cvs    update -dPA sys/dev/ic/rtl8169.c

zcat  /e/kurobsd.z.ki.nu/home/ftp/ \
        pub/testing/evbppc/patch-current/.tmp/20120125.evbppc-current.diff.bz2

was the right thing for quick confirm.

＠ complete run again:

rm     sys/arch/evbppc/include/{kurobox.h,openpicreg.h} 
rm     sys/arch/evbppc/conf/{KUROBOX,Makefile.kurobox.inc,files.kurobox,std.kurobox} 
rm     sys/arch/evbppc/include/{kurobox.h,openpicreg.h} 
rm     sys/dev/c/rtl8169.c
rm -rf sys/arch/evbppc/kurobox/
cvs    update -dPA sys/arch/evbppc
cvs    update -dPA sys/dev/ic/rtl8169.c
zcat  /e/kurobsd.z.ki.nu/home/ftp/\
	pub/testing/evbppc/patch-current/.tmp/20120125.evbppc-current.diff.bz2 \ 
	| patch -s -p0
sudo ./build.sh -j 8 -m evbppc release |& tee ../log/20120126-log-start-over

make release started at:  Fri Jan 27 00:37:28 JST 2012
make release finished at: Fri Jan 27 02:01:25 JST 2012
===> Successful make release
===> build.sh ended:      Fri Jan 27 02:01:26 JST 2012
===> Summary of results:
         build.sh command:    ./build.sh -j 8 -m evbppc release
         build.sh started:    Fri Jan 27 00:37:27 JST 2012
         NetBSD version:      5.99.60
         MACHINE:             evbppc
         MACHINE_ARCH:        powerpc
         Build platform:      NetBSD 5.1 amd64
         HOST_SH:             /bin/sh
         TOOLDIR path:        /export/src-20120117-patched/obj/tooldir.NetBSD-5.1-amd64
         DESTDIR path:        /export/src-20120117-patched/obj/destdir.evbppc
         RELEASEDIR path:     /export/src-20120117-patched/obj/releasedir
         Updated makewrapper: /export/src-20120117-patched/obj/tooldir.NetBSD-5.1-amd64/bin/nbmake-evbppc
         Successful make release
         build.sh ended:      Fri Jan 27 02:01:26 JST 2012
===> .

KUROBOX kernel is also built.

t-105@makoto 09:45:08/120127(/export/src-20120117-patched)% 
  (cd sys/arch/sandpoint/compile/obj/KUROBOX/; ls -l netbsd{,.bin})
-rwxr-xr-x  1 root  wheel  3561473 Jan 17 22:45 netbsd
-rwxr-xr-x  1 root  wheel  3099028 Jan 18 22:35 netbsd.bin

That kernel is also included in releasedir.

(cd obj/releasedir/evbppc/binary/kernel/; ls -l *KURO*)
-rw-r--r--  1 root  wheel  1924647 Jan 27 01:55 netbsd-KUROBOX.gz

But netbsd.bin is not included yet.
To be added:

include netbsd.bin
add sysinst kernel (MD kernel) with KUROBOX_INSTALL kernel

2012年01月26日(木) 旧暦 [n年日記] [更新:"2012/01/27 09:49:11"]

#1 [NetBSD] evbppc 20120125

＠ complete run again: