Commit 865db26a authored by BrLi's avatar BrLi

Manually merge

parents a2f01e1b 449af5b2
Pipeline #1370 skipped with stages
......@@ -4,6 +4,7 @@ Dependencies:
- python3
- libisoburn
- efitools
- syslinux
# gitlab-runner
## Installation
......
......@@ -115,6 +115,7 @@ xorg-xrdb
xorg-xauth
xorg-xinit
xorg-apps
xorg-xrandr
# xorg video drivers
xf86-video-amdgpu
......@@ -135,6 +136,7 @@ xf86-input-wacom
ttf-indic-fonts
ttf-lklug
ttf-raleway
ttf-opensans
ttf-noto
ttf-noto-cjk
ttf-noto-emoji
......@@ -340,6 +342,13 @@ kde-telepathy
fcitx-qt5
kcm-fcitx
# fcitx input methods
fcitx-chewing
fcitx-table-extra
fcitx-googlepinyin
fcitx-kkc
fcitx-hangul
# old QsystemTryIcon (like Skype) integration
sni-qt
......@@ -423,9 +432,3 @@ epsoneplijs
epson-inkjet-printer-escpr
samba
# fcitx input methods
fcitx-chewing
fcitx-table-extra
fcitx-libpinyin
fcitx-kkc
......@@ -82,7 +82,7 @@ class IsoBuilder:
os.makedirs(package_dir, exist_ok=True)
pacman_config = pjoin(self.configdir, "pacman.conf")
command = "pacman -Sw --noconfirm --cachedir {} --config {} {}"
command = "pacman -Sywdd --noconfirm --cachedir {} --config {} {}"
# pacman -Sw doesn't check dependencies with installed system, but it will fetch required packages altogether
with open(os.path.join(self.configdir, "overlay-packages.conf")) as packages:
for line in packages:
......@@ -97,12 +97,10 @@ class IsoBuilder:
).split())
def prepare_efi_img(self):
efitools_path = "/usr/share/efitools/efi/"
assert os.path.isdir(efitools_path), "efitools must be installed"
efi_path = "/usr/lib/syslinux/efi64/"
assert os.path.isdir(efi_path), "syslinux must be installed"
key_path = "/usr/share/refind/keys/"
assert os.path.isdir(key_path), "refind-efi must be installed"
prebootloader_path = "/usr/lib/efitools/efi"
assert os.path.isdir(prebootloader_path), "efitools must be installed"
systemd_path = "/usr/lib/systemd/boot/efi"
assert os.path.isdir(systemd_path), "systemd >=220 must be installed"
with open("log", "w") as log:
os.makedirs(pjoin(self.iso_root, "EFI/chakraiso"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment