diff options
| author | dhacker29 <dhackerdvm@gmail.com> | 2015-01-18 19:34:14 -0500 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 18:10:52 -0700 |
| commit | 852dd64785cbbacf2d1c757079f563c3bb86efab (patch) | |
| tree | b882ff4decffa74476eccf191f34a84e295acbc5 /core/tasks | |
| parent | 830e74cf51826fa8365f9831ccb935e9157fa20e (diff) | |
| download | build-852dd64785cbbacf2d1c757079f563c3bb86efab.zip build-852dd64785cbbacf2d1c757079f563c3bb86efab.tar.gz build-852dd64785cbbacf2d1c757079f563c3bb86efab.tar.bz2 | |
Fix kernel.mk if SELINUX or VARIANT_DEFCONFIG is defined
KERNEL_HEADER_DEFCONFIG was ignoring SELINUX_DEFCONFIG thus breaking
all selinux support
Change-Id: Idc3367d6b4b85343078e63e87dca6d6d052e7f53
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/kernel.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 9f40eec..a2eb21e 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -222,12 +222,12 @@ $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \ $(hide) rm -f ../$(KERNEL_CONFIG); \ - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_HEADER_DEFCONFIG); \ $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) headers_install; fi $(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \ echo "Used a different defconfig for header generation"; \ $(hide) rm -f ../$(KERNEL_CONFIG); \ - $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG); fi $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \ echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \ echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \ |