Skip to content

W
White Rabbit Switch - Software
Commit 2d7654cc authored by Benoit Rat's avatar Benoit Rat Committed by Alessandro Rubini
Browse files
Options

build: correct temp directory and link error in wrapsystem

parent cead9171
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
build/scripts/wrs_build_wraprootfs
View file @ 2d7654cc
......@@ -19,7 +19,7 @@ wrs_echo "--- Wrapping filesystem"
DEVTAR="$WRS_BASE_DIR/../userspace/devices.tar.gz"
TMPFS=$(mktemp /tmp/rootfs.XXXXXX)
TMPFS=$(mktemp -d /tmp/rootfs.XXXXXX)
rootfs_vanilla="$WRS_OUTPUT_DIR/build/buildroot-2011.11/output/target"
rootfs_override="$WRS_BASE_DIR/../userspace/rootfs_override"
......@@ -30,7 +30,6 @@ ROOTFS_IMAGE_TGZ="$WRS_OUTPUT_DIR/images/wrs-image.tar.gz"
ROOTFS_IMAGE_JFFS2="$WRS_OUTPUT_DIR/images/wrs-image.jffs2"
cat > $TMPSCRIPT << EOF
rm -r -f $TMPFS
mkdir -p $TMPFS/wr
cp -r $rootfs_vanilla/* $TMPFS
......@@ -41,7 +40,7 @@ cp -r $rootfs_override/* $TMPFS
rm -rf $TMPFS/dev
(cd $TMPFS && tar xzf $DEVTAR)
(cd $TMPFS && ln -s sbin/init .)
(cd $TMPFS && ln -fs sbin/init .)
mkdir -p $TMPFS/root/.ssh
cat $HOME/.ssh/id_?sa.pub >> $TMPFS/root/.ssh/authorized_keys
......@@ -62,3 +61,4 @@ EOF
fakeroot bash $X $TMPSCRIPT
rm -rf $TMPFS
rm -rf $TMPSCRIPT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment