mirror of
https://gitlab.com/kupfer/kupferbootstrap.git
synced 2025-02-23 13:45:45 -05:00
Add phosh flavour and repository
This commit is contained in:
parent
78af4ebce8
commit
37b5ecb34b
2 changed files with 27 additions and 4 deletions
23
constants.py
23
constants.py
|
@ -27,6 +27,13 @@ DEVICES = {
|
|||
'bq-paella': ['device-msm8916-bq-paella'],
|
||||
}
|
||||
|
||||
BASE_PACKAGES = [
|
||||
'base',
|
||||
'base-kupfer',
|
||||
'nano',
|
||||
'vim',
|
||||
]
|
||||
|
||||
FLAVOURS = {
|
||||
'barebone': {
|
||||
'packages': [],
|
||||
|
@ -39,6 +46,21 @@ FLAVOURS = {
|
|||
'post_cmds': ['systemctl enable gdm'],
|
||||
'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 = [
|
||||
|
@ -48,6 +70,7 @@ REPOSITORIES = [
|
|||
'firmware',
|
||||
'linux',
|
||||
'main',
|
||||
'phosh',
|
||||
]
|
||||
|
||||
Arch = str
|
||||
|
|
8
image.py
8
image.py
|
@ -4,7 +4,7 @@ import subprocess
|
|||
import click
|
||||
from logger import logging
|
||||
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 distro import get_kupfer_https, get_kupfer_local
|
||||
from wrapper import enforce_wrap
|
||||
|
@ -140,7 +140,7 @@ def cmd_build():
|
|||
result = subprocess.run([
|
||||
'fallocate',
|
||||
'-l',
|
||||
f"{FLAVOURS[flavour].get('size',4)}G",
|
||||
f"{FLAVOURS[flavour].get('size',2)}G",
|
||||
image_name,
|
||||
])
|
||||
if result.returncode != 0:
|
||||
|
@ -166,7 +166,7 @@ def cmd_build():
|
|||
extra_repos = get_kupfer_local(arch).repos
|
||||
else:
|
||||
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(
|
||||
chroot_name,
|
||||
arch=arch,
|
||||
|
@ -181,7 +181,7 @@ def cmd_build():
|
|||
password=profile['password'],
|
||||
)
|
||||
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:
|
||||
raise Exception('Error running post_cmds')
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue