From patchwork Tue Nov 27 23:14:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1004096 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WpMzNQFq"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 434KRv5XJ3z9s29 for ; Wed, 28 Nov 2018 10:16:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pTj6WnekhxuIE4ZTe2VuBgPyhsIdy92ri8QRQITNAss=; b=WpMzNQFqe/Tn4r /MYeS/4CtNbb9x+x39GaglVzD26CWE5OYer7HOfzPm7lSM364vb9S4BKEUpIs7Dwsy3ZttlEe5yFP tT4jgy5w6aGaj7YHyQYILdDZWHXAZQPW4iZ8xk5oEbSEQqBI7uNNvvTPpbpfuk0FTC/LhV7EpQ+WV iEJI8XbEXuB9p4996YdET/l5Wli4xRS7vvuPz8D5LsesBahPsknPdp1cU4NU+OoeBRSBRW4XPmspT 8c3uNNlC3VQz77g7ljjRJ/FNq5tazN31xbm2OeIC1bPqKTV5IipQzZjh5tv6pL/XEHJORHCHoow0L ZRxpTZd87zZvFaZSaeUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRmb7-0008F1-3d; Tue, 27 Nov 2018 23:16:53 +0000 Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2] helo=mx2.mailbox.org) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRmZk-0006uf-UW for openwrt-devel@lists.openwrt.org; Tue, 27 Nov 2018 23:15:33 +0000 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id A014AA11C7; Wed, 28 Nov 2018 00:15:15 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id VPABTQFWtHDQ; Wed, 28 Nov 2018 00:15:14 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Wed, 28 Nov 2018 00:14:38 +0100 Message-Id: <20181127231449.29188-17-hauke@hauke-m.de> In-Reply-To: <20181127231449.29188-1-hauke@hauke-m.de> References: <20181127231449.29188-1-hauke@hauke-m.de> X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181127_151529_162952_87B0B3F1 X-CRM114-Status: GOOD ( 11.01 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2001:67c:2050:104:0:2:25:2 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [RFC 16/27] kernel: Adapt to move of autofs4 in kernel 4.19 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org autofs4 is now in the fs/autofs/ folder in kernel 4.19 Signed-off-by: Hauke Mehrtens --- package/kernel/linux/modules/fs.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 7080d9e4ae..4e8acdeb21 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -49,8 +49,12 @@ $(eval $(call KernelPackage,fs-afs)) define KernelPackage/fs-autofs4 SUBMENU:=$(FS_MENU) TITLE:=AUTOFS4 filesystem support - KCONFIG:=CONFIG_AUTOFS4_FS - FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko + KCONFIG:= \ + CONFIG_AUTOFS4_FS \ + CONFIG_AUTOFS_FS + FILES:= \ + $(LINUX_DIR)/fs/autofs4/autofs4.ko@lt4.18 \ + $(LINUX_DIR)/fs/autofs/autofs4.ko@ge4.18 AUTOLOAD:=$(call AutoLoad,30,autofs4) endef