Build separate root file systems to avoid name clashes.

4 files changed, 20 insertions, 17 deletions

diff --git a/file_io/crc/init.c b/file_io/crc/init.c
index 4888e70..4659fb0 100644
--- a/file_io/crc/init.c
+++ b/file_io/crc/init.c
@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fs-root-tar.h"
 #include <rtems/untar.h>
 
 /* sha-specific includes */
@@ -24,6 +23,8 @@
 #include "crc.h"
 #include <errno.h>
 
+#include "crc-rootfs-tar.h"
+
 rtems_task Init(
   rtems_task_argument ignored
 )
@@ -35,7 +36,7 @@ rtems_task Init(
   puts( "\n\n*** untar/imfs/crc example ***" );
 
   printf("Unpacking tar filesystem\nThis may take awhile...\n");
-  if(Untar_FromMemory((char*) fs_root_tar, fs_root_tar_size) != 0) {
+  if (Untar_FromMemory((char*) crc_rootfs_tar, crc_rootfs_tar_size) != 0) {
     printf("Can't unpack tar filesystem\n");
     exit(1);
   }
diff --git a/file_io/crc/wscript b/file_io/crc/wscript
index f7b0f5b..cbce526 100644
--- a/file_io/crc/wscript
+++ b/file_io/crc/wscript
@@ -6,7 +6,7 @@
 # Waf build script for RTEMS fat_ramdisk
 
 import rtems_waf.rtems as rtems
-import rtems_waf.rootfs as rootfs
+import rtems_waf.rootfs as rtems_rootfs
 
 version = "1.0.0"
 
@@ -26,14 +26,14 @@ def build(bld):
     #
     # Package the root file system as a C file.
     #
-    rootfs.build(bld,
-                 name = 'fs-root',
-                 root = 'rootfs')
+    rtems_rootfs.build_from_src_root(bld,
+                                     name = 'crc-rootfs',
+                                     root = 'rootfs')
 
     bld(features = 'c cprogram',
         target = 'crc.exe',
         includes = bld.includes,
         defines = bld.defines,
         source = ['init.c',
-                  'fs-root-tar.c',
-                  'crc_32.c'])
+                  'crc_32.c'],
+        use = ['crc-rootfs-obj'])
diff --git a/filesystem/fat_ramdisk/init.c b/filesystem/fat_ramdisk/init.c
index dfe4409..e05d440 100644
--- a/filesystem/fat_ramdisk/init.c
+++ b/filesystem/fat_ramdisk/init.c
@@ -18,7 +18,7 @@
 #include <rtems/untar.h>
 #include <rtems/shell.h>
 
-#include "fs-root-tar.h"
+#include "fat-ram-rootfs-tar.h"
 
 
 /**
@@ -108,10 +108,10 @@ rtems_task Init(
 {
   int ret;
 
-  puts( "\n\n*** ramdisk/fat example ***" );
+  puts("\n\n*** ramdisk/fat example ***");
 
   printf("Unpacking tar filesystem\nThis may take awhile...\n");
-  if(Untar_FromMemory((char*) fs_root_tar, fs_root_tar_size) != 0) {
+  if (Untar_FromMemory((char*) fat_ram_rootfs_tar, fat_ram_rootfs_tar_size) != 0) {
     printf("Can't unpack tar filesystem\n");
     exit(1);
   }
diff --git a/filesystem/fat_ramdisk/wscript b/filesystem/fat_ramdisk/wscript
index de806c1..f3053de 100644
--- a/filesystem/fat_ramdisk/wscript
+++ b/filesystem/fat_ramdisk/wscript
@@ -6,7 +6,7 @@
 # Waf build script for RTEMS fat_ramdisk
 
 import rtems_waf.rtems as rtems
-import rtems_waf.rootfs as rootfs
+import rtems_waf.rootfs as rtems_rootfs
 
 version = "1.0.0"
 
@@ -26,20 +26,22 @@ def build(bld):
     #
     # Package the root file system as a C file.
     #
-    rootfs.build(bld,
-                 name = 'fs-root',
-                 root = 'rootfs')
+    rtems_rootfs.build_from_src_root(bld,
+                                     name = 'fat-ram-rootfs',
+                                     root = 'rootfs')
 
     bld(features = 'c cprogram',
         target = 'fat_ramdisk.exe',
         includes = bld.includes,
         defines = bld.defines,
-        source = ['init.c', 'fs-root-tar.c'])
+        source = ['init.c'],
+        use = ['fat-ram-rootfs-obj'])
 
     if rtems.check_env(bld, 'RTEMS_TLD'):
         bld(features = 'c rtrace',
             target = 'fat_ramdisk.texe',
             includes = bld.includes,
             defines = bld.defines,
-            source = ['init.c', 'fs-root-tar.c'],
+            source = ['init.c'],
+            use = ['fat-ram-rootfs-obj'],
             rtrace_cfg = '../../filesystem/fat_ramdisk/fat_ramdisk.ini')