mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-19 10:23:03 +00:00
118 lines
4.8 KiB
Diff
118 lines
4.8 KiB
Diff
From 8acc735f7b747149510b4b2be4df12b299cc68fc Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Wed, 24 Mar 2021 15:03:30 +0100
|
|
Subject: [PATCH 1/2] linux/modules: fix some v4.4 dependencies
|
|
|
|
NFT has different deps on v4.4.
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
config/Config-images.in | 1 +
|
|
include/kernel.mk | 4 ++--
|
|
include/quilt.mk | 4 ++++
|
|
include/target.mk | 8 +++++++-
|
|
toolchain/kernel-headers/Makefile | 2 +-
|
|
5 files changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/config/Config-images.in b/config/Config-images.in
|
|
index 2921cd5..969b57e 100644
|
|
--- a/config/Config-images.in
|
|
+++ b/config/Config-images.in
|
|
@@ -17,6 +17,7 @@ menu "Target Images"
|
|
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
|
|
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
|
|
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
|
|
+ default TARGET_INITRAMFS_COMPRESSION_GZIP if TARGET_ipq807x
|
|
default TARGET_INITRAMFS_COMPRESSION_NONE
|
|
depends on TARGET_ROOTFS_INITRAMFS
|
|
help
|
|
diff --git a/include/kernel.mk b/include/kernel.mk
|
|
index 6c99301..b61f56e 100644
|
|
--- a/include/kernel.mk
|
|
+++ b/include/kernel.mk
|
|
@@ -44,7 +44,7 @@ else
|
|
FILES_DIR ?= $(foreach dir,$(wildcard $(CURDIR)/files $(CURDIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
|
|
endif
|
|
KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
|
|
- LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
|
|
+ LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)$(KERNEL_NAME_SUFFIX)
|
|
LINUX_UAPI_DIR=uapi/
|
|
LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
|
|
LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown)
|
|
@@ -59,7 +59,7 @@ else
|
|
ifneq (,$(findstring -rc,$(LINUX_VERSION)))
|
|
LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.gz
|
|
else
|
|
- LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz
|
|
+ LINUX_SOURCE:=linux-$(LINUX_VERSION)$(KERNEL_NAME_SUFFIX).tar.xz
|
|
endif
|
|
|
|
ifneq (,$(findstring -rc,$(LINUX_VERSION)))
|
|
diff --git a/include/quilt.mk b/include/quilt.mk
|
|
index 00597ca..3d2ec01 100644
|
|
--- a/include/quilt.mk
|
|
+++ b/include/quilt.mk
|
|
@@ -99,9 +99,11 @@ define Kernel/Patch/Default
|
|
echo "generic patches directory is present. please move your patches to the pending directory" ; \
|
|
exit 1; \
|
|
fi
|
|
+ifneq ($(CONFIG_TARGET_ipq807x),y)
|
|
$(call PatchDir,$(LINUX_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
|
|
$(call PatchDir,$(LINUX_DIR),$(GENERIC_PATCH_DIR),generic/)
|
|
$(call PatchDir,$(LINUX_DIR),$(GENERIC_HACK_DIR),generic-hack/)
|
|
+endif
|
|
$(call PatchDir,$(LINUX_DIR),$(PATCH_DIR),platform/)
|
|
endef
|
|
|
|
@@ -128,9 +130,11 @@ define Quilt/Refresh/Kernel
|
|
echo "All kernel patches must start with either generic/ or platform/"; \
|
|
false; \
|
|
}
|
|
+ifneq ($(CONFIG_TARGET_ipq807x),y)
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_HACK_DIR),generic-hack/)
|
|
+endif
|
|
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
|
|
endef
|
|
|
|
diff --git a/include/target.mk b/include/target.mk
|
|
index 7526224..691f8fb 100644
|
|
--- a/include/target.mk
|
|
+++ b/include/target.mk
|
|
@@ -138,11 +138,17 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
|
|
endif
|
|
|
|
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
|
|
+ifeq ($(CONFIG_TARGET_ipq807x),y)
|
|
+GENERIC_BACKPORT_DIR :=
|
|
+GENERIC_PATCH_DIR :=
|
|
+GENERIC_HACK_DIR :=
|
|
+GENERIC_FILES_DIR :=
|
|
+else
|
|
GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
|
|
GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
|
|
GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
|
|
GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
|
|
-
|
|
+endif
|
|
__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
|
|
__config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
|
|
find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
|
|
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
|
|
index a70cf2c..cb732bf 100644
|
|
--- a/toolchain/kernel-headers/Makefile
|
|
+++ b/toolchain/kernel-headers/Makefile
|
|
@@ -42,7 +42,7 @@ else
|
|
PKG_SOURCE:=$(LINUX_SOURCE)
|
|
PKG_SOURCE_URL:=$(LINUX_SITE)
|
|
endif
|
|
-HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
|
|
+HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)$(KERNEL_NAME_SUFFIX)
|
|
PKG_HASH:=$(LINUX_KERNEL_HASH)
|
|
LINUX_DIR := $(HOST_BUILD_DIR)
|
|
FILES_DIR :=
|
|
--
|
|
2.7.4
|
|
|