modified for Mageia kernel usage

3 files changed, 70 insertions, 10 deletions

diff --git a/rpi/mageia4arm.cfg b/rpi/mageia4arm.cfg
index f775126..fc4776f 100644
--- a/rpi/mageia4arm.cfg
+++ b/rpi/mageia4arm.cfg
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2017-2018 Daniel Tartavel-jeannot   <contact@librepc.com>
+# Copyright (C) 2017-2018 Daniel Tartavel-jeannot   <dtux@free.fr>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,9 +23,8 @@ TARGET="rpi"
 
 # 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="/mnt/STOCK/mageia/distrib/$MAGEIA_VERSION/$ARM_VERSION"
 # image will be created here
-INSTALL_PATH="/mnt/perso/raspi-test/"
+INSTALL_PATH="<change this>"
 
 # Build directory will be created here
 BUILD_PATH="$INSTALL_PATH/build"
@@ -34,6 +33,7 @@ BUILD_PATH="$INSTALL_PATH/build"
 IMAGE="Mageia-${MAGEIA_VERSION}-$TARGET.img"
 
 #Mount point of image's partitions
+#no need to be changed
 BOOT="/mnt/boot"
 ROOT="/mnt/root"
 
@@ -48,11 +48,9 @@ ROOT_PWD="piroot"
 HOSTNAME="$TARGET.$ID_USER" 
 
 #Filesystem of boot partitions (default ext4 raspberry pi need vfat)
+#DO NOT CHANGE THIS
 BOOTFS="vfat"
 
-#kernel package to install (just needed for odroid)
-KERNEL=""
-
-#Path where the raspberry pi firmware is/will be installed
-#FIRMWARE_PATH="$INSTALL_PATH/"
-#FIRMWARE_DIR="firmware-stable"
+#Path where the raspberry pi firmware is/will be downloaded
+FIRMWARE_PATH="$INSTALL_PATH"
+FIRMWARE_DIR="firmware-stable"
diff --git a/rpi/mageia4arm_dt.cfg b/rpi/mageia4arm_dt.cfg
new file mode 100644
index 0000000..f127e53
--- /dev/null
+++ b/rpi/mageia4arm_dt.cfg
@@ -0,0 +1,59 @@
+
+# Copyright (C) 2017-2018 Daniel Tartavel-jeannot   <contact@librepc.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+MAGEIA_VERSION="cauldron"
+ARM_VERSION="armv7hl"
+
+#target plateform (xu3-4 or rpi)
+TARGET="rpi" 
+
+# 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="/mnt/STOCK/mageia/distrib/$MAGEIA_VERSION/$ARM_VERSION"
+# image will be created here
+
+INSTALL_PATH="/mnt/perso/raspi-test"    
+
+# Build directory will be created here
+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
+ID_USER="pi"
+PASSWORD="raspberry"
+
+#root password
+ROOT_PWD="piroot"
+
+#Hostname 
+HOSTNAME="$TARGET.$ID_USER" 
+
+#Filesystem of boot partitions (default ext4 raspberry pi need vfat)
+BOOTFS="vfat"
+
+#kernel package to install (just needed for odroid)
+KERNEL=""
+
+#Path where the raspberry pi firmware is/will be installed
+FIRMWARE_PATH="$INSTALL_PATH"
+FIRMWARE_DIR="firmware-stable"
diff --git a/rpi/second_stage_install.sh b/rpi/second_stage_install.sh
index 264127e..d8d92ef 100644
--- a/rpi/second_stage_install.sh
+++ b/rpi/second_stage_install.sh
@@ -21,7 +21,7 @@
 /usr/bin/chown :systemd-journal -R /var/log/journal
 
 #Install all packages you need
-# No verifying rpm due to a bug in packages, some are bnot signed
+# 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 dracut u-boot-tools bcm283x-firmware rsync
 
@@ -33,3 +33,6 @@
 /usr/bin/chown :bin /sbin/traceroute
 /usr/bin/chown polkitd /etc/polkit-1/rules.d
 
+KV=`basename /boot/vmlinuz-*`
+KV=${KV#vmlinuz-}
+dracut --kver $KV