From patchwork Sat Jun 22 12:11:34 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: 1120630 X-Patchwork-Delegate: zajec5@gmail.com 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="VaE+akqt"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fDnJmf49"; 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 45WDvC4lmDz9s3Z for ; Sat, 22 Jun 2019 22:12:07 +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=fVddu+Z4agbwWK4fjdEH8I84DA+bbqP+O9csnhTBxMA=; b=VaE+akqtv7NNXA Bt94FepOv+Up18JYuSd4MmKdXTwC3IM/NRvkHd4OtoInEy4NPJQiBs1EIMPQD85+XZPjUxOCRVVNg vXOfPCnFl7fnZZBvOirEE4Na9XgS7gAA3TSW+Ml6OK0Zrgmz9/ypdWTzN9P7zW24lv879deSp6Ms8 5zBlX5bDpXHsjjXqt4VPxqW6L4OgPd/Xm7E2XKPtC4U6Z6HnA1PGq5dhuZFa1v88ihgX7EGwZ+Wxc wrHUBRosmYXdQnSD8/1olibfHdUqgcFkxmZi4bzQdTrrCifpfA7BYTAQUVOLk3Rh/+omKkBS2MA/F KAfBw8qVEnzJEu/EYKlw==; 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 1hees1-0005ek-Mo; Sat, 22 Jun 2019 12:11:49 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1heerx-0005e7-HD for openwrt-devel@lists.openwrt.org; Sat, 22 Jun 2019 12:11:48 +0000 Received: by mail-lj1-x242.google.com with SMTP id k18so8307481ljc.11 for ; Sat, 22 Jun 2019 05:11:45 -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=v5CYkNa1wQcBIOBr0jvSuivebWiEPoAzO9rbCU4pPrE=; b=fDnJmf49I8A6lcAkiP5IpN2tWftZfK9pe3HSBqa1+uGZUmVzOmkJzleUmVnq6/MAio OTcjrJuWJY0DmPLhzAsIOjTb/3UWtehQ8CFAsMfLkY3ymiUMw96cO0f8Ar35XpbA7FC0 T2nLvrz/14k8p9sIx4IIoGY9vBm0xQstoVF5sHfF9987/KxyJkztJhdFB7tsYqcJUZjI 0pEqgB5WepSs+Sv+tQfnv8yGLCjkk2b2sDhuRClamzyC6X0TnjcAKusjgXItGz48NkdH 9mfLAkHtA72BA5r0GcGkTEXim0W0UsBextPUr6LiLdHm8HnT+xfEPYI4U9POjNcEtoy6 cWNQ== 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=v5CYkNa1wQcBIOBr0jvSuivebWiEPoAzO9rbCU4pPrE=; b=Cgn6jUFjzLssoZ0e5Eg1VJo43lHQubPRf/np2NyUUn6Erb8d+da4slcazcUi94Elrq RiAEVChdPUFlKsuD1PtE6KoQdpIgQq4Y4q7adD+WJKyH8WO8xMy3UMUofqovN+gTYlhL bwj1WoMdP+heMW7veAP54YAR/r9yASeL2i77cXGNUkfqrSVuv9Xh4mzxltwfxNbLIyhO jttHqMLk+HR2+G00YE8d2XmW2SRBqkklFxyKVxxTI2/Vbshih67VprgvVQNzxpju3VE+ gkRH6ZL2WSaLswHjkcHjtMiLqNr8L5+LdewujF3zHIC86LhU9vk+SVZe/QjIwhauDo79 73Ow== X-Gm-Message-State: APjAAAWqWSKVc4lVd7MEqeUlc83PNzitXQlzB2oCQb2hxMMIi2bK9rvh EBYDRtJHU9q85tBeD8Zwmv5f2i3g X-Google-Smtp-Source: APXvYqysTK1SBHp2l2gJA9JREbcGesqjBoJ/NXzAl/+uNoRlc2AeGnewI79fhOE2F4ZabO4l1aSKGA== X-Received: by 2002:a2e:9788:: with SMTP id y8mr52842791lji.41.1561205503421; Sat, 22 Jun 2019 05:11:43 -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 x19sm825540ljb.6.2019.06.22.05.11.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jun 2019 05:11:42 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org, Jo-Philipp Wich Date: Sat, 22 Jun 2019 14:11:34 +0200 Message-Id: <20190622121135.5029-1-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-20190622_051146_535466_A925A79B X-CRM114-Status: GOOD ( 13.01 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:242 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH V2 1/2] lua: include version number in installed files 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 installing Lua 5.1 and newer versions at the same time. Signed-off-by: Rafał Miłecki --- V2: Bump PKG_RELEASE --- package/utils/lua/Makefile | 8 ++-- .../001-include-version-number.patch | 48 +++++++++++++++++++ .../patches/001-include-version-number.patch | 48 +++++++++++++++++++ .../013-lnum-strtoul-parsing-fixes.patch | 11 +---- .../utils/lua/patches/020-shared_liblua.patch | 8 ++-- 5 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 package/utils/lua/patches-host/001-include-version-number.patch create mode 100644 package/utils/lua/patches/001-include-version-number.patch diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile index 077a60fbf3..c911c6a913 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua PKG_VERSION:=5.1.5 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ @@ -154,12 +154,14 @@ endef define Package/lua/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua5.1 $(1)/usr/bin/ + $(LN) lua5.1 $(1)/usr/bin/lua endef define Package/luac/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac5.1 $(1)/usr/bin/ + $(LN) luac5.1 $(1)/usr/bin/luac endef define Package/lua-examples/install diff --git a/package/utils/lua/patches-host/001-include-version-number.patch b/package/utils/lua/patches-host/001-include-version-number.patch new file mode 100644 index 0000000000..b7056fd47c --- /dev/null +++ b/package/utils/lua/patches-host/001-include-version-number.patch @@ -0,0 +1,48 @@ +From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 21 Jun 2019 14:08:38 +0200 +Subject: [PATCH] include version number + +Including it allows multiple lua versions to coexist. + +Signed-off-by: Rafał Miłecki +--- + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -41,10 +41,10 @@ RANLIB= ranlib + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + # What to install. +-TO_BIN= lua luac ++TO_BIN= lua$V luac$V + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_LIB= liblua.a +-TO_MAN= lua.1 luac.1 ++TO_MAN= lua$V.1 luac$V.1 + + # Lua version and release. + V= 5.1 +diff --git a/doc/lua.1 b/doc/lua5.1.1 +rename from doc/lua.1 +rename to doc/lua5.1.1 +diff --git a/doc/luac.1 b/doc/luac5.1.1 +rename from doc/luac.1 +rename to doc/luac5.1.1 +diff --git a/src/Makefile b/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ + lstrlib.o loadlib.o linit.o + +-LUA_T= lua ++LUA_T= lua$V + LUA_O= lua.o + +-LUAC_T= luac ++LUAC_T= luac$V + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) diff --git a/package/utils/lua/patches/001-include-version-number.patch b/package/utils/lua/patches/001-include-version-number.patch new file mode 100644 index 0000000000..b7056fd47c --- /dev/null +++ b/package/utils/lua/patches/001-include-version-number.patch @@ -0,0 +1,48 @@ +From 96576b44a1b368bd6590eb0778ae45cc9ccede3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 21 Jun 2019 14:08:38 +0200 +Subject: [PATCH] include version number + +Including it allows multiple lua versions to coexist. + +Signed-off-by: Rafał Miłecki +--- + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -41,10 +41,10 @@ RANLIB= ranlib + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + # What to install. +-TO_BIN= lua luac ++TO_BIN= lua$V luac$V + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_LIB= liblua.a +-TO_MAN= lua.1 luac.1 ++TO_MAN= lua$V.1 luac$V.1 + + # Lua version and release. + V= 5.1 +diff --git a/doc/lua.1 b/doc/lua5.1.1 +rename from doc/lua.1 +rename to doc/lua5.1.1 +diff --git a/doc/luac.1 b/doc/luac5.1.1 +rename from doc/luac.1 +rename to doc/luac5.1.1 +diff --git a/src/Makefile b/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile +@@ -29,10 +29,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ + lstrlib.o loadlib.o linit.o + +-LUA_T= lua ++LUA_T= lua$V + LUA_O= lua.o + +-LUAC_T= luac ++LUAC_T= luac$V + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) diff --git a/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch b/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch index 7f00c8c3a2..8887229589 100644 --- a/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch +++ b/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch @@ -1,8 +1,6 @@ -diff --git a/src/lnum.c b/src/lnum.c -index 1456b6a2ed23..b0632b04c2b7 100644 --- a/src/lnum.c +++ b/src/lnum.c -@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) { +@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lu #else return 0; /* Reject the number */ #endif @@ -11,7 +9,7 @@ index 1456b6a2ed23..b0632b04c2b7 100644 } } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) { return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */ -@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Integer ib ) { +@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Inte return 0; } @@ -25,8 +23,6 @@ index 1456b6a2ed23..b0632b04c2b7 100644 + return (unsigned LUA_INTEGER)v; +} +#endif -diff --git a/src/lnum_config.h b/src/lnum_config.h -index 19d7a4231a49..1092eead6629 100644 --- a/src/lnum_config.h +++ b/src/lnum_config.h @@ -141,7 +141,12 @@ @@ -43,6 +39,3 @@ index 19d7a4231a49..1092eead6629 100644 #endif #ifndef LUA_INTEGER_MIN # define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */ --- -1.9.1 - diff --git a/package/utils/lua/patches/020-shared_liblua.patch b/package/utils/lua/patches/020-shared_liblua.patch index 64f683ddbe..f67ee2b3c7 100644 --- a/package/utils/lua/patches/020-shared_liblua.patch +++ b/package/utils/lua/patches/020-shared_liblua.patch @@ -3,12 +3,12 @@ @@ -42,8 +42,8 @@ PLATS= aix ansi bsd freebsd generic linu # What to install. - TO_BIN= lua luac + TO_BIN= lua$V luac$V -TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp -TO_LIB= liblua.a +TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp lnum_config.h +TO_LIB= liblua.a liblua.so.$R - TO_MAN= lua.1 luac.1 + TO_MAN= lua$V.1 luac$V.1 # Lua version and release. @@ -63,6 +63,7 @@ install: dummy @@ -87,10 +87,10 @@ CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ lundump.o lvm.o lzio.o lnum.o -@@ -33,11 +34,12 @@ LUA_T= lua +@@ -33,11 +34,12 @@ LUA_T= lua$V LUA_O= lua.o - LUAC_T= luac + LUAC_T= luac$V -LUAC_O= luac.o print.o +LUAC_O= luac.o print.o lopcodes.o From patchwork Sat Jun 22 12:11:35 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: 1120631 X-Patchwork-Delegate: zajec5@gmail.com 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="ZNj5u/bc"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dq1lkDJy"; 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 45WDvM5pRBz9s3Z for ; Sat, 22 Jun 2019 22:12:15 +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=Kef3GUZeb6ZDrOALnwGY+2dNtugWFKLbZAi+xrHA/CI=; b=ZNj5u/bckccI2s XjYAf7ZFmXm6EC2TiWrznf9OK5MaXYicewxBKzw+awYHzhUvzFEcC2vcbtjK7QSnSP3Mpvhx71HpU YeEMNcSRKrmH04FlzEDRTHml9zcmejs3A62wldOGRvWe86ZrBGLD7Sbg2BwEei4MmUKgYxb16EEg1 k6gE+7HEBJA37o31Jv2hhQt831rEdZuxAdW7wBqQKuOkYJI5Oj1aNR6UwVICNKLM+VT0boU99crt8 oPflmsusuPee53p4gTfxIkl+VoCO9mxdxBCmaAnbnMfp3Qc5e5w/I050AezvnWCHjTJ9JdXuf1RRB x8QFrSKwoMJzYJuXTyxQ==; 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 1heesC-0005rg-19; Sat, 22 Jun 2019 12:12:00 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hees0-0005eO-Op for openwrt-devel@lists.openwrt.org; Sat, 22 Jun 2019 12:11:50 +0000 Received: by mail-lj1-x241.google.com with SMTP id s21so8324458lji.8 for ; Sat, 22 Jun 2019 05:11:48 -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=32ix55oL+hbZUmT0ieTK0nKxUUWgs/RGSMlx5B7h2/o=; b=Dq1lkDJyB5JG5MWFkG0vZ+ZBs3kfdrZXYfib7yudIJX/qkBeSYgPXUKec5uU5VJdve iXjAvZXrKy1eHIpuUxq45BJw2V8NE7MB1XjuzzLjkOBEoePs56v3GWZw/WpKYlKQMev+ uQWTd5MSruvqz3oGkxqX1SCAVyLA9x54NIYrQ1WAkub1FdDSyrXW2EoBpyLNWHArDSYg nA37bnEMqgGh/efdBRWgidSe81FVPY0SzvJrvzJKkbz27t0NOSH67Rz6Z9oz+PldsSVT O9RBKLaW8RmbFDPJ33ulgEEYPkX2NkdzrAlkKh8ba/JyBsr1WnZRfH2p/AXqzkYoVvnL Ei4g== 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=32ix55oL+hbZUmT0ieTK0nKxUUWgs/RGSMlx5B7h2/o=; b=cnhHUpOZRwRK9MzqkrQCwNLncjd3SQZ+EPdwph90hkAQcDru21K5PDCEKbSQbqASIq jFJszHkvbRww1RQRQYRN3fCiYYp2RMbcJwvjN/91n/2mQwrn4Li1eig1LroJ3dEUWXki NXISZLFNHn2kWagqjhNjMUd/bVVjcgeE2JjqHftWvK9zdzc5TZ1JC62mdkIzPz7ZudXr NHGJLnO65jNAg62rKP4mGfHbuSZvsv90U9ZHProx9KTwMvzqIS0wzQfpWc40nXGg16It LGNF0dB5oupWVa29bKuoUCZtBEs010xKMXcRCJyJZBY6Z+ijjg/qiTZFh1M6KQigLT2p wPMQ== X-Gm-Message-State: APjAAAWBlsv8az9Qjghqai6kQxVkT5I0hS64/iAxClSivznx1RGOVIUQ 9SY/BJPeByeFtY9KMrO24wODFR2M X-Google-Smtp-Source: APXvYqxuZd/BW/cWtCLjQI7d2wFWANvJNQwfyppYiaUynHqlTsa4YDgJeW/4cp3TJT4Di1c1fLAx0w== X-Received: by 2002:a2e:1201:: with SMTP id t1mr49310937lje.153.1561205506341; Sat, 22 Jun 2019 05:11:46 -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 x19sm825540ljb.6.2019.06.22.05.11.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jun 2019 05:11:45 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org, Jo-Philipp Wich Date: Sat, 22 Jun 2019 14:11:35 +0200 Message-Id: <20190622121135.5029-2-zajec5@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190622121135.5029-1-zajec5@gmail.com> References: <20190621123002.9404-1-zajec5@gmail.com> <20190622121135.5029-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190622_051148_811817_84BE86E4 X-CRM114-Status: UNSURE ( 7.50 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:241 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH V2 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 --- V2: Update /install sections to make packages work actually --- package/utils/{lua => lua5.1}/Makefile | 62 ++++++++++--------- .../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, 32 insertions(+), 30 deletions(-) rename package/utils/{lua => lua5.1}/Makefile (77%) 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 77% rename from package/utils/lua/Makefile rename to package/utils/lua5.1/Makefile index c911c6a913..4fb93a9c8f 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua5.1/Makefile @@ -25,7 +25,7 @@ HOST_PATCH_DIR := ./patches-host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -define Package/lua/Default +define Package/lua5.1/Default SUBMENU:=Lua SECTION:=lang CATEGORY:=Languages @@ -34,56 +34,59 @@ define Package/lua/Default MAINTAINER:=Jo-Philipp Wich endef -define Package/lua/Default/description +define Package/lua5.1/Default/description Lua is a powerful light-weight programming language designed for extending applications. Lua is also frequently used as a general-purpose, stand-alone language. Lua is free software. endef -define Package/liblua -$(call Package/lua/Default) +define Package/liblua5.1 +$(call Package/lua5.1/Default) SUBMENU:= SECTION:=libs CATEGORY:=Libraries TITLE+= (libraries) + PROVIDES:=liblua ABI_VERSION:=5.1.5 endef -define Package/liblua/description -$(call Package/lua/Default/description) +define Package/liblua5.1/description +$(call Package/lua5.1/Default/description) This package contains the Lua shared libraries, needed by other programs. endef -define Package/lua -$(call Package/lua/Default) - DEPENDS:=+liblua +define Package/lua5.1 +$(call Package/lua5.1/Default) + DEPENDS:=+liblua5.1 TITLE+= (interpreter) + PROVIDES:=lua endef -define Package/lua/description -$(call Package/lua/Default/description) +define Package/lua.1/description +$(call Package/lua5.1/Default/description) This package contains the Lua language interpreter. endef -define Package/luac -$(call Package/lua/Default) - DEPENDS:=+liblua +define Package/luac5.1 +$(call Package/lua5.1/Default) + DEPENDS:=+liblua5.1 TITLE+= (compiler) + PROVIDES:=luac endef -define Package/luac/description -$(call Package/lua/Default/description) +define Package/luac5.1/description +$(call Package/lua5.1/Default/description) This package contains the Lua language compiler. endef -define Package/lua-examples -$(call Package/lua/Default) - DEPENDS:=lua +define Package/lua5.1-examples +$(call Package/lua5.1/Default) + DEPENDS:=lua5.1 TITLE+= (examples) endef -define Package/lua-examples/description -$(call Package/lua/Default/description) +define Package/lua5.1-examples/description +$(call Package/lua5.1/Default/description) This package contains Lua language examples. endef @@ -147,32 +150,31 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/etc/lua.pc $(1)/usr/lib/pkgconfig/ endef -define Package/liblua/install +define Package/liblua5.1/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so.* $(1)/usr/lib/ endef -define Package/lua/install +define Package/lua5.1/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lua5.1 $(1)/usr/bin/ $(LN) lua5.1 $(1)/usr/bin/lua endef -define Package/luac/install +define Package/luac5.1/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/luac5.1 $(1)/usr/bin/ $(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