diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
28 files changed, 490 insertions, 94 deletions
diff --git a/meta-openembedded/meta-oe/licenses/Arphic-Public-License b/meta-openembedded/meta-oe/licenses/Arphic-Public-License new file mode 100644 index 0000000000..7e38aa59b5 --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/Arphic-Public-License @@ -0,0 +1,58 @@ +ARPHIC PUBLIC LICENSE
+
+Copyright (C) 1999 Arphic Technology Co., Ltd.
+11Fl. No.168, Yung Chi Rd., Taipei, 110 Taiwan
+All rights reserved except as specified below.
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is forbidden.
+
+Preamble
+
+ The licenses for most software are designed to take away your freedom to share and change it. By contrast, the ARPHIC PUBLIC LICENSE specifically permits and encourages you to use this software, provided that you give the recipients all the rights that we gave you and make sure they can get the modifications of this software.
+
+Legal Terms
+
+0. Definitions:
+ Throughout this License, "Font" means the TrueType fonts "AR PL Mingti2L Big5", "AR PL KaitiM Big5" (BIG-5 character set) and "AR PL SungtiL GB", "AR PL KaitiM GB" (GB character set) which are originally distributed by Arphic, and the derivatives of those fonts created through any modification including modifying glyph, reordering glyph, converting format, changing font name, or adding/deleting some characters in/from glyph table.
+
+ "PL" means "Public License".
+
+ "Copyright Holder" means whoever is named in the copyright or copyrights for the Font.
+
+ "You" means the licensee, or person copying, redistributing or modifying the Font.
+
+ "Freely Available" means that you have the freedom to copy or modify the Font as well as redistribute copies of the Font under the same conditions you received, not price. If you wish, you can charge for this service.
+
+1. Copying & Distribution
+ You may copy and distribute verbatim copies of this Font in any medium, without restriction, provided that you retain this license file (ARPHICPL.TXT) unaltered in all copies.
+
+2. Modification
+ You may otherwise modify your copy of this Font in any way, including modifying glyph, reordering glyph, converting format, changing font name, or adding/deleting some characters in/from glyph table, and copy and distribute such modifications under the terms of Section 1 above, provided that the following conditions are met:
+
+ a) You must insert a prominent notice in each modified file stating how and when you changed that file.
+
+ b) You must make such modifications Freely Available as a whole to all third parties under the terms of this License, such as by offering access to copy the modifications from a designated place, or distributing the modifications on a medium customarily used for software interchange.
+
+ c) If the modified fonts normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the Font under these conditions, and telling the user how to view a copy of this License.
+
+ These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Font, and can be reasonably considered independent and separate works in themselves, then this License and its terms, do not apply to those sections when you distribute them as separate works. Therefore, mere aggregation of another work not based on the Font with the Font on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. Condition Subsequent
+ You may not copy, modify, sublicense, or distribute the Font except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Font will automatically retroactively void your rights under this License. However, parties who have received copies or rights from you under this License will keep their licenses valid so long as such parties remain in full compliance.
+
+4. Acceptance
+ You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to copy, modify, sublicense or distribute the Font. These actions are prohibited by law if you do not accept this License. Therefore, by copying, modifying, sublicensing or distributing the Font, you indicate your acceptance of this License and all its terms and conditions.
+
+5. Automatic Receipt
+ Each time you redistribute the Font, the recipient automatically receives a license from the original licensor to copy, distribute or modify the Font subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+6. Contradiction
+ If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Font at all. For example, if a patent license would not permit royalty-free redistribution of the Font by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Font.
+
+ If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+7. NO WARRANTY
+ BECAUSE THE FONT IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE FONT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS OR OTHER PARTIES PROVIDE THE FONT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE FONT IS WITH YOU. SHOULD THE FONT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+8. DAMAGES WAIVER
+ UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, IN NO EVENT WILL ANY COPYRIGHTT HOLDERS, OR OTHER PARTIES WHO MAY COPY, MODIFY OR REDISTRIBUTE THE FONT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, INCIDENTAL, SPECIAL OR EXEMPLARY DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE FONT (INCLUDING BUT NOT LIMITED TO PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION), EVEN IF SUCH HOLDERS OR OTHER PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch new file mode 100644 index 0000000000..dcbe01d5ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch @@ -0,0 +1,30 @@ +From d4f73b037d11d20f080e74c05df28853fb833075 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Dec 2018 22:59:47 -0800 +Subject: [PATCH] Do not set Wno-unused-but-set-variable + +This is gcc specific warning, not implemented by pretending to be gcc +like compilers e.g. clang. + +We will pass this option from recipe + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/compiler_warnings.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 +index f498a28..e65e97f 100644 +--- a/m4/compiler_warnings.m4 ++++ b/m4/compiler_warnings.m4 +@@ -11,7 +11,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + -Wdeclaration-after-statement -Wstrict-prototypes \ + -Wno-unused-parameter -Wno-sign-compare \ + -Wno-deprecated-declarations \ +- -Wno-unused-but-set-variable -Wformat-security; do ++ -Wno-unused -Wformat-security; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb index dec4b67973..01c621441f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb @@ -12,6 +12,7 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + file://0001-Do-not-set-Wno-unused-but-set-variable.patch \ " SRC_URI[md5sum] = "a49c9f73e46c7b89e5efedda250d22c0" @@ -33,6 +34,7 @@ PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" EXTRA_OECONF = " \ --with-udev-base-dir=${nonarch_base_libdir}/udev \ " +CFLAGS_append_toolchain-gcc = " -Wno-unused-but-set-variable" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 08b4bbfc48..62f1c77591 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -1,5 +1,6 @@ SUMMARY = "Meta-oe ptest packagegroups" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup PROVIDES = "${PACKAGES}" @@ -21,7 +22,7 @@ PACKAGES = ' \ packagegroup-meta-oe-test \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest-packages", "", d)} \ ' RDEPENDS_packagegroup-meta-oe = "\ @@ -41,7 +42,7 @@ RDEPENDS_packagegroup-meta-oe = "\ packagegroup-meta-oe-test \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-gnome", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "packagegroup-meta-oe-graphics", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "packagegroup-meta-oe-ptest-packages", "", d)} \ " RDEPENDS_packagegroup-meta-oe-benchmarks = "\ @@ -52,6 +53,12 @@ RDEPENDS_packagegroup-meta-oe-benchmarks = "\ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "glmark2", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-benchmarks_remove_mipsarch = "libhugetlbfs" +RDEPENDS_packagegroup-meta-oe-benchmarks_remove_mips64 = "tinymembench" +RDEPENDS_packagegroup-meta-oe-benchmarks_remove_mips64el = "tinymembench" +RDEPENDS_packagegroup-meta-oe-benchmarks_remove_riscv64 = "libhugetlbfs" +RDEPENDS_packagegroup-meta-oe-benchmarks_remove_riscv32 = "libhugetlbfs" + RDEPENDS_packagegroup-meta-oe-connectivity ="\ gammu hostapd irssi krb5 libev libimobiledevice \ libmbim libmtp libndp libqmi libtorrent \ @@ -83,6 +90,11 @@ RDEPENDS_packagegroup-meta-oe-bsp ="\ efivar flashrom lmsensors lmsensors-config \ lsscsi nvme-cli pcmciautils pointercal \ " +RDEPENDS_packagegroup-meta-oe-bsp_remove_mipsarch = "efivar efibootmgr" +RDEPENDS_packagegroup-meta-oe-bsp_remove_powerpc = "efivar efibootmgr" +RDEPENDS_packagegroup-meta-oe-bsp_remove_riscv64 = "efivar efibootmgr" +RDEPENDS_packagegroup-meta-oe-bsp_remove_riscv32 = "efivar efibootmgr" + RDEPENDS_packagegroup-meta-oe-dbs ="\ leveldb libdbi mariadb mariadb-native \ mysql-python postgresql psqlodbc rocksdb soci \ @@ -106,6 +118,14 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-devtools_remove_armv5 = "uftrace nodejs" +RDEPENDS_packagegroup-meta-oe-devtools_remove_mipsarch = "uftrace lshw" +RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64 = "nodejs" +RDEPENDS_packagegroup-meta-oe-devtools_remove_mips64el = "nodejs" +RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "android-tools breakpad uftrace lshw" +RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv64 = "uftrace lshw" +RDEPENDS_packagegroup-meta-oe-devtools_remove_riscv32 = "uftrace lshw" + RDEPENDS_packagegroup-meta-oe-extended ="\ byacc cfengine cfengine-masterfiles cmpi-bindings \ ddrescue dialog dumb-init enscript fluentbit \ @@ -130,6 +150,11 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \ ${@bb.utils.contains("BBPATH", "meta-python", "openlmi-tools", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-extended_remove_mipsarch = "upm mraa tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc = "upm mraa" +RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm mraa tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm mraa tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_libc-musl = "lcdproc" RDEPENDS_packagegroup-meta-oe-gnome ="\ atkmm gnome-common gnome-doc-utils-stub gtkmm \ @@ -159,6 +184,10 @@ RDEPENDS_packagegroup-meta-oe-kernel ="\ agent-proxy bpftool broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ " +RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "bpftool crash minicoredumper" + +RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" +RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash" RDEPENDS_packagegroup-meta-oe-multimedia ="\ alsa-oss audiofile cdrkit esound id3lib \ @@ -170,6 +199,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libmikmod", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" RDEPENDS_packagegroup-meta-oe-navigation ="\ geoclue geos libspatialite proj \ @@ -223,6 +253,9 @@ RDEPENDS_packagegroup-meta-oe-support ="\ ${NE10} \ " +RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" +RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch_libc-glibc = "gperftools" + RDEPENDS_packagegroup-meta-oe-support-egl ="\ freerdp libnice opencv \ " @@ -231,23 +264,30 @@ RDEPENDS_packagegroup-meta-oe-test ="\ catch2 cppunit cunit cxxtest evtest fb-test \ fwts gtest pm-qa stress-ng testfloat \ " +RDEPENDS_packagegroup-meta-oe-test_remove_libc-musl = "pm-qa" +RDEPENDS_packagegroup-meta-oe-test_remove_arm = "fwts" +RDEPENDS_packagegroup-meta-oe-test_remove_mipsarch = "fwts" +RDEPENDS_packagegroup-meta-oe-test_remove_powerpc = "fwts" +RDEPENDS_packagegroup-meta-oe-test_remove_riscv64 = "fwts" +RDEPENDS_packagegroup-meta-oe-test_remove_riscv32 = "fwts" -RDEPENDS_packagegroup-meta-oe-ptest = "\ +RDEPENDS_packagegroup-meta-oe-ptest-packages = "\ zeromq-ptest \ - libxml-ptest \ - soci-ptest \ leveldb-ptest \ psqlodbc-ptest \ lua-ptest \ protobuf-ptest \ - libdbi-ptest \ rsyslog-ptest \ oprofile-ptest \ libteam-ptest \ uthash-ptest \ - mcelog-ptest \ - openldap-ptest \ libee-ptest \ - numactl-ptest \ poco-ptest \ " +RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = "\ + mcelog-ptest \ +" +RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86-64 = "\ + mcelog-ptest \ +" +RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_arm = "numactl-ptest" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb index 7e8e7b2eaa..1ea868f672 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb @@ -60,7 +60,7 @@ python do_package_prepend () { dvar = d.getVar('D') pn = d.getVar('PN') - target = "/bin/toybox" + target = d.expand("${base_bindir}/toybox") f = open('%s/etc/toybox.links' % (dvar), 'r') for alt_link_name in f: diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-profile index 1c931f37fd..1c931f37fd 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-profile diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index 3bf71f02e9..dc85224543 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -25,7 +25,7 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ file://postgresql.init \ - file://postgresql-bashprofile \ + file://postgresql-profile \ file://postgresql.pam \ file://postgresql-setup \ file://postgresql.service \ @@ -155,7 +155,7 @@ usernum = "28" groupnum = "28" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ - -s /bin/bash -c 'PostgreSQL Server' -u ${usernum} postgres" + -s /bin/sh -c 'PostgreSQL Server' -u ${usernum} postgres" GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres" INITSCRIPT_PACKAGES = "${PN}" @@ -182,7 +182,7 @@ do_install_append() { install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups - install -m 644 ${WORKDIR}/${BPN}-bashprofile ${D}${localstatedir}/lib/${BPN}/.bash_profile + install -m 644 ${WORKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} # multiple server config directory install -d -m 700 ${D}${sysconfdir}/default/${BPN} @@ -222,7 +222,7 @@ RPROVIDES_${PN}-dbg += "libecpg-compat-dbg \ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ ${localstatedir}/lib/${BPN}/data ${localstatedir}/lib/${BPN}/backups \ - ${localstatedir}/lib/${BPN}/.bash_profile ${sysconfdir}/default/${BPN} \ + ${localstatedir}/lib/${BPN}/.profile ${sysconfdir}/default/${BPN} \ ${libdir}/${BPN}/dict_snowball.so ${libdir}/${BPN}/plpgsql.so \ ${libdir}/${BPN}/euc2004_sjis2004.so \ ${libdir}/${BPN}/libpqwalreceiver.so \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index 3052eb0484..f3a0f70ee2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -90,5 +90,7 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64 is not supported in this release -COMPATIBLE_HOST = "^(?!aarch64).*" +# Aarch64/mips64 is not supported in this release +COMPATIBLE_HOST_aarch64 = "null" +COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST_mipsarchn64 = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch deleted file mode 100644 index 9a11442f1c..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 23 Oct 2015 12:40:34 +0300 -Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set - introspection scanner and compiler paths - -Upstream-Status: Pending [review on oe-core maillist] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2c0cfbd..cfcb3bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, - - GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - --GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) -+GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) - AC_SUBST(GI_DATADIR) - - if test "$enable_cairo" != no; then --- -2.1.4 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb index c444fbf05f..348a0398f3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.3.bb @@ -4,17 +4,13 @@ SECTION = "devel/python" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools pkgconfig gnomebase distutils-base gobject-introspection +inherit gnomebase gobject-introspection distutils-base upstream-version-is-even -PYTHON_BASEVERSION = "2.7" -PYTHON_PN = "python" +DEPENDS += "python glib-2.0" -DEPENDS += "gnome-common-native python glib-2.0" - -SRCNAME="pygobject" +SRCNAME = "pygobject" SRC_URI = " \ http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ - file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ " SRC_URI[md5sum] = "3bac63c86bb963aa401f97859464aa90" @@ -24,12 +20,12 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}" +EXTRA_OECONF = "--disable-cairo" RDEPENDS_${PN} += "python-setuptools" RDEPENDS_${PN}_class-native = "" do_install_append() { # Remove files that clash with python3-pygobject; their content is same - rm -rf ${D}${includedir}/pygobject-3.0//pygobject.h ${D}${libdir}/pkgconfig + rm -r ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig } diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch new file mode 100644 index 0000000000..6c87ff2a4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch @@ -0,0 +1,37 @@ +Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1426865 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1426865] +--- a/js/public/TypeDecls.h ++++ b/js/public/TypeDecls.h +@@ -21,22 +21,23 @@ + #include <stdint.h> + + #include "js-config.h" ++#include "jstypes.h" + + struct JSContext; +-class JSFunction; ++class JS_PUBLIC_API(JSFunction); + class JSObject; +-class JSScript; +-class JSString; +-class JSAddonId; ++class JS_PUBLIC_API(JSScript); ++class JS_PUBLIC_API(JSString); ++class JS_PUBLIC_API(JSAddonId); + +-struct jsid; ++struct JS_PUBLIC_API(jsid); + + namespace JS { + + typedef unsigned char Latin1Char; + +-class Symbol; +-class Value; ++class JS_PUBLIC_API(Symbol); ++class JS_PUBLIC_API(Value); + template <typename T> class Handle; + template <typename T> class MutableHandle; + template <typename T> class Rooted; diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb index 0dfe2f8484..7c8a7aee10 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb @@ -14,6 +14,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.o file://disable-mozglue-in-stand-alone-builds.patch \ file://add-riscv-support.patch \ file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ + file://JS_PUBLIC_API.patch \ " SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ @@ -49,7 +50,7 @@ EXTRA_OECONF = " \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},,virtual/libx11" +PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 930c041233..737c13427a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -20,7 +20,9 @@ inherit cmake distutils3-base DEPENDS += "json-c" -EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON" +EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON \ + -DPYTHON3_PACKAGES_PATH:PATH=${baselib}/python${PYTHON_BASEVERSION}/site-packages \ + " # Prepend mraa-utils to make sure bindir ends up in there PACKAGES =+ "${PN}-utils" diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch new file mode 100644 index 0000000000..7351197e4f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch @@ -0,0 +1,41 @@ +From ff98a326d5faa585f0e15e51a558cc2c49aa8099 Mon Sep 17 00:00:00 2001 +From: Primoz Fiser <primoz.fiser@norik.com> +Date: Fri, 23 Nov 2018 08:31:29 +0100 +Subject: [PATCH] Fix build on big endian architectures + +Signed-off-by: Primoz Fiser <primoz.fiser@norik.com> +--- + Common/DtaEndianFixup.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Common/DtaEndianFixup.h b/Common/DtaEndianFixup.h +index 58eb3ff..184fce0 100644 +--- a/Common/DtaEndianFixup.h ++++ b/Common/DtaEndianFixup.h +@@ -31,12 +31,11 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>. + //TODO: add a test on the endianess of the system and define + // empty macros if the system is big endian + #pragma once +-#ifdef __gnu_linux__ +-#include <endian.h> +-#if __BYTE_ORDER != __LITTLE_ENDIAN +-#error This code does not support big endian architectures +-#endif +-#endif ++#if defined(__BYTE_ORDER__)&&(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++#define SWAP16(x) x ++#define SWAP32(x) x ++#define SWAP64(x) x ++#else + /** change the "endianess" of a 16bit field */ + #define SWAP16(x) ((uint16_t) ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8)) + /** change the "endianess" of a 32bit field */ +@@ -47,3 +46,5 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>. + ((uint64_t) (SWAP32((x & 0x00000000ffffffff)) << 32) | \ + ((uint64_t) (SWAP32((x >> 32))) ) \ + ) ++ ++#endif +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index cec569f624..765618433b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae5 BASEPV = "1.15.1" PV = "${BASEPV}+git${SRCPV}" SRCREV = "358cc758948be788284d5faba46ccf4cc1813796" -SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git" +SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ + file://0001-Fix-build-on-big-endian-architectures.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb index 6ebf3c798c..3a88f12ec8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb @@ -19,6 +19,8 @@ RDEPENDS_${PN} += "xserver-nodm-init liberation-fonts" inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check +EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" + REQUIRED_DISTRO_FEATURES = "x11" do_install_append() { @@ -27,3 +29,5 @@ do_install_append() { FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" SYSTEMD_SERVICE_${PN} = "xscreensaver.service" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index fd0653ab87..dd7eaa2aa6 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -14,6 +14,8 @@ EXTRA_OEMAKE = "-C ${S}/tools/bpf/bpftool O=${B} CROSS=${TARGET_PREFIX} CC="${CC do_configure[depends] += "virtual/kernel:do_shared_workdir" +COMPATIBLE_HOST_libc-musl = 'null' + do_compile() { oe_runmake } diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb index 629e2518f4..33194b8504 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb @@ -13,9 +13,9 @@ LICENSE = "GPLv2.0" DEPENDS = "bzip2 zlib elfutils" RDEPENDS_${PN}-tools = "perl ${PN}" -# arm would compile but has never been tested upstream. mips would not compile. +# arm and aarch64 would compile but has never been tested upstream. mips would not compile. # -COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm).*-linux" +COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm|aarch64).*-linux" PACKAGES =+ "${PN}-tools" FILES_${PN}-tools = "${bindir}/*.pl" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb index 59b73f8e8b..7dcaaf6828 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb @@ -23,4 +23,9 @@ LDFLAGS_append_libc-musl = " -lexecinfo" export LINKFLAGS="${LDFLAGS}" +do_configure() { + sed -i 's|/usr/bin/.*python$|/usr/bin/env python2|' ${S}/a2j_control ${S}/waf ${S}/wscript + (cd ${B} && ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}) +} + FILES_${PN} += "${datadir}/dbus-1/services" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index c2e8e3d574..6586e352ea 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -25,9 +25,12 @@ SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f2 inherit waf pkgconfig pythonnative distro_features_check +LUA ?= "lua" +LUA_mips64 = "" +LUA_aarch64 = "" # Note: both lua and libass are required to get on-screen-display (controls) PACKAGECONFIG ??= " \ - lua \ + ${LUA} \ libass \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch new file mode 100644 index 0000000000..561c8c82cf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch @@ -0,0 +1,78 @@ +From c774f2b129fd5acd5647d92c57a2079ae638a62b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 Jan 2019 23:07:39 -0800 +Subject: [PATCH] include time.h for time structure definition + +Exposed by musl/clang + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + nmap_error.cc | 1 + + nping/EchoServer.cc | 1 + + osscan.cc | 1 + + osscan2.cc | 1 + + service_scan.cc | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/nmap_error.cc b/nmap_error.cc +index 19beafb..ea14e08 100644 +--- a/nmap_error.cc ++++ b/nmap_error.cc +@@ -135,6 +135,7 @@ + #include "xml.h" + + #include <errno.h> ++#include <time.h> + + extern NmapOps o; + +diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc +index 70f39b0..40cd4d6 100644 +--- a/nping/EchoServer.cc ++++ b/nping/EchoServer.cc +@@ -137,6 +137,7 @@ + #include "NpingOps.h" + #include "ProbeMode.h" + #include <signal.h> ++#include <time.h> + + extern NpingOps o; + extern EchoServer es; +diff --git a/osscan.cc b/osscan.cc +index f851f60..6ae0c83 100644 +--- a/osscan.cc ++++ b/osscan.cc +@@ -149,6 +149,7 @@ + # include <time.h> + # endif + #endif ++#include <time.h> + + #include <algorithm> + #include <list> +diff --git a/osscan2.cc b/osscan2.cc +index e341947..887fbd2 100644 +--- a/osscan2.cc ++++ b/osscan2.cc +@@ -147,6 +147,7 @@ + + #include <list> + #include <math.h> ++#include <time.h> + + extern NmapOps o; + #ifdef WIN32 +diff --git a/service_scan.cc b/service_scan.cc +index 9780ae3..e07b940 100644 +--- a/service_scan.cc ++++ b/service_scan.cc +@@ -145,6 +145,7 @@ + #include "nmap_tty.h" + + #include <errno.h> ++#include <time.h> + + #if HAVE_OPENSSL + /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/0002-Fix-building-with-libc.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0002-Fix-building-with-libc.patch new file mode 100644 index 0000000000..064be8ff85 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/nmap/files/0002-Fix-building-with-libc.patch @@ -0,0 +1,76 @@ +From 2a361989b5f84ec23ba7ccb6e527a5590ff55deb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 20 Jan 2019 23:11:56 -0800 +Subject: [PATCH] Fix building with libc++ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + nping/EchoServer.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc +index 40cd4d6..04433e1 100644 +--- a/nping/EchoServer.cc ++++ b/nping/EchoServer.cc +@@ -282,14 +282,14 @@ int EchoServer::nep_listen_socket(){ + server_addr6.sin6_len = sizeof(struct sockaddr_in6); + #endif + /* Bind to local address and the specified port */ +- if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ ++ if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ + nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr6.sin6_addr), port); + /* If the bind failed for the supplied address, just try again with in6addr_any */ + if( o.spoofSource() ){ + server_addr6.sin6_addr = in6addr_any; +- if( bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ ++ if( ::bind(master_sd, (struct sockaddr *)&server_addr6, sizeof(server_addr6)) != 0 ){ + nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno)); +- }else{ ++ }else{ + nping_print(VB_1, "Server bound to port %d", port); + } + } +@@ -320,12 +320,12 @@ int EchoServer::nep_listen_socket(){ + #endif + + /* Bind to local address and the specified port */ +- if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ ++ if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ + nping_warning(QT_3, "Failed to bind to source address %s. Trying to bind to port %d...", IPtoa(server_addr4.sin_addr), port); + /* If the bind failed for the supplied address, just try again with in6addr_any */ + if( o.spoofSource() ){ + server_addr4.sin_addr.s_addr=INADDR_ANY; +- if( bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ ++ if( ::bind(master_sd, (struct sockaddr *)&server_addr4, sizeof(server_addr4)) != 0 ){ + nping_fatal(QT_3, "Could not bind to port %d (%s).", port, strerror(errno)); + }else{ + nping_print(VB_1, "Server bound to port %d", port); +@@ -561,7 +561,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe + nping_print(DBG_3, ";"); + /* The payload magic may affect the score only between + * zero and 4 bytes. This is done to prevent long +- * common strings like "GET / HTTP/1.1\r\n" ++ * common strings like "GET / HTTP/1.1\r\n" + * increasing the score a lot and cause problems for + * the matching logic. */ + current_score+= MIN(4, fspec->len)*FACTOR_PAYLOAD_MAGIC; +@@ -571,7 +571,7 @@ clientid_t EchoServer::nep_match_headers(IPv4Header *ip4, IPv6Header *ip6, TCPHe + default: + nping_warning(QT_2, "Bogus field specifier found in client #%d context. Please report a bug", ctx->getIdentifier()); + break; +- } ++ } + } /* End of field specifiers loop */ + + nping_print(DBG_3, "%s() current_score=%.02f candidate_score=%.02f", __func__, current_score, candidate_score); +@@ -650,7 +650,7 @@ clientid_t EchoServer::nep_match_packet(const u8 *pkt, size_t pktlen){ + }else{ + if( (tcplen=tcp.validate())==OP_FAILURE){ + return CLIENT_NOT_FOUND; +- }else{ ++ }else{ + if( (int)pktlen > (iplen+tcplen) ){ + if( payload.storeRecvData(pkt+iplen+tcplen, pktlen-iplen-tcplen)!=OP_FAILURE) + payload_included=true; diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb index 01be1515b7..e878038266 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb +++ b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=1489288f46af415fad SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ file://nmap-redefine-the-python-library-dir.patch \ file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ -" + file://0001-include-time.h-for-time-structure-definition.patch \ + file://0002-Fix-building-with-libc.patch \ + " SRC_URI[md5sum] = "84eb6fbe788e0d4918c2b1e39421bf79" SRC_URI[sha256sum] = "847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18" @@ -18,7 +20,7 @@ inherit autotools-brokensep pkgconfig pythonnative PACKAGECONFIG ?= "ncat nping ndiff pcap" PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" -PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre" +PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" @@ -43,6 +45,6 @@ do_configure() { oe_runconf } -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" RDEPENDS_${PN} = "python" diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.4.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.4.bb index e7f7688922..816ae5e2ed 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.27.4.bb @@ -14,11 +14,12 @@ S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "\ - -DTHREADSAFE=ON \ - -DBUILD_CLAR=OFF \ - -DSHA1_TYPE="builtin" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_EXAMPLES=OFF \ + -DTHREADSAFE=ON \ + -DBUILD_CLAR=OFF \ + -DSHA1_TYPE="builtin" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DBUILD_EXAMPLES=OFF \ + -DLIB_INSTALL_DIR=${libdir} \ " BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb index 478d762cfb..2d7486da34 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.3.0.bb @@ -22,22 +22,22 @@ LICENSE_modules/linux = "GPL-2.0" LICENSE_modules/solaris = "CDDL-1.0" SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ - file://tools.conf \ - file://vmtoolsd.service \ - file://vmtoolsd.init \ - file://0001-configure.ac-don-t-use-dnet-config.patch \ - file://0002-add-include-sys-sysmacros.h.patch \ - file://0005-Use-configure-test-for-struct-timespec.patch \ - file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \ - file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \ - file://0011-Use-configure-test-for-sys-stat.h-include.patch \ - file://fix-subdir-objects-configure-error.patch \ - file://0001-include-poll.h-instead-of-sys-poll.h.patch \ - file://0002-Rename-poll.h-to-vm_poll.h.patch \ - file://0003-use-posix-strerror_r-unless-on-gnu-libc-system.patch \ - file://0004-Use-uintmax_t-for-handling-rlim_t.patch \ - file://0001-Use-off64_t-instead-of-__off64_t.patch \ - " + file://tools.conf \ + file://vmtoolsd.service \ + file://vmtoolsd.init \ + file://0001-configure.ac-don-t-use-dnet-config.patch \ + file://0002-add-include-sys-sysmacros.h.patch \ + file://0005-Use-configure-test-for-struct-timespec.patch \ + file://0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch \ + file://0007-Use-configure-to-test-for-feature-instead-of-platfor.patch \ + file://0011-Use-configure-test-for-sys-stat.h-include.patch \ + file://fix-subdir-objects-configure-error.patch \ + file://0001-include-poll.h-instead-of-sys-poll.h.patch \ + file://0002-Rename-poll.h-to-vm_poll.h.patch \ + file://0003-use-posix-strerror_r-unless-on-gnu-libc-system.patch \ + file://0004-Use-uintmax_t-for-handling-rlim_t.patch \ + file://0001-Use-off64_t-instead-of-__off64_t.patch \ +" SRCREV = "2147df6aabe639fc5ff423ed791a8e7f02bf8d0a" S = "${WORKDIR}/git/open-vm-tools" @@ -52,9 +52,9 @@ inherit autotools pkgconfig systemd update-rc.d SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ - --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \ - --without-root-privileges --without-kernel-modules" + --disable-tests --without-gtkmm --without-xerces --without-pam \ + --disable-grabbitmqproxy --disable-vgauth --disable-deploypkg \ + --without-root-privileges --without-kernel-modules" NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" @@ -68,13 +68,9 @@ FILES_${PN} += "\ ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ ${libdir}/open-vm-tools/plugins/common/lib*.so \ ${sysconfdir}/vmware-tools/tools.conf \ - " +" FILES_${PN}-locale += "${datadir}/open-vm-tools/messages" FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" -FILES_${PN}-dbg += "\ - ${libdir}/open-vm-tools/plugins/common/.debug \ - ${libdir}/open-vm-tools/plugins/vmsvc/.debug \ - " CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" @@ -104,7 +100,6 @@ INITSCRIPT_PARAMS_${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." python() { if 'networking-layer' not in d.getVar('BBFILE_COLLECTIONS').split() or \ - 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): + 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-networking and meta-filesystems to be present.') } - diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb index fe1af476f2..d3488df2cf 100644 --- a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb @@ -1,6 +1,6 @@ SUMMARY = "A collection of powerful tools for manipulating EPROM load files." SECTION = "devel" -LICENSE = "GPLv2" +LICENSE = "GPLv3+ & LGPLv3+" LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7" SRC_URI = " \ diff --git a/meta-openembedded/meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch new file mode 100644 index 0000000000..63a7b78f12 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch @@ -0,0 +1,46 @@ +From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 31 Jan 2019 21:32:26 -0800 +Subject: [PATCH] src/Makefile: improve reproducibility + +Clear all_cflags, all_lflags, compiled_user +and compiled_sys to avoid introducing build +info to improve reproducibility as below: + +WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths] + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/Makefile | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index f2fafa4dc..7148d4bd9 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk + -@echo '#include "vim.h"' >> $@ + -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ + -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ +- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ +- -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ +- -@if test -n "$(COMPILEDBY)"; then \ +- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ +- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi +- -@echo '";' >> $@ +- -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ +- -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi +- -@echo '";' >> $@ ++ -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@ ++ -@echo 'char_u *compiled_user = (char_u *)"";' >> $@ ++ -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@ + -@sh $(srcdir)/pathdef.sh + + GUI_GTK_RES_INPUTS = \ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/vim/vim_8.1.0347.bb b/meta-openembedded/meta-oe/recipes-support/vim/vim_8.1.0347.bb index 46d229e03b..4de4d8e387 100644 --- a/meta-openembedded/meta-oe/recipes-support/vim/vim_8.1.0347.bb +++ b/meta-openembedded/meta-oe/recipes-support/vim/vim_8.1.0347.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;endline=287;md5=f1f82b42360 SRC_URI = "git://github.com/vim/vim.git \ file://disable_acl_header_check.patch;patchdir=.. \ file://vim-add-knob-whether-elf.h-are-checked.patch;patchdir=.. \ + file://0001-src-Makefile-improve-reproducibility.patch;patchdir=.. \ " SRCREV = "f1c118be93184e8e57e3e80b1b3383f464ed649e" |