diff options
| author | Daniel Tartavel <contact@librepc.com> | 2020-02-15 02:32:56 +0100 |
|---|---|---|
| committer | Daniel Tartavel <contact@librepc.com> | 2020-02-15 02:32:56 +0100 |
| commit | a27de93bfead360c409acae50a1e265dd0269e19 (patch) | |
| tree | 5642742cb377a0c94dfbc48081679284bd2158c0 /create_arm_image.sh | |
| parent | f6e6323bf70e475a41614519eaef20f90dd774ad (diff) | |
| download | mageia4arm-a27de93bfead360c409acae50a1e265dd0269e19.tar mageia4arm-a27de93bfead360c409acae50a1e265dd0269e19.tar.gz mageia4arm-a27de93bfead360c409acae50a1e265dd0269e19.tar.bz2 mageia4arm-a27de93bfead360c409acae50a1e265dd0269e19.tar.xz mageia4arm-a27de93bfead360c409acae50a1e265dd0269e19.zip | |
added rpi 4 configuration
corrected bug in addmedia for cauldron
need updating u-boot package
Diffstat (limited to 'create_arm_image.sh')
| -rwxr-xr-x | create_arm_image.sh | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh index 2754368..28ef4fe 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -128,12 +128,21 @@ function genusemirroroptions() DNF_MIRROROPTS="--config=${DNF_CONFIGPATH} --forcearch=${ARM_VERSION} --nogpgcheck --releasever=${MAGEIA_VERSION}" if [ ! -z "${MIRROR}" ]; then - DNF_MIRROROPTS="${DNF_MIRROROPTS} --disablerepo=* --repofrompath=mgarel,${MIRROR}/media/core/release/ --repofrompath=mgaup,${MIRROR}/media/core/updates/ --enablerepo=mgarel --enablerepo=mgaup" + DNF_MIRROROPTS="${DNF_MIRROROPTS} --disablerepo=* --repofrompath=mgarel,${MIRROR}/media/core/release/ --enablerepo=mgarel" + if [ "${MAGEIA_VERSION}" != "cauldron" ]; then + DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgaup,${MIRROR}/media/core/updates/ --enablerepo=mgaup" + fi if [ ${NONFREE} -eq 1 ]; then - DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgarel-nonfree,${MIRROR}/media/nonfree/release/ --repofrompath=mgaup-nonfree,${MIRROR}/media/nonfree/updates/ --enablerepo=mgarel-nonfree --enablerepo=mgaup-nonfree" + DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgarel-nonfree,${MIRROR}/media/nonfree/release/ --enablerepo=mgarel-nonfree " + if [ "${MAGEIA_VERSION}" != "cauldron" ]; then + DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgaup-nonfree,${MIRROR}/media/nonfree/updates/ --enablerepo=mgaup-nonfree" + fi fi if [ ${TAINTED} -eq 1 ]; then - DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgarel-tainted,${MIRROR}/media/tainted/release/ --repofrompath=mgaup-tainted,${MIRROR}/media/tainted/updates/ --enablerepo=mgarel-tainted --enablerepo=mgaup-tainted" + DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgarel-tainted,${MIRROR}/media/tainted/release/ --enablerepo=mgarel-tainted " + if [ "${MAGEIA_VERSION}" != "cauldron" ]; then + DNF_MIRROROPTS="${DNF_MIRROROPTS} --repofrompath=mgaup-tainted,${MIRROR}/media/tainted/updates/ --enablerepo=mgaup-tainted" + fi fi fi export DNF_MIRROROPTS @@ -143,16 +152,21 @@ function genusemirroroptions() # enabling extra Mageia repositories function enableextrarepos() { - if [ "${MAGEIA_VERSION}" = "cauldron" ]; then - extrasect_baseprefix="cauldron" - extrasect_updatesprefix="cauldron-updates" - else - extrasect_baseprefix="mageia" - extrasect_updatesprefix="updates" - fi + extrasect_baseprefix="mageia" + # if [ "${MAGEIA_VERSION}" = "cauldron" ]; then + # extrasect_baseprefix="cauldron" + # extrasect_updatesprefix="" + # else + # extrasect_baseprefix="mageia" + extrasect_updatesprefix="updates" + # fi if [ ${NONFREE} -eq 1 ]; then title "activating non-free repos" - /usr/bin/dnf --installroot="${BUILD_PATH}" config-manager --set-enabled "${extrasect_baseprefix}-${ARM_VERSION}-nonfree" --set-enabled "${extrasect_updatesprefix}-${ARM_VERSION}-nonfree" + DNFPARAM=--installroot="${BUILD_PATH}" config-manager --set-enabled "${extrasect_baseprefix}-${ARM_VERSION}-nonfree" + if [ "${MAGEIA_VERSION}" != "cauldron" ]; then + DNFPARAM=$DNFPARAM" --set-enabled ${extrasect_updatesprefix}-${ARM_VERSION}-nonfree" + fi + /usr/bin/dnf $DNFPARAM; err=${?} if [ ${err} -ne 0 ]; then error "line ${LINENO} error ${err} - can't activate nonfree repositories : exiting" @@ -161,7 +175,11 @@ function enableextrarepos() fi if [ ${TAINTED} -eq 1 ]; then title "activating tainted repos" - /usr/bin/dnf --installroot="${BUILD_PATH}" config-manager --set-enabled "${extrasect_baseprefix}-${ARM_VERSION}-tainted" --set-enabled "${extrasect_updatesprefix}-${ARM_VERSION}-tainted" + DNFPARAM=--installroot="${BUILD_PATH}" config-manager --set-enabled "${extrasect_baseprefix}-${ARM_VERSION}-tainted" + if [ "${MAGEIA_VERSION}" != "cauldron" ]; then + DNFPARAM=$DNFPARAM" --set-enabled ${extrasect_updatesprefix}-${ARM_VERSION}-tainted" + fi + /usr/bin/dnf $DNFPARAM² err=${?} if [ ${err} -ne 0 ]; then error "line ${LINENO} error ${err} - can't activate tainted repositories : exiting" @@ -992,7 +1010,7 @@ case ${OPT} in genusemirroroptions #Generate mirror options, if needed installbasesystem #Generate the rootfs, rootfiles, ... enableextrarepos - addurpmimedia +# addurpmimedia mkfstab preparechroot jumpchroot @@ -1001,7 +1019,7 @@ case ${OPT} in MIRROR= genusemirroroptions enableextrarepos - addurpmimedia +# addurpmimedia mountPartitions copyingsystem unmountingPartitions |