Project

General

Profile

« Previous | Next » 

Revision 17da224f

Added by Benoît PECCATTE about 7 years ago

Fixes #10035: Automatic install of jdk in the packaging fails on rhel

View differences:

packages.makefile
# Original URL: http://www.oracle.com/technetwork/java/javase/downloads/index-jsp-138363.html#javasejdk
JDKURL := http://www.normation.com/tarball/java/jdk-8u101-linux-i586.rpm
JDKPACKAGE := jdk1.8.0_101
ifeq ($(ARCHI),x86_64)
JDKURL := http://www.normation.com/tarball/java/jdk-8u101-linux-x86_64.rpm
endif
.DEFAULT_GOAL := localbuild
localbuild: localdepends buildpackage-debian
......
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
if [ "$(JAVAREQUIRES)" = "jdk" ] && [ $$(rpm -qa jdk|wc -l) -eq 0 ]; then wget -q -O /tmp/jdk.rpm $(JDKURL); rpm -ivh /tmp/jdk.rpm; fi
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:
# Add basic package to have macros for rpm and be able to know which part of .spec file concerns rhel 5

Also available in: Unified diff