Added kernel parameters in extlinux.conf

some small bugs corrected
Corrected an error in extlinux.conf
2018-12-26 14:44:37 +01:00 · 2018-12-26 10:37:41 +01:00 · 2018-12-24 11:14:08 +01:00 · 2018-12-23 11:37:13 +01:00 · 2018-12-21 22:43:46 +01:00 · 2018-12-21 22:27:43 +01:00
9 changed files with 201 additions and 75 deletions
--- a/README.md
+++ b/README.md
@ -21,8 +21,6 @@ Premier lancement de l'image sur le raspberry pi:
 . si vous avez besoin d'un gestionnaire graphique, lancer le script:
 install_graphical.sh \<gestionnaire-graphique\>( xfce, lxqt, plasma, ...) voir les métapaquetages disponibles dans "Environnement graphique" dans le gestionnaire de logiciels.

-ATTENTION: Après une mise à jour du kernel vous devez lancer le script sed_extlinux.conf.sh afin de modifier le fichier extlinux.conf, sinon votre raspberry pi ne re-démarrera pas.
-


 This repository contains script to make image for arm based systems from Mageia repositories.
@ -44,5 +42,3 @@ First launch of the image on raspberry pi:
 . launch drakkeyboard for configure keyboard layout.
 . if you need a graphical environment, launch the script :
  install_graphical.sh \<graphical environment\> ( xfce, lxqt, plasma, ...), see "Graphical environment" in the Mageia application manager' meta packages.
-
-ATTENTION: after updating the kernel, you must launch the script "sed_extlinux.conf.sh" to modify extlinux.conf else your raspberry pi will not boot anymore. 
--- a/create_arm_img_urpmi.sh
+++ b/create_arm_img_urpmi.sh
@ -170,7 +170,7 @@ function createchroot()

 	# Create Build path
 	if ! [ -d "$BUILD_PATH" ];then
-		warning "Build path does not exists, do you want i create it ? [Y|n] "
+		warning "Build path ( $BUILD_PATH ) does not exists, do you want i create it ? [Y|n] "
 		read yn
 		if [ -z $yn ] || [ $yn = "Y" ] || [ $yn = "y" ];then
 			title "Creating $BUILD_PATH"
@ -182,6 +182,7 @@ function createchroot()
 		else
 			exit 1
 		fi
+	else
 		info "Build path exists"
 	fi
 	#Copying qemu
@ -440,6 +441,10 @@ p
 2


+a
+1
+a
+2
 w
 EOF

@ -478,7 +483,7 @@ formatpartitions()

 copyingsystem()
 {
-	info "mounting partitions, creating mountpoint if necessary"
+	info "mounting partitions, making mountpoint if necessary"
 	if ! [ -d "$BOOT" ];then
 		/bin/mkdir "$BOOT"
 		if [ $? -ne 0 ];then
@ -506,85 +511,96 @@ copyingsystem()

 	info "making /etc/fstab"
 	echo "proc            /proc           proc    defaults        0       0
-UUID=$BOOT_UUID  /boot           vfat    defaults        0       0
+UUID=$BOOT_UUID  /mnt/rpi_boot   vfat    defaults        0       0
 UUID=$ROOT_UUID  /               ext4    defaults        0       0" > "$BUILD_PATH"/etc/fstab


 	case $TARGET in
 		rpi)

-			info "copying config.txt, boot.cmd and 10-vchiq-permissions.rules"
+			info "copying 10-vchiq-permissions.rules"
 			cp "$SOURCE_PATH/$CONFIG_PATH/10-vchiq-permissions.rules" "$BUILD_PATH/etc/udev/rules.d/"
-			# Making /etc/modules
+			info "Making /etc/modules"
 			echo "vchiq
 snd_bcm2835
 vc4
 brcmfmac" >> "$BUILD_PATH"/etc/modules

+			RPI_BOOT="$BUILD_PATH/mnt/rpi_boot"
+			if ! [ -d "$RPI_BOOT" ];then
+				mkdir -p "$RPI_BOOT"
+			fi
 			info "copying modprobe.conf"
 			/bin/cp -a "$SOURCE_PATH/$CONFIG_PATH/modprobe.conf" "$BUILD_PATH/etc/"
 			chown root:root "$BUILD_PATH/etc/modprobe.conf"

 			info "making /boot/extlinux/extlinux.conf"
