DTux/dtux__mageia4arm
Archived
1
0
Fork 0
Code

Merge branch 'misc-bootstrap-fixes' of ngompa/mageia4arm into master

Browse Source
This commit is contained in:
DTux 2020-01-06 21:03:07 +00:00 committed by Gogs
commit 1b345f3cb2
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
create_arm_image.sh
View File

@ -85,6 +85,15 @@ function verify_disk_space()
function createchroot() function createchroot()
{ {
title "Making chroot" 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 if ! [ -f /bin/qemu-arm-static ]; then
title "Qemu package not present : installing qemu packages" title "Qemu package not present : installing qemu packages"
/usr/bin/dnf --assumeyes --setopt=install_weak_deps=False install qemu-user-static /usr/bin/dnf --assumeyes --setopt=install_weak_deps=False install qemu-user-static
@ -109,10 +118,10 @@ function createchroot()
# enabling extra Mageia repositories # enabling extra Mageia repositories
function genusemirroroptions() 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}" DNF_MIRROROPTS="--config=${DNF_CONFIGPATH} --forcearch=${ARM_VERSION} --nogpgcheck --releasever=${MAGEIA_VERSION}"
if [ ! -z "${MIRROR}" ]; then 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 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/ --repofrompath=mgaup-nonfree,${MIRROR}/media/nonfree/updates/ --enablerepo=mgarel-nonfree --enablerepo=mgaup-nonfree"
fi fi

5
mageia4arm-dnf.conf
View File

@ -11,10 +11,11 @@ syslog_device=
metadata_expire=0 metadata_expire=0
best=1 best=1
protected_packages= protected_packages=
install_weak_deps=0
# repos # repos
[mageia-$arch] [mageia]
name=Mageia $releasever - $arch name=Mageia $releasever - $arch
#baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/$arch/media/core/release/ #baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/$arch/media/core/release/
#metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch=$arch&section=core&repo=release #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch=$arch&section=core&repo=release
@ -25,7 +26,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/mageia/RPM-GPG-KEY-Mageia
enabled=1 enabled=1
skip_if_unavailable=False skip_if_unavailable=False
[updates-$arch] [updates]
name=Mageia $releasever - $arch - Updates name=Mageia $releasever - $arch - Updates
#baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/$arch/media/core/updates/ #baseurl=http://mirrors.kernel.org/mageia/distrib/$releasever/$arch/media/core/updates/
#metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch=$arch&section=core&repo=updates #metalink=https://mirrors.mageia.org/metalink?distrib=mageia-$releasever&arch=$arch&section=core&repo=updates