From patchwork Mon Apr 20 18:12:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1273622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=ooyYoqQp; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.a=rsa-sha256 header.s=1024a header.b=p14FHQMK; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 495ZYg64jXz9sR4 for ; Tue, 21 Apr 2020 04:12:55 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From: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=4vSTMXtihjV8SR4jzp5taNDS+VEHVG1BxRkG4BjiFh4=; b=ooyYoqQpI10K9+ izGrTvKDg6tjahAhFoA/eUzBV8Z8q3LuDcwqnHtCoBjfnFtYqaPROPyS+aIfxgxWeV71AIZ8NTdIu cWQUKAWBbMnO9ETdQiWJduXj4E9IOJNjVqkqc5TDS/RtBLEyAG590tiBaTF47XS3OVCSTVyBs/nb/ 9mvVNJFhNWBGIuWXB4qCgyHSaxjF6fCq/TSlYTSR86mGnsoFvjnJtbPav+gpN6TFjNJZptKmjG9Cw CDz7ZV3mgN4mmaY79YH9EqgmxK6htHyYN7TFU5omQAYCLX9graN0/xE18xUrohJ+1Rbf7noWWMAJ+ 15MfjHlCM19trzyVr9ag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQauX-0004qG-Fd; Mon, 20 Apr 2020 18:12:49 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQauT-0004na-0T for openwrt-devel@lists.openwrt.org; Mon, 20 Apr 2020 18:12:46 +0000 Received: (wp-smtpd smtp.tlen.pl 4752 invoked from network); 20 Apr 2020 20:12:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1587406362; bh=vkFJuUkDDosVoxkCRyHWcsVkDU00Nc7xzzICTrHMznI=; h=From:To:Subject; b=p14FHQMKaSP2cSGQyaVkNPF6mJwZP1GbzyENu6Ynupw/ikPvwukYAhB5cYrtBvh7s Kf2kFkboScQeQekvhqwcmxjQRf2j5CQj5p4Mc+vLf1kzc1bBteZzjAJO6gT0qhILnG 31ideuMNifcgf/+ht9cEkmKrQk4oDMfjIlvZ18AA= Received: from unknown (HELO localhost.localdomain) (tomek_n@o2.pl@[5.2.67.190]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 20 Apr 2020 20:12:42 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Mon, 20 Apr 2020 20:12:25 +0200 Message-Id: <20200420181228.52873-1-tomek_n@o2.pl> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 X-WP-MailID: 6e97dc62f7ab163675d122b860221b24 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000001 [kYKd] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200420_111245_205984_BB08FAC3 X-CRM114-Status: UNSURE ( 4.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 [tomek_n[at]o2.pl] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 Subject: [OpenWrt-Devel] [PATCH v2 1/4] x86: image: drop dead code X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 These are remnants of old image generation code, which now serve no purpose. Signed-off-by: Tomasz Maciej Nowak --- target/linux/x86/image/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 77516a4a9d41..72a4d66ad731 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -13,12 +13,6 @@ GRUB_SERIAL_CONFIG = GRUB_TERMINAL_CONFIG = GRUB_CONSOLE_CMDLINE = -ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget)))),) - GRUB2_VARIANT := generic -else - GRUB2_VARIANT := legacy -endif - ifneq ($(CONFIG_GRUB_CONSOLE),) GRUB_CONSOLE_CMDLINE += console=tty0 GRUB_TERMINALS += console @@ -152,8 +146,6 @@ define Device/Default ARTIFACTS := $$(ARTIFACTS-y) endef -$(eval $(call Image/gzip-ext4-padded-squashfs)) - ifeq ($(SUBTARGET),64) include 64.mk endif From patchwork Mon Apr 20 18:12:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1273623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=TTq6EhEK; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.a=rsa-sha256 header.s=1024a header.b=eqoKLKlK; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 495ZYv0pQXz9sR4 for ; Tue, 21 Apr 2020 04:13:07 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=D1CEsXWjBy00aa0XiNZNFQLSZwfFVce/qStCs2tyES4=; b=TTq6EhEKb4iBW9Xw3wqE6ILDoC i4LcAj2g7k5sJoJCJY1p4VAA6ckjNzF4VWTp8mmfA51PjfDJZ+x9Sj/gTSZbIvzi54MzY0RRtWMsd 7KHyUm2G2SlnoE33wJHEC4hK7UhoCnnoXK0RVgErt01s3cr2+6s/PQHXfrK0QUnESAJfzjyRPrC+/ gcaMpwuvn9c5gGCgfh3jBCbuvOV78yJEdEHLOWftS5A0enVM71+agIKVWS5fwQm3VINoJIaUoac8U whb8TOgm7fFzDIJdmxhOhzuLqn8smyTL+/9RrncZYdsq+dzpaEn4QyleftpmrvGkv4h6RW5OgNaDq 74hh4fyg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQauk-00053H-OQ; Mon, 20 Apr 2020 18:13:02 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQauT-0004nz-AQ for openwrt-devel@lists.openwrt.org; Mon, 20 Apr 2020 18:12:47 +0000 Received: (wp-smtpd smtp.tlen.pl 5811 invoked from network); 20 Apr 2020 20:12:43 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1587406363; bh=MfH9hH5Ms52Gli3UAa+O/fyfA7vPOYcqBNeYagdsgTU=; h=From:To:Subject; b=eqoKLKlKctadOqyz/uOGEw6T9prbMjY+UZ5GgtyFOMQpriPCRWYu8g1vh3mHXXJ3j /oIEYBOrn0SRbPbir3LtWoDaRfl8F+icxnYJ3QhDv3K0k9Dux7eqkHEMPeYBpvaytA MqlFMVNVIyG9WYlKnvVrx+xWEVILVJfwSUcu0mZQ= Received: from unknown (HELO localhost.localdomain) (tomek_n@o2.pl@[5.2.67.190]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 20 Apr 2020 20:12:43 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Mon, 20 Apr 2020 20:12:26 +0200 Message-Id: <20200420181228.52873-2-tomek_n@o2.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420181228.52873-1-tomek_n@o2.pl> References: <20200420181228.52873-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: e46ec3c0eef99c59b6803d191a2fce8a X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [QVOE] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200420_111245_517304_6DD36179 X-CRM114-Status: UNSURE ( 7.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 [tomek_n[at]o2.pl] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 Subject: [OpenWrt-Devel] [PATCH v2 2/4] x86: fix kmod-forcedeth package selection X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 There's no such package as forcedeth, threfore the driver is never selected. Fix it by properly specifying package name. Fixes: 35f208d ("x86: add nforce eth to default packages") Signed-off-by: Tomasz Maciej Nowak --- target/linux/x86/64/target.mk | 2 +- target/linux/x86/image/generic.mk | 2 +- target/linux/x86/image/legacy.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk index 6f5f896c8b43..874e10d704e1 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/64/target.mk @@ -1,7 +1,7 @@ ARCH:=x86_64 BOARDNAME:=x86_64 DEFAULT_PACKAGES += kmod-button-hotplug kmod-e1000e kmod-e1000 kmod-r8169 \ - kmod-igb kmod-bnx2 forcedeth + kmod-igb kmod-bnx2 kmod-forcedeth define Target/Description Build images for 64 bit systems including virtualized guests. diff --git a/target/linux/x86/image/generic.mk b/target/linux/x86/image/generic.mk index c1a3f8b2e572..8a23afef0afe 100644 --- a/target/linux/x86/image/generic.mk +++ b/target/linux/x86/image/generic.mk @@ -2,7 +2,7 @@ define Device/generic DEVICE_TITLE := Generic x86 DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 kmod-natsemi \ kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 kmod-tg3 \ - kmod-via-rhine kmod-via-velocity forcedeth + kmod-via-rhine kmod-via-velocity kmod-forcedeth GRUB2_VARIANT := generic endef TARGET_DEVICES += generic diff --git a/target/linux/x86/image/legacy.mk b/target/linux/x86/image/legacy.mk index 9d6fa5e3871a..5c13f95157d2 100644 --- a/target/linux/x86/image/legacy.mk +++ b/target/linux/x86/image/legacy.mk @@ -2,7 +2,7 @@ define Device/generic DEVICE_TITLE := Generic x86/legacy DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 \ kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 \ - kmod-tg3 kmod-via-rhine kmod-via-velocity forcedeth + kmod-tg3 kmod-via-rhine kmod-via-velocity kmod-forcedeth GRUB2_VARIANT := legacy endef TARGET_DEVICES += generic From patchwork Mon Apr 20 18:12:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1273624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=PgIzGufB; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.a=rsa-sha256 header.s=1024a header.b=Hi/LKam5; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 495ZZG05syz9sQx for ; Tue, 21 Apr 2020 04:13:26 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=A4PeGBue8m9RbaZnxjkb2hcgFKPYVmImHvPQaSziBMU=; b=PgIzGufBcTxHVoMIlEYXbI941x OcVWQiyH5Y6mqOjLoxeFUcsPLmGUtd3cejUQ+vLXO6oFYn7jdsoHQN5/3SEWLCcCqLQgaYYnikyCV 0uirBz7i9SJz69hnSmTdFeeTJ3Ar7aTfTLKTmxWS6uj1E9+yg6dohweb187yTXSLhOvgf0ZtjX52d /D1eDWr0V3aW8XGA1QIcOnMgN/zA1xz7W15J1cQGGqRzqy5aaFagOwWAP9+N/MpArzqOJLYwx80ya 3POqof1I5eZ2GAYfZ3GqUL0B6STA12qKnXJq/VxFjljslua3joltO1DXW6glIZDRTJOqNCNAx8+dZ AqxGfExw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQav2-0005Jt-6t; Mon, 20 Apr 2020 18:13:20 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQauU-0004oH-5X for openwrt-devel@lists.openwrt.org; Mon, 20 Apr 2020 18:12:47 +0000 Received: (wp-smtpd smtp.tlen.pl 7033 invoked from network); 20 Apr 2020 20:12:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1587406364; bh=GoKtPurViTJKOKVU9YW/KypTNYjD4AKijq20YL1AN0Y=; h=From:To:Subject; b=Hi/LKam5395IQCO+GrxwjNs8iE3LC5y4dnM6tSzckUxq0TKjXNGS4N7fcq+mND74T Bu3nd/IdrMKSUs4vII5TW3G1ck2i9ohc86O1UdfpoLOk96yBuDNgr7QOsosiQnp1PF 3cwctbMYtT2OHKl5fEXPJ0dS5lcD875KLqSEhM7w= Received: from unknown (HELO localhost.localdomain) (tomek_n@o2.pl@[5.2.67.190]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 20 Apr 2020 20:12:44 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Mon, 20 Apr 2020 20:12:27 +0200 Message-Id: <20200420181228.52873-3-tomek_n@o2.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420181228.52873-1-tomek_n@o2.pl> References: <20200420181228.52873-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: a95072b38c91af05b826557d84e97568 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [cVP0] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200420_111246_381555_54D3E114 X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 [tomek_n[at]o2.pl] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 Subject: [OpenWrt-Devel] [PATCH v2 3/4] x86: select kmod-button-hotplug by default X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 This package is useful by all subtargets, therefore move it to default packages selection. Signed-off-by: Tomasz Maciej Nowak --- target/linux/x86/64/target.mk | 4 ++-- target/linux/x86/Makefile | 2 +- target/linux/x86/generic/target.mk | 1 - target/linux/x86/geode/target.mk | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk index 874e10d704e1..02b6c8debfe1 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/64/target.mk @@ -1,7 +1,7 @@ ARCH:=x86_64 BOARDNAME:=x86_64 -DEFAULT_PACKAGES += kmod-button-hotplug kmod-e1000e kmod-e1000 kmod-r8169 \ - kmod-igb kmod-bnx2 kmod-forcedeth +DEFAULT_PACKAGES += kmod-e1000e kmod-e1000 kmod-r8169 kmod-igb kmod-bnx2 \ + kmod-forcedeth define Target/Description Build images for 64 bit systems including virtualized guests. diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 1b8d45f32aee..f6b037b8862e 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -19,7 +19,7 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs +DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug $(eval $(call BuildTarget)) diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk index 90586f56d6a7..81a1d7a7924d 100644 --- a/target/linux/x86/generic/target.mk +++ b/target/linux/x86/generic/target.mk @@ -1,7 +1,6 @@ BOARDNAME:=Generic CPU_TYPE :=pentium4 FEATURES += audio pci pcie usb -DEFAULT_PACKAGES += kmod-button-hotplug define Target/Description Build firmware images for modern x86 based boards with CPUs diff --git a/target/linux/x86/geode/target.mk b/target/linux/x86/geode/target.mk index f69e8cada5aa..04ac926cfd95 100644 --- a/target/linux/x86/geode/target.mk +++ b/target/linux/x86/geode/target.mk @@ -3,7 +3,6 @@ FEATURES += pci usb gpio DEFAULT_PACKAGES += \ kmod-crypto-hw-geode kmod-crypto-cbc \ kmod-ath5k kmod-ath9k \ - kmod-button-hotplug \ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ kmod-ledtrig-netdev hwclock wpad-basic # Geos From patchwork Mon Apr 20 18:12:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1273625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=fail (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=Zyx9WY2Z; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=o2.pl header.i=@o2.pl header.a=rsa-sha256 header.s=1024a header.b=iF4ukKL0; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 495ZZb1y3dz9sQx for ; Tue, 21 Apr 2020 04:13:43 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1P27h1KT0wEk9xS6jp3LJFgaDOQcTd0WP/TTfBRqiFE=; b=Zyx9WY2ZMuT/k3r0eJbdGHMcgt qjrdKNi59OIdavdApjQ+S2HRzyajIyEqtOGiP5QYeRM6oh7Ov6yPAnnpW5ZUUirff7C4RaVP+Qgg6 UfmI3aErpavCg8ayNhkV9tH/ilsnaWIv1sfWvelJXcTcn/1/i8fFnclvxs6I1pyf62xE3xeF4UDwK SEJfFuVkqjGSo5lmRDO7AYgXQv0H6rkjKo7uvBgyIsLBS44Amh/EM3fXsBWwwxVqWlBRbrNNfRg+8 e0QJeLuhTCFeXXchbBNgfoOBjMWaqSZC/vjpnIfReaOuI4u8wQWn4tUuzDvF5zEtbFQ+AFwpw08Ze HxVaR/7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQavI-0005ay-Oq; Mon, 20 Apr 2020 18:13:36 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jQauV-0004oj-Eu for openwrt-devel@lists.openwrt.org; Mon, 20 Apr 2020 18:12:49 +0000 Received: (wp-smtpd smtp.tlen.pl 8513 invoked from network); 20 Apr 2020 20:12:44 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1587406365; bh=pw6EQckzzIP+QKNZmzeWlHr0ntTbX1LqWio1UZjoW4Y=; h=From:To:Subject; b=iF4ukKL0h90N2wDZxjbZopNGkbz0uKdLY2pJwNb6YGY04WggexLKJOVSuolfLFdmF jHnuOSvnQYicBpQcq/h2ZTPT01NG2oJmi6pEy3mkYCAHJ4i1q0cFFmeN7EvtPKohgL /Nbfx15A9bpc6N6T4IEezaOJ2RfUpYT5M+qwlTZg= Received: from unknown (HELO localhost.localdomain) (tomek_n@o2.pl@[5.2.67.190]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 20 Apr 2020 20:12:44 +0200 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Mon, 20 Apr 2020 20:12:28 +0200 Message-Id: <20200420181228.52873-4-tomek_n@o2.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420181228.52873-1-tomek_n@o2.pl> References: <20200420181228.52873-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 947cf51b88bd65102f4ec27a02db4917 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [EdPU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200420_111247_665829_32E42951 X-CRM114-Status: UNSURE ( 6.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 [tomek_n[at]o2.pl] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -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 Subject: [OpenWrt-Devel] [PATCH v2 4/4] x86: move packages selection to profiles X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 This can be rather confusing for contributors, since there are three layers in which packages can be added. As for now there are none profiles other than generic (exception: geos) let's move packages to these profiles. Being here this commit also removes packages in geode profiles already enabled in kernel config. Signed-off-by: Tomasz Maciej Nowak --- v1 -> v2 Really remove those packages. target/linux/x86/64/target.mk | 2 -- target/linux/x86/geode/target.mk | 10 ---------- target/linux/x86/image/64.mk | 2 ++ target/linux/x86/image/geode.mk | 7 +++---- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk index 02b6c8debfe1..ece3d1bc9a16 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/64/target.mk @@ -1,7 +1,5 @@ ARCH:=x86_64 BOARDNAME:=x86_64 -DEFAULT_PACKAGES += kmod-e1000e kmod-e1000 kmod-r8169 kmod-igb kmod-bnx2 \ - kmod-forcedeth define Target/Description Build images for 64 bit systems including virtualized guests. diff --git a/target/linux/x86/geode/target.mk b/target/linux/x86/geode/target.mk index 04ac926cfd95..a64d2baaeec2 100644 --- a/target/linux/x86/geode/target.mk +++ b/target/linux/x86/geode/target.mk @@ -1,15 +1,5 @@ BOARDNAME:=AMD Geode based systems FEATURES += pci usb gpio -DEFAULT_PACKAGES += \ - kmod-crypto-hw-geode kmod-crypto-cbc \ - kmod-ath5k kmod-ath9k \ - kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ - kmod-ledtrig-netdev hwclock wpad-basic -# Geos -DEFAULT_PACKAGES += \ - soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ - hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ - kmod-usb-ohci-pci kmod-hwmon-lm90 define Target/Description Build firmware images for AMD Geode GX/LX based systems (net5501, alix, geos) diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk index bde76ceba5dd..61e6d408d7ce 100644 --- a/target/linux/x86/image/64.mk +++ b/target/linux/x86/image/64.mk @@ -1,5 +1,7 @@ define Device/generic DEVICE_TITLE := Generic x86/64 + DEVICE_PACKAGES += kmod-bnx2 kmod-e1000e kmod-e1000 kmod-forcedeth kmod-igb \ + kmod-r8169 GRUB2_VARIANT := generic endef TARGET_DEVICES += generic diff --git a/target/linux/x86/image/geode.mk b/target/linux/x86/image/geode.mk index 0b463e36ed39..4ebb14888a8c 100644 --- a/target/linux/x86/image/geode.mk +++ b/target/linux/x86/image/geode.mk @@ -1,7 +1,7 @@ define Device/generic DEVICE_TITLE := Generic x86/Geode DEVICE_PACKAGES += kmod-crypto-cbc kmod-crypto-hw-geode kmod-ledtrig-gpio \ - kmod-ledtrig-heartbeat kmod-ledtrig-netdev kmod-via-rhine + kmod-ledtrig-heartbeat kmod-ledtrig-netdev GRUB2_VARIANT := legacy endef TARGET_DEVICES += generic @@ -9,8 +9,7 @@ TARGET_DEVICES += generic define Device/geos $(call Device/generic) DEVICE_TITLE := Traverse Technologies Geos - DEVICE_PACKAGES += br2684ctl flashrom kmod-8139cp kmod-hwmon-lm90 kmod-mppe \ - kmod-pppoa kmod-usb-ohci-pci linux-atm ppp-mod-pppoa pppdump pppstats \ - soloscli tc + DEVICE_PACKAGES += br2684ctl flashrom kmod-hwmon-lm90 kmod-mppe kmod-pppoa \ + kmod-usb-ohci-pci linux-atm ppp-mod-pppoa pppdump pppstats soloscli tc endef TARGET_DEVICES += geos