-			mkdir "$BUILD_PATH/boot/extlinux"
+			mkdir -p "$BUILD_PATH/boot/extlinux"
 			sed -e s/\<UUID\>/$ROOT_UUID/g $SOURCE_PATH/$CONFIG_PATH/extlinux.conf >"$BUILD_PATH/boot/extlinux/extlinux.conf"
+			KERNEL_ID=`basename $BUILD_PATH/usr/lib/linux-*`
+			sed -i -e s/\<FDTDIR\>/$KERNEL_ID/g "$BUILD_PATH/boot/extlinux/extlinux.conf"
+			info "copying firmware, overlays in rpi boot partition"
+#			cp -a "$BUILD_PATH/usr/lib/linux-"* "$BOOT/dtb"
+			cp -av "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/start"* "$RPI_BOOT/"
+			cp -av "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/fixup"* "$RPI_BOOT/"
+			cp -av "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/bootcode.bin"* "$RPI_BOOT/"
+			cp -av "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/overlays" "$RPI_BOOT/"

-			info "copying firmware, overlays and dtb in /boot"
-			cp -a "$BUILD_PATH/usr/lib/linux-"* "$BOOT/dtb"
-			cp -a "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/start"* "$BUILD_PATH/boot/"
-			cp -a "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/fixup"* "$BUILD_PATH/boot/"
-			cp -a "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/bootcode.bin"* "$BUILD_PATH/boot/"
-			cp -a "$FIRMWARE_PATH/$FIRMWARE_DIR/boot/overlays" "$BUILD_PATH/boot/"
-			
-			info "copying u-boot binary to /boot"
+			info "copying u-boot binary to $RPI_BOOT"
 			case $TARGET_VERSION in
 				2)
 					info "copying u-boot for $TARGET 2"
-					cp "$BUILD_PATH/usr/lib/u-boot/rpi_2/u-boot.bin" "$BUILD_PATH/boot/kernel7.img"
+					cp "$BUILD_PATH/usr/lib/u-boot/rpi_2/u-boot.bin" "$RPI_BOOT/kernel7.img"
 					;;
 				0)
 					info "copying u-boot for $TARGET 0"
-					cp "$BUILD_PATH/usr/lib/u-boot/rpi_0_w/u-boot.bin" "$BUILD_PATH/boot/kernel7.img"
+					cp "$BUILD_PATH/usr/lib/u-boot/rpi_0_w/u-boot.bin" "$RPI_BOOT/kernel7.img"
 					;;
 				1)
 					info "copying u-boot for $TARGET 1"
-					cp "$BUILD_PATH/usr/lib/u-boot/rpi/u-boot.bin" "$BUILD_PATH/boot/kernel7.img"
+					cp "$BUILD_PATH/usr/lib/u-boot/rpi/u-boot.bin" "$RPI_BOOT/kernel7.img"
 					;;
 				3_32)
 					info "copying u-boot for $TARGET 3 32 bits"
-					cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$BUILD_PATH/boot/kernel7.img"
+					cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$RPI_BOOT/kernel7.img"
+					;;
+				3+)
+					info "copying u-boot for $TARGET 3b+ 32 bits"
+					cp "$BUILD_PATH/usr/lib/u-boot/rpi_3_32b/u-boot.bin" "$RPI_BOOT/kernel7.img"
 					;;
 			esac

-			info "copying raspberry optionals files in opt"
+#			info "copying raspberry optionals files in opt"
 #			/bin/rsync -rlptDH "$FIRMWARE_PATH/$FIRMWARE_DIR/opt/" "$BUILD_PATH/opt/"

 			info "copying wifi firmware file missing in kernel-firmware-nonfree"
 			if ! [ -d "$ROOT/usr/lib/firmware/brcm/" ];then
 				/bin/mkdir -p "$ROOT/usr/lib/firmware/brcm/"
 			fi
