diff --git a/lua-cjson.yaml b/lua-cjson.yaml index 05476910b75..82d2a7ae50c 100644 --- a/lua-cjson.yaml +++ b/lua-cjson.yaml @@ -1,7 +1,7 @@ package: name: lua-cjson version: 2.1.0.10 - epoch: 1 + epoch: 2 description: "Lua CJSON is a fast JSON encoding/parsing module for Lua" copyright: - license: MIT @@ -11,7 +11,7 @@ package: environment: contents: packages: - - wolfi-base + - wolfi-baselayout - busybox - build-base - ca-certificates-bundle diff --git a/luajit.yaml b/luajit.yaml index a98d4d6b657..371985c6c99 100644 --- a/luajit.yaml +++ b/luajit.yaml @@ -1,7 +1,7 @@ package: name: luajit version: 2.1_p20210510 - epoch: 2 + epoch: 3 description: OpenResty's branch of LuaJIT copyright: - license: MIT @@ -22,14 +22,14 @@ pipeline: uri: https://github.com/openresty/luajit2/archive/v2.1-20210510/luajit${{package.version}}.tar.gz - runs: | - export LUAJIT_LIB=${{targets.destdir}}/usr/lib + export LUAJIT_LIB=/usr/lib export LUA_LIB_DIR="$LUAJIT_LIB/lua" - export LUAJIT_INC=${{targets.destdir}}/usr/include/luajit-2.1 + export LUAJIT_INC=/usr/include/luajit-2.1 make CCDEBUG=-g make DESTDIR="${{targets.destdir}}" install PREFIX=/usr - ln -s ${{targets.destdir}}/usr/bin/luajit ${{targets.destdir}}/usr/bin/lua + ln -s luajit ${{targets.destdir}}/usr/bin/lua ln -s "$LUAJIT_INC" ${{targets.destdir}}/usr/include/lua subpackages: