github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 19:16:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #284 from marcov/install-nsdax

Browse Source 
make: add nsdax source to install-scripts target
This commit is contained in:
James O. D. Hunt 2019-05-01 15:43:01 +01:00 committed by GitHub
commit ac6d19aba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -98,9 +98,10 @@ SCRIPTS += rootfs-builder/rootfs.sh
SCRIPTS += image-builder/image_builder.sh SCRIPTS += image-builder/image_builder.sh
SCRIPTS += initrd-builder/initrd_builder.sh SCRIPTS += initrd-builder/initrd_builder.sh
FILES := HELPER_FILES :=
FILES += rootfs-builder/versions.txt HELPER_FILES += rootfs-builder/versions.txt
FILES += scripts/lib.sh HELPER_FILES += scripts/lib.sh
HELPER_FILES += image-builder/nsdax.gpl.c
define INSTALL_FILE define INSTALL_FILE
echo "Installing $(abspath $2/$1)"; echo "Installing $(abspath $2/$1)";
@ -117,7 +118,7 @@ install-scripts:
@echo "Installing scripts" @echo "Installing scripts"
@$(foreach f,$(SCRIPTS),$(call INSTALL_SCRIPT,$f,$(INSTALL_DIR))) @$(foreach f,$(SCRIPTS),$(call INSTALL_SCRIPT,$f,$(INSTALL_DIR)))
@echo "Installing helper files" @echo "Installing helper files"
@$(foreach f,$(FILES),$(call INSTALL_FILE,$f,$(INSTALL_DIR))) @$(foreach f,$(HELPER_FILES),$(call INSTALL_FILE,$f,$(INSTALL_DIR)))
@echo "Installing installing config files" @echo "Installing installing config files"
@$(foreach f,$(DIST_CONFIGS),$(call INSTALL_FILE,$f,$(INSTALL_DIR))) @$(foreach f,$(DIST_CONFIGS),$(call INSTALL_FILE,$f,$(INSTALL_DIR)))

4
image-builder/image_builder.sh
View File

@ -34,6 +34,10 @@ readonly dax_header_sz=2
# [2] - https://nvdimm.wiki.kernel.org/2mib_fs_dax # [2] - https://nvdimm.wiki.kernel.org/2mib_fs_dax
readonly dax_alignment=2 readonly dax_alignment=2
# Set a default value
AGENT_INIT=${AGENT_INIT:-no}
# In order to support memory hotplug, image must be aligned to # In order to support memory hotplug, image must be aligned to
# memory section(size in MB) according to different architecture. # memory section(size in MB) according to different architecture.
case "$(uname -m)" in case "$(uname -m)" in