Changeset 2d75831 in mainline

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

fd6c8b1

Parents:

123cd6d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 17:35:28)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Copy uspace/overlay

Files:

• boot/Makefile (modified) (3 diffs)
• install.sh.in (modified) (1 diff)
• meson.build (modified) (1 diff)

boot/Makefile

@@ -27 +27 @@
 #
 
-.PHONY: all build_dist clean_dist clean
+.PHONY: all clean
 
 include Makefile.common
 
-all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(PREBUILD) build_dist
+all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(PREBUILD)
         $(MAKE) -r -f $(BUILD) PRECHECK=$(PRECHECK)
 ifneq ($(POSTBUILD),)
@@ -37 +37 @@
 endif
 
-build_dist: clean_dist
-
-
-        if ls $(DIST_OVERLAY_PATH)/* >/dev/null 2>/dev/null; then \
-                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
-        fi
-
-clean: clean_dist
+clean:
         $(MAKE) -r -f $(BUILD) clean PRECHECK=$(PRECHECK)
 ifneq ($(POSTBUILD),)
@@ -52 +45 @@
         find generic/src/ arch/*/src/ genarch/src/ -name '*.o' -follow -exec rm \{\} \;
         find . -name '*.d' -follow -exec rm \{\} \;
-
-clean_dist:
-        rm -f $(INITRD).img $(COMPS).o $(COMPS).tar $(LINK)
-        find $(USPACE_PATH)/dist -mindepth 1 -maxdepth 1 -type f -exec rm \{\} \;
-        rm -rf $(USPACE_PATH)/dist/app
-        rm -f $(USPACE_PATH)/dist/cfg/*
-        rm -rf $(USPACE_PATH)/dist/srv
-        rm -rf $(USPACE_PATH)/dist/drv/*
-        rm -rf $(USPACE_PATH)/dist/lib/*
-        rm -rf $(USPACE_PATH)/dist/inc/*
-        rm -f $(USPACE_PATH)/dist/app/*
-        rm -f $(USPACE_PATH)/dist/test/*
-        rm -f $(USPACE_PATH)/dist/cfg/net/*
-        rm -f $(USPACE_PATH)/dist/w/*

install.sh.in

@@ -11 +11 @@
 fi
 
+rm -r "${DESTDIR}"
+
 mkdir -p "${DESTDIR}cfg/"
 mkdir -p "${DESTDIR}data/"

meson.build

@@ -423 +423 @@
 install_script_text += 'cp -r -L -T -u "@0@/dist" "${DESTDIR}"'.format(_uspace)
 
+# Copy uspace/overlay
+install_script_text += 'if ls @0@/overlay/* >/dev/null 2>/dev/null; then'.format(_uspace)
+install_script_text += 'cp -r -L @0@/overlay/* "${DESTDIR}"'.format(_uspace)
+install_script_text += 'fi'
+
+
 foreach f : install_files
         _cmd = 'mkdir -p "${DESTDIR}@0@" && cp -L -T "@1@" "${DESTDIR}@0@/@2@"'