From patchwork Tue Oct 8 01:02:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173041 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dVDV8nxy"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EmQi5H9T"; 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 46nJww40sNz9sPT for ; Tue, 8 Oct 2019 12:02:39 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=D1cyxt+6QzO4ov887UrZChdgD7tgNY/pMISUum4l980=; b=dVDV8nxye6ZcVL F133vayeV075U85FRLf6lB0eM4wpQPJfShSHRSVz1IhIR3suI/w27Cude53f6zUQwxvdDNwA/UeK9 ZQcqaOnSbkN7ew5MrJVh5KupD9NjcnMmz0bmdg166yyyPWvOAGV6d9nnrsKONkjCCqfWeKyzHbkEn G+Kq50d2gtX/W/emTc3Ho8pT9HejzUEQH4czU0m1TYq8zXCj0z79nknEW+Rv7yPl1QTyezy009zS+ Tjt+QF/KV4AX86ew2vpemwBP5SrfPriJmeZ2tIFsI06ShCGlppPoNTG3bWWnaqtazgpd0Lcsab8u2 d/HnO3wPRH78nQ1nVgLA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdta-0005n0-AB; Tue, 08 Oct 2019 01:02:34 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtW-0005la-EP for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:32 +0000 Received: by mail-pf1-x444.google.com with SMTP id q12so9737651pff.9 for ; Mon, 07 Oct 2019 18:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=NzmQ7+z11v3r1CVbIdxzu4dbsI14WgNHNWjEBJE0kzg=; b=EmQi5H9TQiCw5Htn+g+JiWkcszR2IrsMWLa1cVlKSLFhSbkz0fkFsENBUHxR43Rly9 SqWTKm7h23vwVmIOjqD419xucRvbT+L6VsEIyFXZf9NhNuIMov9O57IBBXk4cwz7f90O vJJulq342GfVBNLFuaLhPd+XyGOr+qvNuwHfQR09y5bYz7bvD62627JEwKgNigFD8OQr jX6maoRCFqmAAYWgXWX9h7GDZGkmmnsjmRLteUiOQyrtPqJkaZ80+6InWbaP5S3sX+de J7nJamNtLhGLJXnjgOHsOuGuT9uaRK3XotWhCO8vs9/y9LPyKBPAj+Kheyl01s0l+0aj tIsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=NzmQ7+z11v3r1CVbIdxzu4dbsI14WgNHNWjEBJE0kzg=; b=uLS54OQ5ed5piL18LDW+FnSHhrW1bUT+MrjomG4bV2MIw5eljBOWviGHb3+a+4DLFL z/XKFqBWj3Fhrh53WPlPcezb9/Qqw7AzCHU43Uz87mX0igRI1NMyhsyUPHX7iTIk5jGr pP1CI23bzV5KHtRt8xKCkEW18lelTbNBEOzGIwpnfgcvZmuNt8ADCBW0J7KmKm2KHbph MjdT1FZZ5bO5P/MTQCKhJL7+Prx3HPvfyb2fh7TB7r89WypIu2LOjs6cIHAiLQW9rszy PtHKNZ2Q46KeZhjWaimN/ddA2MtKeuIXt9Ka0O5YIKU0yq5E5HnZAsb1OmqKLZo+Ne+m h40g== X-Gm-Message-State: APjAAAUtVy/y7z5THeDcB47HyPpEpTJxZn9BBQXydVBOpu0Qx+MLQ8rM azVJjjbnDIBrbFQ4c6kyGxX1a0bD X-Google-Smtp-Source: APXvYqwUD5TRTOiVDd416vNaHd/uKSybdxD/2+yeiwLSFQSNp1/yK0vDGUmWphza1vEnshT4851/dw== X-Received: by 2002:a63:1526:: with SMTP id v38mr34378562pgl.419.1570496547962; Mon, 07 Oct 2019 18:02:27 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:27 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:18 -0700 Message-Id: <20191008010225.8822-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180230_479390_DE135851 X-CRM114-Status: UNSURE ( 7.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 1/8] ncurses: add cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov * Properly handle ".exe" suffix for cygwin. Signed-off-by: Alexey Loukianov (bumped PKG_RELEASE) Signed-off-by: Rosen Penev --- package/libs/ncurses/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index e22eb2b893..07e0fb5c5f 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses PKG_VERSION:=6.1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -26,6 +26,12 @@ PKG_BUILD_DEPENDS:=ncurses/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk +ifeq (CYGWIN,$(findstring CYGWIN,$(HOST_OS))) +EXEC_SUFFIX:=.exe +else +EXEC_SUFFIX:= +endif + define Package/terminfo SECTION:=libs CATEGORY:=Libraries @@ -167,7 +173,7 @@ endef define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) libs - $(MAKE) -C $(HOST_BUILD_DIR)/progs tic + $(MAKE) -C $(HOST_BUILD_DIR)/progs tic$(EXEC_SUFFIX) endef $(eval $(call HostBuild)) From patchwork Tue Oct 8 01:02:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173042 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="guf6BSaS"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SiYFUX56"; 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 46nJxK55K0z9sPq for ; Tue, 8 Oct 2019 12:02:57 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=tyEUIUcD67NWQOTgAHRVjLC9lSvvKH9NhE8ftMluDF8=; b=guf6BSaSrvr5plPeG8BIM6ZO4L yCOeX9RER0tySfrZsj6DM3c4LwPSGNq++Ua1YiUebSDmdNy8ibg1JsS0LiXY93IXI6s/+PiCjVy9T PLVdFi1LUowcW2TN2wg91XhN3DtAM0W3kOn8OO2pul3FbvxqGcsxDt6QcmrdtssairToYOqqOIIFl D+oyDdp7LFUpC2p5eUNl1BBQtYQMW+uo5KnDa9F+3r+kkczEbl2ah8k0UR056UIaR8DGctev8wnFt bUX92Y9/s6u+HQM4f4Qs8IOH+4NSv5TKwWKuqSEVZ4rjWBWHVgUzcSmrpdzSTDsvhTzONHXyPv7bV EcAqvWvw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdti-0005x0-OC; Tue, 08 Oct 2019 01:02:42 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtW-0005lZ-Co for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:32 +0000 Received: by mail-pg1-x531.google.com with SMTP id d26so9263478pgl.7 for ; Mon, 07 Oct 2019 18:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=nyIISXg/EGAmGoLbEGF+8k2+rQY0LPt6G7+qUvM86XI=; b=SiYFUX569PX0+5/87nHhPr3ZQpQySp+WclyvanesyQ/F87yk5iDUweqMLkFqs+7dDv Xcmilb0+r/VlV8Z4Trs/JfVi7onyfcDaKFvnIrQZkctcz7Vh2pgPGeUqA7/uqY0Yz3UD 69dfoNqcTF4p752WmXSHG3Bhd9+peDB79pKVDfUkHjJx6chh4rPHDRO0qGGq42Juzspj JT0MMciswYFF+v6PFjmygcgWd2uvzDQW5+V/6TbAyBuEVuAknvjbNVFH/pVZl1a25MYH rreBBGCdNPhuuEHIiD5V3ix4MYtOb5QNmKwnZUEN9asIiHyRsjBHDQ1H//XoOw5uDves 3CzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=nyIISXg/EGAmGoLbEGF+8k2+rQY0LPt6G7+qUvM86XI=; b=gjlWqu0/pxBryUgO1N126XeYpP0y1bwSYmzVRuZyNG+Q4E1bCctBJa7cNz8Ox9ZofQ 8Wgrw8OKvsd8UV+rK+JnHzgcfOe/fqMeV5Wr4tsvaalUmwCQvq6dag1vXI1Jm5Bbzpqt j9VxbN5EV1WBGIjx+HfsZx2gNmLFEQ+cSh35QqW4HVni0H9Wm2PRWGPqcWfcsOSgXGEu XCHGKTuCYEx0NuZCviu4Zhgds7jcjLDzBzfn2l+SpT1C0ypvkigA9fUlYz1d4J54H+dt 6oB1zZiDIm5ovpb88z0ThVwysRXSRg1jsHtXCK1XnrCXqw9ab4/0+X7L5uZ5Z+Cs9yUa 80+Q== X-Gm-Message-State: APjAAAUJLKHTjmVvEDaZ3d88nZucyJuyUA+RLt4tSUXMVEmKsXQgVA+0 LHMHIu89T1tUrtxXrB/hjI0gJEke X-Google-Smtp-Source: APXvYqxdBXX80du9lTLKuqAiAoLU1IrPatqvH/EjeXSPVbydeji1IljfoqnqzQ2n7y0yUaNpnSOMZw== X-Received: by 2002:a17:90a:c684:: with SMTP id n4mr2448975pjt.33.1570496548819; Mon, 07 Oct 2019 18:02:28 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:28 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:19 -0700 Message-Id: <20191008010225.8822-2-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180230_463329_EE6B352A X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:531 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 2/8] scripts/patch-specs: add cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov Fix patch-specs.sh to also look for "*-cpp.exe" when searching for C preprocessor. Signed-off-by: Alexey Loukianov (Small title edit) Signed-off-by: Rosen Penev --- scripts/patch-specs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patch-specs.sh b/scripts/patch-specs.sh index 2262e218fe..8c6c0a9655 100755 --- a/scripts/patch-specs.sh +++ b/scripts/patch-specs.sh @@ -11,7 +11,7 @@ fi echo -n "Locating cpp ... " for bin in bin usr/bin usr/local/bin; do - for cmd in "$DIR/$bin/"*-cpp; do + for cmd in "$DIR/$bin/"*-cpp "$DIR/$bin/"*-cpp.exe; do if [ -x "$cmd" ]; then echo "$cmd" CPP="$cmd" From patchwork Tue Oct 8 01:02:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173047 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LNIf6q0k"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LxxN131/"; 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 46nJyZ5fkmz9sPT for ; Tue, 8 Oct 2019 12:04:06 +1100 (AEDT) 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=Bz+UlFsdg1CMAi8vVe373XNNMnelNlIWl7T2nZXYsds=; b=LNIf6q0kFnyo8PiuCeye1Bg1CU a2CW2t4lThpP7O5MoMHsjevwzCgzhpE4gh/9iePpCgHTTklmQPTtxCjCtxmu2Ql0PsAfX3v5Iwh7H Jeyc+RbrvXSjTpK1VnXPkSGvdvwHFwCePnwBMtfyLRoT2QbQFN4XCz8EG06Cueey4vk0tRhRkBl1G X2SiDkbljsQEeFm96uyA3F6szeztSUFW53HmsvVH3DHCxD4MVFDExoMlEmJ+oHqxUJ61MQLa3RZop L+RO7lJrqpyirJdO7MGMcnZnQjeywRmu+u7N6j/FEDc32v0i5kFrJ/RQNBkHgRVBX28NebZyvTDnp up2PrnAQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdv2-0007U7-TZ; Tue, 08 Oct 2019 01:04:04 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtW-0005lb-S3 for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:36 +0000 Received: by mail-pg1-x534.google.com with SMTP id z12so9249585pgp.9 for ; Mon, 07 Oct 2019 18:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HjkYFuVMlxwLNI93iVzAAFFPIxqf2OgmC0MUG7PXYrE=; b=LxxN131/HUwAiM868sZXvFfsWRYh8iuOrmEUQ3OjkFXkZKD4lIWesBFSv2eBhNmV6o SHOjsSd22PqrLeycGSoSx0/71X+R1dh03vpck1L0a6nc3zqQLV+6KUhF5PCfDR4t22tc dld8eIi0KZcreXNxfmB6GAiymDena16k3ycRHwMEKmif2j9bGs76Gic4lIKJ9zbKSMiW f+916SGHHMKNH69aTBj2hG5qxnCcr99/se0Pq0M/58P/8LR5v/AqCzv3eFI1YcrPBZWI C0Zvv6/oLvdMAWIJDf4TsxUJrLq5FAFtXwYsWRJLj5+/5JumcH7QJHmbm8ETW4zEEX1X wg8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HjkYFuVMlxwLNI93iVzAAFFPIxqf2OgmC0MUG7PXYrE=; b=jTPMpvbTvnUE49U7aMhLxzebTwEgP94nlnPTt7EEL0ESGKIEkJgX6h6qtVsNBtmDy3 DgYBlkfIYqdVOO95HHgxelBKMw0O61b5rSGgre+acLgmND8oIh64yG31TOEBRrykp6Eo /9h2DS3umH9XSweIasebT6imlCQIaAezK/fTOGiYpFrP+yS46KNYVr1k7Lu82AxwbEur KbvH63wz4aBYVO8TQRqmH2tpZTJwR4cNegODcvVw2GFS+e+Dce9R+v17tXQ68Y+xHebQ Q6WSiGsPbuGMHPnZI16n8GDORvvKW15d2Akw8dpgDQEoVt0+0TJ8mWiDe0XhrKSDhLVH 9YVQ== X-Gm-Message-State: APjAAAVAGqBm+Rbuvrq5exits7YkwH8wpeHOsnn20yJsr6CyIni4P79a mPqb1NyKHPeYT7WUxpPrcMDA2PYh X-Google-Smtp-Source: APXvYqyzsP9+VizaOsNglx96nb0qUMoxuEoHm9nIpXBqrgjWDd5rIq8wvYe+mCJEA7r2HiIcSSBLHQ== X-Received: by 2002:a17:90a:17c5:: with SMTP id q63mr2463711pja.106.1570496549628; Mon, 07 Oct 2019 18:02:29 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:29 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:20 -0700 Message-Id: <20191008010225.8822-3-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180230_904910_2708BE37 X-CRM114-Status: GOOD ( 14.51 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:534 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 3/8] tools/dosfstools: Replace iconv patch with upstream submission 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 It allows more platforms to be able to build it such as Cygwin. This is the same patch currently in the packages repo. Signed-off-by: Rosen Penev --- ..._CHECK_LIB-for-iconv-library-linking.patch | 27 ------------------- tools/dosfstools/patches/010-iconv.patch | 26 ++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch create mode 100644 tools/dosfstools/patches/010-iconv.patch diff --git a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch b/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch deleted file mode 100644 index ea93320821..0000000000 --- a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1c6c135ee15e449c1bf2e76d5307f83a3a1d7425 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= -Date: Tue, 11 Oct 2016 12:07:48 +0200 -Subject: [PATCH] Switch to AC_CHECK_LIB for iconv library linking. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -AC_SEARCH_LIB doesn't work properly for openwrt/lede when building dosfstools -as a package. - -Signed-off-by: Álvaro Fernández Rojas ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ if test "x$with_udev" != "xno"; then - [true]) - fi - --AC_SEARCH_LIBS(iconv_open, iconv) -+AC_CHECK_LIB(iconv, iconv_open) - - # xxd (distributed with vim) is used in the testsuite - AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) diff --git a/tools/dosfstools/patches/010-iconv.patch b/tools/dosfstools/patches/010-iconv.patch new file mode 100644 index 0000000000..04d402bf3b --- /dev/null +++ b/tools/dosfstools/patches/010-iconv.patch @@ -0,0 +1,26 @@ +From e18bcc65d5772e518c6496b439bad8a986f7e434 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Thu, 20 Jun 2019 15:18:19 -0700 +Subject: [PATCH] configure: Fix iconv check for cross compilation + +AC_CHECK_LIB is more friendly towards cross-compilation. + +Added check for libiconv_open as that can be used when the libc lacks iconv. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 07e8703..1b09964 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,7 +75,8 @@ if test "x$with_udev" != "xno"; then + [true]) + fi + +-AC_SEARCH_LIBS(iconv_open, iconv) ++AC_CHECK_LIB(iconv, iconv_open) ++AC_CHECK_LIB(iconv, libiconv_open) + + # xxd (distributed with vim) is used in the testsuite + AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) From patchwork Tue Oct 8 01:02:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173043 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="P415/jWu"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FeDDMnry"; 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 46nJxR4hQHz9sPT for ; Tue, 8 Oct 2019 12:03:07 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=7TWx0sfg273MUsqKbYlBny7fHTqihQ0Y41wHvDKRVI4=; b=P415/jWuTE4gKQ5SOMmpvXqQ1b FumAe1zeNJsclT9/HZ0zHhxMj/ztSZ7wTOCnM9VvKYQSo6IkiEfifODZt/tQFeeLdoQZJgUMDtohA b8xjaDkazw46EXg9W8tEBff4bNk99AZf+Eu96pSPwm0PVnhZTcMvqUlR1t1ebjKdH5l4UemApZs9S ANHeOC7bVmp4m4PGk1I99qFUR1tUr41LngGxwaoHAMsbd9Md0fDp+sFRstdnQXwLqtILaZinmFuHB ZvPxvkIuDMmCQVya1lVRVYHZPuVMqkQc4Ph1CRsV6fVCc+q/DaRtfpvM0Atxynw1gNZ6vdxTvJ+GG fB86owMw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdu1-0006Eq-Ii; Tue, 08 Oct 2019 01:03:01 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtX-0005mB-Qc for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:34 +0000 Received: by mail-pf1-x431.google.com with SMTP id h195so9756257pfe.5 for ; Mon, 07 Oct 2019 18:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=xzcr3ejfFd0iQUyKgURR2jI6sjyOzSiWrwq/XRAc4tI=; b=FeDDMnryjr6ZZTBFqdkDl8M5Zz26HvYJTZaReFcVAy/w/NeEJPv/0Xe1Ga0muyy5Db B9sHNhE0pccKqRXCyUi0FOAtyoASCf0IvOMCY2cuosU2RXBUxHAHf+jAt1iPFVxwXm+C 8yCZ3lpj+QKr0vUGxwiCLGBmzvbySDvR0oqKS/9UzqG+IggmUcUVIjcDAfIu7mHQhw0w PF0f0ZI5hN991ddgEgEpon9/3YUhWTavwGOwvMOmG0B9qdvFPGhGqt8T6IjbqAE0QJ1U AxomXedUFnOT/hTUWLSLgQZXPcCC1rd/lsznx61z4h9u+Whl/5gw+8tYM4bfO7viJhWl c7jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xzcr3ejfFd0iQUyKgURR2jI6sjyOzSiWrwq/XRAc4tI=; b=Ffi1LgBR6hwxTtZ1+84w2FdUMe4DVs4AbRIR5pwE/pKrGEvryW3i7JKyAWPgpcPio/ u9oB+avgoZF3IIAmURHBD6j7a5MeFhkOZZrxJ+Y+wJh8DhJVyoIHkYq2SENLsXhHRNP6 WSv+ySfcYM/QXhA5ccy/87cfGVWPLxsriYwrngMWXl5n1zgnSl+IK4appkjr/QHb/SDY aaJp2DvaZc7IyQzSuQwC9rOBfoEQck0+ytmfSbRJGjQ+67CWKdV5mYuYcMhgfhP4KtjO FS677TbU33XXFSWWPqwbyLqlZG1MnQ8mCZPZz07HS6mizK9eojWnZ/CQgkiOL8/SBumu aHFA== X-Gm-Message-State: APjAAAUlcSOE/YLJ+wKmBAMT3Jslp5rNNVd3Hj7LN52QzgvXenKUWbjY d508TNChSLT90Bn/asFuZ0iV6aV4 X-Google-Smtp-Source: APXvYqwzh+nRIgXZsXkBSDAhVrFdpcrLiPyKlo+PozL4pIAwvz6kJ/jCLpHSB006UL8W1ZgbBFgjDQ== X-Received: by 2002:aa7:96c1:: with SMTP id h1mr37374059pfq.111.1570496550651; Mon, 07 Oct 2019 18:02:30 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:29 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:21 -0700 Message-Id: <20191008010225.8822-4-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180231_854878_C8D78D03 X-CRM114-Status: UNSURE ( 7.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:431 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 4/8] tools/coreutils: add cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov Properly handle ".exe" suffix on CYGWIN hosts. Signed-off-by: Alexey Loukianov (rebased) Signed-off-by: Rosen Penev --- tools/coreutils/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index e338796053..8de2cb9894 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -16,7 +16,13 @@ PKG_HASH:=8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b HOST_BUILD_PARALLEL := 1 -BUILD_PROGRAMS = date readlink touch +ifeq (CYGWIN,$(findstring CYGWIN,$(HOST_OS))) +EXEC_SUFFIX:=.exe +else +EXEC_SUFFIX:= +endif + +BUILD_PROGRAMS = date$(EXEC_SUFFIX) readlink$(EXEC_SUFFIX) touch$(EXEC_SUFFIX) include $(INCLUDE_DIR)/host-build.mk From patchwork Tue Oct 8 01:02:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173044 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JAib+xF2"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OX9ABSss"; 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 46nJxv5p1jz9sPT for ; Tue, 8 Oct 2019 12:03:31 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=93yk2gEiH0mhXYGh+9KsjoBQjP8C0NMa2UGbr8dRJvA=; b=JAib+xF2De+76ak48VJpFxMUJM h9AGEsXB4pfkGDquKn/oNT1Tu76VH6wlstzYhmrVvL3Wjee/7xKyUcVY10HD6JmYbEwxBmEewWq9n UbwTCplK7G54T7NoImamd//ooogbKAJ/2PRxMTMELJm+FeN7VkcMXdhB9e/Iaoxqyz+yz4FJqdBr6 ecVWv8j3VdLR8mdihuHdgSBtZMLy5raLVnM71vLw6NYBTZ+6bwYT1TP2WFcoCkIVOP2X/axihJMZD WuvSDUB6srWiLHpQch/cVWKuH2wHiH3jKIPb6HsDL2ofbh8aClFhp1B7zcqE7bZAEa4nY4pcoPUxP qfva6VAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHduI-0006VJ-1j; Tue, 08 Oct 2019 01:03:18 +0000 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtZ-0005mO-7X for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:34 +0000 Received: by mail-pg1-x532.google.com with SMTP id p30so7184314pgl.2 for ; Mon, 07 Oct 2019 18:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=1c0BPimiDiB0cA8s3X9lyQvf2+q62mBCMbLPejqn2FA=; b=OX9ABSss7PLi9M8QURIapEVwNDAJ2uj7m5tJrCyfo4vm9Fs9BrDyXxaOfHrCzbsnyh QHhWL0qPj2Apza8/RwvJuuyCZ/9z1/ZVbdltouTgKFZKrigngAtKjSd1XcOegeBrVLdA K1R7PDJL6rv1vfFGsFRqurvLnrOrGv/v/XumllOIFj74KgLkNRW6Vdah1YSDa2TqugtU rKZguSEWP/twkO4/e1qCySGrP5dKxinZrsNhu/gQ+oExXHzh909D91H+Nyy+Zd/87f/S 0oLXxp6xISLQbJK0a1P5iTUekHLAuBKRuxQh1b0dyvPux8RAwYVNMR6N9O7/QdXL/xHW gpNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1c0BPimiDiB0cA8s3X9lyQvf2+q62mBCMbLPejqn2FA=; b=S8JsAp1MZ787GAFcGCnhiBgacoZl2kHcN++LXseDRZia1p7uqzbrWIs9o14VGKzMVO v34JLsR9H4QWMzShoGWCvERrIENgUwC1h/n0cABLaFWWbfnDPEMod1rYkhncNDbu8y/B jUAX45GQcrRFHH5qVDzPkjUNotnW/Cl5td4qDgLFbPgnknwg5Id81P+syFkpiysS5Sba G6nAVaZMXjVJ/J3IxZta2OryHqqvA1IDkqokufZgL+DBwFP4FaMKM2JILm/z+4WZr2t9 bW23/rZgc1Xe+1aEVPpf0gPKw7O8zPJVsTWYFLMHk0Jj9KCKXSFFQdJs8AQJGNR3Ugjs 2W4w== X-Gm-Message-State: APjAAAWsLw5C0sYlCvwfCRzi9mi+eYyXvVTowvFor/Y3tMG+YkG6U1Q/ cnUvy+6CSAh7Xa7jBOpUGPB7sdQj X-Google-Smtp-Source: APXvYqwfpo5BhIV+n6h2xcP0J/29+TviRlo6vMLmjGFS/P0evi6CVA2zqcnS6+ec+5HsKuWjLWGTJg== X-Received: by 2002:a62:e106:: with SMTP id q6mr35328233pfh.14.1570496551973; Mon, 07 Oct 2019 18:02:31 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:30 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:22 -0700 Message-Id: <20191008010225.8822-5-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180233_267140_E64ED8DC X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:532 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 5/8] tools/zlib: add cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov Incorporate CYGWIN zlib patches into package. Signed-off-by: Alexey Loukianov (replaced patch with upstream backport) Signed-off-by: Rosen Penev --- tools/zlib/patches/010-cygwin.patch | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tools/zlib/patches/010-cygwin.patch diff --git a/tools/zlib/patches/010-cygwin.patch b/tools/zlib/patches/010-cygwin.patch new file mode 100644 index 0000000000..f6b21dbae0 --- /dev/null +++ b/tools/zlib/patches/010-cygwin.patch @@ -0,0 +1,37 @@ +From 5ff989033e8b839b80ce716a1452acf7664e2ff4 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 16 Jan 2017 09:38:36 -0800 +Subject: [PATCH] Cygwin does not have _wopen(), so do not create gzopen_w() + there. + +--- + gzguts.h | 2 +- + zlib.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gzguts.h b/gzguts.h +index 990a4d25..6378d468 100644 +--- a/gzguts.h ++++ b/gzguts.h +@@ -39,7 +39,7 @@ + # include + #endif + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + # define WIDECHAR + #endif + +diff --git a/zlib.h b/zlib.h +index 21636c25..5daf4f28 100644 +--- a/zlib.h ++++ b/zlib.h +@@ -1893,7 +1893,7 @@ ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int)); + ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); + ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); + ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); +-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO) ++#if defined(_WIN32) && !defined(Z_SOLO) + ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, + const char *mode)); + #endif From patchwork Tue Oct 8 01:02:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173045 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="d1h36HjO"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kgqHBk8J"; 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 46nJy026xfz9sPk for ; Tue, 8 Oct 2019 12:03:36 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=qL87U5V3HPw5i7nH27yF1sNF/S9rLor8O0Uh4m6i3NM=; b=d1h36HjO31jA55moAgE6hf+TAo UYH9LPGAmLwHBxqnBosJk7IVtgLIaXe+ihOD0ILDNQZUlopClO4dIpeB5hnoSnewvab9oEKks+89F um1kSST2aCrf8mx7iRPVjpqTTLDYHEeXviKPUPv+Km1qFQGc6BLJP662g384P1s68Zr3ngqCfDRdt 4aX1608Yj/x/AJPNsipte9U7paW63xPIHJXHNqWog8VTDQiVDtgG9pqpYuOiT6BJWhrsmBtxg6TSl n6CZSQj72DIDDwIJcDGHir8esO7/7+g/VkMcpxjuhd/qmxrBcnY8vjUqIxb9psFNt5XBzU19ZS9pt 76PrWclA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHduX-0006wY-PB; Tue, 08 Oct 2019 01:03:33 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtZ-0005mo-Mj for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:34 +0000 Received: by mail-pf1-x443.google.com with SMTP id q10so9790544pfl.0 for ; Mon, 07 Oct 2019 18:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=AdDKINR2WMY6kHz3IxEDSNGQrQBAX4T451uo+JB+stg=; b=kgqHBk8JBuo+oXS3IFYe0v7iSjaWOW3uhVDIg8ys+H+CJQWyGacyQ4s5mQnO9KmX7u vUwXVofvZGpnFnvy7KgXMrW8hfd6Eu6tlL5qxfE4FE5ozaulrqxo+fO0TFnCa6s2B3WC x9OTVzSxiTyrk3PGADDTiY1oFS9h3Q0bCqIfgM9LRE5ZdfuClUTwqx3LUequsl3YFDHR nqPeYr6RvA2rZaZD9gycDHNDdsypF0kOfW/NofR6aEJ4liqov7p1Cl2IGvxFTLjPl02y 9RuQnER3WWtuW2nBz6nlm2AsisOOr7Ze77eZ8Un7VLneR6XjM/suZbc/UILjVWkt/gt+ VJpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=AdDKINR2WMY6kHz3IxEDSNGQrQBAX4T451uo+JB+stg=; b=rHVLvx8mZirbIXTonlscMXtAJr+EJ4HOr6BdfonHEaqMuFpf2lqeJXWBofj16pOc3r zNY24BLlNcSsdS04WuD0REn1BPN7iHHhiOwGFT4fK1ScBuKyagIdBenEp3OBliftLKGM S64C4sLjuZb/pyQDLTEF1iiaLK2ofmc7nYRj8afayGqCboEtj76mD7fcxIVYGQeJ1tHE UWKtqDe0A/ul/ezwMDlLaSns/pKG364X9Tnn87U7s8SIEtfVFLv8o8R9XZFTknKnWvga CdHVmACu6MI5/wV8gif66YdjRHfZzzYE35pyGKnvnMwBkmQ2c5W4I2f0ijbs8I1Ufyq+ gQBg== X-Gm-Message-State: APjAAAUyLIOGPNwLJ4+uW74u3x9DRlMsmVemrOHQfFdEF8xOvDZ/OIJg CgHAatjz+LBZsXWbrcqveVmg7suI X-Google-Smtp-Source: APXvYqytGtAgwScZNrDtURHQ2VYv2IKZ6MiGS/oxz8pOJyT1gb7rDJJ6P0RpekKWTxEQaU3K8RKceQ== X-Received: by 2002:a17:90a:65c8:: with SMTP id i8mr2407182pjs.51.1570496552890; Mon, 07 Oct 2019 18:02:32 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:32 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:23 -0700 Message-Id: <20191008010225.8822-6-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180233_736894_AB70ED74 X-CRM114-Status: UNSURE ( 9.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 6/8] tools/firmware-utils: add cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov This patches mkheader_gemtek.c to handle endiannes on CYGWIN hosts the same way it is handled on Linux. Signed-off-by: Alexey Loukianov Signed-off-by: Rosen Penev --- tools/firmware-utils/src/mkheader_gemtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware-utils/src/mkheader_gemtek.c b/tools/firmware-utils/src/mkheader_gemtek.c index 9e618efbad..65c41322d1 100644 --- a/tools/firmware-utils/src/mkheader_gemtek.c +++ b/tools/firmware-utils/src/mkheader_gemtek.c @@ -46,7 +46,7 @@ # include # define le32 OSSwapHostToLittleInt32 #else -# if defined(__linux__) +# if (defined(__linux__) || defined(__CYGWIN__)) # include # if __BYTE_ORDER == __BIG_ENDIAN # define CPU_BIG_ENDIAN From patchwork Tue Oct 8 01:02:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173046 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tna5QuC4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f987rT8o"; 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 46nJyG4hs1z9sPT for ; Tue, 8 Oct 2019 12:03:50 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=uhvTxfl0jDgnAr5aYpW+jGGevLhwwRsQf6hSt2niSGo=; b=tna5QuC4bxfD/0bqGpF1jwYyxh skhT55lJSZk8eDaaEGfFrXXhcTSMRBn6xKhQFRWttj8GdbSUERlngEXzTEKNm1SfxTzCMh1ioPtal Q2hURpVuKQlrNXoFUecFViYKucHgL2406e16m4xN9pH9tmNbIm4xj8ZjseOVfrv6FJrinW4dK07PB S8mluwwQYIDr1NEfcfgA1qpQh+fwkLBUDy4bKxMBN95X5GcIQYGlZc/e6NIorDz3jeFosUT53JwEK 8jAJy1SgRhNCBWI03Ev3Jj96k/uvxaqsbe40sVmZI29JN1Sn+WJDm5q+iJwUNZEzz9dOWyEQAujpM OK1MHqkA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdum-0007CC-15; Tue, 08 Oct 2019 01:03:48 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtb-0005oB-GN for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:36 +0000 Received: by mail-pf1-x444.google.com with SMTP id v4so9749422pff.6 for ; Mon, 07 Oct 2019 18:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=XyuJYODBGcl2ohMFlZ32bvBsxZnAFrbZ8zK2mNN1J+c=; b=f987rT8o98ITp/v3u21bj5siZEsahDY7K5+lHWd6ox8ZMnNv9S8Z5F2sOlyy6dS6D/ /3JRtjanEEaM7J47c/uYkAubPaXwIrw2N+SgasEg0NM0N5XKW6gljY8coaSoY0iH2Wy6 TvHw1JesPXWjDMHRM5EQNorKe2uRyzi+DD6hoGbN+pKwpm9WCHq/tQyVl/SgRVDHdPEz GAZWCdDCf2B5eOXgb/jHKOT3kCmqPPIJSg6UsKyPiji7f8PjLd6mhFyHOePnNY5MrbX6 G9P7li7gK2gZbc1P89qf6gYYTbJU1xCrW7jyYlb3RCFdf8t6ruPEMqOrBRFY9Z31h/7t 084g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XyuJYODBGcl2ohMFlZ32bvBsxZnAFrbZ8zK2mNN1J+c=; b=tweQT9AUfLkjHcODtWFdg85VHb2RCwsRyFq5RmtL4qZ+XIllRPATnJNoVJycEwYE4F 2gmLVJVwuQnYDBrwccjIf453avL+m4qTl7S5xH5m6UcnXfuNxGQ1hEt8tG30+viOYDhO RIuTs98hOb1x/LDhV2Rer0veXnVaKwzbWA20y3g0r7SaSvj7Bn8UF2nEC4EnoHcQbOWN j8F6hssbzc1BKI3C4YrWMzVyaCPIfe37vfe/Q6aFKWb/BQQ/5mCIBGrlM9kaoGdd4kUQ RThIfM7v3HwqvN+SyrhI8xCoX5FSY/0gnTxWrKiDdmu1ntIVwaJjHxKK5a/sM8YpzxlM xySQ== X-Gm-Message-State: APjAAAXJ0KjRjny3vgRi4v9CaqaRWIqS6oL/Po4gRGuiNrQB8gBF8Chz WWQfD6FIWquV9WPBQBxG+WbnlCSk X-Google-Smtp-Source: APXvYqw/3Z3ijrXt7LiBU+LJxtHDZUtzLoRxA3Bn0bOrpw4l6Jn+38jxjOuEJDNY6m1Xv2j59QENxw== X-Received: by 2002:a62:7790:: with SMTP id s138mr1326667pfc.57.1570496553989; Mon, 07 Oct 2019 18:02:33 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:33 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:24 -0700 Message-Id: <20191008010225.8822-7-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180235_567641_5AEFBCCD X-CRM114-Status: GOOD ( 11.79 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 7/8] tools/findutils: improve cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov Environment block size on Windows is limited to ~32k. But contrary to typical posix limitation process arguments are not included in environment block and are separate from it. Thus it is not required to compare env_size with arg_max when checking for execl(e) limits in findutils. This is important due to a fact that some software like linux kernel backports tend to export a lot of environment variables during build which leads to find/xargs failing with "environment is too large for exec" message when working under cygwin. Signed-off-by: Alexey Loukianov Signed-off-by: Rosen Penev --- ...cygwin-env-is-not-included-into-args.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 tools/findutils/patches/900-cygwin-env-is-not-included-into-args.patch diff --git a/tools/findutils/patches/900-cygwin-env-is-not-included-into-args.patch b/tools/findutils/patches/900-cygwin-env-is-not-included-into-args.patch new file mode 100644 index 0000000000..d96b2fce91 --- /dev/null +++ b/tools/findutils/patches/900-cygwin-env-is-not-included-into-args.patch @@ -0,0 +1,33 @@ +Index: findutils-4.6.0/lib/buildcmd.c +=================================================================== +--- findutils-4.6.0.orig/lib/buildcmd.c ++++ findutils-4.6.0/lib/buildcmd.c +@@ -509,6 +509,8 @@ bc_init_controlinfo (struct buildcmd_con + + ctl->exit_if_size_exceeded = 0; + ++ ++#ifndef __CYGWIN__ + /* Take the size of the environment into account. */ + if (size_of_environment > ctl->posix_arg_size_max) + { +@@ -525,9 +527,19 @@ bc_init_controlinfo (struct buildcmd_con + } + else + { ++ ctl->posix_arg_size_max -= headroom; + ctl->posix_arg_size_max -= size_of_environment; ++ } ++#else ++ if (headroom >= ctl->posix_arg_size_max) ++ { ++ return BC_INIT_CANNOT_ACCOMODATE_HEADROOM; ++ } ++ else ++ { + ctl->posix_arg_size_max -= headroom; + } ++#endif + + /* need to subtract 2 on the following line - for Linux/PPC */ + ctl->max_arg_count = (ctl->posix_arg_size_max / sizeof (char*)) - 2u; From patchwork Tue Oct 8 01:02:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1173048 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rADMZ69s"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="C8hNM+yB"; 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 46nJyt2n0fz9sPT for ; Tue, 8 Oct 2019 12:04:22 +1100 (AEDT) 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject: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=pDvlGGxi/MhO2NZDOf+PPK6yb6lLftnjH2gdFSs/mTg=; b=rADMZ69s0FNnUO3JLlaonmwhkv a+/QlzXZN+rYoKSRAJg7I9N/M24JtoFBPjgb3AMwr7AKd9nnu9y6EtK9kLs2oYGx4BWh9F7AQDgNU nu1cl8OZZNqCbuyCRURwXln3/pZMDRkUCjKljDXUvPH6M5t5+0JdfYnE7g3xqN/0wowjwc+4SCy2z ClOeRY1eaaXFROfWChZXGrVRQTfXbShsvJq2xfYzdL5tmtjOAyW3lHZ0grtXYvI2NZ2awa71jsmnM POs5NOTvMBazjnnSM+2y2NNzgAqg2x4VUH5urLelyCzqlAM03jXJZQogwGr0I9wUUikgMgi6yB+J3 TBVEfxsA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdvG-0007kM-8N; Tue, 08 Oct 2019 01:04:18 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iHdtb-0005oR-Sb for openwrt-devel@lists.openwrt.org; Tue, 08 Oct 2019 01:02:37 +0000 Received: by mail-pf1-x442.google.com with SMTP id q7so9737696pfh.8 for ; Mon, 07 Oct 2019 18:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=pULE9zDsZWkP2B0VB+g/RuwbEA+WVS7XwQbcvL8NXPQ=; b=C8hNM+yBRuL5Q+MrgW3aMicQXYEIqT5RPBSv7vUPqMAzqwf8rp8XGYHxfWiZYsD3eQ 2QjRtCoPgCzfVSLdJ6GxSY9nO+A01Ks0/hgif//2GVBPfOiOSUrqjo5x+IlEVq+v1Hvg D8arGdmlpxLPrtnBPiVj4FgppUJv6J+Hr3R1J20zpkDavPrxT6uHztRjcHkb4RYi0iPI QQl8ufVi3K1VQ/Yif+QMb+iOinpiTB0gM693+9IlmivZPZYAvIi6iMIDyKwk5d8SJ4Qd Jzt99PMgEwGN3gjKTLPggaHt80ym0yB0S55nzdGfGk1KQsxTK4sD8VHOGF4j323dI5v7 V4zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pULE9zDsZWkP2B0VB+g/RuwbEA+WVS7XwQbcvL8NXPQ=; b=QwGYOCg4Gy7985J93aRt7jVEJDpYDB3/nU0bc/vG37mV2sA3AIy6B3dnIPUY79tNFF uYudQyKPATmLP3oKDpGfqv3wFMQ+9aQ9KiA8sV8re+zor/+M46q60e+lnb7kTPCgJXUj 8nkimjguD4GIZdM2JvWKz7loHDiEjey6ygqWWy1bKWnabp0t6Qq6o351m0jCGILzZpGH rbbed8oOxZTY0sGsO1tM6RaVFNhG22OnR5t5Ce0VB2fdNWL0m91hEcWctT6mg5UJjYye mmJEgkLsMeLh77sXOJOJQE3SduOtNf1R+LiGQT9RlM+2bPtvihxElpdPyWyvoimBNf6a KvJw== X-Gm-Message-State: APjAAAVU3v2nkI0yYTaau4COyLFpLcEmCL2EDlLChkxX/3pyn5p6UlwJ 2ry1HqgOHVgOsq167zMprG4uWQvm X-Google-Smtp-Source: APXvYqzH+8oI9vixR0gXS3nK08FOpAaMrl7eaWiEmzmdfIJn8rZH4ImlWVkoRl6KD1PbKHQSEIyPrw== X-Received: by 2002:a62:7c47:: with SMTP id x68mr36133088pfc.178.1570496554849; Mon, 07 Oct 2019 18:02:34 -0700 (PDT) Received: from mangix-pc.lan ([69.42.0.147]) by smtp.gmail.com with ESMTPSA id x9sm594901pje.27.2019.10.07.18.02.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:02:34 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Date: Mon, 7 Oct 2019 18:02:25 -0700 Message-Id: <20191008010225.8822-8-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008010225.8822-1-rosenp@gmail.com> References: <20191008010225.8822-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191007_180235_934655_877222DE X-CRM114-Status: GOOD ( 12.37 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 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 (rosenp[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 8/8] tools/mtd-utils: add cygwin compatibility 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: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Alexey Loukianov * Add blkpg.h linux header (not available under cygwin) and patch types.h to reflect cygwin specifics. * Define __USE_LINUX_IOCTL_DEFS under cygwin. * Properly handle ".exe" suffix in package makefile. Signed-off-by: Alexey Loukianov Signed-off-by: Rosen Penev --- tools/mtd-utils/Makefile | 17 ++++++++++++- tools/mtd-utils/include/linux/blkpg.h | 35 +++++++++++++++++++++++++++ tools/mtd-utils/include/linux/types.h | 6 +++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 tools/mtd-utils/include/linux/blkpg.h diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile index e0e083d2b6..8a7ee06b62 100644 --- a/tools/mtd-utils/Makefile +++ b/tools/mtd-utils/Makefile @@ -18,6 +18,7 @@ PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/host-build.mk ifneq ($(HOST_OS),Linux) +ifneq (CYGWIN,$(findstring CYGWIN,$(HOST_OS))) HOST_CFLAGS += \ -I$(CURDIR)/include \ -Dloff_t=off_t \ @@ -25,6 +26,14 @@ ifneq ($(HOST_OS),Linux) -include endian.h \ -DNO_NATIVE_SUPPORT \ -include fls.h +else + HOST_CFLAGS += \ + -I$(CURDIR)/include \ + -include endian.h \ + -DNO_NATIVE_SUPPORT \ + -include fls.h \ + -D__USE_LINUX_IOCTL_DEFS +endif endif HOST_CONFIGURE_VARS+= \ @@ -37,8 +46,14 @@ HOST_CONFIGURE_ARGS+= \ --without-zstd \ --without-lzo +ifeq (CYGWIN,$(findstring CYGWIN,$(HOST_OS))) +EXEC_SUFFIX:=.exe +else +EXEC_SUFFIX:= +endif + HOST_MAKE_FLAGS += \ - PROGRAMS="mkfs.jffs2 ubinize mkfs.ubifs" + PROGRAMS="mkfs.jffs2$(EXEC_SUFFIX) ubinize$(EXEC_SUFFIX) mkfs.ubifs$(EXEC_SUFFIX)" define Host/Install $(CP) \ diff --git a/tools/mtd-utils/include/linux/blkpg.h b/tools/mtd-utils/include/linux/blkpg.h new file mode 100644 index 0000000000..7d90fa5d86 --- /dev/null +++ b/tools/mtd-utils/include/linux/blkpg.h @@ -0,0 +1,35 @@ +#ifndef __LINUX_BLKPG_H +#define __LINUX_BLKPG_H + +/*#include */ + +#define BLKPG _IO(0x12,105) + +/* The argument structure */ +struct blkpg_ioctl_arg { + int op; + int flags; + int datalen; + void *data; +}; + +/* The subfunctions (for the op field) */ +#define BLKPG_ADD_PARTITION 1 +#define BLKPG_DEL_PARTITION 2 +#define BLKPG_RESIZE_PARTITION 3 + +/* Sizes of name fields. Unused at present. */ +#define BLKPG_DEVNAMELTH 64 +#define BLKPG_VOLNAMELTH 64 + +/* The data structure for ADD_PARTITION and DEL_PARTITION */ +struct blkpg_partition { + long long start; /* starting offset in bytes */ + long long length; /* length in bytes */ + int pno; /* partition number */ + char devname[BLKPG_DEVNAMELTH]; /* partition name, like sda5 or c0d1p2, + to be used in kernel messages */ + char volname[BLKPG_VOLNAMELTH]; /* volume label */ +}; + +#endif /* __LINUX_BLKPG_H */ diff --git a/tools/mtd-utils/include/linux/types.h b/tools/mtd-utils/include/linux/types.h index 559fac7a2c..0b28190fb1 100644 --- a/tools/mtd-utils/include/linux/types.h +++ b/tools/mtd-utils/include/linux/types.h @@ -5,7 +5,13 @@ typedef uint16_t __u16; typedef uint32_t __u32; + +#if defined(__CYGWIN__) +typedef __signed__ long long __s64; +typedef unsigned long long __u64; +#else typedef uint64_t __u64; +#endif typedef __u16 __le16; typedef __u32 __le32;