Merge branch 'sumo-java-fix' of yoctoproject/meta-netmodule-distro into sumo
This commit is contained in:
		
						commit
						bf17d3fac5
					
				
										
											Binary file not shown.
										
									
								
							|  | @ -10,14 +10,14 @@ DESCRIPTION = "This is the proprietary JRE from Sun/Oracle, with the Hotspot JVM | ||||||
|  applications and applets" |  applications and applets" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| PV_UPDATE = "131" | PV_UPDATE = "191" | ||||||
| BUILD_NUMBER = "11" | BUILD_NUMBER = "11" | ||||||
| JVM_VERSION = "compact1" | JVM_VERSION = "compact1" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| FILESEXTRAPATHS_append := ":${THISDIR}/download" | FILESEXTRAPATHS_append := ":${THISDIR}/download" | ||||||
| 
 | 
 | ||||||
| LIC_FILES_CHKSUM = "file://${WORKDIR}/ejdk1.8.0_${PV_UPDATE}/linux_armv6_vfp_hflt/compact1/COPYRIGHT;md5=3dc1bfbd5bed75d650ad0506a0df5930"  | LIC_FILES_CHKSUM = "file://${WORKDIR}/ejdk1.8.0_${PV_UPDATE}/linux_armv6_vfp_hflt/compact1/COPYRIGHT;md5=a762796b2a8989b8952b653a178607a1" | ||||||
| LICENSE = "Oracle_Binary_Code_License_Agreement" | LICENSE = "Oracle_Binary_Code_License_Agreement" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "file://ejdk-8u${PV_UPDATE}-linux-armv6-vfp-hflt.tar.gz" | SRC_URI = "file://ejdk-8u${PV_UPDATE}-linux-armv6-vfp-hflt.tar.gz" | ||||||
|  | @ -28,14 +28,14 @@ SRC_URI[sha256sum] = "5dcc644c999e7109efe46669ac717f3b96f3bbdeac3cb66f072ca4dfbc | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| FILES_${PN} = "/opt/* /usr/bin/java" | FILES_${PN} = "${bindir}/*" | ||||||
| 
 | 
 | ||||||
| do_install() { | do_install() { | ||||||
| 	install -d ${D}/opt/local/ejdk1.8.0 | 	install -d ${D}${bindir}/ejdk1.8.0 | ||||||
| 	cp -a ${S}/ejdk1.8.0_${PV_UPDATE}/linux_armv6_vfp_hflt/${JVM_VERSION}/* ${D}/opt/local/ejdk1.8.0/ --no-preserve=ownership | 	cp -a ${S}/ejdk1.8.0_${PV_UPDATE}/linux_armv6_vfp_hflt/${JVM_VERSION}/* ${D}${bindir}/ejdk1.8.0/ --no-preserve=ownership | ||||||
| 
 | 
 | ||||||
| 	install -d 0644  ${D}/usr/bin | 	install -d 0644  ${D}${bindir} | ||||||
| 	ln -sfr ${D}/opt/local/ejdk1.8.0/bin/java  ${D}/usr/bin/java | 	ln -sfr ${D}${bindir}/ejdk1.8.0/bin/java  ${D}/usr/bin/java | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue