summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-08-25 20:01:49 +0200
committerChristian Breunig <christian@breunig.cc>2023-08-25 20:02:42 +0200
commit28e63c2dcaf1b64aeb7928d29ca5b541413cf8f8 (patch)
tree92e027f5e22c6a35092b64c80cc307c222d63781 /packages
parent6bafde7f8a90c9d66d2b71bf397dd7a84a83a8e6 (diff)
downloadvyos-build-28e63c2dcaf1b64aeb7928d29ca5b541413cf8f8.tar.gz
vyos-build-28e63c2dcaf1b64aeb7928d29ca5b541413cf8f8.zip
jool: T5499: fix AttributeError: 'int' object has no attribute 'strip'
This fixes an error introduced by commit 3d5445d8f7c0 ("T5499: arm64: build jool with correct depends").
Diffstat (limited to 'packages')
-rw-r--r--packages/linux-kernel/.gitignore1
-rwxr-xr-xpackages/linux-kernel/build-jool.py5
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux-kernel/.gitignore b/packages/linux-kernel/.gitignore
index bde74f5..b3aa640 100644
--- a/packages/linux-kernel/.gitignore
+++ b/packages/linux-kernel/.gitignore
@@ -5,6 +5,7 @@
/intel-qat
/linux-firmware
/ovpn-dco
+/jool*
/qat*
/QAT*
*.tar.xz
diff --git a/packages/linux-kernel/build-jool.py b/packages/linux-kernel/build-jool.py
index 5474e60..5f26c3b 100755
--- a/packages/linux-kernel/build-jool.py
+++ b/packages/linux-kernel/build-jool.py
@@ -6,9 +6,8 @@ from pathlib import Path
from subprocess import run
def find_arch() -> str:
- import os
- arch = os.system("dpkg-architecture -q DEB_HOST_ARCH").strip()
- return arch
+ tmp=run(['dpkg-architecture', '-q', 'DEB_HOST_ARCH'], capture_output=True)
+ return tmp.stdout.decode().strip()
# dependency modifier
def add_depends(package_dir: str, package_name: str,