Merge branch 'dnfify' of ngompa/mageia4arm into master

3 files changed, 11 insertions, 17 deletions

diff --git a/platforms/bananaPro/README.md b/platforms/bananaPro/README.md
index 8b68d53..3d422ed 100644
--- a/platforms/bananaPro/README.md
+++ b/platforms/bananaPro/README.md
@@ -115,6 +115,6 @@ rm -f ./vmlinuz && ln -r -s ./vmlinuz-5.3.1-desktop-2.mga7 ./vmlinuz
 ```
 
 ## Commands used :
-./create_arm_img_urpmi.sh --clean --config bananaPro --build-path ./build
-./create_arm_img_urpmi.sh --all --target bananaPro --size 2 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./log/creation.log
+./create_arm_image.sh --clean --config bananaPro --build-path ./build
+./create_arm_image.sh --all --target bananaPro --size 2 --tainted --nonfree --build-path ./build --config bananaPro 2>&1 | tee -a ./log/creation.log
 dd if=./build/Mageia-7-bananaPro1.img | pv | dd of=/dev/mmcblk0 ; sync
diff --git a/platforms/bananaPro/mageia4arm.cfg b/platforms/bananaPro/mageia4arm.cfg
index b3c2e98..5e00da6 100644
--- a/platforms/bananaPro/mageia4arm.cfg
+++ b/platforms/bananaPro/mageia4arm.cfg
@@ -22,24 +22,19 @@
 #          FEX (DTS) : https://github.com/LeMaker/sunxi-boards
 
 # Mageia version 7 or later, cauldron.
-# TO MODIFY
 MAGEIA_VERSION="7"
 # Arm version armv7hl, aarch64
-# TO MODIFY
 ARM_VERSION="armv7hl"
 
 # Target plateform (odroid or rpi)
-# TO MODIFY
 TARGET="bananaPro"
 # Target version (0,2,3 for raspi, 3 or 4 for odroid)
-#TO MODIFY
 TARGET_VERSION="1"
 
 # URL of the Mageia mirror used to install ( see mirrors.mageia.org )
 MIRROR="http://ftp.free.fr/mirrors/mageia.org/distrib/${MAGEIA_VERSION}/${ARM_VERSION}"
 
 # image will be created here
-# TO MODIFY
 # INSTALL_PATH="./${TARGET}"
 # Should not be in this configuration file, it isn't related to the configuration but to the build platform.
 
@@ -49,10 +44,6 @@ BUILD_PATH="${INSTALL_PATH}/build"
 #name of the image
 IMAGE="Mageia-${MAGEIA_VERSION}-${TARGET}.img"
 
-#Mount point of image's partitions
-BOOT="/mnt/boot"
-ROOT="/mnt/root"
-
 # Default user
 # If not set, no user will be defined.
 # ID_USER="banana"
@@ -69,6 +60,10 @@ HOSTNAME="${TARGET}"
 SEPARATE_BOOT_PARTITION=0
 BOOTFS="ext4"
 
+#Mount point of image's partitions
+BOOT="/mnt/boot"
+ROOT="/mnt/root"
+
 #kernel package to install 
 KERNEL="kernel-desktop"
 
diff --git a/platforms/bananaPro/second_stage_install.sh b/platforms/bananaPro/second_stage_install.sh
index 1cec482..47cad5a 100644
--- a/platforms/bananaPro/second_stage_install.sh
+++ b/platforms/bananaPro/second_stage_install.sh
@@ -24,16 +24,16 @@ export ARCH=arm
 /usr/bin/chown :systemd-journal -R /var/log/journal
 
 #Install all packages you need
-/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
+/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
 
 #For dracut :
-# /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
+# /usr/bin/dnf --setopt=ignorearch=True --nogpgcheck --assumeyes install u-boot-tools mindi-busybox plymouth-scripts #systemd-bootchart libcap-utils keyutils  lvm2  #dmsetup
 
 # ############################
 # ## For compiling a module ##
 # ############################
 # BUG : Make does not like to build inside chroot. It doesn't find tools. Impossible to build any module there.
-# /usr/sbin/urpmi --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 0 kernel-source-latest
+# /usr/bin/dnf --setopt=ignorearch=True --nogpgcheck --assumeyes install kernel-source-latest
 # #See if it is a Server or Desktop kernel :
 # rpm -q kernel-serveur-latest
 # if [ 0 -ne ${?} ]; then
@@ -79,13 +79,12 @@ ln -r -s /boot/initrd-${K_INST_VERSION}.img /boot/initrd.img
 ###########################################
 ## Install a package from testing repo : ##
 ###########################################
-# urpmi.update Testing
-# urpmi --auto --media Testing kernel-desktop-latest
+# dnf --refresh --enablerepo=updates_testing-\* --assumeyes install kernel-desktop-latest
 
 ############################################
 ## Installing the kernel (not on testing) ##
 ############################################
-# urpmi --auto kernel-desktop-latest
+# dnf --refresh --assumeyes install kernel-desktop-latest
 
 ###############################################
 ## Create a symlink for the lastest kernel : ##