Use genfatfs from npm package

piranna · piranna · commit a58da1c6bdce · 2016-04-03T23:26:58.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 deps/
-obj/
-out/
+node_modules/
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "nodeos-initramfs": "^0.0.0"
   },
   "dependencies": {
-    "download-manager": "^0.0.15"
+    "download-manager": "^0.0.15",
+    "genfatfs": "nodeos/genfatfs"
   }
 }
diff --git a/scripts/build b/scripts/build
@@ -38,7 +38,7 @@ EFIBOOT_IMG=`pwd`/obj/efiboot.img
 # Wrap the system up and pack it
 #
 
-GENFATFS=deps/genfatfs/genfatfs
+GENFATFS=node_modules/genfatfs/genfatfs
 
 function createPartitionImage() {
   # Copy kernel and initramfs on the partition image
diff --git a/scripts/preinstall b/scripts/preinstall
@@ -8,13 +8,11 @@ var manager = require('download-manager')
 
 // Source versions
 
-const GENFATFS_VERSION = "master"
 const SYSLINUX_VERSION = "6.03"
 
 
 // Dependencies URLs
 
-const GENFATFS_URL="https://github.com/NodeOS/genfatfs/archive/"+GENFATFS_VERSION+".tar.gz"
 const SYSLINUX_URL="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-"+SYSLINUX_VERSION+".tar.gz"
 
 
@@ -24,15 +22,6 @@ const SYSLINUX_URL="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinu
 
 var downloads =
 [
-  {
-    name: 'genfatfs',
-    url: GENFATFS_URL,
-    action: function(callback)
-    {
-      exec('make', {cwd: join('deps', this.name)}, callback)
-    }
-  },
-
   {
     name: 'syslinux',
     url: SYSLINUX_URL

-Original file line number
+Diff line change
@@ @@ -1,3 +1,2 @@ @@
 deps/
 -obj/
 -out/
 +node_modules/
Original file line number	Diff line number	Diff line change
@@ -38,7 +38,7 @@ EFIBOOT_IMG=`pwd`/obj/efiboot.img
`38`	`38`	`# Wrap the system up and pack it`
`39`	`39`	`#`
`40`	`40`
`41`		`-GENFATFS=deps/genfatfs/genfatfs`
	`41`	`+GENFATFS=node_modules/genfatfs/genfatfs`
`42`	`42`
`43`	`43`	`function createPartitionImage() {`
`44`	`44`	`# Copy kernel and initramfs on the partition image`