diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-support/mysql | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | meta-openembedded-contrib-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz |
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
-rw-r--r-- | meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb | 10 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 210 |
2 files changed, 110 insertions, 110 deletions
diff --git a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb index b2bbfc4aa6..dcaf0c69c3 100644 --- a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb +++ b/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb @@ -12,12 +12,12 @@ EXTRA_OEMAKE = "" EXTRA_OECONF = " --with-embedded-server " do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ } SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index af0ddbb5c0..3d79e193d6 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -35,13 +35,13 @@ EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " do_configure_append() { - sed -i /comp_err/d ${S}/sql/share/Makefile + sed -i /comp_err/d ${S}/sql/share/Makefile - # handle distros with different values of ${libexecdir} - libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` - sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh - sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh - sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh + # handle distros with different values of ${libexecdir} + libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'` + sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysql_install_db.sh + sed -i -e "s:mysqld libexec:mysqld $libexecdir2:g" ${S}/scripts/mysql_install_db.sh + sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh } SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" @@ -52,45 +52,45 @@ SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" # plugindir is not fixed, but we don't create any plugins. # mysql5_sysroot_preprocess () { - sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config - sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config } do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql - install -d ${D}/etc/init.d - install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ - install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld + install -d ${D}/etc/init.d + install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/ + install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld } pkg_postinst_mysql5-server () { - if [ "x$D" != "x" ]; then - exit 1 - fi + if [ "x$D" != "x" ]; then + exit 1 + fi - grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql + grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql - #Install the database - test -d /usr/bin || mkdir -p /usr/bin - test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname - mkdir /var/lib/mysql - chown mysql.nogroup /var/lib/mysql + #Install the database + test -d /usr/bin || mkdir -p /usr/bin + test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname + mkdir /var/lib/mysql + chown mysql.nogroup /var/lib/mysql - mysql_install_db + mysql_install_db } pkg_postrm_mysql5-server () { - grep mysql /etc/passwd && deluser mysql + grep mysql /etc/passwd && deluser mysql } PACKAGES = "${PN}-dbg ${PN} \ -libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ -libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ -${PN}-client ${PN}-server ${PN}-leftovers" + libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ + libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ + ${PN}-client ${PN}-server ${PN}-leftovers" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" FILES_${PN} = " " @@ -98,95 +98,95 @@ RDEPENDS_${PN} = "${PN}-client ${PN}-server" ALLOW_EMPTY_${PN} = "1" FILES_libmysqlclient = "\ -${libdir}/libmysqlclient.so.* \ -${libdir}/plugin/*.so.*" + ${libdir}/libmysqlclient.so.* \ + ${libdir}/plugin/*.so.*" FILES_libmysqlclient-dev = " \ -${includedir}/mysql/ \ -${libdir}/libmysqlclient.so \ -${libdir}/libmysqlclient.la \ -${libdir}/plugin/*.so \ -${libdir}/plugin/*.la \ -${sysconfdir}/aclocal \ -${bindir}/mysql_config" + ${includedir}/mysql/ \ + ${libdir}/libmysqlclient.so \ + ${libdir}/libmysqlclient.la \ + ${libdir}/plugin/*.so \ + ${libdir}/plugin/*.la \ + ${sysconfdir}/aclocal \ + ${bindir}/mysql_config" FILES_libmysqlclient-staticdev = "\ -${libdir}/*.a \ -${libdir}/plugin/*.a" + ${libdir}/*.a \ + ${libdir}/plugin/*.a" FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ -/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" + /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" FILES_libmysqlclient-r-dev = "\ -${libdir}/libmysqlclient_r.so \ -${libdir}/libmysqlclient_r.la" + ${libdir}/libmysqlclient_r.so \ + ${libdir}/libmysqlclient_r.la" FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" FILES_${PN}-client = "\ -${bindir}/myisam_ftdump \ -${bindir}/mysql \ -${bindir}/mysql_client_test \ -${bindir}/mysql_client_test_embedded \ -${bindir}/mysql_find_rows \ -${bindir}/mysql_fix_extensions \ -${bindir}/mysql_waitpid \ -${bindir}/mysqlaccess \ -${bindir}/mysqladmin \ -${bindir}/mysqlbug \ -${bindir}/mysqlcheck \ -${bindir}/mysqldump \ -${bindir}/mysqldumpslow \ -${bindir}/mysqlimport \ -${bindir}/mysqlshow \ -${bindir}/mysqlslap \ -${bindir}/mysqltest_embedded \ -${libexecdir}/mysqlmanager" + ${bindir}/myisam_ftdump \ + ${bindir}/mysql \ + ${bindir}/mysql_client_test \ + ${bindir}/mysql_client_test_embedded \ + ${bindir}/mysql_find_rows \ + ${bindir}/mysql_fix_extensions \ + ${bindir}/mysql_waitpid \ + ${bindir}/mysqlaccess \ + ${bindir}/mysqladmin \ + ${bindir}/mysqlbug \ + ${bindir}/mysqlcheck \ + ${bindir}/mysqldump \ + ${bindir}/mysqldumpslow \ + ${bindir}/mysqlimport \ + ${bindir}/mysqlshow \ + ${bindir}/mysqlslap \ + ${bindir}/mysqltest_embedded \ + ${libexecdir}/mysqlmanager" FILES_${PN}-server = "\ -${bindir}/comp_err \ -${bindir}/isamchk \ -${bindir}/isamlog \ -${bindir}/msql2mysql \ -${bindir}/my_print_defaults \ -${bindir}/myisamchk \ -${bindir}/myisamlog \ -${bindir}/myisampack \ -${bindir}/mysql_convert_table_format \ -${bindir}/mysql_fix_privilege_tables \ -${bindir}/mysql_install_db \ -${bindir}/mysql_secure_installation \ -${bindir}/mysql_setpermission \ -${bindir}/mysql_tzinfo_to_sql \ -${bindir}/mysql_upgrade \ -${bindir}/mysql_zap \ -${bindir}/mysqlbinlog \ -${bindir}/mysqld_multi \ -${bindir}/mysqld_safe \ -${bindir}/mysqlhotcopy \ -${bindir}/mysqltest \ -${bindir}/ndb_delete_all \ -${bindir}/ndb_desc \ -${bindir}/ndb_drop_index \ -${bindir}/ndb_drop_table \ -${bindir}/ndb_mgm \ -${bindir}/ndb_restore \ -${bindir}/ndb_select_all \ -${bindir}/ndb_select_count \ -${bindir}/ndb_show_tables \ -${bindir}/ndb_waiter \ -${bindir}/pack_isam \ -${bindir}/perror \ -${bindir}/replace \ -${bindir}/resolve_stack_dump \ -${bindir}/resolveip \ -${libexecdir}/mysqld \ -${sbindir}/mysqld \ -${sbindir}/ndb_cpcd \ -${sbindir}/ndbd \ -${sbindir}/ndb_mgmd \ -${datadir}/mysql/ \ -${localstatedir}/mysql/ \ -${sysconfdir}/init.d \ -${sysconfdir}/my.cnf" + ${bindir}/comp_err \ + ${bindir}/isamchk \ + ${bindir}/isamlog \ + ${bindir}/msql2mysql \ + ${bindir}/my_print_defaults \ + ${bindir}/myisamchk \ + ${bindir}/myisamlog \ + ${bindir}/myisampack \ + ${bindir}/mysql_convert_table_format \ + ${bindir}/mysql_fix_privilege_tables \ + ${bindir}/mysql_install_db \ + ${bindir}/mysql_secure_installation \ + ${bindir}/mysql_setpermission \ + ${bindir}/mysql_tzinfo_to_sql \ + ${bindir}/mysql_upgrade \ + ${bindir}/mysql_zap \ + ${bindir}/mysqlbinlog \ + ${bindir}/mysqld_multi \ + ${bindir}/mysqld_safe \ + ${bindir}/mysqlhotcopy \ + ${bindir}/mysqltest \ + ${bindir}/ndb_delete_all \ + ${bindir}/ndb_desc \ + ${bindir}/ndb_drop_index \ + ${bindir}/ndb_drop_table \ + ${bindir}/ndb_mgm \ + ${bindir}/ndb_restore \ + ${bindir}/ndb_select_all \ + ${bindir}/ndb_select_count \ + ${bindir}/ndb_show_tables \ + ${bindir}/ndb_waiter \ + ${bindir}/pack_isam \ + ${bindir}/perror \ + ${bindir}/replace \ + ${bindir}/resolve_stack_dump \ + ${bindir}/resolveip \ + ${libexecdir}/mysqld \ + ${sbindir}/mysqld \ + ${sbindir}/ndb_cpcd \ + ${sbindir}/ndbd \ + ${sbindir}/ndb_mgmd \ + ${datadir}/mysql/ \ + ${localstatedir}/mysql/ \ + ${sysconfdir}/init.d \ + ${sysconfdir}/my.cnf" DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" FILES_${PN}-leftovers = "/" |