Parcourir la source

Added ipconfig and cp

rafael il y a 9 ans
Parent
commit
0b48d0b361
3 fichiers modifiés avec 31 ajouts et 7 suppressions
  1. 20 7
      BUILD
  2. 9 0
      BUILD.conf
  3. 2 0
      sys/src/9/k10/k8cpu

+ 20 - 7
BUILD

@@ -220,18 +220,20 @@ compile_kernel()
 
 	## Rest of programs into ramfs ##
 
-	RAMFS_LIST="bind mount echo cat cp ls"
+	RAMFS_LIST="bind mount echo cat cp ls ip/ipconfig/ipconfig"
 
 	for elem in $RAMFS_LIST
 	do
-		echo "cp ${CMD_DIR}/$elem.elf.out $elem.elf.out"
-		cp ${CMD_DIR}/$elem.elf.out $elem.elf.out
+		elf_out=`basename $elem.elf.out`
+		bname=`basename $elem`
+		echo "cp ${CMD_DIR}/$elem.elf.out $elf_out"
+		cp ${CMD_DIR}/$elem.elf.out $elf_out
 		check_error $? "copying $elem"
-		echo "strip $elem.elf.out"
-		strip $elem.elf.out
+		echo "strip $elf_out"
+		strip $elf_out
 		check_error $? "to strip $elem"
-		echo "${UTIL_DIR}/data2c _amd64_bin_$elem $elem.elf.out >> k8cpu.root.c"
-		${UTIL_DIR}/data2c _amd64_bin_$elem $elem.elf.out>> k8cpu.root.c
+		echo "${UTIL_DIR}/data2c _amd64_bin_$bname $elf_out>> k8cpu.root.c"
+		${UTIL_DIR}/data2c _amd64_bin_$bname $elf_out>> k8cpu.root.c
 		check_error $? "executing data2c"
 	done
 	
@@ -624,7 +626,13 @@ build_a_cmd()
 	DO_NOTHING=0
 	LDFLAGS_EXTRA=
 	CFLAGS_EXTRA=
+	BUILD_DIR=
 	cmd_${1} 1
+	if [ -n "$BUILD_DIR" ]
+	then
+		cd -
+		cd "$BUILD_DIR"
+	fi
 	if [ $DO_NOTHING -eq 0 ]
 	then
 		echo "$CC $CFLAGS_CMD $CFLAGS_EXTRA $BUILD_DEBUG -c $BUILD_IN"
@@ -637,6 +645,11 @@ build_a_cmd()
 		fi
 	# If it's a stand alone source don't get all object files
 		if [ -d "${CMD_DIR}/$1" ]
+		then
+			LD_LIBS=`process_libs_to_link "$LIBS_TO_LINK"`
+			echo $LD $LDFLAGS $LDFLAGS_EXTRA $LD_LIBS -o $BUILD_OUT *.o
+			$LD $LDFLAGS_EXTRA $LDFLAGS -o $BUILD_OUT *.o $LD_LIBS
+		elif [ -n ""$BUILD_DIR"" ]
 		then
 			LD_LIBS=`process_libs_to_link "$LIBS_TO_LINK"`
 			echo $LD $LDFLAGS $LDFLAGS_EXTRA $LD_LIBS -o $BUILD_OUT *.o

+ 9 - 0
BUILD.conf

@@ -84,6 +84,15 @@ test_saymyname()
 	LIBS_TO_LINK="stdio c"
 	LDFLAGS_EXTRA="-static -e_main"
 }
+cmd_ipconfig()
+{
+	BUILD_DIR=${CMD_DIR}/ip/ipconfig
+	BUILD_IN="ipv6.c main.c ppp.c"
+	BUILD_OUT="ipconfig.elf.out"
+	CLEAN_COM="rm -f *.o"
+	LIBS_TO_LINK="9p ndb bio ip libc"
+	LDFLAGS_EXTRA="-static -e_main"
+}
 cmd_ls()
 {
 	BUILD_IN="ls.c"

+ 2 - 0
sys/src/9/k10/k8cpu

@@ -77,6 +77,7 @@ rootdir
 #	bootk8cpu.out boot
 #	/amd64/bin/auth/factotum factotum
 #	/amd64/bin/ip/ipconfig ipconfig
+	/amd64/bin/ipconfig
 	/amd64/bin/rc
 	/rc/lib/rcmain
 	/amd64/bin/bind
@@ -84,6 +85,7 @@ rootdir
 	/amd64/bin/echo
 	/amd64/bin/cat
 	/amd64/bin/ls
+	/amd64/bin/cp
 #	../root/nvram nvram
 
 conf