# HG changeset patch # User Aleksej Bobylev # Date 1541749709 -7200 # Node ID 0c5cf0a8abaa6163d21456d93b22e38e8aad2d55 # Parent bfe1f37ff4368530056ccbe27355552444ffad80 mariadb 10.3.10 (again) diff -r bfe1f37ff436 -r 0c5cf0a8abaa mariadb/receipt --- a/mariadb/receipt Fri Nov 09 03:18:57 2018 +0200 +++ b/mariadb/receipt Fri Nov 09 09:48:29 2018 +0200 @@ -15,12 +15,12 @@ pcre-dev curl-dev libxml2-dev xz-dev boost-dev git" SPLIT="\ -$PACKAGE-test $PACKAGE-common $PACKAGE-client $PACKAGE-bench \ -$PACKAGE-backup $PACKAGE-mytop $PACKAGE-server-utils \ -$PACKAGE-dev $PACKAGE" +$PACKAGE-test $PACKAGE-common $PACKAGE-client $PACKAGE-bench \ +$PACKAGE-backup $PACKAGE-embedded $PACKAGE-mytop $PACKAGE-server-utils \ +$PACKAGE-plugin-rocksdb $PACKAGE-dev $PACKAGE" case $ARCH in - x86_64) SPLIT="$PACKAGE-plugin-rocksdb $SPLIT";; + i?86) SPLIT="${SPLIT/$PACKAGE-plugin-rocksdb/}";; esac compile_rules() { @@ -101,22 +101,29 @@ make && make install || return 1 + # fix Perl files permissions + find $install -type f -perm 664 -exec chmod 644 '{}' \; + find $install -type f -perm 775 -exec chmod 755 '{}' \; + find $install -type d -perm 775 -exec chmod 755 '{}' \; + + # install conf files install -Dm600 $stuff/my.cnf $install/etc/my.cnf install -Dm600 $stuff/mariadb-server.cnf $install/etc/my.cnf.d/mariadb-server.cnf mv $install/usr/sql-bench $install/usr/share install -Dm755 $stuff/etc/init.d/mysql $install/etc/init.d/mysql + + # move to bin and leave symlink instead + mv $install/usr/mysql-test/lib/My/SafeProcess/my_safe_process \ + $install/usr/bin/ + ln -s ../../../../bin/my_safe_process \ + $install/usr/mysql-test/lib/My/SafeProcess/my_safe_process } genpkg_rules() { case $PACKAGE in - *-plugin-rocksdb) - copy ha_rocksdb.so - CAT="RocksDB (MyRocks) plugin" - ;; *-test) - # missing bin/my_safe_process copy bin/mysql_client_test bin/my_safe_process \ bin/mysqltest bin/mysqltest_embedded mysql-test/ CAT="development|test suite" @@ -145,6 +152,11 @@ CAT="office|mariabackup tool for physical online backups" DEPENDS=" " ;; + *-embedded) + copy libmariadbd.so* libmysqld.so + CAT="office|embeddable library" + DEPENDS="mariadb-common" + ;; *-mytop) copy bin/mytop DEPENDS="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket \ @@ -157,6 +169,10 @@ CAT="office|non-essential server utilities" DEPENDS="" ;; + *-plugin-rocksdb) + copy ha_rocksdb.so + CAT="RocksDB (MyRocks) plugin" + ;; *-dev) copy @dev @rm CAT="office|CLI tool for monitoring MariaDB performance"