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.

Sign up for GitHub

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

Jump to bottom

Fixes #15895: Caching depends on python #2113

Merged
merged 1 commit into from Oct 8, 2019
Merged

Fixes #15895: Caching depends on python #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions rudder-webapp/SOURCES/Makefile
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@ virtualenv/virtualenv.py:
tar -xzf virtualenv.tgz
mv virtualenv-$(VIRTUALENV_RELEASE)/ virtualenv/

PATCHES_SHA = $(shell find patches/ -type f | xargs | sha256sum | awk '{print $$1}')
PATCHES_SHA = $(shell find patches/ -type f | xargs sha256sum | sha256sum | awk '{print $$1}')
CACHE_PARAMETERS = --with-env name=openldap ldap=$(OPENLDAP_SHA256) patches=$(PATCHES_SHA)
BUILD_LDAP = $(shell ../../build-caching get openldap-source/ $(CACHE_PARAMETERS) || echo build-ldap)
build: $(BUILD_LDAP) rudder-sources virtualenv/virtualenv.py rudder-doc jetty rudder.war
Expand All @@ -143,7 +143,7 @@ build: $(BUILD_LDAP) rudder-sources virtualenv/virtualenv.py rudder-doc jetty ru
touch $@

build-ldap: openldap-source
cd openldap-source && ./configure --prefix=/opt/rudder --libdir=/opt/rudder/lib/ldap --enable-dynamic --enable-debug --enable-modules --enable-monitor=mod --enable-dynlist=mod --enable-mdb=yes --enable-hdb=no --enable-bdb=no
cd openldap-source && CFLAGS=-Wno-format-extra-args ./configure --prefix=/opt/rudder --libdir=/opt/rudder/lib/ldap --enable-dynamic --enable-debug --enable-modules --enable-monitor=mod --enable-dynlist=mod --enable-mdb=yes --enable-hdb=no --enable-bdb=no
cd openldap-source && make --debug=n depend
cd openldap-source && make --debug=n
touch $@
Expand Down
2 changes: 1 addition & 1 deletion rudder-webapp/SPECS/rudder-webapp.spec
View file
Open in desktop
Expand Up @@ -71,7 +71,7 @@ Obsoletes: ncf, ncf-api-virtualenv, rudder-techniques, rudder-inventory-ldap, ru
# Prevent reinstalling old versions
Conflicts: ncf, ncf-api-virtualenv, rudder-techniques, rudder-inventory-ldap, rudder-ldap

BuildRequires: gcc
BuildRequires: gcc, rsync
Requires: rsyslog

# Dependencies
Expand Down
2 changes: 1 addition & 1 deletion rudder-webapp/debian/control
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ Source: rudder-webapp
Section: web
Priority: extra
Maintainer: Rudder Team <dev@rudder.io>
Build-Depends: debhelper (>= 9), libltdl3-dev, libssl-dev, python3-dev, ca-certificates, curl
Build-Depends: debhelper (>= 9), libltdl3-dev, libssl-dev, python3-dev, ca-certificates, curl, rsync
Standards-Version: 3.8.0
Homepage: https://www.rudder.io

Expand Down