DTux/dtux__mageia4arm
Archived
1
0
Fork 0
Code

Merge branch 'master' of Jybz/mageia4arm into master

Browse Source
This commit is contained in:
DTux 2019-12-20 08:20:22 +00:00 committed by Gogs
commit b15108a01f
5 changed files with 643 additions and 1172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
/build /build
/platforms/*/INFO/ /platforms/*/INFO/
/log/ /log

6
README.md
View File

@ -108,7 +108,8 @@ Si l'une de ces fonctions ne retourne pas 0, la création de l'image échoue.
<a id="fr_file-extlinux"/> <a id="fr_file-extlinux"/>
#### extlinux.conf #### extlinux.conf
??? Extlinux.conf est un script utilisé par le chargeur de démarrage (s'il est capable de le gérer, uboot le peut), pour spécifier le noyau à démarrer. Le script est normalement généré automatiquement par les outils de Mageia à chaque installation/mise à jour d'un noyau. Malheureusement, lors de la création d'une image de Mageia, l'outil refuse de générer ce fichier dans un chroot. For cette image, soit le fichier peut être omit, soit écrit par vous même.
TODO : Comment spécifier la ligne de commande pour un matériel spécifique ?
<a id="fr_file-others"/> <a id="fr_file-others"/>
#### Autres #### Autres
@ -282,7 +283,8 @@ If one of this functions does not return 0, the process is stoped.
<a id="en_file-extlinux"/> <a id="en_file-extlinux"/>
#### extlinux.conf #### extlinux.conf
??? extlinux.conf is a script used by the bootloader (if it is able to handel, uboot does) in order to select specific kernel to start. This script is normaly automatically generated by Mageia's tools at each kernel installation/update. Unfortunately, when creating the image of Mageia, the tool refuse to generate the file in chroot. For the image, either the file can be omited, or write by yourself.
TODO : How to specify the command line specific for an hardware ?
<a id="en_file-others"/> <a id="en_file-others"/>
#### others #### others

2
create_arm_img_urpmi.sh
View File

@ -275,7 +275,7 @@ function jumpchroot()
if [ "$OPT" = "chroot" ]; then if [ "$OPT" = "chroot" ]; then
/sbin/chroot "${BUILD_PATH}" /sbin/chroot "${BUILD_PATH}"
else else
/sbin/chroot --userspec root:root "${BUILD_PATH}" /bin/bash -v -c 'sh /second_stage_install.sh 2>&1' /sbin/chroot --userspec root:root "${BUILD_PATH}" /bin/bash -v -c 'bash /second_stage_install.sh 2>&1'
fi fi
RET=${?} RET=${?}
if [ ${RET} -ne 0 ]; then if [ ${RET} -ne 0 ]; then

1781
log/creation.log
View File

File diff suppressed because one or more lines are too long

24
platforms/bananaPro/second_stage_install.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash -x #!/bin/bash
# Copyright (C) 2017-2018 Daniel Tartavel-jeannot <contact@librepc.com> # Copyright (C) 2017-2018 Daniel Tartavel-jeannot <contact@librepc.com>
# Copyright (C) 2019-2020 Jean-Baptiste Biernacki <j.biernacki@free.fr> # Copyright (C) 2019-2020 Jean-Baptiste Biernacki <j.biernacki@free.fr>
@ -77,11 +77,16 @@ export ARCH=arm
########################################### ###########################################
# urpmi.update Testing # urpmi.update Testing
# urpmi --auto --media Testing kernel-desktop-latest # urpmi --auto --media Testing kernel-desktop-latest
urpmi --auto kernel-desktop-latest
############################################
## Installing the kernel (not on testing) ##
############################################
# urpmi --auto kernel-desktop-latest
############################################### ###############################################
## Create a symlink for the lastest kernel : ## ## Create a symlink for the lastest kernel : ##
############################################### ###############################################
## As long as the first installed kernel remains installed, the boot.scr script will continue to work, even if the extlinux.conf file is not working with uboot anymore.
# #Last rpm package : # #Last rpm package :
# KERNELRPM=$(rpm -qa --last | grep "^kernel-[sd]e[[:alpha:]]*-[[:digit:]]" | head -n 1 | cut -d ' ' -f 1 | sed -e 's/\(kernel-[[:alnum:]]*-[\.[:digit:]]*-[\.[:alnum:]]*\)-.*/\1/' ) # KERNELRPM=$(rpm -qa --last | grep "^kernel-[sd]e[[:alpha:]]*-[[:digit:]]" | head -n 1 | cut -d ' ' -f 1 | sed -e 's/\(kernel-[[:alnum:]]*-[\.[:digit:]]*-[\.[:alnum:]]*\)-.*/\1/' )
# #Get the vmlinuz file : # #Get the vmlinuz file :
@ -91,6 +96,17 @@ VMLINUZ=$(ls --sort=time -1 /boot/vmlinuz-[[:digit:]]* | head -n 1)
rm -f /boot/uvmlinuz rm -f /boot/uvmlinuz
ln -r -s "${VMLINUZ}" /boot/uvmlinuz ln -r -s "${VMLINUZ}" /boot/uvmlinuz
################################
## Create the extlinux script ##
################################
# echo -e "\nTrying to generate extlinux script\n"
K_INST_VERSION=$(rpm -q kernel-desktop-latest | sed -e 's/kernel-\([[:alnum:]]*\)-latest-\([\.[:digit:]]*\)-\([\.[:alnum:]]*\).*$/\2-\1-\3/')
# /sbin/installkernel %{kversion}-$kernel_flavour-%{buildrpmrel}
# bash -x /sbin/installkernel ${K_INST_VERSION}
# perl -d /usr/sbin/bootloader-config --kernel-version ${K_INST_VERSION} --initrd-options '' --action add-kernel
/usr/sbin/bootloader-config --kernel-version ${K_INST_VERSION} --initrd-options '' --action add-kernel
# echo -e "\nEnd trying to generate extlinux script with errcode ${?}\n"
/usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony
/usr/bin/chown :daemon /etc/wpa_supplicant.conf /usr/bin/chown :daemon /etc/wpa_supplicant.conf
@ -99,5 +115,5 @@ ln -r -s "${VMLINUZ}" /boot/uvmlinuz
/usr/bin/chown :bin /sbin/traceroute /usr/bin/chown :bin /sbin/traceroute
/usr/bin/chown polkitd /etc/polkit-1/rules.d /usr/bin/chown polkitd /etc/polkit-1/rules.d
# sleep 5s
#DO NOT EXIT THE SCRIPT. A second part is automatically added in this script during the process in order to create the default user and set root password. ## DO NOT EXIT THE SCRIPT. A second part is automatically added in this script during the process in order to create the default user and set root password.