Changeset 61ab4a9 in mainline

Timestamp:

2013-09-02T20:03:17Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

802898f

Parents:

1b34360 (diff), 0435fe41 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

libmbr, libgpt, hdisk merge

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/Makefile.common (modified) (1 diff)
• uspace/app/hdisk/Makefile (added)
• uspace/app/hdisk/common.h (added)
• uspace/app/hdisk/func_gpt.c (added)
• uspace/app/hdisk/func_gpt.h (added)
• uspace/app/hdisk/func_mbr.c (added)
• uspace/app/hdisk/func_mbr.h (added)
• uspace/app/hdisk/func_none.c (added)
• uspace/app/hdisk/func_none.h (added)
• uspace/app/hdisk/hdisk.c (added)
• uspace/app/hdisk/hdisk.h (added)
• uspace/app/hdisk/input.c (added)
• uspace/app/hdisk/input.h (added)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/checksum.c (added)
• uspace/lib/c/include/checksum.h (added)
• uspace/lib/gpt/Makefile (added)
• uspace/lib/gpt/global.c (added)
• uspace/lib/gpt/gpt.h (added)
• uspace/lib/gpt/libgpt.c (added)
• uspace/lib/gpt/libgpt.h (added)
• uspace/lib/mbr/Makefile (added)
• uspace/lib/mbr/libmbr.c (added)
• uspace/lib/mbr/libmbr.h (added)
• uspace/lib/mbr/mbr.h (added)

boot/Makefile.common

@@ -172 +172 @@
         $(USPACE_PATH)/app/dnsres/dnsres \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/hdisk/hdisk \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \

uspace/Makefile

@@ -43 +43 @@
         app/edit \
         app/getterm \
+        app/hdisk \
         app/init \
         app/inet \
@@ -234 +235 @@
         lib/pcm \
         lib/bithenge \
-        lib/posix
+        lib/posix \
+        lib/mbr \
+        lib/gpt
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))

uspace/Makefile.common

@@ -141 +141 @@
 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
 
+LIBMBR_PREFIX = $(LIB_PREFIX)/mbr
+LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
+
 ifeq ($(STATIC_NEEDED),y)
         STATIC_BUILD = y

uspace/lib/c/Makefile

@@ -64 +64 @@
         generic/cap.c \
         generic/cfg.c \
+        generic/checksum.c \
         generic/clipboard.c \
         generic/devman.c \