| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 4ac5b555d058d4d489f25a3806a787b7b2465d09 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Wed, 27 Feb 2019 22:41:26 -0800 |
| 4 | Subject: [PATCH] support-files/CMakeLists.txt: fix do_populate_sysroot issue |
| 5 | |
| 6 | Comment out the logic which for suse as it introduces |
| 7 | below do_populate_sysroot error: |
| 8 | ERROR: mariadb-native-10.3.13-r0 do_populate_sysroot: sstate found an absolute path symlink /build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/sysroot-destdir/build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/recipe-sysroot-native/usr/sbin/rcmysql pointing at /build/tmp/work/x86_64-linux/mariadb-native/10.3.13-r0/recipe-sysroot-native/etc/init.d/mysql. Please replace this with a relative link. |
| 9 | |
| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 10 | Upstream-Status: Inappropriate [oe build specific] |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 11 | |
| 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 13 | |
| 14 | --- |
| 15 | support-files/CMakeLists.txt | 7 ------- |
| 16 | 1 file changed, 7 deletions(-) |
| 17 | |
| 18 | diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt |
| 19 | index b5767432..56733de1 100644 |
| 20 | --- a/support-files/CMakeLists.txt |
| 21 | +++ b/support-files/CMakeLists.txt |
| 22 | @@ -165,12 +165,5 @@ IF(UNIX) |
| 23 | INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR} |
| 24 | COMPONENT IniFiles) |
| 25 | ENDIF() |
| 26 | - |
| 27 | - # This is for SuSE: |
| 28 | - INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink |
| 29 | - ${INSTALL_SYSCONFDIR}/init.d/mysql |
| 30 | - ${INSTALL_SBINDIR}/rcmysql |
| 31 | - WORKING_DIRECTORY \$ENV{DESTDIR}${prefix})" |
| 32 | - COMPONENT SupportFiles) |
| 33 | ENDIF(INSTALL_SYSCONFDIR) |
| 34 | ENDIF() |