Merge branch 'raspi2'

Author: piranna

.gitignore

@@ -1,4 +1,3 @@
-deps/
 build/
 out/
 node_modules/

package.json

@@ -2,10 +2,7 @@
   "name": "nodeos-usersfs",
   "version": "1.0.0-RC2",
   "scripts": {
-    "docker": "scripts/docker",
-    "dockerBuild": "docker build -t usersfs .",
     "build": "scripts/build",
-    "start": "scripts/start",
     "test": "scripts/test",
     "unbuild": "scripts/unbuild"
   },
@@ -40,30 +37,28 @@
     "bin-man": "^0.2.0",
     "bin-pwd": "^0.0.0",
     "davius": "^0.0.1",
-    "dhcpjs": "^0.5.0",
+    "dhcpjs": "^0.5.1",
     "fs-extra": "^1.0.0",
-    "genext2fs": "^1.4.1-0",
     "ifconfig": "NodeOS/ifconfig",
     "ip": "NodeOS/ip",
-    "loadtest": "^2.0.4",
+    "loadtest": "^2.2.1",
     "logon": "^0.1.3",
     "node-bin-getty": "NodeOS/node-bin-getty",
     "node-wget": "^0.4.2",
-    "nodeos-barebones": "NodeOS/nodeos-barebones",
-    "nodeos-cross-toolchain": "NodeOS/nodeos-cross-toolchain",
-    "nodeos-initramfs": "NodeOS/nodeos-initramfs",
-    "nodeos-nodejs": "^6.8.1",
     "nodeos-reverse-proxy": "^0.1.0",
     "npm": "^4.0.3",
     "nsh": "piranna/nsh",
     "ntp-client": "^0.5.3",
     "palmtree": "^2.5.0",
     "performance": "^1.1.1",
     "pstree": "^0.0.0",
