From 93c1d6fc629aaa30dc5abcbe5f2a4e6a6cd16358 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Sat, 7 Dec 2019 16:15:10 +0100 Subject: [PATCH] mariadb: disable installing to sysroot There's no need to use a hidden directory anymore or overwrite the default make install target. --- packages/addons/service/mariadb/package.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk index fd6452e7dc..958e8106b5 100644 --- a/packages/addons/service/mariadb/package.mk +++ b/packages/addons/service/mariadb/package.mk @@ -13,7 +13,7 @@ PKG_DEPENDS_TARGET="toolchain binutils bzip2 libaio libxml2 lzo ncurses openssl PKG_SHORTDESC="MariaDB is a community-developed fork of the MySQL." PKG_LONGDESC="MariaDB (${PKG_VERSION}) is a fast SQL database server and a drop-in replacement for MySQL." PKG_TOOLCHAIN="cmake" -PKG_BUILD_FLAGS="-gold" +PKG_BUILD_FLAGS="-gold -sysroot" PKG_IS_ADDON="yes" PKG_SECTION="service" @@ -71,15 +71,13 @@ makeinstall_host() { : } -makeinstall_target() { - # use only for addon - DESTDIR=${PKG_BUILD}/.install_addon ninja ${NINJA_OPTS} install - rm -rf "${PKG_BUILD}/.install_addon/usr/mysql-test" +post_makeinstall_target() { + rm -rf "${PKG_INSTALL}/usr/mysql-test" } addon() { local ADDON="${ADDON_BUILD}/${PKG_ADDON_ID}" - local MARIADB="${PKG_BUILD}/.install_addon/usr" + local MARIADB="${PKG_INSTALL}/usr" mkdir -p ${ADDON}/bin mkdir -p ${ADDON}/config