On Thu, Jan 08, 2015 at 09:43:16AM +0100, Martin Hejnfelt wrote:
> Signed-off-by: Martin Hejnfelt <[email protected]>
> ---
> :000000 100644 0000000... 4b4512c... A        rules/oracle-java7-jre.in
> :000000 100644 0000000... 8a5603d... A        rules/oracle-java7-jre.make
>  rules/oracle-java7-jre.in   |  25 +++++++++++
>  rules/oracle-java7-jre.make | 102 
> ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 127 insertions(+)
> 
> diff --git a/rules/oracle-java7-jre.in b/rules/oracle-java7-jre.in
> new file mode 100644
> index 0000000..4b4512c
> --- /dev/null
> +++ b/rules/oracle-java7-jre.in
> @@ -0,0 +1,25 @@
> +## SECTION=bytecode_engines
> +
> +menuconfig ORACLE_JAVA7_JRE
> +     tristate
> +     
> +     prompt "oracle java7 jre              "

Any reason to use java7 and not java8?

> +     help
> +      Oracle[tm] Java Runtime Environment 7
> +      This downloads the binary distribution
> +      and extracts into the target prefix.
> +
> +config ORACLE_JAVA7_JRE_TARGET_PREFIX
> +     string
> +     depends on ORACLE_JAVA7_JRE
> +     default "/usr/lib/jvm"
> +     prompt "PREFIX for JRE 7"
> +     help
> +       Where should the JRE be installed.

Do we need this? I think we can just hardcode this path.

> +
> +config ORACLE_JAVA7_JRE_ARCHX64
> +     boolean
> +     depends on ORACLE_JAVA7_JRE
> +     prompt "JRE7 x64 binary"
> +     help
> +       Downloads the x64 binary instead

this should not be needed. Use PTXCONF_ARCH_X86_64 instead.


> diff --git a/rules/oracle-java7-jre.make b/rules/oracle-java7-jre.make
> new file mode 100644
> index 0000000..8a5603d
> --- /dev/null
> +++ b/rules/oracle-java7-jre.make
> @@ -0,0 +1,102 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Oracle

This is the copyright for this file, so your name/email belongs here.

> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_ORACLE_JAVA7_JRE) += oracle-java7-jre

PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_ORACLE_JAVA7_JRE) += oracle-java7-jre

> +
> +#
> +# Paths and names
> +#
> +ifdef PTXCONF_ORACLE_JAVA7_JRE_ARCHX64
> +ORACLE_JAVA7_JRE_ARCH                := x64
> +else
> +ORACLE_JAVA7_JRE_ARCH                := i586
> +endif
> +
> +ORACLE_JAVA7_JRE_VERSION     := 7u67
> +
> +ifdef PTXCONF_ORACLE_JAVA7_JRE_ARCHX64
> +ORACLE_JAVA7_JRE_MD5         := 9007c79167be0177fb47e5313c53d5cb
> +else
> +ORACLE_JAVA7_JRE_MD5            := 2a256eb2a91f0084e58c612636342c2b

indent with tabs.

> +endif
> +
> +ORACLE_JAVA7_JRE             := 
> jre-$(ORACLE_JAVA7_JRE_VERSION)-linux-$(ORACLE_JAVA7_JRE_ARCH)
> +ORACLE_JAVA7_JRE_SUFFIX              := tar.gz
> +ORACLE_JAVA7_JRE_URL         := 
> http://download.oracle.com/otn-pub/java/jdk/$(ORACLE_JAVA7_JRE_VERSION)-b01/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX)
> +ORACLE_JAVA7_JRE_SOURCE              := 
> $(SRCDIR)/$(ORACLE_JAVA7_JRE).$(ORACLE_JAVA7_JRE_SUFFIX)
> +ORACLE_JAVA7_JRE_DIR         := $(BUILDDIR)/$(ORACLE_JAVA7_JRE)
> +ORACLE_JAVA7_JRE_LICENSE     := unknown
> +
> +# 
> ----------------------------------------------------------------------------
> +# Get
> +# 
> ----------------------------------------------------------------------------
> +
> +$(ORACLE_JAVA7_JRE_SOURCE):
> +     @$(call targetinfo)
> +     wget --no-cookies --header "Cookie: 
> oraclelicense=accept-securebackup-cookie" $(ORACLE_JAVA7_JRE_URL) -P 
> $(SRCDIR)/

No, this is more complex. I need to think about how to handle this
correctly.

> +     @$(call touch)
> +
> +# 
> ----------------------------------------------------------------------------
> +# Prepare
> +# 
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/oracle-java7-jre.prepare:
> +     @$(call targetinfo)
> +     @$(call touch)

replace this with:

ORACLE_JAVA7_JRE_CONF_TOOL := NO

> +
> +# 
> ----------------------------------------------------------------------------
> +# Compile
> +# 
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/oracle-java7-jre.compile:
> +     @$(call targetinfo)
> +     @$(call touch)
> +
> +# 
> ----------------------------------------------------------------------------
> +# Install
> +# 
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/oracle-java7-jre.install:
> +     @$(call targetinfo)
> +     @$(call touch)
> +
> +# 
> ----------------------------------------------------------------------------
> +# Target-Install
> +# 
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/oracle-java7-jre.targetinstall:
> +     @$(call targetinfo)
> +
> +     @$(call install_init, oracle-java7-jre)
> +     @$(call install_fixup, oracle-java7-jre,PRIORITY,optional)
> +     @$(call install_fixup, oracle-java7-jre,SECTION,base)
> +     @$(call install_fixup, oracle-java7-jre,AUTHOR,"Oracle")

This is the package author (you, same as copyright) not the upstream author.

> +     @$(call install_fixup, oracle-java7-jre,DESCRIPTION,"Oracle Java 
> Runtime Envinronment")
> +
> +     @$(call install_tree, oracle-java7-jre, -, -, \
                $(ORACLE_JAVA7_JRE_DIR), \
                
$(PTXCONF_ORACLE_JAVA7_JRE_TARGET_PREFIX)/jre-$(ORACLE_JAVA7_JRE_VERSION))

break

> +     @$(call install_link, oracle-java7-jre, 
> $(PTXCONF_ORACLE_JAVA7_JRE_TARGET_PREFIX)/jre-$(ORACLE_JAVA7_JRE_VERSION)/bin/java,
>  /usr/bin/java)
> +     @$(call install_link, oracle-java7-jre, 
> $(PTXCONF_ORACLE_JAVA7_JRE_TARGET_PREFIX)/jre-$(ORACLE_JAVA7_JRE_VERSION)/bin/javaws,
>  /usr/bin/javaws)

here as well

> +
> +     @$(call install_finish, oracle-java7-jre)
> +
> +     @$(call touch)
> +
> +# 
> ----------------------------------------------------------------------------
> +# Clean
> +# 
> ----------------------------------------------------------------------------
> +
> +#$(STATEDIR)/oracle-java7-jre.clean:
> +#    @$(call targetinfo)
> +#    @$(call clean_pkg, ORACLE_JAVA7_JRE)

remove.

Michael

> +
> +# vim: syntax=make
> -- 
> 1.9.1
> 
> 
> -- 
> ptxdist mailing list
> [email protected]
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
[email protected]

Reply via email to