-    "slap": "^0.1.60"
+    "slap": "^0.1.61"
   },
   "devDependencies": {
-    "qemu": "^2.6.0"
+    "nodeos-cross-toolchain": "^1.0.0-RC3",
+    "nodeos-nodejs": "^6.9.1",
+    "qemu": "^2.7.0",
+    "tar-fs": "piranna/tar-fs"
   },
   "description": "Generate a read-write users filesystem for NodeOS for demo purposses",
   "repository": {

init.js resources/init.jsinit.js renamed to resources/init.js

@@ -1,28 +1,22 @@
 #!/usr/bin/env bash
 
-# This script prepares the users filesystem
-
 GRN="\e[32m"
 CLR="\e[0m"
 
 
 TOOLCHAIN=`node -p "require('nodeos-cross-toolchain')"`
-BAREBONES=`node -p "require('nodeos-barebones')"`
-INITRAMFS=`node -p "require('nodeos-initramfs')"`
-
-NODE_DIR=`node -p "require('nodeos-nodejs')"`
 
 source $TOOLCHAIN/scripts/adjustEnvVars.sh &&
 source scripts/utils.sh                    || exit $?
 
 PATH=$TOOLCHAIN/bin:$PATH
 
 
-# Clean object dir and return the input error
-function err(){
-  rmStep $STEP_DIR
-  exit $1
-}
+# Build cross-compiler (if needed)
+(
+  cd $TOOLCHAIN
+  BITS=$BITS CPU=$CPU MACHINE=$MACHINE npm install --production || exit $?
+) || exit $?
 
 
 #
@@ -31,7 +25,7 @@ function err(){
 
 OBJ_ROOT=$OBJECTS/root
 OBJ_NODEOS=$OBJECTS/nodeos
-OUT_DIR=`pwd`/out/$CPU
+OUT_DIR=`pwd`/out/$CPU.tar.gz
 
 
 #
@@ -44,32 +38,32 @@ if [[ ! -d $STEP_DIR ]]; then
   echo -e "${WHT}Generating root user folder${CLR}"
 
   # Force re-creation of usersfs
-  rm -rf $OUT_DIR || exit 14
+  rm -rf $OUT_DIR || exit 10
 
   (
-    mkdir -p $STEP_DIR || exit 10
+    mkdir -p $STEP_DIR || exit 11
 
     #
     # Install system dependencies
     #
 
     PACKAGES=`node -p "require('./package.json').nodeosDependenciesRoot.join(' ')"`
-    eval "$NPMi" -g $PACKAGES || exit 11
+    eval "$NPMi" -g $PACKAGES || exit 12
 
 
     #
     # Services to be started at boot
     #
 
-    mkdir -p $STEP_DIR/etc                 &&
-    cp palmtree.json $STEP_DIR/etc/ || exit 12
+    mkdir -p $STEP_DIR/etc                    &&
+    cp resources/palmtree.json $STEP_DIR/etc/ || exit 13
 
 
     #
     # Init file for the user
     #
 
-    ln -sf bin/palmtree $STEP_DIR/init || exit 13
+    ln -sf bin/palmtree $STEP_DIR/init || exit 14
   ) || err $?
 
   echo -e "${GRN}Successfully generated root user folder${CLR}"
@@ -86,32 +80,32 @@ if [[ ! -d $STEP_DIR ]]; then
   echo -e "${WHT}Generating nodeos user folder${CLR}"
 
   # Force re-creation of usersfs
-  rm -rf $OUT_DIR || exit 25
+  rm -rf $OUT_DIR || exit 20
 
   (
-    mkdir -p $STEP_DIR || exit 20
+    mkdir -p $STEP_DIR || exit 21
 
     #
     # Install user dependencies
     #
 
     PACKAGES=`node -p "require('./package.json').nodeosDependenciesNodeos.join(' ')"`
-    eval "$NPMi" -g $PACKAGES || exit 21
+    eval "$NPMi" -g $PACKAGES || exit 22
 
 
     #
     # Copy nodeos user login info
     #
 
-    mkdir -p $STEP_DIR/etc        &&
-    cp logon.json  $STEP_DIR/etc/ || exit 22
+    mkdir -p $STEP_DIR/etc                  &&
+    cp resources/logon.json  $STEP_DIR/etc/ || exit 23
 
 
     #
     # Dummy init file for the user
     #
 
-    cp init.js $STEP_DIR/init || exit 23
+    cp resources/init.js $STEP_DIR/init || exit 24
 
 
     #
@@ -126,7 +120,7 @@ if [[ ! -d $STEP_DIR ]]; then
     (
       cd $SRC_DIR
 
-      eval "$NPMi" || exit 24
+      eval "$NPMi" || exit 25
     ) || exit $?
 
 
@@ -142,7 +136,7 @@ if [[ ! -d $STEP_DIR ]]; then
     # (
     #   cd $SRC_DIR
     #
-    #   eval "$NPMi" --has_cairo=false --has_X11=false || exit 25
+    #   eval "$NPMi" --has_cairo=false --has_X11=false || exit 26
     # ) || exit $?
   ) || err $?
 
@@ -159,50 +153,9 @@ STEP_DIR=$OUT_DIR
 if [[ ! -f $STEP_DIR ]]; then
   mkdir -p `dirname $STEP_DIR`
 
-  case $PLATFORM in
-    docker|vagga)
-      cp $BAREBONES/out/latest $STEP_DIR/barebones.tar || err 30
-      cp $INITRAMFS/out/latest $STEP_DIR/initramfs.tar || err 31
-
-      chmod -R go= "$OBJECTS" || err 32
-
-      ln -sf ../build/$CPU out/latest || err 33
-    ;;
-
-    pc_* | raspberry_*)
-      DISK_SIZE=192  # Size in MB
-
-      (
-        cd $OBJECTS
-        ../../scripts/gendevicetable.js nodeos 1 1 || exit 40
-      ) > $STEP_DIR || err $?
-
-      genext2fs -b $((DISK_SIZE*1024)) \
-          --root $OBJECTS              \
-          --devtable $STEP_DIR         \
-          --block-size          1024   \
-          --bytes-per-inode     4096   \
-          --reserved-percentage    0   \
-          --creator-os linux           \
-          --allow-holes                \
-          --squash $STEP_DIR           || err 41
-
-      # Set filesystem features and users files permissions
-      tune2fs   $STEP_DIR -O has_journal,filetype > /dev/null || err 42
-      e2fsck -y $STEP_DIR                         > /dev/null
-      if [ $? -gt 2 ]; then
-        err 43
-      fi
-
-      # Mark the newly created filesystem image as the latest one
-      ln -sf $CPU out/latest || err 44
-    ;;
-
-    *)
-      echo -e "${RED}Unknown platform '$PLATFORM'${CLR}"
-      err 50
-    ;;
-  esac
+  scripts/pack.js "$OBJECTS" nodeos 1 1 | gzip > $STEP_DIR || err 30
+
+  ln -sf $CPU.tar.gz out/latest || err 32
 fi
 
 

logon.json resources/logon.jsonlogon.json renamed to resources/logon.json

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+const pack = require('tar-fs').pack
+
+
+const argv = process.argv.slice(2)
+
+const root = argv[0]
+const dir  = argv[1]
+const uid  = argv[2]
+const gid  = argv[3]
+
+
+pack(root,
+{
+  map: function(header)
+  {
+    if(header.name.split('/')[0] === dir)
+    {
+      header.uid = uid
+      header.gid = gid
+    }
+    else
+    {
+      header.uid = 0
+      header.gid = 0
+    }
+
+    return header
+  },
+  umask: 0o077
+})
+.pipe(process.stdout)