From patchwork Fri May 29 17:22:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1300861 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=adrianschmutzler.de 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=Icp3O1JT; 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 49YWdL4hRtz9sRK for ; Sat, 30 May 2020 03:24:06 +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:Cc: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:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OGwDvsOJ8KzvVtfhfOmzgczuoHbf5tb4DyLvQ0/F1z8=; b=Icp3O1JT0IueVP xGOmzZ3c/T2HoDCX9pt1Xafwie8fpnKEaiAObhnYOvht6p26bE8oU9cGcTl/T0pTgT7ITCom2Hpts I5d0mIH3BT8KsZGbQxzla+8GCUauy2vIkULYoJc7F+1JGldNLi/wt3F4Vhr9WliaKHJ9eWQF2O5Pu Lkoh5LOmNcWSvzWqwN3B8RsN1Xyeec1jCqnY9Hye1kzQ5C1J3+sHvsiqqsB47HiHjN9a3b/N/TIJG HBIVv/RlSCvKOoEQ4jPuylWQQpZHRzCK4AMqtojqtR0hF+1fwvATT6p8eNMXWgYu+89cTe1uvmGFb RYBpFjADhSgXA9orrDbA==; 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 1jeijk-0004aG-WB; Fri, 29 May 2020 17:24:05 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeijE-0003v4-LV for openwrt-devel@lists.openwrt.org; Fri, 29 May 2020 17:23:35 +0000 Received: from buildfff.adridolf.com ([188.192.133.27]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MBUuV-1jr8Oe2wcZ-00CzhY; Fri, 29 May 2020 19:23:27 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 29 May 2020 19:22:36 +0200 Message-Id: <20200529172238.43399-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200529172238.43399-1-freifunk@adrianschmutzler.de> References: <20200529172238.43399-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:ChRiXxql03UQX83s6kScyexmYUDy+KNvf3V1F6fN81jalqF1z8Z Q94+F0iaI5YfqgYppkJTv9YQQgTE8KB3DmR+Xxbqii1RNiDcuXKc6JRIuenaJZwYkmEn5VG B2mpeAHCiWvluOB9IY46hlrY2wF3IJc+f0M5xuhsmZYrlGw83RYoPU/iCl0oQJOsAL68IAs czO6192Q7pOgvslZ2EC7g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IsogdzDpV88=:tJ3fNlETCE8C53GDOzo4yf 3jEXYun7FAiDsdFlCAo8zOeqvSAQEFGTk/gdEeZba3xdMVxAhFq/ArHBcM7T2ZfHrwbV7mGec npsDeu+katd+mlAIcO2oiuw7bYM6FFKwKP9mWfbcqIansoFAUZ7fWNM66aIv88OeGsLJC7WHF TFjAHH6YvEB24nDHswQVkf6PiTtElw71mb+zYmYRRjHEVsEj285AdJ46CzADxmQ2XSAJrineC c9xVe0VzMn0tnH09bEr/uirtTMuMYfT6tydOJodomtpbj40XRYih5wm0kj08X3ki8bJVOMDlq lTcd2LmE0gtneZysw7+riSmxHfacCmufu1IgnwiLvZXs2+eeGWruWKsbNzCMPbRj/5a9sZSwV ACfHyVsajlJWlcUpokTUZ+x9xhiXvTayms0Ze5yoBmRP7OFfbZi7ADU2hyHMGUhqR247zrylI pAm7tkKlDJOEFECr+kTlhm75SkAnLbVAynRJQR4Yk282L4m/hVeaY9weVzjrYfij/31GdGfMO 6st/qhR6xaJrL0Rj+EeEfD8IBLNea8CfT0fRM7Z05gY+mJySFKMndRQQK9x67Iu55ZXU8i0LW fGEZRRse1KaU+goS/Pwkg+BC7FMg/5g92TQHRAkghZnXIe4RtnbO2n4Yujjl1mW9RgmqiyTkd 6wTR1U8hOpOWBo5/KKXR7mNQLzqoAmjsy4nu4lDu4r6uY3j1VoStdt/HQrB8+EmtUpAJdI5Ae aHDMC2f2YvfkoMlUoQBCsav7YtRDKkoXbp+UGfuyvTsFUb30lDkgEsyvNW/83l6L3XQPVkgU5 IZmUrgiJ3J4NWRswyoK70wJJRBWWSVGkzxc3tR8PvKXftZPPo/3o6OK7keImlxNRIOPU9r2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200529_102332_992951_FC832EFB X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 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 https://www.dnswl.org/, no trust [212.227.126.134 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 1/3] treewide: drop DEVICE_TYPE when used as device variable 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: , Cc: Linus Walleij , Sungbo Eo , Christian Lamparter Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org DEVICE_TYPE is a target/subtarget variable, and it does not have any effect when set in a device definition. It can only be set in a target's or subtarget's Makefile. Consequently, having it set anyway is misleading, so this drops all cases. This effectively reverts the following commits: 7a1497fd601d ("apm821xx: MBL: set DEVICE_TYPE to NAS") 5b4765c93a1b ("gemini: Classify Raidsonic NAS IB-4220-B as a NAS") cdc6de460bb4 ("gemini: D-Link DNS-313 is a NAS") For the following commit, the variable was set when adding device support: 27b2f0fc0fc5 ("kirkwood: add support for Iomega Storcenter ix2-200") Cc: Christian Lamparter Cc: Sungbo Eo Cc: Linus Walleij Signed-off-by: Adrian Schmutzler --- target/linux/apm821xx/image/Makefile | 1 - target/linux/gemini/image/Makefile | 2 -- target/linux/kirkwood/image/Makefile | 1 - 3 files changed, 4 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index d732141c8f..c26c015751 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -230,7 +230,6 @@ define Device/wd_mybooklive DEVICE_VENDOR := Western Digital DEVICE_MODEL := My Book Live Series (Single + Duo) DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic - DEVICE_TYPE := nas DEVICE_DTS := wd-mybooklive SUPPORTED_DEVICES += mbl wd,mybooklive-duo BLOCKSIZE := 1k diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile index a155939b8c..83f3d222d9 100644 --- a/target/linux/gemini/image/Makefile +++ b/target/linux/gemini/image/Makefile @@ -171,7 +171,6 @@ define Device/dlink_dns-313 DEVICE_VENDOR := D-Link DEVICE_MODEL := DNS-313 1-Bay Network Storage Enclosure DEVICE_DTS := gemini-dlink-dns-313 - DEVICE_TYPE := nas DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES) BLOCKSIZE := 1k FILESYSTEMS := ext4 @@ -204,7 +203,6 @@ define Device/raidsonic_ib-4220-b DEVICE_VENDOR := Raidsonic DEVICE_MODEL := NAS IB-4220-B DEVICE_DTS := gemini-nas4220b - DEVICE_TYPE := nas endef TARGET_DEVICES += raidsonic_ib-4220-b diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index e69e3f125d..552ee44ee4 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -66,7 +66,6 @@ define Device/iom_ix2-200 DEVICE_MODEL := StorCenter ix2-200 DEVICE_DTS := kirkwood-iomega_ix2_200 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-hwmon-lm63 - DEVICE_TYPE:=nas PAGESIZE := 512 SUBPAGESIZE := 256 BLOCKSIZE := 16k From patchwork Fri May 29 17:22:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1300859 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=adrianschmutzler.de 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=aGnu2FH3; 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 49YWct3YfCz9sRK for ; Sat, 30 May 2020 03:23:42 +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:Cc: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:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JqgX//NIyj1QoHyF1NyXEeXU+3QlD2b++vSEAv1FFew=; b=aGnu2FH3Zh02l0 gASs6NvoAqHdNOzyyhWGD9A93+e2hnTjjZE5kDtKNtW7MYUoDIwJbgtd3QBa/dJRhqBz2rjFIRdDB rvM2SP7vTipifQwF5t3D6tPL0t7JAzMtUDFf6dUSRwB70egAKsWV8cUzGluGr6CqLh323NGK1zvjb jkBbDZqT0TMuCb0uqPKihjqG4xnwDOZuJfV+jYyYaNTaHRb+jn2OifhMin03eLPmCDSR5nvTbiAfn wArSqg/zdnT6qTUTTphPVWWlVWRfl7NmPJxW1remUf5z/wfPoawuP9Uv99zPUJS6SKgp87fRKBiT7 1h9JB8JGZwOZkk0OC97A==; 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 1jeijM-00041X-A1; Fri, 29 May 2020 17:23:40 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeijE-0003v2-1t for openwrt-devel@lists.openwrt.org; Fri, 29 May 2020 17:23:33 +0000 Received: from buildfff.adridolf.com ([188.192.133.27]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MD9Kj-1jnHJe3bAv-0099gc; Fri, 29 May 2020 19:23:27 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 29 May 2020 19:22:37 +0200 Message-Id: <20200529172238.43399-3-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200529172238.43399-1-freifunk@adrianschmutzler.de> References: <20200529172238.43399-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:C8jyiQKX3suzrXlIVJm8f9gIQtHEb7SEaJNazYsPKrVJyPPnldp L9aO9mavLbNnoTdi4ee3R4MhDv08wHym0UaFk3FASZEkfC95a4f5kTq1baMJlaGPdyKbsOi dX/6ZXztaRTU2a/HSILIhdAPpCY3o4+Y3hmwsw5k+uYfuHmfqFX37O+4z4IZkmjUHPXiyCv wPyLNkefnP2xYtV3ZXuWA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:vhY/xSCvuBQ=:XjZmSZ8LvjoO6hBr3nLYWe g80IshZHvKvPxik7ymREKLKhPc5GYMNGF+rxZEMKBzHynRBJE79XvklJkrrK3oAP4nIeCF18F oIsxHzXdsClw3fqgtO0u28w0DkWvwjxbdvAauvCbEh6syfuFTbjdVuI8acebripGA800xsILP DRpYksp95XVDTLDcj59o/mfV2fex3PFxAuZPzgv5DpJofT/q09x/nJDdxzQhy/OHCQ5Exognr IqxOsaNW3rjRRVtKmQxSQjlc6f5Vr7MoWLLSnaeNljFC/N7QgD14bWOsjZmHtxYCqssvXvgMJ DnmcUZDzJqUUhUirxZX2s2btczGY4pje9ouUfeB7aEVScfNPLwkE7g2TNE0guxP0w6J8cSaoz eGBCpb+TLWyV6UJYr86eoDCho3ksp4GrhnUChZtHzSQCeeXDY4UwatVsIS3H1TSgbVwcnnDrD Y18ZyyMN4xeSOwIZslJiGtqVcymfm2K8p4B/DBQmUxi2iwYpD/FlbDvmyF32MKXznCo2VrKfQ EGczjBqj047rmOERbhHdoGMPb62Kcde2RouSf9iqVsCNQ6I5FbEngXeAGXw/2tvMK5Q4Gq6Fj 0q671hSTBPqgR/tBgc4wFZZcU1/3y5fs+j9gCp3HwQWc7sbsDNV1pk+X4Bzny9XQo99yCqsg2 gykCbZq+BtbX2jnagQL9HGRs6Aq83VnWH3aoBt4ERZZOnb+y0dZFhGHYrELbKAA5dcTWPxQle v8PNMTuBFqOV7gaiC1UrhActqvvzM2IazWag0eXDpTKlEVTrGmexs5BEOFHXVKNPpDiGzdqlY r8FHToHchVcTyzkxQB5xAykvBgHw4WhF4mKtC0L0pEsJpJtOLvGI+DcGwX4nDhDSkj6/M4o X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200529_102332_390475_04B2E698 X-CRM114-Status: GOOD ( 10.51 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 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 https://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.187 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 2/3] treewide: provide consistent basic DEVICE_TYPE 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: , Cc: Linus Walleij Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org While the effective "default" based on frequent use is "router", the DEVICE_TYPE variable actually provides a "basic" configuration without selecting any additional packages. This is currently set up with the identifier "bootloader", which seems to be not used at all. However, the only targets not using "router" or "nas" are actually archs38 and arc770, which use their own value "developerboard" for DEVICE_TYPE which seems to have been invented when these targets where added. The latter is not implemented in target.mk, though, and will fall back to the "basic" set of packages then. So, to clean this up and make it more readable, let's just define a DEVICE_TYPE "basic" and use it for the aforementioned cases. Cc: Linus Walleij Signed-off-by: Adrian Schmutzler --- include/target.mk | 3 ++- target/linux/arc770/Makefile | 2 +- target/linux/archs38/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/target.mk b/include/target.mk index 9bd4c14936..a2ceb7f783 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,11 +14,12 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd urandom-seed urngd +# For the basic set +DEFAULT_PACKAGES.basic:= # For nas targets DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ip6tables ppp ppp-mod-pppoe firewall odhcpd-ipv6only odhcp6c kmod-ipt-offload -DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) all: dumpinfo diff --git a/target/linux/arc770/Makefile b/target/linux/arc770/Makefile index 8150f147c5..018d6e5448 100644 --- a/target/linux/arc770/Makefile +++ b/target/linux/arc770/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=generic KERNEL_PATCHVER:=4.14 -DEVICE_TYPE:=developerboard +DEVICE_TYPE:=basic define Target/Description Synopsys DesignWare boards diff --git a/target/linux/archs38/Makefile b/target/linux/archs38/Makefile index 55708a09b0..5b3650ef8d 100644 --- a/target/linux/archs38/Makefile +++ b/target/linux/archs38/Makefile @@ -14,7 +14,7 @@ SUBTARGETS:=generic KERNEL_PATCHVER:=5.4 -DEVICE_TYPE:=developerboard +DEVICE_TYPE:=basic define Target/Description Synopsys DesignWare boards From patchwork Fri May 29 17:22:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1300860 X-Patchwork-Delegate: freifunk@adrianschmutzler.de 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=adrianschmutzler.de 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=VteQgmmp; 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 49YWd52lRcz9sRK for ; Sat, 30 May 2020 03:23:53 +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:Cc: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:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=maOS/bPGDLbcHmb/RWVCSwNXEUaWRO/EH5BOMfEiOmU=; b=VteQgmmpT4PGI3 asrDeWAoCNJVQCb3+kzwqxTpfA1SikxftqQVwNUjxpbri4vBVVLognXc1KpvOCwwgDzNIW79w+042 2Uv9ox2CkZYMZa1f0f0lCRcaOGa9PVtS7AF4CJrfDAohKIGrKqh9OdfluttgyGnDp9p0997o4cbH6 jJqoIOiCvkShLSWSzRHSpzMNSfGAgWx9bFxwFBjOqWhwsBqLxslnZGNyApOR5hibRtueCfH6prLuC 9EaawwVFetI2dQnRDpr97jb2p9iIoQHiAQT+Pjz3LOxIvjF9RNTGN6G2yKTC7W+xjEWCeBqNibHhJ /9GEsOZ3MNUNNWGf2gRA==; 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 1jeijX-0004II-8P; Fri, 29 May 2020 17:23:51 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeijE-0003v3-DV for openwrt-devel@lists.openwrt.org; Fri, 29 May 2020 17:23:35 +0000 Received: from buildfff.adridolf.com ([188.192.133.27]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MVeDs-1jWyz54Bgi-00RVW7; Fri, 29 May 2020 19:23:28 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Fri, 29 May 2020 19:22:38 +0200 Message-Id: <20200529172238.43399-4-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200529172238.43399-1-freifunk@adrianschmutzler.de> References: <20200529172238.43399-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:A7lbDJY56G6fmaZRuvekP/6WXl11pb8cIgXDPjo643vwpejARVz D9+Nm1tF9F97Jzyj9RVVa/uHKUNrAEwQsuKdYZ2FMCBKGxji77k8n6CtbwiU+tqmgH4PPg6 Ko25UY3eZy1RHVGQs0bUiUG1GXE9D23DxMv3Wl9hPKdvPmGsaj2suYebnQvMw+5/XplLixm uPbT7yxfbkZOFI2r1khLA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:GDfaRYICll8=:ger14bg2sn6SzIFhjtj/S8 V2Yq2N9JIfYLjTZyA1T94XaeIgb1TCnnmCyj7n4LDsh+3PTjmBcNeaH2s7XBcGUoJCO2zpinX oKUZC7B85DLJ8hhE8q2Qi6ynPxygebnSLlmTQN7AIIBtVk322X9jCN1Z4U5dOcRvL9ddaliAi iXHLi8UeuQeo2KH+lj0GgbsOiJILNRxvj3nopIMSUYPHzW0F6IwO+lD5FSdjryC5eRYOkxR4v syJFxnKM4KrkfHsSguqTiyYs4xDQlfRSEzdxhRLG2lXaamUmdtaHr9leY1gg/YmPTty40/Hws +nBOrunPw8A6svb8M5SvKv2yPE8djJbzAoIJE7HTtG+QfdqqeUW6miAXduXIOvWwzCJLCOMG3 jqS1IPl5CtDknevZ4W39LPTFtV8LjKLxeBmYBG0BZFYlaH9PFTaY/ellD69Xh3e8UjFxJbJmp jvte2uJfZxerraJ+ZFyzM9gzFPWj11001JXZa1nA55N3K7SJCM5/1CnRamMpbng0/8N0KLjhA 701N9HYESq7B52ZoSDIWX3lBBzhnSMPIWUHogJDDwCww83yQNj5pa90JOidhyDSLF+b4abZxo YSYzRYiY1jpC8VGQoTUlXLj7XnNESjlF4JzkiadJ4i7C9zZCpgu1F7hk2MfxXhoZaxKBRPm21 CAdKqWO7CsvXlWB5igoEZdbuL0skaDqb3u6SDPZ0xGwTnTiKkJ1t3my7FZdCVnwLN0EhjTcdd Rk0nVk0hIRPJxkC9e6Nq+T5uBbyrjB/uK/9TwzIm5NieYNM4g4Fi+29jkA6N85YGBlWulOreP opJRJjst5wUXCKMmqOJ1tmtgGJpOdsKvXcirTI621WfPgMZlVzZzhEuNsevffQQcJ3Xvxlq X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200529_102332_743510_4DB9BA75 X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 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 https://www.dnswl.org/, no trust [212.227.126.134 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] Subject: [OpenWrt-Devel] [PATCH 3/3] treewide: rename DEVICE_TYPE to DEFAULT_TYPE 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: , Cc: Linus Walleij Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The prefix "DEVICE_" for Make variables is only used for per-device variables with the only exception of DEVICE_TYPE. This is misleading as it leads people to incorrectly assume it can be set per device like all the other DEVICE_* variables, as has been observed in the past. This renames this (rarely used) variable to clearly indicate that it's not a device-dependent variable, and stays in line with the DEFAULT_PACKAGES variable. Note that there is also a (single) package in the packages feed that needs to be updated. Cc: Linus Walleij Signed-off-by: Adrian Schmutzler --- include/target.mk | 4 ++-- package/utils/busybox/Makefile | 2 +- target/linux/arc770/Makefile | 2 +- target/linux/archs38/Makefile | 2 +- target/linux/oxnas/Makefile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/target.mk b/include/target.mk index a2ceb7f783..8374de2ebd 100644 --- a/include/target.mk +++ b/include/target.mk @@ -10,7 +10,7 @@ ifneq ($(__target_inc),1) __target_inc=1 # default device type -DEVICE_TYPE?=router +DEFAULT_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd urandom-seed urngd @@ -53,7 +53,7 @@ else endif # Add device specific packages (here below to allow device type set from subtarget) -DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE)) +DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEFAULT_TYPE)) filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1)) extra_packages = $(if $(filter wpad-mini wpad-basic wpad nas,$(1)),iwinfo) diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index 01441d1e87..81dde74d0b 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -94,7 +94,7 @@ endif define Build/Configure rm -f $(PKG_BUILD_DIR)/.config touch $(PKG_BUILD_DIR)/.config -ifeq ($(DEVICE_TYPE),nas) +ifeq ($(DEFAULT_TYPE),nas) echo "CONFIG_HDPARM=y" >> $(PKG_BUILD_DIR)/.config endif grep 'CONFIG_BUSYBOX_$(BUSYBOX_SYM)' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_$(BUSYBOX_SYM)_\\(.*\\),\\1CONFIG_\\2,g" >> $(PKG_BUILD_DIR)/.config diff --git a/target/linux/arc770/Makefile b/target/linux/arc770/Makefile index 018d6e5448..d1f3e2dc82 100644 --- a/target/linux/arc770/Makefile +++ b/target/linux/arc770/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=generic KERNEL_PATCHVER:=4.14 -DEVICE_TYPE:=basic +DEFAULT_TYPE:=basic define Target/Description Synopsys DesignWare boards diff --git a/target/linux/archs38/Makefile b/target/linux/archs38/Makefile index 5b3650ef8d..891583b2d2 100644 --- a/target/linux/archs38/Makefile +++ b/target/linux/archs38/Makefile @@ -14,7 +14,7 @@ SUBTARGETS:=generic KERNEL_PATCHVER:=5.4 -DEVICE_TYPE:=basic +DEFAULT_TYPE:=basic define Target/Description Synopsys DesignWare boards diff --git a/target/linux/oxnas/Makefile b/target/linux/oxnas/Makefile index 750eddbcbb..10d05e914f 100644 --- a/target/linux/oxnas/Makefile +++ b/target/linux/oxnas/Makefile @@ -5,7 +5,7 @@ BOARD:=oxnas BOARDNAME:=PLXTECH/Oxford NAS782x/OX8xx SUBTARGETS:=ox810se ox820 FEATURES:=gpio ramdisk rtc squashfs -DEVICE_TYPE:=nas +DEFAULT_TYPE:=nas KERNEL_PATCHVER:=5.4