aports.lua: read functions.sh so we get the CARCH set
This commit is contained in:
parent
8b9f1f2448
commit
abfc6c29ef
22
aports.lua
22
aports.lua
@ -1,6 +1,7 @@
|
|||||||
module(..., package.seeall)
|
module(..., package.seeall)
|
||||||
|
|
||||||
abuild_conf_file = "/etc/abuild.conf"
|
abuild_conf_file = "/etc/abuild.conf"
|
||||||
|
abuild_functions = "/usr/share/abuild/functions.sh"
|
||||||
|
|
||||||
local abuild_conf = {}
|
local abuild_conf = {}
|
||||||
|
|
||||||
@ -72,9 +73,9 @@ local function parse_apkbuilds(dirs)
|
|||||||
--expand repos
|
--expand repos
|
||||||
for i,v in ipairs(dirs) do
|
for i,v in ipairs(dirs) do
|
||||||
str = str..v.."/*/APKBUILD "
|
str = str..v.."/*/APKBUILD "
|
||||||
end
|
end
|
||||||
|
|
||||||
local p = io.popen([[
|
local p = io.popen(". "..abuild_functions..";"..[[
|
||||||
for i in ]]..str..[[; do
|
for i in ]]..str..[[; do
|
||||||
pkgname=
|
pkgname=
|
||||||
pkgver=
|
pkgver=
|
||||||
@ -85,11 +86,12 @@ local function parse_apkbuilds(dirs)
|
|||||||
subpackages=
|
subpackages=
|
||||||
source=
|
source=
|
||||||
url=
|
url=
|
||||||
dir="${i%/APKBUILD}"
|
dir="${i%/APKBUILD}";
|
||||||
cd "$dir"
|
[ -n "$dir" ] || exit 1;
|
||||||
. ./APKBUILD
|
cd "$dir";
|
||||||
echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$depends\|$makedepends\|$subpackages\|$source\|$url
|
. ./APKBUILD;
|
||||||
done
|
echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$depends\|$makedepends\|$subpackages\|$source\|$url ;
|
||||||
|
done;
|
||||||
]])
|
]])
|
||||||
return function()
|
return function()
|
||||||
local line = p:read("*line")
|
local line = p:read("*line")
|
||||||
@ -97,7 +99,7 @@ local function parse_apkbuilds(dirs)
|
|||||||
p:close()
|
p:close()
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
return split_apkbuild(line)
|
return split_apkbuild(line)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -256,7 +258,7 @@ end
|
|||||||
function Aports:foreach(f)
|
function Aports:foreach(f)
|
||||||
local k,v
|
local k,v
|
||||||
for k,v in pairs(self.apks) do
|
for k,v in pairs(self.apks) do
|
||||||
f(k,v)
|
f(k,v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user