diff options
| author | DTux <contact@librepc.com> | 2020-01-05 13:05:14 +0000 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2020-01-05 13:05:14 +0000 |
| commit | df81adfaa244343bff7bbb0554fd8f84b42dc0a6 (patch) | |
| tree | f2cac5a3ac46bfdd6b11d97fafb41cfb723ed083 /platforms/rpi3+ | |
| parent | 415110895ec1ca7e32dc55ed3b3305359f9321c4 (diff) | |
| parent | b4da22f2cf860bec7c185a57ba34dd253ac67b12 (diff) | |
| download | mageia4arm-df81adfaa244343bff7bbb0554fd8f84b42dc0a6.tar mageia4arm-df81adfaa244343bff7bbb0554fd8f84b42dc0a6.tar.gz mageia4arm-df81adfaa244343bff7bbb0554fd8f84b42dc0a6.tar.bz2 mageia4arm-df81adfaa244343bff7bbb0554fd8f84b42dc0a6.tar.xz mageia4arm-df81adfaa244343bff7bbb0554fd8f84b42dc0a6.zip | |
Merge branch 'dnfify' of ngompa/mageia4arm into master
Diffstat (limited to 'platforms/rpi3+')
| -rw-r--r-- | platforms/rpi3+/mageia4arm.cfg | 23 | ||||
| -rw-r--r-- | platforms/rpi3+/second_stage_install.sh | 2 | ||||
| -rwxr-xr-x | platforms/rpi3+/specialFunctions.sh | 2 |
3 files changed, 14 insertions, 13 deletions
diff --git a/platforms/rpi3+/mageia4arm.cfg b/platforms/rpi3+/mageia4arm.cfg index bf8a58a..8667978 100644 --- a/platforms/rpi3+/mageia4arm.cfg +++ b/platforms/rpi3+/mageia4arm.cfg @@ -25,21 +25,17 @@ TARGET="rpi" TARGET_VERSION="3+" # 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" +MIRROR="http://ftp.free.fr/mirrors/mageia.org/distrib/${MAGEIA_VERSION}/${ARM_VERSION}" #MIRROR="/mnt/STOCK/mageia/distrib/$MAGEIA_VERSION/$ARM_VERSION" -# image will be created here -INSTALL_PATH="/mnt/perso/raspi-test" +# image will be created here +# INSTALL_PATH="/mnt/perso/raspi-test" # Build directory will be created here -BUILD_PATH="$INSTALL_PATH/build" +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" +IMAGE="Mageia-${MAGEIA_VERSION}-${TARGET}.img" #Default user ID_USER="pi" @@ -49,16 +45,21 @@ PASSWORD="raspberry" ROOT_PWD="piroot" #Hostname -HOSTNAME="$TARGET.$ID_USER" +HOSTNAME="${TARGET}" #Filesystem of boot partitions (default ext4 raspberry pi need vfat) +SEPARATE_BOOT_PARTITION=1 BOOTFS="vfat" +#Mount point of image's partitions +BOOT="/mnt/boot" +ROOT="/mnt/root" + #The arguments for the Kernel BOOT_ARGS='dwc_otg.lpm_enable=0 console=ttyS0,115200 kgdboc=ttyS0,115200 console=tty1 rootwait fsck.repair=1 8250.nr_uarts=1 elevator=deadline cma=256M\@512M audit=0' #Path where the raspberry pi firmware is/will be installed -FIRMWARE_PATH="$INSTALL_PATH" +FIRMWARE_PATH="${INSTALL_PATH}" FIRMWARE_DIR="firmware-stable" FIRMWARE_DOWNLOAD_URL="https://github.com/raspberrypi/firmware/archive/stable.zip" 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+/specialFunctions.sh b/platforms/rpi3+/specialFunctions.sh index ad00c50..2dc08f5 100755 --- a/platforms/rpi3+/specialFunctions.sh +++ b/platforms/rpi3+/specialFunctions.sh @@ -132,7 +132,7 @@ function copyingCustomSystem() if ! [ -d "${ROOT}/usr/lib/firmware/brcm/" ]; then /bin/mkdir -p "${ROOT}/usr/lib/firmware/brcm/" fi - if ! [ -f "${ROOT}/usr/lib/firmware/brcm/brcmfmac434"* ]; then + if ! [[ -f "${ROOT}/usr/lib/firmware/brcm/brcmfmac434"* ]]; then /bin/cp --preserve=mode "${CONFIG_PATH}/brcmfmac434"* "${ROOT}/usr/lib/firmware/brcm/" if [ ${?} -ne 0 ]; then error "line ${LINENO} error copying wifi firmware in ${ROOTP}/usr/lib/firmware/brcm/ : exiting" |