parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

add exec.file.symlink() and use in BuildChroot

Browse source
This commit is contained in:
InsanePrawn 2022-08-16 03:39:29 +02:00
parent 859b08df6a
commit 4ed0b8626b
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
chroot/build.py
View file

@ -8,7 +8,7 @@ from config import config
from constants import Arch, GCC_HOSTSPECS, CROSSDIRECT_PKGS, CHROOT_PATHS
from distro.distro import get_kupfer_local
from exec.cmd import run_root_cmd
from exec.file import makedir, remove_file, root_makedir, root_write_file
from exec.file import makedir, remove_file, root_makedir, root_write_file, symlink
from .abstract import Chroot, get_chroot
from .helpers import build_chroot_name
@ -104,11 +104,11 @@ class BuildChroot(Chroot):
for target, source in {cc_path: gcc, target_lib_dir: 'lib', target_include_dir: 'usr/include'}.items():
if not os.path.exists(target):
logging.debug(f'Symlinking {source} at {target}')
os.symlink(source, target)
symlink(source, target)
ld_so = os.path.basename(glob(f"{os.path.join(native_chroot.path, 'usr', 'lib', 'ld-linux-')}*")[0])
ld_so_target = os.path.join(target_lib_dir, ld_so)
if not os.path.islink(ld_so_target):
os.symlink(os.path.join('/native', 'usr', 'lib', ld_so), ld_so_target)
symlink(os.path.join('/native', 'usr', 'lib', ld_so), ld_so_target)
else:
logging.debug(f'ld-linux.so symlink already exists, skipping for {self.name}')

7
exec/file.py
View file

@ -135,3 +135,10 @@ def makedir(path, user: Optional[str] = None, group: Optional[str] = None, paren
def root_makedir(path, parents: bool = True):
return makedir(path, user='root', group='root', parents=parents)
def symlink(source, target):
try:
os.symlink(source, target)
except:
run_root_cmd(['ln', '-s', source, target])