From a6b2f99e2c45ff19e4dc54a0ffff3f9abe1ec722 Mon Sep 17 00:00:00 2001 From: Daniel Tartavel Date: Sat, 21 Jul 2018 13:02:00 +0200 Subject: [PATCH] - modified name of config file conflicting with raspberry pi config.txt - update README.md to follow changes - update create_arm_img_urpmi.sh to follow changes --- README.md | 8 +-- create_arm_img_urpmi.sh | 14 ++--- ...ig.txt.template => mageia4arm.cfg.template | 0 rpi/mageia4arm.cfg | 57 +++++++++++++++++++ rpi/second_stage_install.sh | 4 +- xu4/{config.txt => mageia4arm.cfg} | 0 6 files changed, 71 insertions(+), 12 deletions(-) rename config.txt.template => mageia4arm.cfg.template (100%) create mode 100644 rpi/mageia4arm.cfg rename xu4/{config.txt => mageia4arm.cfg} (100%) diff --git a/README.md b/README.md index 2aa0d8c..e846ce8 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ Outils servant à générer une image Mageia pour systèmes à base de processe Démarrage rapide: -Choisissez le dossier de configuration adapté à votre besoin (rpi ou xu4), sinon créer un nouveau dossier de configuration, copier le fichier config.txt.template à l'interieur et modifier le à vos besoins. +Choisissez le dossier de configuration adapté à votre besoin (rpi ou xu4), sinon créer un nouveau dossier de configuration, copier le fichier mageia4arm.cfg.template à l'interieur et modifier le à vos besoins. Créer l'image: -create_arm_img_urpmi.sh --all --config +create_arm_img_urpmi.sh --all --config Aide: create_arm_img_urpmi.sh -h|--help @@ -20,9 +20,9 @@ This repository contains script to make image for arm based systems from Mageia Quick start: -Choose the config dir you need (rpi or xu4), else create a new config directory with config.txt.template in and modify it as you need. +Choose the config dir you need (rpi or xu4), else create a new config directory with mageia4arm.cfg.template in and modify it as you need. -create_arm_img_urpmi.sh --all --config +create_arm_img_urpmi.sh --all --config Help: create_arm_img_urpmi.sh -h|--help diff --git a/create_arm_img_urpmi.sh b/create_arm_img_urpmi.sh index b0770ba..c440184 100755 --- a/create_arm_img_urpmi.sh +++ b/create_arm_img_urpmi.sh @@ -636,16 +636,16 @@ if ! [ -d "$SOURCE_PATH/$CONFIG_PATH" ];then fi if [ -d "$SOURCE_PATH/$CONFIG_PATH" ];then - if [ -e "$SOURCE_PATH/$CONFIG_PATH/config.txt" ];then - info "using $SOURCE_PATH/$CONFIG_PATH/config.txt as config" - . "$SOURCE_PATH/$CONFIG_PATH/config.txt" + if [ -e "$SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg" ];then + info "using $SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg as config" + . "$SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg" else warning "Config file does not exists, do you want i copy template ? [Y|n] " read yn if [ -z $yn ] || [ $yn = "Y" ] || [ $yn = "y" ];then - /usr/bin/cp "$SOURCE_PATH/config.txt.template" "$SOURCE_PATH/$CONFIG_PATH/config.txt" + /usr/bin/cp "$SOURCE_PATH/mageia4arm.cfg.template" "$SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg" fi - warning "You need now to modify the config file ($SOURCE_PATH/$CONFIG_PATH/config.txt) and relaunch the script" + warning "You need now to modify the config file ($SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg) and relaunch the script" exit 1 fi else @@ -653,8 +653,8 @@ else read yn if [ -z $yn ] || [ $yn = "Y" ] || [ $yn = "y" ];then /usr/bin/mkdir "$SOURCE_PATH/$CONFIG_PATH/" - /usr/bin/cp "$SOURCE_PATH/config.template" "$SOURCE_PATH/$CONFIG_PATH/config.txt" - warning "You need now to modify the config file ($SOURCE_PATH/$CONFIG_PATH/config.txt) and relaunch the script" + /usr/bin/cp "$SOURCE_PATH/config.template" "$SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg" + warning "You need now to modify the config file ($SOURCE_PATH/$CONFIG_PATH/mageia4arm.cfg) and relaunch the script" exit fi fi diff --git a/config.txt.template b/mageia4arm.cfg.template similarity index 100% rename from config.txt.template rename to mageia4arm.cfg.template diff --git a/rpi/mageia4arm.cfg b/rpi/mageia4arm.cfg new file mode 100644 index 0000000..5a8c1b2 --- /dev/null +++ b/rpi/mageia4arm.cfg @@ -0,0 +1,57 @@ + +# Copyright (C) 2017-2018 Daniel Tartavel-jeannot +# +# 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 . + + +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" + +# 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/" diff --git a/rpi/second_stage_install.sh b/rpi/second_stage_install.sh index 56ae3c1..3782814 100644 --- a/rpi/second_stage_install.sh +++ b/rpi/second_stage_install.sh @@ -21,8 +21,10 @@ /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 + +/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 -/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 x11-driver-video-fbdev /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony /usr/bin/chown :daemon /etc/wpa_supplicant.conf diff --git a/xu4/config.txt b/xu4/mageia4arm.cfg similarity index 100% rename from xu4/config.txt rename to xu4/mageia4arm.cfg