-			/bin/cp "$SOURCE_PATH/$CONFIG_PATH/brcmfmac43430-sdio.txt" "$ROOT/usr/lib/firmware/brcm/"
+			if ! [ -f "$ROOT/usr/lib/firmware/brcm/brcmfmac434"* ];then
+				/bin/cp "$SOURCE_PATH/$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"
 					exit 1
 				fi
+			fi
 			info "copying tools in /usr/local/bin/"
 			/bin/cp -a "$SOURCE_PATH/tools/" "$BUILD_PATH/usr/local/bin/"
-			/bin/cp -a "$SOURCE_PATH/rpi/sed_extlinux.conf.sh" "$BUILD_PATH/usr/local/bin/"
+#			/bin/cp -a "$SOURCE_PATH/rpi/sed_extlinux.conf.sh" "$BUILD_PATH/usr/local/bin/"
 			if ! [ $? -eq 0 ];then
 				error "line $LINENO error copying tools"
 				ERRORN=$((ERRORN++))
 			fi
-			info "copying "
+#			info "copying "
 			;;
 		ODROID)
 			;;
 	esac

 	info "copying Mageia image to root partition"
-	/bin/rsync -a --exclude "boot/" --exclude "qemu-arm-static*" "$BUILD_PATH/" "$ROOT/"
-	/bin/rsync -a "$BUILD_PATH/boot/" "$BOOT/"
-	/bin/mkdir "$ROOT/boot"
+	/bin/rsync -a --exclude "$RPI_BOOT/" --exclude "qemu-arm-static*" "$BUILD_PATH/" "$ROOT/"
+	/bin/rsync -a "$RPI_BOOT/" "$BOOT/"
+#	/bin/mkdir "$ROOT/boot"

 	copyingcommon
 	# Syncing devices before unmounting
@ -610,7 +626,7 @@ copyingcommon()
 {
 	title "Copying common files and configuration"
 	rsync -aP "$SOURCE_PATH/common/" "$ROOT/"
-	rsync -aP "$SOURCE_PATH/tools/" "$ROOT/usr/local/bin/"
+	rsync -aP "$SOURCE_PATH/tools/*.sh" "$ROOT/usr/local/bin/"
 	chown root:root "$ROOT/usr/local/bin/"
 }

@ -752,7 +768,7 @@ else
 	fi
 fi

-# assign function for building image of TARGET ( rpi, xu3 or xu4 )
+# assign function for building image of TARGET ( rpi, odroid )
 case $TARGET in
 odroid)
 	CREATEIMG="createxu3image"
