From b4da22f2cf860bec7c185a57ba34dd253ac67b12 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 4 Jan 2020 17:52:35 -0500 Subject: 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. --- platforms/bananaPro/README.md | 4 ++-- platforms/bananaPro/second_stage_install.sh | 11 +++++------ platforms/rpi1/second_stage_install.sh | 2 +- platforms/rpi2/second_stage_install.sh | 2 +- platforms/rpi3+/second_stage_install.sh | 2 +- platforms/rpi3+64/second_stage_install.sh | 2 +- platforms/rpi3/second_stage_install.sh | 2 +- platforms/xu4/second_stage_install.sh | 6 +++--- 8 files changed, 15 insertions(+), 16 deletions(-) (limited to 'platforms') 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/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 : ## diff --git a/platforms/rpi1/second_stage_install.sh b/platforms/rpi1/second_stage_install.sh index 1848789..173692b 100644 --- a/platforms/rpi1/second_stage_install.sh +++ b/platforms/rpi1/second_stage_install.sh @@ -23,7 +23,7 @@ #Install all packages you need # No verifying rpm due to a bug in packages, some are not signed -/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 +/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 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony diff --git a/platforms/rpi2/second_stage_install.sh b/platforms/rpi2/second_stage_install.sh index eb105f7..0eea945 100644 --- a/platforms/rpi2/second_stage_install.sh +++ b/platforms/rpi2/second_stage_install.sh @@ -23,7 +23,7 @@ #Install all packages you need # No verifying rpm due to a bug in packages, some are not signed -/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 +/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 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony diff --git a/platforms/rpi3+/second_stage_install.sh b/platforms/rpi3+/second_stage_install.sh index eb105f7..0eea945 100644 --- a/platforms/rpi3+/second_stage_install.sh +++ b/platforms/rpi3+/second_stage_install.sh @@ -23,7 +23,7 @@ #Install all packages you need # No verifying rpm due to a bug in packages, some are not signed -/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 +/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 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony diff --git a/platforms/rpi3+64/second_stage_install.sh b/platforms/rpi3+64/second_stage_install.sh index eb105f7..0eea945 100644 --- a/platforms/rpi3+64/second_stage_install.sh +++ b/platforms/rpi3+64/second_stage_install.sh @@ -23,7 +23,7 @@ #Install all packages you need # No verifying rpm due to a bug in packages, some are not signed -/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 +/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 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony diff --git a/platforms/rpi3/second_stage_install.sh b/platforms/rpi3/second_stage_install.sh index eb105f7..0eea945 100644 --- a/platforms/rpi3/second_stage_install.sh +++ b/platforms/rpi3/second_stage_install.sh @@ -23,7 +23,7 @@ #Install all packages you need # No verifying rpm due to a bug in packages, some are not signed -/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 +/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 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony diff --git a/platforms/xu4/second_stage_install.sh b/platforms/xu4/second_stage_install.sh index c9f023f..0587135 100644 --- a/platforms/xu4/second_stage_install.sh +++ b/platforms/xu4/second_stage_install.sh @@ -22,9 +22,9 @@ #Install all packages you need -/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 -#/usr/sbin/urpmi --urpmi-root "$BUILD_PATH" --ignorearch --no-verify-rpm --auto --split-level 200 --split-length 200 -/usr/sbin/urpmi --auto --no-verify-rpm /root/u-boot-20180507-3.mga7.armv7hl.rpm +/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 +#/usr/bin/dnf --installroot="$BUILD_PATH" --setopt=ignorearch=True --nogpgcheck --assumeyes install +/usr/bin/dnf --nogpgcheck --assumeyes install /root/u-boot-20180507-3.mga7.armv7hl.rpm /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony /usr/bin/chown :daemon /etc/wpa_supplicant.conf /usr/bin/chown :tty /bin/write /bin/wall -- cgit v1.2.1