Skip to content

Commit

Permalink
Revert "Revitalise make setup target with infra install scripts"
Browse files Browse the repository at this point in the history
At least the pip installation ends up under root and that's not what we want:
https://tribe29.slack.com/archives/C01EA6ZBG58/p1698689001772419

This reverts commit f4e463d.

Change-Id: Ie7b33f771f581344a7151e5f9e6263227ad1bbc0
  • Loading branch information
TimotheusBachinger committed Oct 31, 2023
1 parent b674319 commit c648447
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 150 deletions.
69 changes: 68 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,74 @@ buildclean:


setup:
sudo ./install-everything.sh
# librrd-dev is still needed by the python rrd package we build in our virtual environment
sudo apt-get install \
build-essential \
clang-$(CLANG_VERSION) \
clang-format-$(CLANG_VERSION) \
clang-tidy-$(CLANG_VERSION) \
clang-tools-$(CLANG_VERSION) \
clangd-$(CLANG_VERSION) \
cmake \
curl \
direnv \
doxygen \
figlet \
gawk \
git \
ksh \
libclang-$(CLANG_VERSION)-dev \
libjpeg-dev \
libkrb5-dev \
libldap2-dev \
libmariadb-dev-compat \
libpango1.0-dev \
libpcap-dev \
librrd-dev \
libsasl2-dev \
libsqlite3-dev \
libtool-bin \
libxml2-dev \
libreadline-dev \
libxml2-dev \
libxslt-dev \
libpq-dev \
libreadline-dev \
lld-$(CLANG_VERSION) \
lldb-$(CLANG_VERSION) \
musl-tools \
p7zip-full \
patchelf \
pngcrush \
python3-pip \
python3-venv \
shellcheck \
valgrind \
zlib1g-dev
if type pyenv >/dev/null 2>&1 && pyenv shims --short | grep '^pipenv$$'; then \
CMD="pyenv exec" ; \
else \
CMD="" ; \
fi ; \
$$CMD pip3 install --user --upgrade \
pip \
pipenv=="$(PIPENV_VERSION)" \
virtualenv=="$(VIRTUALENV_VERSION)" \
wheel
if ! type rustup >/dev/null 2>&1; then \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh; \
source $$HOME/.cargo/env; \
fi ; \
rustup target add x86_64-unknown-linux-musl
$(MAKE) -C web setup
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/ubuntu $$(lsb_release -cs) stable"
sudo apt-get update
sudo apt-get install docker-ce
sudo bash -c 'usermod -a -G docker $$SUDO_USER'
$(MAKE) -C locale setup
$(MAKE) check-setup

linesofcode:
@wc -l $$(find -type f -name "*.py" -o -name "*.js" -o -name "*.cc" -o -name "*.h" -o -name "*.css" | grep -v openhardwaremonitor | grep -v jquery ) | sort -n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ case "$DISTRO" in
echo "Installing for Ubuntu"

# Install docker software
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" >/etc/apt/sources.list.d/docker.list
apt-get update
apt-get install -y docker-ce
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ if [ "$1" != "link-only" ]; then
fi
set_bin_symlinks "${TARGET_DIR}" "${DIR_NAME}"

test_package "/opt/bin/valgrind --version" "^valgrind-$VALGRIND_VERSION$"
test_package "valgrind --version" "^valgrind-$VALGRIND_VERSION$"
146 changes: 0 additions & 146 deletions install-everything.sh

This file was deleted.

1 change: 0 additions & 1 deletion locale/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ help:
@echo "update-pos - Pull changes in Checkmk localization repository, update, commit and push po-files in Checkmk repository accordingly"

setup:
sudo apt-get update
sudo apt-get install gettext

mo:
Expand Down

0 comments on commit c648447

Please sign in to comment.