sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

poky-qemu-internal: Support NFS boots better 

The image specification can now be in the form nfs-server:directory.
This makes it possible to nfs-boot from servers other than the host.
poky-qemu-internal will properly construct the kernel command line
given such a specification.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
This commit is contained in:
Jeff Dike 2010-08-05 14:50:14 -04:00 committed by Richard Purdie
parent 6ea1ed5f7b
commit 4df9f11171
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/poky-qemu-internal
View File

@ -92,6 +92,16 @@ if [ "$TYPE" != "nfs" -a ! -f "$HDIMAGE" ]; then
return
fi
if [ "$TYPE" = "nfs" ]; then
NFS_SERVER=`echo $HDIMAGE | sed 's/^\([^:]*\):.*/\1/'`
NFS_DIR=`echo $HDIMAGE | sed 's/^[^:]*:\(.*\)/\1/'`
fi
if [ "$NFS_SERVER" = "" ]; then
NFS_SERVER="192.168.7.1"
NFS_DIR=$HDIMAGE
fi
if [ ! -f "$ZIMAGE" ]; then
echo "Error: Kernel image file $ZIMAGE doesn't exist"
return
@ -107,14 +117,11 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -no-reboot $QEMU_UI_OPTIONS"
fi
if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then
HDIMAGE=/srv/nfs/qemuarm
fi
if [ ! -d "$HDIMAGE" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
echo "Error: NFS mount point $HDIMAGE doesn't exist"
return
fi
KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb --no-reboot $QEMU_UI_OPTIONS"
fi
if [ "$MACHINE" = "qemuarmv6" ]; then
@ -133,14 +140,11 @@ if [ "$MACHINE" = "qemux86" ]; then
QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $HDIMAGE $QEMU_UI_OPTIONS"
fi
if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then
HDIMAGE=/srv/nfs/qemux86
fi
if [ ! -d "$HDIMAGE" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
echo "Error: NFS mount point $HDIMAGE doesn't exist."
return
fi
KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
fi
fi

17
scripts/tunctl-src/Makefile Normal file
View File

@ -0,0 +1,17 @@
OBJS = tunctl.o
BIN = tunctl
CFLAGS ?= -g -Wall
BIN_DIR ?= /usr/bin
all : $(BIN)
$(BIN) : $(OBJS)
$(CC) $(CFLAGS) -o $(BIN) $(OBJS)
clean :
rm -f $(BIN) $(OBJS) *~
install : $(BIN)
install -d $(DESTDIR)$(BIN_DIR)
install -s $(BIN) $(DESTDIR)$(BIN_DIR)