Browse Source

Initial conversion to use DNF

This change makes it so that the ARM image creation script uses DNF
instead of urpmi. This affords several advantages:

1. Mageia images can be created from non-Mageia systems
2. Mageia images can be created from within Mock
3. ARM images can be created from x86_64 hosts
4. Image building can rely on pre-installed repo configurations

This also brings us in line with the Docker image creation process,
which also uses DNF.
Neal Gompa 2 years ago
parent
commit
b4da22f2cf

+ 10 - 10
README.md

@@ -47,19 +47,19 @@ Par défaut l'utilisateur est "pi" avec le mot de passe "raspberry", et l'admini
47 47
 
48 48
 <a id="fr_creatimg"/>
49 49
 ### Créer l'image :
50
-create_arm_img_urpmi.sh --all --config \<dossier de configuration\>  
50
+create_arm_image.sh --all --config \<dossier de configuration\>  
51 51
 Par exemple :  
52 52
 ```
53 53
 su -  
54 54
 <mot de passe root>  
55 55
 cd /home/user/workspace/mageia4arm/  
56
-./create_arm_img_urpmi.sh --all --target bananaPro --size 4 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./build.log
56
+./create_arm_image.sh --all --target bananaPro --size 4 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./build.log
57 57
 ```
58 58
 Avec cette commande, toutes les étapes (--all) du processus de création pour (--target) la bananaPro sont exécuter. L'image final tiendra sur une carte de (--size) 4Go. Les dépots tainted et nonfree seront activé. Le chemin de construction (--build-path) sera ./build. Finalement, la configuration (--config) sera bananaPro. La suite de la commande, 2>&1 redirige la sortie d'erreur dans la sortie standart et le tout est dupliqué (| tee -a) dans le fichier build.log pour le déboguage.
59 59
 
60 60
 <a id="fr_help"/>
61 61
 ### Aide :
62
-create_arm_img_urpmi.sh -h|--help  
62
+create_arm_image.sh -h|--help  
63 63
 
64 64
 Vous pouvez adapter le script "second_stage_install.sh" afin de compléter l'installation.  
65 65
 Des scripts sont disponibles dans le dossier "tools", ils sont copié dans /usr/local/bin/ dans l'image.  
@@ -123,8 +123,8 @@ label linux
123 123
   append root=UUID=<UUID> <BOOT_ARGS>
124 124
 ```
125 125
 Les balises :
126
-- \<FDTDIR\> est automatiquement généré par le script ./mageia4arm/create_arm_img_urpmi.sh
127
-- \<UUID\> est récupéré par le script ./mageia4arm/create_arm_img_urpmi.sh , il peut être nécessaire d'ajouter une initrd pour utiliser l'UUID, autrement il faut spécifier /dev/mmcblkXpY .
126
+- \<FDTDIR\> est automatiquement généré par le script ./mageia4arm/create_arm_image.sh
127
+- \<UUID\> est récupéré par le script ./mageia4arm/create_arm_image.sh , il peut être nécessaire d'ajouter une initrd pour utiliser l'UUID, autrement il faut spécifier /dev/mmcblkXpY .
128 128
 - \<BOOT_ARGS\> est défini dans le fichier ./mageia4arm/platforms/\<LaPlateforme\>/mageia4arm.cfg .
129 129
 
130 130
 
@@ -242,19 +242,19 @@ This repository contains script to make image for arm based systems from Mageia
242 242
 Choose the config dir you need (rpi or xu4), else create a new config directory with "mageia4arm.cfg.template" in and modify it as you need.  
243 243
 By default username is "pi" with password "raspberry" and root password is "piroot".  
244 244
 
245
-create_arm_img_urpmi.sh --all --config <your config dir\>  
245
+create_arm_image.sh --all --config <your config dir\>  
246 246
 Example given :
247 247
 ```
248 248
 su -
249 249
 <root password>
250 250
 cd /home/user/workspace/mageia4arm/
