From c1d34338068e7d99e34db98597b2d8b3b58e6c2a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 9 Sep 2019 14:56:00 -0400 Subject: meta-openembedded: subtree update:6a5d6bc9ad..3061ead8cf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (2): gpsd: gpscat no longer uses python-curses in 3.19 dejagnu: Remove, moved to oe-core Alex Kiernan (1): zstd: Upgrade 1.4.2 -> 1.4.3 Alistair Francis (2): python3-twine: Initial commit of 1.13.0 python3-pytest-asyncio: Initial commit of 0.10.0 Andreas Müller (4): fluidsynth: upgrade 2.0.5 -> 2.0.6 imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe xfce4-settings: upgrade 4.14.0 -> 4.14.1 xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6 Andrej Valek (1): nodejs: 10.16.2 -> 10.16.3 Changqing Li (7): yail: update UPSTREAM_CHECK_GITTAGREGEX iscsi-initiator-utils: 2.0.876 -> 2.0.877 postgresql: 11.4 -> 11.5 satyr: upgrade 0.27 -> 0.28 freeradius: upgrade 3.0.17 -> 3.0.19 drbd-utils: switch to add patch from change source in do_configure xfsdump: support usrmerge Gianfranco Costamagna (2): grpc: don't use unexisting gettid function on glibc 2.29, it has been implemented only in 2.30 grpc: Change gettid patch with the upstream merged version Hongxu Jia (1): lvm2: fix blkdeactivate failed with command not found Kai Kang (4): lmbench: update script lmbench-run mariadb: fix file conflictions when multilib enabled php: sync with apache2's change apache2: fix multilib file conflicts Khem Raj (11): iperf2: Fix build with latest libc++ iscsi-initiator-utils: Inherit pkgconfig and override PKG_CONFIG klibc: Fix build with 5.2+ kernel headers samba: Fix configure tests to work with clang ltrace: Fix build on mips python-jinja2: Make asyncio specific to python3 module alone python3-cmd2: Add to blacklist nodejs: Mark incompatible with risc-v drbd,netkit-rusers: Blacklist packages vboxguestdrivers,can-isotp,bpftool: Add to Blacklist strongswan: Fix do_patch fuzz Li Zhou (1): tipcutils: ptts: Set recv buffer size to max to receive as many packets as possible Martin Jansa (1): python3-pyatspi: restrict with GTK2DISTROFEATURES Oleksandr Kravchuk (1): nano: update to 4.4 Qi.Chen@windriver.com (2): python-hyperlink: rdepend on python-idna python-jinja2: rdepend on asyncio module Robert Yang (1): netcf: Fix do_configure failed when multilib Scott Ellis (1): wireguard: Upgrade 20190702 to 20190905 Yuan Chao (10): strongswan: upgrade 5.8.0 -> 5.8.1 php: upgrade 7.3.8 -> 7.3.9 libtalloc: upgrade 2.2.0 -> 2.3.0 numactl: upgrade 2.0.12 -> 2.0.13 uhubctl: upgrade 2.0.0 -> 2.1.0 python-pytest: upgrade 5.1.1 -> 5.1.2 python-stevedore: upgrade 1.30.1 -> 1.31.0 python-dbus: upgrade 1.2.8 -> 1.2.10 python-pbr: upgrade 5.4.2 -> 5.4.3 python-pyasn1: upgrade 0.4.6 -> 0.4.7 Zang Ruochen (3): python-paste: upgrade 3.1.1 -> 3.2.0 libnet-dns-perl: upgrade 1.20 -> 1.21 hwdata: upgrade 0.326 -> 0.327 Zheng Ruoqin (1): python-cmd2: Add python3 version aehs29@gmail.com (1): remmina: Add recipe for the remmina remote desktop client Change-Id: I11f4319f53655ab389fcb7a0ce4f22b71f9a8da2 Signed-off-by: Brad Bishop --- .../dejagnu/dejagnu/configure.patch | 45 -------- .../recipes-devtools/dejagnu/dejagnu_1.4.4.bb | 14 --- .../ltrace/ltrace/include_unistd_nr.patch | 30 ++++++ .../meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 + .../recipes-devtools/nodejs/nodejs_10.16.2.bb | 110 -------------------- .../recipes-devtools/nodejs/nodejs_10.16.3.bb | 113 +++++++++++++++++++++ .../meta-oe/recipes-devtools/php/php.inc | 6 +- .../meta-oe/recipes-devtools/php/php_7.3.8.bb | 27 ----- .../meta-oe/recipes-devtools/php/php_7.3.9.bb | 27 +++++ .../meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb | 2 + 10 files changed, 175 insertions(+), 200 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb (limited to 'meta-openembedded/meta-oe/recipes-devtools') diff --git a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch deleted file mode 100644 index 2eb8af713..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: dejagnu-1.4.4/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/configure.in 2014-07-18 07:05:49.997481207 +0000 -+++ dejagnu-1.4.4/configure.in 2014-07-18 07:05:50.085481210 +0000 -@@ -1,10 +1,10 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.13) --AC_INIT(runtest.exp) -+AC_INIT(dejagnu, 1.4.4) - dnl AC_CONFIG_AUX_DIR(..) - - dnl These are required by automake --AM_INIT_AUTOMAKE(dejagnu, 1.4.4) -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - AC_PROG_MAKE_SET - -Index: dejagnu-1.4.4/example/calc/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/example/calc/configure.in 2002-04-26 03:32:40.000000000 +0000 -+++ dejagnu-1.4.4/example/calc/configure.in 2014-07-18 07:11:59.085491266 +0000 -@@ -1,8 +1,8 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.5) --AC_INIT(calc.c) -+AC_INIT(calc, 1.1) - AM_CONFIG_HEADER(calc.h) --AM_INIT_AUTOMAKE(calc, 1.1) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_INSTALL -Index: dejagnu-1.4.4/example/hello/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/example/hello/configure.in 2002-08-31 05:46:16.000000000 +0000 -+++ dejagnu-1.4.4/example/hello/configure.in 2014-07-18 07:12:23.721491937 +0000 -@@ -25,7 +25,7 @@ - # ------------------------------------------------------------------------ - - AC_INIT(helloworld, demo-version, philip.wilsey@ieee.org) --AM_INIT_AUTOMAKE(helloworld, demo-version) -+AM_INIT_AUTOMAKE([foreign]) - - #AC_CONFIG_SRCDIR([hello.cc]) - #AC_CONFIG_HEADER([config.h]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb deleted file mode 100644 index 63726b232..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "GNU unit testing framework, written in Expect and Tcl" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" -SECTION = "devel" - -inherit autotools - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://configure.patch" - -SRC_URI[md5sum] = "053f18fd5d00873de365413cab17a666" -SRC_URI[sha256sum] = "d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch new file mode 100644 index 000000000..e4490bbb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch @@ -0,0 +1,30 @@ +kernel headers have restructured mips syscall generation in kernel +in recent versions, however, ltrace still has logic to define the +syscall numbers based on old logic, this patch includes the legacy +UAPI headers to get these defines + +Fixes errors e.g. +../../../../git/sysdeps/linux-gnu/mips/trace.c:138:29: error: '__NR_O32_Linux' undeclared (first use in this function) + const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/sysdeps/linux-gnu/mips/trace.c ++++ b/sysdeps/linux-gnu/mips/trace.c +@@ -34,6 +34,16 @@ + #include + #include + ++#ifndef __NR_O32_Linux ++#include ++#endif ++#ifndef __NR_N32_Linux ++#include ++#endif ++#ifndef __NR_N64_Linux ++#include ++#endif ++ + #include "backend.h" + #include "common.h" + #include "debug.h" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 3dc269c80..ead637cb7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ + file://include_unistd_nr.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb deleted file mode 100644 index d464e9d8a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb +++ /dev/null @@ -1,110 +0,0 @@ -DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" -HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" - -DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" - -inherit pkgconfig - -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" - -SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ - file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ - file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ - file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ - file://0006-Use-target-ldflags.patch \ - " -SRC_URI_append_class-target = " \ - file://0002-Using-native-torque.patch \ - " - -SRC_URI[md5sum] = "fa70b942c5e3379ce96219fe90f50c8f" -SRC_URI[sha256sum] = "6cbc17795e9259dce7a8f5fd5a2e46f9e6920fb48b7d9539c5b2faa5bb5db4d8" - -S = "${WORKDIR}/node-v${PV}" - -# v8 errors out if you have set CCACHE -CCACHE = "" - -def map_nodejs_arch(a, d): - import re - - if re.match('i.86$', a): return 'ia32' - elif re.match('x86_64$', a): return 'x64' - elif re.match('aarch64$', a): return 'arm64' - elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' - elif re.match('powerpc$', a): return 'ppc' - return a - -ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ - '--with-arm-fpu=vfp', d), d), d)}" -GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " -ARCHFLAGS ?= "" - -PACKAGECONFIG ??= "zlib icu" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" - -# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi -do_configure () { - rm -rf ${S}/deps/openssl - export LD="${CXX}" - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - export LD="${CXX}" - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} -} - -do_install_append_class-native() { - # use node from PATH instead of absolute path to sysroot - # node-v0.10.25/tools/install.py is using: - # shebang = os.path.join(node_prefix, 'bin/node') - # update_shebang(link_path, shebang) - # and node_prefix can be very long path to bindir in native sysroot and - # when it exceeds 128 character shebang limit it's stripped to incorrect path - # and npm fails to execute like in this case with 133 characters show in log.do_install: - # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node - # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js - # use sed on npm-cli.js because otherwise symlink is replaced with normal file and - # npm-cli.js continues to use old shebang - sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js - - # Install the native torque to provide it within sysroot for the target compilation - install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque -} - -do_install_append_class-target() { - sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js -} - -PACKAGES =+ "${PN}-npm" -FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python-core python-shell python-datetime python-subprocess python-textutils \ - python-compiler python-misc python-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES_${PN}-systemtap = "${datadir}/systemtap" - - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb new file mode 100644 index 000000000..a978eebe4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb @@ -0,0 +1,113 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & BSD & Artistic-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" + +DEPENDS = "openssl" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig + +COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" +COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" +COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" + +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ + file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \ + file://0004-Make-compatibility-with-gcc-4.8.patch \ + file://0005-Link-atomic-library.patch \ + file://0006-Use-target-ldflags.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-torque.patch \ + " + +SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f" +SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd" + +S = "${WORKDIR}/node-v${PV}" + +# v8 errors out if you have set CCACHE +CCACHE = "" + +def map_nodejs_arch(a, d): + import re + + if re.match('i.86$', a): return 'ia32' + elif re.match('x86_64$', a): return 'x64' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' + elif re.match('powerpc$', a): return 'ppc' + return a + +ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ + '--with-arm-fpu=vfp', d), d), d)}" +GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " +ARCHFLAGS ?= "" + +PACKAGECONFIG ??= "zlib icu" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" + +# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi +do_configure () { + rm -rf ${S}/deps/openssl + export LD="${CXX}" + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + export LD="${CXX}" + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} +} + +do_install_append_class-native() { + # use node from PATH instead of absolute path to sysroot + # node-v0.10.25/tools/install.py is using: + # shebang = os.path.join(node_prefix, 'bin/node') + # update_shebang(link_path, shebang) + # and node_prefix can be very long path to bindir in native sysroot and + # when it exceeds 128 character shebang limit it's stripped to incorrect path + # and npm fails to execute like in this case with 133 characters show in log.do_install: + # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node + # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js + # use sed on npm-cli.js because otherwise symlink is replaced with normal file and + # npm-cli.js continues to use old shebang + sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js + + # Install the native torque to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque +} + +do_install_append_class-target() { + sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js +} + +PACKAGES =+ "${PN}-npm" +FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" +RDEPENDS_${PN}-npm = "bash python-core python-shell python-datetime python-subprocess python-textutils \ + python-compiler python-misc python-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES_${PN}-systemtap = "${datadir}/systemtap" + + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index 4c0617c49..d738d2d93 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -172,10 +172,8 @@ do_install_append_class-target() { done if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - install -d ${D}${libdir}/apache2/modules install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} - install -m 755 libs/libphp${PHP_MAJOR_VERSION}.so ${D}${libdir}/apache2/modules install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf cat ${S}/php.ini-production | \ @@ -211,7 +209,7 @@ INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d FILES_${PN}-dbg =+ "${bindir}/.debug \ - ${libdir}/apache2/modules/.debug" + ${libexecdir}/apache2/modules/.debug" FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-phar = "${bindir}/phar*" @@ -237,7 +235,7 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" FILES_${PN} = "${PHP_LIBDIR}/php" -FILES_${PN} += "${bindir}" +FILES_${PN} += "${bindir} ${libexecdir}/apache2" SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb deleted file mode 100644 index 072d53a09..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb +++ /dev/null @@ -1,27 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" - -SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ - file://0048-Use-pkg-config-for-FreeType2-detection.patch \ - file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ - file://debian-php-fixheader.patch \ - " -SRC_URI_append_class-target = " \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - file://xfail_two_bug_tests.patch \ - " - -SRC_URI[md5sum] = "4ffc06e803cd782a95483eb02213301e" -SRC_URI[sha256sum] = "d566c630175d9fa84a98d3c9170ec033069e9e20c8d23dea49ae2a976b6c76f5" - -PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ - --with-pdo-mysql=mysqlnd \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb new file mode 100644 index 000000000..4d656da0f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb @@ -0,0 +1,27 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" + +SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ + file://0048-Use-pkg-config-for-FreeType2-detection.patch \ + file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ + file://0001-Use-pkg-config-for-libxml2-detection.patch \ + file://debian-php-fixheader.patch \ + " +SRC_URI_append_class-target = " \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + file://xfail_two_bug_tests.patch \ + " + +SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" +SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" + +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" + +FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb index 8ced7b84f..e112a5e30 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb @@ -17,3 +17,5 @@ inherit cmake lib_package S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P1(\.\d+)+)" -- cgit v1.2.3