diff options
| -rwxr-xr-x | create_arm_image.sh | 4 | ||||
| -rw-r--r-- | mageia4arm-dnf.conf | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh index 7b8e941..34549a1 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -118,10 +118,10 @@ function createchroot() # enabling extra Mageia repositories function genusemirroroptions() { - DNF_CONFIGPATH="$(dirname $(realpath "$0"))/mageia4arm-dnf.conf" + DNF_CONFIGPATH="$(dirname $(realpath "$0"))/../mageia4arm-dnf.conf" 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/ --repofrompath=mgaup,${MIRROR}/media/core/updates/ --enablerepo=mgarel --enablerepo=mgaup" 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" fi diff --git a/mageia4arm-dnf.conf b/mageia4arm-dnf.conf index d7a0450..c696539 100644 --- a/mageia4arm-dnf.conf +++ b/mageia4arm-dnf.conf @@ -11,10 +11,11 @@ syslog_device= metadata_expire=0 best=1 protected_packages= +install_weak_deps=0 # repos -[mageia-$arch] +[mageia] name=Mageia $releasever - $arch #baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/$arch/media/core/release/ #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch=$arch§ion=core&repo=release @@ -25,7 +26,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia enabled=1 skip_if_unavailable=False -[updates-$arch] +[updates] name=Mageia $releasever - $arch - Updates #baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/$arch/media/core/updates/ #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch=$arch§ion=core&repo=updates |