Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Normation · Nov 27, 2014 · afcce5a · afcce5a
2 parents 5f81a94 + 38bc73f
commit afcce5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/rudder-agent/SOURCES/patches/DEBIAN_3/0001-use-bundled-openssl.patch b/rudder-agent/SOURCES/patches/DEBIAN_3/0001-use-bundled-openssl.patch
@@ -18,7 +18,7 @@ diff -Naur debian/rules debian/rules
  	# Add here commands to configure the package.
  	cd SOURCES && ./perl-prepare.sh $(CURDIR)/SOURCES/fusioninventory-agent
 +	# Compile and install OpenSSL
-+	cd SOURCES/openssl-source && ./config -fPIC --prefix=/opt/rudder --openssldir=/opt/rudder/openssl shared
++	cd SOURCES/openssl-source && if [ "$(shell dpkg-architecture -qDEB_HOST_ARCH)" = "amd64" ]; then TARGET=linux-x86_64; else TARGET=linux-elf; fi && ./Configure -fPIC --prefix=/opt/rudder --openssldir=/opt/rudder/openssl shared $$TARGET
 +	cd SOURCES/openssl-source && make
 +	cd SOURCES/openssl-source && make install INSTALL_PREFIX=$(CURDIR)/debian/tmp
  	# Compile the LMDB library and install it in /opt/rudder

diff --git a/rudder-agent/SOURCES/patches/DEBIAN_4/0001-use-bundled-openssl.patch b/rudder-agent/SOURCES/patches/DEBIAN_4/0001-use-bundled-openssl.patch
@@ -18,7 +18,7 @@ diff -Naur debian/rules debian/rules
  	# Add here commands to configure the package.
  	cd SOURCES && ./perl-prepare.sh $(CURDIR)/SOURCES/fusioninventory-agent
 +	# Compile and install OpenSSL
-+	cd SOURCES/openssl-source && ./config -fPIC --prefix=/opt/rudder --openssldir=/opt/rudder/openssl shared
++	cd SOURCES/openssl-source && if [ "$(shell dpkg-architecture -qDEB_HOST_ARCH)" = "amd64" ]; then TARGET=linux-x86_64; else TARGET=linux-elf; fi && ./Configure -fPIC --prefix=/opt/rudder --openssldir=/opt/rudder/openssl shared $$TARGET
 +	cd SOURCES/openssl-source && make
 +	cd SOURCES/openssl-source && make install INSTALL_PREFIX=$(CURDIR)/debian/tmp
  	# Compile the LMDB library and install it in /opt/rudder

diff --git a/rudder-agent/SOURCES/patches/UBUNTU_10_04/0001-use-bundled-openssl.patch b/rudder-agent/SOURCES/patches/UBUNTU_10_04/0001-use-bundled-openssl.patch
@@ -18,7 +18,7 @@ diff -Naur debian/rules debian/rules
  	# Add here commands to configure the package.
  	cd SOURCES && ./perl-prepare.sh $(CURDIR)/SOURCES/fusioninventory-agent
 +	# Compile and install OpenSSL
-+	cd SOURCES/openssl-source && ./config -fPIC --prefix=/opt/rudder --openssldir=/opt/rudder/openssl shared
++	cd SOURCES/openssl-source && if [ "$(shell dpkg-architecture -qDEB_HOST_ARCH)" = "amd64" ]; then TARGET=linux-x86_64; else TARGET=linux-elf; fi && ./Configure -fPIC --prefix=/opt/rudder --openssldir=/opt/rudder/openssl shared $$TARGET
 +	cd SOURCES/openssl-source && make
 +	cd SOURCES/openssl-source && make install INSTALL_PREFIX=$(CURDIR)/debian/tmp
  	# Compile the LMDB library and install it in /opt/rudder