From 2eb86a8feffc98471f5fc3f9c20dba41844b74a5 Mon Sep 17 00:00:00 2001 From: Fang Jia Date: Thu, 21 Feb 2019 11:23:07 +0800 Subject: Revert "base-files: Define JAVA_HOME by default" This reverts commit ada652564f09756a81f54495cbc2091125239625. When enable multilib on a 64-bit system, probably both base-file and lib32-base-files are installed. Then both packages want to modify the file "profile", 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 can be added by adding a file to ${sysconfdir}/profile.d/. Signed-off-by: Fang Jia Signed-off-by: Richard Leitner --- 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 -} -- cgit v1.2.3-54-g00ecf