Changes in boot/Makefile.common [8ebc5b8a:48197c1] in mainline

File:

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

boot/Makefile.common

@@ -52 +52 @@
 DRVS_PATH = drv
 
-MKARRAY = $(TOOLS_PATH)/mkarray.py
+SANDBOX = pack
+PACK = $(TOOLS_PATH)/pack.py
 MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
 MKFAT = $(TOOLS_PATH)/mkfat.py
@@ -182 +183 @@
         $(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 \
@@ -234 +233 @@
 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)/app/bdsh/test-bdsh \
-        $(USPACE_PATH)/srv/net/tcp/test-tcp
+        $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \
+        $(USPACE_PATH)/app/bdsh/test-bdsh
 
 RD_DATA_ESSENTIAL = \
@@ -253 +251 @@
         $(INITRD).img
 
-COMPONENTS_DEFLATE := $(addsuffix .deflate,$(notdir $(COMPONENTS)))
-
 LINK = arch/$(BARCH)/_link.ld
-COMP = component
-COMPS = $(COMP)s
+COMPS_H = arch/$(BARCH)/include/_components.h
+COMPS_C = arch/$(BARCH)/src/_components.c
 
 -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
 
@@ -281 +277 @@
 JOB ?= image.job
 MAP ?= image.map
+PREBUILD ?= build_comps
 BUILD ?= Makefile.build