251
-./create_arm_img_urpmi.sh --all --target bananaPro --size 4 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./build.log
251
+./create_arm_image.sh --all --target bananaPro --size 4 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./build.log
252 252
 ```
253 253
 With such command, all steps of the build process for the bananaPro will be executed. The final image will fit into a 4 GB SD card. The nonfree and tainted repositories will be activated. The build path will be the directory ./build. Finaly, the configuration is for bananaPro. The rest of the command, 2>&1 redirect the stderr stream into the stdout and it will be duplicated inside the build.log file for debug purpose.
254 254
 
255 255
 <a id="en_help"/>
256 256
 ### Help:
257
-create_arm_img_urpmi.sh -h|--help  
257
+create_arm_image.sh -h|--help  
258 258
 
259 259
 you can adapt the script "second_stage_install.sh" to complete the installation.  
260 260
 Some scripts are available in directory "tools". they are copied in /usr/local/bin/ in the image.  
@@ -318,8 +318,8 @@ label linux
318 318
   append root=UUID=<UUID> <BOOT_ARGS>
319 319
 ```
320 320
 The tags :
321
-- \<FDTDIR\> is automatically generated by the script ./mageia4arm/create_arm_img_urpmi.sh
322
-- \<UUID\> is automatically reused bu the script ./mageia4arm/create_arm_img_urpmi.sh , it might be necessary to add an initrd in order to user the UUID, otherwise it should be specify /dev/mmcblkXpY .
321
+- \<FDTDIR\> is automatically generated by the script ./mageia4arm/create_arm_image.sh
322
+- \<UUID\> is automatically reused bu the script ./mageia4arm/create_arm_image.sh , it might be necessary to add an initrd in order to user the UUID, otherwise it should be specify /dev/mmcblkXpY .
323 323
 - \<BOOT_ARGS\> is defined in the configuration file ./mageia4arm/platforms/\<ThePlatform\>/mageia4arm.cfg
324 324
 
325 325
 

+ 71 - 32
create_arm_img_urpmi.sh

@@ -55,9 +55,8 @@ function help() {
55 55
     
56 56
     echo -e "\nBuild levels:"
57 57
     echo -e "--create-chroot      Create the chroot directory"
58
-    echo -e "--addmedia           add mirrors"
59
-    echo -e "--update-mirror      update urpmi database"
60 58
     echo -e "--install-basesystem install base system"
59
+    echo -e "--add-urpmimedia     add mirrors for urpmi"
61 60
     echo -e "--chroot             chroot to arm directory and launch packages installation"
62 61
     echo -e "--create-image       Create the image of Mageia ${MAGEIA_VERSION}"
63 62
 	echo "--config				Path to config files (rpi1  rpi2  rpi3  rpi3+  xu4)"
@@ -87,7 +86,7 @@ function createchroot()
87 86
     title "Making chroot"
88 87
     if ! [ -f /bin/qemu-arm-static ]; then
89 88
         title "Qemu package not present : installing qemu packages"
90
-        /sbin/urpmi --auto --no-recommends qemu-user-static
89
+        /usr/bin/dnf --assumeyes --setopt=install_weak_deps=False install qemu-user-static
91 90
         if [ ${?} -ne 0 ]; then
92 91
             error "line ${LINENO} can't install qemu-user-static : exiting"
93 92
             exit ${ERR_1}
@@ -106,9 +105,56 @@ function createchroot()
106 105
     return 0
107 106
 }
108 107
 
108
+# enabling extra Mageia repositories
109
+function genusemirroroptions()
110
+{
111
+    DNF_MIRROROPTS="--nogpgcheck --releasever=${MAGEIA_VERSION}"
112
+    if [ ! -z "${MIRROR}" ]; then
113
+        DNF_MIRROROPTS="${DNF_MIRROROPTS} --disablerepo=\* --repofrompath=mgarel,${MIRROR}/media/core/release/ --repofrompath=mgaup,${MIRROR}/media/core/updates/ --enablerepo=mgarel --enablerepo=mgaup"
114
+        if [ ${NONFREE} -eq 1 ]; then
115
+            DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgarel-nonfree,${MIRROR}/media/nonfree/release/ --repofrompath=mgaup-nonfree,${MIRROR}/media/nonfree/updates/ --enablerepo=mgarel-nonfree --enablerepo=mgaup-nonfree"
116
+        fi
117
+        if [ ${TAINTED} -eq 1 ]; then
118
+            DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgarel-tainted,${MIRROR}/media/tainted/release/ --repofrompath=mgaup-tainted,${MIRROR}/media/tainted/updates/ --enablerepo=mgarel-tainted --enablerepo=mgaup-tainted"
119
+        fi
120
+    fi
121
+    export DNF_MIRROROPTS
122
+    return 0
123
+}
124
+
125
+# enabling extra Mageia repositories
126
+function enableextrarepos()
127
+{
128
+    if [ "${MAGEIA_VERSION}" = "cauldron" ]; then
129
+        extrasect_baseprefix="cauldron"
130
+        extrasect_updatesprefix="cauldron-updates"
131
+    else
132
+        extrasect_baseprefix="mageia"
133
+        extrasect_updatesprefix="updates"
134
+    fi
135
+    if [ ${NONFREE} -eq 1 ]; then
136
+        title "activating non-free repos"
137
+        /usr/bin/dnf --installroot="${BUILD_PATH}" config-manager --set-enabled "${extrasect_baseprefix}-${ARM_VERSION}-nonfree" --set-enabled "${extrasect_updatesprefix}-${ARM_VERSION}-nonfree"
138
+        err=${?}
139
+        if [ ${err} -ne 0 ]; then
140
+            error "line ${LINENO} error ${err} - can't activate nonfree repositories : exiting"
141
+            exit ${ERR_1}
142
+        fi
143
+    fi
144
+    if [ ${TAINTED} -eq 1 ]; then
145
+        title "activating tainted repos"
146
+        /usr/bin/dnf --installroot="${BUILD_PATH}" config-manager --set-enabled "${extrasect_baseprefix}-${ARM_VERSION}-tainted" --set-enabled "${extrasect_updatesprefix}-${ARM_VERSION}-tainted"
147
+        err=${?}
148
+        if [ ${err} -ne 0 ]; then
149
+            error "line ${LINENO} error ${err} - can't activate tainted repositories : exiting"
150
+            exit ${ERR_1}
151
+        fi
152
+    fi
153
+    return 0
154
+}
109 155
 
110
-# adding Mageia repositories
111
-function addmedia()
156
+# adding Mageia urpmi repositories
157
+function addurpmimedia()
112 158
 {
113 159
     title "Creating media ${MIRROR}"
114 160
     
@@ -150,18 +196,6 @@ function addmedia()
150 196
 }
151 197
 
152 198
 
153
-function updatemirror()
154
-{
155
-    title "updating mirror"
156
-    /sbin/urpmi.update -a --urpmi-root "${BUILD_PATH}"
157
-    if [ ${?} -ne 0 ]; then
158
-        error "line ${LINENO} can't update mirrors : exiting"
159
-        exit ${ERR_1}
160
-    fi
161
-    return 0
162
-}
163
-
164
-
165 199
 function installbasesystem()
166 200
 {
167 201
     # Create Build path
@@ -183,19 +217,24 @@ function installbasesystem()
183 217
     fi
184 218
 
185 219
     title "installing basesystem"
186
-    /sbin/urpmi --urpmi-root "${BUILD_PATH}"  --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 shadow-utils basesystem-minimal
220
+    /usr/bin/dnf --installroot="${BUILD_PATH}" --setopt=ignorearch=True ${DNF_MIRROROPTS} --assumeyes install shadow-utils basesystem-minimal
187 221
     if [ ${?} -ne 0 ]; then
188 222
         error "line ${LINENO} error installing shadow-utils or basesystem-minimal : exiting"
189 223
         exit ${ERR_1}
190 224
     fi
191
-    #/sbin/urpmi --urpmi-root "${BUILD_PATH}"  --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 basesystem-minimal
225
+    #/usr/bin/dnf --installroot="${BUILD_PATH}" --setopt=ignorearch=True ${DNF_MIRROROPTS} --assumeyes install basesystem-minimal
192 226
     #if [ ${?} -ne 0 ]; then
193 227
     #    error "line ${LINENO} error installing basesystem-minimal  : exiting"
194 228
     #    exit ${ERR_1}
195 229
     #fi
196
-    /sbin/urpmi --urpmi-root "${BUILD_PATH}"  --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 urpmi locales u-boot
230
+    /usr/bin/dnf --installroot="${BUILD_PATH}" --setopt=ignorearch=True ${DNF_MIRROROPTS} --assumeyes install dnf dnf-plugins-core locales u-boot
197 231
     if [ ${?} -ne 0 ]; then
198
-        error "line ${LINENO} error installing urpmi or locales.fr : exiting"
232
+        error "line ${LINENO} error installing dnf or locales : exiting"
233
+        exit ${ERR_1}
234
+    fi
235
+    /usr/bin/dnf --installroot="${BUILD_PATH}" --setopt=ignorearch=True ${DNF_MIRROROPTS} --assumeyes install urpmi
236
+    if [ ${?} -ne 0 ]; then
237
+        error "line ${LINENO} error installing urpmi : exiting"
199 238
         exit ${ERR_1}
200 239
     fi
201 240
     return 0
@@ -705,7 +744,7 @@ fi
705 744
 
706 745
 
707 746
 # parsing commandline
708
-TEMP=$(getopt -o h,a --long all,help,clean,create-chroot,addmedia,create-image,,config:,target:,target-version:,chroot,bootfs:,install-basesystem,update-mirror,build-path:,size:,nonfree,tainted -n ${CMDNAME}  -- "${@}")
747
+TEMP=$(getopt -o h,a --long all,help,clean,create-chroot,add-urpmimedia,create-image,,config:,target:,target-version:,chroot,bootfs:,install-basesystem,update-mirror,build-path:,size:,nonfree,tainted -n ${CMDNAME}  -- "${@}")
709 748
 if [ ${?} -ne 0 ] ; then error "line ${LINENO} Failed parsing options." >&2 ; exit ${ERR_1} ; fi
710 749
 eval set -- "${TEMP}"
711 750
 
@@ -745,9 +784,9 @@ while true; do
745 784
         fi
746 785
         shift
747 786
         ;;
748
-    --addmedia)
787
+    --add-urpmimedia)
749 788
         if [ -z ${OPT} ]; then
750
-            OPT="addmedia"
789
+            OPT="addurpmimedia"
751 790
         fi
752 791
         shift
753 792
         ;;
@@ -926,16 +965,19 @@ case ${OPT} in
926 965
         fi
927 966
         createImageWrap #Create the empty .img
928 967
         createchroot #Check qemu and activate it
929
-        addmedia
930
-        updatemirror
968
+        genusemirroroptions #Generate mirror options, if needed
931 969
         installbasesystem #Generate the rootfs, rootfiles, ...
970
+        enableextrarepos
971
+        addurpmimedia
932 972
         mkfstab 
933 973
         preparechroot
934 974
         jumpchroot
935 975
             #Check before is useless (with $MIRROR
936 976
             info "Use mirrorlist to light one server."
937 977
             MIRROR=
938
-            addmedia
978
+            genusemirroroptions
979
+            enableextrarepos
980
+            addurpmimedia
939 981
         mountPartitions
940 982
         copyingsystem
941 983
         unmountingPartitions
@@ -947,11 +989,8 @@ case ${OPT} in
947 989
     "chroot")
948 990
         jumpchroot
949 991
         ;;
950
-    "addmedia")
951
-        addmedia
952
-        ;;
953
-    "updatemirror")
954
-        updatemirror
992
+    "addurpmimedia")
993
+        addurpmimedia
955 994
         ;;
956 995
     "createimage")
957 996
         verify_disk_space

+ 2 - 2
platforms/bananaPro/README.md

