From c0dfd8afdc37ca6430123de57a1a42bf94de4184 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 3 May 2017 18:07:47 +0200 Subject: [PATCH] Install both jailhouse and kernel modules to the same directory --- build/Makefile | 14 ++++++++------ build/buildroot/.config | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build/Makefile b/build/Makefile index abc0bc6..01fcb61 100644 --- 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 0aedb60..f707911 100644 --- 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="" -- 2.39.2