diff options
| author | DTux <contact@librepc.com> | 2020-01-06 21:03:07 +0000 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2020-01-06 21:03:07 +0000 |
| commit | 1b345f3cb241d20cd004d6c8c8b1c30a683b21a6 (patch) | |
| tree | bfb79d26a0d37fff2a406e13ca0dcd1c196fc2e5 | |
| parent | c5531c36c3dbab601c44ed0171e7cedcafc0b9e9 (diff) | |
| parent | 036dc79d99227674ec9e586d7eba75bb8376d5c8 (diff) | |
| download | mageia4arm-1b345f3cb241d20cd004d6c8c8b1c30a683b21a6.tar mageia4arm-1b345f3cb241d20cd004d6c8c8b1c30a683b21a6.tar.gz mageia4arm-1b345f3cb241d20cd004d6c8c8b1c30a683b21a6.tar.bz2 mageia4arm-1b345f3cb241d20cd004d6c8c8b1c30a683b21a6.tar.xz mageia4arm-1b345f3cb241d20cd004d6c8c8b1c30a683b21a6.zip | |
Merge branch 'misc-bootstrap-fixes' of ngompa/mageia4arm into master
| -rwxr-xr-x | create_arm_image.sh | 13 | ||||
| -rw-r--r-- | mageia4arm-dnf.conf | 5 |
2 files changed, 14 insertions, 4 deletions
diff --git a/create_arm_image.sh b/create_arm_image.sh index 2479390..34549a1 100755 --- a/create_arm_image.sh +++ b/create_arm_image.sh @@ -85,6 +85,15 @@ function verify_disk_space() function createchroot() { title "Making chroot" + if ! [ -f /usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia ]; then + title "distribution-gpg-keys package not present : installing distribution-gpg-keys" + /usr/bin/dnf --assumeyes --setopt=install_weak_deps=False install distribution-gpg-keys + if [ ${?} -ne 0 ]; then + error "line ${LINENO} can't install distribution-gpg-keys : exiting" + exit ${ERR_1} + fi + fi + if ! [ -f /bin/qemu-arm-static ]; then title "Qemu package not present : installing qemu packages" /usr/bin/dnf --assumeyes --setopt=install_weak_deps=False install qemu-user-static @@ -109,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 |