From patchwork Wed Aug 17 20:13:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Kemper X-Patchwork-Id: 1667468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=1P4xkc+y; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=VEAHQ1p4; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M7K7Y6JHRz1ygf for ; Thu, 18 Aug 2022 06:17:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SF+4QrQFgj/6kl7fEt2ZM2H1mVtHaiqQVTpmxxyXS+k=; b=1P4xkc+yfrHMyj rEfHnhOzIJ94OPh1WjE5QXaUbdyaOwdqWlZHJvS+PFpfo16pgZDoqeAg1ew3MYd6Hws3zwM4k7bBr EM+q/s1qJrAlfsJhUW+3mv90sHiBdz9UY01Xh0GPnZQ1/s7Ixjqpw0tdjtTTkOW2E8ELi01hjFXOT TCYNExNw9w9qTp9ziqDLrz2eZ8j4ln4JJ/eKRGKD4k/DsLzXaPpKx6JKohNX/oitCikEpIyowSmZo oGAXOurQC2gdApd6hkXfOPhalzhaWTYtnfjDY+uiWRVYMQvlGQ+LMhEICFFToye64qjIZQvm/2X2U EcnVnuzE5XgD2/HVTIaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOPQY-006BKk-72; Wed, 17 Aug 2022 20:14:10 +0000 Received: from mout.gmx.net ([212.227.15.19]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOPQS-006BD2-9J for openwrt-devel@lists.openwrt.org; Wed, 17 Aug 2022 20:14:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1660767238; bh=WHbNPbJ9yQZUy595GCoMoktwV044dp69UFrzPfiWhpw=; h=X-UI-Sender-Class:Date:From:To:Subject; b=VEAHQ1p4qdIish/ziaESoUjgUqhJsz3+FPN/KHArd3UD1Rvx6rF7m5D+4WlVdYF6g Z3IguBjYrDkFUjf4rw2DzH4iUF3YhfINVkzzJsls2elLaspsRzkoXh+0VLC3xxZpm2 FoPyDwSgs9WI/+C14KnnZST9VoMROe0bM8mHi5uc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from darth.lan ([62.14.67.17]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MNswE-1o09Pi0H0K-00OF5E for ; Wed, 17 Aug 2022 22:13:58 +0200 Date: Wed, 17 Aug 2022 22:13:56 +0200 From: Sebastian Kemper To: openwrt-devel@lists.openwrt.org Subject: [PATCH] build: revert 54070a1 (all kernels are >= 5.10) Message-ID: Mail-Followup-To: openwrt-devel@lists.openwrt.org MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:j/mSS+YbkjSMcob/ZqQyIBlgYE0HQ5k8H0bdhb8AnYYpcejbR0h SzgNCuGjhcYvfrUrLiRhpFv2c6oz7Sy3YRqGeFwZeWaiafelCKygqr2zWjClM/98bZyxAw9 /fQ6M1HzBYePf3wKMQmS6pwNOAIkUvKNk1BCLE4+HvCtpXLdfeF854dY1IOPEBiqvQL5ykz V+V7c3DvEH+hrlfOT5q3A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:ZV1ZBjGIz/c=:uPU/wO+rDaqI0IgN9XanHT E4r9UR4BB58/SUNNcCxldh68z48IWL6o108Hfj5zhjF8G5AToqDHYdPwc0QiZVLBX0JgeSfG4 l6O52Di230el2dWPBF/cU3or1aRpvivN5JGrGYESg4vzMHDWTBgAISluLaT098s7Bo3lKgT+g yUnZdvSKOEqmjpeqyW9VmHA01NF/oBcW96YbsBUrW95layBMX7q9/b1uYKZgP859kiL8fo8Ky bXva5BqOQbySzE/P5r5R1fYnXnAxVx994Bw4pnnpChOlWzymtK+NA7GWdKml+PeFDsvIIFaNw 2esjQzMw/dQPg8oxi3gQ9SmHe8VhsdbOq24qjMv/P3n15wsUCAQryG8yFe//lsMse5fW7EGHH fZxStdeciStO1I4/+DBlLQ3oHiDynlgCuBSfNn+Q8fwzVZ0r86mdUgPp64LjlGZAr/efnbuDP 04Wx7HEHdq9bHGLmx4Q6UfJJ5sPwALhZJA9gqS/21CuQnCHUX3srNFsuzUN0UoLmYTVrsdVQ9 8RqZa82odRa1b2L9bcae9Y9fdg+ZvPeR6uXemSvPRxzIe4v6Fmn86iVRsKn6ZZ8U+Z5+jGF2S vvyADN9qe+PBswskVuZuUogqJhSYhOtkJSP+0kK1xeOZAY2NL1tIABv+a7VBkYchEiqlQcPOI +QYkkrU0AZIvDSu+xZPu9Jmx7e7RuTclJN+mOkRJW1rNLuRX/VHZOqnTzG4rgob5WdknIrRch l13s0XYtrZYDmhTGS/Q0jxuucpGr7cQxIdFS5I71gS0Qxhd23QnfZ/2sPj8FTUobWAJLyNxCk sfnCHYr7eG9i9lrXH3yBAqv5SB9GISzyOo8vNGcO5OunVxAe+Jl2TwPrFte7IQFXk2yJV58gR EPm+DqBjJs8KkW3owrjGN/WocNV/sfCYB6CathNe1A54X4qh60UgRAL8415P66BrZX48knCm3 UTw158J042wGLSumbz47yyH0kjO4QUb+mligo8bIDZYmuMA1b7haFZly5QVJLlmvmB/hZuB13 Cqdf/IS/M2RXhGqfB4nUlWMTAFsD2pMpM58g+u9kBwGy0k9ehKaBhCa0EkBg8r8+U9nMiL0ee nxJlAcScKPp4zDFwB6xjP14FZIHCPIr0FchhAoW6uZ2PCAS0MZOLJjMUQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220817_131404_827754_E8EF3392 X-CRM114-Status: UNSURE ( 7.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Commit 54070a1 was added to allow building proper SDKs with kernels < 5.10. Now that all targets use at least kernel 5.10 it can be reverted. Signed-off-by: Sebastian Kemper --- include/kernel-defaults.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) Content analysis details: (-0.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.227.15.19 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [sebastian_ml[at]gmx.net] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.19 listed in wl.mailspike.net] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Commit 54070a1 was added to allow building proper SDKs with kernels < 5.10. Now that all targets use at least kernel 5.10 it can be reverted. Signed-off-by: Sebastian Kemper --- include/kernel-defaults.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 2e21392016..6687a58d1a 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -153,17 +153,12 @@ define Kernel/CopyImage } endef -# Always add "modules" so a proper Module.symvers file is written that -# also contains symbols from the kernel modules. Without these symbols -# external packages that depend on exported symbols from kernel modules -# will fail to build. define Kernel/CompileImage/Default rm -f $(TARGET_DIR)/init - +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) modules + +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) $(call Kernel/CopyImage) endef -# Here as well, always add "modules", see comment above. ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) define Kernel/CompileImage/Initramfs $(call Kernel/Configure/Initramfs) @@ -185,7 +180,7 @@ endif # ? $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),) $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),$(STAGING_DIR_HOST)/bin/zstd -T0 -f -o $(KERNEL_BUILD_DIR)/initrd.cpio.zstd $(KERNEL_BUILD_DIR)/initrd.cpio) endif - +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) modules + +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all) $(call Kernel/CopyImage,-initramfs) endef else