Commit 546c345d authored by AlmAck's avatar AlmAck
Browse files

merged brli patches

parent 428a8c41
......@@ -230,16 +230,14 @@ xf86-input-wacom
xorg-fonts-75dpi
xorg-fonts-100dpi
xorg-fonts-cyrillic
ttf-dejavu
terminus-font
ttf-liberation
wqy-microhei
ttf-indic-fonts
ttf-khmer
ttf-lklug
ttf-opensans
ttf-raleway
ttf-noto
ttf-noto-cjk
# additional stuff that needs xorg
hicolor-icon-theme
......@@ -369,9 +367,6 @@ milou
baloo
kfilemetadata
# TODO, remove oxygen and replace with noto
oxygen-fonts
# base apps
kde-baseapps-kdepasswd
kde-baseapps-kdialog
......@@ -415,9 +410,6 @@ partitionmanager
kdeplasma-addons
# better integration with android devices
kio-mtp-git
# former kde-common
chakra-common
mariadb
......
......@@ -82,7 +82,8 @@ class IsoBuilder:
os.makedirs(package_dir, exist_ok=True)
pacman_config = pjoin(self.configdir, "pacman.conf")
command = "pacman -Swdd --noconfirm --cachedir {} --config {} {}"
command = "pacman -Sw --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:
line = line.strip()
......@@ -192,7 +193,7 @@ class IsoBuilder:
for file in self.squashfs_files:
shutil.copy(file, squashfs_dir)
def make_iso(self, publisher='Chakra_GNU/Linux_<http://www.chakraos.org>',
def make_iso(self, publisher='Chakra_GNU/Linux_<https://chakraos.org>',
application='Chakra_GNU/Linux_Live/Rescue_CD',
label=None,
imgname='output.iso'
......
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