Changeset 03362fbd in mainline for release/Makefile

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• release/Makefile (modified) (3 diffs)

release/Makefile

@@ -32 +32 @@
 SRC_ARCHIVE = HelenOS-$(RELEASE).tar.bz2
 
-PROFILES = amd64 arm32/GXemul arm32/integratorcp arm32/gta02 ia32 \
-    ia64/i460GX ia64/ski mips32/GXemul mips32/msim sparc64/niagara \
+PROFILES = amd64 arm32/integratorcp arm32/gta02 arm32/beagleboardxm ia32 \
+    ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \
     sparc64/ultra
 
@@ -71 +71 @@
 release: src_rel
         for profile in $(PROFILES); do \
-                $(MAKE) -C $(EXPORT_DIR) clean ; \
+                $(MAKE) -C $(EXPORT_DIR) distclean ; \
                 $(MAKE) -C $(EXPORT_DIR) PROFILE=$$profile ; \
                 $(MAKE) PROFILE=$$profile releasefile ; \
@@ -79 +79 @@
         rm -rf $(EXPORT_DIR)
         mkdir -p $(EXPORT_DIR)
-        $(BZR) export $(EXPORT_DIR)
+        $(BZR) export $(EXPORT_DIR) ../
 
 src_rel $(SRC_ARCHIVE): export