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

Add phosh flavour and repository

Browse source
This commit is contained in:
jld3103 2021-10-13 20:47:19 +02:00
parent 78af4ebce8
commit 37b5ecb34b
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
constants.py
View file

@ -27,6 +27,13 @@ DEVICES = {
'bq-paella': ['device-msm8916-bq-paella'], 'bq-paella': ['device-msm8916-bq-paella'],
} }
BASE_PACKAGES = [
'base',
'base-kupfer',
'nano',
'vim',
]
FLAVOURS = { FLAVOURS = {
'barebone': { 'barebone': {
'packages': [], 'packages': [],
@ -39,6 +46,21 @@ FLAVOURS = {
'post_cmds': ['systemctl enable gdm'], 'post_cmds': ['systemctl enable gdm'],
'size': 8, 'size': 8,
}, },
'phosh': {
'packages': [
'phosh',
'squeekboard',
'gnome-control-center',
'gnome-software',
'gnome-software-packagekit-plugin',
'archlinux-appstream-data',
'gnome-initial-setup',
'kgx',
'iio-sensor-proxy',
],
'post_cmds': ['systemctl enable phosh'],
'size': 3,
}
} }
REPOSITORIES = [ REPOSITORIES = [
@ -48,6 +70,7 @@ REPOSITORIES = [
'firmware', 'firmware',
'linux', 'linux',
'main', 'main',
'phosh',
] ]
Arch = str Arch = str

8
image.py
View file

@ -4,7 +4,7 @@ import subprocess
import click import click
from logger import logging from logger import logging
from chroot import create_chroot, create_chroot_user, get_chroot_path, run_chroot_cmd from chroot import create_chroot, create_chroot_user, get_chroot_path, run_chroot_cmd
from constants import DEVICES, FLAVOURS from constants import BASE_PACKAGES, DEVICES, FLAVOURS
from config import config from config import config
from distro import get_kupfer_https, get_kupfer_local from distro import get_kupfer_https, get_kupfer_local
from wrapper import enforce_wrap from wrapper import enforce_wrap
@ -140,7 +140,7 @@ def cmd_build():
result = subprocess.run([ result = subprocess.run([
'fallocate', 'fallocate',
'-l', '-l',
f"{FLAVOURS[flavour].get('size',4)}G", f"{FLAVOURS[flavour].get('size',2)}G",
image_name, image_name,
]) ])
if result.returncode != 0: if result.returncode != 0:
@ -166,7 +166,7 @@ def cmd_build():
extra_repos = get_kupfer_local(arch).repos extra_repos = get_kupfer_local(arch).repos
else: else:
extra_repos = get_kupfer_https(arch).repos extra_repos = get_kupfer_https(arch).repos
packages = ['base', 'base-kupfer'] + DEVICES[device] + FLAVOURS[flavour]['packages'] + profile['pkgs_include'] packages = BASE_PACKAGES + DEVICES[device] + FLAVOURS[flavour]['packages'] + profile['pkgs_include']
create_chroot( create_chroot(
chroot_name, chroot_name,
arch=arch, arch=arch,
@ -181,7 +181,7 @@ def cmd_build():
password=profile['password'], password=profile['password'],
) )
if post_cmds: if post_cmds:
result = run_chroot_cmd(' && '.join(post_cmds), chroot_name) result = run_chroot_cmd(' && '.join(post_cmds), rootfs_mount)
if result.returncode != 0: if result.returncode != 0:
raise Exception('Error running post_cmds') raise Exception('Error running post_cmds')