Changeset 448


Ignore:
Timestamp:
Dec 28, 2009, 3:20:18 AM (11 years ago)
Author:
Pierre Pronchery
Message:

Merged from upstream

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Apps/Devel/Sources/scripts/targets/NetBSD

    r426 r448  
    77[ -z "$FDISK" ]         && FDISK="fdisk"
    88[ -z "$INSTALLBOOT" ]   && INSTALLBOOT="installboot"
     9[ -z "$LDSO" ]          && LDSO="/libexec/ld.elf_so"
    910[ -z "$MBRLABEL" ]      && MBRLABEL="mbrlabel"
    1011[ -z "$MKFS" ]          && MKFS="newfs"
     
    2122_image_image()
    2223{
    23         USAGE="Options for $IMAGE_TYPE on $TARGET:\n\
    24   IMAGE_FILE    Where to write the filesystem image\n\
    25   IMAGE_KERNEL  Path to the kernel\n\
    26   IMAGE_SIZE    Size of the filesystem image in kilobytes\n\
     24        USAGE="Options for $IMAGE_TYPE on $TARGET:
     25  IMAGE_FILE    Where to write the filesystem image
     26  IMAGE_KERNEL  Path to the kernel
     27  IMAGE_SIZE    Size of the filesystem image in kilobytes
     28  IMAGE_TYPE    The type of image to generate
     29  LDSO          Path to the dynamic loader
    2730  MKFS          Command used to format the filesystem"
    2831
    2932        #sanity check
    3033        check "$USAGE" CHOWN DD DESTDIR DEVZERO FDISK IMAGE_FILE IMAGE_KERNEL \
    31                 IMAGE_SIZE INSTALL INSTALLBOOT LN MBRLABEL MKDIR MKFS MKNOD \
    32                 MOUNT MV UMOUNT VNCONFIG VND
     34                IMAGE_SIZE INSTALL INSTALLBOOT LDSO LN MBRLABEL MKDIR MKFS \
     35                MKNOD MOUNT MV UMOUNT VNCONFIG VND
    3336
    3437        $MKDIR "$DESTDIR"                                       || exit 2
     
    3740        $DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
    3841        $FDISK -Ffi "$IMAGE_FILE"                               || exit 2
    39         SIZE=$((IMAGE_SIZE - 63))
     42        SIZE=$((IMAGE_SIZE * 2 - 63))
    4043        $FDISK -Ffu0s "169/63/$SIZE" "$IMAGE_FILE"              || exit 2
    4144        $FDISK -Ffa0 "$IMAGE_FILE"                              || exit 2
     
    5659        $SUDO $MKNOD -m 600 "$DESTDIR/dev/tty1" c 47 1          &&
    5760        $SUDO $MKDIR "$DESTDIR/libexec" "$DESTDIR/usr/libexec"  &&
    58         $SUDO $INSTALL -m 555 "/libexec/ld.elf_so" \
    59                         "$DESTDIR/libexec"                      &&
     61        $SUDO $INSTALL -m 555 "$LDSO" \
     62                        "$DESTDIR/libexec/ld.elf_so"            &&
    6063        $SUDO $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"&&
    6164        $SUDO $MKDIR "$DESTDIR/sbin"                            &&
     
    6871        $SUDO $INSTALL -m 755 "$IMAGE_KERNEL" "$DESTDIR/netbsd" &&
    6972        $SUDO $INSTALLBOOT -m "$ARCH" -o "console=pc" "/dev/r${VND}e" \
    70                         /usr/mdec/bootxx_ffsv1
     73                        "/usr/mdec/bootxx_ffsv1"
    7174        RET=$?
    7275        $SUDO $UMOUNT "$DESTDIR"
     
    7982_image_iso()
    8083{
    81         USAGE="Options for $IMAGE_TYPE on $TARGET:\n\
    82   IMAGE_FILE    Where to write the filesystem image\n\
     84        USAGE="Options for $IMAGE_TYPE on $TARGET:
     85  IMAGE_FILE    Where to write the filesystem image
    8386  IMAGE_KERNEL  Path to the kernel
     87  IMAGE_TYPE    The type of image to generate
     88  LDSO          Path to the dynamic loader
    8489  MKISOFS       Command used to format the filesystem"
    8590        MKISOFS_ARGS="-o bootimage=i386;bootxx,no-emul-boot,rockridge"
     
    9196        $SUDO $MKNOD -m 600 "$DESTDIR/dev/console" c 0 0        || exit 2
    9297        $MKDIR "$DESTDIR/libexec" "$DESTDIR/usr/libexec"        || exit 2
    93         $INSTALL -m 555 "/libexec/ld.elf_so" "$DESTDIR/libexec" || exit 2
     98        $INSTALL -m 555 "$LDSO" "$DESTDIR/libexec/ld.elf_so"    || exit 2
    9499        $LN -s "/libexec/ld.elf_so" "$DESTDIR/usr/libexec"      || exit 2
    95100        $MKDIR "$DESTDIR/sbin"                                  || exit 2
Note: See TracChangeset for help on using the changeset viewer.