@@ -115,6 +115,6 @@ rm -f ./vmlinuz && ln -r -s ./vmlinuz-5.3.1-desktop-2.mga7 ./vmlinuz
115 115
 ```
116 116
 
117 117
 ## Commands used :
118
-./create_arm_img_urpmi.sh --clean --config bananaPro --build-path ./build
119
-./create_arm_img_urpmi.sh --all --target bananaPro --size 2 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./log/creation.log
118
+./create_arm_image.sh --clean --config bananaPro --build-path ./build
119
+./create_arm_image.sh --all --target bananaPro --size 2 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./log/creation.log
120 120
 dd if=./build/Mageia-7-bananaPro1.img | pv | dd of=/dev/mmcblk0 ; sync

+ 5 - 6
platforms/bananaPro/second_stage_install.sh

@@ -24,16 +24,16 @@ export ARCH=arm
24 24
 /usr/bin/chown :systemd-journal -R /var/log/journal
25 25
 
26 26
 #Install all packages you need
27
-/usr/sbin/urpmi --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 basesystem chrony polkit lockdev rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make rsync binutils ldetect usbutils #kernel-desktop-latest # systemd-bootchart libcap-utils keyutils mindi-busybox plymouth-scripts lvm2  #dmsetup
27
+/usr/bin/dnf --setopt=ignorearch=True --nogpgcheck --assumeyes install basesystem chrony polkit lockdev rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make rsync binutils ldetect usbutils #kernel-desktop-latest # systemd-bootchart libcap-utils keyutils mindi-busybox plymouth-scripts lvm2  #dmsetup
28 28
 
29 29
 #For dracut :
30
-# /usr/sbin/urpmi --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 u-boot-tools mindi-busybox plymouth-scripts #systemd-bootchart libcap-utils keyutils  lvm2  #dmsetup
30
+# /usr/bin/dnf --setopt=ignorearch=True --nogpgcheck --assumeyes install u-boot-tools mindi-busybox plymouth-scripts #systemd-bootchart libcap-utils keyutils  lvm2  #dmsetup
31 31
 
32 32
 # ############################
33 33
 # ## For compiling a module ##
34 34
 # ############################
35 35
 # BUG : Make does not like to build inside chroot. It doesn't find tools. Impossible to build any module there.
36
-# /usr/sbin/urpmi --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 kernel-source-latest
36
+# /usr/bin/dnf --setopt=ignorearch=True --nogpgcheck --assumeyes install kernel-source-latest
37 37
 # #See if it is a Server or Desktop kernel :
38 38
 # rpm -q kernel-serveur-latest
39 39
 # if [ 0 -ne ${?} ]; then
@@ -79,13 +79,12 @@ ln -r -s /boot/initrd-${K_INST_VERSION}.img /boot/initrd.img
79 79
 ###########################################
80 80
 ## Install a package from testing repo : ##
81 81
 ###########################################
82
-# urpmi.update Testing
83
-# urpmi --auto --media Testing kernel-desktop-latest
82
+# dnf --refresh --enablerepo=updates_testing-\* --assumeyes install kernel-desktop-latest
84 83
 
85 84
 ############################################
86 85
 ## Installing the kernel (not on testing) ##
87 86
 ############################################
88
-# urpmi --auto kernel-desktop-latest
87
+# dnf --refresh --assumeyes install kernel-desktop-latest
89 88
 
90 89
 ###############################################
91 90
 ## Create a symlink for the lastest kernel : ##

+ 1 - 1
platforms/rpi1/second_stage_install.sh

@@ -23,7 +23,7 @@
23 23
 #Install all packages you need
24 24
 # No verifying rpm due to a bug in packages, some are not signed
25 25
 
26
-/usr/sbin/urpmi --auto --no-verify-rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11
26
+/usr/bin/dnf --nogpgcheck --assumeyes install basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11
27 27
 
28 28
 
29 29
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony

+ 1 - 1
platforms/rpi2/second_stage_install.sh

@@ -23,7 +23,7 @@
23 23
 #Install all packages you need
24 24
 # No verifying rpm due to a bug in packages, some are not signed
25 25
 
26
-/usr/sbin/urpmi --auto --no-verify-rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
26
+/usr/bin/dnf --nogpgcheck --assumeyes install basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
27 27
 
28 28
 
29 29
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony

+ 1 - 1
platforms/rpi3+/second_stage_install.sh

@@ -23,7 +23,7 @@
23 23
 #Install all packages you need
24 24
 # No verifying rpm due to a bug in packages, some are not signed
25 25
 
26
-/usr/sbin/urpmi --auto --no-verify-rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
26
+/usr/bin/dnf --nogpgcheck --assumeyes install basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
27 27
 
28 28
 
29 29
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony

+ 1 - 1
platforms/rpi3+64/second_stage_install.sh

@@ -23,7 +23,7 @@
23 23
 #Install all packages you need
24 24
 # No verifying rpm due to a bug in packages, some are not signed
25 25
 
26
-/usr/sbin/urpmi --auto --no-verify-rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
26
+/usr/bin/dnf --nogpgcheck --assumeyes install basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
27 27
 
28 28
 
29 29
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony

+ 1 - 1
platforms/rpi3/second_stage_install.sh

@@ -23,7 +23,7 @@
23 23
 #Install all packages you need
24 24
 # No verifying rpm due to a bug in packages, some are not signed
25 25
 
26
-/usr/sbin/urpmi --auto --no-verify-rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
26
+/usr/bin/dnf --nogpgcheck --assumeyes install basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make binutils dracut u-boot rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11 glibc-i18ndata
27 27
 
28 28
 
29 29
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony

+ 3 - 3
platforms/xu4/second_stage_install.sh

@@ -22,9 +22,9 @@
22 22
 
23 23
 #Install all packages you need
24 24
 
25
-/usr/sbin/urpmi --auto --no-verify-rpm /root/kernel-odroid-4.14.y-1.armv7hl.rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make dracut u-boot-tools rsync kernel-desktop-latest
26
-#/usr/sbin/urpmi --urpmi-root "$BUILD_PATH"  --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 200
27
-/usr/sbin/urpmi --auto --no-verify-rpm /root/u-boot-20180507-3.mga7.armv7hl.rpm
25
+/usr/bin/dnf --nogpgcheck --assumeyes install /root/kernel-odroid-4.14.y-1.armv7hl.rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make dracut u-boot-tools rsync kernel-desktop-latest
26
+#/usr/bin/dnf --installroot="$BUILD_PATH" --setopt=ignorearch=True --nogpgcheck --assumeyes install
27
+/usr/bin/dnf --nogpgcheck --assumeyes install /root/u-boot-20180507-3.mga7.armv7hl.rpm
28 28
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony
29 29
 /usr/bin/chown :daemon /etc/wpa_supplicant.conf
30 30
 /usr/bin/chown :tty /bin/write /bin/wall

+ 1 - 1
tools/install_graphical.sh

@@ -25,7 +25,7 @@ else
25 25
 	echo "installing gstreamer"
26 26
 	. $PATH/install_gstreamer.sh
27 27
 	echo "installing task-$1"
28
-	/usr/sbin/urpmi --auto --no-verify-rpm task-$1 sox sddm
28
+	/usr/bin/dnf --nogpgcheck --assumeyes install task-$1 sox sddm
29 29
 	/usr/bin/alternatives --config soundprofile 
30 30
 fi
31 31
 /usr/bin/systemctl enable sddm

File diff suppressed because it is too large
+ 1 - 1
tools/install_gstreamer.sh


+ 1 - 1
tools/install_video_driver.sh

@@ -17,7 +17,7 @@
17 17
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
 
19 19
 
20
-/usr/sbin/urpmi --auto --no-verify-rpm x11-driver-video-fbdev xinit xclock xorg-x11 xorg-x11-75dpi-fonts drakconf
20
+/usr/bin/dnf --nogpgcheck --assumeyes install x11-driver-video-fbdev xinit xclock xorg-x11 xorg-x11-75dpi-fonts drakconf
21 21
 systemctl enable display-manager.service
22 22
 
23 23
 #echo "#!/bin/sh

+ 1 - 1
tools/resize_root.sh

@@ -9,7 +9,7 @@ if [ ${1} = "force" ]; then
9 9
     #Check dependency
10 10
     hash growpart
11 11
     if [ ${?} -ne 0 ]; then
12
-        echo "install cloud-utils-growpart first. Hint : urpmi cloud-utils-growpart"
12
+        echo "install cloud-utils-growpart first. Hint : dnf install cloud-utils-growpart"
13 13
         exit 1
14 14
     fi
15 15