Update

4 files changed, 36 insertions, 2 deletions

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 8a5089f63c..2eb472fdcb 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -44,6 +44,9 @@ include_rtems_bsd_sysdir = $(include_rtemsdir)/bsd/sys
 include_rtems_bsd_sys_HEADERS = include/rtems/bsd/sys/queue.h
 include_rtems_bsd_sys_HEADERS += include/rtems/bsd/sys/cdefs.h
 
+include_uuiddir = $(includedir)/uuid
+include_uuid_HEADERS = libmisc/uuid/uuid.h
+
 if NEWLIB
 include_sysdir = $(includedir)/sys
 include_sys_HEADERS =
@@ -96,7 +99,8 @@ include_rtems_HEADERS += libblock/include/rtems/bdbuf.h \
     libblock/include/rtems/blkdev.h libblock/include/rtems/diskdevs.h \
     libblock/include/rtems/flashdisk.h libblock/include/rtems/ramdisk.h \
     libblock/include/rtems/nvdisk.h libblock/include/rtems/nvdisk-sram.h \
-    libblock/include/rtems/ide_part_table.h
+    libblock/include/rtems/ide_part_table.h \
+    libblock/include/rtems/bdpart.h
 endif
 
 ## ftpd
diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am
index 6da4ead942..d62cf90dba 100644
--- a/cpukit/libblock/Makefile.am
+++ b/cpukit/libblock/Makefile.am
@@ -10,6 +10,7 @@ noinst_LIBRARIES = libblock.a
 libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/flashdisk.c \
     src/ramdisk.c src/ide_part_table.c src/nvdisk.c \
     src/nvdisk-sram.c \
+    src/bdpart.c \
     include/rtems/bdbuf.h include/rtems/blkdev.h \
     include/rtems/diskdevs.h include/rtems/flashdisk.h \
     include/rtems/ramdisk.h include/rtems/nvdisk.h include/rtems/nvdisk-sram.h \
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 5063a740ce..d2f97378f4 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -85,7 +85,8 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \
     shell/err.c shell/errx.c shell/verr.c shell/vis.c \
     shell/verrx.c shell/vwarn.c shell/vwarnx.c shell/warn.c shell/warnx.c \
     shell/fts.c shell/print_heapinfo.c shell/main_wkspaceinfo.c \
-    shell/shell_script.c shell/login_prompt.c shell/login_check.c
+    shell/shell_script.c shell/login_prompt.c shell/login_check.c \
+    shell/fdisk.c
 if LIBNETWORKING
 libshell_a_SOURCES += shell/main_mount_ftp.c shell/main_mount_tftp.c \
     shell/main_ifconfig.c shell/main_route.c shell/main_netstats.c \
@@ -125,6 +126,21 @@ libfsmount_a_SOURCES = fsmount/fsmount.c fsmount/fsmount.h
 
 EXTRA_DIST += fsmount/README
 
+## uuid
+noinst_LIBRARIES += libuuid.a
+libuuid_a_SOURCES = uuid/clear.c \
+	uuid/compare.c \
+	uuid/copy.c \
+	uuid/gen_uuid.c \
+	uuid/isnull.c \
+	uuid/pack.c \
+	uuid/parse.c \
+	uuid/unpack.c \
+	uuid/unparse.c \
+	uuid/uuid_time.c \
+	uuid/uuidd.h \
+	uuid/uuidP.h
+
 ## ---
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
index 87aa19701b..95c02f1731 100644
--- a/cpukit/preinstall.am
+++ b/cpukit/preinstall.am
@@ -41,6 +41,15 @@ $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h: include/rtems/bsd/sys/cdefs.h $(PROJEC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bsd/sys/cdefs.h
 
+$(PROJECT_INCLUDE)/uuid/$(dirstamp):
+	@$(MKDIR_P) $(PROJECT_INCLUDE)/uuid
+	@: > $(PROJECT_INCLUDE)/uuid/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/uuid/$(dirstamp)
+
+$(PROJECT_INCLUDE)/uuid/uuid.h: libmisc/uuid/uuid.h $(PROJECT_INCLUDE)/uuid/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/uuid/uuid.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/uuid/uuid.h
+
 if NEWLIB
 $(PROJECT_INCLUDE)/sys/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/sys
@@ -191,6 +200,10 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/nvdisk-sram.h
 $(PROJECT_INCLUDE)/rtems/ide_part_table.h: libblock/include/rtems/ide_part_table.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ide_part_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ide_part_table.h
+
+$(PROJECT_INCLUDE)/rtems/bdpart.h: libblock/include/rtems/bdpart.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/bdpart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/bdpart.h
 endif
 if LIBNETWORKING
 $(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd/ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)