fix
This commit is contained in:
parent
2818a1c76d
commit
b458669754
3 changed files with 2 additions and 1 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -6,6 +6,7 @@
|
||||||
/out/
|
/out/
|
||||||
/special/
|
/special/
|
||||||
/work/
|
/work/
|
||||||
|
/libre-xfce4-openrc/
|
||||||
ArchLinuxARM-rpi-2-latest.tar.gz
|
ArchLinuxARM-rpi-2-latest.tar.gz
|
||||||
ArchLinuxARM-rpi-3-latest.tar.gz
|
ArchLinuxARM-rpi-3-latest.tar.gz
|
||||||
airootfs.sha512
|
airootfs.sha512
|
||||||
|
|
|
@ -62,7 +62,7 @@ EOT
|
||||||
#pacman -U --noconfirm --force "https://www.parabola.nu/packages/libre/any/parabola-keyring/download"
|
#pacman -U --noconfirm --force "https://www.parabola.nu/packages/libre/any/parabola-keyring/download"
|
||||||
pacman -U --noconfirm --force "https://repomirror.parabola.nu/pool/parabola/parabola-keyring-20180802-1-any.pkg.tar.xz"
|
pacman -U --noconfirm --force "https://repomirror.parabola.nu/pool/parabola/parabola-keyring-20180802-1-any.pkg.tar.xz"
|
||||||
#pacman -U --noconfirm --force "https://repomirror.parabola.nu/libre/os/x86_64/parabola-keyring-20180802-1-any.pkg.tar.xz"
|
#pacman -U --noconfirm --force "https://repomirror.parabola.nu/libre/os/x86_64/parabola-keyring-20180802-1-any.pkg.tar.xz"
|
||||||
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
|
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_${version}.txt)
|
||||||
elif [ "${version%-*-*}" == "manjaro" ]; then
|
elif [ "${version%-*-*}" == "manjaro" ]; then
|
||||||
cp pacman.conf_manjaro /etc/pacman.conf
|
cp pacman.conf_manjaro /etc/pacman.conf
|
||||||
pacman -U --noconfirm --force "https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20180607-1-any.pkg.tar.xz"
|
pacman -U --noconfirm --force "https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20180607-1-any.pkg.tar.xz"
|
||||||
|
|
Loading…
Reference in a new issue