diff --git a/conf/config.template b/config.template similarity index 100% rename from conf/config.template rename to config.template diff --git a/config/config.template b/config/config.template deleted file mode 100644 index 5432f98..0000000 --- a/config/config.template +++ /dev/null @@ -1,57 +0,0 @@ - -# 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="6" -ARM_VERSION="armv7hl" - -#target plateform (xu3-4 or rpi) -TARGET="xu3-4" - -# 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="/path/to/$TARGET" - -# 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="user login" -PASSWORD="user password" - -#root password -ROOT_PWD="root password" - -#Hostname -HOSTNAME="$TARGET.$ID_USER" - -#Filesystem of boot partitions (default ext4 raspberry pi need vfat) -#BOOTFS=ext4 - -#kernel package to install (just needed for odroid) -#KERNEL=kernel-odroid - -#Path where the raspberry pi firmware is/will be installed -FIRMWARE_PATH="$INSTALL_PATH/" diff --git a/config/odroid.config b/config/odroid.config deleted file mode 100644 index 554aa55..0000000 --- a/config/odroid.config +++ /dev/null @@ -1,52 +0,0 @@ - -# 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="6" -ARM_VERSION="armv7hl" -TARGET="xu3-4" - -# 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/xu4-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_xu4" -ROOT="/mnt/root_xu4" - -#Default user -ID_USER="odroid" -PASSWORD="xu4" - -#root password -ROOT_PWD="odroid" - -#Hostname -HOSTNAME="xu4.odroid" - -#Filesystem of boot partitions (default ext4) -#BOOTFS=ext4 - -#kernel package to install -KERNEL=kernel-odroid diff --git a/config/raspi.config b/config/raspi.config deleted file mode 100644 index 3d9ef8d..0000000 --- a/config/raspi.config +++ /dev/null @@ -1,57 +0,0 @@ - -# 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="6" -ARM_VERSION="armv7hl" - -#target plateform (xu3-4 or rpi) -TARGET="raspi" - -# 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="user login" -PASSWORD="user password" - -#root password -ROOT_PWD="root password" - -#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/create_arm_img_urpmi.sh b/create_arm_img_urpmi.sh index f3c58cb..d0014eb 100644 --- a/create_arm_img_urpmi.sh +++ b/create_arm_img_urpmi.sh @@ -622,8 +622,9 @@ BOOT="/mnt/boot" ROOT="/mnt/root" BUILD_PATH="$INSTALL_PATH/build" ARM_VERSION="armv7hl" + if [ -z $CONFIG_PATH ];then - CONFIG_PATH="./$SYSTEM" + CONFIG_PATH="./$TARGET" fi if [ -d "./$CONFIG_PATH" ];then @@ -637,6 +638,8 @@ if [ -d "./$CONFIG_PATH" ];then /usr/bin/cp ./config.template "./$CONFIG_PATH/config.txt" fi /usr/bin/cp ./config.template "./$CONFIG_PATH/config.txt" + warning "You need now to modify the config file and relaunch the script" + exit 1 fi else warning "Config directory does not exists, do you want i make it and copy the template file in? [Y|n] " @@ -644,6 +647,7 @@ else if [ -z $yn || $yn -eq "Y" || $yn -eq "y" ];then /usr/bin/mkdir ./$CONFIG_PATH/ /usr/bin/cp ./config.template "./$CONFIG_PATH/config.txt" + warning "You need now to modify the config file and relaunch the script" fi fi diff --git a/mageia4arm.kdev4 b/mageia4arm.kdev4 new file mode 100644 index 0000000..ae1cb4e --- /dev/null +++ b/mageia4arm.kdev4 @@ -0,0 +1,4 @@ +[Project] +CreatedFrom= +Manager=KDevGenericManager +Name=mageia4arm diff --git a/files/brcmfmac43430-sdio.txt b/rpi/brcmfmac43430-sdio.txt similarity index 100% rename from files/brcmfmac43430-sdio.txt rename to rpi/brcmfmac43430-sdio.txt diff --git a/files/modprobe.conf b/rpi/modprobe.conf similarity index 100% rename from files/modprobe.conf rename to rpi/modprobe.conf diff --git a/conf/raspi.config b/rpi/raspi.config similarity index 100% rename from conf/raspi.config rename to rpi/raspi.config diff --git a/files/second_stage_install.sh b/rpi/second_stage_install.sh similarity index 100% rename from files/second_stage_install.sh rename to rpi/second_stage_install.sh diff --git a/files/boot.ini b/xu4/boot.ini similarity index 100% rename from files/boot.ini rename to xu4/boot.ini diff --git a/conf/odroid.config b/xu4/config.txt similarity index 100% rename from conf/odroid.config rename to xu4/config.txt