--- a/extlinux.conf
+++ b/extlinux.conf
@ -0,0 +1,22 @@
+# File generated by DrakX/drakboot
+default Mageia
+timeout 20
+menu title Boot Menu
+
+label Mageia
+  kernel /boot/vmlinuz
+  initrd /boot/initrd
+  fdtdir /usr/lib/linux-4.19.11-desktop-2.mga7
+  append root=UUID=f9fdc05d-2cc9-42d8-a8dc-2f79ff008045 dwc_otg.lpm_enable=0 kgdboc=ttyS0,115200 console=tty1 rootwait fsck.repair=1 elevator=deadline cma=256M\@512M audit=0 disable_overscan=1
+
+label linux
+  kernel /boot/vmlinuz
+  initrd /boot/initrd.img
+  fdtdir /usr/lib/linux-4.19.12-desktop-2.mga7
+  append root=UUID=f9fdc05d-2cc9-42d8-a8dc-2f79ff008045 8250.nr_uarts=1 console=ttyS0,115200 console=tty1 elevator=deadline cma=256M@512M
+
+label desktop 4.19.12-2.mga7
+  kernel /boot/vmlinuz-4.19.12-desktop-2.mga7
+  initrd /boot/initrd-4.19.12-desktop-2.mga7.img
+  fdtdir /usr/lib/linux-4.19.12-desktop-2.mga7
+  append root=UUID=f9fdc05d-2cc9-42d8-a8dc-2f79ff008045 8250.nr_uarts=1 console=ttyS0,115200 console=tty1 elevator=deadline cma=256M@512M
--- a/rpi/brcmfmac43455-sdio.clm_blob
+++ b/rpi/brcmfmac43455-sdio.clm_blob
--- a/rpi/brcmfmac43455-sdio.txt
+++ b/rpi/brcmfmac43455-sdio.txt
@ -0,0 +1,92 @@
+# Cloned from bcm94345wlpagb_p2xx.txt 
+NVRAMRev=$Rev: 498373 $
+sromrev=11
+vendid=0x14e4
+devid=0x43ab
+manfid=0x2d0
+prodid=0x06e4
+#macaddr=00:90:4c:c5:12:38
+macaddr=b8:27:eb:74:f2:6c
+nocrc=1
+boardtype=0x6e4
+boardrev=0x1304
+
+#XTAL 37.4MHz
+xtalfreq=37400
+
+btc_mode=1
+#------------------------------------------------------
+#boardflags: 5GHz eTR switch by default
+#            2.4GHz eTR switch by default
+#            bit1 for btcoex
+boardflags=0x00480201
+boardflags2=0x40800000
+boardflags3=0x48200100
+phycal_tempdelta=15
+rxchain=1
+txchain=1
+aa2g=1
+aa5g=1
+tssipos5g=1
+tssipos2g=1
+femctrl=0
+AvVmid_c0=1,165,2,100,2,100,2,100,2,100
+pa2ga0=-129,6525,-718
+pa2ga1=-149,4408,-601
+pa5ga0=-185,6836,-815,-186,6838,-815,-184,6859,-815,-184,6882,-818
+pa5ga1=-202,4285,-574,-201,4312,-578,-196,4391,-586,-201,4294,-575
+itrsw=1
+pdoffsetcckma0=2
+pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0
+pdoffset2g40ma0=16
+pdoffset40ma0=0x8888
+pdoffset80ma0=0x8888
+extpagain5g=2
+extpagain2g=2
+tworangetssi2g=1
+tworangetssi5g=1
+# LTECX flags
+# WCI2
+ltecxmux=0
+ltecxpadnum=0x0504
+ltecxfnsel=0x22
+ltecxgcigpio=0x32
+
+maxp2ga0=80
+ofdmlrbw202gpo=0x0022
+dot11agofdmhrbw202gpo=0x4442
+mcsbw202gpo=0x98444422
+mcsbw402gpo=0x98444422
+maxp5ga0=82,82,82,82
+mcsbw205glpo=0xb9555000
+mcsbw205gmpo=0xb9555000
+mcsbw205ghpo=0xb9555000
+mcsbw405glpo=0xb9555000
+mcsbw405gmpo=0xb9555000
+mcsbw405ghpo=0xb9555000
+mcsbw805glpo=0xb9555000
+mcsbw805gmpo=0xb9555000
+mcsbw805ghpo=0xb9555000
+
+swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff
+swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+
+vcodivmode=1
+deadman_to=481500000
+
+ed_thresh2g=-54
+ed_thresh5g=-54
+eu_edthresh2g=-54
+eu_edthresh5g=-54
+ldo1=4
+rawtempsense=0x1ff
+cckPwrIdxCorr=3
+cckTssiDelay=150
+ofdmTssiDelay=150
+txpwr2gAdcScale=1
+txpwr5gAdcScale=1
+dot11b_opts=0x3aa85
+cbfilttype=1
+fdsslevel_ch11=6
--- a/rpi/extlinux.conf
+++ b/rpi/extlinux.conf
@ -1,10 +1,10 @@
-menu title Boot menu
+# File generated by DrakX/drakboot
+default linux
 timeout 20
-default Mageia
-
-label Mageia
-	kernel /vmlinuz
-	append root=UUID=78fa0462-5bcf-46ea-beb3-40cab8fe97c3 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
-	fdtdir /dtb/
-	initrd /initrd
+menu title Boot Menu

+label linux
+  kernel /boot/vmlinuz
+  initrd /boot/initrd.img
+  fdtdir /usr/lib/linux-4.19.12-desktop-2.mga7
+  append root=UUID=f9fdc05d-2cc9-42d8-a8dc-2f79ff008045 console=tty1 elevator=deadline cma=256M@512M audit=0 fsck.repair=1
--- 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 rsync kernel-desktop-latest mlocate drakx-kbd-mouse-x11
+/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/chown :chrony -R /etc/chrony.keys /var/log/chrony
--- a/tools/install_graphical.sh
+++ b/tools/install_graphical.sh
@ -16,15 +16,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.

