From patchwork Fri Jun 21 12:30:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1120208 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="dvighX0w"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QAEs56XK"; 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 45VdMX03jrz9sND for ; Fri, 21 Jun 2019 22:31:04 +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=rkJsJ3Jsir5s/DykKMsFYqUjLSIRTwfq4QfN10bDtTI=; b=dvighX0wi/7Dw1 Dq2CV5ERYe73FGCj5Q4sdMWQs28NpCHHbzls6iX+gtPWtDYnCOhKjzTj2ejbIIW2SQTWH7lOWpsCZ HmbvKyKuI/cGj/PMbWPVnXcYt9mcYXtiPZ+I4NX4C/2hIpw+pm0JUQY7Hdc3hk6wC7oL6CjtHXyLl gMM9i3DNFeGkWhUPPpbxtLk5fAHljPjQsJQayQuxQDWz471ADAVxnye3ElwnKOa0mGAjNxIH6X5GI S0iUjU973f2aRElsFQpgnoAytLqKtbVWj7PLIZgbuHFOGtROMDKFZBNk0YesMk3ooCwLqXp1wfM+a YOAnsmdpD9SHDYrHePDQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1heIgw-0003Qn-LF; Fri, 21 Jun 2019 12:30:54 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heIgP-0003Av-Ly for openwrt-devel@lists.openwrt.org; Fri, 21 Jun 2019 12:30:23 +0000 Received: by mail-lj1-x243.google.com with SMTP id x25so5815190ljh.2 for ; Fri, 21 Jun 2019 05:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xgm+iIlD7SmhQ8c1kop6cjhrAC/CP2xU3xaU39Wa7W0=; b=QAEs56XKSIRhkUPt2J9cu1V2+fOo6P+ZSnnK2O7BbceGyqrP1Vp4yEJX9ekURgrGPp SKn9vGXsCxPJ31AIv+1iadejDjFbrEHQqPBK6npVwhWIspiOSq/mM4z5LFcs8RFu/8w7 Bozgd92c6Vn1r+YIYNiFis1PyA4Q3QO47uqDqC/FoWKg/5oH+bCClEW24jXpYRQRHy5X VtI+gIBidVL0pKVofBTHYoYImP17iu/WZW743WXUsMu4NOUqlWti6vtOVM9XYRCYw1e9 ON3Yngh6/3/jwMCAtDS7RWPh9hw6bJB0OC3qP59KUpt+ZFwbN/ASurtJkUcRxIeamjHi kttQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xgm+iIlD7SmhQ8c1kop6cjhrAC/CP2xU3xaU39Wa7W0=; b=cUcRidQy4HhTVdi/mvH5AClM0y6CzS8zs2gy+pPs2WOTqjaYz+x7xU0qnndNjyJN4s Or+GXf2fIQtr2EQy4gUvCEfuTKN/O2fSsHhdedAzo2z+vwyvJ4xnCSwL15Ufu3XVYFsF OPgDlVDpO74QTVSRhiZjKAGBSEmuVrvpMvqLz4PEApSPvtoYCJ9wCjzYtPMhCur7sBQ4 /irg2pDEWLuCPhMt4CmKiZO6UOr95JWPiEUvY0qNE3NEDwdjvrkIiK0VXXG5MWsvOhmw KCc3EvpKVNBftVareYjh+HO3ZP585To7nHdiqxwx3HTOS8PaMBmPVO/x2F8MFx3nJmJ1 /0PQ== X-Gm-Message-State: APjAAAUTyti7IJwYOeNcIQVL6HJhgcnoxM3DbDnFbX4DxN64iwtBxt9O GMIXy/XDQvMObj9bHXsbIQyRnHZA X-Google-Smtp-Source: APXvYqwbg/CQoM5SEZP890y8H/FKkLIjmBX+iAQJGWRgLOH3xQhXNDsIlNqM1crkVBTUKKU5RhPB4A== X-Received: by 2002:a2e:a0d5:: with SMTP id f21mr40441784ljm.69.1561120219632; Fri, 21 Jun 2019 05:30:19 -0700 (PDT) Received: from elitebook.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id l25sm368376lja.76.2019.06.21.05.30.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jun 2019 05:30:19 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org, Jo-Philipp Wich Date: Fri, 21 Jun 2019 14:30:02 +0200 Message-Id: <20190621123002.9404-2-zajec5@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190621123002.9404-1-zajec5@gmail.com> References: <20190621123002.9404-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190621_053021_749885_D66D7475 X-CRM114-Status: UNSURE ( 7.48 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:243 listed in] [list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH 2/2] lua: rename package to lua5.1 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: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki This will allow adding packages for new Lua releases cleanly. At the same time it doesn't break existing packages thanks to the PROVIDES. Signed-off-by: Rafał Miłecki --- package/utils/{lua => lua5.1}/Makefile | 36 ++++++++++--------- .../001-include-version-number.patch | 0 .../010-lua-5.1.3-lnum-full-260308.patch | 0 .../patches-host/011-lnum-use-double.patch | 0 ...2-lnum-fix-ltle-relational-operators.patch | 0 .../013-lnum-strtoul-parsing-fixes.patch | 0 .../patches-host/015-lnum-ppc-compat.patch | 0 .../030-archindependent-bytecode.patch | 0 .../patches-host/100-no_readline.patch | 0 .../patches/001-include-version-number.patch | 0 .../010-lua-5.1.3-lnum-full-260308.patch | 0 .../patches/011-lnum-use-double.patch | 0 ...2-lnum-fix-ltle-relational-operators.patch | 0 .../013-lnum-strtoul-parsing-fixes.patch | 0 .../patches/015-lnum-ppc-compat.patch | 0 .../patches/020-shared_liblua.patch | 0 .../030-archindependent-bytecode.patch | 0 .../patches/040-use-symbolic-functions.patch | 0 .../patches/050-honor-cflags.patch | 0 .../patches/100-no_readline.patch | 0 .../patches/200-lua-path.patch | 0 .../patches/300-opcode_performance.patch | 0 22 files changed, 19 insertions(+), 17 deletions(-) rename package/utils/{lua => lua5.1}/Makefile (87%) rename package/utils/{lua => lua5.1}/patches-host/001-include-version-number.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/010-lua-5.1.3-lnum-full-260308.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/011-lnum-use-double.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/012-lnum-fix-ltle-relational-operators.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/013-lnum-strtoul-parsing-fixes.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/015-lnum-ppc-compat.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/030-archindependent-bytecode.patch (100%) rename package/utils/{lua => lua5.1}/patches-host/100-no_readline.patch (100%) rename package/utils/{lua => lua5.1}/patches/001-include-version-number.patch (100%) rename package/utils/{lua => lua5.1}/patches/010-lua-5.1.3-lnum-full-260308.patch (100%) rename package/utils/{lua => lua5.1}/patches/011-lnum-use-double.patch (100%) rename package/utils/{lua => lua5.1}/patches/012-lnum-fix-ltle-relational-operators.patch (100%) rename package/utils/{lua => lua5.1}/patches/013-lnum-strtoul-parsing-fixes.patch (100%) rename package/utils/{lua => lua5.1}/patches/015-lnum-ppc-compat.patch (100%) rename package/utils/{lua => lua5.1}/patches/020-shared_liblua.patch (100%) rename package/utils/{lua => lua5.1}/patches/030-archindependent-bytecode.patch (100%) rename package/utils/{lua => lua5.1}/patches/040-use-symbolic-functions.patch (100%) rename package/utils/{lua => lua5.1}/patches/050-honor-cflags.patch (100%) rename package/utils/{lua => lua5.1}/patches/100-no_readline.patch (100%) rename package/utils/{lua => lua5.1}/patches/200-lua-path.patch (100%) rename package/utils/{lua => lua5.1}/patches/300-opcode_performance.patch (100%) diff --git a/package/utils/lua/Makefile b/package/utils/lua5.1/Makefile similarity index 87% rename from package/utils/lua/Makefile rename to package/utils/lua5.1/Makefile index ae4c0cb385..645250e441 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua5.1/Makefile @@ -40,49 +40,52 @@ define Package/lua/Default/description language. Lua is free software. endef -define Package/liblua +define Package/liblua5.1 $(call Package/lua/Default) SUBMENU:= SECTION:=libs CATEGORY:=Libraries TITLE+= (libraries) + PROVIDES:=liblua ABI_VERSION:=5.1.5 endef -define Package/liblua/description +define Package/liblua5.1/description $(call Package/lua/Default/description) This package contains the Lua shared libraries, needed by other programs. endef -define Package/lua +define Package/lua5.1 $(call Package/lua/Default) - DEPENDS:=+liblua + DEPENDS:=+liblua5.1 TITLE+= (interpreter) + PROVIDES:=lua endef -define Package/lua/description +define Package/lua.1/description $(call Package/lua/Default/description) This package contains the Lua language interpreter. endef -define Package/luac +define Package/luac5.1 $(call Package/lua/Default) - DEPENDS:=+liblua + DEPENDS:=+liblua5.1 TITLE+= (compiler) + PROVIDES:=luac endef -define Package/luac/description +define Package/luac5.1/description $(call Package/lua/Default/description) This package contains the Lua language compiler. endef -define Package/lua-examples +define Package/lua5.1-examples $(call Package/lua/Default) - DEPENDS:=lua + DEPENDS:=lua5.1 TITLE+= (examples) endef -define Package/lua-examples/description +define Package/lua5.1-examples/description $(call Package/lua/Default/description) This package contains Lua language examples. endef @@ -164,15 +167,14 @@ define Package/luac/install $(LN) luac5.1 $(1)/usr/bin/luac endef -define Package/lua-examples/install +define Package/lua5.1-examples/install $(INSTALL_DIR) $(1)/usr/share/lua/examples $(INSTALL_DATA) $(PKG_BUILD_DIR)/test/*.lua \ $(1)/usr/share/lua/examples/ endef -$(eval $(call BuildPackage,liblua)) -$(eval $(call BuildPackage,lua)) -$(eval $(call BuildPackage,luac)) -$(eval $(call BuildPackage,lua-examples)) +$(eval $(call BuildPackage,liblua5.1)) +$(eval $(call BuildPackage,lua5.1)) +$(eval $(call BuildPackage,luac5.1)) +$(eval $(call BuildPackage,lua5.1-examples)) $(eval $(call HostBuild)) - diff --git a/package/utils/lua/patches-host/001-include-version-number.patch b/package/utils/lua5.1/patches-host/001-include-version-number.patch similarity index 100% rename from package/utils/lua/patches-host/001-include-version-number.patch rename to package/utils/lua5.1/patches-host/001-include-version-number.patch diff --git a/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch b/package/utils/lua5.1/patches-host/010-lua-5.1.3-lnum-full-260308.patch similarity index 100% rename from package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch rename to package/utils/lua5.1/patches-host/010-lua-5.1.3-lnum-full-260308.patch diff --git a/package/utils/lua/patches-host/011-lnum-use-double.patch b/package/utils/lua5.1/patches-host/011-lnum-use-double.patch similarity index 100% rename from package/utils/lua/patches-host/011-lnum-use-double.patch rename to package/utils/lua5.1/patches-host/011-lnum-use-double.patch diff --git a/package/utils/lua/patches-host/012-lnum-fix-ltle-relational-operators.patch b/package/utils/lua5.1/patches-host/012-lnum-fix-ltle-relational-operators.patch similarity index 100% rename from package/utils/lua/patches-host/012-lnum-fix-ltle-relational-operators.patch rename to package/utils/lua5.1/patches-host/012-lnum-fix-ltle-relational-operators.patch diff --git a/package/utils/lua/patches-host/013-lnum-strtoul-parsing-fixes.patch b/package/utils/lua5.1/patches-host/013-lnum-strtoul-parsing-fixes.patch similarity index 100% rename from package/utils/lua/patches-host/013-lnum-strtoul-parsing-fixes.patch rename to package/utils/lua5.1/patches-host/013-lnum-strtoul-parsing-fixes.patch diff --git a/package/utils/lua/patches-host/015-lnum-ppc-compat.patch b/package/utils/lua5.1/patches-host/015-lnum-ppc-compat.patch similarity index 100% rename from package/utils/lua/patches-host/015-lnum-ppc-compat.patch rename to package/utils/lua5.1/patches-host/015-lnum-ppc-compat.patch diff --git a/package/utils/lua/patches-host/030-archindependent-bytecode.patch b/package/utils/lua5.1/patches-host/030-archindependent-bytecode.patch similarity index 100% rename from package/utils/lua/patches-host/030-archindependent-bytecode.patch rename to package/utils/lua5.1/patches-host/030-archindependent-bytecode.patch diff --git a/package/utils/lua/patches-host/100-no_readline.patch b/package/utils/lua5.1/patches-host/100-no_readline.patch similarity index 100% rename from package/utils/lua/patches-host/100-no_readline.patch rename to package/utils/lua5.1/patches-host/100-no_readline.patch diff --git a/package/utils/lua/patches/001-include-version-number.patch b/package/utils/lua5.1/patches/001-include-version-number.patch similarity index 100% rename from package/utils/lua/patches/001-include-version-number.patch rename to package/utils/lua5.1/patches/001-include-version-number.patch diff --git a/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch b/package/utils/lua5.1/patches/010-lua-5.1.3-lnum-full-260308.patch similarity index 100% rename from package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch rename to package/utils/lua5.1/patches/010-lua-5.1.3-lnum-full-260308.patch diff --git a/package/utils/lua/patches/011-lnum-use-double.patch b/package/utils/lua5.1/patches/011-lnum-use-double.patch similarity index 100% rename from package/utils/lua/patches/011-lnum-use-double.patch rename to package/utils/lua5.1/patches/011-lnum-use-double.patch diff --git a/package/utils/lua/patches/012-lnum-fix-ltle-relational-operators.patch b/package/utils/lua5.1/patches/012-lnum-fix-ltle-relational-operators.patch similarity index 100% rename from package/utils/lua/patches/012-lnum-fix-ltle-relational-operators.patch rename to package/utils/lua5.1/patches/012-lnum-fix-ltle-relational-operators.patch diff --git a/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch b/package/utils/lua5.1/patches/013-lnum-strtoul-parsing-fixes.patch similarity index 100% rename from package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch rename to package/utils/lua5.1/patches/013-lnum-strtoul-parsing-fixes.patch diff --git a/package/utils/lua/patches/015-lnum-ppc-compat.patch b/package/utils/lua5.1/patches/015-lnum-ppc-compat.patch similarity index 100% rename from package/utils/lua/patches/015-lnum-ppc-compat.patch rename to package/utils/lua5.1/patches/015-lnum-ppc-compat.patch diff --git a/package/utils/lua/patches/020-shared_liblua.patch b/package/utils/lua5.1/patches/020-shared_liblua.patch similarity index 100% rename from package/utils/lua/patches/020-shared_liblua.patch rename to package/utils/lua5.1/patches/020-shared_liblua.patch diff --git a/package/utils/lua/patches/030-archindependent-bytecode.patch b/package/utils/lua5.1/patches/030-archindependent-bytecode.patch similarity index 100% rename from package/utils/lua/patches/030-archindependent-bytecode.patch rename to package/utils/lua5.1/patches/030-archindependent-bytecode.patch diff --git a/package/utils/lua/patches/040-use-symbolic-functions.patch b/package/utils/lua5.1/patches/040-use-symbolic-functions.patch similarity index 100% rename from package/utils/lua/patches/040-use-symbolic-functions.patch rename to package/utils/lua5.1/patches/040-use-symbolic-functions.patch diff --git a/package/utils/lua/patches/050-honor-cflags.patch b/package/utils/lua5.1/patches/050-honor-cflags.patch similarity index 100% rename from package/utils/lua/patches/050-honor-cflags.patch rename to package/utils/lua5.1/patches/050-honor-cflags.patch diff --git a/package/utils/lua/patches/100-no_readline.patch b/package/utils/lua5.1/patches/100-no_readline.patch similarity index 100% rename from package/utils/lua/patches/100-no_readline.patch rename to package/utils/lua5.1/patches/100-no_readline.patch diff --git a/package/utils/lua/patches/200-lua-path.patch b/package/utils/lua5.1/patches/200-lua-path.patch similarity index 100% rename from package/utils/lua/patches/200-lua-path.patch rename to package/utils/lua5.1/patches/200-lua-path.patch diff --git a/package/utils/lua/patches/300-opcode_performance.patch b/package/utils/lua5.1/patches/300-opcode_performance.patch similarity index 100% rename from package/utils/lua/patches/300-opcode_performance.patch rename to package/utils/lua5.1/patches/300-opcode_performance.patch