Skip to content

Commit 50e354b

Browse files
committed
fixed distcc building
1 parent 4dba482 commit 50e354b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

buildenv/buildpkg

+4-2
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ def main() -> None: # pylint: disable=too-many-statements
223223
o.build_dir = join(o.build_dir, o.pkg_name)
224224
_run("sudo", "-u", "alarm", "mkdir", "-p", o.build_dir)
225225

226+
if bool(o.distcc_hosts):
227+
with open("/tmp/_pikvm_use_distcc_allowed", "w") as file:
228+
pass
229+
226230
pkg = _read_pkgbuild(join(o.packages_dir, o.pkg_name))
227231
old_version = _get_latest_version(o.target_repo_dir, o.pkg_name)
228232

@@ -245,8 +249,6 @@ def main() -> None: # pylint: disable=too-many-statements
245249
_run("sed", "-i", "-e", r"s/^ShutDown() {/ShutDown() {\nexit 0/g", "/usr/bin/pump") # FIXME: pump hanging on exit
246250
_say(f"Using MAKE_J={o.distcc_make_j} (distcc)")
247251
_run("sed", "-i", "-e", f"s/^#MAKEFLAGS=.*/MAKEFLAGS=-j{o.distcc_make_j}/g", "/etc/makepkg.conf")
248-
with open("/tmp/_pikvm_use_distcc", "w") as file:
249-
pass
250252
else:
251253
_say(f"Using MAKE_J={o.make_j} (local)")
252254
_run("sed", "-i", "-e", f"s/^#MAKEFLAGS=.*/MAKEFLAGS=-j{o.make_j}/g", "/etc/makepkg.conf")

packages/linux-rpi-pikvm/PKGBUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Maintainer: Dave Higham <[email protected]>
55
# Contributer: Jan Alexander Steffens (heftig) <[email protected]>
66

7-
if [ -f "/tmp/_pikvm_use_distcc" ]; then
7+
if [ -f "/tmp/_pikvm_use_distcc_allowed" ]; then
88
_pikvm_use_distcc=1
99
fi
1010

0 commit comments

Comments
 (0)