Changeset 95c675b in mainline for boot/Makefile.common

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• boot/Makefile.common (modified) (6 diffs)

boot/Makefile.common

@@ -52 +52 @@
 DRVS_PATH = drv
 
-SANDBOX = pack
-PACK = $(TOOLS_PATH)/pack.py
+MKARRAY = $(TOOLS_PATH)/mkarray.py
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
@@ -183 +182 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/fdisk/fdisk \
+        $(USPACE_PATH)/app/gunzip/gunzip \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
@@ -208 +208 @@
         $(USPACE_PATH)/app/nterm/nterm \
         $(USPACE_PATH)/app/ping/ping \
+        $(USPACE_PATH)/app/pkg/pkg \
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
@@ -233 +234 @@
 RD_TESTS = \
         $(USPACE_PATH)/lib/c/test-libc \
+        $(USPACE_PATH)/lib/label/test-liblabel \
         $(USPACE_PATH)/lib/posix/test-libposix \
         $(USPACE_PATH)/lib/uri/test-liburi \
         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \
-        $(USPACE_PATH)/app/bdsh/test-bdsh
+        $(USPACE_PATH)/app/bdsh/test-bdsh \
+        $(USPACE_PATH)/srv/net/tcp/test-tcp
 
 RD_DATA_ESSENTIAL = \
@@ -251 +254 @@
         $(INITRD).img
 
+COMPONENTS_DEFLATE := $(addsuffix .deflate,$(notdir $(COMPONENTS)))
+
 LINK = arch/$(BARCH)/_link.ld
-COMPS_H = arch/$(BARCH)/include/_components.h
-COMPS_C = arch/$(BARCH)/src/_components.c
+COMP = component
+COMPS = $(COMP)s
 
 -include arch/$(BARCH)/Makefile.inc
 
 ifeq ($(CONFIG_BAREBONE),y)
-RD_SRVS = $(RD_SRVS_ESSENTIAL)
-RD_APPS = $(RD_APPS_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_ESSENTIAL)
-RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
-RD_DATA = $(RD_DATA_ESSENTIAL)
+        RD_SRVS = $(RD_SRVS_ESSENTIAL)
+        RD_APPS = $(RD_APPS_ESSENTIAL)
+        RD_DRVS = $(RD_DRVS_ESSENTIAL)
+        RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
+        RD_DATA = $(RD_DATA_ESSENTIAL)
 else
-RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
-RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
-RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
-RD_DATA = $(RD_DATA_ESSENTIAL) $(RD_DATA_NON_ESSENTIAL)
+        RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
+        RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
+        RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
+        RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
+        RD_DATA = $(RD_DATA_ESSENTIAL) $(RD_DATA_NON_ESSENTIAL)
 endif
 
@@ -277 +282 @@
 JOB ?= image.job
 MAP ?= image.map
-PREBUILD ?= build_comps
 BUILD ?= Makefile.build