modifications for booting with mageia stock kernel

6 files changed, 22 insertions, 6 deletions

diff --git a/rpi/bcm2836-rpi-2-b.dtb b/rpi/bcm2836-rpi-2-b.dtb
new file mode 100755
index 0000000..06ba65b
--- /dev/null
+++ b/rpi/bcm2836-rpi-2-b.dtb
diff --git a/rpi/bcm2837-rpi-3-b-plus.dtb b/rpi/bcm2837-rpi-3-b-plus.dtb
new file mode 100755
index 0000000..9fa2dd4
--- /dev/null
+++ b/rpi/bcm2837-rpi-3-b-plus.dtb
diff --git a/rpi/bcm2837-rpi-3-b.dtb b/rpi/bcm2837-rpi-3-b.dtb
new file mode 100755
index 0000000..7ed21fb
--- /dev/null
+++ b/rpi/bcm2837-rpi-3-b.dtb
diff --git a/rpi/extlinux.conf b/rpi/extlinux.conf
new file mode 100644
index 0000000..7f6b846
--- /dev/null
+++ b/rpi/extlinux.conf
@@ -0,0 +1,10 @@
+menu autoboot Welcome to Mageia-Minimal.
+timeout 20
+default Mageia
+
+label Mageia
+	kernel /vmlinuz
+	append root=UUID=<UUID> 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"
+	fdtdir /dtb/
+	initrd /initrd
+
diff --git a/rpi/mageia4arm.cfg b/rpi/mageia4arm.cfg
index e1b78d9..5bea977 100644
--- a/rpi/mageia4arm.cfg
+++ b/rpi/mageia4arm.cfg
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2017-2018 Daniel Tartavel-jeannot   <dtux@free.fr>
+# 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
@@ -20,11 +20,16 @@ ARM_VERSION="armv7hl"
 
 #target plateform (xu3-4 or rpi)
 TARGET="rpi" 
+#version of the target
+# 0, 1, 2 ,3_32 for rpi and 3 or 4 for odroid
+TARGET_VERSION="3_32"
 
 # 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="<change this>"
+
+INSTALL_PATH="/mnt/perso/raspi-test"    
 
 # Build directory will be created here
 BUILD_PATH="$INSTALL_PATH/build"
@@ -33,7 +38,6 @@ 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,9 +52,8 @@ ROOT_PWD="piroot"
 HOSTNAME="$TARGET.$ID_USER" 
 
 #Filesystem of boot partitions (default ext4 raspberry pi need vfat)
-#DO NOT CHANGE THIS
 BOOTFS="vfat"
 
-#Path where the raspberry pi firmware is/will be downloaded
+#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 d8d92ef..a22a8fe 100644
--- a/rpi/second_stage_install.sh
+++ b/rpi/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 dracut u-boot-tools bcm283x-firmware rsync
+/usr/sbin/urpmi --auto --no-verify-rpm basesystem chrony rng-tools man openssh-server rfkill wireless-tools bluez wpa_supplicant make dracut u-boot rsync kernel-desktop-latest
 
 
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony
@@ -36,3 +36,6 @@
 KV=`basename /boot/vmlinuz-*`
 KV=${KV#vmlinuz-}
 dracut --kver $KV
+rm -f $0
+cp /boot/vmlinuz-* /boot/vmlinuz
+cp /boot/initrd-* /boot/initrd