From patchwork Mon Aug 31 11:29:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1354313 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=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=VjH3UKnq; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4Bg7Nt506Pz9sSJ for ; Mon, 31 Aug 2020 21:33:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject: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=jgLEoidRgcaHkknDSnBeNl5946NFKtbaAgrGAsd0tx0=; b=VjH3UKnqOAe+W2ebJjHRSqw9bT l9Ey2spCBoyvnExWfPMcITzQebHo3N9obpetRmyI+N7lVIFRA3zXMH+NcrsUX7WmldTEZ5FGHnSTo UmPDrLABy4lJeIOOXVYQ3ob22lOzTUoGGGsejPgNrVmLJ5SxqEppPtDkHXNjA+dzFBBqQWcDp+E3x xHCXWuQV9Q9wsO9ArN6MHMTMszLsUHMPY0SRvvQygOvmRcWuC1Toe5/5EwMpiVijILeIW/nygYVsF 0kBJ3DIatbPr/I+VdiHV67wgZsANFekeEKqmYTqQL76xSFkcCS0OFgqjHZiqTQOZdYWMnqw44AAMF nZL5q1Sw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCi1f-0007kY-OI; Mon, 31 Aug 2020 11:31:03 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kCi1c-0007jl-C4 for openwrt-devel@lists.openwrt.org; Mon, 31 Aug 2020 11:31:02 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHEPI-1kPvQP15Cy-00DHui for ; Mon, 31 Aug 2020 13:30:57 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] tools: sort alphabetically Date: Mon, 31 Aug 2020 13:29:10 +0200 Message-Id: <20200831112910.22954-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200831112910.22954-1-freifunk@adrianschmutzler.de> References: <20200831112910.22954-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:D87YGVMgB0PSQR9u7Evp1225A/guRvSiDdA/EdumhrxSA/KeP0y HNmA9qCyevkxfWFgxcIjG+DPmiA8mlivgIVwBGmMB76BfWZQBxufPH5PE22UaNk2KimNkg7 KbDVQM2jg4dYrlyE6IOsGGGG3fApVa4OwFUFTZKD3zeJYa4jKkpNNgWkV4sVJCWeFeuqquz JksnPn6G/05FbY+dK9aVg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:M6X/wiaRv8c=:gOs46scOzR+ndNRWEN//2X VQO3StphmjTed5k+z03nWG3Ol/lCCNmsCMkS42ukZwtkKPd5QTIQSVA+emBqBjG0wSRbGjHbp zYiFBjcf3+nywbOJKqGNY27szU0XBx5fQOLqYPcTqnYL3iKeKZqJ6j8/Ta4azQLlCovKpRleO 86ZjbRXYxRZEw5wmnqhRiThdrRVE62yiAGoC9y8grP7q0DUHTLUv7Q4PNoAGxUffEgN4aEJGP uBeQ0GVJJidSaUNcpnNN7sbHPAVrfQr/LutXnHUV+vN0O21bBzGrbl3eZQYN2G19OWRRf9Dy3 2sY1j35kRm/dfTeGJ2AjA+tVvzaltM21maxkDP6p4Y2KUsC8L4BPRvdxZMLEZwODB8nIr8u0R K004LYPCzyGa1SneYx1gC4lVUsiM1NX29+Eo8zBsBc5WOV/+GW0ZjKl+Fil28lB+Pshil2mcG nOcnG/ho70KZVeZLHUR2QK+gpHleN42iZcHRiq0058Nd8/8Hp0jUDXqZxf5mGYTSaXuc1R0dv 7veYfuvlEifVZ7AKVhKV5mv9v4Slxo/0S+WjWOIuUCNqLyiohCpVGotXuFcnwdcWByKB7b6Me H/fjQjPTlNkfkgkVUjo7vRqmImRbk/CniVJMmPHQMtLK2dl5U128207mEhxFJWe8lJD0lOC7u 17tC8FLftOk3yaa3wdgheQ68EF1gH45PcHi0tTU36EEaV03KagV3f/X5ZvNman9IK3LfHgGzz vtuptGAkydH36FUfwB7r3KpQo30tpQfi5kt8+pS9ukgO4YewD/Svhmw3KxiZYyoKrZ9rtATSQ aL2mhrJPQd2WIT4rEed/eP2KkeKYFseCbzKfGCWNG81uBM2Zs17pH1Mj8PznoFgeiLrPMM+VK P/NNphXYvRtSPoULIzjA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200831_073100_703083_A4BEC555 X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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.135 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.135 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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 This sorts the added tools and builddir dependencies alphabetically to make it easier to find something in the Makefile. Signed-off-by: Adrian Schmutzler --- tools/Makefile | 75 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 3bd01ebaa7..65bec34c1b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,59 +21,58 @@ ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar BUILD_B43_TOOLS = y endif -tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat -tools-y += m4 libtool autoconf autoconf-archive automake flex bison pkgconf mklibs zlib -tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage -tools-y += firmware-utils patch-image quilt padjffs2 -tools-y += mm-macros missing-macros cmake bc findutils gengetopt patchelf -tools-y += mtools dosfstools libressl fakeroot -tools-$(CONFIG_TARGET_x86) += qemu -tools-$(CONFIG_TARGET_mxs) += elftosb sdimage -tools-$(CONFIG_TARGET_ath79) += lzma-old squashfs -tools-$(CONFIG_USES_MINOR) += kernel2minor -tools-y += lzma squashfskit4 zip zstd +tools-y += autoconf autoconf-archive automake bc bison cmake dosfstools +tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt +tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage +tools-y += mklibs mm-macros mtd-utils mtools padjffs2 patch-image +tools-y += patchelf pkgconf quilt squashfskit4 sstrip zip zlib zstd tools-$(BUILD_B43_TOOLS) += b43-tools tools-$(BUILD_ISL) += isl -tools-$(CONFIG_USE_SPARSE) += sparse +tools-$(BUILD_TOOLCHAIN) += expat gmp libelf mpc mpfr tools-$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini) += genext2fs +tools-$(CONFIG_TARGET_ath79) += lzma-old squashfs +tools-$(CONFIG_TARGET_mxs) += elftosb sdimage tools-$(CONFIG_TARGET_tegra) += cbootimage cbootimage-configs +tools-$(CONFIG_TARGET_x86) += qemu +tools-$(CONFIG_USES_MINOR) += kernel2minor +tools-$(CONFIG_USE_SPARSE) += sparse # builddir dependencies -$(curdir)/bison/compile := $(curdir)/flex/compile -$(curdir)/flex/compile := $(curdir)/libtool/compile -$(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile -$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile -$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile -$(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile $(curdir)/autoconf/compile := $(curdir)/m4/compile $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkgconf/compile $(curdir)/xz/compile -$(curdir)/gmp/compile := $(curdir)/libtool/compile -$(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile -$(curdir)/mpfr/compile := $(curdir)/gmp/compile -$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile -$(curdir)/mklibs/compile := $(curdir)/libtool/compile -$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile -$(curdir)/mm-macros/compile := $(curdir)/libtool/compile -$(curdir)/missing-macros/compile := $(curdir)/autoconf/compile -$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile -$(curdir)/libelf/compile := $(curdir)/libtool/compile -$(curdir)/sdcc/compile := $(curdir)/bison/compile $(curdir)/b43-tools/compile := $(curdir)/bison/compile -$(curdir)/padjffs2/compile := $(curdir)/findutils/compile -$(curdir)/isl/compile := $(curdir)/gmp/compile $(curdir)/bc/compile := $(curdir)/bison/compile +$(curdir)/bison/compile := $(curdir)/flex/compile +$(curdir)/cbootimage/compile += $(curdir)/automake/compile +$(curdir)/cmake/compile += $(curdir)/libressl/compile +$(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile +$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile $(curdir)/findutils/compile := $(curdir)/bison/compile +$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile $(curdir)/zlib/compile +$(curdir)/flex/compile := $(curdir)/libtool/compile $(curdir)/gengetopt/compile := $(curdir)/libtool/compile -$(curdir)/patchelf/compile := $(curdir)/libtool/compile -$(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile +$(curdir)/gmp/compile := $(curdir)/libtool/compile +$(curdir)/isl/compile := $(curdir)/gmp/compile +$(curdir)/libelf/compile := $(curdir)/libtool/compile $(curdir)/libressl/compile := $(curdir)/pkgconf/compile -$(curdir)/mkimage/compile += $(curdir)/libressl/compile -$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile $(curdir)/zlib/compile -$(curdir)/cmake/compile += $(curdir)/libressl/compile -$(curdir)/zlib/compile := $(curdir)/cmake/compile +$(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile $(curdir)/lzma-old/compile := $(curdir)/zlib/compile $(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile -$(curdir)/cbootimage/compile += $(curdir)/automake/compile +$(curdir)/missing-macros/compile := $(curdir)/autoconf/compile +$(curdir)/mkimage/compile += $(curdir)/libressl/compile +$(curdir)/mklibs/compile := $(curdir)/libtool/compile +$(curdir)/mm-macros/compile := $(curdir)/libtool/compile +$(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile +$(curdir)/mpfr/compile := $(curdir)/gmp/compile +$(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile +$(curdir)/padjffs2/compile := $(curdir)/findutils/compile +$(curdir)/patchelf/compile := $(curdir)/libtool/compile +$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile +$(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile +$(curdir)/sdcc/compile := $(curdir)/bison/compile +$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile +$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile +$(curdir)/zlib/compile := $(curdir)/cmake/compile ifneq ($(HOST_OS),Linux) $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile