Ramdisk: fix ramdisk creation for ARM

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

diff --git a/drivers/ramdisk/proto.arm.small b/drivers/ramdisk/proto.arm.small
index e814e97837fd3da06f58a4aa07f567cb238473f4..df58d91b8d19fec7258f6b35e01e508570a4ac82 100644 (file)
--- a/drivers/ramdisk/proto.arm.small
+++ b/drivers/ramdisk/proto.arm.small
@@ -31,4 +31,5 @@ d--755 0 0
        dev d--755 0 0
 #include "proto.dev"
        $
+#include "proto.common.etc"
 $

diff --git a/drivers/ramdisk/proto.common.etc b/drivers/ramdisk/proto.common.etc
index 52a04735caa1b36ccad9f1cf921b8fa6bb5774eb..a0354b3db53b53ec0c2f50ef1b3dbc5730881d5f 100644 (file)
--- a/drivers/ramdisk/proto.common.etc
+++ b/drivers/ramdisk/proto.common.etc
@@ -5,7 +5,7 @@
                pwd.db ---644 0 0 pwd.db
                spwd.db ---600 0 0 spwd.db
                master.passwd ---600 0 0 master.passwd
-#if defined(__i386)
+#if defined(__i386__)
                rc ---755 0 0 rc
                rs.single ---755 0 0 rs.single
 #endif