From 833545e6979f50ab476d46f424dd47a8107f2dd6 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 22 Mar 2023 15:08:54 +0100 Subject: [PATCH] fixes Signed-off-by: John Crispin --- include/kernel-version.mk | 4 ++++ include/target.mk | 3 ++- package/kernel/nat46/Makefile | 2 +- scripts/apk-make-index.sh | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d041819b08..f4daad2e39 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -18,7 +18,11 @@ LINUX_VERSION-5.10 = .27 LINUX_KERNEL_HASH-4.4.60 = e7f2f47acf17497d6ffd713eda65c025b3df0bce09faa8c04712bf1b3cfc9fdb LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03 LINUX_KERNEL_HASH-5.4.158 = 6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59 +ifeq ($(CONFIG_TARGET_ipq95xx),y) +LINUX_KERNEL_HASH-5.4.164 = 0b2987b4b838d169b49f33f01ffa1bb1940eda8f159632943a6db2a3f61db233 +else LINUX_KERNEL_HASH-5.4.164 = a8fdb27e0e7a871086e0c78b899088c21fbc8e16fb236d220926dc4c93e0fb2d +endif LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/include/target.mk b/include/target.mk index a3ad598ebc..57a4f5e9e4 100644 --- a/include/target.mk +++ b/include/target.mk @@ -248,7 +248,8 @@ ifeq ($(DUMP),1) CPU_TYPE ?= generic CPU_CFLAGS_generic = -mcpu=generic CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53 - endif + CPU_CFLAGS_cortex-a73 = -mcpu=cortex-a73+crypto + endif ifeq ($(ARCH),arc) CPU_TYPE ?= arc700 CPU_CFLAGS += -matomic diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile index c2bf582cfa..1d5660c55e 100644 --- a/package/kernel/nat46/Makefile +++ b/package/kernel/nat46/Makefile @@ -28,7 +28,7 @@ include $(INCLUDE_DIR)/kernel-defaults.mk define Build/Compile $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/nat46/modules" \ MODFLAGS="-DMODULE -mlong-calls" \ - EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \ + EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\" -Wno-error=vla" \ modules endef diff --git a/scripts/apk-make-index.sh b/scripts/apk-make-index.sh index df1f1a2e2b..600464ea15 100755 --- a/scripts/apk-make-index.sh +++ b/scripts/apk-make-index.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -e +exit 0 + pkg_dir=$1 if [ -z "$pkg_dir" ] || [ ! -d "$pkg_dir" ]; then -- 2.34.1