Ramdisk: fix ramdisk creation for ARM

This commit is contained in:
Thomas Veerman 2013-01-25 13:49:18 +01:00
parent a5f7ba46f5
commit 31c6dc292d
3 changed files with 6 additions and 4 deletions

View File

@ -26,7 +26,7 @@ PROTO= proto
# Common to all architectures # Common to all architectures
ETC= system.conf master.passwd ETC= system.conf master.passwd
EXTRA= rc mtab EXTRA= mtab
PROTO_FILES= proto.common.etc proto.common.dynamic proto.dev PROTO_FILES= proto.common.etc proto.common.dynamic proto.dev
PROG_DRIVERS= PROG_DRIVERS=
PROG_COMMANDS= mount fsck.mfs sh service PROG_COMMANDS= mount fsck.mfs sh service
@ -36,6 +36,7 @@ PROG_BIN=
.if ${MACHINE_ARCH} == "i386" .if ${MACHINE_ARCH} == "i386"
ETC+= rs.single ETC+= rs.single
EXTRA+= rc
PROG_DRIVERS+= at_wini floppy pci PROG_DRIVERS+= at_wini floppy pci
PROG_COMMANDS+= cdprobe loadramdisk sysenv PROG_COMMANDS+= cdprobe loadramdisk sysenv
PROG_SERVERS+= procfs PROG_SERVERS+= procfs
@ -55,7 +56,7 @@ PROG_DRIVERS+= acpi
.endif # ${MACHINE_ARCH} == "i386" .endif # ${MACHINE_ARCH} == "i386"
.if ${MACHINE_ARCH} == "earm" .if ${MACHINE_ARCH} == "earm"
EXTRA+= mylogin.sh EXTRA+= rc.arm mylogin.sh ttys
PROG_DRIVERS+= mmc tty PROG_DRIVERS+= mmc tty
PROG_COMMANDS+= cp dd getty ls time sync sleep stty umount PROG_COMMANDS+= cp dd getty ls time sync sleep stty umount
PROG_BIN+= cat rm PROG_BIN+= cat rm
@ -169,7 +170,7 @@ proto.gen: ${PROTO} ${PROTO_FILES} ${PROGRAMS}
${STRIP} ${PROGRAMS} ${STRIP} ${PROGRAMS}
# We are using the c preprocessor to generate proto.gen # We are using the c preprocessor to generate proto.gen
# used in the mkfs tool. # used in the mkfs tool.
${TOOL_CAT} ${PROTO} | ${HOST_CC} \ ${TOOL_CAT} ${PROTO} | ${CC} \
${RAMDISK_DEFINES} \ ${RAMDISK_DEFINES} \
-E - | grep -v "^$$" | grep -v "#" >${.OBJDIR}/${.TARGET} -E - | grep -v "^$$" | grep -v "#" >${.OBJDIR}/${.TARGET}

View File

@ -31,4 +31,5 @@ d--755 0 0
dev d--755 0 0 dev d--755 0 0
#include "proto.dev" #include "proto.dev"
$ $
#include "proto.common.etc"
$ $

View File

@ -5,7 +5,7 @@
pwd.db ---644 0 0 pwd.db pwd.db ---644 0 0 pwd.db
spwd.db ---600 0 0 spwd.db spwd.db ---600 0 0 spwd.db
master.passwd ---600 0 0 master.passwd master.passwd ---600 0 0 master.passwd
#if defined(__i386) #if defined(__i386__)
rc ---755 0 0 rc rc ---755 0 0 rc
rs.single ---755 0 0 rs.single rs.single ---755 0 0 rs.single
#endif #endif