aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Duskett <Aduskett@gmail.com>2020-04-18 12:06:59 -0700
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-05-08 09:21:12 +0200
commitf61ae433703711952dc3a230e71532d110c4e899 (patch)
treed7a29b18f4c1707738b1ad638368d5ecf4ae7d3d
parent6808e122f6ae9cca3966877e865e35b8922a9e9a (diff)
downloadbuildroot-f61ae433703711952dc3a230e71532d110c4e899.tar.gz
buildroot-f61ae433703711952dc3a230e71532d110c4e899.tar.bz2
package/openjdk: fix installation with merged usr directories
Currently, Buildroot installs the jre libraries using cp -dprf /build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/ However, if a system has a merged /usr directory, and there is a built kernel before installing OpenJDK, the installation fails because jre/lib has binary modules file, which causes the following error: cp: cannot overwrite directory '/usr/lib/modules with non-directory The obvious fix is to install the modules to /usr/lib/jvm/ and set the appropriate rpaths via the --with-extra-ldflags conf option. However, this fix does not work because the built binaries themselves do not link against libjava.so Indeed, running readelf on the built java binary reports the following: "(RUNPATH) Library runpath: [/usr/lib/jvm]" and /usr/lib/jvm/libjava.so exists. However, when running the Java binary on the target, the following error occurs: "Error: could not find libjava.so." The following is the result of "strace java" ran on the target: faccessat(AT_FDCWD, "/usr/lib/libjava.so", F_OK) = -1 ENOENT faccessat(AT_FDCWD, "/usr/jre/lib/libjava.so", F_OK) = -1 ENOENT newfstatat(AT_FDCWD, "/usr/lib/libjava.so", 0x7ffe7b4af8, 0) = -1 ENOENT newfstatat(AT_FDCWD, "/usr/lib/jvm/libjli.so", [sic] AT_SYMLINK_NOFOLLOW) = 0 As seen above, the java binary searches for libjli.so in /usr/lib/jvm, which demonstrates that the java binary searches for some of the DT_NEEDED libraries using the correct rpath. But libjava.so is not searched from the rpath; it is instead dl-opened manually, looked for in the search paths hardcoded to the following directories: - /usr/lib/ - /usr/jre/lib/ - $(dirname $0)/../lib/ The reason behind the hardcoded paths given by the maintainers is due to historical purposes for the need to support several java versions at the same time on a single system, and that changing the above behavior is not likely to ever happen. As such, most distributions such as Redhat do the following: - Create the directory /usr/lib/jvm/java-$(JAVA_VERSION)/ - Install all directories and files found in images/jre to that directory. - Symlink the binaries to in /usr/lib/jvm/java-$(JAVA_VERSION)/bin to /usr/bin. However, because Buildroot does not need to support multiple versions of java concurrently, there is no need for the additional java-$(JAVA_VERSION) directory. To fix the above issue, the following changes are performed: - Introduce the variable "OPENJDK_INSTALL_BASE" which points to /usr/lib/jvm - Set the --with-extra-ldflags conf_opt to "-Wl,-rpath,$(OPENJDK_INSTALL_BASE)/lib,-rpath, $(OPENJDK_INSTALL_BASE)/lib/$(OPENJDK_JVM_VARIANT)" - Run "mkdir -p $(TARGET_DIR)/usr/lib/jvm/" in the INSTALL_TARGET_CMDS step. - Copy both the lib and bin directories to /usr/lib/jvm/ - Symlink the binaries in /usr/lib/jvm/bin/ to /usr/bin. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12751 Signed-off-by: Adam Duskett <Aduskett@gmail.com> Reviewed-by: Ryan Barnett <ryan.barnett@rockwellcollins.com> Tested-by: Ryan Barnett <ryan.barnett@rockwellcollins.com> [yann.morin.1998@free.fr: fix two remaining mis-placed '/'] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 3edb915709dec21158542b15e62f1560b8dc2fa2) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/openjdk/openjdk.mk16
1 files changed, 14 insertions, 2 deletions
diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk
index 030a205228..e58757b2ed 100644
--- a/package/openjdk/openjdk.mk
+++ b/package/openjdk/openjdk.mk
@@ -46,6 +46,13 @@ OPENJDK_JVM_VARIANT = zero
OPENJDK_DEPENDENCIES += libffi
endif
+# OpenJDK installs a file named 'modules' in jre/lib, which gets installed as
+# /usr/lib/modules. However, with a merged /usr, this conflicts with the
+# directory named 'modules' installed by the kernel. If OpenJDK gets built
+# after the kernel, this manifests itself with: "cp: cannot overwrite
+# directory '/usr/lib/modules with non-directory."
+OPENJDK_INSTALL_BASE = /usr/lib/jvm
+
# OpenJDK ignores some variables unless passed via the environment.
# These variables are PATH, LD, CC, CXX, and CPP.
# OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as
@@ -75,6 +82,7 @@ OPENJDK_CONF_OPTS = \
--with-devkit=$(HOST_DIR) \
--with-extra-cflags="$(TARGET_CFLAGS)" \
--with-extra-cxxflags="$(TARGET_CXXFLAGS)" \
+ --with-extra-ldflags="-Wl,-rpath,$(OPENJDK_INSTALL_BASE)/lib,-rpath,$(OPENJDK_INSTALL_BASE)/lib/$(OPENJDK_JVM_VARIANT)" \
--with-giflib=system \
--with-jobs=$(PARALLEL_JOBS) \
--with-jvm-variants=$(OPENJDK_JVM_VARIANT) \
@@ -114,8 +122,12 @@ endef
# Calling make install always builds and installs the JDK instead of the JRE,
# which makes manual installation necessary.
define OPENJDK_INSTALL_TARGET_CMDS
- cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/* $(TARGET_DIR)/usr/bin/
- cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/
+ mkdir -p $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)
+ cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/ \
+ $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/
+ cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/ \
+ $(TARGET_DIR)$(OPENJDK_INSTALL_BASE)/
+ cd $(TARGET_DIR)/usr/bin && ln -snf ../..$(OPENJDK_INSTALL_BASE)/bin/* .
endef
$(eval $(generic-package))