From patchwork Thu Jul 23 10:29:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1334701 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=vIq0ztte; 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 4BC7tw2hzDz9sSJ for ; Thu, 23 Jul 2020 20:32:24 +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:Cc: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:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NwtarCZ72i34Tu6p6YneMec9z7ukWRbX2/jXbXJcgr0=; b=vIq0ztteld4bQGzXNg4Yd1TjM gIkBs8CDewXQ16Brr71gAnxnIx2g+Fe+0buFhbRIFf2uIb/U38iGE/EZOshG+6o4b233sExW5T0QX 6Xc/SGVKLDjMncPXd6SJD+7uPOeyIDK4jcnvn/QIPmZ6eSbegArzT1lxrdWk3g9HlPhhCZ1YHkCTV kqhtmadFXViEieht9Rr5GviUUe67Ev6gXBWLIbNN4gOHB8YB+Wdvatv5KJ1WvmVPGy021gEANCgLR R0v2mI9mamI4wf+7BgEczbB/vLkZcBiPHtvh0L6nmiaV93ESyw4CPgexIcHZfWUl4G+uk50pFu977 KTx/cgwEA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyYV4-0000Lv-LV; Thu, 23 Jul 2020 10:30:54 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyYUy-0000KW-DA for openwrt-devel@lists.openwrt.org; Thu, 23 Jul 2020 10:30:50 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Moex5-1kZo8B2nGb-00p1pc; Thu, 23 Jul 2020 12:30:42 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 19.07 2/2] make_ext4fs: Update to version 2020-01-05 Date: Thu, 23 Jul 2020 12:29:56 +0200 Message-Id: <20200723102956.58711-3-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200723102956.58711-1-freifunk@adrianschmutzler.de> References: <20200723102956.58711-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:wymyLOCq+RzKYBNoxdVZIbSHKcbQKpbGHJN9DYzDBkLR4BGv3Cv 5uDtp+ekPBXbXT3Uuofs1JpY1l+41Lz/fUaCt+esTI1whBfJHQT0ST/kjge32id5k1mQ60n O6gnjTgzQbMau8hS8PAhsGUJH2biSD2fiAGE7ye8HgZcucGnxgaJt0hTzXXGnDMkhkTl2+W EYIMIvheDs55V+Ajr+SIQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:31xAMpbu4Xs=:sPvJZsUxQ8g6cfO4DgtXTn pCu98OKAnvgHvlWGEsbMPyx92BX/LAOz5h1EEYUyit8FT2lNXrby7K93pnox5EqaG7N5YxC6H 28wMtghNFz/RXpP24ygheZphOLVlaQh12siQ9lYBidUih5v+a46Z5xyR98p8sQJgpEiNJBiMv yBj9YpiKObjIatIHqLOnkRFYfnD4IyRIxiufxVH1qQBnQDfWrwKzA3xANvzPeZjpFRYC6fp6m i2kmJJwXYiUGMOYD7lzWXJ813T6v4bozckjASVKBT0j1e6Xy1oBMXXajuXGxbO9LHFHvJm18H YLuGwSIfe3QWyHTOHMtpc9ReGhFJDpba/gaIlDiRyBXruSlJg98A6F/DHrzpyIA4NjsiGZGkX 5QMxrz0i6x0vNt2fgMYi+xcqZPhTRp1M0DATscvDLPuD6mhQMRIkYpO5WgEUcNIpUVNmlBFxZ Kp1yGrCj8glF/X7GpZ8w4b0YAN9qB/xY8dwWa3XEMrzJyLeCGNl9aQ5Am4iWNV6C+62hkyYtT 21zTaiLwNXxTACcq8ks4kNZWDmVwODK3SpaJL1gdM2hNncL6kAVrgux7/OoPPQdUz/D9jhYmm Z25pfvIrmo3IDCS6i+ckivhHnW45oLKPRHaF6HLg1OO/2fHMwRFHCW9d1UNWBqSS3AeQ9oDIG Xif4Td1yQhZ7kRM+lppQJzJFa+8gxYtqdPDvOyIHFwLVRuA92ta3c2f/6zM1JC480u8lpxQAF 8LXZgOHadcceKQCTAZu+tps4zbIL2Oa+n/PqiF1e260Owew7+FYC4ciOxYk4HD/OljmTkOhpH yBDbOxsitYYndNqMZFA97M8D7IKCU4I1knYbuqBFwAbsm+SyGTUguYYHenXuMyf0C+z+BveNc MOCCMzZFdchIKc65d9Eg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200723_063048_709381_947D82EF X-CRM114-Status: GOOD ( 10.13 ) 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 [217.72.192.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: , Cc: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Hauke Mehrtens 5c201be Add LDFLAGS when building libsparse.a ec17045 make_ext4fs: fix build on musl systems Signed-off-by: Hauke Mehrtens (cherry picked from commit 271d0c825ba5821160e4a516497796fa342c2eff) --- tools/make-ext4fs/Makefile | 6 +++--- tools/make-ext4fs/patches/100-add-ldflags.patch | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile index 03db1917fc..77031cdce3 100644 --- a/tools/make-ext4fs/Makefile +++ b/tools/make-ext4fs/Makefile @@ -11,9 +11,9 @@ PKG_NAME:=make-ext4fs PKG_SOURCE_URL=$(PROJECT_GIT)/project/make_ext4fs.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2017-05-29 -PKG_SOURCE_VERSION:=eebda1d55d9701ace2700d7ae461697fadf52d1f -PKG_MIRROR_HASH:=c52e14101d7de89292a0c8b30506839aca3164603a20f8e491e42103083b9d8c +PKG_SOURCE_DATE:=2020-01-05 +PKG_SOURCE_VERSION:=5c201be7d72aff735da27e17c29852e0cefe3e52 +PKG_MIRROR_HASH:=a9b74b7b95acc84a5a5c33d6acf493faad8f161caca3180734d9bd383c9d823f include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/make-ext4fs/patches/100-add-ldflags.patch b/tools/make-ext4fs/patches/100-add-ldflags.patch deleted file mode 100644 index d9ce47bb80..0000000000 --- a/tools/make-ext4fs/patches/100-add-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ OBJ := \ - $(CC) $(CFLAGS) -c -o $@ $^ - - make_ext4fs: $(OBJ) libsparse/libsparse.a -- $(CC) -o $@ $^ $(ZLIB) -+ $(CC) $(LDFLAGS)-o $@ $^ $(ZLIB) - - libsparse/libsparse.a: - $(MAKE) -C libsparse/ libsparse.a