Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arm architecture adaptation #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ubuntu16/02_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [[ $EUID -ne 0 ]]; then
fi

# install build tools
apt-get -y install devscripts build-essential fakeroot cdbs debhelper dh-autoreconf
apt-get -y install devscripts build-essential fakeroot cdbs debhelper dh-autoreconf ed

# install additional packages for new squid
apt-get -y install \
Expand Down
5 changes: 3 additions & 2 deletions src/ubuntu16/04_install_ecap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ source ecap.ver
pushd build/libecap

# install ecap packages
dpkg --install libecap3_${ECAP_PKG}_amd64.deb
dpkg --install libecap3-dev_${ECAP_PKG}_amd64.deb
arch=$(dpkg --print-architecture)
dpkg --install libecap3_${ECAP_PKG}_${arch}.deb
dpkg --install libecap3-dev_${ECAP_PKG}_${arch}.deb

# and revert
popd
8 changes: 5 additions & 3 deletions src/ubuntu16/06_install_squid.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash

if [[ $EUID -ne 0 ]]; then
echo "This script must be run as root" 1>&2
exit 1
Expand All @@ -10,11 +11,12 @@ source squid.ver
# decend into working directory
pushd build/squid

# install ecap packages
# install squid packages
arch=$(dpkg --print-architecture)
sudo apt-get install squid-langpack
dpkg --install squid-common_${SQUID_PKG}_all.deb
dpkg --install squid_${SQUID_PKG}_amd64.deb
dpkg --install squidclient_${SQUID_PKG}_amd64.deb
dpkg --install squid_${SQUID_PKG}_${arch}.deb
dpkg --install squidclient_${SQUID_PKG}_${arch}.deb

# and revert
popd
5 changes: 3 additions & 2 deletions src/ubuntu18/scripts.squid4/04_install_squid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ source squid.ver
pushd build/squid

# install squid packages
arch=$(dpkg --print-architecture)
sudo apt-get install squid-langpack
dpkg --install squid-common_${SQUID_PKG}_all.deb
dpkg --install squid_${SQUID_PKG}_amd64.deb
dpkg --install squidclient_${SQUID_PKG}_amd64.deb
dpkg --install squid_${SQUID_PKG}_${arch}.deb
dpkg --install squidclient_${SQUID_PKG}_${arch}.deb

# and revert
popd