Skip to content

luajit2: update to v2.1-20260606#29669

Open
orangepizza wants to merge 4 commits into
openwrt:masterfrom
orangepizza:update-luajit2
Open

luajit2: update to v2.1-20260606#29669
orangepizza wants to merge 4 commits into
openwrt:masterfrom
orangepizza:update-luajit2

Conversation

@orangepizza

Copy link
Copy Markdown
Contributor

For changes, see tagged commit:
https://github.com/openresty/luajit2/releases/tag/v2.1-20260606

added a version check that it's under 2.1.x version

📦 Package Details

Maintainer: @jmarcet
(You can find this by checking the history of the package Makefile.)

Description:

update to latest tagged version while updateing test-version.sh to check it's under 2.1.x

🧪 Run Testing Details

  • OpenWrt Version: snapshot
  • OpenWrt Target/Subtarget: x86-x64
  • OpenWrt Device: kvm vm

✅ Formalities

  • I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

If your PR contains a patch:

  • It can be applied using git am
  • It has been refreshed to avoid offsets, fuzzes, etc., using
    make package/<your-package>/refresh V=s
  • It is structured in a way that it is potentially upstreamable
    (e.g., subject line, commit description, etc.)
    We must try to upstream patches to reduce maintenance burden.

@orangepizza

Copy link
Copy Markdown
Contributor Author

@BKPepe does this looks right?

Comment thread lang/lua/luajit2/Makefile Outdated

PKG_NAME:=luajit2
PKG_SOURCE_DATE:=2026-02-27
PKG_SOURCE_DATE:=2026-06-0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is something missing.

Comment thread lang/lua/luajit2/test-version.sh Outdated
case "$PKG_NAME" in #luajit2 use build number at -v but releases are named by date
luajit2)
exit 0
if /usr/bin/luajit2 -v 2>&1 | grep -q "LuaJIT 2.1."; then

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to specify the path? Wouldn't somthing like luajit2 -v 2>&1 | grep -q "LuaJIT 2.1." sufficient? Anyway, this seems to complicated.

What about something like this?

case "$PKG_NAME" in #luajit2 use build number at -v but releases are named by date
luajit2)
	luajit2 -v 2>&1 | grep -q "LuaJIT 2.1."
	;;
*)
	echo "Untested package: $PKG_NAME" >&2
	exit 1
	;;
esac

@BKPepe BKPepe mentioned this pull request Jun 7, 2026
3 tasks
luajit2 -v 2>&1 | grep -q "LuaJIT 2.1."
;;

*)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this PR bundles a test fix together with a package update, please split it into two separate commits:

a) Update luajit2.
b) Fix test-version.sh. For this commit, please ensure the commit description clearly explains the changes, include the slightly modified version comment in the code, and add the appropriate Fixes: tag.

Comment thread lang/lua/luajit2/Makefile Outdated
Comment on lines +10 to +11
PKG_MIRROR_HASH:=10addf4f28b09f343454d891e9f19843b338b51d33683466ffb0f2ad2882cfac
PKG_SOURCE_VERSION:=a08100e7598451d4fd3a89a9826980f7c64117e7

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI/CD shows:

Hash mismatch for file luajit2-2.1.2026.06.06.tar.zst: expected 10addf4f28b09f343454d891e9f19843b338b51d33683466ffb0f2ad2882cfac, got 44a57a8bab1851e76fc345e2b99c67b9937e38aefb7941f1313539cd15219fc1
  make[2]: *** [Makefile:98: /builder/dl/luajit2-2.1.2026.06.06.tar.zst] Error 1
  make[2]: Leaving directory '/feed/lang/lua/luajit2'

For changes, see tagged commit:
https://github.com/openresty/luajit2/releases/tag/v2.1-20260606

Signed-off-by: Seo Suchan <tjtncks@gmail.com>
Comment thread lang/lua/luajit2/test-version.sh Outdated
case "$PKG_NAME" in #luajit2 use build number at -v but releases are named by date
luajit2)
exit 0
luajit2 -v 2>&1 | grep -q "LuaJIT 2.1."

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GeorgeSapkin Sorry for the ping, could you take a look at what I might be missing here? The CI/CD output doesn't seem to print the version. If I compare it to openldap or htop, those log the version correctly. Shouldn't the test always output the visible version?

@BKPepe BKPepe Jun 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@orangepizza try this one: grep -F "LuaJIT 2.1."

In my case, it works:

root@turris:~# luajit -v 2>&1 | grep -F "LuaJIT 2.1."
LuaJIT 2.1.0-beta3 -- Copyright (C) 2005-2017 Mike Pall. http://luajit.org/

@BKPepe

BKPepe commented Jun 8, 2026 via email

Copy link
Copy Markdown
Member

@BKPepe

BKPepe commented Jun 8, 2026

Copy link
Copy Markdown
Member

In commit luajit2: update test-version.sh to actual test, you are missing:

  • Fixes tag
  • Suggested-by tag

@orangepizza

Copy link
Copy Markdown
Contributor Author

have no idea what to fill fixes with: this PR itself?

@BKPepe

BKPepe commented Jun 8, 2026

Copy link
Copy Markdown
Member

@orangepizza

Copy link
Copy Markdown
Contributor Author

Like if this fixed an issus here I'd add that, but we don't have that isn't it?

@orangepizza

Copy link
Copy Markdown
Contributor Author

Have you made an issue about test version.sh cleanup?

@orangepizza orangepizza force-pushed the update-luajit2 branch 4 times, most recently from 97b3d27 to 694f877 Compare June 8, 2026 22:29
old just disabled version test, but as LuaJIt 2.1. part is stable.
So we can use that for test if luajit2 itself able to run.

Fixes: c7ca6d4 luajit2: ("add test-version.sh")
Suggested-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Signed-off-by: Seo Suchan <tjtncks@gmail.com>
@BKPepe

BKPepe commented Jun 8, 2026

Copy link
Copy Markdown
Member

Good 👍 , let's wait for CI/CD result.

@orangepizza

Copy link
Copy Markdown
Contributor Author

looks like powerpcs need some complier flag update, bug looks like riscv64 patch wasn't updated to newer code nor likely to be merged upstream

use refreshed patch from https://github.com/openresty/luajit2/pull/236/commits
patch itself is for v2.1-20260114, but it complies by SDK

Signed-off-by: Seo Suchan <tjtncks@gmail.com>
as suggested in openwrt#26577
backported luajit's patch

I don't have PowerPC thing so can't test if it actually works

Signed-off-by: Seo Suchan <tjtncks@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants