Skip to content

Commit

Permalink
fixes junest for linuxarmv7 -u argument isnt valid anymore (#6422)
Browse files Browse the repository at this point in the history
* fixes junest for linuxarmv7 -u argument isnt valid anymore

* added setup for junest

* going back to the last major release of junset to see if that fixes the errors

* Upgrade junest

Remove junest -u syntax
Install junest with junest setup
Install sed into junest
improve package installation (--needed , -Sy only when needed)
  • Loading branch information
ofTheo committed Nov 3, 2019
1 parent 73cb6bf commit ce68a11
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion scripts/ci/linuxarmv7l/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
export PATH=~/.local/share/junest/bin:$PATH
ROOT=$(cd $(dirname $0); pwd -P)
junest -u $ROOT/build_junest.sh
junest $ROOT/build_junest.sh
21 changes: 11 additions & 10 deletions scripts/ci/linuxarmv7l/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,20 @@ createArchImg(){
echo "Downloading archlinux image"
#$ROOT/arch-bootstrap_downloadonly.sh -a armv7h -r "http://eu.mirror.archlinuxarm.org/" ~/archlinux
cd ~
wget http://archlinuxarm.org/os/ArchLinuxARM-rpi-2-latest.tar.gz
wget -v http://os.archlinuxarm.org/os/ArchLinuxARM-rpi-2-latest.tar.gz
# download=$!
# echoDots $download
# wait $download

mkdir ~/archlinux
junest -u << EOF
junest -- << EOF
tar xzf ~/ArchLinuxARM-rpi-2-latest.tar.gz --no-same-owner -C ~/archlinux/ 2>&1 >/dev/null | grep -v "tar: Ignoring unknown extended header keyword"
sed -i s_/etc/pacman_$HOME/archlinux/etc/pacman_g ~/archlinux/etc/pacman.conf
sed -i "s/Required DatabaseOptional/Never/g" ~/archlinux/etc/pacman.conf
pacman --noconfirm -Sy archlinux-keyring
pacman --noconfirm -Syu ccache
pacman --noconfirm -r ~/archlinux/ --config ~/archlinux/etc/pacman.conf --arch=armv7h -Syu
pacman --noconfirm -r ~/archlinux/ --config ~/archlinux/etc/pacman.conf --arch=armv7h -S \
pacman --noconfirm -S archlinux-keyring
pacman --noconfirm -S ccache
pacman --noconfirm --needed -r ~/archlinux/ --config ~/archlinux/etc/pacman.conf --arch=armv7h -Syu
pacman --noconfirm --needed -r ~/archlinux/ --config ~/archlinux/etc/pacman.conf --arch=armv7h -S \
make \
pkg-config \
gcc \
Expand Down Expand Up @@ -138,7 +138,7 @@ downloadToolchain(){
fi
cd ~
wget --quiet http://archlinuxarm.org/builder/xtools/x-tools7h.tar.xz
junest -u << EOF
junest -- << EOF
tar -x --delay-directory-restore --no-same-owner -f ~/x-tools7h.tar.xz -C ~/
rm ~/x-tools7h.tar.xz
EOF
Expand Down Expand Up @@ -202,13 +202,14 @@ installJunest(){
git clone git://github.com/fsquillace/junest ~/.local/share/junest
fi
export PATH=~/.local/share/junest/bin:$PATH
junest -u << EOF
junest setup
junest -- << EOF
echo updating keys
pacman -S gnupg --noconfirm
pacman -Syy gnupg --noconfirm --needed
pacman-key --populate archlinux
pacman-key --refresh-keys
pacman -Syyu --noconfirm
pacman -S --noconfirm git flex grep gcc pkg-config make wget
pacman -S --noconfirm --needed git flex grep gcc pkg-config make wget sed
EOF
echo "Done installing junest"
}
Expand Down

0 comments on commit ce68a11

Please sign in to comment.