Index: hpcsh/miniroot/Makefile.inc =================================================================== RCS file: /cvsroot/src/distrib/hpcsh/miniroot/Makefile.inc,v retrieving revision 1.5 diff -u -r1.5 Makefile.inc --- hpcsh/miniroot/Makefile.inc 11 Feb 2010 09:06:48 -0000 1.5 +++ hpcsh/miniroot/Makefile.inc 2 May 2010 17:37:56 -0000 @@ -1,12 +1,12 @@ # $NetBSD: Makefile.inc,v 1.5 2010/02/11 09:06:48 roy Exp $ -DBG= -O +WARNS= 1 +DBG= -Os IMAGESIZE= 4m MAKEFS_FLAGS= -o density=2k IMAGEENDIAN= le MAKEDEVTARGETS= all -#LISTS+= ${DISTRIBDIR}/common/list.sysinst +LISTS+= ${DISTRIBDIR}/common/list.sysinst.en MTREECONF+= ${.CURDIR}/mtree.usr.install -IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ - ${DESTDIR}/.profile ${DESTDIR}/etc/spwd.db +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile Index: hpcsh/miniroot/dot.profile =================================================================== RCS file: /cvsroot/src/distrib/hpcsh/miniroot/dot.profile,v retrieving revision 1.3 diff -u -r1.3 dot.profile --- hpcsh/miniroot/dot.profile 1 May 2010 12:59:26 -0000 1.3 +++ hpcsh/miniroot/dot.profile 2 May 2010 17:37:57 -0000 @@ -66,5 +66,5 @@ grep() sed -n "/$1/p" # run the installation or upgrade script. - # sysinst XXX + sysinst fi Index: hpcsh/miniroot/list =================================================================== RCS file: /cvsroot/src/distrib/hpcsh/miniroot/list,v retrieving revision 1.8 diff -u -r1.8 list --- hpcsh/miniroot/list 1 May 2010 12:18:44 -0000 1.8 +++ hpcsh/miniroot/list 2 May 2010 17:37:57 -0000 @@ -26,12 +26,5 @@ # Minimize use of MFS SYMLINK /tmp var/tmp -# various files that we need in /etc for the install -COPY ${DESTDIR}/etc/spwd.db etc/spwd.db -LINK etc/spwd.db etc/pwd.db - -# and the installation tools +# files that we need the installation tools COPY ${ARCHDIR}/dot.profile .profile - -# and a spare .profile -COPY ${DESTDIR}/.profile tmp/.hdprofile Index: utils/sysinst/Makefile =================================================================== RCS file: /cvsroot/src/distrib/utils/sysinst/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- utils/sysinst/Makefile 5 Dec 2009 16:29:11 -0000 1.14 +++ utils/sysinst/Makefile 2 May 2010 17:37:57 -0000 @@ -25,6 +25,7 @@ SUBDIR += arch/hp700 SUBDIR += arch/hpcarm SUBDIR += arch/hpcmips +SUBDIR += arch/hpcsh SUBDIR += arch/i386 SUBDIR += arch/landisk SUBDIR += arch/mac68k --- /dev/null 2010-05-03 01:37:57.000000000 +0900 +++ utils/sysinst/arch/hpcsh/Makefile 2010-05-02 23:07:44.000000000 +0900 @@ -0,0 +1,11 @@ +# $NetBSD$ +# +# Makefile for hpcsh +# + +MENUS_MD= menus.md.${SYSINSTLANG} menus.mbr +MSG_MD= msg.md.${SYSINSTLANG} msg.mbr.${SYSINSTLANG} + +LANGUAGES= # no translations ready yet + +.include "../../Makefile.inc" --- /dev/null 2010-05-03 01:37:57.000000000 +0900 +++ utils/sysinst/arch/hpcsh/md.c 2010-05-03 00:19:50.000000000 +0900 @@ -0,0 +1,177 @@ +/* $NetBSD$ */ + +/* + * Copyright 1997 Piermont Information Systems Inc. + * All rights reserved. + * + * Based on code written by Philip A. Nelson for Piermont Information + * Systems Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Piermont Information Systems Inc. + * 4. The name of Piermont Information Systems Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* md.c -- hpcsh machine specific routines */ + +#include +#include +#include +#include +#include + +#include "defs.h" +#include "md.h" +#include "msg_defs.h" +#include "menu_defs.h" +#include "endian.h" +#include "mbr.h" + +void +md_init(void) +{ +} + +void +md_init_set_status(int minimal) +{ + + (void)minimal; +} + +int +md_get_info(void) +{ + + return set_bios_geom_with_mbr_guess(); +} + +/* + * md back-end code for menu-driven BSD disklabel editor. + */ +int +md_make_bsd_partitions(void) +{ + + return make_bsd_partitions(); +} + +/* + * any additional partition validation + */ +int +md_check_partitions(void) +{ + + return 1; +} + +/* + * hook called before writing new disklabel. + */ +int +md_pre_disklabel(void) +{ + + msg_display(MSG_dofdisk); + + /* write edited MBR onto disk. */ + if (write_mbr(diskdev, &mbr, 1) != 0) { + msg_display(MSG_wmbrfail); + process_menu(MENU_ok, NULL); + return 1; + } + return 0; +} + +/* + * hook called after writing disklabel to new target disk. + */ +int +md_post_disklabel(void) +{ + + return 0; +} + +/* + * hook called after upgrade() or install() has finished setting + * up the target disk but immediately before the user is given the + * ``disks are now set up'' message. + */ +int +md_post_newfs(void) +{ + + return 0; +} + +void +md_cleanup_install(void) +{ + +#ifndef DEBUG + enable_rc_conf(); +#endif +} + +int +md_pre_update(void) +{ + + return 1; +} + +/* Upgrade support */ +int +md_update(void) +{ + + md_post_newfs(); + return 1; +} + +int +md_post_extract(void) +{ + + return 0; +} + +int +md_check_mbr(mbr_info_t *mbri) +{ + + return 2; +} + +int +md_mbr_use_wholedisk(mbr_info_t *mbri) +{ + + return mbr_use_wholedisk(mbri); +} --- /dev/null 2010-05-03 01:37:57.000000000 +0900 +++ utils/sysinst/arch/hpcsh/md.h 2010-05-02 23:07:44.000000000 +0900 @@ -0,0 +1,76 @@ +/* $NetBSD$ */ + +/* + * Copyright 1997 Piermont Information Systems Inc. + * All rights reserved. + * + * Written by Philip A. Nelson for Piermont Information Systems Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Piermont Information Systems Inc. + * 4. The name of Piermont Information Systems Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +/* md.h -- Machine specific definitions for the hpcsh */ + + +#include +#include +#include +#include +#include + +/* hpcsh uses the mbr code. */ +#include "mbr.h" + +/* constants and defines */ + + +/* Extra megs for full X installation */ +#define XNEEDMB 340 + + +/* + * Default filesets to fetch and install during installation + * or upgrade. The standard sets are: + * base etc comp games man misc tests text xbase xcomp xetc xfont xserver + */ +#define SET_KERNEL_1_NAME "kern-GENERIC" +#define SET_KERNEL_2_NAME "kern-HPW650PA" + + +/* + * Machine-specific command to write a new label to a disk. + * For example, i386 uses "/sbin/disklabel -w -r", just like i386 + * miniroot scripts, though this may leave a bogus incore label. + * Sun ports should probably use DISKLABEL_CMD "/sbin/disklabel -w" + * to get incore to ondisk inode translation for the Sun proms. + * If not defined, we assume the port does not support disklabels and + * hand-edited disklabel will NOT be written by MI code. + */ +#define DISKLABEL_CMD "disklabel -w -r" --- /dev/null 2010-05-03 01:37:57.000000000 +0900 +++ utils/sysinst/arch/hpcsh/menus.md.en 2010-05-02 23:07:44.000000000 +0900 @@ -0,0 +1,40 @@ +/* $NetBSD$ */ + +/* + * Copyright 1997 Piermont Information Systems Inc. + * All rights reserved. + * + * Written by Philip A. Nelson for Piermont Information Systems Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Piermont Information Systems Inc. + * 4. The name of Piermont Information Systems Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +/* Menu definitions for sysinst. hpcsh version, machine dependent. */ + --- /dev/null 2010-05-03 01:37:57.000000000 +0900 +++ utils/sysinst/arch/hpcsh/msg.md.en 2010-05-02 23:07:44.000000000 +0900 @@ -0,0 +1,50 @@ +/* $NetBSD$ */ + +/* + * Copyright 1997 Piermont Information Systems Inc. + * All rights reserved. + * + * Written by Philip A. Nelson for Piermont Information Systems Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Piermont Information Systems Inc. + * 4. The name of Piermont Information Systems Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +/* MD Message catalog -- English, hpcsh version */ + +message md_hello +{If you booted from an external device, you may now remove it. + +} + +message set_kernel_1 +{Kernel (GENERIC)} +message set_kernel_2 +{Kernel (HPW650PA)} +