Install both jailhouse and kernel modules to the same directory

diff --git a/build/Makefile b/build/Makefile
index abc0bc691cd12e80e6d07f34d6f02ea4ce0d8ae0..01fcb612d0206eff07a5e375f7f2b91ba60d8d2d 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,12 +1,14 @@
-all: buildroot/images/rootfs.cpio.gz
+all: buildroot/images/rootfs.cpio.uboot
 
-buildroot/images/rootfs.cpio.gz: jailhouse/lib/firmware/jailhouse.bin
+buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/3.10.96/kernel
        $(MAKE) -C buildroot
 
-jailhouse/lib/firmware/jailhouse.bin: linux-3.10/vmlinux
-jailhouse/lib/firmware/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd ../jailhouse && git ls-files))
-       $(MAKE) -C ../jailhouse install KDIR=$(CURDIR)/linux-3.10 ARCH=arm64 DESTDIR=$(CURDIR)/jailhouse
+rootfs-overlay/lib/firmware/jailhouse.bin: linux-3.10/vmlinux
+rootfs-overlay/lib/firmware/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd ../jailhouse && git ls-files))
+       $(MAKE) -C ../jailhouse install KDIR=$(CURDIR)/linux-3.10 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay
+
+rootfs-overlay/lib/modules/3.10.96/kernel:
+       $(MAKE) -C linux-3.10 modules_install INSTALL_MOD_PATH=$(CURDIR)/rootfs-overlay
 
 linux-3.10/vmlinux:
        $(MAKE) -C $(@D)
-       $(MAKE) -C $(@D) modules_install INSTALL_MOD_PATH=$(CURDIR)/modules

diff --git a/build/buildroot/.config b/build/buildroot/.config
index 0aedb607f33eb41534868980e607b955b4ca5425..f707911c15b31104bdc88ef892ce01db5d491b72 100644 (file)
--- a/build/buildroot/.config
+++ b/build/buildroot/.config
@@ -301,7 +301,7 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_GENERATE_LOCALE=""
 # BR2_TARGET_TZ_INFO is not set
 BR2_ROOTFS_USERS_TABLES=""
-BR2_ROOTFS_OVERLAY="$(O)/../jailhouse $(O)/../modules"
+BR2_ROOTFS_OVERLAY="$(O)/../rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT=""
 BR2_ROOTFS_POST_FAKEROOT_SCRIPT=""
 BR2_ROOTFS_POST_IMAGE_SCRIPT=""