summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--NEWS28
-rw-r--r--bootloader/Makefile2
-rw-r--r--bootloader/po/.tx/config2
-rw-r--r--bootloader/po/ast.po18
-rw-r--r--bootloader/po/eo.po13
-rw-r--r--bootloader/po/fi.po85
-rw-r--r--bootloader/po/he.po86
-rw-r--r--bootloader/po/nl.po5
-rw-r--r--bootloader/po/pt.po27
-rw-r--r--bootloader/po/ru.po9
-rw-r--r--bootloader/po/zh_CN.po5
-rw-r--r--examples/gui/config/build.cfg1
-rw-r--r--examples/minimal/config/build.cfg3
-rw-r--r--examples/xfce/config/build.cfg3
-rw-r--r--lib/MGA/DrakISO/BuildBoot.pm2
-rw-r--r--lib/MGA/DrakISO/BuildMedia.pm54
-rw-r--r--lib/MGA/DrakISO/BuildRoot.pm4
-rw-r--r--lib/MGA/DrakISO/Utils.pm2
19 files changed, 274 insertions, 77 deletions
diff --git a/Makefile b/Makefile
index efedf24..a6ec30b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NAME = drakiso
-VERSION = 1.15
+VERSION = 1.20
all:
make -C bootloader
diff --git a/NEWS b/NEWS
index accfec9..2a5b214 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+1.20
+
+- translation updates
+
+1.19
+
+- improved algorithm for selecting packages from rpmsrate
+
+1.18
+
+- change ESP label to MGAISO-ESP (mga#28409)
+- optimise drakclassic build media step
+- translation updates
+
+1.17
+
+- bootloader:
+ - add f2fs module
+ - update translations
+- examples:
+ - remove obsolete nvidia340 drivers
+ - remove obsolete capi4linux service
+
+1.16
+
+- support use of https in repository URLs (mga#27776)
+- translation updates
+
1.15
- draklive2: show installer summary screen when GUI is used
diff --git a/bootloader/Makefile b/bootloader/Makefile
index c2cbd8c..bd8f7b0 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -2,7 +2,7 @@ MY_TARGETS = images kbd-names.txt lang-kbds.txt maggy unicode.pf2
ARCH = $(shell uname -m)
-GRUB2_MODULES = iso9660 ext2 fat jfs reiserfs xfs \
+GRUB2_MODULES = iso9660 ext2 fat f2fs jfs reiserfs xfs \
part_apple part_bsd part_gpt part_msdos \
all_video font gfxterm gfxmenu png \
boot chain configfile echo gettext \
diff --git a/bootloader/po/.tx/config b/bootloader/po/.tx/config
index f61e495..40f797b 100644
--- a/bootloader/po/.tx/config
+++ b/bootloader/po/.tx/config
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
-[mageia.drakiso]
+[o:MageiaLinux:p:mageia:r:drakiso]
file_filter = <lang>.po
source_file = bootloader.pot
source_lang = en
diff --git a/bootloader/po/ast.po b/bootloader/po/ast.po
index 14da3ba..f4aeabc 100644
--- a/bootloader/po/ast.po
+++ b/bootloader/po/ast.po
@@ -47,31 +47,31 @@ msgid "Keyboard [$kbd]"
msgstr "Tecláu [$kbd]"
msgid "[more options after boot]"
-msgstr ""
+msgstr "[más opciones dempués del arrinque]"
msgid "Install Mageia"
-msgstr ""
+msgstr "Instalar Mageia"
msgid "Rescue System"
msgstr "Sistema de rescate"
msgid "Memory Test"
-msgstr ""
+msgstr "Prueba de memoria"
msgid "Boot Mageia Live"
-msgstr ""
+msgstr "Arrincar Mageia Live"
msgid "Install Mageia Live"
-msgstr ""
+msgstr "Instalar Mageia Live"
msgid " + use non-free NVIDIA drivers (slower to boot)"
-msgstr ""
+msgstr " + usar los controladores non llibres de NVIDIA (arrinque más lentu)"
msgid "Select an item with the arrow keys and press Enter to boot."
-msgstr ""
+msgstr "Esbilla un elementu coles fleches del tecláu y primi Intro p'arrincar"
msgid "Press 'c' for command line, 'e' to edit."
-msgstr ""
+msgstr "Primi «c» pa la llinia de comandos y «e» pa editar."
# NOTE: The Mageia grub2 package replaces one of the upstream messages
# with this, but doesn't provide any translations. This doesn't need
@@ -80,3 +80,5 @@ msgid ""
"Press Ctrl-x to start, Ctrl-c for a command prompt or Escape to discard "
"edits and return to the menu. Pressing Tab lists possible completions."
msgstr ""
+"Primi Ctrl-X p'aniciar, Ctrl-C pa la llinia de comandos o Esc pa escartar "
+"los cambeos y volver al menú. El tabulador completa comandos si ye posible."
diff --git a/bootloader/po/eo.po b/bootloader/po/eo.po
index a3ec0cf..8ed25b3 100644
--- a/bootloader/po/eo.po
+++ b/bootloader/po/eo.po
@@ -15,13 +15,14 @@
#
# Translators:
# Yuri Chornoivan <yurchor@ukr.net>, 2018
-# Gilberto F da Silva <gfs1989@gmx.net>, 2018
+# Gilberto F da Silva <gfs1989@gmx.net>, 2020
+#
msgid ""
msgstr ""
"Project-Id-Version: drakiso\n"
"POT-Creation-Date: 2018-03-09 00:38+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Gilberto F da Silva <gfs1989@gmx.net>, 2018\n"
+"PO-Revision-Date: 2018-04-05 04:22+0000\n"
+"Last-Translator: Gilberto F da Silva <gfs1989@gmx.net>, 2020\n"
"Language-Team: Esperanto (https://www.transifex.com/MageiaLinux/teams/9361/"
"eo/)\n"
"Language: eo\n"
@@ -31,10 +32,10 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "Kernel [original]"
-msgstr ""
+msgstr "Kerno [originala]"
msgid "Kernel [latest]"
-msgstr ""
+msgstr "Kerno [plej nova]"
# NOTE: Please leave "[$lang]" untranslated - it is automatically replaced
# by the currently selected language code (e.g. en_US).
@@ -65,7 +66,7 @@ msgid "Install Mageia Live"
msgstr "Instali Mageia Live"
msgid " + use non-free NVIDIA drivers (slower to boot)"
-msgstr "+ uzu senpagajn filmetilojn (pli malrapidaj por ekkapti)"
+msgstr "+ uzu ne libera NVIDIA-ŝoforojn (pli malrapide ekŝarĝante)"
msgid "Select an item with the arrow keys and press Enter to boot."
msgstr "Elektu eron per la sagaj klavoj kaj premu Enter por komenci."
diff --git a/bootloader/po/fi.po b/bootloader/po/fi.po
new file mode 100644
index 0000000..d011fa5
--- /dev/null
+++ b/bootloader/po/fi.po
@@ -0,0 +1,85 @@
+# Translations for Mageia ISO bootloader
+# Copyright (C) 2017-2018 Mageia
+#
+# NOTE: If you add a new language, please uncomment (or add if necessary)
+# the corresponding line(s) in the lang-names.txt file. Do correct them
+# if they are wrong!
+#
+# NOTE: Except where noted, all strings must fit on a single line on the
+# bootloader screen (which may be running at a low resolution). Please keep
+# the translated strings as short as possible.
+#
+# NOTE: grub2 currently doesn't display some scripts properly. It is probably
+# best not to enable these languages. Language codes known to be affected
+# are: bn gu hi mr pa si ta
+#
+# Translators:
+# Yuri Chornoivan <yurchor@ukr.net>, 2018
+# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2023
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: drakiso\n"
+"POT-Creation-Date: 2018-03-09 00:38+0000\n"
+"PO-Revision-Date: 2018-04-05 04:22+0000\n"
+"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2023\n"
+"Language-Team: Finnish (https://app.transifex.com/MageiaLinux/teams/9361/"
+"fi/)\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Kernel [original]"
+msgstr "Kernel [alkuperäinen]"
+
+msgid "Kernel [latest]"
+msgstr "Kernel [viimeisin]"
+
+# NOTE: Please leave "[$lang]" untranslated - it is automatically replaced
+# by the currently selected language code (e.g. en_US).
+msgid "Language [$lang]"
+msgstr "Kieli [$lang]"
+
+# NOTE: Please leave "[$kbd]" untranslated - it is automatically replaced
+# by the currently selected keyboard code (e.g. us).
+msgid "Keyboard [$kbd]"
+msgstr "Näppäimistö [$kbd]"
+
+msgid "[more options after boot]"
+msgstr "[lisää valintoja käynnistyksen jälkeen]"
+
+msgid "Install Mageia"
+msgstr "Asenna Mageia"
+
+msgid "Rescue System"
+msgstr "Korjausjärjestelmä"
+
+msgid "Memory Test"
+msgstr "Muistitesti"
+
+msgid "Boot Mageia Live"
+msgstr "Käynnistä Mageia Live"
+
+msgid "Install Mageia Live"
+msgstr "Asenna Mageia Live"
+
+msgid " + use non-free NVIDIA drivers (slower to boot)"
+msgstr " + käytä non-free NVIDIA drivers (käynnistyy hitaammin)"
+
+msgid "Select an item with the arrow keys and press Enter to boot."
+msgstr "Valitse kohde nuolinäppäimillä ja paina Enter."
+
+msgid "Press 'c' for command line, 'e' to edit."
+msgstr "Komentoriville painamalla 'c', muokkaukseen 'e'."
+
+# NOTE: The Mageia grub2 package replaces one of the upstream messages
+# with this, but doesn't provide any translations. This doesn't need
+# to fit on a single line.
+msgid ""
+"Press Ctrl-x to start, Ctrl-c for a command prompt or Escape to discard "
+"edits and return to the menu. Pressing Tab lists possible completions."
+msgstr ""
+"Aloita painamalla Ctrl-x, komentokehoite Ctrl-c tai Esc hylkää muutokset ja "
+"palaa valikkoon. Sarkaimen painaminen näyttää mahdolliset täydennykset."
diff --git a/bootloader/po/he.po b/bootloader/po/he.po
new file mode 100644
index 0000000..2e604ee
--- /dev/null
+++ b/bootloader/po/he.po
@@ -0,0 +1,86 @@
+# Translations for Mageia ISO bootloader
+# Copyright (C) 2017-2018 Mageia
+#
+# NOTE: If you add a new language, please uncomment (or add if necessary)
+# the corresponding line(s) in the lang-names.txt file. Do correct them
+# if they are wrong!
+#
+# NOTE: Except where noted, all strings must fit on a single line on the
+# bootloader screen (which may be running at a low resolution). Please keep
+# the translated strings as short as possible.
+#
+# NOTE: grub2 currently doesn't display some scripts properly. It is probably
+# best not to enable these languages. Language codes known to be affected
+# are: bn gu hi mr pa si ta
+#
+# Translators:
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2018
+# Omer I.S. <omeritzicschwartz@gmail.com>, 2021
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: drakiso\n"
+"POT-Creation-Date: 2018-03-09 00:38+0000\n"
+"PO-Revision-Date: 2018-04-05 04:22+0000\n"
+"Last-Translator: Omer I.S. <omeritzicschwartz@gmail.com>, 2021\n"
+"Language-Team: Hebrew (https://www.transifex.com/MageiaLinux/teams/9361/"
+"he/)\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
+"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+
+msgid "Kernel [original]"
+msgstr "ליבה [original]"
+
+msgid "Kernel [latest]"
+msgstr "ליבה [latest]"
+
+# NOTE: Please leave "[$lang]" untranslated - it is automatically replaced
+# by the currently selected language code (e.g. en_US).
+msgid "Language [$lang]"
+msgstr "שפה [$lang]"
+
+# NOTE: Please leave "[$kbd]" untranslated - it is automatically replaced
+# by the currently selected keyboard code (e.g. us).
+msgid "Keyboard [$kbd]"
+msgstr "מקלדת [$kbd]"
+
+msgid "[more options after boot]"
+msgstr "[אפשרויות נוספות יהיו לאחר ההפעלה]"
+
+msgid "Install Mageia"
+msgstr "התקנת Mageia"
+
+msgid "Rescue System"
+msgstr "הצלת המערכת"
+
+msgid "Memory Test"
+msgstr "בדיקת זיכרון"
+
+msgid "Boot Mageia Live"
+msgstr "הפעלת Mageia במצב המחשה"
+
+msgid "Install Mageia Live"
+msgstr "התקנת Mageia מתוך מצב ההמחשה"
+
+msgid " + use non-free NVIDIA drivers (slower to boot)"
+msgstr " + שימוש במנהלי התקנים שאינם חופשיים עבור NVIDIA (הפעלה איטית יותר)"
+
+msgid "Select an item with the arrow keys and press Enter to boot."
+msgstr "נא לבחור פריט בעזרת מקשי החיצים וללחוץ על Enter להפעלה."
+
+msgid "Press 'c' for command line, 'e' to edit."
+msgstr "מקש \"c\" לשורת הפקודה, מקש \"e\" לעריכה."
+
+# NOTE: The Mageia grub2 package replaces one of the upstream messages
+# with this, but doesn't provide any translations. This doesn't need
+# to fit on a single line.
+msgid ""
+"Press Ctrl-x to start, Ctrl-c for a command prompt or Escape to discard "
+"edits and return to the menu. Pressing Tab lists possible completions."
+msgstr ""
+"‏Ctrl+x להתחלה, Ctrl+c לשורת הפקודה או Escape לביטול העריכות וחזרה לתפריט. "
+"לחיצה על Tab מציגה את ההשלמות האפשריות."
diff --git a/bootloader/po/nl.po b/bootloader/po/nl.po
index 9b87ccc..abaa519 100644
--- a/bootloader/po/nl.po
+++ b/bootloader/po/nl.po
@@ -16,13 +16,14 @@
# Translators:
# Yuri Chornoivan <yurchor@ukr.net>, 2018
# dragnadh, 2019
+# Marcel Pol <marcel@timelord.nl>, 2021
#
msgid ""
msgstr ""
"Project-Id-Version: drakiso\n"
"POT-Creation-Date: 2018-03-09 00:38+0000\n"
"PO-Revision-Date: 2018-04-05 04:22+0000\n"
-"Last-Translator: dragnadh, 2019\n"
+"Last-Translator: Marcel Pol <marcel@timelord.nl>, 2021\n"
"Language-Team: Dutch (https://www.transifex.com/MageiaLinux/teams/9361/nl/)\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
@@ -65,7 +66,7 @@ msgid "Install Mageia Live"
msgstr "Installeer Mageia Live"
msgid " + use non-free NVIDIA drivers (slower to boot)"
-msgstr "+ gebruik niet-vrije NVIDIA drivers (start trager op)"
+msgstr "+ gebruik niet-vrije NVIDIA-stuurprogramma's (start trager op)"
msgid "Select an item with the arrow keys and press Enter to boot."
msgstr ""
diff --git a/bootloader/po/pt.po b/bootloader/po/pt.po
index 148386c..81f9bb6 100644
--- a/bootloader/po/pt.po
+++ b/bootloader/po/pt.po
@@ -14,23 +14,24 @@
# are: bn gu hi mr pa si ta
#
# Translators:
-# Yuri Chornoivan <yurchor@ukr.net>, 2018
-# MS <manuelarodsilva@gmail.com>, 2018
# Rui <xymarior@yandex.com>, 2018
+# Sérgio Marques <smarquespt@gmail.com>, 2019
+# Manuela Silva <mmsrs@sky.com>, 2020
#
msgid ""
msgstr ""
"Project-Id-Version: drakiso\n"
"POT-Creation-Date: 2018-03-09 00:38+0000\n"
"PO-Revision-Date: 2018-04-05 04:22+0000\n"
-"Last-Translator: Rui <xymarior@yandex.com>, 2018\n"
-"Language-Team: Portuguese (https://www.transifex.com/MageiaLinux/teams/9361/"
+"Last-Translator: Manuela Silva <mmsrs@sky.com>, 2020\n"
+"Language-Team: Portuguese (https://app.transifex.com/MageiaLinux/teams/9361/"
"pt/)\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % "
+"1000000 == 0 ? 1 : 2;\n"
msgid "Kernel [original]"
msgstr "Kernel [original]"
@@ -55,24 +56,24 @@ msgid "Install Mageia"
msgstr "Instalar Mageia"
msgid "Rescue System"
-msgstr "Sistema de Recuperação"
+msgstr "Sistema de recuperação"
msgid "Memory Test"
msgstr "Teste de Memória"
msgid "Boot Mageia Live"
-msgstr "Arranque Mageia Live"
+msgstr "Arrancar Mageia Live"
msgid "Install Mageia Live"
msgstr "Instalar Mageia Live"
msgid " + use non-free NVIDIA drivers (slower to boot)"
-msgstr " + usar controladores de vídeo não livres (mais lento ao arrancar)"
+msgstr "+ utilizar controladores NVIDIA proprietários (mais lento ao iniciar)"
msgid "Select an item with the arrow keys and press Enter to boot."
msgstr ""
-"Selecione um item com as teclas de setas e pressione Enter para o sistema "
-"arrancar."
+"Selecione um item com as teclas de setas e prima Enter para arrancar o "
+"sistema."
msgid "Press 'c' for command line, 'e' to edit."
msgstr "Pressione 'c' para a linha de comandos, 'e' para editar."
@@ -84,6 +85,6 @@ msgid ""
"Press Ctrl-x to start, Ctrl-c for a command prompt or Escape to discard "
"edits and return to the menu. Pressing Tab lists possible completions."
msgstr ""
-"Pressione Ctrl-x para iniciar, Ctrl-c para uma linha de comandos ou Escape "
-"para descartar as edições e voltar ao menu. Pressionar a tecla Tab lista "
-"terminações possíveis."
+"Prima Ctrl-x para iniciar, Ctrl-c para uma linha de comandos ou Escape para "
+"descartar as edições e voltar ao menu. A tecla Tab lista as conclusões "
+"possíveis."
diff --git a/bootloader/po/ru.po b/bootloader/po/ru.po
index ddd9e24..48807b0 100644
--- a/bootloader/po/ru.po
+++ b/bootloader/po/ru.po
@@ -16,14 +16,15 @@
# Translators:
# Yuri Chornoivan <yurchor@ukr.net>, 2018
# AlexL <loginov.alex.valer@gmail.com>, 2019
+# Victor, 2022
#
msgid ""
msgstr ""
"Project-Id-Version: drakiso\n"
"POT-Creation-Date: 2018-03-09 00:38+0000\n"
"PO-Revision-Date: 2018-04-05 04:22+0000\n"
-"Last-Translator: AlexL <loginov.alex.valer@gmail.com>, 2019\n"
-"Language-Team: Russian (https://www.transifex.com/MageiaLinux/teams/9361/"
+"Last-Translator: Victor, 2022\n"
+"Language-Team: Russian (https://app.transifex.com/MageiaLinux/teams/9361/"
"ru/)\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -86,5 +87,5 @@ msgid ""
"edits and return to the menu. Pressing Tab lists possible completions."
msgstr ""
"Нажмите Ctrl-X, чтобы запустить, Ctrl-C, чтобы перейти к командной строке, "
-"или Esc, чтобы отбросить изменения и вернуться в меню. Нажмите Tab, чтобы "
-"увидеть список возможных вариантов записи."
+"или Esc, чтобы отменить изменения и вернуться в меню. Нажатие Tab перечислит "
+"список возможных вариантов записи."
diff --git a/bootloader/po/zh_CN.po b/bootloader/po/zh_CN.po
index de8bd1a..2b21b38 100644
--- a/bootloader/po/zh_CN.po
+++ b/bootloader/po/zh_CN.po
@@ -16,13 +16,14 @@
# Translators:
# Yuri Chornoivan <yurchor@ukr.net>, 2018
# zwpwjwtz <zwpwjwtz@126.com>, 2018
+# Dmitry <dmitrydmitry761@gmail.com>, 2021
#
msgid ""
msgstr ""
"Project-Id-Version: drakiso\n"
"POT-Creation-Date: 2018-03-09 00:38+0000\n"
"PO-Revision-Date: 2018-04-05 04:22+0000\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>, 2018\n"
+"Last-Translator: Dmitry <dmitrydmitry761@gmail.com>, 2021\n"
"Language-Team: Chinese (China) (https://www.transifex.com/MageiaLinux/"
"teams/9361/zh_CN/)\n"
"Language: zh_CN\n"
@@ -66,7 +67,7 @@ msgid "Install Mageia Live"
msgstr "安装 Mageia Live"
msgid " + use non-free NVIDIA drivers (slower to boot)"
-msgstr "+ 使用非自由图形驱动(引导速度稍慢)"
+msgstr " + 使用非免费的 NVIDIA 驱动程序(它们加载速度较慢)"
msgid "Select an item with the arrow keys and press Enter to boot."
msgstr "请用方向键选择要引导的系统,然后按回车键引导。"
diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index da401f2..0710d40 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -97,7 +97,6 @@ my $config = {
# nonfree
'dkms-broadcom-wl',
- 'dkms-nvidia340', 'x11-driver-video-nvidia340',
'dkms-nvidia390', 'x11-driver-video-nvidia390',
if_($arch eq 'x86_64',
'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index ae7e7a9..dc78c9e 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/config/build.cfg
@@ -67,7 +67,6 @@ my $config = {
# No proprietary drivers
'dkms-broadcom-wl',
- 'dkms-nvidia340', 'x11-driver-video-nvidia340',
'dkms-nvidia390', 'x11-driver-video-nvidia390',
'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
@@ -94,7 +93,7 @@ my $config = {
disable_services => [
# Uncommon hardware.
- qw(bpalogin capi4linux cpqarrayd mdadm pcscd),
+ qw(bpalogin cpqarrayd mdadm pcscd),
# Unneeded software.
qw(chronyd snmpd),
# Slows down basic usage and install, reenabled after install.
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index 40c8ba3..00b8fda 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -101,7 +101,6 @@ my $config = {
# nonfree
'dkms-broadcom-wl',
- 'dkms-nvidia340', 'x11-driver-video-nvidia340',
'dkms-nvidia390', 'x11-driver-video-nvidia390',
if_($arch eq 'x86_64',
'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
@@ -129,7 +128,7 @@ my $config = {
# ],
disable_services => [
# Uncommon hardware.
- qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
+ qw(bpalogin cpqarrayd mdadm oki4daemon pcscd),
# Unneeded software.
qw(chronyd snmpd),
# Slows down basic usage and install, reenabled after install.
diff --git a/lib/MGA/DrakISO/BuildBoot.pm b/lib/MGA/DrakISO/BuildBoot.pm
index 861f56a..83f158c 100644
--- a/lib/MGA/DrakISO/BuildBoot.pm
+++ b/lib/MGA/DrakISO/BuildBoot.pm
@@ -273,7 +273,7 @@ sub prepare_iso_bootloader {
# Give it a label, to try to work around mga#23939.
my $esp_image = $images_dir . '/esp.img';
eval { rm_rf($esp_image) };
- run_('/sbin/mkdosfs', '-n', 'MGALIVE-ESP', '-F12', '-C', $esp_image, '4096');
+ run_('/sbin/mkdosfs', '-n', 'MGAISO-ESP', '-F12', '-C', $esp_image, '4096');
run_('mcopy', '-s', '-i', $esp_image, $efi_root_dir, '::');
# Now we've built the ESP image, we can delete the grub2 image. We need
diff --git a/lib/MGA/DrakISO/BuildMedia.pm b/lib/MGA/DrakISO/BuildMedia.pm
index dced6e5..8d589b4 100644
--- a/lib/MGA/DrakISO/BuildMedia.pm
+++ b/lib/MGA/DrakISO/BuildMedia.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 Mageia
+# Copyright (C) 2017-2022 Mageia
# Martin Whitaker <mageia@martin-whitaker.me.uk>
#
# This program is free software; you can redistribute it and/or modify
@@ -101,8 +101,10 @@ sub prepare_media {
build_installer_media($build);
- check_installer_media($build, ${$build->{urpmi_media}{enabled_sections}}[0]);
- check_installer_media($build, '*');
+ my $base_section = ${$build->{urpmi_media}{enabled_sections}}[0];
+ foreach my $section (@{$build->{urpmi_media}{enabled_sections}}) {
+ check_installer_media($build, $section, $base_section);
+ }
my $arch_dir = $build->get_build_dir('files/' . $build->{settings}{arch});
@@ -323,23 +325,16 @@ sub add_rated_packages {
my ($ratings, $flag_expressions) = partition { /^\d$/ } @values;
my ($rating) = @$ratings or die "ERROR: missing rating at $file line $line_number\n";
- # In the installer, the set of flag expressions is treated as a
- # list of conditions, all of which must be true for the package
- # to be selected. But we need to include the packages for any
- # possible selection of categories, so we need to determine
- # whether any individual flag matches one of groups specified by
- # the user and whether the package rating meets the specified
- # threshold for that group.
- my @flags = map { split('\|\|', $_) } @$flag_expressions;
-
# Skip any architecture-specific packages that don't match our
# architecture.
my $arch = $build->{settings}{arch};
- next if $arch eq 'x86_64' && member('!TYPE"64bit"', @flags);
- next if $arch ne 'x86_64' && member( 'TYPE"64bit"', @flags);
+ next if $arch eq 'x86_64' && member('!TYPE"64bit"', @$flag_expressions);
+ next if $arch ne 'x86_64' && member( 'TYPE"64bit"', @$flag_expressions);
# Skip any packages that don't match the user's requirements.
- next if !any { defined $group_threshold{$_} && $rating >= $group_threshold{$_} } @flags;
+ next if any {
+ !any { $_ =~ /^!/ || !defined $group_threshold{$_} || $rating >= $group_threshold{$_} } split('\|\|', $_)
+ } @$flag_expressions;
# For each package, set the package class to 1 to indicate it is
# an explicitly selected package.
@@ -552,14 +547,15 @@ sub create_media_cfg {
}
sub check_installer_media {
- my ($build, $section) = @_;
+ my ($build, $section, $base_section) = @_;
print "Checking installer media [$section]\n" if $::verbose;
my $arch = $build->{settings}{arch};
my $media_dir = $build->get_build_dir('files/' . $arch . '/media');
my $log_file = $build->get_build_dir('tmp') . '/rpmcheck.log';
- run_("zcat -q $media_dir/$section/media_info/hdlist.cz | rpmcheck -explain -failures > $log_file")
+ my $base = $section ne $base_section ? "-base $media_dir/$base_section/media_info/hdlist.cz" : "";
+ run_("cat $media_dir/$section/media_info/hdlist.cz | rpmcheck -explain -failures -compressed-input $base > $log_file")
or die "ERROR: failed to run rpmcheck\n";
if (system('grep', '-q', 'FAILED', $log_file) == 0) {
@@ -579,7 +575,7 @@ sub read_repo_product_id {
my $src_file = $build->{settings}{repository} . '/' . $build->{settings}{arch} . '/product.id';
my $product_id;
- if ($src_file =~ m!^(ftp|http)://!) {
+ if ($src_file =~ m!^(ftp|https?)://!) {
$product_id = `curl --silent $src_file`;
$? and die "ERROR: couldn't fetch product.id file from repository\n";
} else {
@@ -622,26 +618,24 @@ sub create_index {
my $media_dir = $build->get_build_dir('files/' . $arch . '/media/');
my @hdlists = glob("$media_dir/*/media_info/hdlist.cz");
- my @tab;
+ my %pkgs;
my $urpm = URPM->new;
foreach (@hdlists) {
$urpm->parse_hdlist($_);
- $urpm->traverse(sub {
- my $pkg = shift;
- my $pkgname = $pkg->name;
- my $version = $pkg->version;
- my $arch = $pkg->arch;
- push @tab, "$pkgname-$version ($arch)";
- });
}
-
- my %hashtab = map { $_ => 1 } @tab;
- my @orderedpkgs = sort keys %hashtab;
+ $urpm->traverse(sub {
+ my ($pkg) = @_;
+ my $pkgname = $pkg->name;
+ my $version = $pkg->version;
+ my $arch = $pkg->arch;
+ $pkgs{"$pkgname-$version ($arch)"} = 1;
+ });
+ my @ordered_pkgs = sort keys %pkgs;
my $label = $build->{media}{label};
open(my $f, '>', $file);
- foreach (@orderedpkgs) {
+ foreach (@ordered_pkgs) {
print $f "$label $_\n";
}
close($f);
diff --git a/lib/MGA/DrakISO/BuildRoot.pm b/lib/MGA/DrakISO/BuildRoot.pm
index b20dc34..995b419 100644
--- a/lib/MGA/DrakISO/BuildRoot.pm
+++ b/lib/MGA/DrakISO/BuildRoot.pm
@@ -62,7 +62,7 @@ sub install_live_system {
my $base_repository = $build->{settings}{repository};
my $arch_repository = $base_repository . '/' . $arch;
- my $remote_method = $arch_repository =~ m!^(ftp|http)://! && $1;
+ my $remote_method = $arch_repository =~ m!^(ftp|https?)://! && ($1 =~ s/https/http/r);
my $chroot = $build->get_chroot_dir;
@@ -683,7 +683,7 @@ sub copy_file_to_root {
my ($root, $dst_dir, $mode, $src_file) = @_;
my $dst_file = $dst_dir . '/' . basename($src_file);
- if ($src_file =~ m!^(ftp|http)://!) {
+ if ($src_file =~ m!^(ftp|https?)://!) {
run_as_root('curl', '--silent', '-o', $root . $dst_file, $src_file)
or die "ERROR: couldn't copy $src_file to $dst_file\n";
} else {
diff --git a/lib/MGA/DrakISO/Utils.pm b/lib/MGA/DrakISO/Utils.pm
index cb2702d..e604652 100644
--- a/lib/MGA/DrakISO/Utils.pm
+++ b/lib/MGA/DrakISO/Utils.pm
@@ -84,7 +84,7 @@ sub run_in_root {
sub copy_or_link {
my ($src_file, $dst_file) = @_;
mkdir_p(dirname($dst_file));
- if ($src_file =~ m!^(ftp|http)://!) {
+ if ($src_file =~ m!^(ftp|https?)://!) {
run_as_root('curl', '--silent', '-o', $dst_file, $src_file)
or die "ERROR: couldn't copy $src_file to $dst_file\n";
} else {