diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs')
20 files changed, 282 insertions, 257 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb index 06f794764..fa360b8d1 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.7.10.bb @@ -4,10 +4,10 @@ HOMEPAGE = "https://www.influxdata.com/products/influxdb-overview/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=ba8146ad9cc2a128209983265136e06a" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN} = "bash" -RDEPENDS_${PN}-dev = "bash" +RDEPENDS:${PN} = "bash" +RDEPENDS:${PN}-dev = "bash" GO_IMPORT = "github.com/influxdata/influxdb" @@ -22,22 +22,22 @@ SRC_URI = "\ file://influxdb.conf \ " -SRC_URI_append_mipsarch = " file://0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch;patchdir=src/${GO_IMPORT}" +SRC_URI:append:mipsarch = " file://0001-patch-term-module-for-mips-ispeed-ospeed-termios-abs.patch;patchdir=src/${GO_IMPORT}" SRCREV = "c958f436b2e538a88a7815aad721c7774a0b8f63" inherit go-mod systemd update-rc.d useradd USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" +USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" -do_install_prepend() { +do_install:prepend() { rm ${B}/src/${GO_IMPORT}/build.py rm ${B}/src/${GO_IMPORT}/build.sh rm ${B}/src/${GO_IMPORT}/Dockerfile* } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/influxdb install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb chown -R root.influxdb ${D}${sysconfdir}/influxdb @@ -62,4 +62,4 @@ INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "influxdb" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "influxdb.service" +SYSTEMD_SERVICE:${PN} = "influxdb.service" diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb index b597ef1ea..b973c68b0 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb @@ -20,7 +20,7 @@ PACKAGECONFIG[tcmalloc] = ",,gperftools" EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON \ -DLEVELDB_BUILD_TESTS=${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ON', 'OFF', d)}" -do_install_append() { +do_install:append() { install -D -m 0755 ${B}/leveldbutil ${D}${bindir}/leveldbutil } @@ -30,4 +30,4 @@ do_install_ptest() { # Do not try to build lib32-leveldb for mips64, but allow libn32-leveldb. # -COMPATIBLE_HOST_mipsarcho32_pn-lib32-leveldb = "null" +COMPATIBLE_HOST:mipsarcho32:pn-lib32-leveldb = "null" diff --git a/meta-openembedded/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch b/meta-openembedded/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch new file mode 100644 index 000000000..2cc98e6d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch @@ -0,0 +1,33 @@ +From 4a11d4d03ef66729d302cc122fa0c693299a7776 Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Wed, 18 Aug 2021 10:49:38 -0400 +Subject: [PATCH] Makefile: use libprefix instead of libdir + +libdir expands to "$(exec_prefix)/lib" where "lib" is hardcoded. +This is a problem for builds that enable MULTILIB since libraries +are to be installed in "lib64" directory. Hence allow the directory +to be configurable. + +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + libraries/liblmdb/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index f254511..1ec74e6 100644 +--- a/Makefile ++++ b/Makefile +@@ -46,11 +46,11 @@ all: $(ILIBS) $(PROGS) + + install: $(ILIBS) $(IPROGS) $(IHDRS) + mkdir -p $(DESTDIR)$(bindir) +- mkdir -p $(DESTDIR)$(libdir) ++ mkdir -p $(DESTDIR)$(libprefix) + mkdir -p $(DESTDIR)$(includedir) + mkdir -p $(DESTDIR)$(mandir)/man1 + for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done +- for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done ++ for f in $(ILIBS); do cp $$f $(DESTDIR)$(libprefix); done + for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done + for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done + diff --git a/meta-openembedded/meta-oe/recipes-dbs/lmdb/files/run-ptest b/meta-openembedded/meta-oe/recipes-dbs/lmdb/files/run-ptest new file mode 100644 index 000000000..a6a7549b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/lmdb/files/run-ptest @@ -0,0 +1,25 @@ +#!/bin/sh + +cd tests + +retval=0 +for t in mtest* +do + mkdir testdb + ./$t > /dev/null && ./mdb_stat testdb > /dev/null + if [ $? -ne 0 ]; then + echo "FAIL: $t" + retval=$(( ${retval} + 1)) + else + echo "PASS: $t" + fi + rm -rf testdb +done + +if [ $retval -eq 0 ] ; then + echo "PASS: lmdb" +else + echo "FAIL: lmdb" +fi + +exit $retval
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb new file mode 100644 index 000000000..3c6ffe04e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb @@ -0,0 +1,40 @@ +# SPDX-FileCopyrightText: 2017-2019 Volker Krause <vkrause@kde.org> +# SPDX-FileCopyrightText: 2019 Hannah Kiekens <hannahkiekens@gmail.com> +# +# SPDX-License-Identifier: MIT + +SUMMARY = "Lightning Memory-Mapped Database (LMDB)" +HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/" +LICENSE = "OLDAP-2.8" +LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972" + +SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \ + file://run-ptest \ + file://0001-Makefile-use-libprefix-instead-of-libdir.patch \ + " + +SRCREV = "LMDB_${PV}" + +inherit base ptest + +S = "${WORKDIR}/git/libraries/liblmdb" + +LDFLAGS += "-Wl,-soname,lib${PN}.so.${PV}" + +do_compile() { + oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" +} + +do_install() { + oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" install + cd ${D}${libdir} + ln -s liblmdb.so.${PV} liblmdb.so + rm liblmdb.a +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + for test in mtest mtest2 mtest3 mtest4 mtest5 mdb_stat; do + install -m 755 ${S}/$test ${D}${PTEST_PATH}/tests + done +} diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.6.4.bb index 73b2a0980..e38726d3f 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.6.4.bb @@ -4,7 +4,7 @@ inherit native PROVIDES += "mysql5-native" DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" -RDEPENDS_${PN} = "" +RDEPENDS:${PN} = "" PACKAGES = "" EXTRA_OEMAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 5787ae4bd..81a785932 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311" -SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz \ +SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://my.cnf \ file://mysqld.service \ file://install_db.service \ @@ -12,20 +12,18 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ - file://0001-disable-ucontext-on-musl.patch \ file://c11_atomics.patch \ - file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ - file://sys_futex.patch \ file://ssize_t.patch \ file://mm_malloc.patch \ + file://sys_futex.patch \ " -SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" +SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a" +SRC_URI[sha256sum] = "75bf9b147a95d38160d01a73b098d50a1960563b46d16a235971fff64d99643c" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -39,24 +37,24 @@ MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ ${PN}-setupdb:${bindir}/mariadb-install-db" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" -INITSCRIPT_NAME_${PN}-server = "mysqld" -INITSCRIPT_PARAMS_${PN}-server ?= "start 45 5 . stop 45 0 6 1 ." +INITSCRIPT_NAME:${PN}-server = "mysqld" +INITSCRIPT_PARAMS:${PN}-server ?= "start 45 5 . stop 45 0 6 1 ." USERADD_PACKAGES = "${PN}-setupdb" -USERADD_PARAM_${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" -GROUPADD_PARAM_${PN}-setupdb = "--system mysql" +USERADD_PARAM:${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" +GROUPADD_PARAM:${PN}-setupdb = "--system mysql" -INITSCRIPT_NAME_${PN}-setupdb = "install_db" -INITSCRIPT_PARAMS_${PN}-setupdb ?= "defaults 44 44" +INITSCRIPT_NAME:${PN}-setupdb = "install_db" +INITSCRIPT_PARAMS:${PN}-setupdb ?= "defaults 44 44" SYSTEMD_PACKAGES = "${PN}-server ${PN}-setupdb" -SYSTEMD_SERVICE_${PN}-server = "mysqld.service" -SYSTEMD_AUTO_ENABLE_${PN}-server ?= "disable" +SYSTEMD_SERVICE:${PN}-server = "mysqld.service" +SYSTEMD_AUTO_ENABLE:${PN}-server ?= "disable" -SYSTEMD_SERVICE_${PN}-setupdb = "install_db.service" -SYSTEMD_AUTO_ENABLE_${PN}-setupdb ?= "enable" -ALLOW_EMPTY_${PN}-setupdb ?= "1" -FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db \ +SYSTEMD_SERVICE:${PN}-setupdb = "install_db.service" +SYSTEMD_AUTO_ENABLE:${PN}-setupdb ?= "enable" +ALLOW_EMPTY:${PN}-setupdb ?= "1" +FILES:${PN}-setupdb = "${sysconfdir}/init.d/install_db \ ${bindir}/mariadb-install-db \ ${bindir}/my_print_defaults \ ${bindir}/mysql_install_db \ @@ -64,7 +62,7 @@ FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG_class-native = "" +PACKAGECONFIG:class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" @@ -95,16 +93,16 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DCAT_EXECUTABLE=`which cat` \ -DCMAKE_AR:FILEPATH=${AR}" -EXTRA_OECMAKE_prepend_class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " # With Ninja it fails with: # make: *** No rule to make target `install'. Stop. OECMAKE_GENERATOR = "Unix Makefiles" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -do_configure_append() { +do_configure:append() { # 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 @@ -112,14 +110,14 @@ do_configure_append() { sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh } -do_generate_toolchain_file_append_class-native () { +do_generate_toolchain_file:append:class-native () { # If these are set cmake will assume we're cross-compiling, which will # result in certain things we want being disabled sed -i "/set( CMAKE_SYSTEM_NAME/d" ${WORKDIR}/toolchain.cmake sed -i "/set( CMAKE_SYSTEM_PROCESSOR/d" ${WORKDIR}/toolchain.cmake } -do_configure_prepend_class-target () { +do_configure:prepend:class-target () { # Write out a qemu wrapper that will be used by cmake # so that it can run target helper binaries through that. qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" @@ -130,7 +128,7 @@ EOF chmod +x ${WORKDIR}/qemuwrapper } -do_compile_prepend_class-target () { +do_compile:prepend:class-target () { if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then if ! [ -e ${B}/include/openssl/kssl.h ] ; then mkdir -p ${B}/include/openssl @@ -168,11 +166,6 @@ do_install() { sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ ${D}${systemd_unitdir}/system/install_db.service - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "f /var/log/mysqld.err 0640 mysql mysql -" \ - > ${D}${sysconfdir}/tmpfiles.d/99-mysqld.conf - fi install -d ${D}${bindir} install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} install -d ${D}${datadir}/doc/${PN} @@ -193,65 +186,65 @@ PACKAGES = "${PN}-dbg ${PN}-setupdb ${PN} \ libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev \ libmysqlclient libmysqlclient-dev libmysqlclient-staticdev \ libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-leftovers" -CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" -CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" -CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" +CONFFILES:${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" +CONFFILES:${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" +CONFFILES:libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" -RPROVIDES_${PN}-dbg += "libmysqlclient-r-dbg libmysqlclient-dbg" +RPROVIDES:${PN}-dbg += "libmysqlclient-r-dbg libmysqlclient-dbg" -FILES_${PN} = " " -RDEPENDS_${PN} = "${PN}-client ${PN}-server" -ALLOW_EMPTY_${PN} = "1" +FILES:${PN} = " " +RDEPENDS:${PN} = "${PN}-client ${PN}-server" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \ +RDEPENDS:${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \ perl-module-fcntl perl-module-sys-hostname perl-module-ipc-open3 \ perl-module-exporter" -RDEPENDS_${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ +RDEPENDS:${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ perl-module-file-copy perl-module-file-temp perl-module-posix \ ${PN}-client ${PN}-setupdb libdbi-perl libdbd-mysql-perl" -RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ +RDEPENDS:${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \ perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \ perl-module-file-spec perl-module-file-find perl-module-file-basename perl-module-file-path \ perl-module-constant perl-module-lib perl-module-file-temp perl-module-file-spec-functions \ perl-module-io-socket-inet perl-module-io-select bash" -RDEPENDS_${PN}-setupdb = "coreutils" +RDEPENDS:${PN}-setupdb = "coreutils" # Allow old code to link to the backward compatible library -RDEPENDS_libmysqlclient-dev = "libmysqlclient-r-dev" +RDEPENDS:libmysqlclient-dev = "libmysqlclient-r-dev" -FILES_libmysqlclient = "\ +FILES:libmysqlclient = "\ ${libdir}/libmysqlclient.so.* \ ${libdir}/libmariadb.so.* \ ${sysconfdir}/my.cnf.d/client.cnf" -FILES_libmysqlclient-dev = " \ +FILES:libmysqlclient-dev = " \ ${includedir}/mysql/ \ ${libdir}/libmysqlclient.so \ ${libdir}/libmariadb.so \ ${sysconfdir}/aclocal \ ${bindir}/mysql_config" -FILES_libmysqlclient-staticdev = "\ +FILES:libmysqlclient-staticdev = "\ ${libdir}/*.a" # Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0 # which are intentionally non-PIC on 32-bit x86 (see e.g. # storage/xtradb/plug.in in the source) -INSANE_SKIP_libmysqlclient_append_x86 = " textrel" +INSANE_SKIP:libmysqlclient:append:x86 = " textrel" -FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" -FILES_libmysqlclient-r-dev = "\ +FILES:libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" +FILES:libmysqlclient-r-dev = "\ ${libdir}/libmysqlclient_r.so" -FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" +FILES:libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" -FILES_libmysqld = "\ +FILES:libmysqld = "\ ${libdir}/libmysqld.so.* \ ${libdir}/libmariadbd.so.*" -FILES_libmysqld-dev = "\ +FILES:libmysqld-dev = "\ ${libdir}/libmysqld.so \ ${libdir}/libmariadbd.so" -FILES_${PN}-client = "\ +FILES:${PN}-client = "\ ${bindir}/myisam_ftdump \ ${bindir}/mysql \ ${bindir}/mariadb \ @@ -286,7 +279,7 @@ FILES_${PN}-client = "\ ${libexecdir}/mysqlmanager \ ${sysconfdir}/my.cnf.d/mysql-clients.cnf" -FILES_${PN}-server = "\ +FILES:${PN}-server = "\ ${bindir}/msql2mysql \ ${bindir}/my_print_defaults \ ${bindir}/myisamchk \ @@ -336,5 +329,5 @@ FILES_${PN}-server = "\ ${sysconfdir}/security/user_map.conf \ ${sysconfdir}/tmpfiles.d" -DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" -FILES_${PN}-leftovers = "/" +DESCRIPTION:${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" +FILES:${PN}-leftovers = "/" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch index a2f7812c5..6ed174113 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch @@ -1,6 +1,6 @@ -From 5d9a869a72420cf0bb08b6aa93e980df90bdcf2e Mon Sep 17 00:00:00 2001 +From 0a3222338efc108c831fbdd719a47d35f4b0adcd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 3 Apr 2021 12:02:36 -0700 +Date: Wed, 18 Aug 2021 06:49:25 +0000 Subject: [PATCH] aio_linux: Check if syscall exists before using it Return -ENOSYS if not implememented, fixes build on arches like RISCV32 @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc -index d9aa8be2..d8a87a8f 100644 +index 4abc213..da75411 100644 --- a/tpool/aio_linux.cc +++ b/tpool/aio_linux.cc -@@ -59,6 +59,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ +@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ */ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) { @@ -28,7 +28,7 @@ index d9aa8be2..d8a87a8f 100644 int saved_errno= errno; int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx), min_nr, nr, ev, 0); -@@ -68,6 +69,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) +@@ -67,6 +68,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) errno= saved_errno; } return ret; @@ -36,8 +36,8 @@ index d9aa8be2..d8a87a8f 100644 + return -ENOSYS; +#endif } - #endif + -- -2.31.1 +2.29.2 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch deleted file mode 100644 index daf2432a5..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b658bdb38b7ff6a78915fd0ac390fc224e4006cb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 26 Mar 2017 14:30:33 -0700 -Subject: [PATCH] disable ucontext on musl - -musl does not have *contex() APIs even though it has ucontext.h header - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - include/my_context.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/my_context.h b/include/my_context.h -index ea0e3496..4c9b37dc 100644 ---- a/include/my_context.h -+++ b/include/my_context.h -@@ -31,7 +31,7 @@ - #define MY_CONTEXT_USE_X86_64_GCC_ASM - #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) - #define MY_CONTEXT_USE_I386_GCC_ASM --#elif defined(HAVE_UCONTEXT_H) -+#elif defined(__GLIBC__) && defined(HAVE_UCONTEXT_H) - #define MY_CONTEXT_USE_UCONTEXT - #else - #define MY_CONTEXT_DISABLE diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch deleted file mode 100644 index c77a86944..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang_version_header_conflict.patch +++ /dev/null @@ -1,32 +0,0 @@ -libc++ also has a file called version and this file and how cflags are specified -it ends up including this file and resulting in compile errors - -fixes errors like -storage/mroonga/version:1:1: error: expected unqualified-id -7.07 -^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/storage/mroonga/CMakeLists.txt -+++ b/storage/mroonga/CMakeLists.txt -@@ -80,7 +80,7 @@ else() - set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) - endif() - --file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) -+file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION) - file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) - file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) - file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) ---- /dev/null -+++ b/storage/mroonga/ver -@@ -0,0 +1 @@ -+7.07 -\ No newline at end of file ---- a/storage/mroonga/version -+++ /dev/null -@@ -1 +0,0 @@ --7.07 -\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf index dc4c172e5..75db46a55 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf @@ -10,7 +10,7 @@ user = mysql port = 3306 socket = /var/lib/mysql/mysql.sock pid-file = /var/lib/mysql/mysqld.pid -log-error = /var/log/mysqld.err +log-error = /var/log/mysqld.log basedir = /usr datadir = /var/lib/mysql skip-external-locking diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index d6e53c29e..a4deee607 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -3,11 +3,13 @@ Remove glibc specific function dependencies Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch Signed-off-by: Khem Raj <raj.khem@gmail.com> +diff --git a/include/my_cpu.h b/include/my_cpu.h +index f2e26fca..94599b74 100644 --- a/include/my_cpu.h +++ b/include/my_cpu.h @@ -24,17 +24,16 @@ */ - + #ifdef _ARCH_PWR8 -#include <sys/platform/ppc.h> /* Very low priority */ @@ -28,7 +30,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> /* High priority */ #define HMT_high() asm volatile("or 3,3,3") #else -@@ -81,7 +80,7 @@ static inline void MY_RELAX_CPU(void) +@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void) __asm__ __volatile__ ("pause"); #endif #elif defined(_ARCH_PWR8) @@ -36,15 +38,4 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + __builtin_ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ - #ifdef _aarch64_ ---- a/storage/tokudb/PerconaFT/portability/toku_time.h -+++ b/storage/tokudb/PerconaFT/portability/toku_time.h -@@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v - __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result)); - return result; - #elif defined(__powerpc__) -- return __ppc_get_timebase(); -+ return __builtin_ppc_get_timebase(); - #else - #error No timer implementation for this platform - #endif + __asm__ __volatile__ ("":::"memory"); diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch index 3277a3eee..3244ab8da 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sys_futex.patch @@ -1,22 +1,23 @@ - Use SYS_futex for syscall +Use SYS_futex for syscall glibc defines SYS_futex and on newer 32bit CPUs like RISCV-32, arc there is no 32bit time_t therefore define SYS_futex in terms of SYS_futex_time64 Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/storage/innobase/include/ib0mutex.h -+++ b/storage/innobase/include/ib0mutex.h -@@ -150,6 +150,12 @@ private: - #include <linux/futex.h> - #include <sys/syscall.h> - + +--- a/storage/innobase/sync/srw_lock.cc ++++ b/storage/innobase/sync/srw_lock.cc +@@ -210,6 +210,12 @@ void ssux_lock_low::wake() { WakeByAddre + # ifdef __linux__ + # include <linux/futex.h> + # include <sys/syscall.h> +/** Newer 32bit CPUs eg. RISCV-32 are defaulting to 64bit time_t from get go and + therefore do not define __NR_futex */ -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+# define SYS_futex SYS_futex_time64 -+#endif ++# if !defined(SYS_futex) && defined(SYS_futex_time64) ++# define SYS_futex SYS_futex_time64 ++# endif + - /** Mutex implementation that used the Linux futex. */ - template <template <typename> class Policy> - struct TTASFutexMutex { + # define SRW_FUTEX(a,op,n) \ + syscall(SYS_futex, a, FUTEX_ ## op ## _PRIVATE, n, nullptr, nullptr, 0) + # elif defined __OpenBSD__ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb deleted file mode 100644 index 57d7736ea..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -inherit qemu - -DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb new file mode 100644 index 000000000..04dfb4223 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +inherit qemu + +DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES:${PN} += "mysql5" +RREPLACES:${PN} += "mysql5" +RCONFLICTS:${PN} += "mysql5" + +RPROVIDES:${PN}-dbg += "mysql5-dbg" +RREPLACES:${PN}-dbg += "mysql5-dbg" +RCONFLICTS:${PN}-dbg += "mysql5-dbg" + +RPROVIDES:${PN}-leftovers += "mysql5-leftovers" +RREPLACES:${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS:${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES:${PN}-client += "mysql5-client" +RREPLACES:${PN}-client += "mysql5-client" +RCONFLICTS:${PN}-client += "mysql5-client" + +RPROVIDES:${PN}-server += "mysql5-server" +RREPLACES:${PN}-server += "mysql5-server" +RCONFLICTS:${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index 09c6a3ca9..e609ac33e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -40,11 +40,11 @@ inherit autotools pkgconfig perlnative python3native python3targetconfig useradd CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" -SYSTEMD_SERVICE_${PN} = "postgresql.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "postgresql.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" -DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" -pkg_postinst_${PN} () { +DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" +pkg_postinst:${PN} () { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then if [ -n "$D" ]; then OPTS="--root=$D" @@ -68,25 +68,25 @@ EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ --datadir=${datadir}/${BPN} \ --sysconfdir=${sysconfdir}/${BPN} \ " -EXTRA_OECONF_sh4 += "--disable-spinlocks" -EXTRA_OECONF_aarch64 += "--disable-spinlocks" +EXTRA_OECONF:sh4 += "--disable-spinlocks" +EXTRA_OECONF:aarch64 += "--disable-spinlocks" -DEBUG_OPTIMIZATION_remove_mips = " -Og" -DEBUG_OPTIMIZATION_append_mips = " -O" -BUILD_OPTIMIZATION_remove_mips = " -Og" -BUILD_OPTIMIZATION_append_mips = " -O" +DEBUG_OPTIMIZATION:remove:mips = " -Og" +DEBUG_OPTIMIZATION:append:mips = " -O" +BUILD_OPTIMIZATION:remove:mips = " -Og" +BUILD_OPTIMIZATION:append:mips = " -O" -DEBUG_OPTIMIZATION_remove_mipsel = " -Og" -DEBUG_OPTIMIZATION_append_mipsel = " -O" -BUILD_OPTIMIZATION_remove_mipsel = " -Og" -BUILD_OPTIMIZATION_append_mipsel = " -O" +DEBUG_OPTIMIZATION:remove:mipsel = " -Og" +DEBUG_OPTIMIZATION:append:mipsel = " -O" +BUILD_OPTIMIZATION:remove:mipsel = " -Og" +BUILD_OPTIMIZATION:append:mipsel = " -O" PACKAGES_DYNAMIC += "^${PN}-plperl \ ^${PN}-pltcl \ ^${PN}-plpython \ " -python populate_packages_prepend() { +python populate_packages:prepend() { def fill_more(name): if name is None or name.strip() == "": @@ -123,7 +123,7 @@ do_configure() { # do_configure autotools_do_configure - # do_configure_append + # do_configure:append # workaround perl package related bugs sed -i -e "s:-L/usr/local/lib:-L=/usr/local/lib:g" \ ${B}/src/Makefile.global @@ -159,7 +159,7 @@ do_configure() { fi } -do_compile_append() { +do_compile:append() { oe_runmake -C contrib all } @@ -167,15 +167,15 @@ do_compile_append() { usernum = "28" groupnum = "28" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ +USERADD_PARAM:${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ -s /bin/sh -c 'PostgreSQL Server' -u ${usernum} postgres" -GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres" +GROUPADD_PARAM:${PN} = "-g ${groupnum} -o -r postgres" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "${BPN}-server" INITSCRIPT_PARAMS = "start 64 . stop 36 0 1 2 3 4 5 6 ." -do_install_append() { +do_install:append() { # install contrib oe_runmake DESTDIR=${D} -C contrib install # install tutorial @@ -213,7 +213,7 @@ do_install_append() { } SSTATE_SCAN_FILES += "Makefile.global" -SSTATE_SCAN_FILES_remove = "*_config" +SSTATE_SCAN_FILES:remove = "*_config" PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \ libecpg-compat libecpg-compat-dev \ @@ -223,7 +223,7 @@ PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \ ${PN}-contrib \ " -RPROVIDES_${PN}-dbg += "libecpg-compat-dbg \ +RPROVIDES:${PN}-dbg += "libecpg-compat-dbg \ libecpg-dbg \ libpq-dbg \ libpgtypes-dbg \ @@ -233,7 +233,7 @@ RPROVIDES_${PN}-dbg += "libecpg-compat-dbg \ ${PN}-plperl-dbg \ " -FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ +FILES:${PN} += "${sysconfdir}/init.d/${BPN}-server \ ${localstatedir}/lib/${BPN}/data ${localstatedir}/lib/${BPN}/backups \ ${localstatedir}/lib/${BPN}/.profile ${sysconfdir}/default/${BPN} \ ${libdir}/${BPN}/dict_snowball.so ${libdir}/${BPN}/plpgsql.so \ @@ -245,7 +245,7 @@ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ else ''} \ " -FILES_${PN}-client = "${bindir}/clusterdb \ +FILES:${PN}-client = "${bindir}/clusterdb \ ${bindir}/createdb \ ${bindir}/createuser \ ${bindir}/dropdb \ @@ -259,7 +259,7 @@ FILES_${PN}-client = "${bindir}/clusterdb \ ${bindir}/vacuumlo \ ${datadir}/${BPN}/psqlrc.sample \ " -FILES_${PN}-client-doc = "${mandir}/man1/clusterdb.* \ +FILES:${PN}-client-doc = "${mandir}/man1/clusterdb.* \ ${mandir}/man1/createdb.* ${mandir}/man1/createlang.* \ ${mandir}/man1/createuser.* ${mandir}/man1/dropdb.* \ ${mandir}/man1/droplang.* ${mandir}/man1/dropuser.* \ @@ -268,46 +268,46 @@ FILES_${PN}-client-doc = "${mandir}/man1/clusterdb.* \ ${mandir}/man1/reindexdb.* ${mandir}/man1/vacuumdb.* \ ${mandir}/man7/* \ " -FILES_${PN}-doc += "${docdir}/${BPN}/html ${libdir}/${BPN}/tutorial/ \ +FILES:${PN}-doc += "${docdir}/${BPN}/html ${libdir}/${BPN}/tutorial/ \ ${mandir}/man1/initdb.* ${mandir}/man1/pg_controldata.* \ ${mandir}/man1/pg_ctl.* ${mandir}/man1/pg_resetxlog.* \ ${mandir}/man1/postgres.* ${mandir}/man1/postmaster.* \ " -FILES_${PN}-timezone = "${datadir}/${BPN}/timezone \ +FILES:${PN}-timezone = "${datadir}/${BPN}/timezone \ ${datadir}/${BPN}/timezonesets \ " -RDEPENDS_${PN} += "${PN}-timezone" -FILES_${PN}-server-dev = "${includedir}/${BPN}/server \ +RDEPENDS:${PN} += "${PN}-timezone" +FILES:${PN}-server-dev = "${includedir}/${BPN}/server \ ${libdir}/${BPN}/pgxs \ " -FILES_libecpg = "${libdir}/libecpg*${SOLIBS}" -FILES_libecpg-dev = "${libdir}/libecpg*${SOLIBSDEV} \ +FILES:libecpg = "${libdir}/libecpg*${SOLIBS}" +FILES:libecpg-dev = "${libdir}/libecpg*${SOLIBSDEV} \ ${libdir}/libpgtypes*${SOLIBSDEV} \ ${includedir}/ecpg*.h ${includedir}/${BPN}/ecpg*.h \ ${includedir}/pgtypes*.h ${includedir}/${BPN}/informix \ ${includedir}/sql3types.h ${includedir}/sqlca.h \ " -FILES_libecpg-doc = "${mandir}/man1/ecpg.*" -FILES_libecpg-staticdev = "${libdir}/libecpg*.a" -SECTION_libecpg-staticdev = "devel" -RDEPENDS_libecpg-staticdev = "libecpg-dev (= ${EXTENDPKGV})" +FILES:libecpg-doc = "${mandir}/man1/ecpg.*" +FILES:libecpg-staticdev = "${libdir}/libecpg*.a" +SECTION:libecpg-staticdev = "devel" +RDEPENDS:libecpg-staticdev = "libecpg-dev (= ${EXTENDPKGV})" -FILES_libpq = "${libdir}/libpq*${SOLIBS}" -FILES_libpq-dev = "${libdir}/libpq*${SOLIBSDEV} \ +FILES:libpq = "${libdir}/libpq*${SOLIBS}" +FILES:libpq-dev = "${libdir}/libpq*${SOLIBSDEV} \ ${includedir} \ " -FILES_libpq-staticdev = "${libdir}/libpq*.a ${libdir}/libpgport.a" -SECTION_libpq-staticdev = "devel" -RDEPENDS_libpq-staticdev = "libpq-dev (= ${EXTENDPKGV})" +FILES:libpq-staticdev = "${libdir}/libpq*.a ${libdir}/libpgport.a" +SECTION:libpq-staticdev = "devel" +RDEPENDS:libpq-staticdev = "libpq-dev (= ${EXTENDPKGV})" -FILES_libecpg-compat = "${libdir}/libecpg_compat*${SOLIBS}" -FILES_libecpg-compat-dev = "${libdir}/libecpg_compat*${SOLIBS}" -FILES_libpgtypes = "${libdir}/libpgtypes*${SOLIBS}" -FILES_libpgtypes-staticdev = "${libdir}/libpgtypes*.a" -FILES_libpgtypes-dev = "${libdir}/libpgtypes*${SOLIBS} ${includedir}/pgtypes*.h" +FILES:libecpg-compat = "${libdir}/libecpg_compat*${SOLIBS}" +FILES:libecpg-compat-dev = "${libdir}/libecpg_compat*${SOLIBS}" +FILES:libpgtypes = "${libdir}/libpgtypes*${SOLIBS}" +FILES:libpgtypes-staticdev = "${libdir}/libpgtypes*.a" +FILES:libpgtypes-dev = "${libdir}/libpgtypes*${SOLIBS} ${includedir}/pgtypes*.h" -FILES_${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \ +FILES:${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \ ${bindir}/pgbench \ ${S}/contrib/spi/*.example \ ${libdir}/${BPN}/_int.so ${libdir}/${BPN}/adminpack.so \ @@ -335,27 +335,27 @@ FILES_${PN}-contrib = " ${bindir}/oid2name ${bindir}/pg_standby \ ${libdir}/${BPN}/pg_upgrade_support.so ${libdir}/${BPN}/.so \ ${libdir}/${BPN}/unaccent.so \ " -DESCRIPTION_${PN}-contrib = "The postgresql-contrib package contains \ +DESCRIPTION:${PN}-contrib = "The postgresql-contrib package contains \ contributed packages that are included in the PostgreSQL distribution." -FILES_${PN}-pltcl = "${libdir}/${BPN}/pltcl.so ${bindir}/pltcl_delmod \ +FILES:${PN}-pltcl = "${libdir}/${BPN}/pltcl.so ${bindir}/pltcl_delmod \ ${binddir}/pltcl_listmod ${bindir}/pltcl_loadmod \ ${datadir}/${BPN}/unknown.pltcl" -SUMMARY_${PN}-pltcl = "The Tcl procedural language for PostgreSQL" -DESCRIPTION_${PN}-pltcl = "PostgreSQL is an advanced Object-Relational \ +SUMMARY:${PN}-pltcl = "The Tcl procedural language for PostgreSQL" +DESCRIPTION:${PN}-pltcl = "PostgreSQL is an advanced Object-Relational \ database management system. The postgresql-pltcl package contains the PL/Tcl \ procedural language for the backend." -FILES_${PN}-plperl = "${libdir}/${BPN}/plperl.so" -SUMMARY_${PN}-plperl = "The Perl procedural language for PostgreSQL" -DESCRIPTION_${PN}-plperl = "PostgreSQL is an advanced Object-Relational \ +FILES:${PN}-plperl = "${libdir}/${BPN}/plperl.so" +SUMMARY:${PN}-plperl = "The Perl procedural language for PostgreSQL" +DESCRIPTION:${PN}-plperl = "PostgreSQL is an advanced Object-Relational \ database management system. The postgresql-plperl package contains the \ PL/Perl procedural language for the backend." # In version 8, it will be plpython.so # In version 9, it might be plpython{2,3}.so depending on python2 or 3 -FILES_${PN}-plpython = "${libdir}/${BPN}/plpython*.so" -SUMMARY_${PN}-plpython = "The Python procedural language for PostgreSQL" -DESCRIPTION_${PN}-plpython = "PostgreSQL is an advanced Object-Relational \ +FILES:${PN}-plpython = "${libdir}/${BPN}/plpython*.so" +SUMMARY:${PN}-plpython = "The Python procedural language for PostgreSQL" +DESCRIPTION:${PN}-plpython = "PostgreSQL is an advanced Object-Relational \ database management system. The postgresql-plpython package contains \ the PL/Python procedural language for the backend." diff --git a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc index 5337b4569..ae20a72a1 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc @@ -44,7 +44,7 @@ do_install_ptest() { sed -i -e 's|@LIBDIR@|${libdir}|' ${D}${PTEST_PATH}/odbcini-gen.sh } -FILES_${PN} += "${libdir}" +FILES:${PN} += "${libdir}" # The tests need a local PostgreSQL server running -RDEPENDS_${PN}-ptest = "postgresql" +RDEPENDS:${PN}-ptest = "postgresql" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb index c89d5d431..9b1fefc12 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb @@ -20,9 +20,9 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://arm.patch \ " -SRC_URI_append_riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" -SRC_URI_append_mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" -SRC_URI_remove_toolchain-clang_riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI:append:mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI:remove:toolchain-clang:riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" S = "${WORKDIR}/git" @@ -45,9 +45,9 @@ EXTRA_OECMAKE = "\ -DFAIL_ON_WARNINGS=OFF \ " -do_install_append() { +do_install:append() { # fix for qa check buildpaths sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/rocksdb/RocksDBTargets.cmake } -LDFLAGS_append_riscv64 = " -pthread" +LDFLAGS:append:riscv64 = " -pthread" diff --git a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb index 3f22d3818..c218b7151 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb @@ -42,8 +42,8 @@ inherit dos2unix cmake PACKAGES += "${PN}-sqlite3 ${PN}-mysql ${PN}-postgresql ${PN}-odbc ${PN}-oracle" -FILES_${PN}-sqlite3 = "${libdir}/lib${BPN}_sqlite3.so.*" -FILES_${PN}-mysql = "${libdir}/lib${BPN}_mysql.so.*" -FILES_${PN}-postgresql = "${libdir}/lib${BPN}_postgresql.so.*" -FILES_${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*" -FILES_${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*" +FILES:${PN}-sqlite3 = "${libdir}/lib${BPN}_sqlite3.so.*" +FILES:${PN}-mysql = "${libdir}/lib${BPN}_mysql.so.*" +FILES:${PN}-postgresql = "${libdir}/lib${BPN}_postgresql.so.*" +FILES:${PN}-odbc = "${libdir}/lib${BPN}_odbc.so.*" +FILES:${PN}-oracle = "${libdir}/lib${BPN}_oracle.so.*" diff --git a/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb index 501c0e3e7..bb62afab4 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb @@ -52,8 +52,8 @@ do_install() { } PACKAGES += "${PN}-bin" -FILES_${PN}-bin = "${bindir}/*" -FILES_${PN} = "${libdir}/*.so.*" +FILES:${PN}-bin = "${bindir}/*" +FILES:${PN} = "${libdir}/*.so.*" SRC_URI[md5sum] = "838dbac20b56d2c4292e98848505a05b" SRC_URI[sha256sum] = "3f35ebfb67867fb5b583a03e480f900206af637efe7179b32294a6a0cf806f37" |