uml: add Kernel 6.1 support via testing

[openwrt/staging/jow.git] / target / linux / uml / Makefile

diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 1962249c48a7c207ad9f51e8afe685ac2fe62a97..ba3c7eae9dc443a8df6694c18c4b3be52e17b745 100644 (file)
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@@ -1,41 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2006-2021 OpenWrt.org
+
 include $(TOPDIR)/rules.mk
 
 # UML only makes sense on linux
 ifeq ($(HOST_OS),Linux)
+  ifeq ($(HOST_ARCH),x86_64)
 
-ARCH:=$(shell uname -m | sed \
-       -e 's/i[3-9]86/i386/' \
-       -e 's/mipsel/mips/' \
-       -e 's/mipseb/mips/' \
-       -e 's/powerpc/ppc/' \
-       -e 's/sh[234]/sh/' \
-       -e 's/armeb/arm/' \
-)
+ARCH:=x86_64
 BOARD:=uml
 BOARDNAME:=User Mode Linux
-FEATURES:=squashfs ext4 audio source-only
-MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+FEATURES:=audio ext4 rootfs-part squashfs
 
-KERNEL_PATCHVER:=4.14
+KERNEL_PATCHVER:=5.15
+KERNEL_TESTING_PATCHVER:=6.1
 
 include $(INCLUDE_DIR)/target.mk
 
-define Kernel/Patch
-       mkdir -p $(LINUX_DIR)/arch/um/include/uapi
-       mv $(LINUX_DIR)/arch/um/include/asm $(LINUX_DIR)/arch/um/include/uapi/
-       $(Kernel/Patch/Default)
-endef
-
-LINUX_TARGET_CONFIG:=$(CURDIR)/config/$(ARCH)
-
-DEFAULT_PACKAGES += wpad-basic kmod-mac80211-hwsim mkf2fs e2fsprogs
+DEFAULT_PACKAGES += wpad-basic-mbedtls kmod-mac80211-hwsim mkf2fs e2fsprogs
 
+  endif
 endif
 
 $(eval $(call BuildTarget))