Verified Commit 48f76586 authored by Dan Johansen's avatar Dan Johansen
Browse files

[buildarmpkg][buildarmimg][buildrootfs][builddockerimg] use the new...

[buildarmpkg][buildarmimg][buildrootfs][builddockerimg] use the new pacman-mirrors syntax and new mirror
parent 9cb79f2e
......@@ -43,7 +43,7 @@ create_rootfs () {
info "Setting up keyrings..."
$NSPAWN $BUILDDIR/$ARCH pacman-key --init 1> /dev/null 2>&1
$NSPAWN $BUILDDIR/$ARCH pacman-key --populate archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
$NSPAWN $BUILDDIR/$ARCH pacman-mirrors -g 1> /dev/null 2>&1
$NSPAWN $BUILDDIR/$ARCH pacman-mirrors -f10 1> /dev/null 2>&1
}
compress_docker () {
......
......@@ -37,7 +37,7 @@ create_rootfs () {
rm -f $BUILDDIR/$ARCH/etc/ca-certificates/extracted/tls-ca-bundle.pem
cp -a /etc/ssl/certs/ca-certificates.crt $BUILDDIR/$ARCH/etc/ssl/certs/
cp -a /etc/ca-certificates/extracted/tls-ca-bundle.pem $BUILDDIR/$ARCH/etc/ca-certificates/extracted/
$NSPAWN $BUILDDIR/$ARCH pacman-mirrors -g 1> /dev/null 2>&1
$NSPAWN $BUILDDIR/$ARCH pacman-mirrors -f10 1> /dev/null 2>&1
}
compress_rootfs () {
......
......@@ -174,7 +174,7 @@ create_rootfs_pkg() {
cp -a /etc/ca-certificates/extracted/tls-ca-bundle.pem $BUILDDIR/$ARCH/etc/ca-certificates/extracted/
sed -i s/'#PACKAGER="John Doe <john@doe.com>"'/"$PACKAGER"/ $BUILDDIR/$ARCH/etc/makepkg.conf
sed -i s/'#MAKEFLAGS="-j2"'/'MAKEFLAGS="-j$(nproc)"'/ $BUILDDIR/$ARCH/etc/makepkg.conf
$NSPAWN $BUILDDIR/$ARCH pacman-mirrors -g
$NSPAWN $BUILDDIR/$ARCH pacman-mirrors -f10
$NSPAWN $BUILDDIR/$ARCH pacman -Syy
}
......@@ -220,7 +220,7 @@ create_rootfs_img() {
info "Setting branch to $BRANCH..."
sed -i s/"# Branch = stable"/"Branch = $BRANCH"/g $ROOTFS_IMG/rootfs_$ARCH/etc/pacman-mirrors.conf
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman-mirrors -g
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman-mirrors -f10
msg "Installing packages for $EDITION edition on $DEVICE..."
# Install device and editions specific packages
......@@ -332,7 +332,7 @@ create_emmc_install() {
msg "Installing packages for eMMC installer edition of $EDITION on $DEVICE..."
# Install device and editions specific packages
mount -o bind /var/cache/manjaro-arm-tools/pkg/pkg-cache $ROOTFS_IMG/rootfs_$ARCH/var/cache/pacman/pkg
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman-mirrors -g
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman-mirrors -f10
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman -Syyu base $PKG_DEVICE $PKG_EDITION manjaro-system manjaro-release manjaro-arm-emmc-flasher --noconfirm
info "Enabling services..."
......
......@@ -35,7 +35,7 @@ Architecture = aarch64
#Color
#TotalDownload
CheckSpace
VerbosePkgLists
#VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
......@@ -68,15 +68,15 @@ LocalFileSigLevel = Optional
[core]
#Include = /etc/pacman.d/mirrorlist
Server = https://manjaro-arm.moson.eu/stable/$repo/$arch
Server = https://manjaro.moson.eu/stable/$repo/$arch
[extra]
#Include = /etc/pacman.d/mirrorlist
Server = https://manjaro-arm.moson.eu/stable/$repo/$arch
Server = https://manjaro.moson.eu/stable/$repo/$arch
[community]
#Include = /etc/pacman.d/mirrorlist
Server = https://manjaro-arm.moson.eu/stable/$repo/$arch
Server = https://manjaro.moson.eu/stable/$repo/$arch
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment