Project

General

Profile

« Previous | Next » 

Revision 195e264a

Added by Benoît PECCATTE about 7 years ago

Fixes #10048: Make webapp build on debian with java 8

View differences:

packages.makefile
if [ "${OS}" = "SLES" -a "${OSVERSION}" = "10" ];then echo -e "y\ny" | zypper ref || true;fi
if [ ! -z "${BUILDREQUIRESSLES}" ];then zypper -n install ${BUILDREQUIRESSLES};fi
if [ ! -z "${BUILDREQUIRESSLESSP}" ];then zypper -n install ${BUILDREQUIRESSLESSP};fi
# alternatives doesn't exist on sles11 but it is a rewrite of update-alternatives so this works
ln -s /usr/sbin/update-alternatives /usr/sbin/alternatives || true
if [ "$(JAVAREQUIRES)" = "jdk" ] && [ $$(rpm -qa $(JDKPACKAGE)|wc -l) -eq 0 ]; then wget -q -O /tmp/jdk.rpm $(JDKURL); rpm -ivh /tmp/jdk.rpm; fi
buildpackage-rpm-common-prep-rhel:
rudder-inventory-endpoint/debian/rules
echo "oracle-java8-installer shared/error-oracle-license-v1-1 error " | debconf-set-selections; \
echo "oracle-java8-installer oracle-java8-installer/not_exist error " | debconf-set-selections; \
echo "oracle-java8-installer oracle-java8-installer/local string " | debconf-set-selections; \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y oracle-java8-installer ; \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes oracle-java8-installer ; \
fi \
)
rudder-webapp/debian/rules
echo "oracle-java8-installer shared/error-oracle-license-v1-1 error " | debconf-set-selections; \
echo "oracle-java8-installer oracle-java8-installer/not_exist error " | debconf-set-selections; \
echo "oracle-java8-installer oracle-java8-installer/local string " | debconf-set-selections; \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y oracle-java8-installer ; \
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes oracle-java8-installer ; \
fi \
)

Also available in: Unified diff