parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-22 13:15:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

chroot/build: mount_crossdirect(): fix symlink creation if link exists

Browse source
This commit is contained in:
InsanePrawn 2023-12-20 01:55:16 +01:00
parent 4cce7e57ae
commit a75f32b4b1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chroot/build.py
View file

@ -82,6 +82,7 @@ class BuildChroot(Chroot):
native_chroot.mount_pacman_cache() native_chroot.mount_pacman_cache()
native_chroot.mount_packages() native_chroot.mount_packages()
native_chroot.activate() native_chroot.activate()
logging.debug(f"Installing {CROSSDIRECT_PKGS=} + {gcc=}")
results = dict(native_chroot.try_install_packages( results = dict(native_chroot.try_install_packages(
CROSSDIRECT_PKGS + [gcc], CROSSDIRECT_PKGS + [gcc],
refresh=True, refresh=True,
@ -103,8 +104,8 @@ class BuildChroot(Chroot):
target_include_dir = os.path.join(self.path, 'include') target_include_dir = os.path.join(self.path, 'include')
for target, source in {cc_path: gcc, target_lib_dir: 'lib', target_include_dir: 'usr/include'}.items(): for target, source in {cc_path: gcc, target_lib_dir: 'lib', target_include_dir: 'usr/include'}.items():
if not os.path.exists(target): if not (os.path.exists(target) or os.path.islink(target)):
logging.debug(f'Symlinking {source} at {target}') logging.debug(f'Symlinking {source=} at {target=}')
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 = 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) ld_so_target = os.path.join(target_lib_dir, ld_so)