-if [ "$1" = "" ];then
-	echo "syntax install_graphical.sh [xfce | lxde | lxqt | plasma | gnome] ( see task-* for all )"
+if [ "$1" = "" ] || [ "$1" = "-h" ];then
+	echo "syntax install_graphical.sh [ sugar | xfce | lxde | lxqt | enlightenment | mate | cinnamon | plasma5 | gnome] ( see 'urpmq -Y task-' for all )"
 else
 	PATH="$(/bin/dirname  "$(readlink -f "$0")")"
 	echo "installing Video drivers"
 	. $PATH/install_video_driver.sh
-	echo "installing gstremer"
+	echo "installing gstreamer"
 	. $PATH/install_gstreamer.sh
 	echo "installing task-$1"
-	/usr/sbin/urpmi --auto --no-verify-rpm task-$1
+	/usr/sbin/urpmi --auto --no-verify-rpm task-$1 sox sddm
 fi
-systemctl enable sddm
+/usr/bin/systemctl enable sddm
--- a/tools/install_gstreamer.sh
+++ b/tools/install_gstreamer.sh
@ -17,4 +17,4 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.


-/usr/sbin/urpmi --auto --no-verify-rpm gstreamer1.0-schroedinger gstreamer1.0-gsm gstreamer1.0-plugins-ugly gstreamer1.0-opencv gstreamer1.0-vp8 gstreamer1.0-flac gstreamer1.0-amrnb gstreamer1.0-plugins-bad gstreamer1.0-lame gstreamer1.0-plugins-good gstreamer1.0-twolame gstreamer1.0-ofa gstreamer1.0-libav gstreamer1.0-pulse gstreamer1.0-transcoder gstreamer1.0-faad gstreamer1.0-neon gstreamer1.0-mpeg  gstreamer1.0-libvisual gstreamer1.0-wavpack gstreamer1.0-mpeg2enc gstreamer1.0-vaapi gstreamer1.0-x264 gstreamer1.0-tools gstreamer1.0-editing-services gstreamer1.0-speex gstreamer1.0-x265 gstreamer1.0-soup gstreamer1.0-a52dec gstreamer1.0-libass gstreamer1.0-omx
+/usr/sbin/urpmi --auto --no-verify-rpm gstreamer1.0-gsm gstreamer1.0-plugins-ugly gstreamer1.0-opencv gstreamer1.0-vp8 gstreamer1.0-flac gstreamer1.0-amrnb gstreamer1.0-plugins-bad gstreamer1.0-lame gstreamer1.0-plugins-good gstreamer1.0-twolame gstreamer1.0-ofa gstreamer1.0-libav gstreamer1.0-pulse gstreamer1.0-transcoder gstreamer1.0-neon gstreamer1.0-mpeg  gstreamer1.0-libvisual gstreamer1.0-wavpack gstreamer1.0-mpeg2enc gstreamer1.0-vaapi gstreamer1.0-x264 gstreamer1.0-tools gstreamer1.0-editing-services gstreamer1.0-speex x265 gstreamer1.0-soup gstreamer1.0-a52dec gstreamer1.0-libass gstreamer1.0-omx qt5-gstreamer task-codec-audio task-codec-video task-pulseaudio
Author	SHA1	Message	Date
Daniel Tartavel	b58cefc85d	Added kernel parameters in extlinux.conf	2018-12-26 14:44:37 +01:00
Daniel Tartavel	bbd38aab37	some small bugs corrected	2018-12-26 10:37:41 +01:00
Daniel Tartavel	06f2c8674b	Corrected an error in extlinux.conf	2018-12-24 11:14:08 +01:00
Daniel Tartavel	fa7ca293d9	some adds	2018-12-23 11:37:13 +01:00
Daniel Tartavel	0a00272b50	removing rpi_boot from being copied on the image	2018-12-21 22:43:46 +01:00
Daniel Tartavel	c0c863c560	Stable with kernel update	2018-12-21 22:27:43 +01:00
Daniel Tartavel	425791a74b	0.9 stable	2018-12-20 08:29:52 +01:00