From: Thomas Veerman <thomas@minix3.org>
Date: Fri, 25 Jan 2013 12:49:18 +0000 (+0100)
Subject: Ramdisk: fix ramdisk creation for ARM
X-Git-Tag: v3.2.1~64
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/openssl_button.gif?a=commitdiff_plain;h=31c6dc292df3e6dea4e49438fd153e2bf8e44878;p=minix.git

Ramdisk: fix ramdisk creation for ARM
---

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index d472db537..30aa3df6b 100644
--- 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 e814e9783..df58d91b8 100644
--- 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 52a04735c..a0354b3db 100644
--- 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