diff options
| -rw-r--r-- | config/auto_inst.cfg.pl | 12 | ||||
| -rwxr-xr-x | files/mga_rpms/update_media.sh | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index b0373df..040cda8 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -66,20 +66,26 @@ $o = { 'denemo', # pulls in lilypond and texlive # no devel packages on live media - 'glibc-devel', 'gdb', + 'glibc-devel', 'gdb', 'gcc', + # pulls in devel deps 'empathy', + # not needed on live medias 'virtuoso-opensource', - if_($ENV{DRAKLIVE_PRODUCT} !~ /guadec/i, 'gcc'), + # theese fonts adds 20-30 sec delay / font on initial execution of + # fontconfig cache wich is _way_ too painful on live boot (mga#17223) + 'fonts-otf-source-han', '/^google-noto/', + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', #- !TYPE"64bit" packages are selected by default for live #- skip i586 ones if not relevant 'libqca1-tls', '/^lib64atlas3-/', ), - if_($ENV{DRAKLIVE_ARCH} eq 'i586', + + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^libatlas3-/', ), diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh index 0334eec..b26a23f 100755 --- a/files/mga_rpms/update_media.sh +++ b/files/mga_rpms/update_media.sh @@ -27,6 +27,10 @@ cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/efivar-*.rpm x86_64/mga_rpms/core/ cp $bcdmedia/x86_64/media/core/release/lib64efivar0-*.rpm x86_64/mga_rpms/core/ +# add problematic font (mga#17223) +cp $bcdmedia/i586/media/core/release/fonts-otf-source-han-*.rpm i586/mga_rpms/core/ +cp $bcdmedia/x86_64/media/core/release/fonts-otf-source-han-*.rpm x86_64/mga_rpms/core/ + # add dkms stuff cp $bcdmedia/i586/media/core/release/libstdc++-devel*.rpm i586/mga_rpms/core/ cp $bcdmedia/i586/media/core/release/dkms-2*.rpm i586/mga_rpms/core/ |