diff options
| author | Gaetan Bisson | 2020-01-22 08:05:18 -1000 |
|---|---|---|
| committer | Gaetan Bisson | 2020-01-22 08:05:18 -1000 |
| commit | 991be698e97f2e74e38a6b38ec16c968f2ee249a (patch) | |
| tree | 8699f3ef1aa52bb9c45e135c5217a7963ef0c63c | |
| parent | 7ca192e6ab1b429ffe80dd92a51f6502c106dcac (diff) | |
| download | aur-991be698e97f2e74e38a6b38ec16c968f2ee249a.tar.gz | |
drop pacman-contrib, simply rm package cache
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rwxr-xr-x | arch.build | 7 | ||||
| -rwxr-xr-x | arch.install | 6 |
3 files changed, 11 insertions, 10 deletions
@@ -1,8 +1,8 @@ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=buildstuff -pkgver=1.6 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc='Stuff to build packages in virtual machines' url='http://arch.vesath.org/' arch=('any') @@ -25,5 +25,5 @@ package() { sha256sums=('6225e9cd7dbd46692d3b3ebde37a182c05863459879e99dbca5b3a4125e5eb1d' 'acf683446e1162104759b1a75d18859b1a36ac6f3eeabb241025d0e6c37c7960' - '12b438eaa95d48db7a9ff5a2c5e6af542548752e293fca6d824f2437a59fc5f2' - 'ec9d9974fc65a670754f66aa16b6f64394fbf089685acae32e31d3727263f3ee') + '12d4c4033073cc940b26581d3008c865145cd1bbe0f64491bff522922370d003' + '8f33b668ab81dcefd62191c3a01d596d498b8ba1058368dbb1ca2a2a2bf89218') diff --git a/arch.build b/arch.build index 53f937ca78f3..44c35a5ee29b 100755 --- a/arch.build +++ b/arch.build @@ -23,7 +23,7 @@ vhost=" start_vm() { qemu-system-x86_64 \ - -cpu $cpu -smp 4 -m 4G \ + -cpu $cpu -smp 4 -m 2G \ -accel kvm:tcg,thread=multi \ -device virtio-net,netdev=vlan \ -netdev user,id=vlan,hostfwd=::$vport-:22 \ @@ -32,7 +32,7 @@ start_vm() { ssh $vhost 'curl -o /dev/null -s vesath.org' && break done - cat /etc/pacman.d/mirrorlist | + sed 's/127.0.0.1/10.0.2.2/g' /etc/pacman.d/mirrorlist | ssh $vhost 'sudo dd of=/etc/pacman.d/mirrorlist' } @@ -67,7 +67,7 @@ set -E start_vm $img ssh $vhost 'sudo pacman --noconfirm -Syu' ssh $vhost 'sudo pacman --noconfirm -Su' - ssh $vhost 'sudo paccache --remove --keep 0' + ssh $vhost 'sudo rm --force /var/cache/pacman/pkg/*' stop_vm } @@ -79,6 +79,7 @@ for r in $repo; do done | ssh $vhost ssh $vhost 'sudo pacman --noconfirm -Syu' ssh $vhost 'sudo pacman --noconfirm -Su' +ssh $vhost 'sudo rm --force /var/cache/pacman/pkg/*' ssh $vhost 'sudo install -o user -g user -d /build' sftp $vhost <<<"mkdir .gnupg" sftp $vhost <<<"put $HOME/.makepkg.conf" diff --git a/arch.install b/arch.install index 862f4dfd7f1d..9259e6131074 100755 --- a/arch.install +++ b/arch.install @@ -32,9 +32,9 @@ pushd ${mnt} install -d boot mount ${loop}p1 boot -setarch ${arch} pacstrap -C /usr/share/devtools/pacman-extra.conf -c . base base-devel pacman-contrib haveged openssh sudo syslinux -systemctl --root=. enable systemd-{networkd,resolved} haveged sshd +setarch ${arch} pacstrap -C /usr/share/devtools/pacman-extra.conf -c . base base-devel syslinux mkinitcpio haveged openssh sudo +systemctl --root=. enable systemd-{networkd,resolved} haveged sshd ln -sf ../run/systemd/resolve/resolv.conf etc/resolv.conf install -d home/user/.ssh @@ -76,8 +76,8 @@ DHCP=yes EOF setarch ${arch} arch-chroot . <<EOF +sudo pacman --noconfirm -S linux syslinux-install_update -i -m -mkinitcpio -p linux locale-gen useradd -p 00as1wm0AZG56 user chown -R user:users /home/user |