From: Michal Sojka <michal.sojka@cvut.cz>
Date: Tue, 15 May 2018 08:19:56 +0000 (+0200)
Subject: Tune Makefile and buildroot .config
X-Git-Tag: 0.0~31
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/hercules2020/jailhouse-build.git/commitdiff_plain/afc226d350520b8c59ed06af598f80772b3a02b1

Tune Makefile and buildroot .config
---

diff --git a/build/Makefile b/build/Makefile
index 96a8cf8..90ce972 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -4,8 +4,8 @@ all: buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
 image.fit: buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
 	mkimage -f auto -d linux-4.4/arch/arm64/boot/Image -i buildroot/images/rootfs.cpio.uboot -b linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb image.fit
 
-buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/4.4.38+/kernel
-	$(MAKE) -C buildroot
+buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/4.4.38+/modules.dep
+	$(MAKE) -j1 -C buildroot ROOTFS_CPIO_COMPRESS_CMD="gzip --fast -c"
 
 rootfs-overlay/lib/firmware/jailhouse.bin: linux-4.4/vmlinux
 rootfs-overlay/lib/firmware/jailhouse.bin: ../jailhouse/include/jailhouse/config.h
@@ -21,9 +21,9 @@ rootfs-overlay/lib/firmware/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd
 	echo '#define CONFIG_TRACE_ERROR             1' >> $@.tmp
 	echo '#define CONFIG_ARM_GIC_V2		     1'	>> $@.tmp
 	echo '#define CONFIG_MACH_JETSON_TX2	     1'	>> $@.tmp
-	mv $@.tmp $@
+	mv --update $@.tmp $@
 
-rootfs-overlay/lib/modules/4.4.38+/kernel: linux-4.4/vmlinux
+rootfs-overlay/lib/modules/4.4.38+/modules.dep: linux-4.4/vmlinux
 	$(MAKE) -C linux-4.4 modules_install INSTALL_MOD_PATH=$(CURDIR)/rootfs-overlay
 
 linux-4.4/vmlinux:
diff --git a/build/buildroot/.config b/build/buildroot/.config
index 3e904bc..31d71a5 100644
--- a/build/buildroot/.config
+++ b/build/buildroot/.config
@@ -3,6 +3,12 @@
 # Buildroot 2017.02.1 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
+BR2_HOST_GCC_AT_LEAST_4_5=y
+BR2_HOST_GCC_AT_LEAST_4_6=y
+BR2_HOST_GCC_AT_LEAST_4_7=y
+BR2_HOST_GCC_AT_LEAST_4_8=y
+BR2_HOST_GCC_AT_LEAST_4_9=y
+BR2_HOST_GCC_AT_LEAST_5=y
 
 #
 # Target options
@@ -103,6 +109,7 @@ BR2_STRIP_EXCLUDE_DIRS=""
 # BR2_OPTIMIZE_3 is not set
 # BR2_OPTIMIZE_G is not set
 BR2_OPTIMIZE_S=y
+# BR2_GOOGLE_BREAKPAD_ENABLE is not set
 BR2_SSP_NONE=y
 # BR2_SSP_REGULAR is not set
 # BR2_SSP_STRONG is not set
@@ -401,10 +408,7 @@ BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS=y
 # BR2_PACKAGE_FWTS is not set
 # BR2_PACKAGE_GDB is not set
 BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
-
-#
-# google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8
-#
+# BR2_PACKAGE_GOOGLE_BREAKPAD is not set
 # BR2_PACKAGE_IOZONE is not set
 
 #
@@ -774,10 +778,7 @@ BR2_PACKAGE_ERLANG_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LUA is not set
 # BR2_PACKAGE_MICROPYTHON is not set
 # BR2_PACKAGE_MOARVM is not set
-
-#
-# nodejs needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.8, wchar
-#
+# BR2_PACKAGE_NODEJS is not set
 # BR2_PACKAGE_PERL is not set
 # BR2_PACKAGE_PHP is not set
 # BR2_PACKAGE_PYTHON is not set
@@ -1883,10 +1884,6 @@ BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS=y
 # BR2_PACKAGE_HOST_JSMIN is not set
 # BR2_PACKAGE_HOST_LPC3250LOADER is not set
 # BR2_PACKAGE_HOST_LTTNG_BABELTRACE is not set
-
-#
-# mfgtools needs host gcc >= 4.8
-#
 # BR2_PACKAGE_HOST_MKE2IMG is not set
 # BR2_PACKAGE_HOST_MKPASSWD is not set
 # BR2_PACKAGE_HOST_MTD is not set