TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2025-12-24 13:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mount ccache dir when building package if/as required

Browse Source
This commit is contained in:
Waqar Ahmed
2023-05-24 10:23:04 +04:00
parent 3055cefd17
commit 51145fed73
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scale_build/packages/ccache.py
View File

@@ -1,3 +1,5 @@
import os
from scale_build.config import CCACHE_ENABLED from scale_build.config import CCACHE_ENABLED
@@ -8,3 +10,11 @@ class CCacheMixin:
@property @property
def ccache_enabled(self) -> bool: def ccache_enabled(self) -> bool:
return self.ccache and CCACHE_ENABLED return self.ccache and CCACHE_ENABLED
@property
def ccache_with_chroot_path(self) -> str:
return os.path.join(self.dpkg_overlay, self.ccache_in_chroot.lstrip('/'))
@property
def ccache_in_chroot(self) -> str:
return '/root/.ccache'

10
scale_build/packages/overlay.py
View File

@@ -2,7 +2,7 @@ import os
import shutil import shutil
from scale_build.utils.run import run from scale_build.utils.run import run
from scale_build.utils.paths import TMP_DIR, TMPFS from scale_build.utils.paths import CCACHE_DIR, TMP_DIR, TMPFS
class OverlayMixin: class OverlayMixin:
@@ -39,7 +39,7 @@ class OverlayMixin:
for path in (self.chroot_overlay, self.dpkg_overlay, self.sources_overlay, self.workdir_overlay): for path in (self.chroot_overlay, self.dpkg_overlay, self.sources_overlay, self.workdir_overlay):
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)
for entry in ( for entry in [
([ ([
'mount', '-t', 'overlay', '-o', 'mount', '-t', 'overlay', '-o',
f'lowerdir={self.chroot_base_directory},upperdir={self.chroot_overlay},workdir={self.workdir_overlay}', f'lowerdir={self.chroot_base_directory},upperdir={self.chroot_overlay},workdir={self.workdir_overlay}',
@@ -51,7 +51,10 @@ class OverlayMixin:
['mount', '--bind', self.sources_overlay, self.source_in_chroot], ['mount', '--bind', self.sources_overlay, self.source_in_chroot],
'Failed mount --bind /dpkg-src', self.source_in_chroot 'Failed mount --bind /dpkg-src', self.source_in_chroot
) )
): ] + ([
(['mount', '--bind', CCACHE_DIR, self.ccache_with_chroot_path],
'Failed to mount --bind ccache', self.ccache_with_chroot_path),
] if self.ccache_enabled else []):
if len(entry) == 2: if len(entry) == 2:
command, msg = entry command, msg = entry
else: else:
@@ -64,6 +67,7 @@ class OverlayMixin:
for command in ( for command in (
['umount', '-f', os.path.join(self.dpkg_overlay, 'proc')], ['umount', '-f', os.path.join(self.dpkg_overlay, 'proc')],
['umount', '-f', os.path.join(self.dpkg_overlay, 'sys')], ['umount', '-f', os.path.join(self.dpkg_overlay, 'sys')],
['umount', '-f', self.ccache_with_chroot_path],
['umount', '-f', self.dpkg_overlay], ['umount', '-f', self.dpkg_overlay],
['umount', '-R', '-f', self.dpkg_overlay], ['umount', '-R', '-f', self.dpkg_overlay],
['umount', '-R', '-f', self.tmpfs_path], ['umount', '-R', '-f', self.tmpfs_path],