Skip to content

Commit b5d640f

Browse files
authored
Merge pull request #16 from jeaaustx/1110-rebaseAuditLog
Audit Log: 1110 rebase audit log PRs #14 & #15
2 parents 29c4cef + 7a0c95c commit b5d640f

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

scripts/build-unit-test-docker

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ except Exception:
4646
prefix = "/usr/local"
4747
proc_count = nproc().strip()
4848

49+
# Determine the library path based on architecture
50+
arch = uname("-m").strip()
51+
if arch == "ppc64le":
52+
libbase = "powerpc64le-linux-gnu/"
53+
else:
54+
# All others use architecture name
55+
libbase = f"{arch}-linux-gnu/"
4956

5057
class PackageDef(TypedDict, total=False):
5158
"""Package Definition for packages dictionary."""
@@ -158,6 +165,25 @@ packages = {
158165
rev="json-c-0.17-20230812",
159166
build_type="cmake",
160167
),
168+
"linux-audit/audit-userspace": PackageDef(
169+
rev="3.1.2",
170+
url=(
171+
lambda pkg, rev: f"https://github.com/{pkg}/archive/refs/tags/v{rev}.tar.gz"
172+
),
173+
build_type="make",
174+
custom_post_dl=["./autogen.sh",
175+
f"./configure --prefix={prefix} \
176+
--exec-prefix={prefix} \
177+
--libdir={prefix}/lib/{libbase} \
178+
--enable-gssapi-krb5=no \
179+
--with-libcap-ng=no \
180+
--with-python3=no \
181+
--with-python=no \
182+
--without-golang \
183+
--disable-zos-remote \
184+
--with-arm=no \
185+
--with-aarch64=yes"],
186+
),
161187
"linux-test-project/lcov": PackageDef(
162188
rev="v1.16",
163189
build_type="make",
@@ -195,6 +221,7 @@ packages = {
195221
"openbmc/phosphor-logging": PackageDef(
196222
depends=[
197223
"USCiLab/cereal",
224+
"linux-audit/audit-userspace",
198225
"ibm-openbmc/phosphor-dbus-interfaces",
199226
"openbmc/sdbusplus",
200227
"openbmc/sdeventplus",
@@ -675,7 +702,6 @@ if username == "root":
675702
uid = 0
676703

677704
# Determine the architecture for Docker.
678-
arch = uname("-m").strip()
679705
if arch == "ppc64le":
680706
docker_base = "ppc64le/"
681707
elif arch == "x86_64":

0 commit comments

Comments
 (0)