[oe] [meta-java][PATCH 1/2] Revert "base-files: Define JAVA_HOME by default"
Fang Jia
fang.jia at windriver.com
Thu Nov 29 10:48:23 UTC 2018
This reverts commit ada652564f09756a81f54495cbc2091125239625.
When enable multilib on 64bit system, probably both base-file and
lib32-base-files are installed.
Since both packages want to modify the file "profile", then there
will be an error like:
"
Error: Transaction check error:
file /etc/profile conflicts between attempted installs of
lib32-base-files-3.0.14-r148.gpb_virt and
base-files-3.0.14-r148.gpb_virt
"
The task should be added into openjdk pacakge as postinst script.
Signed-off-by: Fang Jia <fang.jia at windriver.com>
---
recipes-core/base-files/base-files_3.0.14.bbappend | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 recipes-core/base-files/base-files_3.0.14.bbappend
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
deleted file mode 100644
index 4651185..0000000
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-do_install_append() {
- cat >> ${D}${sysconfdir}/profile << EOT
-JAVA_HOME=""
-for dir in ${libdir}/jvm/*; do
- if [ -x "\${dir}/bin/java" ]; then
- [ -z "\${JAVA_HOME}" ] && JAVA_HOME="\${dir}"
- fi
-done
-if [ -n "\${JAVA_HOME}" ]; then
- export JAVA_HOME=\${JAVA_HOME}
-fi
-EOT
-}
--
2.7.4
More information about the Openembedded-devel
mailing list