diff options
| author | Rob Landley <rob@landley.net> | 2020-04-11 22:01:36 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2020-04-11 22:01:36 -0500 |
| commit | 40b93892f2df5318967c3652ff474c9ebb01c8f3 (patch) | |
| tree | 2960588614a38d5be5a1ceb87eb3b8b68db8165d /scripts | |
| parent | 1a529e1daeaf9f175b98863fdbbccdb40a2b8905 (diff) | |
| download | toybox-40b93892f2df5318967c3652ff474c9ebb01c8f3.tar.gz | |
Remove prefix from fs dir (so it's just root/$CROSS/fs), don't search oneit
by path, add m68k target.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkroot.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/mkroot.sh b/scripts/mkroot.sh index 40ecc4ec..163aece7 100755 --- a/scripts/mkroot.sh +++ b/scripts/mkroot.sh @@ -49,7 +49,7 @@ fi echo "Building for ${CROSS:=host}" : ${OUTPUT:=$TOP/$CROSS} -[ -z "$ROOT" ] && ROOT="$OUTPUT/${CROSS_BASE}fs" && rm -rf "$ROOT" +[ -z "$ROOT" ] && ROOT="$OUTPUT/fs" && rm -rf "$ROOT" MYBUILD="$BUILD/${CROSS_BASE:-host-}tmp" rm -rf "$MYBUILD" && mkdir -p "$MYBUILD" || exit 1 @@ -97,7 +97,7 @@ if [ $$ -eq 1 ]; then [ -z "$CONSOLE" ] && CONSOLE="$(</sys/class/tty/console/active)" [ -z "$HANDOFF" ] && HANDOFF=/bin/sh && echo Type exit when done. - exec /sbin/oneit -c /dev/"${CONSOLE:-console}" $HANDOFF + exec oneit -c /dev/"${CONSOLE:-console}" $HANDOFF else /bin/sh umount /dev/pts /dev /sys /proc @@ -157,6 +157,9 @@ else fi KARCH=x86 KARGS=ttyS0 VMLINUX=arch/x86/boot/bzImage KCONF=$KCONF,UNWINDER_FRAME_POINTER,PCI,BLK_DEV_SD,ATA,ATA_SFF,ATA_BMDMA,ATA_PIIX,NET_VENDOR_INTEL,E1000,SERIAL_8250,SERIAL_8250_CONSOLE,RTC_CLASS + elif [ "$TARGET" == m68k ]; then + QEMU="m68k -M q800" KARCH=m68k KARGS=ttyS0 VMLINUX=vmlinux + KCONF=MMU,M68040,M68KFPU_EMU,MAC,SCSI_MAC_ESP,MACINTOSH_DRIVERS,ADB,ADB_MACII,NET_CORE,MACSONIC,SERIAL_PMACZILOG,SERIAL_PMACZILOG_TTYS,SERIAL_PMACZILOG_CONSOLE elif [ "$TARGET" == mips ] || [ "$TARGET" == mipsel ]; then QEMU="mips -M malta" KARCH=mips KARGS=ttyS0 VMLINUX=vmlinux KCONF=MIPS_MALTA,CPU_MIPS32_R2,SERIAL_8250,SERIAL_8250_CONSOLE,PCI,BLK_DEV_SD,ATA,ATA_SFF,ATA_BMDMA,ATA_PIIX,NET_VENDOR_AMD,PCNET32,POWER_RESET,POWER_RESET_SYSCON |