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

image.py: fix building (remove incorrect inode reservation)

Browse source
This commit is contained in:
InsanePrawn 2021-10-26 05:41:22 +02:00
parent 955546c918
commit 013a7a88d1
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
image.py
View file

@ -113,6 +113,7 @@ def losetup_rootfs_image(image_path: str, sector_size: int) -> str:
'-f', '-f',
'-b', '-b',
str(sector_size), str(sector_size),
'-P',
image_path, image_path,
]) ])
if result.returncode != 0: if result.returncode != 0:
@ -158,12 +159,12 @@ def mount_rootfs_loop_device(loop_device, chroot: Chroot):
logging.debug(f'Mounting {loop_device}p2 at {chroot.path}') logging.debug(f'Mounting {loop_device}p2 at {chroot.path}')
chroot.mount_rootfs(loop_device + 'p2') chroot.mount_rootfs(loop_device + 'p2')
assert (os.path.ismount(chroot.path))
if not os.path.exists(f'{chroot.path}/boot'): os.makedirs(chroot.get_path('boot'), exist_ok=True)
os.makedirs(f'{chroot.path}/boot')
logging.debug(f'Mounting {loop_device}p1 at {chroot.path}/boot') logging.debug(f'Mounting {loop_device}p1 at {chroot.path}/boot')
chroot.mount(loop_device + 'p1', '/boot') chroot.mount(loop_device + 'p1', '/boot', options=['defaults'])
def dump_bootimg(image_path: str) -> str: def dump_bootimg(image_path: str) -> str:
@ -237,6 +238,7 @@ def cmd_build():
chroot = get_device_chroot(device=device, flavour=flavour, arch=arch, packages=packages, extra_repos=extra_repos) chroot = get_device_chroot(device=device, flavour=flavour, arch=arch, packages=packages, extra_repos=extra_repos)
image_path = get_image_path(chroot) image_path = get_image_path(chroot)
os.makedirs(config.get_path('images'), exist_ok=True)
new_image = not os.path.exists(image_path) new_image = not os.path.exists(image_path)
if new_image: if new_image:
result = subprocess.run([ result = subprocess.run([
@ -281,8 +283,6 @@ def cmd_build():
'-F', '-F',
'-L', '-L',
'kupfer_root', 'kupfer_root',
'-N',
'100000',
f'{loop_device}p2', f'{loop_device}p2',
]) ])
if result.returncode != 0: if result.returncode != 0:
@ -290,7 +290,7 @@ def cmd_build():
mount_rootfs_loop_device(loop_device, chroot) mount_rootfs_loop_device(loop_device, chroot)
chroot.mount_rootfs(image_path) chroot.mount_pacman_cache()
chroot.initialize() chroot.initialize()
chroot.activate() chroot.activate()
chroot.create_user( chroot.create_user(

1
requirements.txt
View file

@ -1,3 +1,4 @@
click==8.0.1 click==8.0.1
appdirs==1.4.4 appdirs==1.4.4
joblib==1.0.1 joblib==1.0.1
toml