From git at git.openembedded.org Sat Apr 1 06:38:07 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:07 +0000 Subject: [oe-commits] [meta-openembedded] 01/55: dnsmasq: disable the service by default In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.A54BE2376DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 48fe7d310d3d9247c2333f328f36c83cbfd1833c Author: Jackie Huang AuthorDate: Mon Feb 27 16:09:59 2017 +0800 dnsmasq: disable the service by default The service will fail to start/stop when dnsmasq and bind (provides named) are both installed since they are using the same port 53: | dnsmasq: failed to create listening socket for port 53: Address already in use So disable the service by default, if the user really want to use two dns servives, the config needs to be changed to use different interfaces or ports. As reference, other distro like centos/fedora also disables the services by default on installation. Signed-off-by: Jackie Huang Signed-off-by: Jackie Huang > Signed-off-by: Martin Jansa --- meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index ef79c5f..3d0386b 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -81,3 +81,4 @@ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "dnsmasq.service" +SYSTEMD_AUTO_ENABLE ?= "disable" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:09 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:09 +0000 Subject: [oe-commits] [meta-openembedded] 03/55: libdnet: update SRC_URI In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.B1F132376DC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b906176f0f941be1010677cc5dd5b436bc4f7b82 Author: Kai Kang AuthorDate: Thu Mar 23 11:04:55 2017 +0800 libdnet: update SRC_URI The official homepage libdnet.googlecode.com has been redirected to github. So update SRC_URI to use git repo on github. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 28b6c82..f48b655 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -4,10 +4,10 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" -SRC_URI = "http://libdnet.googlecode.com/files/libdnet-${PV}.tgz" +SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" +SRCREV = "12fca29a6d4e99d1b923d6820887fe7b24226904" -SRC_URI[md5sum] = "9253ef6de1b5e28e9c9a62b882e44cc9" -SRC_URI[sha256sum] = "83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026" +S = "${WORKDIR}/git" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:08 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:08 +0000 Subject: [oe-commits] [meta-openembedded] 02/55: ctdb: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.AB9332376DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 4fc0aaff5ace96dd481e4ae582dec965d48d4214 Author: Khem Raj AuthorDate: Wed Mar 22 11:45:28 2017 -0700 ctdb: Fix build with musl Fixes | ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 7cea0f6..b5a6064 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -27,6 +27,9 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" DEPENDS += "popt libtevent libtalloc libldb" +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:10 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:10 +0000 Subject: [oe-commits] [meta-openembedded] 04/55: wireless-regdb: fix crda failing from missing pubkey In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.B83312376DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6f1d95f4b9995bca7fb24cea7ed5f12f77bedf11 Author: Aaron Zinghini AuthorDate: Fri Mar 24 08:54:27 2017 -0700 wireless-regdb: fix crda failing from missing pubkey crda fails with exit code 255 because the public key from wireless-regdb is missing. Signed-off-by: Aaron Zinghini Signed-off-by: Martin Jansa --- .../recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb index a9119ea..64e9401 100644 --- a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb +++ b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb @@ -12,7 +12,9 @@ inherit bin_package do_install() { install -d -m0755 ${D}${libdir}/crda + install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin + install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem } RSUGGESTS_${PN} = "crda" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:06 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:06 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (8f02287 -> b3f8215) Message-ID: <149102868649.30268.14642619100553213211@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master-next in repository meta-openembedded. discard 8f02287 meta-efl: blacklist efl-native and dependent recipes discard 007eca4 zile: fix do_install discard d9b1a54 tcsh, dt: blacklist because tcsh doesn't respect CC variable discard 9d0363c vboxguestdrivers: upgrade to 5.1.18 to fix compatibility with 4.10 kernel discard 17aebdf vboxguestdrivers: make sure that do_compile fails when some module failed to build discard 4181594 ttf-liberation-sans-narrow: use pagure.org instead of retired fedorahosted.org discard 4593be6 ttf-abyssinica: fix SRC_URI discard a521f94 libqb: inherit autotools-brokensep discard fdf73fe libqb: use github.com instead of retired fedorahosted.org discard b680012 mailcap: use pagure.org instead of retired fedorahosted.org discard 816a4d7 hwdata: use github instead of fedorahosted.org discard f573685 atop: Fix build with musl discard 8b8b786 php: fix install failure discard 4ab7000 polkit-group-rule.inc: Fix comment typo "polkid" -> "polkitd" discard b3ceca8 ntp: update to 4.2.8.p10 discard 2c52a62 wireless-regdb: fix crda failing from missing pubkey discard 6378e78 glm: Fix rootfs error for glm-dev install discard 4f8fb8c libdnet: update SRC_URI discard 4996156 alsa-equal: Update SRC_URI to something valid discard 56a223a python-slip-dbus: Update SRC_URI to github discard bf2cf44 libedit: Update to 20160618-3.1 release discard 9fbd923 libndp: Include sys/select.h in ndptool.c discard 7cfb249 ctdb: Fix build with musl discard 4bf0ad2 log4cpp: Upgrade to 1.1.2 rc5 discard 6426142 xfce4-mount-plugin: Fix build with musl discard d0e8e5c abiword: Mark gconv dependencies only for glibc discard 40da0d5 fwts: upgrade to 17.03.00 release discard 827359b aufs-utils-native: define CC discard f16faf7 nginx: make sure the user is correctly set for the volatile directories discard ae26da7 nginx: set sane defaults for temp directories discard 83b9800 lio-utils: Fix GNU_HASH QA errors discard 9274e39 libnice: Upgrade to 0.1.13 discard c9070de libssh: Force to use gcc toolchain discard ac7f99b gflags: correct S and update library install directory discard 380ddf2 lvm2: fix lvm2-native RRECOMMENDS problem discard 31520bf lvm2: libdevicemapper package needs udev rules and dmsetup discard 472a76d lvm2: Avoid an unnecessary dependency on bash discard cf6f125 memstat: Fix build with musl discard dc02354 digitemp: Update past 3.7.1 release discard 9be90ec samsung-soc-utils: Remove -static discard 1ce4dfb zile: Fix build with musl discard 2f26ed1 gradm: Fix GNU_HASH QA errors discard 3cd99b3 procmail: Fix GNU_HASH errors, pass LDFLAGS discard 7bc10f5 smstools3: Fix GNU_HASH errors discard 7246f84 libmatroska: Fix missing GNU_HASH errors discard 18095f4 sgio: Fix missing GNU_HASH errors discard c9efffc libtorrent, rtorrent: Update to latest discard 9530df7 rapidjson: Update to 1.1.0 + git discard 99d4ea4 nginx: make user in nginx.conf consistent with the default value discard 433ed04 gperftools: fix do_compile failure for qemuppc discard cd99d41 dnsmasq: disable the service by default add 02cf7ab gperftools: fix do_compile failure for qemuppc add 0233f4c nginx: make user in nginx.conf consistent with the default value add 0d48a39 rapidjson: Update to 1.1.0 + git add f67e201 libtorrent, rtorrent: Update to latest add 2e3645e sgio: Fix missing GNU_HASH errors add e961adf libmatroska: Fix missing GNU_HASH errors add 040036a smstools3: Fix GNU_HASH errors add 738d386 procmail: Fix GNU_HASH errors, pass LDFLAGS add d92ee32 gradm: Fix GNU_HASH QA errors add 64640f4 zile: Fix build with musl add fb9224e samsung-soc-utils: Remove -static add bfc16ec digitemp: Update past 3.7.1 release add cafa3a4 memstat: Fix build with musl add af279a8 lvm2: Avoid an unnecessary dependency on bash add 269d009 lvm2: libdevicemapper package needs udev rules and dmsetup add ff30e01 lvm2: fix lvm2-native RRECOMMENDS problem add aa4daa9 libssh: Force to use gcc toolchain add f646f52 libnice: Upgrade to 0.1.13 add df3d2be lio-utils: Fix GNU_HASH QA errors add a4e4cfd nginx: set sane defaults for temp directories add d050a35 nginx: make sure the user is correctly set for the volatile directories add defe6ca aufs-utils-native: define CC add 7f97463 fwts: upgrade to 17.03.00 release add 1b22caf abiword: Mark gconv dependencies only for glibc add 705a863 xfce4-mount-plugin: Fix build with musl add 0ef3f00 log4cpp: Upgrade to 1.1.2 rc5 add 9cd2b3f libndp: Include sys/select.h in ndptool.c add 9a3812e libedit: Update to 20160618-3.1 release add fe63fd7 python-slip-dbus: Update SRC_URI to github add a02ec57 alsa-equal: Update SRC_URI to something valid add 7dd9572 glm: Fix rootfs error for glm-dev install add 6c9c731 polkit-group-rule.inc: Fix comment typo "polkid" -> "polkitd" add b5bb611 php: fix install failure add fbfaf10 atop: Fix build with musl add 8e804af hwdata: use github instead of fedorahosted.org add 23361df mailcap: use pagure.org instead of retired fedorahosted.org add 18893ec libqb: use github.com instead of retired fedorahosted.org add 1a9dc23 libqb: inherit autotools-brokensep add 2e408bd ttf-abyssinica: fix SRC_URI add 2c4b174 ttf-liberation-sans-narrow: use pagure.org instead of retired fedorahosted.org add a971557 vboxguestdrivers: make sure that do_compile fails when some module failed to build add 4cf51a6 vboxguestdrivers: upgrade to 5.1.18 to fix compatibility with 4.10 kernel add 385cb88 tcsh, dt: blacklist because tcsh doesn't respect CC variable add b836859 zile: fix do_install add 56c233b meta-efl: blacklist efl-native and dependent recipes new 48fe7d3 dnsmasq: disable the service by default new 4fc0aaf ctdb: Fix build with musl new b906176 libdnet: update SRC_URI new 6f1d95f wireless-regdb: fix crda failing from missing pubkey new 9146958 ntp: update to 4.2.8.p10 new b69e091 loop-aes: Add recipe new 9a3da2f gpm: Update to use git src uri new b0b2e4f netcat-openbsd: Fix build and whitelist new 6167f73 v4l-utils: Depend on argp-standalone for musl new 2632060 caps: Use c99 int types new ddec166 lvm2: Fix patch errors found with musl new 1c82947 squid: Update to 3.5.23 new 593ae29 xfce4-closebutton-plugin: Fix build with clang new de0efe3 xfce4-timer-plugin: Fix build when security flags are enabled with clang new 5ea2eca tcsh: Update to 6.20.00 release new fc46373 libnfnetlink: Backport patches to fix musl build new 6619097 ebtables: Fix build with musl new 97d4370 poco: Upgrade to 1.7.8 new d0c2329 mariadb: Do not use ucontext_* APIs with musl new 9a5ab2b lowpan-tools: Fix build with musl new 79ad47b usb-modeswitch-data: Add dep on native tcl new f5a6e5a aufs-util: Define HOSTCC new 4867738 ttf-inconsolata: Move copying of .otf to .ttf into do_compile new d96ca29 libraw1394: Update to 2.1.2 release new 484b7fd libdc1394: Update to 2.2.5+ new cc7d7bf ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 new 70dcd88 openl2tp: Fix build with musl new d16a05c rp-pppoe: Fix build with musl new bc70034 minicoredumper: Update to 2.0.0 new 9256a18 vsftpd: Fix build with musl new 5dfc6e8 faac: Fix with with security flags and on musl new 9334e89 dibbler: Upgrade to 1.0.2RC1 new 4bec484 live555: Do not use XLOCALE on musl new 4f6c5e6 libqb: Upgrade to 1.0.1 release new a94127d libgxim: Fix build with security flags turned on new 20f3a73 vpnc: Update to build from github SRC_URI new 2daed6d daq: Fix build with musl new 2824e0b utouch: Fix build on musl new db9e8c3 libavc1394: Add libargp on musl new b8dcf93 picocom: Upgrade to 2.2 new 8215a80 libexecinfo: Add recipe new ee6b7e6 xarchiver: Fix build with security flags turned on new f353fcc arptables: Upgrade to 0.0.4 new da896ec libnetfilter-log: Switch to git URI new 9817183 lxdm: Find libexecinfo if its on platform new 30d8307 libnetfilter-queue: Update to git for SRC_URI new 52a43d0 libunique: Fix build with secutiy flags on new 977040b snort: Fix build with musl new 46aeae3 pavucontrol: Backport patches to build with c++11 std new 1d84d3b networkmanager: Fix build on musl new 2bf0052 autofs: Patch to build on musl new f504848 jsonrpc: Backport and create patches to build with musl new d479e4e xdebug: 2.2.6 -> 2.5.1 new b121b06 python-smbus: upgrade to 3.1.2 new b3f8215 opencv: remove redundant build dependency on python2 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8f02287) \ N -- N -- N refs/heads/master-next (b3f8215) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 55 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} | 6 +- .../recipes-utils/aufs-util/aufs-util_git.bb | 2 + ...01-basic.h-Use-c99-supported-stdint-types.patch | 46 ++ .../recipes-multimedia/caps/caps_0.9.24.bb | 8 +- .../recipes-multimedia/faac/faac_1.28.bb | 6 +- ...frontend-Fix-format-string-security-error.patch | 26 + ...Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 + .../libavc1394/libavc1394_0.5.4.bb | 3 + .../recipes-multimedia/libdc1394/libdc1394_git.bb | 4 +- .../recipes-connectivity/daq/daq_2.0.6.bb | 4 +- .../0001-correct-the-location-of-unistd.h.patch | 29 + .../dibbler/dibbler_fix_getSize_crash.patch | 56 +- .../dibbler/dibbler/types.patch | 96 ---- .../dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} | 16 +- .../recipes-connectivity/snort/snort_2.9.7.5.bb | 4 + .../0001-search-for-log-help-in-build-dir.patch | 26 + ... 0002-Fix-vpnc-install-for-cross-compile.patch} | 20 +- ...003-error.h-is-specific-to-glibc-on-linux.patch | 30 + ...Use-pkgconfig-instead-of-libgcrypt-config.patch | 30 + ...ude-sys-ttydefaults.h-for-CEOT-definition.patch | 30 + ...header-include-sequence-to-adjust-for-mus.patch | 40 ++ ...error-API-when-error.h-is-not-on-platform.patch | 66 +++ ...0008-include-sysdep.h-before-net-if_tun.h.patch | 36 ++ .../recipes-connectivity/vpnc/vpnc/makeman.patch | 11 - .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 41 +- ...fine-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch | 50 ++ .../0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 51 ++ .../recipes-daemons/autofs/autofs_5.1.1.bb | 6 +- .../squid/{squid_3.5.20.bb => squid_3.5.23.bb} | 9 +- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 28 + .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 7 +- .../0001-add-RARP-and-update-iana-url.patch | 45 ++ .../0002-fix-compilation-warning.patch | 25 + .../0003-add-info-about-Wl-no-as-needed.patch | 25 + ...for-kernel-regression-bug-IPv6-source-des.patch | 28 + ...-command-line-support-for-ebtables-restor.patch | 75 +++ ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 +++ .../0007-extensions-Use-stdint-types.patch | 67 +++ ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 ++ ...low-RETURN-target-rules-in-user-defined-c.patch | 48 ++ .../0010-Adjust-header-include-sequence.patch | 216 +++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 12 +- ...o-in-the-location-of-internal.h-in-includ.patch | 26 + .../libnetfilter/libnetfilter-log_1.0.1.bb | 10 +- .../libnetfilter/libnetfilter-queue_1.0.2.bb | 11 +- ...0001-build-resolve-automake-1.12-warnings.patch | 28 + ...rce-code-license-header-in-sync-with-curr.patch | 49 ++ .../0003-configure-uclinux-is-also-linux.patch | 27 + ...k-initialize-attribute-padding-to-resolve.patch | 39 ++ .../0005-include-Sync-with-kernel-headers.patch | 110 ++++ .../0006-src-Use-stdint-types-everywhere.patch | 403 +++++++++++++ .../libnfnetlink/libnfnetlink_1.0.1.bb | 9 +- .../openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch | 29 + .../0001-l2tp_api-Included-needed-headers.patch | 34 ++ ...02-cli-include-fcntl.h-for-O_CREAT-define.patch | 25 + .../openl2tp/0002-user-ipv6-structures.patch | 33 ++ ...fine-_GNU_SOURCE-for-getting-sighandler_t.patch | 35 ++ ...linux-kernel-headers-assumptions-on-glibc.patch | 36 ++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 17 +- .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 30 + ...0002-Enable-support-for-the-kernel-module.patch | 25 + .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 5 +- .../arptables-compile-install.patch | 61 -- ...FLAGS-for-package-specific-compiler-flags.patch | 79 +++ .../arptables-arpt-get-target-fix.patch | 0 .../arptables-init-busybox.patch | 0 .../arptables-remove-bashism.patch | 0 .../arptables.service | 0 .../{arptables_0.0.3-4.bb => arptables_git.bb} | 43 +- ...d-config-parse.y-add-missing-time.h-inclu.patch | 44 ++ .../lowpan-tools/lowpan-tools_git.bb | 1 + ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 20 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- .../recipes-connectivity/dibbler/dibbler_1.0.1.bb | 40 -- ...adjust-net-headers-for-musl-compatibility.patch | 82 +++ .../0001-check-for-strndupa-before-using-it.patch | 67 +++ ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 + .../networkmanager/0003-Define-ETH_ALEN.patch | 39 ++ ...Define-missing-features-to-cater-for-musl.patch | 93 +++ ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 ++ .../networkmanager/networkmanager_1.4.2.bb | 15 +- ...mset-and-family-needs-to-include-string.h.patch | 26 + .../jsonrpc/0002-Fix-build-problem-on-Mac.patch | 27 + meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb | 4 +- .../0001-makefile-Fix-build-on-linux.patch | 59 ++ ...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 +++ .../libexecinfo/libexecinfo_1.1.bb | 31 + .../0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch | 53 ++ .../libgxim/0002-Update-autotools-macro.patch | 31 + ...string-qualifier-to-fix-potential-securit.patch | 30 + meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 6 +- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +- .../recipes-extended/tcsh/files/01_build.1.patch | 16 - .../recipes-extended/tcsh/files/01_build.2.patch | 13 - .../recipes-extended/tcsh/files/01_build.3.patch | 13 - .../tcsh/files/12_unknown_lscolors.patch | 24 - .../recipes-extended/tcsh/files/15_no-strip.patch | 14 - .../tcsh/files/disable-broken-test.patch | 14 - .../tcsh/files/disable-lexical.at-31.patch | 30 - .../tcsh/files/disable-test-nice.patch | 23 - .../tcsh/files/disable-test-notty.patch | 30 - .../tcsh/files/fix-gcc6-wait-union.patch | 11 - .../tcsh/files/tcsh-6.17.02-multibyte.patch | 18 - .../0001-Enable-system-malloc-on-all-linux.patch | 30 + .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 ++ meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | 55 -- meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb | 44 ++ ...-unique-Add-format-qualifier-s-for-string.patch | 32 ++ meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 11 +- ...-for-libexecinfo-providing-backtrace-APIs.patch | 36 ++ meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 16 +- .../ttf-fonts/ttf-inconsolata_20100526.bb | 7 +- ...coredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 19 +- meta-oe/recipes-multimedia/live555/live555.inc | 5 +- .../0001-build-sys-Use-C-11-for-building.patch | 27 + ...-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch | 624 +++++++++++++++++++++ .../pulseaudio/pavucontrol_3.0.bb | 5 +- .../v4l2apps/v4l-utils_1.10.1.bb | 1 + meta-oe/recipes-support/gflags/gflags_2.2.0.bb | 3 +- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 ----------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 -- meta-oe/recipes-support/gpm/gpm_git.bb | 44 ++ .../{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} | 4 +- meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb | 22 + ...001-implement-libc-specific-reopen_stream.patch | 14 +- ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 14 +- meta-oe/recipes-support/mysql/mariadb.inc | 1 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 + meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 - meta-oe/recipes-support/picocom/picocom_git.bb | 23 + .../poco/{poco_1.7.7.bb => poco_1.7.8.bb} | 4 +- .../usb-modeswitch/usb-modeswitch-data_20170205.bb | 2 + ...sys-stat.h-for-fixing-build-issue-on-musl.patch | 29 + meta-oe/recipes-support/utouch/utouch-frame_git.bb | 4 +- .../{python-smbus_3.1.1.bb => python-smbus.inc} | 10 +- .../recipes-devtools/python/python-smbus_3.1.2.bb | 2 + .../recipes-devtools/python/python3-smbus_3.1.2.bb | 2 + .../xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} | 4 +- ...formatting-string-to-printf-like-function.patch | 43 ++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +- ...n_val_if_fail-in-functions-expecting-a-re.patch | 62 ++ .../closebutton/xfce4-closebutton-plugin_git.bb | 4 +- .../0001-Specify-string-format-explicitly.patch | 32 ++ .../timer/xfce4-timer-plugin_1.6.0.bb | 2 + 152 files changed, 4770 insertions(+), 1076 deletions(-) rename meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/{ntfs-3g-ntfsprogs_2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} (88%) create mode 100644 meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch create mode 100644 meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch create mode 100644 meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch create mode 100644 meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch delete mode 100644 meta-networking/recipes-connectivity/dibbler/dibbler/types.patch rename meta-networking/recipes-connectivity/dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} (77%) create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch rename meta-networking/recipes-connectivity/vpnc/vpnc/{vpnc-install.patch => 0002-Fix-vpnc-install-for-cross-compile.patch} (73%) create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch create mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch delete mode 100644 meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch create mode 100644 meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch create mode 100644 meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch rename meta-networking/recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} (95%) create mode 100644 meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch create mode 100644 meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch create mode 100644 meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch delete mode 100644 meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch create mode 100644 meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-arpt-get-target-fix.patch (100%) rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-init-busybox.patch (100%) rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables-remove-bashism.patch (100%) rename meta-networking/recipes-support/arptables/{arptables-0.0.3-4 => arptables}/arptables.service (100%) rename meta-networking/recipes-support/arptables/{arptables_0.0.3-4.bb => arptables_git.bb} (61%) create mode 100644 meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch create mode 100644 meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch delete mode 100644 meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch create mode 100644 meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch create mode 100644 meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch rename meta-oe/recipes-extended/libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} (67%) delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.1.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.2.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.3.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/15_no-strip.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch create mode 100644 meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch create mode 100644 meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch delete mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb create mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch rename meta-oe/recipes-kernel/minicoredumper/{minicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} (64%) create mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch create mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch create mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/init (100%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/no-docs.patch (93%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/processcreds.patch (100%) delete mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb create mode 100644 meta-oe/recipes-support/gpm/gpm_git.bb rename meta-oe/recipes-support/libraw1394/{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} (71%) create mode 100644 meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb create mode 100644 meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb rename meta-oe/recipes-support/poco/{poco_1.7.7.bb => poco_1.7.8.bb} (97%) create mode 100644 meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch rename meta-python/recipes-devtools/python/{python-smbus_3.1.1.bb => python-smbus.inc} (60%) create mode 100644 meta-python/recipes-devtools/python/python-smbus_3.1.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb rename meta-webserver/recipes-php/xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} (86%) create mode 100644 meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch create mode 100644 meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch create mode 100644 meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:12 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:12 +0000 Subject: [oe-commits] [meta-openembedded] 06/55: loop-aes: Add recipe In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.C87882376DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b69e091b0f32ca63f58cc35eb95443110afe3887 Author: Khem Raj AuthorDate: Fri Dec 2 19:00:55 2016 -0800 loop-aes: Add recipe Signed-off-by: Khem Raj --- meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb b/meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb new file mode 100644 index 0000000..fa60c7b --- /dev/null +++ b/meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb @@ -0,0 +1,22 @@ +SUMMARY = "Loop-aes - replacement for loop driver that can do aes encryption" +DESCRIPTION = "Fast and transparent file system and swap encryption package for \ + linux. No source code changes to linux kernel. Works with 3.x,\ + 2.6, 2.4, 2.2 and 2.0 kernels." +HOMEPAGE = "http://sourceforge.net/projects/loop-aes/" +LICENSE = "GPL-2.0" + +LIC_FILES_CHKSUM = "file://aes-GPL.diff;md5=bf349af3486306c2e4d85de5b6fa3bb4" + +SRC_URI = "http://loop-aes.sourceforge.net/loop-AES/loop-AES-${PV}.tar.bz2" +SRC_URI[md5sum] = "335238a7cfd45f157935c59156533a05" +SRC_URI[sha256sum] = "67ede839d4cac657359c39b05eac46f6991054768a7e1096bef5b92edb3b8aba" + +inherit module + +S = "${WORKDIR}/loop-AES-${PV}" + +EXTRA_OEMAKE += "LINUX_SOURCE=${STAGING_KERNEL_DIR} INSTALL_MOD_PATH=${D} MODINST=n" + +do_install () { + install -D -m 0655 loop.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/misc/loop.ko +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:15 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:15 +0000 Subject: [oe-commits] [meta-openembedded] 09/55: v4l-utils: Depend on argp-standalone for musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.E138B2376E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6167f7357bb0e08d0b4f1e896a20bc8c046d5cab Author: Khem Raj AuthorDate: Wed Mar 22 11:49:42 2017 -0700 v4l-utils: Depend on argp-standalone for musl musl does not bundle libargp like glibc Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb index b9732fe..4d87b50 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb @@ -6,6 +6,7 @@ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" +DEPENDS_append_libc-musl = " argp-standalone" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:20 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:20 +0000 Subject: [oe-commits] [meta-openembedded] 14/55: xfce4-timer-plugin: Fix build when security flags are enabled with clang In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.0F5B02376E7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit de0efe3bb9949101842faa76d5ec0c4b9f6b43df Author: Khem Raj AuthorDate: Wed Mar 22 15:34:51 2017 -0700 xfce4-timer-plugin: Fix build when security flags are enabled with clang Signed-off-by: Khem Raj --- .../0001-Specify-string-format-explicitly.patch | 32 ++++++++++++++++++++++ .../timer/xfce4-timer-plugin_1.6.0.bb | 2 ++ 2 files changed, 34 insertions(+) diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch new file mode 100644 index 0000000..3f0bb05 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch @@ -0,0 +1,32 @@ +From 6b786e1c161026ab5486ac218891a85db65bf3ba Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 15:28:24 -0700 +Subject: [PATCH] Specify string format explicitly + +Avoids below errors when compiling with -Wformat-security + +error: format string is not a string literal (potentially insecure) + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/xfcetimer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xfcetimer.c b/src/xfcetimer.c +index 601772f..4b89682 100644 +--- a/src/xfcetimer.c ++++ b/src/xfcetimer.c +@@ -190,7 +190,7 @@ static gboolean update_function (gpointer data){ + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, +- GTK_BUTTONS_NONE, dialog_message); ++ GTK_BUTTONS_NONE, "%s", dialog_message); + + gtk_window_set_title ((GtkWindow *) dialog, dialog_title); + +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb index d61235f..9615192 100644 --- a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb @@ -6,5 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin +SRC_URI += "file://0001-Specify-string-format-explicitly.patch" + SRC_URI[md5sum] = "3be2a4ccfb2af20441b1d25c2cea5f28" SRC_URI[sha256sum] = "39d7d21f099bc4219f6a6156142f0bbb8374986ee1970a9c0c8dc138b87f867c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:13 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:13 +0000 Subject: [oe-commits] [meta-openembedded] 07/55: gpm: Update to use git src uri In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.D19502376E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9a3da2f926e04ce8a6828da2c65a8c9cb005f31b Author: Khem Raj AuthorDate: Mon Mar 6 13:14:15 2017 -0800 gpm: Update to use git src uri Additional patches are upstream to fix build with gcc6 and clang Add systemd unit file Signed-off-by: Khem Raj --- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ---- meta-oe/recipes-support/gpm/gpm_git.bb | 44 +++ 8 files changed, 54 insertions(+), 392 deletions(-) diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch deleted file mode 100644 index e43bdcb..0000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: pending - ---- gpm-1.99.7.orig/src/daemon/open_console.c 2008-07-24 12:33:05.000000000 +0200 -+++ gpm-1.99.7/src/daemon/open_console.c 2013-01-10 12:39:47.975461947 +0100 -@@ -23,6 +23,7 @@ - #include /* open and co. */ - #include /* stat() */ - #include /* ioctl() */ -+#include /* major() */ - - /* Linux specific (to be outsourced in gpm2 */ - #include /* for serial console check */ diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch deleted file mode 100644 index d2d6cb8..0000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch +++ /dev/null @@ -1,326 +0,0 @@ -Remove nested functions, they are not available in all compilers -e.g. clang will not support them. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: gpm-1.99.7/src/drivers/summa/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/summa/i.c -+++ gpm-1.99.7/src/drivers/summa/i.c -@@ -36,6 +36,28 @@ extern int summamaxy; - - extern signed char summaid; - -+static void resetsumma(int fd) -+{ -+ write(fd, 0, 1); /* Reset */ -+ usleep(400000); /* wait */ -+} -+ -+static int waitsumma(int fd) -+{ -+ struct timeval timeout; -+ -+ fd_set readfds; -+ -+ int err; -+ -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return (err); -+} -+ - Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc, - char **argv) - { -@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short - flags = argc = 0; /* FIXME: 1.99.13 */ - argv = NULL; - -- void resetsumma() { -- write(fd, 0, 1); /* Reset */ -- usleep(400000); /* wait */ -- } -- int waitsumma() { -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return (err); -- } - int err; - - char buffer[255]; -@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short - */ - setspeed(fd, 1200, 9600, 1, - B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD); -- resetsumma(); -+ resetsumma(fd); - - write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE)); - -@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short - * read the Summa Firm-ID - */ - write(fd, SS_FIRMID, strlen(SS_FIRMID)); -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - summaid = 10; /* Original Summagraphics */ - read(fd, buffer, 255); /* Read Firm-ID */ -@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short - } - - if(summaid < 0) { /* Genius-test */ -- resetsumma(); -+ resetsumma(fd); - write(fd, GEN_MMSERIES, 1); - write(fd, &GEN_MODELL, 1); /* Read modell */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { /* read Genius-ID */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - read(fd, &config, 1); - summaid = (config[0] & 224) >> 5; /* genius tablet-id -@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short - * unknown tablet ? - */ - if((summaid < 0) || (summaid == 11)) { -- resetsumma(); -+ resetsumma(fd); - write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3); - } - - /* - * read tablet size - */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) - read(fd, buffer, sizeof(buffer)); - write(fd, SS_READCONFIG, 1); -Index: gpm-1.99.7/src/drivers/wacom/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/wacom/i.c -+++ gpm-1.99.7/src/drivers/wacom/i.c -@@ -30,10 +30,6 @@ - #include "message.h" /* gpm_report */ - #include "wacom.h" /* wacom */ - --Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -- char **argv) --{ -- - /* wacom graphire tablet */ - #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */ - /* -@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short - #define UD_COORD "~C\r" /* Request max coordinates */ - #define UD_STOP "\nSP\r" /* stop sending coordinates */ - -- flags = 0; /* FIXME: 1.99.13 */ - -- void reset_wacom() { -- /* -- * Init Wacom communication; this is modified from xf86Wacom.so module -- */ -- /* -- * Set speed to 19200 -- */ -- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Baudrate Command -- */ -- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -- usleep(250000); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(75000); -- /* -- * Set speed to 9600bps -- */ -- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(250000); -- write(fd, UD_STOP, strlen(UD_STOP)); -- usleep(100000); -- } -+static void reset_wacom(int fd) -+{ -+ /* -+ * Init Wacom communication; this is modified from xf86Wacom.so module -+ */ -+ /* -+ * Set speed to 19200 -+ */ -+ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Baudrate Command -+ */ -+ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -+ usleep(250000); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(75000); -+ /* -+ * Set speed to 9600bps -+ */ -+ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(250000); -+ write(fd, UD_STOP, strlen(UD_STOP)); -+ usleep(100000); -+} - -- int wait_wacom() { -- /* -- * Wait up to 200 ms for Data from Tablet. -- * Do not read that data. -- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -- */ -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return ((err > 0) ? 1 : err); -- } -+static int wait_wacom(int fd) -+{ -+ /* -+ * Wait up to 200 ms for Data from Tablet. -+ * Do not read that data. -+ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -+ */ -+ struct timeval timeout; - -- char buffer[50], *p; -+ fd_set readfds; - -- int RequestData(char *cmd) { -- int err; -+ int err; - -- /* -- * Send cmd if not null, and get back answer from tablet. -- * Get Data to buffer until full or timeout. -- * Give back 0 for timeout and !0 for buffer full -- */ -- if(cmd) -- write(fd, cmd, strlen(cmd)); -- memset(buffer, 0, sizeof(buffer)); -- p = buffer; -- err = wait_wacom(); -- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -- err = wait_wacom(); -- } -- /* -- * return 1 for buffer full -- */ -- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return ((err > 0) ? 1 : err); -+} -+ -+static int RequestData(int fd, char *cmd, char *buffer) -+{ -+ int err; -+ char *p; -+ /* -+ * Send cmd if not null, and get back answer from tablet. -+ * Get Data to buffer until full or timeout. -+ * Give back 0 for timeout and !0 for buffer full -+ */ -+ if(cmd) -+ write(fd, cmd, strlen(cmd)); -+ memset(buffer, 0, sizeof(buffer)); -+ p = buffer; -+ err = wait_wacom(fd); -+ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -+ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -+ err = wait_wacom(fd); - } -+ /* -+ * return 1 for buffer full -+ */ -+ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+} -+ -+Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -+ char **argv) -+{ -+ -+ flags = 0; /* FIXME: 1.99.13 */ -+ -+ char buffer[50]; - - /* - * We do both modes, relative and absolute, with the same function. -@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short - }; - parse_argv(optioninfo, argc, argv); - type->absolute = WacomAbsoluteWanted; -- reset_wacom(); -+ reset_wacom(fd); - - /* - * "Flush" input queque - */ -- while(RequestData(NULL)) ; -+ while(RequestData(fd, NULL, buffer)) ; - - /* - * read WACOM-ID - */ -- RequestData(UD_FIRMID); -+ RequestData(fd, UD_FIRMID, buffer); - - /* - * Search for matching modell -@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short - * read Wacom max size - */ - if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) { -- RequestData(UD_COORD); -+ RequestData(fd, UD_COORD, buffer); - sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy); - wmaxx = (wmaxx - wcmodell[WacomModell].border); - wmaxy = (wmaxy - wcmodell[WacomModell].border); diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in new file mode 100644 index 0000000..ee6c040 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm/init similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/init rename to meta-oe/recipes-support/gpm/gpm/init diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch similarity index 93% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch rename to meta-oe/recipes-support/gpm/gpm/no-docs.patch index f10217a..3faef84 100644 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch +++ b/meta-oe/recipes-support/gpm/gpm/no-docs.patch @@ -11,7 +11,7 @@ Index: gpm-1.99.7/Makefile.in # user-overridable flags, but it's also all the implicit rule looks at. # missing ? --SUBDIRS = src doc contrib gpm2 +-SUBDIRS = src doc contrib +SUBDIRS = src diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb deleted file mode 100644 index bbb8c28..0000000 --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ -for the console and xterm, with sample clients included \ -(emacs, etc)." -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f" - -PR = "r2" - -DEPENDS = "ncurses" - -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ - file://no-docs.patch \ - file://processcreds.patch \ - file://eglibc-2.17.patch \ - file://remove_nested_functions.patch \ - file://init" - -inherit autotools-brokensep update-rc.d - -INITSCRIPT_NAME = "gpm" -INITSCRIPT_PARAMS = "defaults" - -#export LIBS = "-lm" - -# all fields are /* FIXME: gpm 1.99.13 */ -# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable] -# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable] -# cc1: all warnings being treated as errors -CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable" - -# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7 -# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] -# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror] -CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -m 0644 src/headers/gpm.h ${D}${includedir} - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm - cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 -} -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544" -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee" - -FILES_${PN} += "${datadir}/emacs" diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb new file mode 100644 index 0000000..4c0e943 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ +for the console and xterm, with sample clients included \ +(emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" + +PV = "1.99.7+git${SRCREV}" +PR = "r2" +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/telmich/gpm;protocol=git \ + file://no-docs.patch \ + file://processcreds.patch \ + file://gpm.service.in \ + file://init" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep update-rc.d systemd + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" + +do_configure_prepend() { + (cd ${S};./autogen.sh;cd -) +} + +do_install_append () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm + fi + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h +} + +SYSTEMD_SERVICE_${PN} = "gpm.service" + +FILES_${PN} += "${datadir}/emacs" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:18 +0000 Subject: [oe-commits] [meta-openembedded] 12/55: squid: Update to 3.5.23 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.01E4F2376E5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1c82947b4e6cb456d70eb6d929b24bc76d229bf0 Author: Khem Raj AuthorDate: Wed Mar 22 14:39:47 2017 -0700 squid: Update to 3.5.23 Disable NIS on musl, it doesnt yet build Signed-off-by: Khem Raj --- .../recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb similarity index 95% rename from meta-networking/recipes-daemons/squid/squid_3.5.20.bb rename to meta-networking/recipes-daemons/squid/squid_3.5.23.bb index 2e9e1f1..0fe9673 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb @@ -22,13 +22,12 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ " +SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22" +SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ " -SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60" -SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1" - DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools useradd ptest @@ -45,7 +44,9 @@ PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -BASIC_AUTH = "DB SASL LDAP NIS" +BASIC_AUTH = "DB SASL LDAP" +BASIC_AUTH_append_libc-glibc = " NIS" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:17 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:17 +0000 Subject: [oe-commits] [meta-openembedded] 11/55: lvm2: Fix patch errors found with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.EFE222376E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit ddec166d29548601a9a386f3ced437d54be6d759 Author: Khem Raj AuthorDate: Wed Mar 22 14:13:42 2017 -0700 lvm2: Fix patch errors found with musl The patches had syntax errors which are only visible when using musl libs Signed-off-by: Khem Raj --- .../lvm2/0001-implement-libc-specific-reopen_stream.patch | 14 +++++++------- .../lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch index f09fd76..b6a7f1a 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch @@ -1,7 +1,7 @@ -From ede7976da9431573b0104dbcfe91a32c02dbea13 Mon Sep 17 00:00:00 2001 +From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:49:40 +0000 -Subject: [PATCH 1/4] implement libc specific reopen_stream +Subject: [PATCH] implement libc specific reopen_stream musl defines stdin/stdio/stderr as constant types which means we can not assign to them as we are doing here but works ok with glibc @@ -13,15 +13,15 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + +%% original patch: 0001-implement-libc-specific-reopen_stream.patch --- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c -index c933154..638839d 100644 +index c933154..3581084 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ @@ -38,7 +38,7 @@ index c933154..638839d 100644 } +#else +{ -+ return (freopen(NULL, mode, *stream) != NULL) ++ return (freopen(NULL, mode, *stream) != NULL); +} +#endif @@ -76,5 +76,5 @@ index 9a4deb7..f1f18e6 100644 strerror(errno)); return 0; -- -2.9.3 +2.12.0 diff --git a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index 5baafab..ef38509 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -1,20 +1,20 @@ -From 8706a6d33753d8b2cf5bb2a12bd6880b371ce337 Mon Sep 17 00:00:00 2001 +From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH 2/4] Guard use of mallinfo() with __GLIBC__ +Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ This API is glibc-only Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + +%% original patch: 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch --- lib/mm/memlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index da90144..c1bf8fb 100644 +index da90144..f34f890 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) @@ -22,10 +22,10 @@ index da90144..c1bf8fb 100644 static void _allocate_memory(void) { -#ifndef VALGRIND_POOL -+#ifndef VALGRIND_POOL && defined(__GLIBC__) ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) void *stack_mem; struct rlimit limit; int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; -- -2.9.3 +2.12.0 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:11 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:11 +0000 Subject: [oe-commits] [meta-openembedded] 05/55: ntp: update to 4.2.8.p10 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.C13E12376DE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9146958945125948ffb81d48b8741a4ccd8c6b32 Author: Armin Kuster AuthorDate: Fri Mar 24 09:22:55 2017 -0700 ntp: update to 4.2.8.p10 LICENSE_FILE md5 changed do to copyright date change. NTF's NTP Project is releasing ntp-4.2.8p10, which addresses: 6 MEDIUM severity vulnerabilities (1 is about the Windows PPSAPI DLL) 5 LOW severity vulnerabilities (2 are in the Windows Installer) 4 Informational-level vulnerabilities 15 other non-security fixes and improvements All of the security issues in this release are listed in VU#633849. ntp-4.2.8p10 was released on 21 March 2017. Sec 3389 / CVE-2017-6464 / VU#325339: NTP-01-016 NTP: Denial of Service via Malformed Config (Pentest report 01.2017) Sec 3388 / CVE-2017-6462 / VU#325339: NTP-01-014 NTP: Buffer Overflow in DPTS Clock (Pentest report 01.2017) Sec 3387 / CVE-2017-6463 / VU#325339: NTP-01-012 NTP: Authenticated DoS via Malicious Config Option (Pentest report 01.2017) Sec 3386: NTP-01-011 NTP: ntpq_stripquotes() returns incorrect Value (Pentest report 01.2017) Sec 3385: NTP-01-010 NTP: ereallocarray()/eallocarray() underused (Pentest report 01.2017) Sec 3384 / CVE-2017-6455 / VU#325339: NTP-01-009 NTP: Windows: Privileged execution of User Library code (Pentest report 01.2017) Sec 3383 / CVE-2017-6452 / VU#325339: NTP-01-008 NTP: Windows Installer: Stack Buffer Overflow from Command Line (Pentest report 01.2017) Sec 3382 / CVE-2017-6459 / VU#325339: NTP-01-007 NTP: Windows Installer: Data Structure terminated insufficiently (Pentest report 01.2017) Sec 3381: NTP-01-006 NTP: Copious amounts of Unused Code (Pentest report 01.2017) Sec 3380: NTP-01-005 NTP: Off-by-one in Oncore GPS Receiver (Pentest report 01.2017) Sec 3379 / CVE-2017-6458 / VU#325339: NTP-01-004 NTP: Potential Overflows in ctl_put() functions (Pentest report 01.2017) Sec 3378 / CVE-2017-6451 / VU#325339: NTP-01-003 Improper use of snprintf() in mx4200_send() (Pentest report 01.2017) Sec 3377 / CVE-2017-6460 / VU#325339: NTP-01-002 Buffer Overflow in ntpq when fetching reslist (Pentest report 01.2017) Sec 3376: NTP-01-001 Makefile does not enforce Security Flags (Pentest report 01.2017) Sec 3361 / CVE-2016-9042 / VU#325339: 0rigin Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa --- .../recipes-support/ntp/{ntp_4.2.8p9.bb => ntp_4.2.8p10.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb similarity index 96% rename from meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb rename to meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb index 58b31c5..719c60b 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003" DEPENDS = "libevent" @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "857452b05f5f2e033786f77ade1974ed" -SRC_URI[sha256sum] = "b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72" +SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" +SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" inherit autotools update-rc.d useradd systemd pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:14 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:14 +0000 Subject: [oe-commits] [meta-openembedded] 08/55: netcat-openbsd: Fix build and whitelist In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.D917D2376E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b0b2e4fecbb11d631d1a273dc40c43b537ff7961 Author: Khem Raj AuthorDate: Tue Mar 21 10:03:08 2017 -0700 netcat-openbsd: Fix build and whitelist pkgconfig is used so we need to inherit pkgconfig secondly, base64 support is added for it to work with musl Signed-off-by: Khem Raj --- ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 20 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- 3 files changed, 395 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file mode 100644 index 0000000..0966b65 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 11:30:49 -0700 +Subject: [PATCH] bundle own base64 encode/decode functions + +Not all libc implementations provide it. +as an aside libresolv is no longer needed + +Signed-off-by: Khem Raj +--- + Makefile | 4 +- + base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + netcat.c | 2 + + socks.c | 3 + + 4 files changed, 320 insertions(+), 2 deletions(-) + create mode 100644 base64.c + +Index: netcat-openbsd-1.105/Makefile +=================================================================== +--- netcat-openbsd-1.105.orig/Makefile ++++ netcat-openbsd-1.105/Makefile +@@ -1,9 +1,9 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c base64.c + +-LIBS= `pkg-config --libs libbsd` -lresolv ++LIBS= `pkg-config --libs libbsd` + OBJS= $(SRCS:.c=.o) + CFLAGS= -g -O2 + LDFLAGS= -Wl,--no-add-needed +Index: netcat-openbsd-1.105/base64.c +=================================================================== +--- /dev/null ++++ netcat-openbsd-1.105/base64.c +@@ -0,0 +1,313 @@ ++/* ++ * Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#if !defined(LINT) && !defined(CODECENTER) ++static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; ++#endif /* not lint */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define Assert(Cond) if (!(Cond)) abort() ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ size_t i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ Assert(output[3] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++//libresolv_hidden_def (b64_ntop) ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(char const *src, u_char *target, size_t targsize) { ++ int tarindex, state, ch; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = *src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ target[tarindex+1] = ((pos - Base64) & 0x0f) ++ << 4 ; ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ target[tarindex+1] = ((pos - Base64) & 0x03) ++ << 6; ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ default: ++ abort(); ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = *src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = *src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +Index: netcat-openbsd-1.105/netcat.c +=================================================================== +--- netcat-openbsd-1.105.orig/netcat.c ++++ netcat-openbsd-1.105/netcat.c +@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, + socklen_t salen, int ctimeout); + static void quit(); + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int + main(int argc, char *argv[]) + { +Index: netcat-openbsd-1.105/socks.c +=================================================================== +--- netcat-openbsd-1.105.orig/socks.c ++++ netcat-openbsd-1.105/socks.c +@@ -53,6 +53,9 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int remote_connect(const char *, const char *, struct addrinfo); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index e0a0328..76a32a5 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -2,12 +2,15 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch" + ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${PN}-${PV} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" @@ -16,8 +19,6 @@ SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a inherit pkgconfig -S = "${WORKDIR}/${BPN}-${PV}" - EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" do_configure[noexec] = "1" @@ -25,9 +26,18 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} quilt pop -a || true - QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat } +do_unpack[cleandirs] += "${S}" + python do_patch() { bb.build.exec_func('netcat_do_patch', d) bb.build.exec_func('patch_do_patch', d) diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 91a24a1..1544164 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -9,7 +9,7 @@ connection you would need and has several interesting built-in \ capabilities." SECTION = "net" -inherit update-alternatives gettext +inherit update-alternatives gettext pkgconfig ALTERNATIVE_${PN} = "nc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:19 +0000 Subject: [oe-commits] [meta-openembedded] 13/55: xfce4-closebutton-plugin: Fix build with clang In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.08D072376E6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 593ae29f3b99bae6a84a200b47d983de4c6877b0 Author: Khem Raj AuthorDate: Wed Mar 22 15:14:12 2017 -0700 xfce4-closebutton-plugin: Fix build with clang Signed-off-by: Khem Raj --- ...n_val_if_fail-in-functions-expecting-a-re.patch | 62 ++++++++++++++++++++++ .../closebutton/xfce4-closebutton-plugin_git.bb | 4 +- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch new file mode 100644 index 0000000..2e824ec --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch @@ -0,0 +1,62 @@ +From b0bda2dfc2d8d7bb244e59897b5bf0776f4fe44c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 15:07:26 -0700 +Subject: [PATCH] Use g_return_val_if_fail() in functions expecting a return + value + +Clang detects that we are not returning any value when function +expects it. + +Fixes + +| ../../git/panel-plugin/closebutton.c:170:3: error: non-void function 'closebutton_plugin_set_icon' should return a value [-Wreturn-type] +| g_return_if_fail (XFCE_IS_PANEL_IMAGE (icon)); + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + panel-plugin/closebutton-settings.c | 2 +- + panel-plugin/closebutton.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/panel-plugin/closebutton-settings.c b/panel-plugin/closebutton-settings.c +index f2fa370..d4e6b0c 100644 +--- a/panel-plugin/closebutton-settings.c ++++ b/panel-plugin/closebutton-settings.c +@@ -60,7 +60,7 @@ closebutton_builder_new (XfcePanelPlugin *panel_plugin, + GtkBuilder *builder; + GObject *dialog, *button; + +- g_return_if_fail (XFCE_IS_PANEL_PLUGIN (panel_plugin)); ++ g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (panel_plugin), 0); + + builder = gtk_builder_new (); + if (gtk_builder_add_from_string (builder, buffer, length, &error)) +diff --git a/panel-plugin/closebutton.c b/panel-plugin/closebutton.c +index fd0a7b5..2120728 100644 +--- a/panel-plugin/closebutton.c ++++ b/panel-plugin/closebutton.c +@@ -167,8 +167,8 @@ closebutton_plugin_set_icon (CloseButtonPlugin *plugin, gboolean force_reload) + XfcePanelPlugin *panel_plugin = XFCE_PANEL_PLUGIN (plugin); + XfcePanelImage *icon = XFCE_PANEL_IMAGE (plugin->icon); + +- g_return_if_fail (XFCE_IS_PANEL_IMAGE (icon)); +- g_return_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin)); ++ g_return_val_if_fail (XFCE_IS_PANEL_IMAGE (icon), 0); ++ g_return_val_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin), 0); + + window = closebutton_plugin_get_effective_window (plugin); + if (window != NULL) +@@ -404,7 +404,7 @@ closebutton_plugin_size_changed (XfcePanelPlugin *panel_plugin, + gint size) + { + CloseButtonPlugin *plugin = XFCE_CLOSEBUTTON_PLUGIN (panel_plugin); +- g_return_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin)); ++ g_return_val_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin), 0); + + #if LIBXFCE4PANEL_CHECK_VERSION(4,9,0) + size /= xfce_panel_plugin_get_nrows (panel_plugin); +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 341107f..746b122 100644 --- a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -9,7 +9,9 @@ DEPENDS += "exo-native libwnck xfconf" PV = "0.1.0+gitr${SRCPV}" -SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master \ + file://0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch \ + " SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:16 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:16 +0000 Subject: [oe-commits] [meta-openembedded] 10/55: caps: Use c99 int types In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063806.E8B052376E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2632060a6102b425074b52ed52c5294d548a4d57 Author: Khem Raj AuthorDate: Wed Mar 22 11:57:26 2017 -0700 caps: Use c99 int types Fixes build with musl Signed-off-by: Khem Raj --- ...01-basic.h-Use-c99-supported-stdint-types.patch | 46 ++++++++++++++++++++++ .../recipes-multimedia/caps/caps_0.9.24.bb | 8 ++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch new file mode 100644 index 0000000..1087b0e --- /dev/null +++ b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch @@ -0,0 +1,46 @@ +From a5cea22294a9acb6eed955bd415f562a6cc36482 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 11:54:23 -0700 +Subject: [PATCH] basic.h: Use c99 supported stdint types + +include stdint.h for getting the definitions for int types + +Signed-off-by: Khem Raj +--- + basics.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/basics.h b/basics.h +index 643d96e..1dc2fa7 100644 +--- a/basics.h ++++ b/basics.h +@@ -46,17 +46,18 @@ + + #include + #include ++#include + + #include "ladspa.h" + +-typedef __int8_t int8; +-typedef __uint8_t uint8; +-typedef __int16_t int16; +-typedef __uint16_t uint16; +-typedef __int32_t int32; +-typedef __uint32_t uint32; +-typedef __int64_t int64; +-typedef __uint64_t uint64; ++typedef int8_t int8; ++typedef uint8_t uint8; ++typedef int16_t int16; ++typedef uint16_t uint16; ++typedef int32_t int32; ++typedef uint32_t uint32; ++typedef int64_t int64; ++typedef uint64_t uint64; + + #define MIN_GAIN 1e-6 /* -120 dB */ + /* smallest non-denormal 32 bit IEEE float is 1.18e-38 */ +-- +2.12.0 + diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb index 3e409e6..90a2836 100644 --- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://quitte.de/dsp/caps.html" LICENSE = "GPL-3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ - file://Avoid-ambiguity-in-div-invocation.patch \ -" +SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ + file://Avoid-ambiguity-in-div-invocation.patch \ + file://0001-basic.h-Use-c99-supported-stdint-types.patch \ + " SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:21 +0000 Subject: [oe-commits] [meta-openembedded] 15/55: tcsh: Update to 6.20.00 release In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.1773B2376E8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 5ea2ecaaf0590976d7f2f5b43da03ac12683ec8c Author: Khem Raj AuthorDate: Wed Mar 22 19:26:44 2017 -0700 tcsh: Update to 6.20.00 release Fix segfaults on musl Signed-off-by: Khem Raj --- .../recipes-extended/tcsh/files/01_build.1.patch | 16 ------ .../recipes-extended/tcsh/files/01_build.2.patch | 13 ----- .../recipes-extended/tcsh/files/01_build.3.patch | 13 ----- .../tcsh/files/12_unknown_lscolors.patch | 24 --------- .../recipes-extended/tcsh/files/15_no-strip.patch | 14 ----- .../tcsh/files/disable-broken-test.patch | 14 ----- .../tcsh/files/disable-lexical.at-31.patch | 30 ----------- .../tcsh/files/disable-test-nice.patch | 23 --------- .../tcsh/files/disable-test-notty.patch | 30 ----------- .../tcsh/files/fix-gcc6-wait-union.patch | 11 ---- .../tcsh/files/tcsh-6.17.02-multibyte.patch | 18 ------- .../0001-Enable-system-malloc-on-all-linux.patch | 30 +++++++++++ .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 ++++++++++++++++++++++ meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | 55 -------------------- meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb | 44 ++++++++++++++++ 15 files changed, 134 insertions(+), 261 deletions(-) diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch deleted file mode 100644 index b9f41ad..0000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Franz Pletz -Description: Original comment: Fix build -Not sure why we have this patch. Let's keep it for compatibility. ---- a/pathnames.h -+++ b/pathnames.h -@@ -92,6 +92,10 @@ - # define _PATH_TCSHELL "/local/bin/tcsh" /* use ram disk */ - #endif /* _MINIX && !_PATH_TCSHELL */ - -+#ifndef _PATH_TCSHELL -+# define _PATH_TCSHELL "/bin/tcsh" /* Debian */ -+#endif /* !_PATH_TCSHELL */ -+ - #if defined(__EMX__) && !defined(_PATH_DEVNULL) - # define _PATH_DEVNULL "nul" - #endif /* __EMX__ && !_PATH_DEVNULL */ diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch deleted file mode 100644 index ff27531..0000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Franz Pletz -Description: Update manpage. ---- a/tcsh.man -+++ b/tcsh.man -@@ -578,7 +578,7 @@ Repeating \fIdabbrev-expand\fR without a - changes to the next previous word etc., skipping identical matches - much like \fIhistory-search-backward\fR does. - .TP 8 --.B delete-char \fR(not bound) -+.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR) - Deletes the character under the cursor. - See also \fIdelete-char-or-list-or-eof\fR. - .TP 8 diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch deleted file mode 100644 index d36c177..0000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Franz Pletz -Description: Enable NODOT ---- a/config_f.h -+++ b/config_f.h -@@ -98,7 +98,7 @@ - /* - * NODOT Don't put "." in the default path, for security reasons - */ --#undef NODOT -+#define NODOT - - /* - * AUTOLOGOUT tries to determine if it should set autologout depending diff --git a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch deleted file mode 100644 index faa59cc..0000000 --- a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Franz Pletz -Description: Don't die on unknown LS_COLORS values -Removing the patch causes a segfault when dircolors is set by coreutils' dircolors. -Debian-Bug: #592089 - ---- a/tw.color.c -+++ b/tw.color.c -@@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value) - if ((Char)variables[i].variable[0] == (v[0] & CHAR) && - (Char)variables[i].variable[1] == (v[1] & CHAR)) - break; -- if (i < nvariables) { -- v += 3; -+ v += 3; -+ if (i < nvariables) - getstring(&c, &v, &variables[i].color, ':'); -- continue; -- } -- else -- stderror(ERR_BADCOLORVAR, v[0], v[1]); -+ continue; - } - break; - } diff --git a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch deleted file mode 100644 index cbc9f65..0000000 --- a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lucas Nussbaum -Description: do not strip binary - Stripping should be handled by dh_strip instead, so DEB_BUILD_OPTIONS=nostrip works. - Closes: #438109, #411607 ---- a/Makefile.in -+++ b/Makefile.in -@@ -596,7 +596,6 @@ install: tcsh$(EXEEXT) - -mkdir -p ${DESTBIN} - -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old - cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) -- -strip ${DESTBIN}/tcsh$(EXEEXT) - chmod 755 ${DESTBIN}/tcsh$(EXEEXT) - - install.man: tcsh.man diff --git a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch deleted file mode 100644 index 0bda0ba..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lucas Nussbaum -Description: disable syntactically incorrect test ---- a/tests/lexical.at -+++ b/tests/lexical.at -@@ -172,9 +172,6 @@ - AT_DATA([nohist.csh], - [echo ! space ! tab != "!(" newline ! - ]) --AT_CHECK([tcsh -f nohist.csh], , --[[! space ! tab != !( newline ! --]]) - - AT_CLEANUP - diff --git a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch deleted file mode 100644 index 98a9b2e..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/tests/lexical.at -+++ b/tests/lexical.at -@@ -27,27 +27,6 @@ AT_CHECK([tcsh -f oneword.csh], , - - AT_CLEANUP - -- --AT_SETUP([Comments]) -- --AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK --]) -- --AT_CHECK([tcsh -f -c 'echo @%:@no comment'], , --[@%:@no comment --]) -- --AT_DATA([comment2.csh], --[[echo testing...@%:@\ --OK --]]) --AT_CHECK([tcsh -f comment2.csh], , --[testing... OK --]) -- --AT_CLEANUP -- -- - AT_SETUP([Escaping special characters]) - - AT_DATA([nosplit.csh], diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch deleted file mode 100644 index 79f918c..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Lucas Nussbaum -Description: disable test that fails on the buildd with - "setpriority: Permission denied". ---- a/tests/commands.at -+++ b/tests/commands.at -@@ -888,17 +888,6 @@ TCSH_UNTESTED([migrate]) - TCSH_UNTESTED([newgrp]) - - --AT_SETUP([nice]) -- --# Nothing really tested --AT_CHECK([tcsh -f -c 'nice set var=1; echo $?var'], , --[0 --]) -- -- --AT_CLEANUP -- -- - AT_SETUP([nohup]) - - AT_DATA([nohup.csh], diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch deleted file mode 100644 index 69f0564..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Lucas Nussbaum -Description: Those tests fail when running the testsuite without a tty. Disabling them. - ---- a/tests/commands.at -+++ b/tests/commands.at -@@ -1203,11 +1203,6 @@ AT_SETUP([source]) - AT_DATA([script.csh], - [[set var=$1 - ]]) --AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ -- | sed 's/ [^ ]* / TIME /']], , --[ 1 TIME source -h script.csh foo ; history -- 2 TIME set var=$1 --]) - - AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [], - [var: Undefined variable. ---- a/tests/variables.at -+++ b/tests/variables.at -@@ -319,10 +319,6 @@ AT_CLEANUP - - AT_SETUP([$ edit]) - --AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , --[1 --]) -- - AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], , - [0 - ]) diff --git a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch b/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch deleted file mode 100644 index acc2ce9..0000000 --- a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tcsh-6.18.01/sh.proc.c.orig 2016-06-08 16:11:02.902326725 +0000 -+++ tcsh-6.18.01/sh.proc.c 2016-06-08 16:38:22.150304901 +0000 -@@ -48,7 +48,7 @@ - #endif /* aiws */ - - #if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) --# if !defined(__ANDROID__) -+# if !defined(__ANDROID__) && !defined(__GLIBC__) - # define BSDWAIT - # endif - #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch deleted file mode 100644 index 3dd420a..0000000 --- a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Jean-Luc Leger -Description: fix broken globbing expansion -Debian-Bug: #603545 -Index: tcsh-6.18.01/tc.str.c -=================================================================== ---- tcsh-6.18.01.orig/tc.str.c 2012-01-10 13:34:31.000000000 -0800 -+++ tcsh-6.18.01/tc.str.c 2013-02-26 13:12:13.429153489 -0800 -@@ -122,8 +122,9 @@ - #else - ret = mbtowc(&tmp, s, n); - #endif -- if (ret > 0) { -+ if (ret >= 0) - *pwc = tmp; -+ if (ret >= 0) { - #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC) - if (tmp >= 0xd800 && tmp <= 0xdbff) { - /* UTF-16 surrogate pair. Fetch second half and compute diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch new file mode 100644 index 0000000..ff2f6a3 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch @@ -0,0 +1,30 @@ +From 0553455813a1f717ef50cc911e4db73da3d23c32 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 18:47:40 -0700 +Subject: [PATCH 1/2] Enable system malloc on all linux + +Dont trigger on being just android or glibc +internal malloc falls flat on musl based systems +as well. So switch to using system malloc + +Signed-off-by: Khem Raj +--- + config_f.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config_f.h b/config_f.h +index 6a632a5..0a66960 100644 +--- a/config_f.h ++++ b/config_f.h +@@ -139,7 +139,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__linux__) || defined(__OpenBSD__) || defined(__APPLE__) + # define SYSMALLOC + #else + # undef SYSMALLOC +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch new file mode 100644 index 0000000..e4de6f7 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch @@ -0,0 +1,60 @@ +From 60271713025f6b17dda29721be012a8428e77185 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 18:56:49 -0700 +Subject: [PATCH 2/2] Add debian csh scripts + +Signed-off-by: Khem Raj +--- + csh.cshrc | 15 +++++++++++++++ + csh.login | 8 ++++++++ + csh.logout | 1 + + 3 files changed, 24 insertions(+) + create mode 100644 csh.cshrc + create mode 100644 csh.login + create mode 100644 csh.logout + +diff --git a/csh.cshrc b/csh.cshrc +new file mode 100644 +index 0000000..29c934a +--- /dev/null ++++ b/csh.cshrc +@@ -0,0 +1,15 @@ ++# /etc/csh.cshrc: system-wide .cshrc file for csh(1) and tcsh(1) ++ ++if ($?tcsh && $?prompt) then ++ ++ bindkey "\e[1~" beginning-of-line # Home ++ bindkey "\e[7~" beginning-of-line # Home rxvt ++ bindkey "\e[2~" overwrite-mode # Ins ++ bindkey "\e[3~" delete-char # Delete ++ bindkey "\e[4~" end-of-line # End ++ bindkey "\e[8~" end-of-line # End rxvt ++ ++ set autoexpand ++ set autolist ++ set prompt = "%U%m%u:%B%~%b%# " ++endif +diff --git a/csh.login b/csh.login +new file mode 100644 +index 0000000..2455c3c +--- /dev/null ++++ b/csh.login +@@ -0,0 +1,8 @@ ++# /etc/csh.login: system-wide .login file for csh(1) and tcsh(1) ++ ++# allow for other packages/system admins to customize the shell environment ++if (-e /etc/csh/login.d && `/bin/ls /etc/csh/login.d` != "") then ++ foreach FILE (`/bin/ls /etc/csh/login.d/*`) ++ source $FILE; ++ end; ++endif +diff --git a/csh.logout b/csh.logout +new file mode 100644 +index 0000000..a207eba +--- /dev/null ++++ b/csh.logout +@@ -0,0 +1 @@ ++# /etc/csh.logout: system-wide .logout file for csh(1) and tcsh(1) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb deleted file mode 100644 index 1cfd96c..0000000 --- a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ - The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ - It includes all features of 4.4BSD C shell, plus a command-line editor, \ - programmable word completion, spelling correction and more." - -HOMEPAGE = "http://www.tcsh.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780" -SECTION = "base" -DEPENDS = "ncurses gettext-native" -SRC_URI = " \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs2 \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-5.diff.gz;name=diffs5 \ - file://01_build.1.patch \ - file://01_build.2.patch \ - file://01_build.3.patch \ - file://15_no-strip.patch \ - file://disable-test-notty.patch \ - file://disable-test-nice.patch \ - file://disable-lexical.at-31.patch \ - file://12_unknown_lscolors.patch \ - file://tcsh-6.17.02-multibyte.patch \ - file://disable-broken-test.patch \ - file://fix-gcc6-wait-union.patch \ -" -SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a" -SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8" -SRC_URI[diffs2.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9" -SRC_URI[diffs2.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c" -SRC_URI[diffs5.md5sum] = "d536c12a02dc48c332cc472b86927319" -SRC_URI[diffs5.sha256sum] = "7548d64bf996548bfbc13f3e0959fd2e8455f8375381a31da67d79554aabc7af" - -inherit autotools - -do_install_append () { - oe_runmake install.man DESTDIR=${D} - - install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - - install -d ${D}${sysconfdir}/csh/login.d - install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} - install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el -} - -FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" - - -pkg_postinst_${PN} () { -#!/bin/sh -e -echo /usr/bin/tcsh >> $D/etc/shells -} - -PNBLACKLIST[tcsh] ?= "Doesn't respect CC variable and fails with HOSTTOOLS http://errors.yoctoproject.org/Errors/Details/138244/" diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb new file mode 100644 index 0000000..b59d88f --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ + The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ + It includes all features of 4.4BSD C shell, plus a command-line editor, \ + programmable word completion, spelling correction and more." + +HOMEPAGE = "http://www.tcsh.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" +SECTION = "base" +DEPENDS = "ncurses gettext-native" +SRC_URI = " \ + http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \ + file://0001-Enable-system-malloc-on-all-linux.patch \ + file://0002-Add-debian-csh-scripts.patch \ +" +SRC_URI[md5sum] = "59d40ef40a68e790d95e182069431834" +SRC_URI[sha256sum] = "b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d" + +EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" +inherit autotools + +do_compile_prepend() { + oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost +} + +do_install_append () { + oe_runmake install.man DESTDIR=${D} + + install -d ${D}${base_bindir} + ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh + ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + install -d ${D}${sysconfdir}/csh/login.d + install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} + install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el +} + +FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" + + +pkg_postinst_${PN} () { +#!/bin/sh -e +echo /usr/bin/tcsh >> $D/etc/shells +echo /usr/bin/csh >> $D/etc/shells +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:23 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:23 +0000 Subject: [oe-commits] [meta-openembedded] 17/55: ebtables: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.297672376EA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6619097a67fec8d7fd5fda8bbb58171eda9026dd Author: Khem Raj AuthorDate: Sun Mar 26 14:21:31 2017 -0700 ebtables: Fix build with musl Backport upstream fixes and add fixes to make it work with musl Signed-off-by: Khem Raj --- .../0001-add-RARP-and-update-iana-url.patch | 45 +++++ .../0002-fix-compilation-warning.patch | 25 +++ .../0003-add-info-about-Wl-no-as-needed.patch | 25 +++ ...for-kernel-regression-bug-IPv6-source-des.patch | 28 +++ ...-command-line-support-for-ebtables-restor.patch | 75 +++++++ ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 +++++++ .../0007-extensions-Use-stdint-types.patch | 67 +++++++ ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 +++++ ...low-RETURN-target-rules-in-user-defined-c.patch | 48 +++++ .../0010-Adjust-header-include-sequence.patch | 216 +++++++++++++++++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 12 +- 11 files changed, 657 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch new file mode 100644 index 0000000..90b6979 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch @@ -0,0 +1,45 @@ +From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Tue, 3 Jul 2012 18:47:32 +0000 +Subject: [PATCH 01/10] add RARP and update iana url + +--- + ethertypes | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/ethertypes b/ethertypes +index 5e700f6..813177b 100644 +--- a/ethertypes ++++ b/ethertypes +@@ -5,6 +5,7 @@ + # + # This list could be found on: + # http://www.iana.org/assignments/ethernet-numbers ++# http://www.iana.org/assignments/ieee-802-numbers + # + # ... #Comment + # +@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT + DIAG 6005 # DEC Diagnostics + CUST 6006 # DEC Customer use + SCA 6007 # DEC Systems Comms Arch +-TEB 6558 # Trans Ether Bridging [RFC1701] +-RAW_FR 6559 # Raw Frame Relay [RFC1701] ++TEB 6558 # Trans Ether Bridging [RFC1701] ++RAW_FR 6559 # Raw Frame Relay [RFC1701] ++RARP 8035 # Reverse ARP [RFC903] + AARP 80F3 # Appletalk AARP +-ATALK 809B # Appletalk ++ATALK 809B # Appletalk + 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame + IPX 8137 # Novell IPX + NetBEUI 8191 # NetBEUI + IPv6 86DD ip6 # IP version 6 +-PPP 880B # PPP ++PPP 880B # PPP + ATMMPOA 884C # MultiProtocol over ATM + PPP_DISC 8863 # PPPoE discovery messages + PPP_SES 8864 # PPPoE session messages +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch new file mode 100644 index 0000000..87b0e9b --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch @@ -0,0 +1,25 @@ +From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 +From: Petri Gynther +Date: Sun, 24 Feb 2013 10:56:59 +0100 +Subject: [PATCH 02/10] fix compilation warning + +--- + communication.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/communication.c b/communication.c +index 62ed667..ba058c0 100644 +--- a/communication.c ++++ b/communication.c +@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) + } + close_file: + fclose(file); +- return 0; ++ return ret; + } + + /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch new file mode 100644 index 0000000..c8573a4 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch @@ -0,0 +1,25 @@ +From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Wed, 3 Jul 2013 22:12:47 +0200 +Subject: [PATCH 03/10] add info about -Wl,-no-as-needed + +--- + INSTALL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 4a05c67..e90d5c1 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -39,6 +39,8 @@ That's all + You can also use a base directory different from the root directory (/), + using the DESTDIR option. See the Makefile for more details. + ++You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly ++on your system. + + ADDITIONAL PROGRAMS: + ---------------------- +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch new file mode 100644 index 0000000..d8f2795 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch @@ -0,0 +1,28 @@ +From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 +From: Luis Fernando +Date: Wed, 3 Jul 2013 22:19:55 +0200 +Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 + source/destination addresses are potentially not matched correctly + +--- + extensions/ebt_ip6.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index 0465e77..bbdc4ae 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) + + ipinfo->invflags = 0; + ipinfo->bitmask = 0; ++ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); ++ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); ++ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); ++ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); + } + + #define OPT_SOURCE 0x01 +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch new file mode 100644 index 0000000..9585fd2 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch @@ -0,0 +1,75 @@ +From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 +From: Sanket Shah +Date: Wed, 31 Jul 2013 21:40:08 +0200 +Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore + +--- + ebtables-restore.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/ebtables-restore.c b/ebtables-restore.c +index ea02960..bb4d0cf 100644 +--- a/ebtables-restore.c ++++ b/ebtables-restore.c +@@ -22,13 +22,25 @@ + #include + #include + #include ++#include + #include "include/ebtables_u.h" + ++static const struct option options[] = { ++ {.name = "noflush", .has_arg = 0, .val = 'n'}, ++ { 0 } ++}; ++ + static struct ebt_u_replace replace[3]; + void ebt_early_init_once(); + + #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ + ++static void print_usage() ++{ ++ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); ++ exit(1); ++} ++ + static void copy_table_names() + { + strcpy(replace[0].name, "filter"); +@@ -41,11 +53,20 @@ static void copy_table_names() + int main(int argc_, char *argv_[]) + { + char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; +- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; ++ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; + char ebtables_str[] = "ebtables"; + +- if (argc_ != 1) +- ebtrest_print_error("options are not supported"); ++ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { ++ switch(c) { ++ case 'n': ++ flush = 0; ++ break; ++ default: ++ print_usage(); ++ break; ++ } ++ } ++ + ebt_silent = 0; + copy_table_names(); + ebt_early_init_once(); +@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) + ebtrest_print_error("table '%s' was not recognized", cmdline+1); + table_nr = i; + replace[table_nr].command = 11; +- ebt_get_kernel_table(&replace[table_nr], 1); ++ ebt_get_kernel_table(&replace[table_nr], flush); + replace[table_nr].command = 0; + replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ + continue; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch new file mode 100644 index 0000000..21f8e58 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch @@ -0,0 +1,69 @@ +From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Mon, 14 Apr 2014 22:04:55 +0200 +Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch + by Mariusz Mazur ) + +--- + extensions/ebt_ip6.c | 4 ++-- + include/ebtables_u.h | 1 + + useful_functions.c | 13 +++++++++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index bbdc4ae..e3e0956 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, + if (ipinfo->invflags & EBT_IP6_SOURCE) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); + } + if (ipinfo->bitmask & EBT_IP6_DEST) { + printf("--ip6-dst "); + if (ipinfo->invflags & EBT_IP6_DEST) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); + } + if (ipinfo->bitmask & EBT_IP6_TCLASS) { + printf("--ip6-tclass "); +diff --git a/include/ebtables_u.h b/include/ebtables_u.h +index ab615c1..35a5bcc 100644 +--- a/include/ebtables_u.h ++++ b/include/ebtables_u.h +@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); + void ebt_parse_ip6_address(char *address, struct in6_addr *addr, + struct in6_addr *msk); + char *ebt_ip6_to_numeric(const struct in6_addr *addrp); ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk); + + + int do_command(int argc, char *argv[], int exec_style, +diff --git a/useful_functions.c b/useful_functions.c +index d20b68e..d14cbe9 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) + static char buf[50+1]; + return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); + } ++ ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk) ++{ ++ /* /0000:0000:0000:0000:0000:000.000.000.000 ++ * /0000:0000:0000:0000:0000:0000:0000:0000 */ ++ static char buf[51+1]; ++ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && ++ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) ++ *buf = '\0'; ++ else ++ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); ++ return buf; ++} +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch new file mode 100644 index 0000000..6fbe7df --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch @@ -0,0 +1,67 @@ +From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:22:39 +0200 +Subject: [PATCH 07/10] extensions: Use stdint types + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + extensions/ebt_ip6.c | 4 ++-- + extensions/ebt_limit.c | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index e3e0956..dd48547 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -53,8 +53,8 @@ static const struct option opts[] = + + struct icmpv6_names { + const char *name; +- u_int8_t type; +- u_int8_t code_min, code_max; ++ uint8_t type; ++ uint8_t code_min, code_max; + }; + + static const struct icmpv6_names icmpv6_codes[] = { +diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c +index ee40e5c..d189a09 100644 +--- a/extensions/ebt_limit.c ++++ b/extensions/ebt_limit.c +@@ -59,11 +59,11 @@ static void print_help(void) + " default %u\n", EBT_LIMIT_BURST); + } + +-static int parse_rate(const char *rate, u_int32_t *val) ++static int parse_rate(const char *rate, uint32_t *val) + { + const char *delim; +- u_int32_t r; +- u_int32_t mult = 1; /* Seconds by default. */ ++ uint32_t r; ++ uint32_t mult = 1; /* Seconds by default. */ + + delim = strchr(rate, '/'); + if (delim) { +@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, + struct rates + { + const char *name; +- u_int32_t mult; ++ uint32_t mult; + }; + + static struct rates g_rates[] = +@@ -162,7 +162,7 @@ static struct rates g_rates[] = + { "sec", EBT_LIMIT_SCALE } + }; + +-static void print_rate(u_int32_t period) ++static void print_rate(uint32_t period) + { + unsigned int i; + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch new file mode 100644 index 0000000..df3f521 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch @@ -0,0 +1,48 @@ +From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:31:58 +0200 +Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro + _THROW + +Fixes compilation with musl libc + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/ethernetdb.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/ethernetdb.h b/include/ethernetdb.h +index 46d8bfd..1683abe 100644 +--- a/include/ethernetdb.h ++++ b/include/ethernetdb.h +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch new file mode 100644 index 0000000..248582c --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch @@ -0,0 +1,48 @@ +From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alin=20N=C4=83stac?= +Date: Thu, 22 Oct 2015 16:41:03 +0200 +Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined + chains + +During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if +they're called from a base chain rather than a user defined chain. + +This can be used by ebtables targets that can encode a special return +value to bail out if e.g. RETURN is used from a base chain. + +Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also +copied to called user-defined-chains (i.e., a user defined chain can no +longer be distinguished from a base chain): + +root at OpenWrt:~# ebtables -N foo +root at OpenWrt:~# ebtables -A OUTPUT -j foo +root at OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN +--mark-target RETURN not allowed on base chain. + +This works if -A OUTPUT -j foo is omitted, but will still appear +if we try to call foo from OUTPUT afterwards. + +After this patch we still reject +'-A OUTPUT -j mark .. --mark-target RETURN'. + +Signed-off-by: Florian Westphal +--- + libebtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libebtc.c b/libebtc.c +index 17ba8f2..74830ec 100644 +--- a/libebtc.c ++++ b/libebtc.c +@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) + /* check if we've dealt with this chain already */ + if (entries2->hook_mask & (1<hook_mask |= entries->hook_mask; ++ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); + /* Jump to the chain, make sure we know how to get back */ + stack[sp].chain_nr = chain_nr; + stack[sp].n = j; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch new file mode 100644 index 0000000..a6ef9cd --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,216 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj +--- + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + include/linux/if_ether.h | 126 ---------------------------------------------- + useful_functions.c | 4 +- + 5 files changed, 5 insertions(+), 131 deletions(-) + delete mode 100644 include/linux/if_ether.h + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index f97d07e..b096847 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index c3757f3..c5102a4 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index e6afbf8..8d318d1 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h +deleted file mode 100644 +index 28a15ff..0000000 +--- a/include/linux/if_ether.h ++++ /dev/null +@@ -1,126 +0,0 @@ +-/* +- * INET An implementation of the TCP/IP protocol suite for the LINUX +- * operating system. INET is implemented using the BSD Socket +- * interface as the means of communication with the user level. +- * +- * Global definitions for the Ethernet IEEE 802.3 interface. +- * +- * Version: @(#)if_ether.h 1.0.1a 02/08/94 +- * +- * Author: Fred N. van Kempen, +- * Donald Becker, +- * Alan Cox, +- * Steve Whitehouse, +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. +- */ +- +-#ifndef _LINUX_IF_ETHER_H +-#define _LINUX_IF_ETHER_H +- +-#include +- +-/* +- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +- * and FCS/CRC (frame check sequence). +- */ +- +-#define ETH_ALEN 6 /* Octets in one ethernet addr */ +-#define ETH_HLEN 14 /* Total octets in header. */ +-#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ +-#define ETH_DATA_LEN 1500 /* Max. octets in payload */ +-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +-#define ETH_FCS_LEN 4 /* Octets in the FCS */ +- +-/* +- * These are the defined Ethernet Protocol ID's. +- */ +- +-#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ +-#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ +-#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ +-#define ETH_P_IP 0x0800 /* Internet Protocol packet */ +-#define ETH_P_X25 0x0805 /* CCITT X.25 */ +-#define ETH_P_ARP 0x0806 /* Address Resolution packet */ +-#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ +-#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ +-#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ +-#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ +-#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ +-#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ +-#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ +-#define ETH_P_LAT 0x6004 /* DEC LAT */ +-#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ +-#define ETH_P_CUST 0x6006 /* DEC Customer use */ +-#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ +-#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ +-#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ +-#define ETH_P_ATALK 0x809B /* Appletalk DDP */ +-#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ +-#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ +-#define ETH_P_IPX 0x8137 /* IPX over DIX */ +-#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ +-#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ +-#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ +-#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol +- * defined in draft-wilson-wrec-wccp-v2-00.txt */ +-#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ +-#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ +-#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ +-#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ +-#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ +-#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ +-#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport +- * over Ethernet +- */ +-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ +-#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +-#define ETH_P_TIPC 0x88CA /* TIPC */ +-#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ +-#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +-#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ +-#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ +- +-/* +- * Non DIX types. Won't clash for 1500 types. +- */ +- +-#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ +-#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ +-#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ +-#define ETH_P_802_2 0x0004 /* 802.2 frames */ +-#define ETH_P_SNAP 0x0005 /* Internal only */ +-#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ +-#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ +-#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ +-#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ +-#define ETH_P_CAN 0x000C /* Controller Area Network */ +-#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ +-#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ +-#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz at cafe.net) */ +-#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ +-#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ +-#define ETH_P_ECONET 0x0018 /* Acorn Econet */ +-#define ETH_P_HDLC 0x0019 /* HDLC frames */ +-#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ +-#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ +-#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ +-#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +-#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ +-#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ +- +-/* +- * This is an Ethernet frame header. +- */ +- +-struct ethhdr { +- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ +- unsigned char h_source[ETH_ALEN]; /* source ether addr */ +- __be16 h_proto; /* packet type ID field */ +-} __attribute__((packed)); +- +- +-#endif /* _LINUX_IF_ETHER_H */ +diff --git a/useful_functions.c b/useful_functions.c +index d14cbe9..c304f4d 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include + #include + #include +@@ -33,6 +31,8 @@ + #include + #include + #include ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; + const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index f5e2871..375423d 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -18,7 +18,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://ebtables.common \ file://ebtables.service \ file://no-as-needed.patch \ -" + file://0001-add-RARP-and-update-iana-url.patch \ + file://0002-fix-compilation-warning.patch \ + file://0003-add-info-about-Wl-no-as-needed.patch \ + file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ + file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ + file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ + file://0007-extensions-Use-stdint-types.patch \ + file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ + file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ + file://0010-Adjust-header-include-sequence.patch \ + " SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:25 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:25 +0000 Subject: [oe-commits] [meta-openembedded] 19/55: mariadb: Do not use ucontext_* APIs with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.393172376EC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d0c2329ef3f97a0f6ab49355202e1c4e7fb5969d Author: Khem Raj AuthorDate: Mon Mar 27 09:46:34 2017 -0700 mariadb: Do not use ucontext_* APIs with musl musl has ucontext.h header but does not implement the APIs Signed-off-by: Khem Raj --- meta-oe/recipes-support/mysql/mariadb.inc | 1 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 0a0caa3..4019072 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ + file://0001-disable-ucontext-on-musl.patch \ " SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch new file mode 100644 index 0000000..60e9199 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch @@ -0,0 +1,28 @@ +From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 dd44103..9b28c17 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 +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:27 +0000 Subject: [oe-commits] [meta-openembedded] 21/55: usb-modeswitch-data: Add dep on native tcl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.484CA2376EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 79ad47be8d8e1a9559f3296d45e8ac312e4606c1 Author: Khem Raj AuthorDate: Mon Mar 27 18:06:21 2017 -0700 usb-modeswitch-data: Add dep on native tcl it has a tclsh need for executing a script during build Fixes | ./gen-rules.tcl | /usr/bin/env: ?tclsh?: No such file or directory | make: *** [Makefile:26: 40-usb_modeswitch.rules] Error 127 | WARNING: /mnt/b/build/tmp-musl/work/all-oe-linux/usb-modeswitch-data/20170205-r0/temp/run.do_compile.30695:1 exit 1 from 'exit 1' Signed-off-by: Khem Raj --- meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb index 042cd38..eeed5e2 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit allarch +DEPENDS += "tcl-native" + SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" SRC_URI[md5sum] = "0cc107cd0c4c83df0d9400c999e21dfd" SRC_URI[sha256sum] = "e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:29 +0000 Subject: [oe-commits] [meta-openembedded] 23/55: ttf-inconsolata: Move copying of .otf to .ttf into do_compile In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.5DE132376DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 486773852d37c4b8ab4a2e483233da719118db8d Author: Khem Raj AuthorDate: Mon Mar 27 18:59:49 2017 -0700 ttf-inconsolata: Move copying of .otf to .ttf into do_compile Fixes errors like | mv: cannot stat '/mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf': No such file or directory | WARNING: /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/temp/run.do_configure.2485:1 exit 1 from 'mv /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/ttf-inconsolata-20100526/Inconsolata.ttf' Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 20041bb..0d6df24 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -13,13 +13,14 @@ S = "${WORKDIR}/ttf-inconsolata-${PV}" FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" -do_configure() { +deltask do_configure + +do_compile_prepend() { mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf } do_install_append() { - install -d ${D}${datadir}/doc/ttf-inconsolata/ - install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ + install -D -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/OFL.txt } SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:28 +0000 Subject: [oe-commits] [meta-openembedded] 22/55: aufs-util: Define HOSTCC In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.555962376DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit f5a6e5a9328fbaf928ab4b209170517698da34e2 Author: Khem Raj AuthorDate: Mon Mar 27 18:28:04 2017 -0700 aufs-util: Define HOSTCC Fixes errors like below | make: cc: Command not found | make: *** [: c2sh] Error 127 Signed-off-by: Khem Raj --- meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 7d5352e..50d8b90 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -18,6 +18,8 @@ PV = "3.14+git${SRCPV}" S = "${WORKDIR}/git" +export HOSTCC = "${BUILD_CC}" + do_configure_prepend() { # Replace sbin,bin paths with bitbake environment sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:30 +0000 Subject: [oe-commits] [meta-openembedded] 24/55: libraw1394: Update to 2.1.2 release In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.6788A2376D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d96ca299d9472998e1c40e8777af134ec9c19958 Author: Khem Raj AuthorDate: Mon Mar 27 20:02:21 2017 -0700 libraw1394: Update to 2.1.2 release Signed-off-by: Khem Raj --- .../libraw1394/{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb similarity index 71% rename from meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb rename to meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb index 811829e..3377807 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "d06cccb776b240b6ab5efdee33b87af2" -SRC_URI[sha256sum] = "a83cff16fb8885831bc29d7d17f3c570dc39251d89e20795c08e87720de0ba70" +SRC_URI[md5sum] = "45031ab15ca93e50c19886a38bc1814a" +SRC_URI[sha256sum] = "ddc4e32721cdfe680d964aaede68ac606a20cd17dd2ba70e2d7e0692086ab57c" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:24 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:24 +0000 Subject: [oe-commits] [meta-openembedded] 18/55: poco: Upgrade to 1.7.8 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.313D82376EB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 97d43703b361f125b6845b8f82b30e724ca21b2d Author: Khem Raj AuthorDate: Sun Mar 26 15:45:27 2017 -0700 poco: Upgrade to 1.7.8 Fixes build with musl Signed-off-by: Khem Raj --- meta-oe/recipes-support/poco/{poco_1.7.7.bb => poco_1.7.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/poco/poco_1.7.7.bb b/meta-oe/recipes-support/poco/poco_1.7.8.bb similarity index 97% rename from meta-oe/recipes-support/poco/poco_1.7.7.bb rename to meta-oe/recipes-support/poco/poco_1.7.8.bb index e2d3be8..0fd6a8b 100644 --- a/meta-oe/recipes-support/poco/poco_1.7.7.bb +++ b/meta-oe/recipes-support/poco/poco_1.7.8.bb @@ -12,9 +12,9 @@ inherit cmake ptest BBCLASSEXTEND = "native" -SRCREV = "e98adba2c298b4179e77237873d3fbc53876c528" +SRCREV = "aae9c2e0f64caf019d31ba8f97635d5656b25ba5" SRC_URI = " \ - git://github.com/pocoproject/poco.git \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ file://run-ptest \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:26 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:26 +0000 Subject: [oe-commits] [meta-openembedded] 20/55: lowpan-tools: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.401D72376ED@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9a5ab2b9ee2a2220e232d0f3de6fbc92e61d795a Author: Khem Raj AuthorDate: Mon Mar 27 17:59:24 2017 -0700 lowpan-tools: Fix build with musl Signed-off-by: Khem Raj --- ...d-config-parse.y-add-missing-time.h-inclu.patch | 44 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch new file mode 100644 index 0000000..0a81a22 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -0,0 +1,44 @@ +From ab725a3faaeead90ae3c63cbcd370af087c413a5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Mar 2017 17:55:06 -0700 +Subject: [PATCH] addrdb/coord-config-parse.y: add missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The %union definition uses the time_t structure. In order to use this +structure, the header has to be included. Otherwise, the build +breaks with some C libraries, such as musl: + +In file included from coord-config-lex.l:23:0: +coord-config-parse.y:107:2: error: unknown type name ?time_t? + time_t timestamp; + ^ + +This patch includes using the '%code requires' directive of +Yacc. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Khem Raj +--- + addrdb/coord-config-parse.y | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y +index 2e10a88..85ee058 100644 +--- a/addrdb/coord-config-parse.y ++++ b/addrdb/coord-config-parse.y +@@ -102,6 +102,10 @@ + + %} + ++%code requires { ++#include ++} ++ + %union { + unsigned long number; + time_t timestamp; +-- +2.12.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 8c7dbc0..139eb78 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -11,6 +11,7 @@ PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ + file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:34 +0000 Subject: [oe-commits] [meta-openembedded] 28/55: rp-pppoe: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.8A2C52376F0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d16a05c81c84394f6018f53b9d93958f3cf16777 Author: Khem Raj AuthorDate: Tue Mar 28 19:30:16 2017 -0700 rp-pppoe: Fix build with musl Signed-off-by: Khem Raj --- .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 30 ++++++++++++++++++++++ ...0002-Enable-support-for-the-kernel-module.patch | 25 ++++++++++++++++++ .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 5 +++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch new file mode 100644 index 0000000..11356ce --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -0,0 +1,30 @@ +From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:20:07 -0700 +Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h + +Fixes build with musl + +Signed-off-by: Khem Raj +--- + src/pppoe.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/pppoe.h b/src/pppoe.h +index ec067a0..281879c 100644 +--- a/src/pppoe.h ++++ b/src/pppoe.h +@@ -127,10 +127,6 @@ typedef unsigned long UINT32_t; + #error Could not find a 32-bit integer type + #endif + +-#ifdef HAVE_LINUX_IF_ETHER_H +-#include +-#endif +- + #include + + #ifdef HAVE_NETINET_IF_ETHER_H +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch new file mode 100644 index 0000000..139d1f0 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch @@ -0,0 +1,25 @@ +From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:24:53 -0700 +Subject: [PATCH 2/2] Enable support for the kernel module + +Signed-off-by: Khem Raj +--- + src/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/configure.in b/src/configure.in +index cae0976..951a042 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -33,6 +33,7 @@ AC_CHECK_HEADERS(linux/if_pppox.h, [], [], + #include + #include + #include ++#include + ]) + + dnl Checks for typedefs, structures, and compiler characteristics. +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb index e1ca17f..fbe015f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -17,7 +17,10 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ file://pppoe-server.default \ file://pppoe-server.init \ file://configure.in-Error-fix.patch \ - file://pppoe-server.service" + file://pppoe-server.service \ + file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ + file://0002-Enable-support-for-the-kernel-module.patch \ + " SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:36 +0000 Subject: [oe-commits] [meta-openembedded] 30/55: vsftpd: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.9B1D42376F2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9256a180f05a91f3133218bfdc9075cfe2ca0511 Author: Khem Raj AuthorDate: Tue Mar 28 20:11:06 2017 -0700 vsftpd: Fix build with musl Signed-off-by: Khem Raj --- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 28 ++++++++++++++++++++++ .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 7 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch new file mode 100644 index 0000000..c3919e1 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -0,0 +1,28 @@ +From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 20:09:12 -0700 +Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx + +Signed-off-by: Khem Raj +--- + sysdeputil.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sysdeputil.c b/sysdeputil.c +index 06f01f4..a8cff3b 100644 +--- a/sysdeputil.c ++++ b/sysdeputil.c +@@ -58,7 +58,9 @@ + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL + #define VSF_SYSDEP_HAVE_LIBCAP +-#define VSF_SYSDEP_HAVE_UTMPX ++#if defined(__GLIBC__) ++ #define VSF_SYSDEP_HAVE_UTMPX ++#endif + + #define __USE_GNU + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 3eaaa30..e524614 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -19,7 +19,10 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ -" + ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ + file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + " LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ @@ -30,13 +33,11 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:22 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:22 +0000 Subject: [oe-commits] [meta-openembedded] 16/55: libnfnetlink: Backport patches to fix musl build In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.210E42376E9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit fc4637348135391a11c6c8cd54f396eb9cb84aeb Author: Khem Raj AuthorDate: Sun Mar 26 11:49:42 2017 -0700 libnfnetlink: Backport patches to fix musl build There are few upstream patches that are required for getting it working with musl, backport these patches on top of 1.0.1 Signed-off-by: Khem Raj --- ...0001-build-resolve-automake-1.12-warnings.patch | 28 ++ ...rce-code-license-header-in-sync-with-curr.patch | 49 +++ .../0003-configure-uclinux-is-also-linux.patch | 27 ++ ...k-initialize-attribute-padding-to-resolve.patch | 39 ++ .../0005-include-Sync-with-kernel-headers.patch | 110 ++++++ .../0006-src-Use-stdint-types-everywhere.patch | 403 +++++++++++++++++++++ .../libnfnetlink/libnfnetlink_1.0.1.bb | 9 +- 7 files changed, 664 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch new file mode 100644 index 0000000..00d95cd --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch @@ -0,0 +1,28 @@ +From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 9 Oct 2012 15:59:48 +0200 +Subject: [PATCH 1/6] build: resolve automake-1.12 warnings + +am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries +using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-off-by: Jan Engelhardt +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ed549df..0926a1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([-Wall foreign subdir-objects + tar-pax no-dist-gzip dist-bzip2 1.6]) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + dnl kernel style compile messages + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch new file mode 100644 index 0000000..c2fb5e0 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch @@ -0,0 +1,49 @@ +From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Wed, 7 Aug 2013 20:53:57 +0200 +Subject: [PATCH 2/6] src: get source code license header in sync with current + licensing terms + +Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, +propagate that changes to src/iftable.c and src/rtnl.c + +Reported-by: Thomas Woerner +Signed-off-by: Pablo Neira Ayuso +--- + src/iftable.c | 2 +- + src/rtnl.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iftable.c b/src/iftable.c +index 0325335..5976ed8 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -3,7 +3,7 @@ + * (C) 2004 by Astaro AG, written by Harald Welte + * (C) 2008 by Pablo Neira Ayuso + * +- * This software is Free Software and licensed under GNU GPLv2. ++ * This software is Free Software and licensed under GNU GPLv2+. + */ + + /* IFINDEX handling */ +diff --git a/src/rtnl.c b/src/rtnl.c +index 5ccb272..7b4ac7d 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -1,10 +1,10 @@ + /* rtnl - rtnetlink utility functions + * + * (C) 2004 by Astaro AG, written by Harald Welte +- * ++ * + * Adapted to nfnetlink by Eric Leblond + * +- * This software is free software and licensed under GNU GPLv2. ++ * This software is free software and licensed under GNU GPLv2+. + * + */ + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch new file mode 100644 index 0000000..6cb7ed6 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch @@ -0,0 +1,27 @@ +From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Tue, 10 Sep 2013 16:23:29 -0300 +Subject: [PATCH 3/6] configure: uclinux is also linux + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Pablo Neira Ayuso +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0926a1c..b979772 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DISABLE_STATIC + AM_PROG_LIBTOOL + + case "$host" in +-*-*-linux*) ;; ++*-*-linux* | *-*-uclinux*) ;; + *) AC_MSG_ERROR([Linux only, dude!]);; + esac + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch new file mode 100644 index 0000000..cf3a841 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch @@ -0,0 +1,39 @@ +From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Mon, 3 Feb 2014 12:09:29 +0100 +Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve + valgrind warnings + +==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) +==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) +==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) +==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) +==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) +==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) +==12195== by 0x400CB1: main (nfulnl_test.c:77) +==12195== Address 0x7fefff3e9 is on thread 1's stack + +This patch sets to zero the padding that is included to align the +attribute payload. + +Reported-by: Ivan Homoliak +Signed-off-by: Pablo Neira Ayuso +--- + src/libnfnetlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 4b2bcd0..398b7d7 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + nfa->nfa_type = type; + nfa->nfa_len = len; + memcpy(NFA_DATA(nfa), data, alen); ++ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); + n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); + return 0; + } +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch new file mode 100644 index 0000000..383f0e8 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch @@ -0,0 +1,110 @@ +From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:49:07 +0200 +Subject: [PATCH 5/6] include: Sync with kernel headers + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- + include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- + 2 files changed, 12 insertions(+), 44 deletions(-) + +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..44a38d6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -25,9 +25,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ __u8 nfgen_family; /* AF_xxx */ ++ __u8 version; /* nfnetlink version */ ++ __be16 res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -46,40 +46,8 @@ struct nfgenmsg { + #define NFNL_SUBSYS_CTNETLINK_EXP 2 + #define NFNL_SUBSYS_QUEUE 3 + #define NFNL_SUBSYS_ULOG 4 +-#define NFNL_SUBSYS_COUNT 5 ++#define NFNL_SUBSYS_OSF 5 ++#define NFNL_SUBSYS_IPSET 6 ++#define NFNL_SUBSYS_COUNT 7 + +-#ifdef __KERNEL__ +- +-#include +-#include +-#include +- +-struct nfnl_callback +-{ +- int (*call)(struct sock *nl, struct sk_buff *skb, +- struct nlmsghdr *nlh, struct nlattr *cda[]); +- const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ +-}; +- +-struct nfnetlink_subsystem +-{ +- const char *name; +- __u8 subsys_id; /* nfnetlink subsystem ID */ +- __u8 cb_count; /* number of callbacks */ +- const struct nfnl_callback *cb; /* callback for individual types */ +-}; +- +-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); +-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); +- +-extern int nfnetlink_has_listeners(unsigned int group); +-extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, +- int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); +- +-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ +- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +- +-#endif /* __KERNEL__ */ + #endif /* _NFNETLINK_H */ +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..74b9e55 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -1,6 +1,8 @@ + #ifndef _NFNETLINK_COMPAT_H + #define _NFNETLINK_COMPAT_H +-#ifndef __KERNEL__ ++ ++#include ++ + /* Old nfnetlink macros for userspace */ + + /* nfnetlink groups: Up to 32 maximum */ +@@ -18,10 +20,9 @@ + * ! nfnetlink use the same attributes methods. - J. Schulist. + */ + +-struct nfattr +-{ +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++struct nfattr { ++ __u16 nfa_len; ++ __u16 nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +@@ -57,5 +58,4 @@ struct nfattr + + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) + #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) + +-#endif /* ! __KERNEL__ */ + #endif /* _NFNETLINK_COMPAT_H */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch new file mode 100644 index 0000000..72c9987 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch @@ -0,0 +1,403 @@ +From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:59:57 +0200 +Subject: [PATCH 6/6] src: Use stdint types everywhere + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/libnfnetlink.h | 25 ++++++------- + src/iftable.c | 8 ++--- + src/iftable.h | 4 +-- + src/libnfnetlink.c | 72 ++++++++++++++++++------------------- + src/rtnl.c | 4 +-- + src/rtnl.h | 2 +- + 6 files changed, 58 insertions(+), 57 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include + #include /* for sa_family_t */ + #include + #include +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..157f97b 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -27,10 +27,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..655df6b 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,8 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..df57533 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -72,9 +72,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +86,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + } + + /** +- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr ++ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..284eecd 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -30,7 +30,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..2cb22a8 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -7,7 +7,7 @@ + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb index edd0f86..f7951ff 100644 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb @@ -11,7 +11,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar" +SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ + file://0001-build-resolve-automake-1.12-warnings.patch \ + file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ + file://0003-configure-uclinux-is-also-linux.patch \ + file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ + file://0005-include-Sync-with-kernel-headers.patch \ + file://0006-src-Use-stdint-types-everywhere.patch \ + " SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:31 +0000 Subject: [oe-commits] [meta-openembedded] 25/55: libdc1394: Update to 2.2.5+ In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.7035D2376DC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 484b7fd35288c71991e8f6977be5f40c84538c11 Author: Khem Raj AuthorDate: Mon Mar 27 20:03:02 2017 -0700 libdc1394: Update to 2.2.5+ Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb index c298b44..8318385 100755 --- a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +++ b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl" -PV = "2.2.4+gitr${SRCPV}" +PV = "2.2.5+gitr${SRCPV}" -SRCREV = "9ac63fe7a7561bea83bfd4a5db47d4d74fde43a6" +SRCREV = "5e78f51936fd09db0c0f742c7d2c0e5bdbbeed56" SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \ file://install_examples.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:43 +0000 Subject: [oe-commits] [meta-openembedded] 37/55: daq: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.E93EB2376DE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2daed6d8c1bb422dfc9a4364a705f6181d1358f4 Author: Khem Raj AuthorDate: Thu Mar 30 00:18:57 2017 -0700 daq: Fix build with musl unistd.h is not in sys/ on all platforms use standard location in /usr/include to look for it Signed-off-by: Khem Raj --- .../recipes-connectivity/daq/daq_2.0.6.bb | 4 ++- .../0001-correct-the-location-of-unistd.h.patch | 29 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 952d7a4..47cb163 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -9,7 +9,9 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ - file://disable-run-test-program-while-cross-compiling.patch " + file://disable-run-test-program-while-cross-compiling.patch \ + file://0001-correct-the-location-of-unistd.h.patch \ + " # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch new file mode 100644 index 0000000..4798a77 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -0,0 +1,29 @@ +From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 15:59:43 -0700 +Subject: [PATCH] correct the location of unistd.h + +Signed-off-by: Khem Raj +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb0..c2a4175 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include + #include + #include ++#include + + #include + #include +-#include + + #include + #include +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:32 +0000 Subject: [oe-commits] [meta-openembedded] 26/55: ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.78BAC2376DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit cc7d7bf108ba728b5ad373569fb43f329e9b7876 Author: Khem Raj AuthorDate: Tue Mar 28 10:48:31 2017 -0700 ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 Signed-off-by: Khem Raj --- ...tfs-3g-ntfsprogs_2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb similarity index 88% rename from meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb rename to meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index 6957ea9..63627de 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz" S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" - -SRC_URI[md5sum] = "2d6fb47ddf62b51733227126fe9227fe" -SRC_URI[sha256sum] = "4b383f0074a3ab7683339d1f18222b107aaeb4983db119292c43c2b275cefb27" +SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" +SRC_URI[sha256sum] = "3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5" inherit autotools pkgconfig @@ -33,6 +32,7 @@ do_install_append() { # Standard mount will execute the program /sbin/mount.TYPE # when called. Add the symbolic to let mount could find ntfs. ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs + rmdir ${D}${libdir}/ntfs-3g } # Satisfy the -dev runtime dependency -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:45 +0000 Subject: [oe-commits] [meta-openembedded] 39/55: libavc1394: Add libargp on musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.0A8702376E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit db9e8c384203b10de6591fa52da8d3c9d561ae2e Author: Khem Raj AuthorDate: Thu Mar 30 00:33:36 2017 -0700 libavc1394: Add libargp on musl Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb b/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb index 97e2bf1..f5b0d48 100644 --- a/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb +++ b/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://sourceforge.net/projects/libavc1394/" SECTION = "libs/multimedia" DEPENDS = "libraw1394" +DEPENDS_append_libc-musl = " argp-standalone" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" @@ -13,3 +14,5 @@ SRC_URI[md5sum] = "caf0db059d8b8d35d6f08e6c0e1c7dfe" SRC_URI[sha256sum] = "7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53" inherit autotools pkgconfig + +LDFLAGS_append_libc-musl = " -largp" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:44 +0000 Subject: [oe-commits] [meta-openembedded] 38/55: utouch: Fix build on musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.015502376E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2824e0bf4b7032241af3e35703ac5d8eff88c715 Author: Khem Raj AuthorDate: Thu Mar 30 00:29:33 2017 -0700 utouch: Fix build on musl Signed-off-by: Khem Raj --- ...sys-stat.h-for-fixing-build-issue-on-musl.patch | 29 ++++++++++++++++++++++ meta-oe/recipes-support/utouch/utouch-frame_git.bb | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch new file mode 100644 index 0000000..f3c8eeb --- /dev/null +++ b/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -0,0 +1,29 @@ +From 08b17ec505e09e8f5a4d73ffc3aa61561ec2e0da Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 00:27:54 -0700 +Subject: [PATCH] include sys/stat.h for fixing build issue on musl + +error: field has incomplete + type 'struct stat' + struct stat fs; + +Signed-off-by: Khem Raj +--- + tools/utouch-frame-test-mtdev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/utouch-frame-test-mtdev.c b/tools/utouch-frame-test-mtdev.c +index 5253320..2032af4 100644 +--- a/tools/utouch-frame-test-mtdev.c ++++ b/tools/utouch-frame-test-mtdev.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include "common-defs.h" + + struct frame_test { +-- +2.12.1 + diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 6ec566d..39d46af 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -10,7 +10,9 @@ DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ - file://remove-man-page-creation.patch" + file://remove-man-page-creation.patch \ + file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ + " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" PV = "1.1.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:41 +0000 Subject: [oe-commits] [meta-openembedded] 35/55: libgxim: Fix build with security flags turned on In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.CF1312376E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a94127d79fd5dd5e512f185d6878e4b6ede2f650 Author: Khem Raj AuthorDate: Wed Mar 29 18:09:02 2017 -0700 libgxim: Fix build with security flags turned on Signed-off-by: Khem Raj --- .../0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch | 53 ++++++++++++++++++++++ .../libgxim/0002-Update-autotools-macro.patch | 31 +++++++++++++ ...string-qualifier-to-fix-potential-securit.patch | 30 ++++++++++++ meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 6 ++- 4 files changed, 119 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch new file mode 100644 index 0000000..41e07f3 --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch @@ -0,0 +1,53 @@ +From d2ccba90186e2affbb3d146ada341ea2ae6fab2c Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 13 May 2013 16:05:32 +0900 +Subject: [PATCH 1/3] Use AM_CPPFLAGS instead of INCLUDES + +--- + docs/reference/Makefile.am | 2 +- + libgxim/Makefile.am | 2 +- + tests/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index 24986e1..f785735 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -84,7 +84,7 @@ expand_content_files= + # signals and properties. + # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) + # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +-INCLUDES= \ ++AM_CPPFLAGS= \ + $(GXIM_CFLAGS) \ + -I$(top_srcdir) \ + $(NULL) +diff --git a/libgxim/Makefile.am b/libgxim/Makefile.am +index 572bdb5..ae1ba32 100644 +--- a/libgxim/Makefile.am ++++ b/libgxim/Makefile.am +@@ -1,7 +1,7 @@ + ## + # Global definitions + NULL = +-INCLUDES = \ ++AM_CPPFLAGS = \ + $(GXIM_CFLAGS) \ + -I$(top_srcdir) \ + $(NULL) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 2926829..919ccc8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,7 +1,7 @@ + ## + # Global definitions + NULL = +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir)/libgxim \ + -I$(top_srcdir) \ + $(GXIM_CFLAGS) \ +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch new file mode 100644 index 0000000..808203b --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch @@ -0,0 +1,31 @@ +From 3215783732b147723e3613cc3c3f83cdcf2ae832 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 22 Jan 2014 18:59:32 +0900 +Subject: [PATCH 2/3] Update autotools macro + +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d559491..8b846a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,10 +11,12 @@ dnl V=0 to make. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AM_MAINTAINER_MODE +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4macros]) + +-AC_PROG_LIBTOOL ++LT_PREREQ([2.2]) ++LT_INIT([disable-static]) ++ + AC_PROG_INTLTOOL + + AC_PROG_CC +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch new file mode 100644 index 0000000..cb21e1e --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch @@ -0,0 +1,30 @@ +From d05d7fa24ee128f1f33a2e905fc3601955dd27d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 18:06:02 -0700 +Subject: [PATCH 3/3] Add format string qualifier to fix potential security + risk + +Fixes +libgxim/gximprotocol10.c:2076:66: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + +Signed-off-by: Khem Raj +--- + libgxim/gximprotocol10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgxim/gximprotocol10.c b/libgxim/gximprotocol10.c +index 04887a5..65bd4df 100644 +--- a/libgxim/gximprotocol10.c ++++ b/libgxim/gximprotocol10.c +@@ -2073,7 +2073,7 @@ g_xim_protocol10_closure_real_parser_error(GXimProtocol *proto, + msg = g_strdup_printf("Unable to parse the protocol %s properly", + g_xim_protocol_name(major_opcode)); + +- g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg); ++ g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg); + switch (major_opcode) { + case G_XIM_CONNECT: + case G_XIM_AUTH_REQUIRED: +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 44b7531..5bf7c6e 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -10,7 +10,11 @@ HOMEPAGE = "http://code.google.com/p/libgxim/" SECTION = "System Environment/Libraries" SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ + file://0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch \ + file://0002-Update-autotools-macro.patch \ + file://0003-Add-format-string-qualifier-to-fix-potential-securit.patch \ + " SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a" SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:46 +0000 Subject: [oe-commits] [meta-openembedded] 40/55: picocom: Upgrade to 2.2 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.145AF2376E3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b8dcf930c38032819780aa02b20de2287cdf4500 Author: Khem Raj AuthorDate: Sat Mar 18 10:44:25 2017 -0700 picocom: Upgrade to 2.2 Package has moved to github License file got some cosmetic changes see https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1 Signed-off-by: Khem Raj --- meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 ------------------- meta-oe/recipes-support/picocom/picocom_git.bb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb deleted file mode 100644 index d2a76c0..0000000 --- a/meta-oe/recipes-support/picocom/picocom_1.7.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program" -SECTION = "console/utils" -LICENSE = "GPLv2+" -HOMEPAGE = "http://code.google.com/p/picocom/" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz" - -SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef" -SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e" - -EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \ - 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb new file mode 100644 index 0000000..e091094 --- /dev/null +++ b/meta-oe/recipes-support/picocom/picocom_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program" +SECTION = "console/utils" +LICENSE = "GPLv2+" +HOMEPAGE = "http://code.google.com/p/picocom/" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" + +BASEPV = "2.2" +PV = "${BASEPV}+git${SRCPV}" + +SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc" + +SRC_URI = "git://github.com/npat-efault/picocom" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \ + 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/ +} + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:35 +0000 Subject: [oe-commits] [meta-openembedded] 29/55: minicoredumper: Update to 2.0.0 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.92D2C2376F1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit bc7003489ad1194b338496d49b13667278f5aa0a Author: Khem Raj AuthorDate: Tue Mar 28 20:02:33 2017 -0700 minicoredumper: Update to 2.0.0 Clarify licensing and switch to github for fetching Signed-off-by: Khem Raj --- ...inicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb similarity index 64% rename from meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb rename to meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index babe544..f3071e3 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -1,17 +1,24 @@ SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ to allow minimal and customized crash dumps" -LICENSE = " LGPLv2.1 & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=45445387350de96a0e70410470ee5cab" -DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux" +LICENSE = " LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=709087c2ed0acda54a4d91497a889e42 \ + file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ + file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ + " +DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRC_URI = "https://linutronix.de/${BPN}/files/${BPN}-${PV}.tar.gz \ +SRCREV = "248019446ccf6079926efb54f8b6dd7be769bbae" + +PR .= "+git${SRCPV}" + +SRC_URI = "git://github.com/Linutronix/minicoredumper-debian;branch=unstable \ file://minicoredumper.service \ file://minicoredumper.init \ " -SRC_URI[md5sum] = "5ba9d116b52a8e2fb93456260644e753" -SRC_URI[sha256sum] = "1b0eeb3d70dbd2ad6f2f673e4e3446e5dd784e132730e21d8f9dc0977e47dd9a" + +S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "minicoredumper.service" SYSTEMD_AUTO_ENABLE = "enable" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:42 +0000 Subject: [oe-commits] [meta-openembedded] 36/55: vpnc: Update to build from github SRC_URI In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.D91972376F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 20f3a7307444d3623f925fbde68f3a3f60da50bf Author: Khem Raj AuthorDate: Thu Mar 30 00:13:12 2017 -0700 vpnc: Update to build from github SRC_URI Fix build for musl add packageconfig for crypto selection Fix build with externalsrc Signed-off-by: Khem Raj --- .../0001-search-for-log-help-in-build-dir.patch | 26 +++++++++ ... 0002-Fix-vpnc-install-for-cross-compile.patch} | 20 ++++++- ...003-error.h-is-specific-to-glibc-on-linux.patch | 30 ++++++++++ ...Use-pkgconfig-instead-of-libgcrypt-config.patch | 30 ++++++++++ ...ude-sys-ttydefaults.h-for-CEOT-definition.patch | 30 ++++++++++ ...header-include-sequence-to-adjust-for-mus.patch | 40 +++++++++++++ ...error-API-when-error.h-is-not-on-platform.patch | 66 ++++++++++++++++++++++ ...0008-include-sysdep.h-before-net-if_tun.h.patch | 36 ++++++++++++ .../recipes-connectivity/vpnc/vpnc/makeman.patch | 11 ---- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 41 +++++++++----- 10 files changed, 302 insertions(+), 28 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch new file mode 100644 index 0000000..184c794 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -0,0 +1,26 @@ +From 48e16e9ae7d8e4c42282bd82cbbd9a6d346a5c00 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 1/8] search for log-help in build dir + +Signed-off-by: Khem Raj +--- + makeman.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makeman.pl b/makeman.pl +index cf241a1..2d73432 100755 +--- a/makeman.pl ++++ b/makeman.pl +@@ -30,7 +30,7 @@ my $vpnc = './vpnc'; + # indenting lists (those originally starting with an asterisk). I hope + # this pays off when converting the manpage to HTML or such. + +-open my $LONGHELP, '-|', "$vpnc --long-help"; ++open my $LONGHELP, '-|', "cat ./long-help"; + my $vpnc_options = ''; + my $relative_indent = 0; + my $indent_needed = 0; +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch similarity index 73% rename from meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch rename to meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 3de65ec..6f00d3b 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -1,6 +1,17 @@ ---- a/Makefile~ 2009-01-20 18:44:30.000000000 +0100 -+++ b/Makefile 2009-01-20 18:44:30.000000000 +0100 -@@ -119,21 +119,21 @@ +From d565b4a5e0045f1e40e0e462920ed5b8faca9eec Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 2/8] Fix vpnc install for cross compile + +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 69f5aca..a15782e 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,21 +133,21 @@ install-common: all else \ install vpnc-script $(DESTDIR)$(ETCDIR); \ fi @@ -33,3 +44,6 @@ uninstall : rm -f $(DESTDIR)$(SBINDIR)/vpnc \ +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch new file mode 100644 index 0000000..bb77306 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -0,0 +1,30 @@ +From 6b49020893f999df56392b49b1a289cb96a113a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:08:17 -0700 +Subject: [PATCH 3/8] error.h is specific to glibc on linux + +Signed-off-by: Khem Raj +--- + sysdep.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 137bf6d..6a323f0 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -37,9 +37,10 @@ int tun_read(int fd, unsigned char *buf, int len); + int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + + /***************************************************************************/ +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__linux__) ++#if defined(__GLIBC__) + #include +- ++#endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 + #define HAVE_ERROR 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch new file mode 100644 index 0000000..f70a138 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -0,0 +1,30 @@ +From 4d1dd61c04f52a7c796debbdea5fc9139ffa271d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:45:05 -0700 +Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a15782e..b537046 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,10 +63,10 @@ RELEASE_VERSION := $(shell cat VERSION) + CC ?= gcc + CFLAGS ?= -O3 -g + CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings +-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) ++CFLAGS += $(shell pkg-config libgcrypt --cflags) $(CRYPTO_CFLAGS) + CPPFLAGS += -DVERSION=\"$(VERSION)\" + LDFLAGS ?= -g +-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) ++LIBS += $(shell pkg-config libgcrypt --libs) $(CRYPTO_LDADD) + + ifeq ($(shell uname -s), SunOS) + LIBS += -lnsl -lresolv -lsocket +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch new file mode 100644 index 0000000..01783f4 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -0,0 +1,30 @@ +From 1947ea776dc38c3377702dd89bd229670f4d948d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:06:52 -0700 +Subject: [PATCH 5/8] include sys/ttydefaults.h for CEOT definition + +Fixes + +config.c:146:25: error: use of undeclared identifier 'CEOT' + if (llen == 0 && c == CEOT) + +Signed-off-by: Khem Raj +--- + config.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.c b/config.c +index 804faa7..1883d12 100644 +--- a/config.c ++++ b/config.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch new file mode 100644 index 0000000..fa89df2 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -0,0 +1,40 @@ +From 56768fc0c2cbd6abcf28c9805ab516db8a0548d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:09:47 -0700 +Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl + +--- + sysdep.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 6a323f0..0122b95 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -17,16 +17,20 @@ + * __SKYOS__ + * + */ ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + #include + #include +-#include + + #if !defined(__CYGWIN__) +-#include +-#include ++//#include ++//#include + #include + #endif ++#include + + #include "config.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch new file mode 100644 index 0000000..de67b47 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -0,0 +1,66 @@ +From b6a027fe4da6f66552b533f1314e5005b16c5455 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:52:36 -0700 +Subject: [PATCH 7/8] add error() API when error.h is not on platform + +sign-off-by: Khem Raj +--- + sysdep.c | 24 ++++++++++++++++++++++++ + sysdep.h | 2 ++ + 2 files changed, 26 insertions(+) + +diff --git a/sysdep.c b/sysdep.c +index d8f181d..2518ec1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -17,6 +17,7 @@ + GNU General Public License for more details. + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -794,3 +795,26 @@ int setenv(const char *name, const char *value, int overwrite) + return ret; + } + #endif ++ ++#ifndef _ERROR_H_ ++#define _ERROR_H_ ++#include ++#include ++#include ++ ++void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ ++ fflush(stdout); ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ":%d", errnum); ++ if (status) ++ exit(status); ++} ++#endif /* _ERROR_H_ */ ++ +diff --git a/sysdep.h b/sysdep.h +index 0122b95..4e60064 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -44,6 +44,8 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + #if defined(__linux__) + #if defined(__GLIBC__) + #include ++#else ++void error(int status, int errnum, const char* format, ...); + #endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch new file mode 100644 index 0000000..62ffdb7 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -0,0 +1,36 @@ +From 7f01847d14a1a3af50f49499743b0551ddef1311 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:54:01 -0700 +Subject: [PATCH 8/8] include sysdep.h before net/if_tun.h + +Fixes duplicate defines in header errors + +Signed-off-by: Khem Raj +--- + sysdep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdep.c b/sysdep.c +index 2518ec1..5624ef1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -57,6 +57,8 @@ + #include + #endif + ++#include "sysdep.h" ++ + #if defined(__DragonFly__) + #include + #elif defined(__linux__) +@@ -69,7 +71,6 @@ + #include + #endif + +-#include "sysdep.h" + + #if !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || !defined(HAVE_ERROR) + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch deleted file mode 100644 index f394e6a..0000000 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vpnc-0.5.1/makeman.pl.old 2008-03-16 02:17:59.000000000 -0500 -+++ vpnc-0.5.1/makeman.pl 2008-03-16 02:29:34.000000000 -0500 -@@ -29,7 +29,7 @@ my $vpnc = './vpnc'; - # indenting lists (those originally starting with an asterisk). I hope - # this pays off when converting the manpage to HTML or such. - --open my $LONGHELP, '-|', "$vpnc --long-help"; -+open my $LONGHELP, '-|', "cat ../long-help"; - my $vpnc_options = ''; - my $relative_indent = 0; - my $indent_needed = 0; diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 1aff045..6f92acd 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -4,17 +4,39 @@ AUTHOR = "Maurice Massar vpnc at unix-ag.uni-kl.de" SECTION = "net" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" -DEPENDS = "libgcrypt" -inherit perlnative +DEPENDS += "libgcrypt" -EXTRA_OEMAKE = "-e MAKEFLAGS=" -CFLAGS_append = ' -DVERSION=\\"${PV}\\"' -LDFLAGS_append = " -lgcrypt -lgpg-error" +PV .= "r550-2jnpr1" +SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" +SRC_URI = "git://github.com/ndpgroup/vpnc \ + file://long-help \ + file://default.conf \ + file://0001-search-for-log-help-in-build-dir.patch \ + file://0002-Fix-vpnc-install-for-cross-compile.patch \ + file://0003-error.h-is-specific-to-glibc-on-linux.patch \ + file://0004-Use-pkgconfig-instead-of-libgcrypt-config.patch \ + file://0005-include-sys-ttydefaults.h-for-CEOT-definition.patch \ + file://0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch \ + file://0007-add-error-API-when-error.h-is-not-on-platform.patch \ + file://0008-include-sysdep.h-before-net-if_tun.h.patch \ + " + +PACKAGECONFIG ?= "gnutls" + +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[openssl] = ",,openssl" + +S = "${WORKDIR}/git" + +inherit perlnative pkgconfig + +#EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure_append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl + cp ${WORKDIR}/long-help ${S} } do_install () { @@ -34,12 +56,3 @@ vpnc_sysroot_preprocess () { CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" RDEPENDS_${PN} = "perl-module-io-file" RRECOMMENDS_${PN} = "kernel-module-tun" - -SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \ - file://makeman.patch \ - file://vpnc-install.patch \ - file://long-help \ - file://default.conf" - -SRC_URI[md5sum] = "4378f9551d5b077e1770bbe09995afb3" -SRC_URI[sha256sum] = "46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:39 +0000 Subject: [oe-commits] [meta-openembedded] 33/55: live555: Do not use XLOCALE on musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.BAF782376F5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 4bec4841e1002d35459895609c3e75fd349cd20d Author: Khem Raj AuthorDate: Wed Mar 29 16:11:00 2017 -0700 live555: Do not use XLOCALE on musl musl does not have xlocale.h Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/live555/live555.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index 710dbde..a516193 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc @@ -18,9 +18,12 @@ MIRRORS += "http://www.live555.com/liveMedia/public/ http://distcache.FreeBSD.or S = "${WORKDIR}/live" TARGET_CC_ARCH += "${LDFLAGS}" +XLOCALE_libc-musl = " -DXLOCALE_NOT_USED" +XLOCALE ?= "" + do_configure() { cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross + echo "COMPILE_OPTS+=" -fPIC ${XLOCALE}"" >> config.linux-cross ./genMakefiles linux-cross } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:33 +0000 Subject: [oe-commits] [meta-openembedded] 27/55: openl2tp: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.8193C2376EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 70dcd883a7c748db734fd31b53c137a2255bd4f5 Author: Khem Raj AuthorDate: Tue Mar 28 18:44:44 2017 -0700 openl2tp: Fix build with musl Signed-off-by: Khem Raj --- .../openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch | 29 +++++++++++++++++ .../0001-l2tp_api-Included-needed-headers.patch | 34 ++++++++++++++++++++ ...02-cli-include-fcntl.h-for-O_CREAT-define.patch | 25 +++++++++++++++ .../openl2tp/0002-user-ipv6-structures.patch | 33 ++++++++++++++++++++ ...fine-_GNU_SOURCE-for-getting-sighandler_t.patch | 35 +++++++++++++++++++++ ...linux-kernel-headers-assumptions-on-glibc.patch | 36 ++++++++++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 17 +++++++++- 7 files changed, 208 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch new file mode 100644 index 0000000..d1ee3c5 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -0,0 +1,29 @@ +From 1f8d336a5cd88b87e15596d05980f6fe77a0f226 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:28:41 -0700 +Subject: [PATCH 1/4] Use -1 instead of WAIT_ANY + +WAIT_ANY is not supported by POSIX and some C libraries +e.g. musl do not define this. + +Signed-off-by: Khem Raj +--- + usl/usl_pid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usl/usl_pid.c b/usl/usl_pid.c +index 103458b..9819473 100644 +--- a/usl/usl_pid.c ++++ b/usl/usl_pid.c +@@ -78,7 +78,7 @@ int usl_pid_reap_children(int waitfor) + + /* Wait for processes in our process group. */ + +- while (((pid = waitpid(WAIT_ANY, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { ++ while (((pid = waitpid(-1, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { + have_callback = 0; + usl_list_for_each(walk, tmp, &usl_child_list) { + child = usl_list_entry(walk, struct usl_pid_child, list); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch new file mode 100644 index 0000000..c50f68e --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -0,0 +1,34 @@ +From 25dce20a75bc84ae9e4ec640590cef0c12750789 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 17:48:13 -0700 +Subject: [PATCH 1/2] l2tp_api: Included needed headers + +These are flagged by musl + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index d16f80e..9d6f60a 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -22,9 +22,12 @@ + * Each module implements the required RPC xxx_1_svc() callbacks which + * are called directly by the RPC library. + */ +- ++#define _GNU_SOURCE ++#include ++#include ++#include + #include +-#include ++//#include + + #include "usl.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch new file mode 100644 index 0000000..9df3265 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -0,0 +1,25 @@ +From 2d633f4c18ff3cb52234449fd86a0a63b55d669b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:31:55 -0700 +Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 097ed6a..127136c 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch new file mode 100644 index 0000000..3f8bcaa --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -0,0 +1,33 @@ +From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 18:09:58 -0700 +Subject: [PATCH 2/2] user ipv6 structures + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index 9d6f60a..f0946fd 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -450,10 +450,12 @@ int l2tp_api_rpc_check_request(SVCXPRT *xprt) + * non-loopback interface, reject the request. + */ + if ((!l2tp_opt_remote_rpc) && +- ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && +- (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { ++ ((xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_LOOPBACK)) && ++ (xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_ANY)))) { ++ char straddr[INET6_ADDRSTRLEN]; ++ inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); + if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { +- l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); ++ l2tp_log(LOG_ERR, "Rejecting RPC request from %s", straddr); + } + svcerr_auth(xprt, AUTH_TOOWEAK); + return -EPERM; +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch new file mode 100644 index 0000000..e05be1b --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -0,0 +1,35 @@ +From 74fe72583472bcc3c89a52839cac2ebbad6c8a74 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:34:52 -0700 +Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 127136c..931779b 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -17,7 +17,7 @@ + * Boston, MA 02110-1301 USA + * + *****************************************************************************/ +- ++#define _GNU_SOURCE + #include + #include + #include +@@ -634,7 +634,7 @@ static void cli_rl_uninstall_signal_handlers(void) + + static int cli_rl_install_signal_handlers(void) + { +- __sighandler_t handler; ++ sighandler_t handler; + + rl_catch_signals = 0; + rl_clear_signals(); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch new file mode 100644 index 0000000..0fcba65 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch @@ -0,0 +1,36 @@ +From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:46:56 -0700 +Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc + +Fixes build issues e.g. + +In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: +/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier + IFF_LOWER_UP = 1<<16, /* __volatile__ */ + ^ + +Signed-off-by: Khem Raj +--- + plugins/ppp_unix.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c +index 869066f..5c1e44f 100644 +--- a/plugins/ppp_unix.c ++++ b/plugins/ppp_unix.c +@@ -21,6 +21,11 @@ + * Plugin to use the standard UNIX pppd + */ + ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 67118d8..e1670b3 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -16,14 +16,28 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + file://0001-Use-1-instead-of-WAIT_ANY.patch \ + file://0002-cli-include-fcntl.h-for-O_CREAT-define.patch \ + file://0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch \ + file://0001-l2tp_api-Included-needed-headers.patch \ + " + +SRC_URI_append_libc-musl = "\ + file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://0002-user-ipv6-structures.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig +DEPENDS_append_libc-musl = " libtirpc" +CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ @@ -34,5 +48,6 @@ do_compile_prepend() { -e 's:$(CROSS_COMPILE)nm:${NM}:g' \ -e 's:$(CROSS_COMPILE)strip:${STRIP}:g' \ -e 's:$(CROSS_COMPILE)install:install:g' \ + -e 's:CPPFLAGS-y:CPPFLAGS:g' \ ${S}/Makefile } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:47 +0000 Subject: [oe-commits] [meta-openembedded] 41/55: libexecinfo: Add recipe In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.1F5E42376E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8215a80b2c9cafc22779ce91507f0cb468e4dd3d Author: Khem Raj AuthorDate: Sun Mar 19 16:19:21 2017 -0700 libexecinfo: Add recipe This package is handy especially with musl to port apps which use glibc backtrace APIs build for musl systems alone Signed-off-by: Khem Raj --- .../0001-makefile-Fix-build-on-linux.patch | 59 ++++++++++++++++ ...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 ++++++++++++++++++++++ .../libexecinfo/libexecinfo_1.1.bb | 31 +++++++++ 3 files changed, 169 insertions(+) diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch new file mode 100644 index 0000000..f1863f1 --- /dev/null +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch @@ -0,0 +1,59 @@ +From 910bbc2cb6cc1cfa6deed9d170da02a639902c7c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 Mar 2017 16:14:54 -0700 +Subject: [PATCH 1/2] makefile: Fix build on linux + +Signed-off-by: Khem Raj +--- + Makefile | 33 +++++++++++++++++---------------- + 1 file changed, 17 insertions(+), 16 deletions(-) + +Index: libexecinfo-1.1/Makefile +=================================================================== +--- libexecinfo-1.1.orig/Makefile ++++ libexecinfo-1.1/Makefile +@@ -23,24 +23,25 @@ + # SUCH DAMAGE. + # + # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ ++# ++# Linux Makefile by Matt Smith , 2011/01/04 + +-LIB= execinfo +- +-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h +- +-INCS= execinfo.h +- +-SHLIB_MAJOR= 1 +-SHLIB_MINOR= 0 +- +-NOPROFILE= yes +- +-DPADD= ${LIBM} +-LDADD= -lm +- +-#WARNS?= 4 +- +-#stacktraverse.c: gen.py +-# ./gen.py > stacktraverse.c ++CC?=cc ++AR?=ar ++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c ++EXECINFO_LDFLAGS=$(LDFLAGS) ++ ++all: static dynamic ++ ++static: ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c ++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o ++ ++dynamic: ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So ++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 $(EXECINFO_LDFLAGS) stacktraverse.So execinfo.So + +-.include ++clean: ++ rm -rf *.o *.So *.a *.so diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch new file mode 100644 index 0000000..423b670 --- /dev/null +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch @@ -0,0 +1,79 @@ +From 0810817773fb81d7383d2fa8464244c8f79845fb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 Mar 2017 16:16:18 -0700 +Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang + +Signed-off-by: Khem Raj +--- + execinfo.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/execinfo.c b/execinfo.c +index 906fb14..9448b60 100644 +--- a/execinfo.c ++++ b/execinfo.c +@@ -69,7 +69,8 @@ backtrace(void **buffer, int size) + char ** + backtrace_symbols(void *const *buffer, int size) + { +- int i, clen, alen, offset; ++ size_t clen, alen; ++ int i, offset; + char **rval; + char *cp; + Dl_info info; +@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size) + rval = malloc(clen); + if (rval == NULL) + return NULL; +- (char **)cp = &(rval[size]); + for (i = 0; i < size; i++) { + if (dladdr(buffer[i], &info) != 0) { + if (info.dli_sname == NULL) +@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size) + 2 + /* " <" */ + strlen(info.dli_sname) + /* "function" */ + 1 + /* "+" */ +- D10(offset) + /* "offset */ ++ 10 + /* "offset */ + 5 + /* "> at " */ + strlen(info.dli_fname) + /* "filename" */ + 1; /* "\0" */ + rval = realloc_safe(rval, clen + alen); + if (rval == NULL) + return NULL; +- snprintf(cp, alen, "%p <%s+%d> at %s", ++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s", + buffer[i], info.dli_sname, offset, info.dli_fname); + } else { + alen = 2 + /* "0x" */ +@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size) + rval = realloc_safe(rval, clen + alen); + if (rval == NULL) + return NULL; +- snprintf(cp, alen, "%p", buffer[i]); ++ snprintf((char *) rval + clen, alen, "%p", buffer[i]); + } +- rval[i] = cp; +- cp += alen; ++ rval[i] = (char *) clen; ++ clen += alen; + } + ++ for (i = 0; i < size; i++) ++ rval[i] += (long) rval; ++ + return rval; + } + +@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd) + return; + snprintf(buf, len, "%p\n", buffer[i]); + } +- write(fd, buf, len - 1); ++ write(fd, buf, strlen(buf)); + } + } +-- +2.12.0 + diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb new file mode 100644 index 0000000..f79b1ab --- /dev/null +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb @@ -0,0 +1,31 @@ +# Copyright (C) 2017 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility." +HOMEPAGE = "http://www.freshports.org/devel/libexecinfo" +LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5" +LICENSE = "BSD-2-Clause" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \ + file://0001-makefile-Fix-build-on-linux.patch \ + file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \ + " +SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91" +SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f" + +CFLAGS += "-fno-omit-frame-pointer" + +do_install() { + install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h + install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h + install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a + install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1 + ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so +} +# +# We will skip parsing for non-musl systems +# +COMPATIBLE_HOST = ".*-musl.*" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:50 +0000 Subject: [oe-commits] [meta-openembedded] 44/55: libnetfilter-log: Switch to git URI In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.3DC842376DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit da896ec40f5ab1ed5a15a32a4bbd5751252684c8 Author: Khem Raj AuthorDate: Thu Mar 30 13:13:20 2017 -0700 libnetfilter-log: Switch to git URI Move to tip of tree which has needed fixes for musl build add missing dependency on libmnl Signed-off-by: Khem Raj --- .../recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb index 30c9ae6..2f627d4 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libnfnetlink" +DEPENDS = "libnfnetlink libmnl" +SRCREV = "ba196a97e810746e5660fe3f57c87c0ed0f2b324" +PV .= "+git${SRCPV}" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "2a4bb0654ae675a52d2e8d1c06090b94" -SRC_URI[tar.sha256sum] = "74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21" +SRC_URI = "git://git.netfilter.org/libnetfilter_log" -S = "${WORKDIR}/libnetfilter_log-${PV}" +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:38 +0000 Subject: [oe-commits] [meta-openembedded] 32/55: dibbler: Upgrade to 1.0.2RC1 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.B0D322376F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9334e892f50e5b1739575681aeafa8493939c9f1 Author: Khem Raj AuthorDate: Wed Mar 29 15:36:19 2017 -0700 dibbler: Upgrade to 1.0.2RC1 Delete dibbler from meta-oe Signed-off-by: Khem Raj --- .../dibbler/dibbler_fix_getSize_crash.patch | 56 ++++--------- .../dibbler/dibbler/types.patch | 96 ---------------------- .../dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} | 16 ++-- .../recipes-connectivity/dibbler/dibbler_1.0.1.bb | 40 --------- 4 files changed, 24 insertions(+), 184 deletions(-) diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index adb249f..42d2627 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,32 +1,8 @@ -diff --git a/ClntMessages/ClntMsg.cpp b/ClntMessages/ClntMsg.cpp -index eeaadd0..0cf5dce 100644 ---- a/ClntMessages/ClntMsg.cpp -+++ b/ClntMessages/ClntMsg.cpp -@@ -346,7 +346,9 @@ unsigned long TClntMsg::getTimeout() - - void TClntMsg::send() - { -- char* pkt = new char[getSize()]; -+ size_t size = getSize(); -+ char* pkt = new char[size]; -+ memset(pkt, 0, size); - - srand((uint32_t)time(NULL)); - if (!RC) -@@ -364,7 +366,7 @@ void TClntMsg::send() - - RC++; - -- this->storeSelf(pkt); -+ storeSelf(pkt); - - SPtr ptrIface = ClntIfaceMgr().getIfaceByID(Iface); - if (!ptrIface) { -diff --git a/ClntMessages/ClntMsgRequest.cpp b/ClntMessages/ClntMsgRequest.cpp -index 4a7b5da..f3e40fd 100644 ---- a/ClntMessages/ClntMsgRequest.cpp -+++ b/ClntMessages/ClntMsgRequest.cpp -@@ -143,7 +143,10 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, +Index: git/ClntMessages/ClntMsgRequest.cpp +=================================================================== +--- git.orig/ClntMessages/ClntMsgRequest.cpp ++++ git/ClntMessages/ClntMsgRequest.cpp +@@ -142,7 +142,10 @@ TClntMsgRequest::TClntMsgRequest(List(TA IsDone=false; SPtr ptr; ptr = new TOptDUID(OPTION_CLIENTID, ClntCfgMgr().getDUID(), this ); @@ -38,8 +14,8 @@ index 4a7b5da..f3e40fd 100644 if (!srvDUID) { Log(Error) << "Unable to send REQUEST: ServerId not specified.\n" << LogEnd; -@@ -154,7 +157,9 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, - ptr = (Ptr*) new TOptDUID(OPTION_SERVERID, srvDUID,this); +@@ -153,7 +156,9 @@ TClntMsgRequest::TClntMsgRequest(List(TA + ptr = new TOptDUID(OPTION_SERVERID, srvDUID,this); // all IAs provided by checkSolicit SPtr ClntAddrIA; - Options.push_back( ptr ); @@ -49,21 +25,21 @@ index 4a7b5da..f3e40fd 100644 IAs.first(); while (ClntAddrIA = IAs.get()) -diff --git a/Messages/Msg.cpp b/Messages/Msg.cpp -index baa6c86..6eef6c7 100644 ---- a/Messages/Msg.cpp -+++ b/Messages/Msg.cpp -@@ -66,10 +66,15 @@ int TMsg::getSize() +Index: git/Messages/Msg.cpp +=================================================================== +--- git.orig/Messages/Msg.cpp ++++ git/Messages/Msg.cpp +@@ -69,10 +69,15 @@ int TMsg::getSize() { int pktsize=0; TOptList::iterator opt; -+ int optionCount = 0; ++ int optionCount = 0; for (opt = Options.begin(); opt!=Options.end(); ++opt) { - pktsize += (*opt)->getSize(); -+ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; -+ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; -+ pktsize += (*opt)->getSize(); ++ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; ++ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; ++ pktsize += (*opt)->getSize(); } + Log(Info) << "### CPE Debug - Packet size of option (Add 4) " << pktsize << LogEnd ; + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch deleted file mode 100644 index 28f18ef..0000000 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch +++ /dev/null @@ -1,96 +0,0 @@ -Apply fixes to build on musl - -Signed-off-by: Khem Raj - - -Index: dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/IfaceMgr.cpp -+++ dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include "Portable.h" - #include "IfaceMgr.h" - #include "Iface.h" -Index: dibbler-1.0.1/IfaceMgr/SocketIPv6.h -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/SocketIPv6.h -+++ dibbler-1.0.1/IfaceMgr/SocketIPv6.h -@@ -18,6 +18,7 @@ class TIfaceSocket; - - #include - #include -+#include - - #include "Portable.h" - #include "DHCPConst.h" -Index: dibbler-1.0.1/Port-linux/ethtool-local.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/ethtool-local.h -+++ dibbler-1.0.1/Port-linux/ethtool-local.h -@@ -22,9 +22,9 @@ - */ - - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; - - #include "ethtool-kernel.h" - -Index: dibbler-1.0.1/Port-linux/interface.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/interface.c -+++ dibbler-1.0.1/Port-linux/interface.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -35,13 +36,10 @@ - #include - #include - --#include - - #include "ethtool-local.h" - #include "interface.h" - #include --#include --#include - - void daemon_log(int loglevel, const char *fmt,...) - { -Index: dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/lowlevel-linux-link-state.c -+++ dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - #include "Portable.h" - #include "interface.h" - -Index: dibbler-1.0.1/Port-linux/utils.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/utils.h -+++ dibbler-1.0.1/Port-linux/utils.h -@@ -4,6 +4,7 @@ - #include - //#include - #include -+#include - - #include "libnetlink.h" - #include "ll_map.h" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb similarity index 77% rename from meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb rename to meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 1913d3a..8890e14 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -5,12 +5,14 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${BP}.tar.gz \ - file://dibbler_fix_getSize_crash.patch \ - file://types.patch \ -" -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" +SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" + +SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ + file://dibbler_fix_getSize_crash.patch \ + " +PV = "1.0.1+1.0.2RC1+git${SRCREV}" + +S = "${WORKDIR}/git" PACKAGECONFIG ??= "debug bind-reuse resolvconf dns-update" @@ -27,8 +29,6 @@ inherit autotools DEPENDS += "flex-native" -CFLAGS += "-D_GNU_SOURCE" - PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" FILES_${PN}-client = "${sbindir}/${PN}-client" diff --git a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb deleted file mode 100644 index 41bb78f..0000000 --- a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A portable DHCPv6 implementation" -DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful \ -(i.e. IPv6 address granting and IPv6 prefix delegation) as well as stateless (i.e. \ -option granting) autoconfiguration for IPv6." -HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3 \ - file://bison++/COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://klub.com.pl/dhcpv6/dibbler/dibbler-${PV}.tar.gz" - -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" - -inherit autotools - -PACKAGECONFIG ?= "auth bind-reuse dns-update dst-addr-filter link-state" - -PACKAGECONFIG[auth] = "--enable-auth,--disable-auth" -PACKAGECONFIG[bind-reuse] = "--enable-bind-reuse,--disable-bind-reuse" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[dns-update] = "--enable-dns-update,--disable-dns-update" -PACKAGECONFIG[dst-addr-filter] = "--enable-dst-addr-filter,--disable-dst-addr-filter" -PACKAGECONFIG[link-state] = "--enable-link-state,--disable-link-state" -PACKAGECONFIG[remote-autoconf] = "--enable-remote-autoconf,--disable-remote-autoconf" -PACKAGECONFIG[resolvconf] = "--enable-resolvconf,--disable-resolvconf" - -EXTRA_OECONF += " \ - --disable-efence \ - --with-gtest=no \ -" - -PACKAGES =+ "${PN}-client ${PN}-relay ${PN}-requestor ${PN}-server" - -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:37 +0000 Subject: [oe-commits] [meta-openembedded] 31/55: faac: Fix with with security flags and on musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.A75322376F3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 5dfc6e845b5960b4294ce8871e332339bdd2a574 Author: Khem Raj AuthorDate: Tue Mar 28 21:35:20 2017 -0700 faac: Fix with with security flags and on musl Signed-off-by: Khem Raj --- .../recipes-multimedia/faac/faac_1.28.bb | 6 ++++- ...frontend-Fix-format-string-security-error.patch | 26 ++++++++++++++++++++ ...Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb index 2f048af..5c9477f 100644 --- a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb +++ b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb @@ -9,11 +9,15 @@ inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ file://build-fix.patch \ file://address-gcc-6-narrowing-errors.patch \ -" + file://0001-frontend-Fix-format-string-security-error.patch \ + file://0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \ + " SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6" SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df" +EXTRA_OECONF += "--without-mp4v2" + PACKAGES =+ "lib${BPN} lib${BPN}-dev" FILES_${PN} = " ${bindir}/faac " diff --git a/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch new file mode 100644 index 0000000..75e003e --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch @@ -0,0 +1,26 @@ +From c1d7a8b992dc36d0012cc3d54b7d3abf4ad4d5d8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 21:33:01 -0700 +Subject: [PATCH 1/2] frontend: Fix format string security error + +Signed-off-by: Khem Raj +--- + frontend/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/frontend/main.c b/frontend/main.c +index 02146a8..cb9329c 100644 +--- a/frontend/main.c ++++ b/frontend/main.c +@@ -715,7 +715,7 @@ int main(int argc, char *argv[]) + break; + #endif + case 'L': +- fprintf(stderr, faac_copyright_string); ++ fprintf(stderr, "%s", faac_copyright_string); + dieMessage = license; + break; + case 'X': +-- +2.12.1 + diff --git a/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch new file mode 100644 index 0000000..d845ddf --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch @@ -0,0 +1,28 @@ +From 46cc9298c38b9dd735fec3f39aa2d6e56a362410 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 21:33:36 -0700 +Subject: [PATCH 2/2] mp4v2: Define __STRING if cdefs.h does not exist + +Signed-off-by: Khem Raj +--- + common/mp4v2/mp4util.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/common/mp4v2/mp4util.h b/common/mp4v2/mp4util.h +index 1f9cb64..1e7aced 100644 +--- a/common/mp4v2/mp4util.h ++++ b/common/mp4v2/mp4util.h +@@ -23,6 +23,10 @@ + #define __MP4_UTIL_INCLUDED__ + #include + ++#ifndef __STRING ++#define __STRING(x) #x ++#endif ++ + #ifndef ASSERT + #define ASSERT(expr) \ + if (!(expr)) { \ +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:52 +0000 Subject: [oe-commits] [meta-openembedded] 46/55: libnetfilter-queue: Update to git for SRC_URI In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.4FFD52376DB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 30d83075826254986c7503a0f9c81e6dcefec5a6 Author: Khem Raj AuthorDate: Thu Mar 30 13:29:01 2017 -0700 libnetfilter-queue: Update to git for SRC_URI brings in the fixes to build on musl Add a typo fix patch Signed-off-by: Khem Raj --- ...o-in-the-location-of-internal.h-in-includ.patch | 26 ++++++++++++++++++++++ .../libnetfilter/libnetfilter-queue_1.0.2.bb | 11 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch new file mode 100644 index 0000000..76d2d5d --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch @@ -0,0 +1,26 @@ +From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:26:56 -0700 +Subject: [PATCH] Correct typo in the location of internal.h in #include + +Signed-off-by: Khem Raj +--- + src/libnetfilter_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c +index 211a8ba..065d618 100644 +--- a/src/libnetfilter_queue.c ++++ b/src/libnetfilter_queue.c +@@ -32,7 +32,7 @@ + + #include + #include +-#include "src/internal.h" ++#include "internal.h" + + /** + * \mainpage +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb index ddf2aa5..0ca074c 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb @@ -6,10 +6,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "df09befac35cb215865b39a36c96a3fa" -SRC_URI[tar.sha256sum] = "838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32" +PV .= "+git${SRCREV}" +SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" -S = "${WORKDIR}/libnetfilter_queue-${PV}" +SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ + file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ + " + +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:49 +0000 Subject: [oe-commits] [meta-openembedded] 43/55: arptables: Upgrade to 0.0.4 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.336552376E6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit f353fcc7ba34c78db868426c22ec767defe459c8 Author: Khem Raj AuthorDate: Thu Mar 30 12:39:45 2017 -0700 arptables: Upgrade to 0.0.4 Switch the SRC_URI to git based fetcher Signed-off-by: Khem Raj --- .../arptables-compile-install.patch | 61 ----------------- ...FLAGS-for-package-specific-compiler-flags.patch | 79 ++++++++++++++++++++++ .../arptables-arpt-get-target-fix.patch | 0 .../arptables-init-busybox.patch | 0 .../arptables-remove-bashism.patch | 0 .../arptables.service | 0 .../{arptables_0.0.3-4.bb => arptables_git.bb} | 43 ++++++------ 7 files changed, 98 insertions(+), 85 deletions(-) diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch deleted file mode 100644 index 80e9804..0000000 --- a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: arptables-v0.0.3-4/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/Makefile 2010-03-22 15:52:56.000000000 +0300 -@@ -6,12 +6,11 @@ - LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= - --COPT_FLAGS:=-O2 --CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" - - ifndef ARPT_LIBDIR - ARPT_LIBDIR:=$(LIBDIR)/arptables -@@ -22,16 +21,16 @@ - all: arptables - - arptables.o: arptables.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables-standalone.o: arptables-standalone.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^ - - $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 - mkdir -p $(@D) -@@ -50,6 +49,7 @@ - cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_ - install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ -+ install -d $(DESTDIR)$(INITDIR) - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - -Index: arptables-v0.0.3-4/extensions/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/extensions/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/extensions/Makefile 2010-03-22 15:52:38.000000000 +0300 -@@ -4,4 +4,7 @@ - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) - - extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -+ -+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch new file mode 100644 index 0000000..e8be45e --- /dev/null +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -0,0 +1,79 @@ +From a2021f0bc0f029dfa05dcca5db3d2ec77904d41a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 12:33:51 -0700 +Subject: [PATCH] Use ARPCFLAGS for package specific compiler flags + +This leaves room for setting CFLAGS in environment +which OE uses to pass tweaks + +Signed-off-by: Khem Raj +--- + Makefile | 15 +++++++-------- + extensions/Makefile | 5 ++++- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 7bead0d..336db6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib + BINDIR:=$(PREFIX)/sbin + MANDIR:=$(PREFIX)/man + man8dir=$(MANDIR)/man8 +-INITDIR:=/etc/rc.d/init.d ++INITDIR:=/etc/init.d + SYSCONFIGDIR:=/etc/sysconfig + DESTDIR:= + + MANS = arptables.8 arptables-save.8 arptables-restore.8 + +-COPT_FLAGS:=-O2 +-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG +- ++ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" + ifndef ARPT_LIBDIR + ARPT_LIBDIR:=$(LIBDIR)/arptables + endif +@@ -25,13 +23,13 @@ include extensions/Makefile + all: arptables libarptc/libarptc.a + + arptables.o: arptables.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + arptables-standalone.o: arptables-standalone.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.a: libarptc/libarptc.o + $(AR) rcs $@ $< +@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv + install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore + cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi ++ install -d $(DESTDIR)$(INITDIR) ++ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables + rm -f arptables-save_ arptables-restore_ arptables.sysv_ + + .PHONY: install-man +diff --git a/extensions/Makefile b/extensions/Makefile +index 0189cc9..b046425 100644 +--- a/extensions/Makefile ++++ b/extensions/Makefile +@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK + EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) + + extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h +- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< ++ ++extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< +-- +2.12.1 + diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch b/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/meta-networking/recipes-support/arptables/arptables/arptables.service similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service rename to meta-networking/recipes-support/arptables/arptables/arptables.service diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_git.bb similarity index 61% rename from meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb rename to meta-networking/recipes-support/arptables/arptables_git.bb index f536408..274a55d 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,15 +1,13 @@ SUMMARY = "Administration tool for arp packet filtering" -LICENSE = "GPL-2.0" SECTION = "net" - -PR = "r2" - -RDEPENDS_${PN} += "perl" - +LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" +PV = "0.0.4+git${SRCPV}" + SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ - file://arptables-compile-install.patch \ + git://git.netfilter.org/arptables \ + file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ file://arptables-remove-bashism.patch \ @@ -18,26 +16,23 @@ SRC_URI = " \ SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" -S = "${WORKDIR}/arptables-v${PV}" - -do_compile () { - oe_runmake -} +S = "${WORKDIR}/git" +SYSTEMD_SERVICE_${PN} = "arptables.service" -# the install target is not multi-job safe, but it doesn't do much -# so we just install serially -# -PARALLEL_MAKEINST = "-j1" +inherit systemd -fakeroot do_install () { - oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install -} +EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'" do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + fi } -inherit systemd +RDEPENDS_${PN} += "perl" -SYSTEMD_SERVICE_${PN} = "arptables.service" +# the install target is not multi-job safe, but it doesn't do much +# so we just install serially +# +PARALLEL_MAKEINST = "-j1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:40 +0000 Subject: [oe-commits] [meta-openembedded] 34/55: libqb: Upgrade to 1.0.1 release In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063807.C535A2376DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 4f6c5e65c06ea7b99719d7b42cae0fbe5bfcc84a Author: Khem Raj AuthorDate: Wed Mar 29 16:37:15 2017 -0700 libqb: Upgrade to 1.0.1 release Add a patch needed for cross compiling Signed-off-by: Khem Raj --- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ++++++++++++++++++++++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +++---- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch new file mode 100644 index 0000000..28bc5c0 --- /dev/null +++ b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch @@ -0,0 +1,43 @@ +From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 16:31:38 -0700 +Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC + +Does not work during cross compile + +use a compile-time check to detect whether the +monotonic clock is available. This check can run just fine when we are +cross-compiling. + +Signed-off-by: Khem Raj +--- + configure.ac | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa13ae6..f4f0f46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + ) + + AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include ]], +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], ++[[ ++#include ++int main() { ++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) ++ #error No monotonic clock ++#endif ++ return 0; ++ ++]])], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb similarity index 67% rename from meta-oe/recipes-extended/libqb/libqb_0.17.2.bb rename to meta-oe/recipes-extended/libqb/libqb_1.0.1.bb index 94030b2..e26bb7c 100644 --- a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb @@ -4,22 +4,20 @@ It provides high performance logging, tracing, ipc, and poll." HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" SECTION = "libs" - LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" -inherit autotools-brokensep pkgconfig - -PV = "0.17.2+git${SRCPV}" +inherit autotools pkgconfig -SRCREV = "bd2c587f6ccacd8a5644b275d99324d200c2b378" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git" +PV .= "+git${SRCPV}" +SRCREV = "0a329683a76bc6aeb36f20f2bf6b43ba0440c4dc" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ + file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + " S = "${WORKDIR}/git" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) } - - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:48 +0000 Subject: [oe-commits] [meta-openembedded] 42/55: xarchiver: Fix build with security flags turned on In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.292622376E5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit ee6b7e68c589e8af4e931ecdefa832911b3d37ef Author: Khem Raj AuthorDate: Thu Mar 30 11:26:23 2017 -0700 xarchiver: Fix build with security flags turned on Signed-off-by: Khem Raj --- ...formatting-string-to-printf-like-function.patch | 43 ++++++++++++++++++++++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch new file mode 100644 index 0000000..2d7eb9a --- /dev/null +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch @@ -0,0 +1,43 @@ +From baf93ea9acf845c5455d577ac19a6f680dac3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 11:22:42 -0700 +Subject: [PATCH] Add proper formatting string to printf-like functions + +Avoids potential security holes and makes compiler happy + +| ../../../../../../../workspace/sources/xarchiver/src/window.c:236:72: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] +| gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); + +Signed-off-by: Khem Raj +--- + src/window.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/window.c b/src/window.c +index ca2f69f..3b10e2c 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -231,9 +231,9 @@ int xa_show_message_dialog (GtkWindow *window,int mode,int type,int button,const + { + int response; + +- dialog = gtk_message_dialog_new (window,mode,type,button,message1); ++ dialog = gtk_message_dialog_new (window,mode,type,"%s",button,message1); + gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_NO); +- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),"%s",message2); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + return response; +@@ -511,7 +511,7 @@ void xa_list_archive (GtkMenuItem *menuitem,gpointer data) + g_fprintf (stream,_("Comment:\n")); + if (bp) + g_fprintf(stream,"
");
+-			g_fprintf (stream,archive[idx]->comment->str);
++			g_fprintf (stream,"%s",archive[idx]->comment->str);
+ 			if (bp)
+ 				g_fprintf(stream,"
"); + g_fprintf (stream,"\n"); +-- +2.12.1 + diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index ca29922..ea34a52 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master \ + file://0001-Add-proper-formatting-string-to-printf-like-function.patch \ + " SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" PV = "0.5.3" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:54 +0000 Subject: [oe-commits] [meta-openembedded] 48/55: snort: Fix build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.62CBE2376E8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 977040ba84d2ade812883f05d77061be9bf1b449 Author: Khem Raj AuthorDate: Thu Mar 30 14:53:59 2017 -0700 snort: Fix build with musl Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index c62a8d3..57a04f2 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -5,6 +5,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux" +DEPENDS_append_libc-musl = " libtirpc" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -46,6 +47,9 @@ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + do_install_append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:51 +0000 Subject: [oe-commits] [meta-openembedded] 45/55: lxdm: Find libexecinfo if its on platform In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.474652376D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 98171831c762ed0fda0dc39f340339f624368676 Author: Khem Raj AuthorDate: Thu Mar 30 13:14:40 2017 -0700 lxdm: Find libexecinfo if its on platform fixes build with musl Signed-off-by: Khem Raj --- ...-for-libexecinfo-providing-backtrace-APIs.patch | 36 ++++++++++++++++++++++ meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 16 +++++----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch new file mode 100644 index 0000000..f9fd497 --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch @@ -0,0 +1,36 @@ +From 1d2425febf2020e38db70188df582acc9f37b136 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:01:33 -0700 +Subject: [PATCH] check for libexecinfo providing backtrace() APIs + +on musl it depends on external library to provide backtrace APIs +unlike glibc where it is bundled in + +Signed-off-by: Khem Raj +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index aa3291c..b15f65d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ AM_PROG_CC_C_O + + # Checks for libraries. + AC_CHECK_LIB([crypt], [crypt]) ++AC_CHECK_LIB([execinfo], [backtrace]) + + # Check for PAM support + AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]), +@@ -33,6 +34,7 @@ AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ]) + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_PID_T +-- +2.12.1 + diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 407129d..c98c3a1 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -2,13 +2,13 @@ SUMMARY = "LXDM is the lightweight display manager" HOMEPAGE = "http://blog.lxde.org/?p=531" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ - file://lxdm.conf \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ - ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ - file://0002-let-autotools-create-lxdm.conf.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ + file://lxdm.conf \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ + ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ + file://0002-let-autotools-create-lxdm.conf.patch \ + file://0001-check-for-libexecinfo-providing-backtrace-APIs.patch \ + " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" @@ -16,6 +16,7 @@ PE = "1" DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" +DEPENDS_append_libc-musl = " libexecinfo" # combine oe-core way with angstrom DISTRO_TYPE DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" @@ -25,6 +26,7 @@ inherit autotools pkgconfig gettext systemd distro_features_check REQUIRED_DISTRO_FEATURES = "x11" CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " +LDFLAGS_append_libc-musl = " -lexecinfo" EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:53 +0000 Subject: [oe-commits] [meta-openembedded] 47/55: libunique: Fix build with secutiy flags on In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.59A6D2376E7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 52a43d02c9c4c21461121b038adb1bea3d307961 Author: Khem Raj AuthorDate: Thu Mar 30 14:36:02 2017 -0700 libunique: Fix build with secutiy flags on Signed-off-by: Khem Raj --- ...-unique-Add-format-qualifier-s-for-string.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 11 ++++---- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch new file mode 100644 index 0000000..7f9fdf3 --- /dev/null +++ b/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch @@ -0,0 +1,32 @@ +From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 14:32:55 -0700 +Subject: [PATCH] test-unique: Add format qualifier %s for string + +Fixes potential security issues that compiler flags + +Signed-off-by: Khem Raj +--- + tests/test-unique.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test-unique.c b/tests/test-unique.c +index b7cde45..82ee81b 100644 +--- a/tests/test-unique.c ++++ b/tests/test-unique.c +@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, +- title); ++ "%s",title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +- message); ++ "%s",message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); + +-- +2.12.1 + diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb index 8aa293f..9133ccc 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb @@ -4,11 +4,12 @@ HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ -" + file://fix_for_compile_with_gcc-4.6.0.patch \ + file://noconst.patch \ + file://build.patch \ + file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ + file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ + " SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:56 +0000 Subject: [oe-commits] [meta-openembedded] 50/55: networkmanager: Fix build on musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.7B2EF2376DC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1d84d3b11ee2938a04a1403856fa888e49078536 Author: Khem Raj AuthorDate: Fri Mar 31 18:53:16 2017 -0700 networkmanager: Fix build on musl Signed-off-by: Khem Raj --- ...adjust-net-headers-for-musl-compatibility.patch | 82 +++++++++++++++++++ .../0001-check-for-strndupa-before-using-it.patch | 67 ++++++++++++++++ ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 +++++++ .../networkmanager/0003-Define-ETH_ALEN.patch | 39 +++++++++ ...Define-missing-features-to-cater-for-musl.patch | 93 ++++++++++++++++++++++ ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 +++++++++ .../networkmanager/networkmanager_1.4.2.bb | 15 ++-- 7 files changed, 357 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch new file mode 100644 index 0000000..ced0c7c --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch @@ -0,0 +1,82 @@ +From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 15:57:05 -0700 +Subject: [PATCH 1/5] adjust net/ headers for musl compatibility + +Signed-off-by: Khem Raj +--- + libnm-core/nm-utils.c | 12 +++++++----- + libnm-core/nm-utils.h | 5 ++--- + src/platform/wifi/wifi-utils.h | 2 +- + 3 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c +index df75d56..868224e 100644 +--- a/libnm-core/nm-utils.c ++++ b/libnm-core/nm-utils.c +@@ -19,24 +19,26 @@ + * Copyright 2005 - 2014 Red Hat, Inc. + */ + +-#include "nm-default.h" +- +-#include "nm-utils.h" +- + #include + #include + #include +-#include + #include + #include + #include + #include + #include ++//#include ++//#include ++#include ++ ++#include "nm-default.h" + ++#include "nm-utils.h" + #if WITH_JANSSON + #include + #endif + ++ + #include "nm-common-macros.h" + #include "nm-utils-private.h" + #include "nm-setting-private.h" +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h +index 407c14e..156ccae 100644 +--- a/libnm-core/nm-utils.h ++++ b/libnm-core/nm-utils.h +@@ -27,11 +27,10 @@ + + #include + +-#include +- + /* For ETH_ALEN and INFINIBAND_ALEN */ +-#include ++//#include + #include ++#include + + #include "nm-core-enum-types.h" + #include "nm-setting-wireless-security.h" +diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h +index 8e2b93f..84f5ce9 100644 +--- a/src/platform/wifi/wifi-utils.h ++++ b/src/platform/wifi/wifi-utils.h +@@ -22,7 +22,7 @@ + #ifndef __WIFI_UTILS_H__ + #define __WIFI_UTILS_H__ + +-#include ++//#include + + #include "nm-dbus-interface.h" + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch new file mode 100644 index 0000000..26f380b --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch @@ -0,0 +1,67 @@ +From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 18:37:19 -0700 +Subject: [PATCH] check for strndupa before using it + +musl does not have strndupa + +Signed-off-by: Khem Raj +--- + config.h.in | 4 ++++ + configure.ac | 1 + + src/systemd/src/basic/alloc-util.h | 12 ++++++++++++ + 3 files changed, 17 insertions(+) + +diff --git a/config.h.in b/config.h.in +index db8c135..c4229ed 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -41,6 +41,10 @@ + */ + #undef HAVE_DCGETTEXT + ++/* Define to 1 if you have the declaration of `strndupa', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_STRNDUPA ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_DLFCN_H + +diff --git a/configure.ac b/configure.ac +index 2630f8d..d0a57fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION) + + GIT_SHA_RECORD(NM_GIT_SHA) + ++AC_CHECK_DECLS([strndupa], [], [], [[#include ]]) + dnl + dnl Checks for typedefs, structures, and compiler characteristics. + dnl +diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h +index ceeee51..924b59c 100644 +--- a/src/systemd/src/basic/alloc-util.h ++++ b/src/systemd/src/basic/alloc-util.h +@@ -25,6 +25,18 @@ + #include + + #include "macro.h" ++#include "config.h" ++ ++#if !HAVE_DECL_STRNDUPA ++#define strndupa(s, n) \ ++ ({ \ ++ const char *__old = (s); \ ++ size_t __len = strnlen(__old, (n)); \ ++ char *__new = (char *)alloca(__len + 1); \ ++ __new[__len] = '\0'; \ ++ (char *)memcpy(__new, __old, __len); \ ++ }) ++#endif + + #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch new file mode 100644 index 0000000..22bc6e8 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch @@ -0,0 +1,30 @@ +From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:05:05 -0700 +Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl + +Signed-off-by: Khem Raj +--- + src/systemd/src/basic/socket-util.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h +index 2536b08..76d6107 100644 +--- a/src/systemd/src/basic/socket-util.h ++++ b/src/systemd/src/basic/socket-util.h +@@ -29,6 +29,12 @@ + #include + #include + ++#if !defined(__GLIBC__) ++/* SIOCGSTAMPNS from linux/asm-generic.h ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */ ++#include ++#endif ++ + #include "macro.h" + #include "util.h" + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch new file mode 100644 index 0000000..236914f --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch @@ -0,0 +1,39 @@ +From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:08:45 -0700 +Subject: [PATCH 3/5] Define ETH_ALEN + +Signed-off-by: Khem Raj +--- + libnm-core/nm-utils.h | 1 + + src/platform/wifi/wifi-utils.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h +index 156ccae..68e222b 100644 +--- a/libnm-core/nm-utils.h ++++ b/libnm-core/nm-utils.h +@@ -29,6 +29,7 @@ + + /* For ETH_ALEN and INFINIBAND_ALEN */ + //#include ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ + #include + #include + +diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h +index 84f5ce9..33a838d 100644 +--- a/src/platform/wifi/wifi-utils.h ++++ b/src/platform/wifi/wifi-utils.h +@@ -24,6 +24,8 @@ + + //#include + ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ ++ + #include "nm-dbus-interface.h" + + typedef struct WifiData WifiData; +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch new file mode 100644 index 0000000..27c9ae9 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch @@ -0,0 +1,93 @@ +From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:09:41 -0700 +Subject: [PATCH 4/5] Define missing features to cater for musl + +Signed-off-by: Khem Raj +--- + src/systemd/sd-adapt/nm-sd-adapt.h | 2 +- + src/systemd/src/basic/parse-util.c | 5 ++++- + src/systemd/src/basic/stdio-util.h | 2 ++ + src/systemd/src/basic/util.h | 5 +++++ + src/systemd/src/systemd/sd-event.h | 4 ---- + 5 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h +index cf27c1a..72c1b89 100644 +--- a/src/systemd/sd-adapt/nm-sd-adapt.h ++++ b/src/systemd/sd-adapt/nm-sd-adapt.h +@@ -119,7 +119,7 @@ G_STMT_START { \ + # ifdef HAVE___SECURE_GETENV + # define secure_getenv __secure_getenv + # else +-# error neither secure_getenv nor __secure_getenv is available ++# define secure_getenv getenv + # endif + #endif + +diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c +index 2738663..9c21e5a 100644 +--- a/src/systemd/src/basic/parse-util.c ++++ b/src/systemd/src/basic/parse-util.c +@@ -25,8 +25,11 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include +- ++#else ++#include ++#endif + #include "alloc-util.h" + #include "extract-word.h" + #include "macro.h" +diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h +index bd1144b..c92e935 100644 +--- a/src/systemd/src/basic/stdio-util.h ++++ b/src/systemd/src/basic/stdio-util.h +@@ -19,7 +19,9 @@ + along with systemd; If not, see . + ***/ + ++#ifdef __GLIBC__ + #include ++#endif + #include + #include + #include +diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h +index bb2fc31..fe074a5 100644 +--- a/src/systemd/src/basic/util.h ++++ b/src/systemd/src/basic/util.h +@@ -46,6 +46,11 @@ + #include "missing.h" + #include "time-util.h" + ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + size_t page_size(void) _pure_; + #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) + +diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h +index cc26b7d..c7e0004 100644 +--- a/src/systemd/src/systemd/sd-event.h ++++ b/src/systemd/src/systemd/sd-event.h +@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata); + typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata); + typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata); + typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata); +-#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED + typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata); +-#else +-typedef void* sd_event_child_handler_t; +-#endif + + int sd_event_default(sd_event **e); + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch new file mode 100644 index 0000000..f4a04c7 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -0,0 +1,36 @@ +From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:48:00 -0700 +Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over + specified + +Signed-off-by: Khem Raj +--- + src/systemd/src/systemd/sd-lldp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h +=================================================================== +--- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h ++++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h +@@ -22,7 +22,7 @@ + ***/ + + #include +-#include ++//#include + #include + + #include "sd-event.h" +Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c +=================================================================== +--- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c ++++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c +@@ -21,6 +21,7 @@ + #include "nm-sd-adapt.h" + + #include ++#include + + #include "sd-lldp.h" + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb index 064c58b..90499a6 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb @@ -23,11 +23,16 @@ DEPENDS = " \ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ - file://0002-Fix-nm-version-macro-includes.patch \ -" +SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ + file://0002-Fix-nm-version-macro-includes.patch \ + file://0001-adjust-net-headers-for-musl-compatibility.patch \ + file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \ + file://0003-Define-ETH_ALEN.patch \ + file://0004-Define-missing-features-to-cater-for-musl.patch \ + file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ + file://0001-check-for-strndupa-before-using-it.patch \ + " SRC_URI[md5sum] = "59b5b5585467756787c6cb535cbd306e" SRC_URI[sha256sum] = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:55 +0000 Subject: [oe-commits] [meta-openembedded] 49/55: pavucontrol: Backport patches to build with c++11 std In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.6F78E2376E9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 46aeae3a5879380b41e06503fa6a476eb07df9d2 Author: Khem Raj AuthorDate: Fri Mar 31 14:41:32 2017 -0700 pavucontrol: Backport patches to build with c++11 std Signed-off-by: Khem Raj --- .../0001-build-sys-Use-C-11-for-building.patch | 27 + ...-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch | 624 +++++++++++++++++++++ .../pulseaudio/pavucontrol_3.0.bb | 5 +- 3 files changed, 655 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch new file mode 100644 index 0000000..b59569f --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch @@ -0,0 +1,27 @@ +From 1f92aa5c8d910519e3a74b2e3a9199aa9026a16c Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Mon, 25 Jan 2016 08:41:42 +0530 +Subject: [PATCH 1/2] build-sys: Use C++11 for building + +This requirement was added by gtkmm at some point: + +http://www.murrayc.com/permalink/2015/07/31/gtkmm-now-uses-c11/ +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 5b50e2d..8f28782 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_LN_S + AC_TYPE_SIGNAL + AC_HEADER_STDC ++AX_CXX_COMPILE_STDCXX_11 + + AC_ARG_ENABLE(gtk3, + [AS_HELP_STRING([--disable-gtk3], +-- +2.12.1 + diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch new file mode 100644 index 0000000..97ec37d --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch @@ -0,0 +1,624 @@ +From ccb3eb7b4ff65414a56e2294080885b8966da52b Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Tue, 2 Feb 2016 17:01:47 +0530 +Subject: [PATCH 2/2] build-sys: Add m4 file for AX_CXX_COMPILE_STDCXX_11 + +--- + m4/ax_cxx_compile_stdcxx.m4 | 558 +++++++++++++++++++++++++++++++++++++++++ + m4/ax_cxx_compile_stdcxx_11.m4 | 39 +++ + 2 files changed, 597 insertions(+) + create mode 100644 m4/ax_cxx_compile_stdcxx.m4 + create mode 100644 m4/ax_cxx_compile_stdcxx_11.m4 + +diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 +new file mode 100644 +index 0000000..079e17d +--- /dev/null ++++ b/m4/ax_cxx_compile_stdcxx.m4 +@@ -0,0 +1,558 @@ ++# =========================================================================== ++# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) ++# ++# DESCRIPTION ++# ++# Check for baseline language coverage in the compiler for the specified ++# version of the C++ standard. If necessary, add switches to CXXFLAGS to ++# enable support. VERSION may be '11' (for the C++11 standard) or '14' ++# (for the C++14 standard). ++# ++# The second argument, if specified, indicates whether you insist on an ++# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. ++# -std=c++11). If neither is specified, you get whatever works, with ++# preference for an extended mode. ++# ++# The third argument, if specified 'mandatory' or if left unspecified, ++# indicates that baseline support for the specified C++ standard is ++# required and that the macro should error out if no mode with that ++# support is found. If specified 'optional', then configuration proceeds ++# regardless, after defining HAVE_CXX${VERSION} if and only if a ++# supporting mode is found. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Benjamin Kosnik ++# Copyright (c) 2012 Zack Weinberg ++# Copyright (c) 2013 Roy Stogner ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov ++# Copyright (c) 2015 Paul Norman ++# Copyright (c) 2015 Moritz Klammler ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 1 ++ ++dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro ++dnl (serial version number 13). ++ ++AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl ++ m4_if([$1], [11], [], ++ [$1], [14], [], ++ [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])], ++ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl ++ m4_if([$2], [], [], ++ [$2], [ext], [], ++ [$2], [noext], [], ++ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl ++ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], ++ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], ++ [$3], [optional], [ax_cxx_compile_cxx$1_required=false], ++ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) ++ AC_LANG_PUSH([C++])dnl ++ ac_success=no ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, ++ ax_cv_cxx_compile_cxx$1, ++ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [ax_cv_cxx_compile_cxx$1=yes], ++ [ax_cv_cxx_compile_cxx$1=no])]) ++ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then ++ ac_success=yes ++ fi ++ ++ m4_if([$2], [noext], [], [dnl ++ if test x$ac_success = xno; then ++ for switch in -std=gnu++$1 -std=gnu++0x; do ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, ++ $cachevar, ++ [ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS $switch" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [eval $cachevar=yes], ++ [eval $cachevar=no]) ++ CXXFLAGS="$ac_save_CXXFLAGS"]) ++ if eval test x\$$cachevar = xyes; then ++ CXXFLAGS="$CXXFLAGS $switch" ++ ac_success=yes ++ break ++ fi ++ done ++ fi]) ++ ++ m4_if([$2], [ext], [], [dnl ++ if test x$ac_success = xno; then ++ dnl HP's aCC needs +std=c++11 according to: ++ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf ++ dnl Cray's crayCC needs "-h std=c++11" ++ for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, ++ $cachevar, ++ [ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS $switch" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [eval $cachevar=yes], ++ [eval $cachevar=no]) ++ CXXFLAGS="$ac_save_CXXFLAGS"]) ++ if eval test x\$$cachevar = xyes; then ++ CXXFLAGS="$CXXFLAGS $switch" ++ ac_success=yes ++ break ++ fi ++ done ++ fi]) ++ AC_LANG_POP([C++]) ++ if test x$ax_cxx_compile_cxx$1_required = xtrue; then ++ if test x$ac_success = xno; then ++ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) ++ fi ++ else ++ if test x$ac_success = xno; then ++ HAVE_CXX$1=0 ++ AC_MSG_NOTICE([No compiler with C++$1 support was found]) ++ else ++ HAVE_CXX$1=1 ++ AC_DEFINE(HAVE_CXX$1,1, ++ [define if the compiler supports basic C++$1 syntax]) ++ fi ++ ++ AC_SUBST(HAVE_CXX$1) ++ fi ++]) ++ ++ ++dnl Test body for checking C++11 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++) ++ ++ ++dnl Test body for checking C++14 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ++) ++ ++ ++dnl Tests for new features in C++11 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ ++ ++// If the compiler admits that it is not ready for C++11, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif __cplusplus < 201103L ++ ++#error "This is not a C++11 compiler" ++ ++#else ++ ++namespace cxx11 ++{ ++ ++ namespace test_static_assert ++ { ++ ++ template ++ struct check ++ { ++ static_assert(sizeof(int) <= sizeof(T), "not big enough"); ++ }; ++ ++ } ++ ++ namespace test_final_override ++ { ++ ++ struct Base ++ { ++ virtual void f() {} ++ }; ++ ++ struct Derived : public Base ++ { ++ virtual void f() override {} ++ }; ++ ++ } ++ ++ namespace test_double_right_angle_brackets ++ { ++ ++ template < typename T > ++ struct check {}; ++ ++ typedef check single_type; ++ typedef check> double_type; ++ typedef check>> triple_type; ++ typedef check>>> quadruple_type; ++ ++ } ++ ++ namespace test_decltype ++ { ++ ++ int ++ f() ++ { ++ int a = 1; ++ decltype(a) b = 2; ++ return a + b; ++ } ++ ++ } ++ ++ namespace test_type_deduction ++ { ++ ++ template < typename T1, typename T2 > ++ struct is_same ++ { ++ static const bool value = false; ++ }; ++ ++ template < typename T > ++ struct is_same ++ { ++ static const bool value = true; ++ }; ++ ++ template < typename T1, typename T2 > ++ auto ++ add(T1 a1, T2 a2) -> decltype(a1 + a2) ++ { ++ return a1 + a2; ++ } ++ ++ int ++ test(const int c, volatile int v) ++ { ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == false, ""); ++ static_assert(is_same::value == false, ""); ++ auto ac = c; ++ auto av = v; ++ auto sumi = ac + av + 'x'; ++ auto sumf = ac + av + 1.0; ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == false, ""); ++ static_assert(is_same::value == true, ""); ++ return (sumf > 0.0) ? sumi : add(c, v); ++ } ++ ++ } ++ ++ namespace test_noexcept ++ { ++ ++ int f() { return 0; } ++ int g() noexcept { return 0; } ++ ++ static_assert(noexcept(f()) == false, ""); ++ static_assert(noexcept(g()) == true, ""); ++ ++ } ++ ++ namespace test_constexpr ++ { ++ ++ template < typename CharT > ++ unsigned long constexpr ++ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept ++ { ++ return *s ? strlen_c_r(s + 1, acc + 1) : acc; ++ } ++ ++ template < typename CharT > ++ unsigned long constexpr ++ strlen_c(const CharT *const s) noexcept ++ { ++ return strlen_c_r(s, 0UL); ++ } ++ ++ static_assert(strlen_c("") == 0UL, ""); ++ static_assert(strlen_c("1") == 1UL, ""); ++ static_assert(strlen_c("example") == 7UL, ""); ++ static_assert(strlen_c("another\0example") == 7UL, ""); ++ ++ } ++ ++ namespace test_rvalue_references ++ { ++ ++ template < int N > ++ struct answer ++ { ++ static constexpr int value = N; ++ }; ++ ++ answer<1> f(int&) { return answer<1>(); } ++ answer<2> f(const int&) { return answer<2>(); } ++ answer<3> f(int&&) { return answer<3>(); } ++ ++ void ++ test() ++ { ++ int i = 0; ++ const int c = 0; ++ static_assert(decltype(f(i))::value == 1, ""); ++ static_assert(decltype(f(c))::value == 2, ""); ++ static_assert(decltype(f(0))::value == 3, ""); ++ } ++ ++ } ++ ++ namespace test_uniform_initialization ++ { ++ ++ struct test ++ { ++ static const int zero {}; ++ static const int one {1}; ++ }; ++ ++ static_assert(test::zero == 0, ""); ++ static_assert(test::one == 1, ""); ++ ++ } ++ ++ namespace test_lambdas ++ { ++ ++ void ++ test1() ++ { ++ auto lambda1 = [](){}; ++ auto lambda2 = lambda1; ++ lambda1(); ++ lambda2(); ++ } ++ ++ int ++ test2() ++ { ++ auto a = [](int i, int j){ return i + j; }(1, 2); ++ auto b = []() -> int { return '0'; }(); ++ auto c = [=](){ return a + b; }(); ++ auto d = [&](){ return c; }(); ++ auto e = [a, &b](int x) mutable { ++ const auto identity = [](int y){ return y; }; ++ for (auto i = 0; i < a; ++i) ++ a += b--; ++ return x + identity(a + b); ++ }(0); ++ return a + b + c + d + e; ++ } ++ ++ int ++ test3() ++ { ++ const auto nullary = [](){ return 0; }; ++ const auto unary = [](int x){ return x; }; ++ using nullary_t = decltype(nullary); ++ using unary_t = decltype(unary); ++ const auto higher1st = [](nullary_t f){ return f(); }; ++ const auto higher2nd = [unary](nullary_t f1){ ++ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; ++ }; ++ return higher1st(nullary) + higher2nd(nullary)(unary); ++ } ++ ++ } ++ ++ namespace test_variadic_templates ++ { ++ ++ template ++ struct sum; ++ ++ template ++ struct sum ++ { ++ static constexpr auto value = N0 + sum::value; ++ }; ++ ++ template <> ++ struct sum<> ++ { ++ static constexpr auto value = 0; ++ }; ++ ++ static_assert(sum<>::value == 0, ""); ++ static_assert(sum<1>::value == 1, ""); ++ static_assert(sum<23>::value == 23, ""); ++ static_assert(sum<1, 2>::value == 3, ""); ++ static_assert(sum<5, 5, 11>::value == 21, ""); ++ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); ++ ++ } ++ ++ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae ++ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function ++ // because of this. ++ namespace test_template_alias_sfinae ++ { ++ ++ struct foo {}; ++ ++ template ++ using member = typename T::member_type; ++ ++ template ++ void func(...) {} ++ ++ template ++ void func(member*) {} ++ ++ void test(); ++ ++ void test() { func(0); } ++ ++ } ++ ++} // namespace cxx11 ++ ++#endif // __cplusplus >= 201103L ++ ++]]) ++ ++ ++dnl Tests for new features in C++14 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ ++ ++// If the compiler admits that it is not ready for C++14, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif __cplusplus < 201402L ++ ++#error "This is not a C++14 compiler" ++ ++#else ++ ++namespace cxx14 ++{ ++ ++ namespace test_polymorphic_lambdas ++ { ++ ++ int ++ test() ++ { ++ const auto lambda = [](auto&&... args){ ++ const auto istiny = [](auto x){ ++ return (sizeof(x) == 1UL) ? 1 : 0; ++ }; ++ const int aretiny[] = { istiny(args)... }; ++ return aretiny[0]; ++ }; ++ return lambda(1, 1L, 1.0f, '1'); ++ } ++ ++ } ++ ++ namespace test_binary_literals ++ { ++ ++ constexpr auto ivii = 0b0000000000101010; ++ static_assert(ivii == 42, "wrong value"); ++ ++ } ++ ++ namespace test_generalized_constexpr ++ { ++ ++ template < typename CharT > ++ constexpr unsigned long ++ strlen_c(const CharT *const s) noexcept ++ { ++ auto length = 0UL; ++ for (auto p = s; *p; ++p) ++ ++length; ++ return length; ++ } ++ ++ static_assert(strlen_c("") == 0UL, ""); ++ static_assert(strlen_c("x") == 1UL, ""); ++ static_assert(strlen_c("test") == 4UL, ""); ++ static_assert(strlen_c("another\0test") == 7UL, ""); ++ ++ } ++ ++ namespace test_lambda_init_capture ++ { ++ ++ int ++ test() ++ { ++ auto x = 0; ++ const auto lambda1 = [a = x](int b){ return a + b; }; ++ const auto lambda2 = [a = lambda1(x)](){ return a; }; ++ return lambda2(); ++ } ++ ++ } ++ ++ namespace test_digit_seperators ++ { ++ ++ constexpr auto ten_million = 100'000'000; ++ static_assert(ten_million == 100000000, ""); ++ ++ } ++ ++ namespace test_return_type_deduction ++ { ++ ++ auto f(int& x) { return x; } ++ decltype(auto) g(int& x) { return x; } ++ ++ template < typename T1, typename T2 > ++ struct is_same ++ { ++ static constexpr auto value = false; ++ }; ++ ++ template < typename T > ++ struct is_same ++ { ++ static constexpr auto value = true; ++ }; ++ ++ int ++ test() ++ { ++ auto x = 0; ++ static_assert(is_same::value, ""); ++ static_assert(is_same::value, ""); ++ return x; ++ } ++ ++ } ++ ++} // namespace cxx14 ++ ++#endif // __cplusplus >= 201402L ++ ++]]) +diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 +new file mode 100644 +index 0000000..09db383 +--- /dev/null ++++ b/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -0,0 +1,39 @@ ++# ============================================================================ ++# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html ++# ============================================================================ ++# ++# SYNOPSIS ++# ++# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional]) ++# ++# DESCRIPTION ++# ++# Check for baseline language coverage in the compiler for the C++11 ++# standard; if necessary, add switches to CXXFLAGS to enable support. ++# ++# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX ++# macro with the version set to C++11. The two optional arguments are ++# forwarded literally as the second and third argument respectively. ++# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for ++# more information. If you want to use this macro, you also need to ++# download the ax_cxx_compile_stdcxx.m4 file. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Benjamin Kosnik ++# Copyright (c) 2012 Zack Weinberg ++# Copyright (c) 2013 Roy Stogner ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov ++# Copyright (c) 2015 Paul Norman ++# Copyright (c) 2015 Moritz Klammler ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 14 ++ ++include([ax_cxx_compile_stdcxx.m4]) ++ ++AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) +-- +2.12.1 + diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb index e9f5d49..959068d 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb @@ -8,7 +8,10 @@ inherit gnome distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" +SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \ + file://0001-build-sys-Use-C-11-for-building.patch \ + file://0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch \ + " SRC_URI[md5sum] = "176308d2c03f8f3a7b2bd4f4d284fe71" SRC_URI[sha256sum] = "b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:59 +0000 Subject: [oe-commits] [meta-openembedded] 53/55: xdebug: 2.2.6 -> 2.5.1 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.98B742376E0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d479e4e53e4e92b990a037c973dc36ac68799f4e Author: dengke.du at windriver.com AuthorDate: Thu Mar 30 04:49:51 2017 -0400 xdebug: 2.2.6 -> 2.5.1 Upgrade the xdebug to fix the build failure with php 7.1 Signed-off-by: Dengke Du Signed-off-by: Martin Jansa --- .../recipes-php/xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb similarity index 86% rename from meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb rename to meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb index f7d6a4e..cc5bf0d 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb @@ -6,8 +6,8 @@ DEPENDS = "php" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -SRC_URI[md5sum] = "f216356861e27284580d0208060ea7fa" -SRC_URI[sha256sum] = "6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e" +SRC_URI[md5sum] = "6167b1e104f1108d77f08eb561a12b22" +SRC_URI[sha256sum] = "7fda9020fd5a2c549ae5a692fcabbb00f74e39dda81d53d25e622bdab4880ec2" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:57 +0000 Subject: [oe-commits] [meta-openembedded] 51/55: autofs: Patch to build on musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.843F62376DD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2bf0052d8342418c4bf5025cec4215824f9c2423 Author: Khem Raj AuthorDate: Fri Mar 31 19:14:53 2017 -0700 autofs: Patch to build on musl Signed-off-by: Khem Raj --- ...fine-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch | 50 +++++++++++++++++++++ .../0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 51 ++++++++++++++++++++++ .../recipes-daemons/autofs/autofs_5.1.1.bb | 6 ++- 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch new file mode 100644 index 0000000..075af57 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -0,0 +1,50 @@ +From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:10:57 -0700 +Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF + +if they are not defined as is in musl then define +them here + +Signed-off-by: Khem Raj +--- + include/automount.h | 8 ++++++++ + include/nsswitch.h | 3 +++ + 2 files changed, 11 insertions(+) + +diff --git a/include/automount.h b/include/automount.h +index 219b07d..b12c22a 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -42,6 +42,14 @@ + + #define ENABLE_CORES 1 + ++#ifndef __SWORD_TYPE ++# if __WORDSIZE == 32 /* System word size */ ++# define __SWORD_TYPE int ++# else /* __WORDSIZE == 64 */ ++# define __SWORD_TYPE long int ++# endif ++#endif ++ + /* We MUST have the paths to mount(8) and umount(8) */ + #ifndef HAVE_MOUNT + #error Failed to locate mount(8)! +diff --git a/include/nsswitch.h b/include/nsswitch.h +index 2b445a9..3db77b2 100644 +--- a/include/nsswitch.h ++++ b/include/nsswitch.h +@@ -24,6 +24,9 @@ + #include + #include "list.h" + ++#ifndef _PATH_NSSWITCH_CONF ++#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" ++#endif + #define NSSWITCH_FILE _PATH_NSSWITCH_CONF + + enum nsswitch_status { +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch new file mode 100644 index 0000000..6b6ba6d --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -0,0 +1,51 @@ +From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:12:10 -0700 +Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC + +S_IEXEC is portable + +Signed-off-by: Khem Raj +--- + daemon/lookup.c | 4 ++-- + modules/lookup_multi.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/lookup.c b/daemon/lookup.c +index 62071df..1bec97f 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c +index 6ec8434..88d081f 100644 +--- a/modules/lookup_multi.c ++++ b/modules/lookup_multi.c +@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch + continue; + } + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb index 8d55596..d85600e 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS += "libtirpc flex-native bison-native" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" + inherit autotools-brokensep systemd SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ @@ -21,7 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://force-STRIP-to-emtpy.patch \ file://remove-bashism.patch \ file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ -" + file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ + file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ + " SRC_URI[md5sum] = "e143df66b614b8cdb1ff533735f8e12d" SRC_URI[sha256sum] = "795419383b120d15699ab3b89ea0f3d029f6fb28405a83982d305c4b7b61130f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:39:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:39:00 +0000 Subject: [oe-commits] [meta-openembedded] 54/55: python-smbus: upgrade to 3.1.2 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.A14202376E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b121b06b9f163fcb23edcba201a94aa8857f9cd9 Author: Stefan Agner AuthorDate: Thu Mar 30 09:27:21 2017 -0700 python-smbus: upgrade to 3.1.2 Upgrade to 3.1.2 and use Yocto source mirror to follow commit f76fe46e098d ("i2c-tools: point SRC_URI at Yocto source mirrors") in OpenEmbedded cores i2c-tools recipe. With the upgrade to i2c-tools 3.1.2 Python 3 support has been added. To support Python 3 add a common recipe for all common information and one for each supported Python version 2 and 3. Signed-off-by: Stefan Agner Signed-off-by: Martin Jansa --- .../python/{python-smbus_3.1.1.bb => python-smbus.inc} | 10 ++++------ meta-python/recipes-devtools/python/python-smbus_3.1.2.bb | 2 ++ meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-smbus_3.1.1.bb b/meta-python/recipes-devtools/python/python-smbus.inc similarity index 60% rename from meta-python/recipes-devtools/python/python-smbus_3.1.1.bb rename to meta-python/recipes-devtools/python/python-smbus.inc index df47df6..ded30ce 100644 --- a/meta-python/recipes-devtools/python/python-smbus_3.1.1.bb +++ b/meta-python/recipes-devtools/python/python-smbus.inc @@ -2,14 +2,12 @@ SUMMARY = "Set of i2c tools for linux - Python module" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" -SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \ +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/i2c-tools-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "0fdbff53ebd0b8d9249256d6c56480b1" -SRC_URI[sha256sum] = "14d4d7d60d1c12e43f2befe239c682a5c44c27682f153d4b58c1e392d2db1700" +SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962" +SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441" -DEPENDS = "i2c-tools" - -inherit distutils +DEPENDS += "i2c-tools" S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" diff --git a/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb b/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb new file mode 100644 index 0000000..1b95778 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb @@ -0,0 +1,2 @@ +inherit distutils +require python-smbus.inc diff --git a/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb b/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb new file mode 100644 index 0000000..b357bcd --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb @@ -0,0 +1,2 @@ +inherit distutils3 +require python-smbus.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:38:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:38:58 +0000 Subject: [oe-commits] [meta-openembedded] 52/55: jsonrpc: Backport and create patches to build with musl In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.8EA242376DE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit f50484861b29b053cc16463dac4997df2257d08b Author: Khem Raj AuthorDate: Fri Mar 31 19:15:25 2017 -0700 jsonrpc: Backport and create patches to build with musl Signed-off-by: Khem Raj --- ...mset-and-family-needs-to-include-string.h.patch | 26 +++++++++++++++++++++ .../jsonrpc/0002-Fix-build-problem-on-Mac.patch | 27 ++++++++++++++++++++++ meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb | 4 +++- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch new file mode 100644 index 0000000..21ef98b --- /dev/null +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch @@ -0,0 +1,26 @@ +From f5416f1c2b2989f94163a2ae4b91c9b9fa13c620 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 13:32:31 -0700 +Subject: [PATCH 1/2] memset() and family needs to include string.h + +Signed-off-by: Khem Raj +--- + src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp +index 9fca57b..e63c49e 100644 +--- a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp ++++ b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + + using namespace jsonrpc; + using namespace std; +-- +2.12.1 + diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch new file mode 100644 index 0000000..aece45b --- /dev/null +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch @@ -0,0 +1,27 @@ +From 79050ef9607f242e0d509969b19e9390220c3411 Mon Sep 17 00:00:00 2001 +From: Yongwei Wu +Date: Sat, 31 Dec 2016 11:57:11 +0800 +Subject: [PATCH 2/2] Fix build problem on Mac. + +__suseconds_t is not defined on Mac/BSD; use the POSIX-conformant +suseconds_t. +--- + src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp +index 8e019ca..68107f2 100644 +--- a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp ++++ b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp +@@ -122,7 +122,7 @@ int FileDescriptorServer::WaitForRead() { + FD_ZERO(&except_fds); + FD_SET(inputfd, &read_fds); + timeout.tv_sec = 0; +- timeout.tv_usec = (__suseconds_t) (READ_TIMEOUT * 1000000); ++ timeout.tv_usec = (suseconds_t) (READ_TIMEOUT * 1000000); + // Wait for something to read + return select(inputfd + 1, &read_fds, &write_fds, &except_fds, &timeout); + } +-- +2.12.1 + diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb index 3a43f90..eb1ff65 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb @@ -13,7 +13,9 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \ file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \ file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \ -" + file://0001-memset-and-family-needs-to-include-string.h.patch \ + file://0002-Fix-build-problem-on-Mac.patch \ + " SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e" SECTION = "libs" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 06:39:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 06:39:01 +0000 Subject: [oe-commits] [meta-openembedded] 55/55: opencv: remove redundant build dependency on python2 In-Reply-To: <149102868649.30268.14642619100553213211@git.openembedded.org> References: <149102868649.30268.14642619100553213211@git.openembedded.org> Message-ID: <20170401063808.AAA432376DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b3f82159b8bef6c02ce2017c2bf628c589e595fe Author: Dmitry Rozhkov AuthorDate: Fri Mar 31 14:10:32 2017 +0300 opencv: remove redundant build dependency on python2 The recipe opencv_3.2.bb inherits to either distutils-base or distutils3-base classes or both which do add appropriate build dependency on python or python3 respectively. There's no need to have python in DEPENDS explicitly. It can even make things needlessly complicated in case a user wants to build python3-only images. The redundant build dependency on python is removed from DEPENDS. Signed-off-by: Dmitry Rozhkov Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index f47347a..f50bc05 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp" +DEPENDS = "libtool swig swig-native bzip2 zlib glib-2.0 libwebp" SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810" SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 07:15:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 07:15:53 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (49772e1 -> e788fb2) Message-ID: <149103095351.3973.11201205694730005650@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 49772e1 distutils3.bbclass: Fix path to python for scripts add c0e0b37 perl-native: Bring build dependencies inline with target perl package add cffc3a8 openssl: add a "openssl10" PROVIDES add ee7c195 oeqa/runtime/cases: Migrate underscore cases add 4a44a76 volatile-binds: correct some errors reported by systemd add d6fea65 wic-tools: add btrfs-tools squashfs-tools to DEPENDS add 95ec9e6 oe-selftest: add wic test case test_fs_types add 44e9406 filemap: remove FilemapSeek class add 36779a9 oe-selftest: add kickstart_parser test case add 9a47075 wic: remove fsimage plugin add 9674bbd wic: use wic-tools STAGING_DATADIR as bootimg_dir add 9749336 wic: remove runner.show API add 1e45a4f wic: remove unused code from runner module add 4da2526 oe-selftest: add test_image_bootpart_globbed test for wic add cf06e67 oe-selftest: fix incorrect fstype add 21af89a wic: allow only supported fstypes add ebb8fb5 wic: don't silently skip unknown fstypes add f06c507 wic: support 'msdos' fstype add b6243a0 wic: set FAT 16 for msdos partitions add 230452f wic: set correct system id for msdos partitions add ab7f2a7 wic: fix list of supported fstypes in help content add 044dd14 oe-selftest: test creation of msdos partition add 9152960 wic: remove prepare_empty_partition_squashfs add be93e37 wic: partition: Update fsck parameters add 8413e26 kernel.bbclass: fix a typo add 396e9dc systemd: make vconsole a PACKAGECONFIG option add 1271d50 oe-run-native: OLDPATH -> OLD_PATH add b77cf43 selftest/pkgdata: replace the glibc recipe allowing execution on non-poky distros add 2799eda lsb: Avoid using double slashes in paths add b791f13 lsb: Create ${base_prefix}/lib64 correctly when needed add 474ef7c base-files: resize only serial tty's in profile add e788fb2 kernel.bbclass: introduce INITRAMFS_IMAGE_NAME No new revisions were added by this update. Summary of changes: meta/classes/kernel-fitimage.bbclass | 10 +- meta/classes/kernel.bbclass | 23 +- meta/lib/oeqa/runtime/cases/_ptest.py | 130 ++++----- meta/lib/oeqa/runtime/cases/_qemutiny.py | 11 +- meta/lib/oeqa/selftest/pkgdata.py | 28 +- meta/lib/oeqa/selftest/wic.py | 41 +++ meta/recipes-connectivity/openssl/openssl.inc | 2 + meta/recipes-core/base-files/base-files/profile | 2 +- meta/recipes-core/meta/wic-tools.bb | 6 +- meta/recipes-core/systemd/systemd_232.bb | 3 +- meta/recipes-core/volatile-binds/volatile-binds.bb | 9 + meta/recipes-devtools/perl/perl-native_5.24.1.bb | 4 + meta/recipes-extended/lsb/lsb_4.1.bb | 59 ++-- scripts/lib/wic/filemap.py | 309 ++++----------------- scripts/lib/wic/help.py | 2 + scripts/lib/wic/ksparser.py | 4 +- scripts/lib/wic/partition.py | 114 +++----- scripts/lib/wic/plugins/imager/direct.py | 15 +- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 48 ++-- scripts/lib/wic/plugins/source/fsimage.py | 56 ---- scripts/lib/wic/utils/misc.py | 14 +- scripts/lib/wic/utils/runner.py | 74 +---- scripts/oe-run-native | 2 +- 23 files changed, 315 insertions(+), 651 deletions(-) delete mode 100644 scripts/lib/wic/plugins/source/fsimage.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 07:15:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 07:15:55 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: dpkg: Add PACKAGECONFIG for liblzma and enable it Message-ID: <149103095560.4276.9331606318272508500@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new 97b2a20 dpkg: Add PACKAGECONFIG for liblzma and enable it 97b2a20 is described below commit 97b2a20b55acf76ebaacff0054e0f3c2b4236847 Author: Richard Purdie AuthorDate: Fri Mar 31 14:39:16 2017 +0100 dpkg: Add PACKAGECONFIG for liblzma and enable it liblzma is part of xz and we already build it but configure it out. This makes no sense. Enabling it means we gain multithreaded compression and it speeds dpkg-deb up massively. It also removes the fork overhead of separate xz processes. Turning the existing config into a PACKAGECONFIG and turning it on by default therefore makes best use of what we have available. The manual RDEPENDS are no longer needed since it uses liblzma which is picked up by the shlibs code magically. Signed-off-by: Richard Purdie --- meta/recipes-devtools/dpkg/dpkg.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 6abe3ae..870117a 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -4,8 +4,8 @@ SECTION = "base" DEPENDS = "zlib bzip2 perl ncurses" DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz perl" -RDEPENDS_${PN}_class-native = "xz-native" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" +RDEPENDS_${PN}_class-native = "" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" @@ -28,10 +28,12 @@ EXTRA_OECONF = "\ --enable-start-stop-daemon \ --with-libz \ --with-libbz2 \ - --without-liblzma \ --without-libselinux \ " +PACKAGECONFIG = "liblzma" +PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" + EXTRA_OECONF += "TAR=tar" EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 07:24:05 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 07:24:05 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: fetch2: Do not fail to create symbolic links if they already exist Message-ID: <149103144502.6003.4823252090729042410@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. The following commit(s) were added to refs/heads/master-next by this push: new 58a0353 fetch2: Do not fail to create symbolic links if they already exist 58a0353 is described below commit 58a03531c8183b165bb7dcad86d8559c92bc150d Author: Peter Kjellerstedt AuthorDate: Fri Mar 31 16:59:56 2017 +0200 fetch2: Do not fail to create symbolic links if they already exist When the fetcher retrieves file:// URLs, there is no lock file being used. This means that in case two separate tasks (typically from two concurrent invocations of bitbake) want to download the same file:// URL at the same time, there is a very small chance that they also end up wanting to create a symbolic link to the file at the same time. This would previously lead to one of the tasks failing as the other task would have created the link. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index ea72025..136fc29 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -983,7 +983,14 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): open(ud.donestamp, 'w').close() dest = os.path.join(dldir, os.path.basename(ud.localpath)) if not os.path.exists(dest): - os.symlink(ud.localpath, dest) + # In case this is executing without any file locks held (as is + # the case for file:// URLs), two tasks may end up here at the + # same time, in which case we do not want the second task to + # fail when the link has already been created by the first task. + try: + os.symlink(ud.localpath, dest) + except FileExistsError: + pass if not verify_donestamp(origud, ld) or origud.method.need_update(origud, ld): origud.method.download(origud, ld) if hasattr(origud.method,"build_mirror_data"): @@ -995,7 +1002,11 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): # Broken symbolic link os.unlink(origud.localpath) - os.symlink(ud.localpath, origud.localpath) + # As per above, in case two tasks end up here simultaneously. + try: + os.symlink(ud.localpath, origud.localpath) + except FileExistsError: + pass update_stamp(origud, ld) return ud.localpath -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 22:29:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 22:29:03 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (e788fb2 -> 3b7111b) Message-ID: <149108574315.8062.18377911761456464997@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from e788fb2 kernel.bbclass: introduce INITRAMFS_IMAGE_NAME add 97b2a20 dpkg: Add PACKAGECONFIG for liblzma and enable it add ae13f58 python: remove stale link to "Python for Embedded Systems Site" add 46c757d ncurses_6.0: Improve reproducibility add b007eb1 binutils: Detect 64bit mips target for gold add 3b25404 scripts: add oe-build-perf-report script add 9e97ff1 scripts/contrib: add oe-build-perf-report-email add 443d2d3 autoconf: Adjust shebang lines to remove interpreter path hardcode add 3b7111b automake: Adjust shebang lines to remove interpreter path hardcode No new revisions were added by this update. Summary of changes: .../ncurses/files/configure-reproducible.patch | 20 + meta/recipes-core/ncurses/ncurses_6.0+20161126.bb | 1 + meta/recipes-devtools/autoconf/autoconf.inc | 7 +- ...tion-in-shebangs-with-modern-use-warnings.patch | 120 +++++ meta/recipes-devtools/autoconf/autoconf_2.69.bb | 1 + ...tion-in-shebangs-with-modern-use-warnings.patch | 99 ++++ meta/recipes-devtools/automake/automake_1.15.bb | 13 +- meta/recipes-devtools/binutils/binutils-2.28.inc | 1 + .../binutils/0016-Detect-64-bit-MIPS-targets.patch | 50 ++ meta/recipes-devtools/dpkg/dpkg.inc | 8 +- .../python/python-2.7-manifest.inc | 1 - .../python/python-3.5-manifest.inc | 1 - .../python/python-native-2.7-manifest.inc | 1 - .../python/python-native-3.5-manifest.inc | 1 - scripts/contrib/oe-build-perf-report-email.py | 266 +++++++++++ scripts/contrib/python/generate-manifest-2.7.py | 1 - scripts/contrib/python/generate-manifest-3.5.py | 1 - scripts/lib/build_perf/__init__.py | 31 ++ .../__init__.py => scripts/lib/build_perf/html.py | 18 +- scripts/lib/build_perf/html/measurement_chart.html | 50 ++ scripts/lib/build_perf/html/report.html | 209 ++++++++ scripts/lib/build_perf/report.py | 342 +++++++++++++ scripts/lib/build_perf/scrape-html-report.js | 56 +++ scripts/oe-build-perf-report | 531 +++++++++++++++++++++ 24 files changed, 1807 insertions(+), 22 deletions(-) create mode 100644 meta/recipes-core/ncurses/files/configure-reproducible.patch create mode 100644 meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch create mode 100644 meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0016-Detect-64-bit-MIPS-targets.patch create mode 100755 scripts/contrib/oe-build-perf-report-email.py create mode 100644 scripts/lib/build_perf/__init__.py copy meta/lib/oeqa/buildperf/__init__.py => scripts/lib/build_perf/html.py (58%) create mode 100644 scripts/lib/build_perf/html/measurement_chart.html create mode 100644 scripts/lib/build_perf/html/report.html create mode 100644 scripts/lib/build_perf/report.py create mode 100644 scripts/lib/build_perf/scrape-html-report.js create mode 100755 scripts/oe-build-perf-report -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 1 22:29:14 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 01 Apr 2017 22:29:14 +0000 Subject: [oe-commits] [bitbake] branch master updated (2c424b8 -> 58a0353) Message-ID: <149108575435.8324.13698619633414950803@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository bitbake. from 2c424b8 bitbake: Bump version to 1.33.3 add 58a0353 fetch2: Do not fail to create symbolic links if they already exist No new revisions were added by this update. Summary of changes: lib/bb/fetch2/__init__.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 3 21:32:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Apr 2017 21:32:35 +0000 Subject: [oe-commits] [bitbake] branch master updated: bitbake-user-manual: Fixed special character in -D output Message-ID: <149125515536.21633.8576822392806260675@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository bitbake. The following commit(s) were added to refs/heads/master by this push: new 0476ec4 bitbake-user-manual: Fixed special character in -D output 0476ec4 is described below commit 0476ec4605c94b9e0208cfd3fa48ecf3e3f04181 Author: Scott Rifenbark AuthorDate: Mon Apr 3 14:24:34 2017 -0700 bitbake-user-manual: Fixed special character in -D output Fixes [YOCTO #9962] The new output for -D was copied into the manual and merged by the engineering team before checking to see if the manual would make properly. The next output for -D introduced an error through the string "". The angled bracket characters are illegal in docbook and must be replaced by "<" and ">", respectively. I made this fix. Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-intro.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/doc/bitbake-user-manual/bitbake-user-manual-intro.xml index 5bbfc67..ca7f724 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-intro.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-intro.xml @@ -506,7 +506,7 @@ Read the specified file after bitbake.conf. -v, --verbose Enable tracing of shell tasks (with 'set -x'). Also print bb.note(...) messages to stdout (in - addition to writing them to ${T}/log.do_). + addition to writing them to ${T}/log.do_<task>). -D, --debug Increase the debug level. You can specify this more than once. -D sets the debug level to 1, where only bb.debug(1, ...) messages are printed -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 3 21:32:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 03 Apr 2017 21:32:37 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (58a0353 -> 0476ec4) Message-ID: <149125515738.21793.11999035779890512250@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from 58a0353 fetch2: Do not fail to create symbolic links if they already exist add 0476ec4 bitbake-user-manual: Fixed special character in -D output No new revisions were added by this update. Summary of changes: doc/bitbake-user-manual/bitbake-user-manual-intro.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:55 +0000 Subject: [oe-commits] [openembedded-core] 02/11: sanity: explain where TMPDIR is if we're telling the user to delete it In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.1B728237C4A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c03de901213846d7c8cc2a12a97034273aa904c3 Author: Ross Burton AuthorDate: Tue Apr 4 17:14:06 2017 +0100 sanity: explain where TMPDIR is if we're telling the user to delete it Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 94c78b5..e8064ac 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -589,7 +589,7 @@ def sanity_handle_abichanges(status, d): with open(abifile, "w") as f: f.write(current_abi) elif int(abi) <= 11 and current_abi == "12": - status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't make sense and this change will rebuild everything so please start with a clean TMPDIR.\n") + status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't make sense and this change will rebuild everything so please delete TMPDIR (%s).\n" % d.getVar("TMPDIR")) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:53 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (3b7111b -> 434b485) Message-ID: <149138201387.11000.4978957775335825713@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 3b7111b automake: Adjust shebang lines to remove interpreter path hardcode new 760ab75 recipe_sanity: Drop now unused FILESDIR new c03de90 sanity: explain where TMPDIR is if we're telling the user to delete it new d8b4c58 scripts: change way we find native tools (pseudo) new 6c0fc4d meta-ide-support: exclude this recipe from rm_work new 1910f9e devtool: point runqemu to correct native bindir new 3211d43 kernel.bbclass: move in addtask kernel_link_images statement from linux-yocto.inc new 57357d4 x86-base.inc, qemuarm.conf: prefer 4.10 version of linux-yocto new 3810738 selftest/commands: extend variable regex to include A_B variable notation new 087e120 selftest/devtool: use kernel provider instead of recipe allowing other kernel providers new ebfd79a gpgme: fix configure if 'import distutils' causes output on stderr new 434b485 runtime/dnf : Add ID to the dnf test cases The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel.bbclass | 1 + meta/classes/recipe_sanity.bbclass | 17 ---------------- meta/classes/sanity.bbclass | 2 +- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/lib/oeqa/runtime/cases/dnf.py | 12 +++++++++++ meta/lib/oeqa/selftest/devtool.py | 23 +++++++++++----------- meta/lib/oeqa/utils/commands.py | 2 +- meta/recipes-core/meta/meta-ide-support.bb | 1 + meta/recipes-kernel/linux/linux-yocto.inc | 1 - .../gpgme/gpgme/python-import.patch | 19 ++++++++++++++++++ meta/recipes-support/gpgme/gpgme_1.8.0.bb | 2 +- scripts/lib/devtool/runqemu.py | 4 +++- scripts/oe-find-native-sysroot | 8 ++++---- 14 files changed, 57 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-support/gpgme/gpgme/python-import.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:57 +0000 Subject: [oe-commits] [openembedded-core] 04/11: meta-ide-support: exclude this recipe from rm_work In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.2D07C237C4C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6c0fc4daee0e32c85c8895ce77126d3d0c6c2ed5 Author: brian avery AuthorDate: Tue Apr 4 15:22:11 2017 -0700 meta-ide-support: exclude this recipe from rm_work The results of meta-ide-support are used by utilities like runqemu and runqemu-extract-sdk. Since the usr/bin that meta-ide-support creates is subsequently removed bu rm_work, we exclude this recipe from the rm_work list. [YOCTO #11119] Signed-off-by: brian avery Signed-off-by: Richard Purdie --- meta/recipes-core/meta/meta-ide-support.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 1c4aded..0692ec8 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -4,6 +4,7 @@ LICENSE = "MIT" DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native" PR = "r3" +RM_WORK_EXCLUDE += "${PN}" inherit meta toolchain-scripts nopackages -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:54 +0000 Subject: [oe-commits] [openembedded-core] 01/11: recipe_sanity: Drop now unused FILESDIR In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.14259237C49@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 760ab75be6b794fdcd0b1717439fcea605db9e0b Author: Richard Purdie AuthorDate: Wed Apr 5 09:33:33 2017 +0100 recipe_sanity: Drop now unused FILESDIR FILESDIR is long dead and unreferenced pretty much anywhere now, drop these sanity references too. Signed-off-by: Richard Purdie --- meta/classes/recipe_sanity.bbclass | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index 3b00b0e..7fa4a84 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass @@ -70,22 +70,6 @@ def can_delete_FILESPATH(cfgdata, d): return False return expected != unexpanded -def can_delete_FILESDIR(cfgdata, d): - expected = cfgdata.get("FILESDIR") - #expected = "${@bb.utils.which(d.getVar('FILESPATH'), '.')}" - unexpanded = d.getVar("FILESDIR", False) - if unexpanded is None: - return False - - expanded = os.path.normpath(d.getVar("FILESDIR")) - filespath = d.getVar("FILESPATH").split(":") - filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)] - - return unexpanded != expected and \ - os.path.exists(expanded) and \ - (expanded in filespath or - expanded == d.expand(expected)) - def can_delete_others(p, cfgdata, d): for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS", "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: @@ -112,7 +96,6 @@ python do_recipe_sanity () { p = "%s %s %s" % (d.getVar("PN"), d.getVar("PV"), d.getVar("PR")) sanitychecks = [ - (can_delete_FILESDIR, "candidate for removal of FILESDIR"), (can_delete_FILESPATH, "candidate for removal of FILESPATH"), #(can_use_autotools_base, "candidate for use of autotools_base"), (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:00 +0000 Subject: [oe-commits] [openembedded-core] 07/11: x86-base.inc, qemuarm.conf: prefer 4.10 version of linux-yocto In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.48678237C4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 57357d4e7f5d256a5cc657798f955f1ac8416665 Author: Martin Jansa AuthorDate: Tue Apr 4 10:02:02 2017 +0200 x86-base.inc, qemuarm.conf: prefer 4.10 version of linux-yocto * 4.8 version was removed in: commit 466e6e45ca04a07ebe1b1f52de747f077b362d54 Author: Bruce Ashfield Date: Tue Mar 28 08:58:07 2017 -0400 linux-yocto: drop 4.8 recipes We have 4.1 (LTSI), 4.4 (LTS), 4.9 (LTS/LTSI) and 4.10 available in master. 4.8 is no longer required, so we drop the recipe to keep the version selection under control. * causing each build to start with 188 lines of this stuff: NOTE: preferred version 4.8% of linux-yocto not available (for item virtual/kernel) NOTE: versions of linux-yocto available: 4.1.38+gitAUTOINC+7140ddb86e_4d2c95e78c 4.10.5+gitAUTOINC+01f18cba44_b97dcd4f06 4.4.56+gitAUTOINC+271b0c8d51_01aaede0a2 4.9.17+gitAUTOINC+8b97a445fa_3ff3760c2a NOTE: preferred version 4.8% of linux-yocto not available (for item kernel-module-raid456) NOTE: versions of linux-yocto available: 4.1.38+gitAUTOINC+7140ddb86e_4d2c95e78c 4.10.5+gitAUTOINC+01f18cba44_b97dcd4f06 4.4.56+gitAUTOINC+271b0c8d51_01aaede0a2 4.9.17+gitAUTOINC+8b97a445fa_3ff3760c2a Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index 40d5957..7365953 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc @@ -20,7 +20,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "4.8%" +PREFERRED_VERSION_linux-yocto ??= "4.10%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index f9d6dd7..6b875e4 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" -PREFERRED_VERSION_linux-yocto ??= "4.8%" +PREFERRED_VERSION_linux-yocto ??= "4.10%" QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:56 +0000 Subject: [oe-commits] [openembedded-core] 03/11: scripts: change way we find native tools (pseudo) In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.24091237C4B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d8b4c58676705e9749347be0e8f191ccccc37f05 Author: brian avery AuthorDate: Tue Apr 4 15:22:10 2017 -0700 scripts: change way we find native tools (pseudo) oe-find-native-sysroot: Recipe Specific Sysroots have eliminated the large STAGING_DIR_NATIVE. Now, we will rely on the meta-ide-support sysroot that is what was populating the large STAGING_DIR_NATIVE in previous versions anyway. We now look for RECIPE_SYSROOT_NATIVE. [YOCTO #11119] Signed-off-by: brian avery Signed-off-by: Richard Purdie --- scripts/oe-find-native-sysroot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot index 13a5c46..3f4c29d 100755 --- a/scripts/oe-find-native-sysroot +++ b/scripts/oe-find-native-sysroot @@ -2,7 +2,7 @@ # # Find a native sysroot to use - either from an in-tree OE build or # from a toolchain installation. It then ensures the variable -# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets +# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets # $PSEUDO to the path of the pseudo binary. # # This script is intended to be run within other scripts by source'ing @@ -54,10 +54,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then exit 1 fi touch conf/sanity.conf - OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` + OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` rm -f conf/sanity.conf else - OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` + OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` fi else echo "Error: Unable to locate bitbake command." @@ -72,7 +72,7 @@ fi if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then # This indicates that there was an error running bitbake -e that # the user needs to be informed of - echo "There was an error running bitbake to determine STAGING_DIR_NATIVE" + echo "There was an error running bitbake to determine RECIPE_SYSROOT_NATIVE" echo "Here is the output from bitbake -e" bitbake -e exit 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:58 +0000 Subject: [oe-commits] [openembedded-core] 05/11: devtool: point runqemu to correct native bindir In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.353ED237C4D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1910f9e9336bfedc8278a3bc02e7e7f934a4fc86 Author: brian avery AuthorDate: Tue Apr 4 16:23:24 2017 -0700 devtool: point runqemu to correct native bindir devtool/runqemu.py was relying on STAGING_BINDIR_NATIVE to find the host tools it needed like qemu-system-. In the post RSS world, this no longer exists. This patch points it to {STAGING_DIR}/{BUILD_ARCH}/{bindir_native}. [YOCTO #11223] Signed-off-by: brian avery Signed-off-by: Richard Purdie --- scripts/lib/devtool/runqemu.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/lib/devtool/runqemu.py b/scripts/lib/devtool/runqemu.py index 641664e..e26cf28 100644 --- a/scripts/lib/devtool/runqemu.py +++ b/scripts/lib/devtool/runqemu.py @@ -32,7 +32,9 @@ def runqemu(args, config, basepath, workspace): tinfoil = setup_tinfoil(config_only=True, basepath=basepath) try: machine = tinfoil.config_data.getVar('MACHINE') - bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE') + bindir_native = os.path.join(tinfoil.config_data.getVar('STAGING_DIR'), + tinfoil.config_data.getVar('BUILD_ARCH'), + tinfoil.config_data.getVar('bindir_native').lstrip(os.path.sep)) finally: tinfoil.shutdown() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:46:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:46:59 +0000 Subject: [oe-commits] [openembedded-core] 06/11: kernel.bbclass: move in addtask kernel_link_images statement from linux-yocto.inc In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.3F181237C4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3211d43d80f69d9c200a0e4f90fd37736046aafe Author: Ming Liu AuthorDate: Thu Mar 30 15:20:13 2017 +0200 kernel.bbclass: move in addtask kernel_link_images statement from linux-yocto.inc Add kernel_link_images task in kernel.bbclass instead of adding it in linux-yocto.inc, or else the recipes inheriting kernel.bbclass might run into implicit dependency issues. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 1 + meta/recipes-kernel/linux/linux-yocto.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index b7f5fce..8954b28 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -539,6 +539,7 @@ do_kernel_link_images() { ln -sf ../../../vmlinuz.bin fi } +addtask kernel_link_images after do_compile before do_strip do_strip() { if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 556546f..637506a 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -65,6 +65,5 @@ do_install_append(){ # extra tasks addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile -addtask kernel_link_images after do_compile before do_strip addtask validate_branches before do_patch after do_kernel_checkout addtask kernel_configcheck after do_configure before do_compile -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:01 +0000 Subject: [oe-commits] [openembedded-core] 08/11: selftest/commands: extend variable regex to include A_B variable notation In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.4FF21237C50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3810738eff6bdcf27c7e291dbeaedc699ab14bfc Author: Leonardo Sandoval AuthorDate: Tue Apr 4 09:45:46 2017 -0700 selftest/commands: extend variable regex to include A_B variable notation This change allows quering for variables with the format A_B, i.e. PREFERRED_PROVIDER_virtual/kernel instead of just A. Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index 2951dfb..57286fc 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -165,7 +165,7 @@ def get_bb_vars(variables=None, target=None, postconfig=None): if variables is not None: variables = variables.copy() - var_re = re.compile(r'^(export )?(?P\w+)="(?P.*)"$') + var_re = re.compile(r'^(export )?(?P\w+(_.*)?)="(?P.*)"$') unset_re = re.compile(r'^unset (?P\w+)$') lastline = None values = {} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:03 +0000 Subject: [oe-commits] [openembedded-core] 10/11: gpgme: fix configure if 'import distutils' causes output on stderr In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.69A65237C52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ebfd79ae6e5954253c3bb0886d476be480b24de8 Author: Ross Burton AuthorDate: Tue Apr 4 15:40:01 2017 +0100 gpgme: fix configure if 'import distutils' causes output on stderr There are a number of reasons that importing a module could cause output on stderr that isn't a fatal error (compatibilty problems with inputrc, or encoding warnings) so backport a patch from autoconf-archive to only check the exit code instead of asserting that stderr is empty. [ YOCTO #11231 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/gpgme/gpgme/python-import.patch | 19 +++++++++++++++++++ meta/recipes-support/gpgme/gpgme_1.8.0.bb | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/gpgme/gpgme/python-import.patch b/meta/recipes-support/gpgme/gpgme/python-import.patch new file mode 100644 index 0000000..61b77a1 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/python-import.patch @@ -0,0 +1,19 @@ +Don't check for output on stderr to know if an import worked, host inputrc and +sysroot readline can cause warnings on stderr. + +Upstream-Status: Backport (from autoconf-archive 883a2abd) +Signed-off-by: Ross Burton + +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +index b990d5b..318b089 100644 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.8.0.bb index 2756ef8..eddf3a0 100644 --- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.8.0.bb @@ -15,6 +15,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://python-lang-config.patch \ file://0001-Correctly-install-python-modules.patch \ file://0001-Avoid-host-contamination-from-gpg-config.patch \ + file://python-import.patch \ " SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" @@ -70,4 +71,3 @@ do_configure_prepend () { rm -f ${S}/m4/gpg-error.m4 rm -f ${S}/m4/libassuan.m4 } - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:04 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:04 +0000 Subject: [oe-commits] [openembedded-core] 11/11: runtime/dnf : Add ID to the dnf test cases In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.76DBA237C53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 434b48566f2febcc5bd5d6cd9c04788f008ffce1 Author: Jose Perez Carranza AuthorDate: Tue Apr 4 10:02:10 2017 -0500 runtime/dnf : Add ID to the dnf test cases Add the corresponding Testopia ID to the test cases for dnf Signed-off-by: Jose Perez Carranza Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/dnf.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py index eb3af07..2f87296 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py @@ -26,22 +26,27 @@ class DnfBasicTest(DnfTest): 'RPM is not the primary package manager') @OEHasPackage(['dnf']) @OETestDepends(['ssh.SSHTest.test_ssh']) + @OETestID(1735) def test_dnf_help(self): self.dnf('--help') @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) + @OETestID(1739) def test_dnf_version(self): self.dnf('--version') @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) + @OETestID(1737) def test_dnf_info(self): self.dnf('info dnf') @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) + @OETestID(1738) def test_dnf_search(self): self.dnf('search dnf') @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) + @OETestID(1736) def test_dnf_history(self): self.dnf('history') @@ -65,6 +70,7 @@ class DnfRepoTest(DnfTest): self.dnf(" ".join(cmdlinerepoopts) + " --nogpgcheck " + command) @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) + @OETestID(1744) def test_dnf_makecache(self): self.dnf_with_repo('makecache') @@ -75,19 +81,23 @@ class DnfRepoTest(DnfTest): # self.dnf_with_repo('repolist') @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) + @OETestID(1746) def test_dnf_repoinfo(self): self.dnf_with_repo('repoinfo') @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache']) + @OETestID(1740) def test_dnf_install(self): self.dnf_with_repo('install -y run-postinsts-dev') @OETestDepends(['dnf.DnfRepoTest.test_dnf_install']) + @OETestID(1741) def test_dnf_install_dependency(self): self.dnf_with_repo('remove -y run-postinsts') self.dnf_with_repo('install -y run-postinsts-dev') @OETestDepends(['dnf.DnfRepoTest.test_dnf_install_dependency']) + @OETestID(1742) def test_dnf_install_from_disk(self): self.dnf_with_repo('remove -y run-postinsts-dev') self.dnf_with_repo('install -y --downloadonly run-postinsts-dev') @@ -96,6 +106,7 @@ class DnfRepoTest(DnfTest): self.dnf_with_repo('install -y %s' % output) @OETestDepends(['dnf.DnfRepoTest.test_dnf_install_from_disk']) + @OETestID(1743) def test_dnf_install_from_http(self): output = subprocess.check_output('%s %s -name run-postinsts-dev*' % (bb.utils.which(os.getenv('PATH'), "find"), os.path.join(self.tc.td['WORKDIR'], 'oe-testimage-repo')), shell=True).decode("utf-8") @@ -105,6 +116,7 @@ class DnfRepoTest(DnfTest): self.dnf_with_repo('install -y %s' % url) @OETestDepends(['dnf.DnfRepoTest.test_dnf_install']) + @OETestID(1745) def test_dnf_reinstall(self): self.dnf_with_repo('reinstall -y run-postinsts-dev') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:02 +0000 Subject: [oe-commits] [openembedded-core] 09/11: selftest/devtool: use kernel provider instead of recipe allowing other kernel providers In-Reply-To: <149138201387.11000.4978957775335825713@git.openembedded.org> References: <149138201387.11000.4978957775335825713@git.openembedded.org> Message-ID: <20170405084654.5F268237C51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 087e1204fb27e2952f16c2e4761f5993b7722732 Author: Leonardo Sandoval AuthorDate: Tue Apr 4 09:45:47 2017 -0700 selftest/devtool: use kernel provider instead of recipe allowing other kernel providers To generalize the unit test for other kernel providers, use virtual/kernel instead of linux-yocto, allowing to run the selftest on non-poky distros, i.e. poky-tiny. Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/devtool.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 7f9efe6..d32ca28 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -1634,18 +1634,19 @@ class DevtoolTests(DevtoolBase): #verify the modification. features = 'MACHINE = "qemux86"\n' self.write_config(features) + kernel_provider = get_bb_var('PREFERRED_PROVIDER_virtual/kernel') # Clean up the enviroment - bitbake('linux-yocto -c cleansstate') + bitbake('%s -c cleansstate' % kernel_provider) tempdir = tempfile.mkdtemp(prefix='devtoolqa') self.track_for_cleanup(tempdir) self.track_for_cleanup(self.workspacedir) self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - self.add_command_to_tearDown('bitbake -c clean linux-yocto') + self.add_command_to_tearDown('bitbake -c clean %s' % kernel_provider) #Step 1 #Here is just generated the config file instead of all the kernel to optimize the #time of executing this test case. - bitbake('linux-yocto -c configure') - bbconfig = os.path.join(get_bb_var('B',"linux-yocto"),'.config') + bitbake('%s -c configure' % kernel_provider) + bbconfig = os.path.join(get_bb_var('B', kernel_provider),'.config') buildir= get_bb_var('TOPDIR') #Step 2 runCmd('cp %s %s' % (bbconfig, buildir)) @@ -1654,7 +1655,7 @@ class DevtoolTests(DevtoolBase): tmpconfig = os.path.join(buildir, '.config') #Step 3 - bitbake('linux-yocto -c clean') + bitbake('%s -c clean' % kernel_provider) #Step 4.1 runCmd('devtool modify virtual/kernel -x %s' % tempdir) self.assertTrue(os.path.exists(os.path.join(tempdir, 'Makefile')), @@ -1664,10 +1665,10 @@ class DevtoolTests(DevtoolBase): diff = runCmd('diff %s %s' % (tmpconfig, configfile)) self.assertEqual(0,diff.status,'Kernel .config file is not the same using bitbake and devtool') #Step 4.3 - #NOTE: virtual/kernel is mapped to linux-yocto - result = runCmd('devtool build linux-yocto') + #NOTE: virtual/kernel is mapped to kernel_provider + result = runCmd('devtool build %s' % kernel_provider) self.assertEqual(0,result.status,'Cannot build kernel using `devtool build`') - kernelfile = os.path.join(get_bb_var('KBUILD_OUTPUT',"linux-yocto"), 'vmlinux') + kernelfile = os.path.join(get_bb_var('KBUILD_OUTPUT', kernel_provider), 'vmlinux') self.assertTrue(os.path.exists(kernelfile),'Kernel was not build correctly') #Modify the kernel source, this is specific for qemux86 @@ -1681,11 +1682,11 @@ class DevtoolTests(DevtoolBase): modconf = runCmd("sed -i 's/CONFIG_SG_POOL=y/%s/' %s" % (modconfopt, codeconfigfile)) self.assertEqual(0,modconf.status,'Modification to %s failed' % codeconfigfile) #Build again kernel with devtool - rebuild = runCmd('devtool build linux-yocto') + rebuild = runCmd('devtool build %s' % kernel_provider) self.assertEqual(0,rebuild.status,'Fail to build kernel after modification of source and config') #Step 4.4 - bzimagename = 'bzImage-' + get_bb_var('KERNEL_VERSION_NAME',"linux-yocto") - bzimagefile = os.path.join(get_bb_var('D',"linux-yocto"),'boot', bzimagename) + bzimagename = 'bzImage-' + get_bb_var('KERNEL_VERSION_NAME', kernel_provider) + bzimagefile = os.path.join(get_bb_var('D', kernel_provider),'boot', bzimagename) checkmodcode = runCmd("grep '%s' %s" % (modstring, bzimagefile)) self.assertEqual(0,checkmodcode.status,'Modification on kernel source failed') #Step 4.5 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:05 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:05 +0000 Subject: [oe-commits] [bitbake] 01/05: lib/bb/data: fix dependency handling for contains and multiple values In-Reply-To: <149138202452.11371.1585674233574314023@git.openembedded.org> References: <149138202452.11371.1585674233574314023@git.openembedded.org> Message-ID: <20170405084704.98B33237C4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 272f1245acdd4fb85cb78612aa03627a9c246d8f Author: Paul Eggleton AuthorDate: Mon Apr 3 11:19:03 2017 +1200 lib/bb/data: fix dependency handling for contains and multiple values The code that determines variable dependencies uses the codeparser to find references to "contains" type operations e.g. bb.utils.contains(). That function can take multiple items to check, and all specified items have to be present. However this code didn't handle that - it assumed that only one item would be specified and thus it was treating the multiple items as a single item with spaces in between. Split the value and check if all words are present in order to determine whether the check is "set" or "unset". Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/data.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bb/data.py b/lib/bb/data.py index a85cb3a..0403754 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -296,11 +296,13 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d): newvalue = "" for k in sorted(contains): l = (d.getVar(k) or "").split() - for word in sorted(contains[k]): - if word in l: - newvalue += "\n%s{%s} = Set" % (k, word) + for item in sorted(contains[k]): + for word in item.split(): + if not word in l: + newvalue += "\n%s{%s} = Unset" % (k, item) + break else: - newvalue += "\n%s{%s} = Unset" % (k, word) + newvalue += "\n%s{%s} = Set" % (k, item) if not newvalue: return value if not value: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:04 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:04 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (0476ec4 -> 751c9dc) Message-ID: <149138202452.11371.1585674233574314023@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from 0476ec4 bitbake-user-manual: Fixed special character in -D output new 272f124 lib/bb/data: fix dependency handling for contains and multiple values new 496e3c8 codeparser: improve handling of contains_any() and filter() new 88fda49 bitbake-selftest: add contains tests new c1780bc codeparser: add some comments new 751c9dc fetch/local: Drop FILESDIR The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conf/bitbake.conf | 1 - .../bitbake-user-manual-fetching.xml | 9 ---- .../bitbake-user-manual-ref-variables.xml | 18 -------- lib/bb/cache.py | 2 +- lib/bb/codeparser.py | 34 +++++++++++++-- lib/bb/data.py | 10 +++-- lib/bb/fetch2/local.py | 9 ---- lib/bb/tests/codeparser.py | 48 ++++++++++++++++++++++ 8 files changed, 86 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:08 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:08 +0000 Subject: [oe-commits] [bitbake] 04/05: codeparser: add some comments In-Reply-To: <149138202452.11371.1585674233574314023@git.openembedded.org> References: <149138202452.11371.1585674233574314023@git.openembedded.org> Message-ID: <20170405084704.ADDD5237C51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit c1780bc1872bb35bc28c76eff9110717f02d9db2 Author: Paul Eggleton AuthorDate: Mon Apr 3 11:19:06 2017 +1200 codeparser: add some comments Add a few comments at the top of the file explaining what it's for, and a comment pointing out that you need to increment the cache version when changing any code that changes the output. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/codeparser.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py index f76b478..530f44e 100644 --- a/lib/bb/codeparser.py +++ b/lib/bb/codeparser.py @@ -1,3 +1,22 @@ +""" +BitBake code parser + +Parses actual code (i.e. python and shell) for functions and in-line +expressions. Used mainly to determine dependencies on other functions +and variables within the BitBake metadata. Also provides a cache for +this information in order to speed up processing. + +(Not to be confused with the code that parses the metadata itself, +see lib/bb/parse/ for that). + +NOTE: if you change how the parsers gather information you will almost +certainly need to increment CodeParserCache.CACHE_VERSION below so that +any existing codeparser cache gets invalidated. Additionally you'll need +to increment __cache_version__ in cache.py in order to ensure that old +recipe caches don't trigger "Taskhash mismatch" errors. + +""" + import ast import sys import codegen @@ -117,6 +136,10 @@ class shellCacheLine(object): class CodeParserCache(MultiProcessCache): cache_file_name = "bb_codeparser.dat" + # NOTE: you must increment this if you change how the parsers gather information, + # so that an existing cache gets invalidated. Additionally you'll need + # to increment __cache_version__ in cache.py in order to ensure that old + # recipe caches don't trigger "Taskhash mismatch" errors. CACHE_VERSION = 9 def __init__(self): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:06 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:06 +0000 Subject: [oe-commits] [bitbake] 02/05: codeparser: improve handling of contains_any() and filter() In-Reply-To: <149138202452.11371.1585674233574314023@git.openembedded.org> References: <149138202452.11371.1585674233574314023@git.openembedded.org> Message-ID: <20170405084704.A057A237C4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 496e3c84820a2a889d99d3604659e47a550941d5 Author: Paul Eggleton AuthorDate: Mon Apr 3 11:19:04 2017 +1200 codeparser: improve handling of contains_any() and filter() Ensure we handle bb.utils.contains_any() as separate items, rather than how we handle contains() where every item must be in the list. Additionally, enable handling bb.utils.filter() which for the purposes of looking at dependencies is the same as contains_any(). Additionally bump the codeparser cache and recipe cache versions to invalidate the user's existing caches (ensuring that the changes take effect and avoiding "taskhash mismatch" errors respectively). Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/cache.py | 2 +- lib/bb/codeparser.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/bb/cache.py b/lib/bb/cache.py index c04ac13..28e8a87 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -37,7 +37,7 @@ import bb.utils logger = logging.getLogger("BitBake.Cache") -__cache_version__ = "150" +__cache_version__ = "151" def getCacheFile(path, filename, data_hash): return os.path.join(path, filename + "." + data_hash) diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py index 89d24ab..f76b478 100644 --- a/lib/bb/codeparser.py +++ b/lib/bb/codeparser.py @@ -117,7 +117,7 @@ class shellCacheLine(object): class CodeParserCache(MultiProcessCache): cache_file_name = "bb_codeparser.dat" - CACHE_VERSION = 8 + CACHE_VERSION = 9 def __init__(self): MultiProcessCache.__init__(self) @@ -193,7 +193,8 @@ class BufferedLogger(Logger): class PythonParser(): getvars = (".getVar", ".appendVar", ".prependVar") getvarflags = (".getVarFlag", ".appendVarFlag", ".prependVarFlag") - containsfuncs = ("bb.utils.contains", "base_contains", "bb.utils.contains_any") + containsfuncs = ("bb.utils.contains", "base_contains") + containsanyfuncs = ("bb.utils.contains_any", "bb.utils.filter") execfuncs = ("bb.build.exec_func", "bb.build.exec_task") def warn(self, func, arg): @@ -212,13 +213,17 @@ class PythonParser(): def visit_Call(self, node): name = self.called_node_name(node.func) - if name and (name.endswith(self.getvars) or name.endswith(self.getvarflags) or name in self.containsfuncs): + if name and (name.endswith(self.getvars) or name.endswith(self.getvarflags) or name in self.containsfuncs or name in self.containsanyfuncs): if isinstance(node.args[0], ast.Str): varname = node.args[0].s if name in self.containsfuncs and isinstance(node.args[1], ast.Str): if varname not in self.contains: self.contains[varname] = set() self.contains[varname].add(node.args[1].s) + elif name in self.containsanyfuncs and isinstance(node.args[1], ast.Str): + if varname not in self.contains: + self.contains[varname] = set() + self.contains[varname].update(node.args[1].s.split()) elif name.endswith(self.getvarflags): if isinstance(node.args[1], ast.Str): self.references.add('%s[%s]' % (varname, node.args[1].s)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:09 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:09 +0000 Subject: [oe-commits] [bitbake] 05/05: fetch/local: Drop FILESDIR In-Reply-To: <149138202452.11371.1585674233574314023@git.openembedded.org> References: <149138202452.11371.1585674233574314023@git.openembedded.org> Message-ID: <20170405084704.B5F61237C52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 751c9dc51fd01fa64a1ff37ba2638110335f71af Author: Richard Purdie AuthorDate: Wed Apr 5 09:37:59 2017 +0100 fetch/local: Drop FILESDIR This has long since been deprecated and is no longer used anywhere, FILESPATH is the commonly used varaible which offers much more flexibility. Remove the FILESDIR code and references from bitbake. Signed-off-by: Richard Purdie --- conf/bitbake.conf | 1 - .../bitbake-user-manual-fetching.xml | 9 --------- .../bitbake-user-manual-ref-variables.xml | 18 ------------------ lib/bb/fetch2/local.py | 9 --------- 4 files changed, 37 deletions(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index deb36aa..a460df4 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -24,7 +24,6 @@ DEPENDS = "" DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" DL_DIR = "${TMPDIR}/downloads" -FILESDIR = "${@bb.utils.which(d.getVar('FILESPATH', True), '.')}" FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE', False))}" GITDIR = "${DL_DIR}/git" diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml index 3f1d8eb..d1ce43e 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml @@ -268,15 +268,6 @@ FILESPATH variable is used in the same way PATH is used to find executables. - Failing that, - FILESDIR - is used to find the appropriate relative file. - - FILESDIR is deprecated and can - be replaced with FILESPATH. - Because FILESDIR is likely to be - removed, you should not use this variable in any new code. - If the file cannot be found, it is assumed that it is available in DL_DIR by the time the download() method is called. diff --git a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml index 66d8f84..0e89bf2 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml @@ -1539,24 +1539,6 @@ - FILESDIR - - - Specifies directories BitBake uses when searching for - patches and files. - The "local" fetcher module uses these directories when - handling file:// URLs if the file - was not found using - FILESPATH. - - The FILESDIR variable is - deprecated and you should use - FILESPATH in all new code. - - - - - FILESPATH diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py index 2ff7723..a114ac1 100644 --- a/lib/bb/fetch2/local.py +++ b/lib/bb/fetch2/local.py @@ -67,12 +67,6 @@ class Local(FetchMethod): logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) newpath, hist = bb.utils.which(filespath, path, history=True) searched.extend(hist) - if not newpath: - filesdir = d.getVar('FILESDIR') - if filesdir: - logger.debug(2, "Searching for %s in path: %s" % (path, filesdir)) - newpath = os.path.join(filesdir, path) - searched.append(newpath) if (not newpath or not os.path.exists(newpath)) and path.find("*") != -1: # For expressions using '*', best we can do is take the first directory in FILESPATH that exists newpath, hist = bb.utils.which(filespath, ".", history=True) @@ -102,9 +96,6 @@ class Local(FetchMethod): filespath = d.getVar('FILESPATH') if filespath: locations = filespath.split(":") - filesdir = d.getVar('FILESDIR') - if filesdir: - locations.append(filesdir) locations.append(d.getVar("DL_DIR")) msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 08:47:07 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 08:47:07 +0000 Subject: [oe-commits] [bitbake] 03/05: bitbake-selftest: add contains tests In-Reply-To: <149138202452.11371.1585674233574314023@git.openembedded.org> References: <149138202452.11371.1585674233574314023@git.openembedded.org> Message-ID: <20170405084704.A7885237C50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 88fda492df875dd79b7aecf1f34b38517fc1eb33 Author: Paul Eggleton AuthorDate: Mon Apr 3 11:19:05 2017 +1200 bitbake-selftest: add contains tests Add some tests to verify that we are extracting "contains" information from python expressions in the code in the bb.data and bb.codeparser modules. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/tests/codeparser.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/lib/bb/tests/codeparser.py b/lib/bb/tests/codeparser.py index a45a582..e30e78c 100644 --- a/lib/bb/tests/codeparser.py +++ b/lib/bb/tests/codeparser.py @@ -49,6 +49,9 @@ class ReferenceTest(unittest.TestCase): def assertExecs(self, execs): self.assertEqual(self.execs, execs) + def assertContains(self, contains): + self.assertEqual(self.contains, contains) + class VariableReferenceTest(ReferenceTest): def parseExpression(self, exp): @@ -201,6 +204,7 @@ class PythonReferenceTest(ReferenceTest): self.references = parsedvar.references | parser.references self.execs = parser.execs + self.contains = parser.contains @staticmethod def indent(value): @@ -265,6 +269,26 @@ be. These unit tests are testing snippets.""" self.assertExecs(set(["testget"])) del self.context["testget"] + def test_contains(self): + self.parseExpression('bb.utils.contains("TESTVAR", "one", "true", "false", d)') + self.assertContains({'TESTVAR': {'one'}}) + + def test_contains_multi(self): + self.parseExpression('bb.utils.contains("TESTVAR", "one two", "true", "false", d)') + self.assertContains({'TESTVAR': {'one two'}}) + + def test_contains_any(self): + self.parseExpression('bb.utils.contains_any("TESTVAR", "hello", "true", "false", d)') + self.assertContains({'TESTVAR': {'hello'}}) + + def test_contains_any_multi(self): + self.parseExpression('bb.utils.contains_any("TESTVAR", "one two three", "true", "false", d)') + self.assertContains({'TESTVAR': {'one', 'two', 'three'}}) + + def test_contains_filter(self): + self.parseExpression('bb.utils.filter("TESTVAR", "hello there world", d)') + self.assertContains({'TESTVAR': {'hello', 'there', 'world'}}) + class DependencyReferenceTest(ReferenceTest): @@ -370,6 +394,30 @@ esac self.assertEqual(deps, set(["oe_libinstall"])) + def test_contains_vardeps(self): + expr = '${@bb.utils.filter("TESTVAR", "somevalue anothervalue", d)} \ + ${@bb.utils.contains("TESTVAR", "testval testval2", "yetanothervalue", "", d)} \ + ${@bb.utils.contains("TESTVAR", "testval2 testval3", "blah", "", d)} \ + ${@bb.utils.contains_any("TESTVAR", "testval2 testval3", "lastone", "", d)}' + parsedvar = self.d.expandWithRefs(expr, None) + # Check contains + self.assertEqual(parsedvar.contains, {'TESTVAR': {'testval2 testval3', 'anothervalue', 'somevalue', 'testval testval2', 'testval2', 'testval3'}}) + # Check dependencies + self.d.setVar('ANOTHERVAR', expr) + self.d.setVar('TESTVAR', 'anothervalue testval testval2') + deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), self.d) + self.assertEqual(sorted(values.splitlines()), + sorted([expr, + 'TESTVAR{anothervalue} = Set', + 'TESTVAR{somevalue} = Unset', + 'TESTVAR{testval testval2} = Set', + 'TESTVAR{testval2 testval3} = Unset', + 'TESTVAR{testval2} = Set', + 'TESTVAR{testval3} = Unset' + ])) + # Check final value + self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['anothervalue', 'yetanothervalue', 'lastone']) + #Currently no wildcard support #def test_vardeps_wildcards(self): # self.d.setVar("oe_libinstall", "echo test") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:32 +0000 Subject: [oe-commits] [openembedded-core] 02/33: libuser: replace fedorahosted.org SRC_URI with pagure.io source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.4D144237C4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bbe3cde5fc2102fd84ba065ed14f2732bcd0d420 Author: Choong YinThong AuthorDate: Sun Apr 2 19:51:42 2017 -0700 libuser: replace fedorahosted.org SRC_URI with pagure.io source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to pagure.io. pagure.io is a replacement for fedorahosted. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/recipes-extended/libuser/libuser_0.62.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/libuser/libuser_0.62.bb b/meta/recipes-extended/libuser/libuser_0.62.bb index 6960d71..1765346 100644 --- a/meta/recipes-extended/libuser/libuser_0.62.bb +++ b/meta/recipes-extended/libuser/libuser_0.62.bb @@ -1,8 +1,8 @@ SUMMARY = "user and group account administration library" DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user \ and group accounts" -HOMEPAGE = "https://fedorahosted.org/libuser/" -BUGTRACKER = "https://fedorahosted.org/libuser/newticket" +HOMEPAGE = "https://pagure.io/libuser" +BUGTRACKER = "https://pagure.io/libuser/issues" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" -SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz \ +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ file://0001-Check-for-issetugid.patch \ file://0002-remove-unused-execinfo.h.patch \ file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:33 +0000 Subject: [oe-commits] [openembedded-core] 03/33: libnewt: replace fedorahosted.org SRC_URI with pagure.io source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.548A9237C50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b85905bc8b845c9da7d2a086ea239ec00d5142e3 Author: Choong YinThong AuthorDate: Sun Apr 2 19:51:44 2017 -0700 libnewt: replace fedorahosted.org SRC_URI with pagure.io source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to pagure.io. pagure.io is a replacement for fedorahosted. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/recipes-extended/newt/libnewt_0.52.19.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/newt/libnewt_0.52.19.bb b/meta/recipes-extended/newt/libnewt_0.52.19.bb index a26ce1f..de76ce2 100644 --- a/meta/recipes-extended/newt/libnewt_0.52.19.bb +++ b/meta/recipes-extended/newt/libnewt_0.52.19.bb @@ -8,7 +8,7 @@ shared library needed by programs built with newt, as well as a \ /usr/bin/dialog replacement called whiptail. Newt is based on the \ slang library." -HOMEPAGE = "https://fedorahosted.org/newt/" +HOMEPAGE = "https://releases.pagure.org/newt/" SECTION = "libs" LICENSE = "LGPLv2" @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" # slang needs to be >= 2.2 DEPENDS = "slang popt" -SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \ +SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ file://fix_SHAREDDIR.patch \ file://cross_ar.patch \ file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:31 +0000 Subject: [oe-commits] [openembedded-core] 01/33: xmlto: replace fedorahosted.org SRC_URI with pagure.io source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.40528237C4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 79ae1e98a7c3fd4c732ea4cd0b3099d4e319a111 Author: Choong YinThong AuthorDate: Sun Apr 2 19:51:41 2017 -0700 xmlto: replace fedorahosted.org SRC_URI with pagure.io source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to pagure.io. pagure.io is a replacement for fedorahosted. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb index ce5d1e0..6216d77 100644 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb @@ -1,11 +1,11 @@ SUMMARY = "A shell-script tool for converting XML files to various formats" -HOMEPAGE = "https://fedorahosted.org/xmlto/" +HOMEPAGE = "https://releases.pagure.org/xmlto/" SECTION = "docs/xmlto" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \ +SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ file://catalog.xml \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:34 +0000 Subject: [oe-commits] [openembedded-core] 04/33: liberation-fonts: replace fedorahosted.org SRC_URI with pagure.io source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.5C810237C51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 441ad240db4ce64d854e263e14dc6a1752aed956 Author: Choong YinThong AuthorDate: Sun Apr 2 19:51:45 2017 -0700 liberation-fonts: replace fedorahosted.org SRC_URI with pagure.io source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to pagure.io. pagure.io is a replacement for fedorahosted. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb index bda82e7..74212e7 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb @@ -2,7 +2,7 @@ SUMMARY = "Liberation(tm) Fonts" DESCRIPTION = "The Liberation(tm) Fonts is a font family originally \ created by Ascender(c) which aims at metric compatibility with \ Arial, Times New Roman, Courier New." -HOMEPAGE = "https://fedorahosted.org/liberation-fonts/" +HOMEPAGE = "https://releases.pagure.org/liberation-fonts/" BUGTRACKER = "https://bugzilla.redhat.com/" RECIPE_NO_UPDATE_REASON = "2.x depends on fontforge package, which is not yet provided in oe-core" @@ -17,7 +17,7 @@ inherit allarch fontcache FONT_PACKAGES = "${PN}" -SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ +SRC_URI = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${PV}.tar.gz \ file://30-liberation-aliases.conf" SRC_URI[md5sum] = "4846797ef0fc70b0cbaede2514677c58" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:30 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (434b485 -> 98e921b) Message-ID: <149139236999.32740.14978677266878176241@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 434b485 runtime/dnf : Add ID to the dnf test cases new 79ae1e9 xmlto: replace fedorahosted.org SRC_URI with pagure.io source new bbe3cde libuser: replace fedorahosted.org SRC_URI with pagure.io source new b85905b libnewt: replace fedorahosted.org SRC_URI with pagure.io source new 441ad24 liberation-fonts: replace fedorahosted.org SRC_URI with pagure.io source new b070317 cronie: replace fedorahosted.org SRC_URI with github.com source new 9b3c919 selftest/recipetool: replace fedorahosted.org SRC_URI with github.com source new 0fb5427 chkconfig: replace fedorahosted.org SRC_URI with github.com source new df2e1a8 update_gio_module_cache: Do not chown a non-existing file new 9414382 scripts: Add yocto-compat-layer-wrapper new 402ef1c yocto-compat-layer.py: Add status for skipped items new 57fc8a9 yocto-compat-layer.py: Add --dependency argument new 6e0a268 compatlayer/__init__.py: Allow add_layer to process recursive deps new 4eb0932 yocto-compat-layer.py: Fix the signature validation new f84d0bd scripts/oe-build-perf-report: better guessing of args new 79b90ae scripts/oe-build-perf-report: fix 'charts ready' console message new 0a05ccf scripts/oe-build-perf-report: fix typo new be3d171 build-perf-test-wrapper.sh: make it possible to specify Git branch name new ed43b2d build-perf-test-wrapper.sh: correctly check test script exit status new d8e14df build-perf-test-wrapper.sh: support pushing to remote Git new 46e76ff build-perf-test-wrapper.sh: support sending email reports new e75bd6a Revert "filemap: remove FilemapSeek class" new f0425c0 wic: improve error message new 4b667d2 quilt: Fix paths for patch and perl new 3b1871b libjpeg-turbo: don't depend on NASM for non-x86 targets new 02a76f3 u-boot: Add bc-native to DEPENDS to fix u-boot/spl build. new b5f471b yocto-uninative: Update to the 1.6 release new 3f1be2c libxml2: make dependencies on python conditional new 0375178 selftest/devtool: skip test in case of poky-tiny distro new 612e62c oe-selftest: test wic sparse_copy API new 15a732a ethtool: Switch to download mirror new 72088ae busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE new 7d60a36 net-tools: Fix build with USE_NLS="no" new 98e921b glibc: fix nativesdk ldd RTLDLIST The 33 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/conf/distro/include/yocto-uninative.inc | 6 +- meta/lib/oeqa/selftest/devtool.py | 2 + meta/lib/oeqa/selftest/recipetool.py | 8 +- meta/lib/oeqa/selftest/wic.py | 26 ++ meta/recipes-bsp/u-boot/u-boot_2017.01.bb | 2 +- meta/recipes-core/busybox/busybox.inc | 1 - meta/recipes-core/glibc/glibc-ld.inc | 1 + meta/recipes-core/libxml/libxml2_2.9.4.bb | 20 +- meta/recipes-devtools/quilt/quilt-native.inc | 3 +- meta/recipes-devtools/quilt/quilt.inc | 9 +- ...0001-tests-Allow-different-output-from-mv.patch | 29 ++ meta/recipes-devtools/quilt/quilt_0.65.bb | 10 - meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 4 +- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 12 +- meta/recipes-extended/cronie/cronie_1.5.1.bb | 6 +- meta/recipes-extended/ethtool/ethtool_4.8.bb | 2 +- meta/recipes-extended/libuser/libuser_0.62.bb | 6 +- .../net-tools/net-tools_1.60-26.bb | 14 +- meta/recipes-extended/newt/libnewt_0.52.19.bb | 4 +- meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb | 10 +- .../ttf-fonts/liberation-fonts_1.04.bb | 4 +- scripts/contrib/build-perf-test-wrapper.sh | 70 ++++- scripts/lib/build_perf/html/measurement_chart.html | 6 +- scripts/lib/build_perf/html/report.html | 5 +- scripts/lib/compatlayer/__init__.py | 47 +++- scripts/lib/wic/filemap.py | 313 +++++++++++++++++---- scripts/lib/wic/utils/misc.py | 2 +- scripts/oe-build-perf-report | 4 +- .../postinst-intercepts/update_gio_module_cache | 6 +- scripts/yocto-compat-layer-wrapper | 27 ++ scripts/yocto-compat-layer.py | 47 +++- 31 files changed, 548 insertions(+), 158 deletions(-) create mode 100644 meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch create mode 100755 scripts/yocto-compat-layer-wrapper -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:35 +0000 Subject: [oe-commits] [openembedded-core] 05/33: cronie: replace fedorahosted.org SRC_URI with github.com source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.66280237C52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b0703175ed650d89870309e4065cda917199ac93 Author: Choong YinThong AuthorDate: Sun Apr 2 19:51:47 2017 -0700 cronie: replace fedorahosted.org SRC_URI with github.com source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to github.com. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/recipes-extended/cronie/cronie_1.5.1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/cronie/cronie_1.5.1.bb b/meta/recipes-extended/cronie/cronie_1.5.1.bb index ad616d5..cfb8c21 100644 --- a/meta/recipes-extended/cronie/cronie_1.5.1.bb +++ b/meta/recipes-extended/cronie/cronie_1.5.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Cronie contains the standard UNIX daemon crond that runs \ specified programs at scheduled times and related tools. It is based on the \ original cron and has security and configuration enhancements like the \ ability to use pam and SELinux." -HOMEPAGE = "https://fedorahosted.org/cronie/" +HOMEPAGE = "https://github.com/cronie-crond/cronie/" BUGTRACKER = "https://bugzilla.redhat.com" # Internet Systems Consortium License @@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ SECTION = "utils" -SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ +UPSTREAM_CHECK_URI = "https://github.com/cronie-crond/${BPN}/releases/" + +SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}/cronie-${PV}.tar.gz \ file://crond.init \ file://crontab \ file://crond.service \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:37 +0000 Subject: [oe-commits] [openembedded-core] 07/33: chkconfig: replace fedorahosted.org SRC_URI with github.com source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.72E5C237C54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0fb5427937576fe46d463b9c9953d0bcdc1f256a Author: Choong YinThong AuthorDate: Tue Apr 4 02:29:13 2017 -0700 chkconfig: replace fedorahosted.org SRC_URI with github.com source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to github.com. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb index e839026..2f1f6c0 100644 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb @@ -6,7 +6,7 @@ of the drudgery of manually editing the symbolic links." RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" -HOMEPAGE = "http://fedorahosted.org/releases/c/h/chkconfig" +HOMEPAGE = "https://github.com/fedora-sysv" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" @@ -16,12 +16,16 @@ PROVIDES += "virtual/update-alternatives" PR = "r7" -SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2 \ +S = "${WORKDIR}/${BPN}-${BPN}-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/fedora-sysv/${BPN}/releases" + +SRC_URI = "https://github.com/fedora-sysv/chkconfig/archive/chkconfig-${PV}.tar.gz \ file://replace_caddr_t.patch \ " -SRC_URI[md5sum] = "c2039ca67f2749fe0c06ef7c6f8ee246" -SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f18271211de68" +SRC_URI[md5sum] = "3f51ac38a234be5278b3a2d9705eda5e" +SRC_URI[sha256sum] = "bf1e81f0d7cc999b536c9fe7877abf584a4082fd03c9d2597b6f090966579b40" inherit gettext -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:38 +0000 Subject: [oe-commits] [openembedded-core] 08/33: update_gio_module_cache: Do not chown a non-existing file In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.79F6C237C55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit df2e1a8fbadffac0f1781a0d07e050356a007327 Author: Peter Kjellerstedt AuthorDate: Thu Mar 30 01:16:06 2017 +0200 update_gio_module_cache: Do not chown a non-existing file Only change the ownership of ${libdir}/gio/modules/giomodule.cache if it exists. Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton --- scripts/postinst-intercepts/update_gio_module_cache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/postinst-intercepts/update_gio_module_cache b/scripts/postinst-intercepts/update_gio_module_cache index 92092f2..fc3f9d0 100644 --- a/scripts/postinst-intercepts/update_gio_module_cache +++ b/scripts/postinst-intercepts/update_gio_module_cache @@ -3,7 +3,7 @@ set -e PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D${libdir}:$D${base_libdir} \ - $D${libexecdir}/${binprefix}gio-querymodules $D${libdir}/gio/modules/ - -chown root:root $D${libdir}/gio/modules/giomodule.cache + $D${libexecdir}/${binprefix}gio-querymodules $D${libdir}/gio/modules/ +[ ! -e $D${libdir}/gio/modules/giomodule.cache ] || + chown root:root $D${libdir}/gio/modules/giomodule.cache -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:36 +0000 Subject: [oe-commits] [openembedded-core] 06/33: selftest/recipetool: replace fedorahosted.org SRC_URI with github.com source In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.6CA3B237C53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9b3c9193d4a04061e64e43d55782a4d73ee166ad Author: Choong YinThong AuthorDate: Tue Apr 4 02:29:07 2017 -0700 selftest/recipetool: replace fedorahosted.org SRC_URI with github.com source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to github.com. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/recipetool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index d62c8bb..d47b9dd 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py @@ -369,15 +369,15 @@ class RecipetoolTests(RecipetoolBase): tempsrc = os.path.join(self.tempdir, 'srctree') os.makedirs(tempsrc) recipefile = os.path.join(self.tempdir, 'logrotate_3.8.7.bb') - srcuri = 'https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.7.tar.gz' + srcuri = 'https://github.com/logrotate/logrotate/archive/r3-8-7.tar.gz' result = runCmd('recipetool create -o %s %s -x %s' % (recipefile, srcuri, tempsrc)) self.assertTrue(os.path.isfile(recipefile)) checkvars = {} checkvars['LICENSE'] = 'GPLv2' checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=18810669f13b87348459e611d31ab760' - checkvars['SRC_URI'] = 'https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz' - checkvars['SRC_URI[md5sum]'] = '99e08503ef24c3e2e3ff74cc5f3be213' - checkvars['SRC_URI[sha256sum]'] = 'f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64' + checkvars['SRC_URI'] = 'https://github.com/logrotate/logrotate/archive/r3-8-7.tar.gz' + checkvars['SRC_URI[md5sum]'] = '6b1aa0e0d07eda3c9a2526520850397a' + checkvars['SRC_URI[sha256sum]'] = 'dece4bfeb9d8374a0ecafa34be139b5a697db5c926dcc69a9b8715431a22e733' self._test_recipe_contents(recipefile, checkvars, []) @testcase(1194) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:40 +0000 Subject: [oe-commits] [openembedded-core] 10/33: yocto-compat-layer.py: Add status for skipped items In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.87036237C57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 402ef1c8bd1ea994581a39672f31ab1203a0899d Author: Mark Hatle AuthorDate: Thu Mar 30 21:30:26 2017 -0500 yocto-compat-layer.py: Add status for skipped items If items were skipped because the dependencies could not be found, we want to record this was skipped so we can display it later. Signed-off-by: Mark Hatle Signed-off-by: Ross Burton --- scripts/yocto-compat-layer.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-compat-layer.py index 9e74033..d13d8c0 100755 --- a/scripts/yocto-compat-layer.py +++ b/scripts/yocto-compat-layer.py @@ -107,6 +107,7 @@ def main(): td = {} results = collections.OrderedDict() + results_status = collections.OrderedDict() logger.info('') logger.info('Getting initial bitbake variables ...') @@ -125,19 +126,22 @@ def main(): shutil.copyfile(bblayersconf + '.backup', bblayersconf) if not add_layer(bblayersconf, layer, layers, logger): + results[layer['name']] = None + results_status[layer['name']] = 'SKIPPED (Missing dependencies)' + layers_tested = layers_tested + 1 continue result = test_layer_compatibility(td, layer) results[layer['name']] = result + results_status[layer['name']] = 'PASS' if results[layer['name']].wasSuccessful() else 'FAIL' layers_tested = layers_tested + 1 if layers_tested: logger.info('') logger.info('Summary of results:') logger.info('') - for layer_name in results: - logger.info('%s ... %s' % (layer_name, 'PASS' if \ - results[layer_name].wasSuccessful() else 'FAIL')) + for layer_name in results_status: + logger.info('%s ... %s' % (layer_name, results_status[layer_name])) cleanup_bblayers(None, None) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:39 +0000 Subject: [oe-commits] [openembedded-core] 09/33: scripts: Add yocto-compat-layer-wrapper In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.80441237C56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9414382f96d4a5d81cca440c75140950ca515aab Author: An?bal Lim?n AuthorDate: Thu Mar 30 14:01:14 2017 -0600 scripts: Add yocto-compat-layer-wrapper This script will be used to create it's own build directory to make runs of yocto-compat-layer.py againts layers isolated. Example: $ source oe-init-build-env $ yocto-compat-layer-wrapper LAYER_DIR LAYER_DIR_N [YOCTO #11164] Signed-off-by: An?bal Lim?n Signed-off-by: Ross Burton --- scripts/yocto-compat-layer-wrapper | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/scripts/yocto-compat-layer-wrapper b/scripts/yocto-compat-layer-wrapper new file mode 100755 index 0000000..db4b687 --- /dev/null +++ b/scripts/yocto-compat-layer-wrapper @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +# Yocto Project compatibility layer tool wrapper +# +# Creates a temprary build directory to run Yocto Project Compatible +# script to avoid a contaminated environment. +# +# Copyright (C) 2017 Intel Corporation +# Released under the MIT license (see COPYING.MIT) + +if [ -z "$BUILDDIR" ]; then + echo "Please source oe-init-build-env before run this script." + exit 2 +fi + +base_dir=$(realpath $BUILDDIR/../) +cd $base_dir + +build_dir=$(mktemp -p $base_dir -d -t build-XXXX) + +source oe-init-build-env $build_dir +yocto-compat-layer.py "$@" +retcode=$? + +rm -rf $build_dir + +exit $retcode -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:41 +0000 Subject: [oe-commits] [openembedded-core] 11/33: yocto-compat-layer.py: Add --dependency argument In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.8D82D237C58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 57fc8a9771174b7d0533a42c045053adefa537a8 Author: Mark Hatle AuthorDate: Thu Mar 30 21:30:27 2017 -0500 yocto-compat-layer.py: Add --dependency argument When processing a large number of items, there are times that it would be nice to be able to pass in a series of layers that can be used as dependencies for the layer that is being scanned. This avoids the significant overhead of processing all of the layers to compatibility. Signed-off-by: Mark Hatle Signed-off-by: Ross Burton --- scripts/yocto-compat-layer.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-compat-layer.py index d13d8c0..f8a1ac7 100755 --- a/scripts/yocto-compat-layer.py +++ b/scripts/yocto-compat-layer.py @@ -47,6 +47,8 @@ def main(): help='Layer to test compatibility with Yocto Project') parser.add_argument('-o', '--output-log', help='File to output log (optional)', action='store') + parser.add_argument('--dependency', nargs="+", + help='Layers to process for dependencies', action='store') parser.add_argument('-n', '--no-auto', help='Disable auto layer discovery', action='store_true') parser.add_argument('-d', '--debug', help='Enable debug output', @@ -80,6 +82,11 @@ def main(): if not layers: logger.error("Fail to detect layers") return 1 + if args.dependency: + dep_layers = detect_layers(args.dependency, args.no_auto) + dep_layers = dep_layers + layers + else: + dep_layers = layers logger.info("Detected layers:") for layer in layers: @@ -125,7 +132,8 @@ def main(): shutil.copyfile(bblayersconf + '.backup', bblayersconf) - if not add_layer(bblayersconf, layer, layers, logger): + if not add_layer(bblayersconf, layer, dep_layers, logger): + logger.info('Skipping %s due to missing dependencies.' % layer['name']) results[layer['name']] = None results_status[layer['name']] = 'SKIPPED (Missing dependencies)' layers_tested = layers_tested + 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:44 +0000 Subject: [oe-commits] [openembedded-core] 14/33: scripts/oe-build-perf-report: better guessing of args In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.A0BEB237C5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f84d0bd7deb4c19fdb1e821b3a50e8c8f54a731b Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:33 2017 +0300 scripts/oe-build-perf-report: better guessing of args When getting info from the latest commit, don't search all refs but only branches. We don't get correct data from refs/tags/* or refs/notest/*, for example. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/oe-build-perf-report | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index 3976613..ca9cf1d 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -380,7 +380,7 @@ def auto_args(repo, args): """Guess arguments, if not defined by the user""" # Get the latest commit in the repo log.debug("Guessing arguments from the latest commit") - msg = repo.run_cmd(['log', '-1', '--all', '--format=%b']) + msg = repo.run_cmd(['log', '-1', '--branches', '--format=%b']) for line in msg.splitlines(): split = line.split(':', 1) if len(split) != 2: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:43 +0000 Subject: [oe-commits] [openembedded-core] 13/33: yocto-compat-layer.py: Fix the signature validation In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.99DB0237C5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4eb0932e755b7cb582a8db811aeed1397ecb92cc Author: Mark Hatle AuthorDate: Thu Mar 30 21:30:29 2017 -0500 yocto-compat-layer.py: Fix the signature validation The initial signatures need to be collected -after- the dependency layers have been added to the system. Otherwise changes that happen due to dependencies, outside of the layer being scanned, will show up as signature problems. The add_layer function was split into two pieces so that we can process the dependencies first, and then add the layer itself for the comparison. Signed-off-by: Mark Hatle Signed-off-by: Ross Burton --- scripts/lib/compatlayer/__init__.py | 7 ++++--- scripts/yocto-compat-layer.py | 29 +++++++++++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 8d8bdfe..86f86eb 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -140,9 +140,7 @@ def _find_layer_depends(depend, layers): return layer return None -def add_layer(bblayersconf, layer, layers, logger): - logger.info('Adding layer %s' % layer['name']) - +def add_layer_dependencies(bblayersconf, layer, layers, logger): def recurse_dependencies(depends, layer, layers, logger, ret = []): logger.debug('Processing dependencies %s for layer %s.' % \ (depends, layer['name'])) @@ -192,7 +190,10 @@ def add_layer(bblayersconf, layer, layers, logger): logger.info('Adding layer dependency %s' % layer_depend['name']) with open(bblayersconf, 'a+') as f: f.write("\nBBLAYERS += \"%s\"\n" % layer_depend['path']) + return True +def add_layer(bblayersconf, layer, layers, logger): + logger.info('Adding layer %s' % layer['name']) with open(bblayersconf, 'a+') as f: f.write("\nBBLAYERS += \"%s\"\n" % layer['path']) diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-compat-layer.py index f8a1ac7..22c0c2d 100755 --- a/scripts/yocto-compat-layer.py +++ b/scripts/yocto-compat-layer.py @@ -22,7 +22,7 @@ import scriptpath scriptpath.add_oe_lib_path() scriptpath.add_bitbake_lib_path() -from compatlayer import LayerType, detect_layers, add_layer, get_signatures +from compatlayer import LayerType, detect_layers, add_layer, add_layer_dependencies, get_signatures from oeqa.utils.commands import get_bb_vars PROGNAME = 'yocto-compat-layer' @@ -116,29 +116,38 @@ def main(): results = collections.OrderedDict() results_status = collections.OrderedDict() - logger.info('') - logger.info('Getting initial bitbake variables ...') - td['bbvars'] = get_bb_vars() - logger.info('Getting initial signatures ...') - td['builddir'] = builddir - td['sigs'] = get_signatures(td['builddir']) - logger.info('') - layers_tested = 0 for layer in layers: if layer['type'] == LayerType.ERROR_NO_LAYER_CONF or \ layer['type'] == LayerType.ERROR_BSP_DISTRO: continue + logger.info('') + logger.info("Setting up for %s(%s), %s" % (layer['name'], layer['type'], + layer['path'])) + shutil.copyfile(bblayersconf + '.backup', bblayersconf) - if not add_layer(bblayersconf, layer, dep_layers, logger): + if not add_layer_dependencies(bblayersconf, layer, dep_layers, logger): logger.info('Skipping %s due to missing dependencies.' % layer['name']) results[layer['name']] = None results_status[layer['name']] = 'SKIPPED (Missing dependencies)' layers_tested = layers_tested + 1 continue + logger.info('Getting initial bitbake variables ...') + td['bbvars'] = get_bb_vars() + logger.info('Getting initial signatures ...') + td['builddir'] = builddir + td['sigs'] = get_signatures(td['builddir']) + + if not add_layer(bblayersconf, layer, dep_layers, logger): + logger.info('Skipping %s ???.' % layer['name']) + results[layer['name']] = None + results_status[layer['name']] = 'SKIPPED (Unknown)' + layers_tested = layers_tested + 1 + continue + result = test_layer_compatibility(td, layer) results[layer['name']] = result results_status[layer['name']] = 'PASS' if results[layer['name']].wasSuccessful() else 'FAIL' -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:52 +0000 Subject: [oe-commits] [openembedded-core] 22/33: wic: improve error message In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.ED86F237C63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f0425c0a0f1c98f65bf61fd9aa7e023ed41a35fa Author: Chen Qi AuthorDate: Thu Mar 30 16:37:36 2017 +0800 wic: improve error message When using `wic create mkefidisk -e core-image-minimal', the following error message appeared. Please bake it with 'bitbake parted-native' and try again. However, following this command doesn't do any help. The same problem still appeared. The problem is that when we 'bitbake parted-native', it doesn't have anything to do with core-image-minimal. And the required tool 'parted' is not under core-image-minimal's recipe-sysroot-native directory. Improve the error message so that following it could get things done. Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- scripts/lib/wic/utils/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 307779a..4609984 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py @@ -131,7 +131,7 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): "was not found (see details above).\n\n" % prog recipe = NATIVE_RECIPES.get(prog) if recipe: - msg += "Please bake it with 'bitbake %s-native' "\ + msg += "Please make sure wic-tools have %s-native in its DEPENDS, bake it with 'bitbake wic-tools' "\ "and try again.\n" % recipe else: msg += "Wic failed to find a recipe to build native %s. Please "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:49 +0000 Subject: [oe-commits] [openembedded-core] 19/33: build-perf-test-wrapper.sh: support pushing to remote Git In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.D5DAD237C60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d8e14df29d28bfe805dc746f43c9f3a7726e57ce Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:38 2017 +0300 build-perf-test-wrapper.sh: support pushing to remote Git Implement new '-P' option for spefifying a Git remote where to push results after committing to a local Git repository. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/contrib/build-perf-test-wrapper.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index e804ac2..c847197 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -32,6 +32,7 @@ Optional arguments: -c COMMITISH test (checkout) this commit, : can be specified to test specific commit of certain branch -C GIT_REPO commit results into Git + -P GIT_REMOTE push results to a remote Git repository -w WORK_DIR work dir for this script (default: GIT_TOP_DIR/build-perf-test) -x create xml report (instead of json) @@ -42,7 +43,8 @@ EOF # Parse command line arguments commitish="" oe_build_perf_test_extra_opts=() -while getopts "ha:c:C:w:x" opt; do +oe_git_archive_extra_opts=() +while getopts "ha:c:C:P:w:x" opt; do case $opt in h) usage exit 0 @@ -53,6 +55,8 @@ while getopts "ha:c:C:w:x" opt; do ;; C) results_repo=`realpath -s "$OPTARG"` ;; + P) oe_git_archive_extra_opts+=("--push" "$OPTARG") + ;; w) base_dir=`realpath -s "$OPTARG"` ;; x) oe_build_perf_test_extra_opts+=("--xml") @@ -172,6 +176,7 @@ if [ -n "$results_repo" ]; then --tag-name "{hostname}/{branch}/{machine}/{commit_count}-g{commit}/{tag_number}" \ --exclude "buildstats.json" \ --notes "buildstats/{branch_name}" "$results_dir/buildstats.json" \ + "${oe_git_archive_extra_opts[@]}" \ "$results_dir" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:46 +0000 Subject: [oe-commits] [openembedded-core] 16/33: scripts/oe-build-perf-report: fix typo In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.BD406237C5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0a05ccfeba2f185ef9ea78a23bc376d4b97ec547 Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:35 2017 +0300 scripts/oe-build-perf-report: fix typo Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/oe-build-perf-report | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index ca9cf1d..6f2db49 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -234,7 +234,7 @@ def print_diff_report(metadata_l, data_l, metadata_r, data_r): meta_diff = metadata_diff(metadata_l, metadata_r) rows = [] row_fmt = ['{:{wid}} ', '{:<{wid}} ', '{:<{wid}}'] - rows = [['', 'CURRENT COMMIT', 'OOMPARING WITH']] + rows = [['', 'CURRENT COMMIT', 'COMPARING WITH']] for key, val in meta_diff.items(): # Shorten commit hashes if key == 'commit': -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:40:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:40:00 +0000 Subject: [oe-commits] [openembedded-core] 30/33: ethtool: Switch to download mirror In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.445FD237C6B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 15a732a844fe7476291d3086125f2e27de50248d Author: Paul Barker AuthorDate: Sun Apr 2 22:31:35 2017 +0100 ethtool: Switch to download mirror The md5sum & sha256sum for ethtool-4.8.tar.gz have changed upstream :( Signed-off-by: Paul Barker Signed-off-by: Ross Burton --- meta/recipes-extended/ethtool/ethtool_4.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/ethtool/ethtool_4.8.bb b/meta/recipes-extended/ethtool/ethtool_4.8.bb index 4ca88d7..afaf2e2 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.8.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.8.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" -SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ +SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/ethtool-${PV}.tar.gz \ file://run-ptest \ file://avoid_parallel_tests.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:56 +0000 Subject: [oe-commits] [openembedded-core] 26/33: yocto-uninative: Update to the 1.6 release In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.1E38B237C67@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5f471b74b2da533abfad2601b221fa806fcf3b2 Author: Joshua Lock AuthorDate: Mon Apr 3 17:26:22 2017 +0100 yocto-uninative: Update to the 1.6 release This release includes fixes for Windows/Mingw support. Signed-off-by: Joshua Lock Signed-off-by: Ross Burton --- meta/conf/distro/include/yocto-uninative.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 7f9eaba..7c2151c 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,6 +6,6 @@ # to the distro running on the build machine. # -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.5/" -UNINATIVE_CHECKSUM[i686] ?= "4cda652ba90f98e4c34e4c5a7e9f6364b51d3538228a4ffc24d0168fdf331369" -UNINATIVE_CHECKSUM[x86_64] ?= "22f5a061d077379f5728197bfcc239aa087332293038df48535c7badcb6939fd" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.6/" +UNINATIVE_CHECKSUM[i686] ?= "d9daf66785834f888b6f50a1d37a8120815f8380e0e267d311e1dfaf4bb5404e" +UNINATIVE_CHECKSUM[x86_64] ?= "2b4fffa308d9f19e0742a1a404ff42495fb50c165e5ca0458cedca157372691a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:51 +0000 Subject: [oe-commits] [openembedded-core] 21/33: Revert "filemap: remove FilemapSeek class" In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.E6D75237C62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e75bd6a7dd5c1b4bad039c35cf4a2ffc2f77c60a Author: Ed Bartosh AuthorDate: Mon Apr 3 18:31:00 2017 +0300 Revert "filemap: remove FilemapSeek class" FIEMAP API is not supported by tmpfs file system, but SEEK_HOLE/SEEK_DATA is supported. Returned back FilemapSeek class that implements support of SEEK_HOLE/SEEK_DATA API to make sparse_copy API working on tmpfs again. This reverts commit 6b80c13f7a82a312a3b981de5a56c66466ba1fac. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/filemap.py | 309 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 260 insertions(+), 49 deletions(-) diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py index 34523c0..080668e 100644 --- a/scripts/lib/wic/filemap.py +++ b/scripts/lib/wic/filemap.py @@ -54,46 +54,24 @@ class Error(Exception): """A class for all the other exceptions raised by this module.""" pass -# Below goes the FIEMAP ioctl implementation, which is not very readable -# because it deals with the rather complex FIEMAP ioctl. To understand the -# code, you need to know the FIEMAP interface, which is documented in the -# "Documentation/filesystems/fiemap.txt" file in the Linux kernel sources. - -# Format string for 'struct fiemap' -_FIEMAP_FORMAT = "=QQLLLL" -# sizeof(struct fiemap) -_FIEMAP_SIZE = struct.calcsize(_FIEMAP_FORMAT) -# Format string for 'struct fiemap_extent' -_FIEMAP_EXTENT_FORMAT = "=QQQQQLLLL" -# sizeof(struct fiemap_extent) -_FIEMAP_EXTENT_SIZE = struct.calcsize(_FIEMAP_EXTENT_FORMAT) -# The FIEMAP ioctl number -_FIEMAP_IOCTL = 0xC020660B -# This FIEMAP ioctl flag which instructs the kernel to sync the file before -# reading the block map -_FIEMAP_FLAG_SYNC = 0x00000001 -# Size of the buffer for 'struct fiemap_extent' elements which will be used -# when invoking the FIEMAP ioctl. The larger is the buffer, the less times the -# FIEMAP ioctl will be invoked. -_FIEMAP_BUFFER_SIZE = 256 * 1024 -class FilemapFiemap: +class _FilemapBase(object): """ - This class provides API to the FIEMAP ioctl. Namely, it allows to iterate - over all mapped blocks and over all holes. - - This class synchronizes the image file every time it invokes the FIEMAP - ioctl in order to work-around early FIEMAP implementation kernel bugs. + This is a base class for a couple of other classes in this module. This + class simply performs the common parts of the initialization process: opens + the image file, gets its size, etc. The 'log' parameter is the logger object + to use for printing messages. """ - def __init__(self, image): + def __init__(self, image, log=None): """ - Initialize a class instance. The 'image' argument is full the file - object to operate on. + Initialize a class instance. The 'image' argument is full path to the + file or file object to operate on. """ - self._log = logging.getLogger(__name__) - self._log.debug("FilemapFiemap: initializing") + self._log = log + if self._log is None: + self._log = logging.getLogger(__name__) self._f_image_needs_close = False @@ -135,21 +113,6 @@ class FilemapFiemap: self._log.debug("block size %d, blocks count %d, image size %d" % (self.block_size, self.blocks_cnt, self.image_size)) - self._buf_size = _FIEMAP_BUFFER_SIZE - - # Calculate how many 'struct fiemap_extent' elements fit the buffer - self._buf_size -= _FIEMAP_SIZE - self._fiemap_extent_cnt = self._buf_size // _FIEMAP_EXTENT_SIZE - assert self._fiemap_extent_cnt > 0 - self._buf_size = self._fiemap_extent_cnt * _FIEMAP_EXTENT_SIZE - self._buf_size += _FIEMAP_SIZE - - # Allocate a mutable buffer for the FIEMAP ioctl - self._buf = array.array('B', [0] * self._buf_size) - - # Check if the FIEMAP ioctl is supported - self.block_is_mapped(0) - def __del__(self): """The class destructor which just closes the image file.""" if self._f_image_needs_close: @@ -165,6 +128,240 @@ class FilemapFiemap: self._f_image_needs_close = True + def block_is_mapped(self, block): # pylint: disable=W0613,R0201 + """ + This method has has to be implemented by child classes. It returns + 'True' if block number 'block' of the image file is mapped and 'False' + otherwise. + """ + + raise Error("the method is not implemented") + + def block_is_unmapped(self, block): # pylint: disable=W0613,R0201 + """ + This method has has to be implemented by child classes. It returns + 'True' if block number 'block' of the image file is not mapped (hole) + and 'False' otherwise. + """ + + raise Error("the method is not implemented") + + def get_mapped_ranges(self, start, count): # pylint: disable=W0613,R0201 + """ + This method has has to be implemented by child classes. This is a + generator which yields ranges of mapped blocks in the file. The ranges + are tuples of 2 elements: [first, last], where 'first' is the first + mapped block and 'last' is the last mapped block. + + The ranges are yielded for the area of the file of size 'count' blocks, + starting from block 'start'. + """ + + raise Error("the method is not implemented") + + def get_unmapped_ranges(self, start, count): # pylint: disable=W0613,R0201 + """ + This method has has to be implemented by child classes. Just like + 'get_mapped_ranges()', but yields unmapped block ranges instead + (holes). + """ + + raise Error("the method is not implemented") + + +# The 'SEEK_HOLE' and 'SEEK_DATA' options of the file seek system call +_SEEK_DATA = 3 +_SEEK_HOLE = 4 + +def _lseek(file_obj, offset, whence): + """This is a helper function which invokes 'os.lseek' for file object + 'file_obj' and with specified 'offset' and 'whence'. The 'whence' + argument is supposed to be either '_SEEK_DATA' or '_SEEK_HOLE'. When + there is no more data or hole starting from 'offset', this function + returns '-1'. Otherwise the data or hole position is returned.""" + + try: + return os.lseek(file_obj.fileno(), offset, whence) + except OSError as err: + # The 'lseek' system call returns the ENXIO if there is no data or + # hole starting from the specified offset. + if err.errno == os.errno.ENXIO: + return -1 + elif err.errno == os.errno.EINVAL: + raise ErrorNotSupp("the kernel or file-system does not support " + "\"SEEK_HOLE\" and \"SEEK_DATA\"") + else: + raise + +class FilemapSeek(_FilemapBase): + """ + This class uses the 'SEEK_HOLE' and 'SEEK_DATA' to find file block mapping. + Unfortunately, the current implementation requires the caller to have write + access to the image file. + """ + + def __init__(self, image, log=None): + """Refer the '_FilemapBase' class for the documentation.""" + + # Call the base class constructor first + _FilemapBase.__init__(self, image, log) + self._log.debug("FilemapSeek: initializing") + + self._probe_seek_hole() + + def _probe_seek_hole(self): + """ + Check whether the system implements 'SEEK_HOLE' and 'SEEK_DATA'. + Unfortunately, there seems to be no clean way for detecting this, + because often the system just fakes them by just assuming that all + files are fully mapped, so 'SEEK_HOLE' always returns EOF and + 'SEEK_DATA' always returns the requested offset. + + I could not invent a better way of detecting the fake 'SEEK_HOLE' + implementation than just to create a temporary file in the same + directory where the image file resides. It would be nice to change this + to something better. + """ + + directory = os.path.dirname(self._image_path) + + try: + tmp_obj = tempfile.TemporaryFile("w+", dir=directory) + except IOError as err: + raise ErrorNotSupp("cannot create a temporary in \"%s\": %s" + % (directory, err)) + + try: + os.ftruncate(tmp_obj.fileno(), self.block_size) + except OSError as err: + raise ErrorNotSupp("cannot truncate temporary file in \"%s\": %s" + % (directory, err)) + + offs = _lseek(tmp_obj, 0, _SEEK_HOLE) + if offs != 0: + # We are dealing with the stub 'SEEK_HOLE' implementation which + # always returns EOF. + self._log.debug("lseek(0, SEEK_HOLE) returned %d" % offs) + raise ErrorNotSupp("the file-system does not support " + "\"SEEK_HOLE\" and \"SEEK_DATA\" but only " + "provides a stub implementation") + + tmp_obj.close() + + def block_is_mapped(self, block): + """Refer the '_FilemapBase' class for the documentation.""" + offs = _lseek(self._f_image, block * self.block_size, _SEEK_DATA) + if offs == -1: + result = False + else: + result = (offs // self.block_size == block) + + self._log.debug("FilemapSeek: block_is_mapped(%d) returns %s" + % (block, result)) + return result + + def block_is_unmapped(self, block): + """Refer the '_FilemapBase' class for the documentation.""" + return not self.block_is_mapped(block) + + def _get_ranges(self, start, count, whence1, whence2): + """ + This function implements 'get_mapped_ranges()' and + 'get_unmapped_ranges()' depending on what is passed in the 'whence1' + and 'whence2' arguments. + """ + + assert whence1 != whence2 + end = start * self.block_size + limit = end + count * self.block_size + + while True: + start = _lseek(self._f_image, end, whence1) + if start == -1 or start >= limit or start == self.image_size: + break + + end = _lseek(self._f_image, start, whence2) + if end == -1 or end == self.image_size: + end = self.blocks_cnt * self.block_size + if end > limit: + end = limit + + start_blk = start // self.block_size + end_blk = end // self.block_size - 1 + self._log.debug("FilemapSeek: yielding range (%d, %d)" + % (start_blk, end_blk)) + yield (start_blk, end_blk) + + def get_mapped_ranges(self, start, count): + """Refer the '_FilemapBase' class for the documentation.""" + self._log.debug("FilemapSeek: get_mapped_ranges(%d, %d(%d))" + % (start, count, start + count - 1)) + return self._get_ranges(start, count, _SEEK_DATA, _SEEK_HOLE) + + def get_unmapped_ranges(self, start, count): + """Refer the '_FilemapBase' class for the documentation.""" + self._log.debug("FilemapSeek: get_unmapped_ranges(%d, %d(%d))" + % (start, count, start + count - 1)) + return self._get_ranges(start, count, _SEEK_HOLE, _SEEK_DATA) + + +# Below goes the FIEMAP ioctl implementation, which is not very readable +# because it deals with the rather complex FIEMAP ioctl. To understand the +# code, you need to know the FIEMAP interface, which is documented in the +# "Documentation/filesystems/fiemap.txt" file in the Linux kernel sources. + +# Format string for 'struct fiemap' +_FIEMAP_FORMAT = "=QQLLLL" +# sizeof(struct fiemap) +_FIEMAP_SIZE = struct.calcsize(_FIEMAP_FORMAT) +# Format string for 'struct fiemap_extent' +_FIEMAP_EXTENT_FORMAT = "=QQQQQLLLL" +# sizeof(struct fiemap_extent) +_FIEMAP_EXTENT_SIZE = struct.calcsize(_FIEMAP_EXTENT_FORMAT) +# The FIEMAP ioctl number +_FIEMAP_IOCTL = 0xC020660B +# This FIEMAP ioctl flag which instructs the kernel to sync the file before +# reading the block map +_FIEMAP_FLAG_SYNC = 0x00000001 +# Size of the buffer for 'struct fiemap_extent' elements which will be used +# when invoking the FIEMAP ioctl. The larger is the buffer, the less times the +# FIEMAP ioctl will be invoked. +_FIEMAP_BUFFER_SIZE = 256 * 1024 + +class FilemapFiemap(_FilemapBase): + """ + This class provides API to the FIEMAP ioctl. Namely, it allows to iterate + over all mapped blocks and over all holes. + + This class synchronizes the image file every time it invokes the FIEMAP + ioctl in order to work-around early FIEMAP implementation kernel bugs. + """ + + def __init__(self, image, log=None): + """ + Initialize a class instance. The 'image' argument is full the file + object to operate on. + """ + + # Call the base class constructor first + _FilemapBase.__init__(self, image, log) + self._log.debug("FilemapFiemap: initializing") + + self._buf_size = _FIEMAP_BUFFER_SIZE + + # Calculate how many 'struct fiemap_extent' elements fit the buffer + self._buf_size -= _FIEMAP_SIZE + self._fiemap_extent_cnt = self._buf_size // _FIEMAP_EXTENT_SIZE + assert self._fiemap_extent_cnt > 0 + self._buf_size = self._fiemap_extent_cnt * _FIEMAP_EXTENT_SIZE + self._buf_size += _FIEMAP_SIZE + + # Allocate a mutable buffer for the FIEMAP ioctl + self._buf = array.array('B', [0] * self._buf_size) + + # Check if the FIEMAP ioctl is supported + self.block_is_mapped(0) + def _invoke_fiemap(self, block, count): """ Invoke the FIEMAP ioctl for 'count' blocks of the file starting from @@ -318,10 +515,24 @@ class FilemapFiemap: % (hole_first, start + count - 1)) yield (hole_first, start + count - 1) +def filemap(image, log=None): + """ + Create and return an instance of a Filemap class - 'FilemapFiemap' or + 'FilemapSeek', depending on what the system we run on supports. If the + FIEMAP ioctl is supported, an instance of the 'FilemapFiemap' class is + returned. Otherwise, if 'SEEK_HOLE' is supported an instance of the + 'FilemapSeek' class is returned. If none of these are supported, the + function generates an 'Error' type exception. + """ + + try: + return FilemapFiemap(image, log) + except ErrorNotSupp: + return FilemapSeek(image, log) def sparse_copy(src_fname, dst_fname, offset=0, skip=0): """Efficiently copy sparse file to or into another file.""" - fmap = FilemapFiemap(src_fname) + fmap = filemap(src_fname) try: dst_file = open(dst_fname, 'r+b') except IOError: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:55 +0000 Subject: [oe-commits] [openembedded-core] 25/33: u-boot: Add bc-native to DEPENDS to fix u-boot/spl build. In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.17328237C66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 02a76f320d3cddbfaae2fc5bee7d3660d95e6b7a Author: Philip Balister AuthorDate: Mon Apr 3 08:51:38 2017 -0400 u-boot: Add bc-native to DEPENDS to fix u-boot/spl build. Signed-off-by: Philip Balister Signed-off-by: Ross Burton --- meta/recipes-bsp/u-boot/u-boot_2017.01.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot_2017.01.bb index dabe709..37c21dc 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2017.01.bb @@ -1,4 +1,4 @@ require u-boot-common_${PV}.inc require u-boot.inc -DEPENDS += "dtc-native" +DEPENDS += "bc-native dtc-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:45 +0000 Subject: [oe-commits] [openembedded-core] 15/33: scripts/oe-build-perf-report: fix 'charts ready' console message In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.B0ABF237C5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 79b90ae02257002ea831a48f6798794b7711c1f8 Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:34 2017 +0300 scripts/oe-build-perf-report: fix 'charts ready' console message The javascript console log messages are used in scraping, when converting an html test report to html email. Before this patch a console message indicating that all charts have been drawn was not correctly sent if the last test failed (or didn't have chart data for some other reason) which, in turn, caused oe-build-perf-report-email.py script to fail with a timeout. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/lib/build_perf/html/measurement_chart.html | 6 +++--- scripts/lib/build_perf/html/report.html | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/lib/build_perf/html/measurement_chart.html b/scripts/lib/build_perf/html/measurement_chart.html index 26fe145..65f1a22 100644 --- a/scripts/lib/build_perf/html/measurement_chart.html +++ b/scripts/lib/build_perf/html/measurement_chart.html @@ -1,4 +1,5 @@ {# Render measurement result charts #} {% for test in test_data %} - {% set test_loop = loop %} {% if test.status == 'SUCCESS' %} {% for measurement in test.measurements %} {% set chart_elem_id = test.name + '_' + measurement.name + '_chart' %} - {% if test_loop.last and loop.last %} - {% set last_chart = true %} - {% endif %} {% include 'measurement_chart.html' %} {% endfor %} {% endif %} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:40:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:40:01 +0000 Subject: [oe-commits] [openembedded-core] 31/33: busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.4CE36237C6C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72088ae2e1c6d48751c7e11d5c772cd3a1d00006 Author: Andre McCurdy AuthorDate: Mon Apr 3 18:58:43 2017 -0700 busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE EXTRA_OEMAKE no longer contains '-e MAKEFLAGS=' so the comment explaining that it needs to be removed / over-ridden is obsolete. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-core/busybox/busybox.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 6246c95..375632d 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -18,7 +18,6 @@ BUSYBOX_SPLIT_SUID ?= "1" export EXTRA_CFLAGS = "${CFLAGS}" export EXTRA_LDFLAGS = "${LDFLAGS}" -# We don't want '-e MAKEFLAGS=' in EXTRA_OEMAKE EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' HOSTCPP='${BUILD_CPP}'" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:42 +0000 Subject: [oe-commits] [openembedded-core] 12/33: compatlayer/__init__.py: Allow add_layer to process recursive deps In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.93F85237C59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e0a268b750fb6701604dd936cd2cf3b47a6e804 Author: Mark Hatle AuthorDate: Thu Mar 30 21:30:28 2017 -0500 compatlayer/__init__.py: Allow add_layer to process recursive deps When processing a layer for dependencies, you have to process the layer itself, it's dependencies, the dependencies dependencies and so forth until all items have been processed. i.e.: LayerA requires LayerB requires LayerC requires layerD The end result should be LayerB, LayerC and LayerD are all dependencies of LayerA. Signed-off-by: Mark Hatle Signed-off-by: Ross Burton --- scripts/lib/compatlayer/__init__.py | 40 ++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 087ac14..8d8bdfe 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -143,10 +143,9 @@ def _find_layer_depends(depend, layers): def add_layer(bblayersconf, layer, layers, logger): logger.info('Adding layer %s' % layer['name']) - for collection in layer['collections']: - depends = layer['collections'][collection]['depends'] - if not depends: - continue + def recurse_dependencies(depends, layer, layers, logger, ret = []): + logger.debug('Processing dependencies %s for layer %s.' % \ + (depends, layer['name'])) for depend in depends.split(): # core (oe-core) is suppose to be provided @@ -157,8 +156,39 @@ def add_layer(bblayersconf, layer, layers, logger): if not layer_depend: logger.error('Layer %s depends on %s and isn\'t found.' % \ (layer['name'], depend)) - return False + ret = None + continue + + # We keep processing, even if ret is None, this allows us to report + # multiple errors at once + if ret is not None and layer_depend not in ret: + ret.append(layer_depend) + + # Recursively process... + if 'collections' not in layer_depend: + continue + + for collection in layer_depend['collections']: + collect_deps = layer_depend['collections'][collection]['depends'] + if not collect_deps: + continue + ret = recurse_dependencies(collect_deps, layer_depend, layers, logger, ret) + + return ret + layer_depends = [] + for collection in layer['collections']: + depends = layer['collections'][collection]['depends'] + if not depends: + continue + + layer_depends = recurse_dependencies(depends, layer, layers, logger, layer_depends) + + # Note: [] (empty) is allowed, None is not! + if layer_depends is None: + return False + else: + for layer_depend in layer_depends: logger.info('Adding layer dependency %s' % layer_depend['name']) with open(bblayersconf, 'a+') as f: f.write("\nBBLAYERS += \"%s\"\n" % layer_depend['path']) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:48 +0000 Subject: [oe-commits] [openembedded-core] 18/33: build-perf-test-wrapper.sh: correctly check test script exit status In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.CC5AC237C5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ed43b2dfe019f35086967a0c8dc605bc6629c75b Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:37 2017 +0300 build-perf-test-wrapper.sh: correctly check test script exit status Test of the exit code was accidentally moved to wrong place when oe-git-archive was taken into use. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/contrib/build-perf-test-wrapper.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index 7b7e4dd..e804ac2 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -155,6 +155,14 @@ oe-build-perf-test --out-dir "$results_dir" \ "${oe_build_perf_test_extra_opts[@]}" \ --lock-file "$base_dir/oe-build-perf.lock" +case $? in + 1) echo "ERROR: oe-build-perf-test script failed!" + exit 1 + ;; + 2) echo "NOTE: some tests failed!" + ;; +esac + # Commit results to git if [ -n "$results_repo" ]; then echo -e "\nArchiving results in $results_repo" @@ -167,14 +175,6 @@ if [ -n "$results_repo" ]; then "$results_dir" fi -case $? in - 1) echo "ERROR: oe-build-perf-test script failed!" - exit 1 - ;; - 2) echo "NOTE: some tests failed!" - ;; -esac - echo -ne "\n\n-----------------\n" echo "Global results file:" echo -ne "\n" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:40:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:40:03 +0000 Subject: [oe-commits] [openembedded-core] 33/33: glibc: fix nativesdk ldd RTLDLIST In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.61259237C4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 98e921bcf527fad1861ca6b351e82c2cf0697e7d Author: Ming Liu AuthorDate: Tue Apr 4 17:12:37 2017 +0200 glibc: fix nativesdk ldd RTLDLIST Override RTLDLIST for nativesdk, or else ldd would fail to run on SDK targets. Signed-off-by: Ming Liu Signed-off-by: Ross Burton --- meta/recipes-core/glibc/glibc-ld.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index b89b70a..c1d635d 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc @@ -44,4 +44,5 @@ def glibc_dl_info(d): EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" +RTLDLIST_class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" glibc_dl_info[vardepsexclude] = "OVERRIDES" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:58 +0000 Subject: [oe-commits] [openembedded-core] 28/33: selftest/devtool: skip test in case of poky-tiny distro In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.2C549237C69@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 03751783cb063bc6a57cd19357bc1016bfa2a814 Author: Leonardo Sandoval AuthorDate: Mon Apr 3 21:20:08 2017 -0700 selftest/devtool: skip test in case of poky-tiny distro The recipe being tested (devtoo-test-patch-gz) by devtool has dependencies (at least libxres and virtual/libx11) that cannot be built with poky-tiny distro so skip the test for this particular policy. [YOCTO #10891] Signed-off-by: Leonardo Sandoval Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/devtool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index d32ca28..762c7ba 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -1035,6 +1035,8 @@ class DevtoolTests(DevtoolBase): def test_devtool_update_recipe_local_patch_gz(self): # First, modify the recipe testrecipe = 'devtool-test-patch-gz' + if get_bb_var('DISTRO') == 'poky-tiny': + self.skipTest("The DISTRO 'poky-tiny' does not provide the dependencies needed by %s" % testrecipe) bb_vars = get_bb_vars(['FILE', 'SRC_URI'], testrecipe) recipefile = bb_vars['FILE'] src_uri = bb_vars['SRC_URI'] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:57 +0000 Subject: [oe-commits] [openembedded-core] 27/33: libxml2: make dependencies on python conditional In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.2579B237C68@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3f1be2c3875fc112d9c67af16759091e007e5b99 Author: Dmitry Rozhkov AuthorDate: Tue Apr 4 09:46:46 2017 +0300 libxml2: make dependencies on python conditional The library libxml2 can provide its own bindings for python2 in addition to the third party python-lxml and python3-lxml packages if this functionality is enabled in PACKAGECONFIG. But in case the functionality is disabled there's no need to depend on python2. Make the dependency on python2 enabled only if the python feature is added to PACKAGECONFIG. Also add missing run-time dependency on make to libxml2-ptest. Signed-off-by: Dmitry Rozhkov Signed-off-by: Ross Burton --- meta/recipes-core/libxml/libxml2_2.9.4.bb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index 023fe99..0c3d683 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb @@ -32,22 +32,24 @@ SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c BINCONFIG = "${bindir}/xml2-config" -inherit autotools pkgconfig binconfig-disabled pythonnative ptest +PACKAGECONFIG ??= "python \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +" +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +inherit autotools pkgconfig binconfig-disabled ptest + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'pythonnative', '', d)} -RDEPENDS_${PN}-ptest += "python-core" +RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-core', '', d)}" -RDEPENDS_${PN}-python += "python-core" +RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-core', '', d)}" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm1141" export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ -" -PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - # WARNING: zlib is require for RPM use EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:50 +0000 Subject: [oe-commits] [openembedded-core] 20/33: build-perf-test-wrapper.sh: support sending email reports In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.DC360237C61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 46e76ffd460933ab35da4cfd3509f7c5de5ecd93 Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:39 2017 +0300 build-perf-test-wrapper.sh: support sending email reports Add new '-E' command line option for sending an email report to specified recipient. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/contrib/build-perf-test-wrapper.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index c847197..49bc298 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -19,6 +19,7 @@ # oe-build-perf-test and archives the results. script=`basename $0` +script_dir=$(realpath $(dirname $0)) archive_dir=~/perf-results/archives usage () { @@ -32,6 +33,7 @@ Optional arguments: -c COMMITISH test (checkout) this commit, : can be specified to test specific commit of certain branch -C GIT_REPO commit results into Git + -E EMAIL_ADDR send email report -P GIT_REMOTE push results to a remote Git repository -w WORK_DIR work dir for this script (default: GIT_TOP_DIR/build-perf-test) @@ -39,12 +41,16 @@ Optional arguments: EOF } +get_os_release_var () { + ( source /etc/os-release; eval echo '$'$1 ) +} + # Parse command line arguments commitish="" oe_build_perf_test_extra_opts=() oe_git_archive_extra_opts=() -while getopts "ha:c:C:P:w:x" opt; do +while getopts "ha:c:C:E:P:w:x" opt; do case $opt in h) usage exit 0 @@ -55,6 +61,8 @@ while getopts "ha:c:C:P:w:x" opt; do ;; C) results_repo=`realpath -s "$OPTARG"` ;; + E) email_to="$OPTARG" + ;; P) oe_git_archive_extra_opts+=("--push" "$OPTARG") ;; w) base_dir=`realpath -s "$OPTARG"` @@ -178,8 +186,18 @@ if [ -n "$results_repo" ]; then --notes "buildstats/{branch_name}" "$results_dir/buildstats.json" \ "${oe_git_archive_extra_opts[@]}" \ "$results_dir" + + # Send email report + if [ -n "$email_to" ]; then + echo -e "\nEmailing test report" + os_name=`get_os_release_var PRETTY_NAME` + oe-build-perf-report -r "$results_repo" > report.txt + oe-build-perf-report -r "$results_repo" --html > report.html + "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html + fi fi + echo -ne "\n\n-----------------\n" echo "Global results file:" echo -ne "\n" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:53 +0000 Subject: [oe-commits] [openembedded-core] 23/33: quilt: Fix paths for patch and perl In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.07593237C64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4b667d268fe410a21cacaecd1b5e3bfbbe7d53d8 Author: Jussi Kukkonen AuthorDate: Thu Mar 30 19:49:28 2017 +0300 quilt: Fix paths for patch and perl Currently some shebang lines end up as #! /usr/bin/env perl -w env does not like the argument. Also the current sed to insert env does not cover the copies ptests use. Fix these issues by: - using --with-perl to insert "env" - Replacing "-w" in shebang lines with a new "use warning;" line Remove a EXTRA_OECONF_append_class_target from the native recipe. Don't overwrite EXTRA_OECONF in native: the values should be correct for native as well. --with-patch is used within the gnu patch wrapper only: before this commit the wrapper contained a (build host) path to native patch. Also tweak one test so busybox mv output is accepted. All ptests should now pass: Fixes [YOCTO #11221]. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- meta/recipes-devtools/quilt/quilt-native.inc | 3 +-- meta/recipes-devtools/quilt/quilt.inc | 9 ++++++- ...0001-tests-Allow-different-output-from-mv.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/quilt/quilt_0.65.bb | 10 -------- 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc index fce5fa1..c706704 100644 --- a/meta/recipes-devtools/quilt/quilt-native.inc +++ b/meta/recipes-devtools/quilt/quilt-native.inc @@ -5,8 +5,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1" inherit native PATCHTOOL = "patch" -EXTRA_OECONF = "--disable-nls" -EXTRA_OECONF_append_class-target = "--with-perl=perl" +EXTRA_OECONF_append = " --disable-nls" do_configure () { oe_runconf diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 57e2a14..c7bb741 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -8,6 +8,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ file://run-ptest \ file://Makefile \ file://test.sh \ + file://0001-tests-Allow-different-output-from-mv.patch \ " SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" @@ -33,10 +34,16 @@ RDEPENDS_${PN} = "bash" EXTRA_OE_MAKE_ARGS_darwin ?= "" EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" -EXTRA_OECONF = "--with-perl=perl" +EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" +# Make sure we don't have "-w" in shebang lines: it breaks using +# "/usr/bin/env perl" as parser +do_configure_prepend () { + find ${S} -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \; +} + # Don't setup symlinks to host utilities, we don't need them do_configure_append () { sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile diff --git a/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch new file mode 100644 index 0000000..21219a0 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch @@ -0,0 +1,29 @@ +From 1530138960cfafbeefb95f2a760954c00b4d0ef0 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Wed, 29 Mar 2017 15:11:59 +0300 +Subject: [PATCH] tests: Allow different output from mv + +busybox mv has different error messages: fix the test + +Upstream-Status: Inappropriate [embedded] +Signed-off-by: Jussi Kukkonen +--- + test/failbackup.test | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/failbackup.test b/test/failbackup.test +index 37046f7..fce6725 100644 +--- a/test/failbackup.test ++++ b/test/failbackup.test +@@ -16,7 +16,7 @@ What happens when refresh fails because of a permission error? + $ cat > test.txt + < This is updated test.txt. + $ quilt refresh --backup +- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission denied ++ >~ mv: .*: Permission denied + $ echo %{?} + > 1 + +-- +2.1.4 + diff --git a/meta/recipes-devtools/quilt/quilt_0.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb index 00f900a..12859f0 100644 --- a/meta/recipes-devtools/quilt/quilt_0.65.bb +++ b/meta/recipes-devtools/quilt/quilt_0.65.bb @@ -4,13 +4,3 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" SRC_URI += "file://aclocal.patch \ file://gnu_patch_test_fix_target.patch \ " - -# fix build-distro specific perl path in the target perl scripts -do_install_append() { - for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards - do - if [ -f $perlscript ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript - fi - done -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:40:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:40:02 +0000 Subject: [oe-commits] [openembedded-core] 32/33: net-tools: Fix build with USE_NLS="no" In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.595F1237C4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7d60a3614226288e17ebc81509094933466c1c9e Author: Jussi Kukkonen AuthorDate: Tue Apr 4 11:09:29 2017 +0300 net-tools: Fix build with USE_NLS="no" The configuration change was already done for -native but we really want it when USE_NLS is set. Fixes [YOCTO #11285]. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 115b398..45d7bf4 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -70,21 +70,15 @@ python do_patch() { bb.build.exec_func('patch_do_patch', d) } -# i18n only enabled for the target, doesn't build for native -# and isn't needed there. -disable_i18n() { - sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make -} -disable_i18n_class-target () { - : -} - do_configure() { # net-tools has its own config mechanism requiring "make config" # we pre-generate desired options and copy to source directory instead cp ${WORKDIR}/net-tools-config.h ${S}/config.h cp ${WORKDIR}/net-tools-config.make ${S}/config.make - disable_i18n + + if [ "${USE_NLS}" = "no" ]; then + sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make + fi } do_compile() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:54 +0000 Subject: [oe-commits] [openembedded-core] 24/33: libjpeg-turbo: don't depend on NASM for non-x86 targets In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.10885237C65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b1871b7c6df66d3bf3453668f46566b8af3e6d9 Author: Ross Burton AuthorDate: Mon Apr 3 12:57:52 2017 +0100 libjpeg-turbo: don't depend on NASM for non-x86 targets NASM is a x86-specific assembler so it is only required when building for x86 targets. Use x86-architecture and class-target overrides to depend on NASM, but explicitly disable and don't depend on it for native as complications in the native overrides meant NASM was enabled for x86-64 but disabled for x86 (this will be investigated later). Original patch by Tristan Van Berkom , more work to solve selftest failures by Richard Purdie . I just wrote a nice commit message. Also fix some missing whitespace in _appends. [ YOCTO #11240 ] Signed-off-by: Ross Burton --- meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb index 70d38f4..de2eeaf 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a127 file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \ " -DEPENDS = "nasm-native" +DEPENDS_append_x86-64_class-target = " nasm-native" +DEPENDS_append_x86_class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://fix-mips.patch" @@ -26,6 +27,9 @@ RCONFLICTS_${PN} += "jpeg" inherit autotools pkgconfig +# Add nasm-native dependency consistently for all build arches is hard +EXTRA_OECONF_append_class-native = " --without-simd" + # Work around missing x32 ABI support EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}" @@ -33,8 +37,8 @@ EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32 EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "--without-simd", "", d)}" # Provide a workaround if Altivec unit is not present in PPC -EXTRA_OECONF_append_class-target_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" -EXTRA_OECONF_append_class-target_powerpc64 = "${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" +EXTRA_OECONF_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" +EXTRA_OECONF_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" PACKAGES =+ "jpeg-tools libturbojpeg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:59 +0000 Subject: [oe-commits] [openembedded-core] 29/33: oe-selftest: test wic sparse_copy API In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113931.39C2F237C6A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 612e62c8732e7afd2f6cc6484af219bfd79f9d37 Author: Ed Bartosh AuthorDate: Tue Apr 4 14:10:45 2017 +0300 oe-selftest: test wic sparse_copy API Added new parameter 'api' to sparse_copy function to specify underlying filemap API to use. By default sparse_copy will try both available APIs. Added test case for sparse_copy to wic test suite. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/wic.py | 26 ++++++++++++++++++++++++++ scripts/lib/wic/filemap.py | 6 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index df5e060..7e26dde 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -24,6 +24,7 @@ """Test cases for wic.""" import os +import sys import unittest from glob import glob @@ -758,3 +759,28 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r self.assertEqual(0, runCmd(cmd).status) self.remove_config(config) self.assertEqual(1, len(glob(self.resultdir + "sdimage-bootpart-*direct"))) + + def test_sparse_copy(self): + """Test sparse_copy with FIEMAP and SEEK_HOLE filemap APIs""" + libpath = os.path.join(get_bb_var('COREBASE'), 'scripts', 'lib', 'wic') + sys.path.insert(0, libpath) + from filemap import FilemapFiemap, FilemapSeek, sparse_copy + with NamedTemporaryFile("w", suffix=".wic-sparse") as sparse: + src_name = sparse.name + src_size = 1024 * 10 + sparse.truncate(src_size) + # write one byte to the file + with open(src_name, 'r+b') as sfile: + sfile.seek(1024 * 4) + sfile.write(b'\x00') + dest = sparse.name + '.out' + # copy src file to dest using different filemap APIs + for api in (FilemapFiemap, FilemapSeek, None): + if os.path.exists(dest): + os.unlink(dest) + sparse_copy(sparse.name, dest, api=api) + dest_stat = os.stat(dest) + self.assertEqual(dest_stat.st_size, src_size) + # 8 blocks is 4K (physical sector size) + self.assertEqual(dest_stat.st_blocks, 8) + os.unlink(dest) diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py index 080668e..1f1aacc 100644 --- a/scripts/lib/wic/filemap.py +++ b/scripts/lib/wic/filemap.py @@ -530,9 +530,11 @@ def filemap(image, log=None): except ErrorNotSupp: return FilemapSeek(image, log) -def sparse_copy(src_fname, dst_fname, offset=0, skip=0): +def sparse_copy(src_fname, dst_fname, offset=0, skip=0, api=None): """Efficiently copy sparse file to or into another file.""" - fmap = filemap(src_fname) + if not api: + api = filemap + fmap = api(src_fname) try: dst_file = open(dst_fname, 'r+b') except IOError: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 11:39:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 11:39:47 +0000 Subject: [oe-commits] [openembedded-core] 17/33: build-perf-test-wrapper.sh: make it possible to specify Git branch name In-Reply-To: <149139236999.32740.14978677266878176241@git.openembedded.org> References: <149139236999.32740.14978677266878176241@git.openembedded.org> Message-ID: <20170405113930.C435B237C5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit be3d1718a99e59e636f349586e0a64eb8e2824a4 Author: Markus Lehtonen AuthorDate: Mon Apr 3 18:58:36 2017 +0300 build-perf-test-wrapper.sh: make it possible to specify Git branch name Support : format for the -c argument. This makes it possible to test older commits of a certain branch (not just the tip of it) so that the branch name will still be correctly recorded in the test report data. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- scripts/contrib/build-perf-test-wrapper.sh | 31 ++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index 234652d..7b7e4dd 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -29,7 +29,8 @@ Optional arguments: -h show this help and exit. -a ARCHIVE_DIR archive results tarball here, give an empty string to disable tarball archiving (default: $archive_dir) - -c COMMITISH test (checkout) this commit + -c COMMITISH test (checkout) this commit, : can be + specified to test specific commit of certain branch -C GIT_REPO commit results into Git -w WORK_DIR work dir for this script (default: GIT_TOP_DIR/build-perf-test) @@ -90,15 +91,33 @@ fi cd "$git_topdir" if [ -n "$commitish" ]; then - # Checkout correct revision - echo "Checking out $commitish" + echo "Running git fetch" git fetch &> /dev/null git checkout HEAD^0 &> /dev/null - git branch -D $commitish &> /dev/null - if ! git checkout -f $commitish &> /dev/null; then - echo "Git checkout failed" + + # Handle : format + if echo "$commitish" | grep -q ":"; then + commit=`echo "$commitish" | cut -d":" -f2` + branch=`echo "$commitish" | cut -d":" -f1` + else + commit="$commitish" + branch="$commitish" + fi + + echo "Checking out $commitish" + git branch -D $branch &> /dev/null + if ! git checkout -f $branch &> /dev/null; then + echo "ERROR: Git checkout failed" + exit 1 + fi + + # Check that the specified branch really contains the commit + commit_hash=`git rev-parse --revs-only $commit --` + if [ -z "$commit_hash" -o "`git merge-base $branch $commit`" != "$commit_hash" ]; then + echo "ERROR: branch $branch does not contain commit $commit" exit 1 fi + git reset --hard $commit > /dev/null fi # Setup build environment -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:26 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:26 +0000 Subject: [oe-commits] [meta-openembedded] 01/33: xfce4-closebutton-plugin: Fix build with clang In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.A0E7C237C4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit b1b626c1650309bb5e1c9ed67681d7f0dc268d46 Author: Khem Raj AuthorDate: Wed Mar 22 15:14:12 2017 -0700 xfce4-closebutton-plugin: Fix build with clang Signed-off-by: Khem Raj --- ...n_val_if_fail-in-functions-expecting-a-re.patch | 62 ++++++++++++++++++++++ .../closebutton/xfce4-closebutton-plugin_git.bb | 4 +- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch new file mode 100644 index 0000000..2e824ec --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch @@ -0,0 +1,62 @@ +From b0bda2dfc2d8d7bb244e59897b5bf0776f4fe44c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 15:07:26 -0700 +Subject: [PATCH] Use g_return_val_if_fail() in functions expecting a return + value + +Clang detects that we are not returning any value when function +expects it. + +Fixes + +| ../../git/panel-plugin/closebutton.c:170:3: error: non-void function 'closebutton_plugin_set_icon' should return a value [-Wreturn-type] +| g_return_if_fail (XFCE_IS_PANEL_IMAGE (icon)); + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + panel-plugin/closebutton-settings.c | 2 +- + panel-plugin/closebutton.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/panel-plugin/closebutton-settings.c b/panel-plugin/closebutton-settings.c +index f2fa370..d4e6b0c 100644 +--- a/panel-plugin/closebutton-settings.c ++++ b/panel-plugin/closebutton-settings.c +@@ -60,7 +60,7 @@ closebutton_builder_new (XfcePanelPlugin *panel_plugin, + GtkBuilder *builder; + GObject *dialog, *button; + +- g_return_if_fail (XFCE_IS_PANEL_PLUGIN (panel_plugin)); ++ g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (panel_plugin), 0); + + builder = gtk_builder_new (); + if (gtk_builder_add_from_string (builder, buffer, length, &error)) +diff --git a/panel-plugin/closebutton.c b/panel-plugin/closebutton.c +index fd0a7b5..2120728 100644 +--- a/panel-plugin/closebutton.c ++++ b/panel-plugin/closebutton.c +@@ -167,8 +167,8 @@ closebutton_plugin_set_icon (CloseButtonPlugin *plugin, gboolean force_reload) + XfcePanelPlugin *panel_plugin = XFCE_PANEL_PLUGIN (plugin); + XfcePanelImage *icon = XFCE_PANEL_IMAGE (plugin->icon); + +- g_return_if_fail (XFCE_IS_PANEL_IMAGE (icon)); +- g_return_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin)); ++ g_return_val_if_fail (XFCE_IS_PANEL_IMAGE (icon), 0); ++ g_return_val_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin), 0); + + window = closebutton_plugin_get_effective_window (plugin); + if (window != NULL) +@@ -404,7 +404,7 @@ closebutton_plugin_size_changed (XfcePanelPlugin *panel_plugin, + gint size) + { + CloseButtonPlugin *plugin = XFCE_CLOSEBUTTON_PLUGIN (panel_plugin); +- g_return_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin)); ++ g_return_val_if_fail (XFCE_IS_CLOSEBUTTON_PLUGIN (plugin), 0); + + #if LIBXFCE4PANEL_CHECK_VERSION(4,9,0) + size /= xfce_panel_plugin_get_nrows (panel_plugin); +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 341107f..746b122 100644 --- a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -9,7 +9,9 @@ DEPENDS += "exo-native libwnck xfconf" PV = "0.1.0+gitr${SRCPV}" -SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master \ + file://0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch \ + " SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:27 +0000 Subject: [oe-commits] [meta-openembedded] 02/33: xfce4-timer-plugin: Fix build when security flags are enabled with clang In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.AA9DA237C4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit c142219d33d80fe9525dfda10650fb6f88270b29 Author: Khem Raj AuthorDate: Wed Mar 22 15:34:51 2017 -0700 xfce4-timer-plugin: Fix build when security flags are enabled with clang Signed-off-by: Khem Raj --- .../0001-Specify-string-format-explicitly.patch | 32 ++++++++++++++++++++++ .../timer/xfce4-timer-plugin_1.6.0.bb | 2 ++ 2 files changed, 34 insertions(+) diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch new file mode 100644 index 0000000..3f0bb05 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch @@ -0,0 +1,32 @@ +From 6b786e1c161026ab5486ac218891a85db65bf3ba Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 15:28:24 -0700 +Subject: [PATCH] Specify string format explicitly + +Avoids below errors when compiling with -Wformat-security + +error: format string is not a string literal (potentially insecure) + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/xfcetimer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xfcetimer.c b/src/xfcetimer.c +index 601772f..4b89682 100644 +--- a/src/xfcetimer.c ++++ b/src/xfcetimer.c +@@ -190,7 +190,7 @@ static gboolean update_function (gpointer data){ + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, +- GTK_BUTTONS_NONE, dialog_message); ++ GTK_BUTTONS_NONE, "%s", dialog_message); + + gtk_window_set_title ((GtkWindow *) dialog, dialog_title); + +-- +2.12.0 + diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb index d61235f..9615192 100644 --- a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb @@ -6,5 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin +SRC_URI += "file://0001-Specify-string-format-explicitly.patch" + SRC_URI[md5sum] = "3be2a4ccfb2af20441b1d25c2cea5f28" SRC_URI[sha256sum] = "39d7d21f099bc4219f6a6156142f0bbb8374986ee1970a9c0c8dc138b87f867c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:28 +0000 Subject: [oe-commits] [meta-openembedded] 03/33: tcsh: Update to 6.20.00 release In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.B5B1A237C50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 4ecaaf8c1d62d05a82a086c9ca5327ee9358502d Author: Khem Raj AuthorDate: Wed Mar 22 19:26:44 2017 -0700 tcsh: Update to 6.20.00 release Fix segfaults on musl Signed-off-by: Khem Raj --- .../recipes-extended/tcsh/files/01_build.1.patch | 16 ------ .../recipes-extended/tcsh/files/01_build.2.patch | 13 ----- .../recipes-extended/tcsh/files/01_build.3.patch | 13 ----- .../tcsh/files/12_unknown_lscolors.patch | 24 --------- .../recipes-extended/tcsh/files/15_no-strip.patch | 14 ----- .../tcsh/files/disable-broken-test.patch | 14 ----- .../tcsh/files/disable-lexical.at-31.patch | 30 ----------- .../tcsh/files/disable-test-nice.patch | 23 --------- .../tcsh/files/disable-test-notty.patch | 30 ----------- .../tcsh/files/fix-gcc6-wait-union.patch | 11 ---- .../tcsh/files/tcsh-6.17.02-multibyte.patch | 18 ------- .../0001-Enable-system-malloc-on-all-linux.patch | 30 +++++++++++ .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 ++++++++++++++++++++++ meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | 55 -------------------- meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb | 44 ++++++++++++++++ 15 files changed, 134 insertions(+), 261 deletions(-) diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch deleted file mode 100644 index b9f41ad..0000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Franz Pletz -Description: Original comment: Fix build -Not sure why we have this patch. Let's keep it for compatibility. ---- a/pathnames.h -+++ b/pathnames.h -@@ -92,6 +92,10 @@ - # define _PATH_TCSHELL "/local/bin/tcsh" /* use ram disk */ - #endif /* _MINIX && !_PATH_TCSHELL */ - -+#ifndef _PATH_TCSHELL -+# define _PATH_TCSHELL "/bin/tcsh" /* Debian */ -+#endif /* !_PATH_TCSHELL */ -+ - #if defined(__EMX__) && !defined(_PATH_DEVNULL) - # define _PATH_DEVNULL "nul" - #endif /* __EMX__ && !_PATH_DEVNULL */ diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch deleted file mode 100644 index ff27531..0000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Franz Pletz -Description: Update manpage. ---- a/tcsh.man -+++ b/tcsh.man -@@ -578,7 +578,7 @@ Repeating \fIdabbrev-expand\fR without a - changes to the next previous word etc., skipping identical matches - much like \fIhistory-search-backward\fR does. - .TP 8 --.B delete-char \fR(not bound) -+.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR) - Deletes the character under the cursor. - See also \fIdelete-char-or-list-or-eof\fR. - .TP 8 diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch deleted file mode 100644 index d36c177..0000000 --- a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Franz Pletz -Description: Enable NODOT ---- a/config_f.h -+++ b/config_f.h -@@ -98,7 +98,7 @@ - /* - * NODOT Don't put "." in the default path, for security reasons - */ --#undef NODOT -+#define NODOT - - /* - * AUTOLOGOUT tries to determine if it should set autologout depending diff --git a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch deleted file mode 100644 index faa59cc..0000000 --- a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Franz Pletz -Description: Don't die on unknown LS_COLORS values -Removing the patch causes a segfault when dircolors is set by coreutils' dircolors. -Debian-Bug: #592089 - ---- a/tw.color.c -+++ b/tw.color.c -@@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value) - if ((Char)variables[i].variable[0] == (v[0] & CHAR) && - (Char)variables[i].variable[1] == (v[1] & CHAR)) - break; -- if (i < nvariables) { -- v += 3; -+ v += 3; -+ if (i < nvariables) - getstring(&c, &v, &variables[i].color, ':'); -- continue; -- } -- else -- stderror(ERR_BADCOLORVAR, v[0], v[1]); -+ continue; - } - break; - } diff --git a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch deleted file mode 100644 index cbc9f65..0000000 --- a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lucas Nussbaum -Description: do not strip binary - Stripping should be handled by dh_strip instead, so DEB_BUILD_OPTIONS=nostrip works. - Closes: #438109, #411607 ---- a/Makefile.in -+++ b/Makefile.in -@@ -596,7 +596,6 @@ install: tcsh$(EXEEXT) - -mkdir -p ${DESTBIN} - -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old - cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) -- -strip ${DESTBIN}/tcsh$(EXEEXT) - chmod 755 ${DESTBIN}/tcsh$(EXEEXT) - - install.man: tcsh.man diff --git a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch deleted file mode 100644 index 0bda0ba..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lucas Nussbaum -Description: disable syntactically incorrect test ---- a/tests/lexical.at -+++ b/tests/lexical.at -@@ -172,9 +172,6 @@ - AT_DATA([nohist.csh], - [echo ! space ! tab != "!(" newline ! - ]) --AT_CHECK([tcsh -f nohist.csh], , --[[! space ! tab != !( newline ! --]]) - - AT_CLEANUP - diff --git a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch deleted file mode 100644 index 98a9b2e..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/tests/lexical.at -+++ b/tests/lexical.at -@@ -27,27 +27,6 @@ AT_CHECK([tcsh -f oneword.csh], , - - AT_CLEANUP - -- --AT_SETUP([Comments]) -- --AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK --]) -- --AT_CHECK([tcsh -f -c 'echo @%:@no comment'], , --[@%:@no comment --]) -- --AT_DATA([comment2.csh], --[[echo testing...@%:@\ --OK --]]) --AT_CHECK([tcsh -f comment2.csh], , --[testing... OK --]) -- --AT_CLEANUP -- -- - AT_SETUP([Escaping special characters]) - - AT_DATA([nosplit.csh], diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch deleted file mode 100644 index 79f918c..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Lucas Nussbaum -Description: disable test that fails on the buildd with - "setpriority: Permission denied". ---- a/tests/commands.at -+++ b/tests/commands.at -@@ -888,17 +888,6 @@ TCSH_UNTESTED([migrate]) - TCSH_UNTESTED([newgrp]) - - --AT_SETUP([nice]) -- --# Nothing really tested --AT_CHECK([tcsh -f -c 'nice set var=1; echo $?var'], , --[0 --]) -- -- --AT_CLEANUP -- -- - AT_SETUP([nohup]) - - AT_DATA([nohup.csh], diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch deleted file mode 100644 index 69f0564..0000000 --- a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Lucas Nussbaum -Description: Those tests fail when running the testsuite without a tty. Disabling them. - ---- a/tests/commands.at -+++ b/tests/commands.at -@@ -1203,11 +1203,6 @@ AT_SETUP([source]) - AT_DATA([script.csh], - [[set var=$1 - ]]) --AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ -- | sed 's/ [^ ]* / TIME /']], , --[ 1 TIME source -h script.csh foo ; history -- 2 TIME set var=$1 --]) - - AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [], - [var: Undefined variable. ---- a/tests/variables.at -+++ b/tests/variables.at -@@ -319,10 +319,6 @@ AT_CLEANUP - - AT_SETUP([$ edit]) - --AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , --[1 --]) -- - AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], , - [0 - ]) diff --git a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch b/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch deleted file mode 100644 index acc2ce9..0000000 --- a/meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tcsh-6.18.01/sh.proc.c.orig 2016-06-08 16:11:02.902326725 +0000 -+++ tcsh-6.18.01/sh.proc.c 2016-06-08 16:38:22.150304901 +0000 -@@ -48,7 +48,7 @@ - #endif /* aiws */ - - #if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) --# if !defined(__ANDROID__) -+# if !defined(__ANDROID__) && !defined(__GLIBC__) - # define BSDWAIT - # endif - #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */ diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch deleted file mode 100644 index 3dd420a..0000000 --- a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Jean-Luc Leger -Description: fix broken globbing expansion -Debian-Bug: #603545 -Index: tcsh-6.18.01/tc.str.c -=================================================================== ---- tcsh-6.18.01.orig/tc.str.c 2012-01-10 13:34:31.000000000 -0800 -+++ tcsh-6.18.01/tc.str.c 2013-02-26 13:12:13.429153489 -0800 -@@ -122,8 +122,9 @@ - #else - ret = mbtowc(&tmp, s, n); - #endif -- if (ret > 0) { -+ if (ret >= 0) - *pwc = tmp; -+ if (ret >= 0) { - #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC) - if (tmp >= 0xd800 && tmp <= 0xdbff) { - /* UTF-16 surrogate pair. Fetch second half and compute diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch new file mode 100644 index 0000000..ff2f6a3 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch @@ -0,0 +1,30 @@ +From 0553455813a1f717ef50cc911e4db73da3d23c32 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 18:47:40 -0700 +Subject: [PATCH 1/2] Enable system malloc on all linux + +Dont trigger on being just android or glibc +internal malloc falls flat on musl based systems +as well. So switch to using system malloc + +Signed-off-by: Khem Raj +--- + config_f.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config_f.h b/config_f.h +index 6a632a5..0a66960 100644 +--- a/config_f.h ++++ b/config_f.h +@@ -139,7 +139,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__linux__) || defined(__OpenBSD__) || defined(__APPLE__) + # define SYSMALLOC + #else + # undef SYSMALLOC +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch new file mode 100644 index 0000000..e4de6f7 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch @@ -0,0 +1,60 @@ +From 60271713025f6b17dda29721be012a8428e77185 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 18:56:49 -0700 +Subject: [PATCH 2/2] Add debian csh scripts + +Signed-off-by: Khem Raj +--- + csh.cshrc | 15 +++++++++++++++ + csh.login | 8 ++++++++ + csh.logout | 1 + + 3 files changed, 24 insertions(+) + create mode 100644 csh.cshrc + create mode 100644 csh.login + create mode 100644 csh.logout + +diff --git a/csh.cshrc b/csh.cshrc +new file mode 100644 +index 0000000..29c934a +--- /dev/null ++++ b/csh.cshrc +@@ -0,0 +1,15 @@ ++# /etc/csh.cshrc: system-wide .cshrc file for csh(1) and tcsh(1) ++ ++if ($?tcsh && $?prompt) then ++ ++ bindkey "\e[1~" beginning-of-line # Home ++ bindkey "\e[7~" beginning-of-line # Home rxvt ++ bindkey "\e[2~" overwrite-mode # Ins ++ bindkey "\e[3~" delete-char # Delete ++ bindkey "\e[4~" end-of-line # End ++ bindkey "\e[8~" end-of-line # End rxvt ++ ++ set autoexpand ++ set autolist ++ set prompt = "%U%m%u:%B%~%b%# " ++endif +diff --git a/csh.login b/csh.login +new file mode 100644 +index 0000000..2455c3c +--- /dev/null ++++ b/csh.login +@@ -0,0 +1,8 @@ ++# /etc/csh.login: system-wide .login file for csh(1) and tcsh(1) ++ ++# allow for other packages/system admins to customize the shell environment ++if (-e /etc/csh/login.d && `/bin/ls /etc/csh/login.d` != "") then ++ foreach FILE (`/bin/ls /etc/csh/login.d/*`) ++ source $FILE; ++ end; ++endif +diff --git a/csh.logout b/csh.logout +new file mode 100644 +index 0000000..a207eba +--- /dev/null ++++ b/csh.logout +@@ -0,0 +1 @@ ++# /etc/csh.logout: system-wide .logout file for csh(1) and tcsh(1) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb deleted file mode 100644 index 1cfd96c..0000000 --- a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ - The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ - It includes all features of 4.4BSD C shell, plus a command-line editor, \ - programmable word completion, spelling correction and more." - -HOMEPAGE = "http://www.tcsh.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780" -SECTION = "base" -DEPENDS = "ncurses gettext-native" -SRC_URI = " \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs2 \ - ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-5.diff.gz;name=diffs5 \ - file://01_build.1.patch \ - file://01_build.2.patch \ - file://01_build.3.patch \ - file://15_no-strip.patch \ - file://disable-test-notty.patch \ - file://disable-test-nice.patch \ - file://disable-lexical.at-31.patch \ - file://12_unknown_lscolors.patch \ - file://tcsh-6.17.02-multibyte.patch \ - file://disable-broken-test.patch \ - file://fix-gcc6-wait-union.patch \ -" -SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a" -SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8" -SRC_URI[diffs2.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9" -SRC_URI[diffs2.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c" -SRC_URI[diffs5.md5sum] = "d536c12a02dc48c332cc472b86927319" -SRC_URI[diffs5.sha256sum] = "7548d64bf996548bfbc13f3e0959fd2e8455f8375381a31da67d79554aabc7af" - -inherit autotools - -do_install_append () { - oe_runmake install.man DESTDIR=${D} - - install -d ${D}${base_bindir} - ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh - - install -d ${D}${sysconfdir}/csh/login.d - install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} - install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el -} - -FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" - - -pkg_postinst_${PN} () { -#!/bin/sh -e -echo /usr/bin/tcsh >> $D/etc/shells -} - -PNBLACKLIST[tcsh] ?= "Doesn't respect CC variable and fails with HOSTTOOLS http://errors.yoctoproject.org/Errors/Details/138244/" diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb new file mode 100644 index 0000000..b59d88f --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ + The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ + It includes all features of 4.4BSD C shell, plus a command-line editor, \ + programmable word completion, spelling correction and more." + +HOMEPAGE = "http://www.tcsh.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" +SECTION = "base" +DEPENDS = "ncurses gettext-native" +SRC_URI = " \ + http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \ + file://0001-Enable-system-malloc-on-all-linux.patch \ + file://0002-Add-debian-csh-scripts.patch \ +" +SRC_URI[md5sum] = "59d40ef40a68e790d95e182069431834" +SRC_URI[sha256sum] = "b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d" + +EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" +inherit autotools + +do_compile_prepend() { + oe_runmake CC_FOR_GETHOST='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' gethost +} + +do_install_append () { + oe_runmake install.man DESTDIR=${D} + + install -d ${D}${base_bindir} + ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh + ln -s /usr/bin/tcsh ${D}${base_bindir}/csh + install -d ${D}${sysconfdir}/csh/login.d + install -m 0644 ${S}/csh.cshrc ${S}/csh.login ${S}/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} + install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el +} + +FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" + + +pkg_postinst_${PN} () { +#!/bin/sh -e +echo /usr/bin/tcsh >> $D/etc/shells +echo /usr/bin/csh >> $D/etc/shells +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:25 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:25 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (56c233b -> 2af18f9) Message-ID: <149141354531.5149.14314858590355227296@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master in repository meta-openembedded. from 56c233b meta-efl: blacklist efl-native and dependent recipes new b1b626c xfce4-closebutton-plugin: Fix build with clang new c142219 xfce4-timer-plugin: Fix build when security flags are enabled with clang new 4ecaaf8 tcsh: Update to 6.20.00 release new 211beca poco: Upgrade to 1.7.8 new b545c06 mariadb: Do not use ucontext_* APIs with musl new 43f5811 usb-modeswitch-data: Add dep on native tcl new d021ff0 aufs-util: Define HOSTCC new accb3f4 libraw1394: Update to 2.1.2 release new 217d65c libdc1394: Update to 2.2.5+ new 09a82e1 ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 new c2a7f35 faac: Fix with with security flags and on musl new 6061558 live555: Do not use XLOCALE on musl new 50c14d2 libgxim: Fix build with security flags turned on new 8acb143 utouch: Fix build on musl new 6000766 libavc1394: Add libargp on musl new 2d5b141 picocom: Upgrade to 2.2 new 386f2ea libexecinfo: Add recipe new b17f499 lxdm: Find libexecinfo if its on platform new e2d8066 libunique: Fix build with secutiy flags on new 254a9f8 pavucontrol: Backport patches to build with c++11 std new 38f0f13 networkmanager: Fix build on musl new 01feee2 jsonrpc: Backport and create patches to build with musl new a34ab25 xdebug: 2.2.6 -> 2.5.1 new ad81891 python-smbus: upgrade to 3.1.2 new b0699e4 opencv: remove redundant build dependency on python2 new 490409c flite-alsa: Blacklist as old and unmaintained new 61dc304 logfsprogs: Blacklist, doesn't have proper PV, doesn't respect LDFLAGS new 9097d4a pngcheck: respect LDFLAGS new 1214d16 uml-utilities: respect LDFLAGS not only for mconsole but for other binaries as well new ad9c16b xdotool: prevent compile-host-path QA issues new 0e1d178 dlm: fix ldflags QA warning new 61d1d45 v4l-utils: Depend on argp-standalone for musl new 2af18f9 caps: Use c99 int types The 33 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../logfsprogs/logfsprogs_git.bb | 3 + ...2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} | 6 +- .../recipes-utils/aufs-util/aufs-util_git.bb | 2 + ...01-basic.h-Use-c99-supported-stdint-types.patch | 46 ++ .../recipes-multimedia/caps/caps_0.9.24.bb | 8 +- .../recipes-multimedia/faac/faac_1.28.bb | 6 +- ...frontend-Fix-format-string-security-error.patch | 26 + ...Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 + .../libavc1394/libavc1394_0.5.4.bb | 3 + .../recipes-multimedia/libdc1394/libdc1394_git.bb | 4 +- ...adjust-net-headers-for-musl-compatibility.patch | 82 +++ .../0001-check-for-strndupa-before-using-it.patch | 67 +++ ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 + .../networkmanager/0003-Define-ETH_ALEN.patch | 39 ++ ...Define-missing-features-to-cater-for-musl.patch | 93 +++ ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 ++ .../networkmanager/networkmanager_1.4.2.bb | 15 +- ...mset-and-family-needs-to-include-string.h.patch | 26 + .../jsonrpc/0002-Fix-build-problem-on-Mac.patch | 27 + meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb | 4 +- .../respect-ldflags-also-from-bin_ldflags.patch | 36 ++ meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 4 +- .../0001-makefile-Fix-build-on-linux.patch | 59 ++ ...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 +++ .../libexecinfo/libexecinfo_1.1.bb | 31 + .../0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch | 53 ++ .../libgxim/0002-Update-autotools-macro.patch | 31 + ...string-qualifier-to-fix-potential-securit.patch | 30 + meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 6 +- .../recipes-extended/tcsh/files/01_build.1.patch | 16 - .../recipes-extended/tcsh/files/01_build.2.patch | 13 - .../recipes-extended/tcsh/files/01_build.3.patch | 13 - .../tcsh/files/12_unknown_lscolors.patch | 24 - .../recipes-extended/tcsh/files/15_no-strip.patch | 14 - .../tcsh/files/disable-broken-test.patch | 14 - .../tcsh/files/disable-lexical.at-31.patch | 30 - .../tcsh/files/disable-test-nice.patch | 23 - .../tcsh/files/disable-test-notty.patch | 30 - .../tcsh/files/fix-gcc6-wait-union.patch | 11 - .../tcsh/files/tcsh-6.17.02-multibyte.patch | 18 - .../0001-Enable-system-malloc-on-all-linux.patch | 30 + .../tcsh/tcsh/0002-Add-debian-csh-scripts.patch | 60 ++ meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | 55 -- meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb | 44 ++ .../uml-utilities-20040406/fix-ldflags.patch | 88 +++ ...-unique-Add-format-qualifier-s-for-string.patch | 32 ++ meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 11 +- ...-for-libexecinfo-providing-backtrace-APIs.patch | 36 ++ meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 16 +- .../xdotool/xdotool_1.20100416.2809.bb | 2 +- meta-oe/recipes-multimedia/live555/live555.inc | 5 +- .../0001-build-sys-Use-C-11-for-building.patch | 27 + ...-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch | 624 +++++++++++++++++++++ .../pulseaudio/pavucontrol_3.0.bb | 5 +- .../v4l2apps/v4l-utils_1.10.1.bb | 1 + meta-oe/recipes-support/flite/flite-alsa_1.3.bb | 9 + .../{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} | 4 +- meta-oe/recipes-support/mysql/mariadb.inc | 1 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 + meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 - meta-oe/recipes-support/picocom/picocom_git.bb | 23 + meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb | 2 +- .../poco/{poco_1.7.7.bb => poco_1.7.8.bb} | 4 +- .../usb-modeswitch/usb-modeswitch-data_20170205.bb | 2 + ...sys-stat.h-for-fixing-build-issue-on-musl.patch | 29 + meta-oe/recipes-support/utouch/utouch-frame_git.bb | 4 +- .../{python-smbus_3.1.1.bb => python-smbus.inc} | 10 +- .../recipes-devtools/python/python-smbus_3.1.2.bb | 2 + .../recipes-devtools/python/python3-smbus_3.1.2.bb | 2 + .../xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} | 4 +- ...n_val_if_fail-in-functions-expecting-a-re.patch | 62 ++ .../closebutton/xfce4-closebutton-plugin_git.bb | 4 +- .../0001-Specify-string-format-explicitly.patch | 32 ++ .../timer/xfce4-timer-plugin_1.6.0.bb | 2 + 75 files changed, 2038 insertions(+), 329 deletions(-) rename meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/{ntfs-3g-ntfsprogs_2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} (88%) create mode 100644 meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch create mode 100644 meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch create mode 100644 meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch create mode 100644 meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch create mode 100644 meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch create mode 100644 meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch create mode 100644 meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.1.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.2.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/01_build.3.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/15_no-strip.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/fix-gcc6-wait-union.patch delete mode 100644 meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch create mode 100644 meta-oe/recipes-extended/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch create mode 100644 meta-oe/recipes-extended/tcsh/tcsh/0002-Add-debian-csh-scripts.patch delete mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb create mode 100644 meta-oe/recipes-extended/tcsh/tcsh_6.20.00.bb create mode 100644 meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch create mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch create mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch create mode 100644 meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch rename meta-oe/recipes-support/libraw1394/{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} (71%) create mode 100644 meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch delete mode 100644 meta-oe/recipes-support/picocom/picocom_1.7.bb create mode 100644 meta-oe/recipes-support/picocom/picocom_git.bb rename meta-oe/recipes-support/poco/{poco_1.7.7.bb => poco_1.7.8.bb} (97%) create mode 100644 meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch rename meta-python/recipes-devtools/python/{python-smbus_3.1.1.bb => python-smbus.inc} (60%) create mode 100644 meta-python/recipes-devtools/python/python-smbus_3.1.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb rename meta-webserver/recipes-php/xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} (86%) create mode 100644 meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin/0001-Use-g_return_val_if_fail-in-functions-expecting-a-re.patch create mode 100644 meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:33 +0000 Subject: [oe-commits] [meta-openembedded] 08/33: libraw1394: Update to 2.1.2 release In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.E3DB6237C55@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit accb3f4ea6504a762095bb7e80b4b67689a94c62 Author: Khem Raj AuthorDate: Mon Mar 27 20:02:21 2017 -0700 libraw1394: Update to 2.1.2 release Signed-off-by: Khem Raj --- .../libraw1394/{libraw1394_2.1.0.bb => libraw1394_2.1.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb similarity index 71% rename from meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb rename to meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb index 811829e..3377807 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.0.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "d06cccb776b240b6ab5efdee33b87af2" -SRC_URI[sha256sum] = "a83cff16fb8885831bc29d7d17f3c570dc39251d89e20795c08e87720de0ba70" +SRC_URI[md5sum] = "45031ab15ca93e50c19886a38bc1814a" +SRC_URI[sha256sum] = "ddc4e32721cdfe680d964aaede68ac606a20cd17dd2ba70e2d7e0692086ab57c" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:32 +0000 Subject: [oe-commits] [meta-openembedded] 07/33: aufs-util: Define HOSTCC In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.DD901237C54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit d021ff09b42753332a6587c6cdf8355c97b6af7f Author: Khem Raj AuthorDate: Mon Mar 27 18:28:04 2017 -0700 aufs-util: Define HOSTCC Fixes errors like below | make: cc: Command not found | make: *** [: c2sh] Error 127 Signed-off-by: Khem Raj --- meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 7d5352e..50d8b90 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -18,6 +18,8 @@ PV = "3.14+git${SRCPV}" S = "${WORKDIR}/git" +export HOSTCC = "${BUILD_CC}" + do_configure_prepend() { # Replace sbin,bin paths with bitbake environment sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:35 +0000 Subject: [oe-commits] [meta-openembedded] 10/33: ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.F05D6237C57@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 09a82e1fb029bbfacf56ff960e026d800a6047bc Author: Khem Raj AuthorDate: Tue Mar 28 10:48:31 2017 -0700 ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 Signed-off-by: Khem Raj --- ...tfs-3g-ntfsprogs_2013.1.13.bb => ntfs-3g-ntfsprogs_2017.3.23.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb similarity index 88% rename from meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb rename to meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb index 6957ea9..63627de 100644 --- a/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2013.1.13.bb +++ b/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz" S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" - -SRC_URI[md5sum] = "2d6fb47ddf62b51733227126fe9227fe" -SRC_URI[sha256sum] = "4b383f0074a3ab7683339d1f18222b107aaeb4983db119292c43c2b275cefb27" +SRC_URI[md5sum] = "d97474ae1954f772c6d2fa386a6f462c" +SRC_URI[sha256sum] = "3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5" inherit autotools pkgconfig @@ -33,6 +32,7 @@ do_install_append() { # Standard mount will execute the program /sbin/mount.TYPE # when called. Add the symbolic to let mount could find ntfs. ln -sf mount.ntfs-3g ${D}/${base_sbindir}/mount.ntfs + rmdir ${D}${libdir}/ntfs-3g } # Satisfy the -dev runtime dependency -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:31 +0000 Subject: [oe-commits] [meta-openembedded] 06/33: usb-modeswitch-data: Add dep on native tcl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.D6B5E237C53@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 43f5811017c01b2173756951b6d269b9b9324467 Author: Khem Raj AuthorDate: Mon Mar 27 18:06:21 2017 -0700 usb-modeswitch-data: Add dep on native tcl it has a tclsh need for executing a script during build Fixes | ./gen-rules.tcl | /usr/bin/env: ?tclsh?: No such file or directory | make: *** [Makefile:26: 40-usb_modeswitch.rules] Error 127 | WARNING: /mnt/b/build/tmp-musl/work/all-oe-linux/usb-modeswitch-data/20170205-r0/temp/run.do_compile.30695:1 exit 1 from 'exit 1' Signed-off-by: Khem Raj --- meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb index 042cd38..eeed5e2 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit allarch +DEPENDS += "tcl-native" + SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" SRC_URI[md5sum] = "0cc107cd0c4c83df0d9400c999e21dfd" SRC_URI[sha256sum] = "e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:34 +0000 Subject: [oe-commits] [meta-openembedded] 09/33: libdc1394: Update to 2.2.5+ In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.EA425237C56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 217d65c7c5627dee3fcd60c725d58f3430514788 Author: Khem Raj AuthorDate: Mon Mar 27 20:03:02 2017 -0700 libdc1394: Update to 2.2.5+ Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb index c298b44..8318385 100755 --- a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +++ b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl" -PV = "2.2.4+gitr${SRCPV}" +PV = "2.2.5+gitr${SRCPV}" -SRCREV = "9ac63fe7a7561bea83bfd4a5db47d4d74fde43a6" +SRCREV = "5e78f51936fd09db0c0f742c7d2c0e5bdbbeed56" SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \ file://install_examples.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:37 +0000 Subject: [oe-commits] [meta-openembedded] 12/33: live555: Do not use XLOCALE on musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.0A7DD237C59@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 60615588194c0ebcae59c031cc59cda69417cc01 Author: Khem Raj AuthorDate: Wed Mar 29 16:11:00 2017 -0700 live555: Do not use XLOCALE on musl musl does not have xlocale.h Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/live555/live555.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index 710dbde..a516193 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc @@ -18,9 +18,12 @@ MIRRORS += "http://www.live555.com/liveMedia/public/ http://distcache.FreeBSD.or S = "${WORKDIR}/live" TARGET_CC_ARCH += "${LDFLAGS}" +XLOCALE_libc-musl = " -DXLOCALE_NOT_USED" +XLOCALE ?= "" + do_configure() { cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross + echo "COMPILE_OPTS+=" -fPIC ${XLOCALE}"" >> config.linux-cross ./genMakefiles linux-cross } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:30 +0000 Subject: [oe-commits] [meta-openembedded] 05/33: mariadb: Do not use ucontext_* APIs with musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.CC5BA237C52@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit b545c0643d2b2a1f1a816e789ff67116c613de5b Author: Khem Raj AuthorDate: Mon Mar 27 09:46:34 2017 -0700 mariadb: Do not use ucontext_* APIs with musl musl has ucontext.h header but does not implement the APIs Signed-off-by: Khem Raj --- meta-oe/recipes-support/mysql/mariadb.inc | 1 + .../mariadb/0001-disable-ucontext-on-musl.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 0a0caa3..4019072 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -16,6 +16,7 @@ SRC_URI = "http://downloads.mariadb.com/MariaDB/mariadb-${PV}/source/mariadb-${P file://configure.cmake-fix-valgrind.patch \ file://fix-a-building-failure.patch \ file://change-cc-to-cc-version.patch \ + file://0001-disable-ucontext-on-musl.patch \ " SRC_URI[md5sum] = "fca86f1eaed2163b4bdce4f98f472324" SRC_URI[sha256sum] = "e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293" diff --git a/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch new file mode 100644 index 0000000..60e9199 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/0001-disable-ucontext-on-musl.patch @@ -0,0 +1,28 @@ +From 5bc3e7ef9700d12054e0125a126f1bb093f01ef9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 dd44103..9b28c17 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 +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:36 +0000 Subject: [oe-commits] [meta-openembedded] 11/33: faac: Fix with with security flags and on musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.02D35237C58@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit c2a7f35398b366e1af04e502708990d0337f3268 Author: Khem Raj AuthorDate: Tue Mar 28 21:35:20 2017 -0700 faac: Fix with with security flags and on musl Signed-off-by: Khem Raj --- .../recipes-multimedia/faac/faac_1.28.bb | 6 ++++- ...frontend-Fix-format-string-security-error.patch | 26 ++++++++++++++++++++ ...Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb index 2f048af..5c9477f 100644 --- a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb +++ b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb @@ -9,11 +9,15 @@ inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ file://build-fix.patch \ file://address-gcc-6-narrowing-errors.patch \ -" + file://0001-frontend-Fix-format-string-security-error.patch \ + file://0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \ + " SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6" SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df" +EXTRA_OECONF += "--without-mp4v2" + PACKAGES =+ "lib${BPN} lib${BPN}-dev" FILES_${PN} = " ${bindir}/faac " diff --git a/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch new file mode 100644 index 0000000..75e003e --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch @@ -0,0 +1,26 @@ +From c1d7a8b992dc36d0012cc3d54b7d3abf4ad4d5d8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 21:33:01 -0700 +Subject: [PATCH 1/2] frontend: Fix format string security error + +Signed-off-by: Khem Raj +--- + frontend/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/frontend/main.c b/frontend/main.c +index 02146a8..cb9329c 100644 +--- a/frontend/main.c ++++ b/frontend/main.c +@@ -715,7 +715,7 @@ int main(int argc, char *argv[]) + break; + #endif + case 'L': +- fprintf(stderr, faac_copyright_string); ++ fprintf(stderr, "%s", faac_copyright_string); + dieMessage = license; + break; + case 'X': +-- +2.12.1 + diff --git a/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch new file mode 100644 index 0000000..d845ddf --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch @@ -0,0 +1,28 @@ +From 46cc9298c38b9dd735fec3f39aa2d6e56a362410 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 21:33:36 -0700 +Subject: [PATCH 2/2] mp4v2: Define __STRING if cdefs.h does not exist + +Signed-off-by: Khem Raj +--- + common/mp4v2/mp4util.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/common/mp4v2/mp4util.h b/common/mp4v2/mp4util.h +index 1f9cb64..1e7aced 100644 +--- a/common/mp4v2/mp4util.h ++++ b/common/mp4v2/mp4util.h +@@ -23,6 +23,10 @@ + #define __MP4_UTIL_INCLUDED__ + #include + ++#ifndef __STRING ++#define __STRING(x) #x ++#endif ++ + #ifndef ASSERT + #define ASSERT(expr) \ + if (!(expr)) { \ +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:29 +0000 Subject: [oe-commits] [meta-openembedded] 04/33: poco: Upgrade to 1.7.8 In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173225.BFE42237C51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 211beca606a26e680fba54851c9188a018bd01ab Author: Khem Raj AuthorDate: Sun Mar 26 15:45:27 2017 -0700 poco: Upgrade to 1.7.8 Fixes build with musl Signed-off-by: Khem Raj --- meta-oe/recipes-support/poco/{poco_1.7.7.bb => poco_1.7.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/poco/poco_1.7.7.bb b/meta-oe/recipes-support/poco/poco_1.7.8.bb similarity index 97% rename from meta-oe/recipes-support/poco/poco_1.7.7.bb rename to meta-oe/recipes-support/poco/poco_1.7.8.bb index e2d3be8..0fd6a8b 100644 --- a/meta-oe/recipes-support/poco/poco_1.7.7.bb +++ b/meta-oe/recipes-support/poco/poco_1.7.8.bb @@ -12,9 +12,9 @@ inherit cmake ptest BBCLASSEXTEND = "native" -SRCREV = "e98adba2c298b4179e77237873d3fbc53876c528" +SRCREV = "aae9c2e0f64caf019d31ba8f97635d5656b25ba5" SRC_URI = " \ - git://github.com/pocoproject/poco.git \ + git://github.com/pocoproject/poco.git;branch=poco-${PV} \ file://run-ptest \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:39 +0000 Subject: [oe-commits] [meta-openembedded] 14/33: utouch: Fix build on musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.19A66237C5B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 8acb143f454d84192a809e1ff785932b9d16e7e4 Author: Khem Raj AuthorDate: Thu Mar 30 00:29:33 2017 -0700 utouch: Fix build on musl Signed-off-by: Khem Raj --- ...sys-stat.h-for-fixing-build-issue-on-musl.patch | 29 ++++++++++++++++++++++ meta-oe/recipes-support/utouch/utouch-frame_git.bb | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch new file mode 100644 index 0000000..f3c8eeb --- /dev/null +++ b/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -0,0 +1,29 @@ +From 08b17ec505e09e8f5a4d73ffc3aa61561ec2e0da Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 00:27:54 -0700 +Subject: [PATCH] include sys/stat.h for fixing build issue on musl + +error: field has incomplete + type 'struct stat' + struct stat fs; + +Signed-off-by: Khem Raj +--- + tools/utouch-frame-test-mtdev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/utouch-frame-test-mtdev.c b/tools/utouch-frame-test-mtdev.c +index 5253320..2032af4 100644 +--- a/tools/utouch-frame-test-mtdev.c ++++ b/tools/utouch-frame-test-mtdev.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include "common-defs.h" + + struct frame_test { +-- +2.12.1 + diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 6ec566d..39d46af 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -10,7 +10,9 @@ DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ - file://remove-man-page-creation.patch" + file://remove-man-page-creation.patch \ + file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ + " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" PV = "1.1.2+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:40 +0000 Subject: [oe-commits] [meta-openembedded] 15/33: libavc1394: Add libargp on musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.22935237C5C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 6000766a821723daf93ce4a78b4f0a6ffd8d833b Author: Khem Raj AuthorDate: Thu Mar 30 00:33:36 2017 -0700 libavc1394: Add libargp on musl Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb b/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb index 97e2bf1..f5b0d48 100644 --- a/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb +++ b/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb @@ -4,6 +4,7 @@ HOMEPAGE = "http://sourceforge.net/projects/libavc1394/" SECTION = "libs/multimedia" DEPENDS = "libraw1394" +DEPENDS_append_libc-musl = " argp-standalone" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" @@ -13,3 +14,5 @@ SRC_URI[md5sum] = "caf0db059d8b8d35d6f08e6c0e1c7dfe" SRC_URI[sha256sum] = "7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53" inherit autotools pkgconfig + +LDFLAGS_append_libc-musl = " -largp" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:38 +0000 Subject: [oe-commits] [meta-openembedded] 13/33: libgxim: Fix build with security flags turned on In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.1182C237C5A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 50c14d2535046e4d5bc5a00f4a3d171d9c5a053e Author: Khem Raj AuthorDate: Wed Mar 29 18:09:02 2017 -0700 libgxim: Fix build with security flags turned on Signed-off-by: Khem Raj --- .../0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch | 53 ++++++++++++++++++++++ .../libgxim/0002-Update-autotools-macro.patch | 31 +++++++++++++ ...string-qualifier-to-fix-potential-securit.patch | 30 ++++++++++++ meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 6 ++- 4 files changed, 119 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch new file mode 100644 index 0000000..41e07f3 --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch @@ -0,0 +1,53 @@ +From d2ccba90186e2affbb3d146ada341ea2ae6fab2c Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 13 May 2013 16:05:32 +0900 +Subject: [PATCH 1/3] Use AM_CPPFLAGS instead of INCLUDES + +--- + docs/reference/Makefile.am | 2 +- + libgxim/Makefile.am | 2 +- + tests/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index 24986e1..f785735 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -84,7 +84,7 @@ expand_content_files= + # signals and properties. + # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) + # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +-INCLUDES= \ ++AM_CPPFLAGS= \ + $(GXIM_CFLAGS) \ + -I$(top_srcdir) \ + $(NULL) +diff --git a/libgxim/Makefile.am b/libgxim/Makefile.am +index 572bdb5..ae1ba32 100644 +--- a/libgxim/Makefile.am ++++ b/libgxim/Makefile.am +@@ -1,7 +1,7 @@ + ## + # Global definitions + NULL = +-INCLUDES = \ ++AM_CPPFLAGS = \ + $(GXIM_CFLAGS) \ + -I$(top_srcdir) \ + $(NULL) +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 2926829..919ccc8 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,7 +1,7 @@ + ## + # Global definitions + NULL = +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir)/libgxim \ + -I$(top_srcdir) \ + $(GXIM_CFLAGS) \ +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch new file mode 100644 index 0000000..808203b --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch @@ -0,0 +1,31 @@ +From 3215783732b147723e3613cc3c3f83cdcf2ae832 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 22 Jan 2014 18:59:32 +0900 +Subject: [PATCH 2/3] Update autotools macro + +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d559491..8b846a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,10 +11,12 @@ dnl V=0 to make. + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AM_MAINTAINER_MODE +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4macros]) + +-AC_PROG_LIBTOOL ++LT_PREREQ([2.2]) ++LT_INIT([disable-static]) ++ + AC_PROG_INTLTOOL + + AC_PROG_CC +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch new file mode 100644 index 0000000..cb21e1e --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch @@ -0,0 +1,30 @@ +From d05d7fa24ee128f1f33a2e905fc3601955dd27d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 18:06:02 -0700 +Subject: [PATCH 3/3] Add format string qualifier to fix potential security + risk + +Fixes +libgxim/gximprotocol10.c:2076:66: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + +Signed-off-by: Khem Raj +--- + libgxim/gximprotocol10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgxim/gximprotocol10.c b/libgxim/gximprotocol10.c +index 04887a5..65bd4df 100644 +--- a/libgxim/gximprotocol10.c ++++ b/libgxim/gximprotocol10.c +@@ -2073,7 +2073,7 @@ g_xim_protocol10_closure_real_parser_error(GXimProtocol *proto, + msg = g_strdup_printf("Unable to parse the protocol %s properly", + g_xim_protocol_name(major_opcode)); + +- g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg); ++ g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg); + switch (major_opcode) { + case G_XIM_CONNECT: + case G_XIM_AUTH_REQUIRED: +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 44b7531..5bf7c6e 100644 --- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -10,7 +10,11 @@ HOMEPAGE = "http://code.google.com/p/libgxim/" SECTION = "System Environment/Libraries" SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ + file://0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch \ + file://0002-Update-autotools-macro.patch \ + file://0003-Add-format-string-qualifier-to-fix-potential-securit.patch \ + " SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a" SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:42 +0000 Subject: [oe-commits] [meta-openembedded] 17/33: libexecinfo: Add recipe In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.315EC237C5E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 386f2eaddad00a6e76e38ebb2c9d824c9540b7e4 Author: Khem Raj AuthorDate: Sun Mar 19 16:19:21 2017 -0700 libexecinfo: Add recipe This package is handy especially with musl to port apps which use glibc backtrace APIs build for musl systems alone Signed-off-by: Khem Raj --- .../0001-makefile-Fix-build-on-linux.patch | 59 ++++++++++++++++ ...x-compiler-errors-found-with-newer-gcc-cl.patch | 79 ++++++++++++++++++++++ .../libexecinfo/libexecinfo_1.1.bb | 31 +++++++++ 3 files changed, 169 insertions(+) diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch new file mode 100644 index 0000000..f1863f1 --- /dev/null +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch @@ -0,0 +1,59 @@ +From 910bbc2cb6cc1cfa6deed9d170da02a639902c7c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 Mar 2017 16:14:54 -0700 +Subject: [PATCH 1/2] makefile: Fix build on linux + +Signed-off-by: Khem Raj +--- + Makefile | 33 +++++++++++++++++---------------- + 1 file changed, 17 insertions(+), 16 deletions(-) + +Index: libexecinfo-1.1/Makefile +=================================================================== +--- libexecinfo-1.1.orig/Makefile ++++ libexecinfo-1.1/Makefile +@@ -23,24 +23,25 @@ + # SUCH DAMAGE. + # + # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ ++# ++# Linux Makefile by Matt Smith , 2011/01/04 + +-LIB= execinfo +- +-SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h +- +-INCS= execinfo.h +- +-SHLIB_MAJOR= 1 +-SHLIB_MINOR= 0 +- +-NOPROFILE= yes +- +-DPADD= ${LIBM} +-LDADD= -lm +- +-#WARNS?= 4 +- +-#stacktraverse.c: gen.py +-# ./gen.py > stacktraverse.c ++CC?=cc ++AR?=ar ++EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c ++EXECINFO_LDFLAGS=$(LDFLAGS) ++ ++all: static dynamic ++ ++static: ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c ++ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c ++ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o ++ ++dynamic: ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So ++ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So ++ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 $(EXECINFO_LDFLAGS) stacktraverse.So execinfo.So + +-.include ++clean: ++ rm -rf *.o *.So *.a *.so diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch new file mode 100644 index 0000000..423b670 --- /dev/null +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch @@ -0,0 +1,79 @@ +From 0810817773fb81d7383d2fa8464244c8f79845fb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 19 Mar 2017 16:16:18 -0700 +Subject: [PATCH 2/2] execinfo: Fix compiler errors found with newer gcc/clang + +Signed-off-by: Khem Raj +--- + execinfo.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/execinfo.c b/execinfo.c +index 906fb14..9448b60 100644 +--- a/execinfo.c ++++ b/execinfo.c +@@ -69,7 +69,8 @@ backtrace(void **buffer, int size) + char ** + backtrace_symbols(void *const *buffer, int size) + { +- int i, clen, alen, offset; ++ size_t clen, alen; ++ int i, offset; + char **rval; + char *cp; + Dl_info info; +@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size) + rval = malloc(clen); + if (rval == NULL) + return NULL; +- (char **)cp = &(rval[size]); + for (i = 0; i < size; i++) { + if (dladdr(buffer[i], &info) != 0) { + if (info.dli_sname == NULL) +@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size) + 2 + /* " <" */ + strlen(info.dli_sname) + /* "function" */ + 1 + /* "+" */ +- D10(offset) + /* "offset */ ++ 10 + /* "offset */ + 5 + /* "> at " */ + strlen(info.dli_fname) + /* "filename" */ + 1; /* "\0" */ + rval = realloc_safe(rval, clen + alen); + if (rval == NULL) + return NULL; +- snprintf(cp, alen, "%p <%s+%d> at %s", ++ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s", + buffer[i], info.dli_sname, offset, info.dli_fname); + } else { + alen = 2 + /* "0x" */ +@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size) + rval = realloc_safe(rval, clen + alen); + if (rval == NULL) + return NULL; +- snprintf(cp, alen, "%p", buffer[i]); ++ snprintf((char *) rval + clen, alen, "%p", buffer[i]); + } +- rval[i] = cp; +- cp += alen; ++ rval[i] = (char *) clen; ++ clen += alen; + } + ++ for (i = 0; i < size; i++) ++ rval[i] += (long) rval; ++ + return rval; + } + +@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd) + return; + snprintf(buf, len, "%p\n", buffer[i]); + } +- write(fd, buf, len - 1); ++ write(fd, buf, strlen(buf)); + } + } +-- +2.12.0 + diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb new file mode 100644 index 0000000..f79b1ab --- /dev/null +++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb @@ -0,0 +1,31 @@ +# Copyright (C) 2017 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility." +HOMEPAGE = "http://www.freshports.org/devel/libexecinfo" +LIC_FILES_CHKSUM = "file://execinfo.c;endline=25;md5=85bd3fa4ea9acae5182e29db063fe2e5" +LICENSE = "BSD-2-Clause" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \ + file://0001-makefile-Fix-build-on-linux.patch \ + file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \ + " +SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91" +SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f" + +CFLAGS += "-fno-omit-frame-pointer" + +do_install() { + install -D -m 0744 ${S}/execinfo.h ${D}${includedir}/execinfo.h + install -D -m 0744 ${S}/stacktraverse.h ${D}${includedir}/stacktraverse.h + install -D -m 0744 ${B}/libexecinfo.a ${D}${libdir}/libexecinfo.a + install -D -m 0755 ${B}/libexecinfo.so.1 ${D}${libdir}/libexecinfo.so.1 + ln -s libexecinfo.so.1 ${D}${libdir}/libexecinfo.so +} +# +# We will skip parsing for non-musl systems +# +COMPATIBLE_HOST = ".*-musl.*" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:51 +0000 Subject: [oe-commits] [meta-openembedded] 26/33: flite-alsa: Blacklist as old and unmaintained In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.73844237C67@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 490409c268f5c7a21b75a22626ba62be90d6d3d5 Author: Martin Jansa AuthorDate: Mon Apr 3 15:38:53 2017 +0200 flite-alsa: Blacklist as old and unmaintained Signed-off-by: Martin Jansa --- meta-oe/recipes-support/flite/flite-alsa_1.3.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta-oe/recipes-support/flite/flite-alsa_1.3.bb b/meta-oe/recipes-support/flite/flite-alsa_1.3.bb index 51012e6..ca9a99e 100644 --- a/meta-oe/recipes-support/flite/flite-alsa_1.3.bb +++ b/meta-oe/recipes-support/flite/flite-alsa_1.3.bb @@ -10,3 +10,12 @@ SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-rel SRC_URI[md5sum] = "ae0aca1cb7b4801f4372f3a75a9e52b5" SRC_URI[sha256sum] = "922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b" + +# Looks like caused by flite-1.3-alsa_support-1.2.diff +# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags] +# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags] +# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/core2-64-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags] +# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/core2-64-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags] +# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/i586-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox16/usr/lib/libflite_cmu_us_kal16.so.1.3' [ldflags] +# flite-alsa-1.3: No GNU_HASH in the elf binary: '/tmp/work/i586-oe-linux/flite-alsa/1.3-r1/packages-split/libflite-alsa-vox8/usr/lib/libflite_cmu_us_kal.so.1.3' [ldflags] +PNBLACKLIST[flite-alsa] ?= "OLD: wasn't updated in over 6 years, only navit was RSUGGESTing it and doesn't respect LDFLAGS" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:44 +0000 Subject: [oe-commits] [meta-openembedded] 19/33: libunique: Fix build with secutiy flags on In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.3FE87237C60@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit e2d8066922fe9d5dfe9cd652fa01c4cc547c8ea2 Author: Khem Raj AuthorDate: Thu Mar 30 14:36:02 2017 -0700 libunique: Fix build with secutiy flags on Signed-off-by: Khem Raj --- ...-unique-Add-format-qualifier-s-for-string.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb | 11 ++++---- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch new file mode 100644 index 0000000..7f9fdf3 --- /dev/null +++ b/meta-oe/recipes-gnome/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch @@ -0,0 +1,32 @@ +From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 14:32:55 -0700 +Subject: [PATCH] test-unique: Add format qualifier %s for string + +Fixes potential security issues that compiler flags + +Signed-off-by: Khem Raj +--- + tests/test-unique.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test-unique.c b/tests/test-unique.c +index b7cde45..82ee81b 100644 +--- a/tests/test-unique.c ++++ b/tests/test-unique.c +@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, +- title); ++ "%s",title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +- message); ++ "%s",message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); + +-- +2.12.1 + diff --git a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb index 8aa293f..9133ccc 100644 --- a/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb +++ b/meta-oe/recipes-gnome/libunique/libunique_1.1.6.bb @@ -4,11 +4,12 @@ HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ -" + file://fix_for_compile_with_gcc-4.6.0.patch \ + file://noconst.patch \ + file://build.patch \ + file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ + file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ + " SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:52 +0000 Subject: [oe-commits] [meta-openembedded] 27/33: logfsprogs: Blacklist, doesn't have proper PV, doesn't respect LDFLAGS In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.79F03237C68@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 61dc304a44e1e8b7da643bfbd73e822b6637dc01 Author: Martin Jansa AuthorDate: Mon Apr 3 15:42:26 2017 +0200 logfsprogs: Blacklist, doesn't have proper PV, doesn't respect LDFLAGS Signed-off-by: Martin Jansa --- meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index 32ebec8..7a00e0c 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -24,3 +24,6 @@ do_install () { } BBCLASSEXTEND = "native nativesdk" + +# logfsprogs-git: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/logfsprogs/git-r0/packages-split/logfsprogs/usr/bin/mklogfs' [ldflags] +PNBLACKLIST[logfsprogs] ?= "Doesn't have proper PV, doesn't respect LDFLAGS" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:47 +0000 Subject: [oe-commits] [meta-openembedded] 22/33: jsonrpc: Backport and create patches to build with musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.563C5237C63@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 01feee2cd909d7388fa395269fad1b6bc7ccf2f1 Author: Khem Raj AuthorDate: Fri Mar 31 19:15:25 2017 -0700 jsonrpc: Backport and create patches to build with musl Signed-off-by: Khem Raj --- ...mset-and-family-needs-to-include-string.h.patch | 26 +++++++++++++++++++++ .../jsonrpc/0002-Fix-build-problem-on-Mac.patch | 27 ++++++++++++++++++++++ meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb | 4 +++- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch new file mode 100644 index 0000000..21ef98b --- /dev/null +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch @@ -0,0 +1,26 @@ +From f5416f1c2b2989f94163a2ae4b91c9b9fa13c620 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 13:32:31 -0700 +Subject: [PATCH 1/2] memset() and family needs to include string.h + +Signed-off-by: Khem Raj +--- + src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp +index 9fca57b..e63c49e 100644 +--- a/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp ++++ b/src/jsonrpccpp/server/connectors/unixdomainsocketserver.cpp +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + + using namespace jsonrpc; + using namespace std; +-- +2.12.1 + diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch new file mode 100644 index 0000000..aece45b --- /dev/null +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch @@ -0,0 +1,27 @@ +From 79050ef9607f242e0d509969b19e9390220c3411 Mon Sep 17 00:00:00 2001 +From: Yongwei Wu +Date: Sat, 31 Dec 2016 11:57:11 +0800 +Subject: [PATCH 2/2] Fix build problem on Mac. + +__suseconds_t is not defined on Mac/BSD; use the POSIX-conformant +suseconds_t. +--- + src/jsonrpccpp/server/connectors/filedescriptorserver.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp +index 8e019ca..68107f2 100644 +--- a/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp ++++ b/src/jsonrpccpp/server/connectors/filedescriptorserver.cpp +@@ -122,7 +122,7 @@ int FileDescriptorServer::WaitForRead() { + FD_ZERO(&except_fds); + FD_SET(inputfd, &read_fds); + timeout.tv_sec = 0; +- timeout.tv_usec = (__suseconds_t) (READ_TIMEOUT * 1000000); ++ timeout.tv_usec = (suseconds_t) (READ_TIMEOUT * 1000000); + // Wait for something to read + return select(inputfd + 1, &read_fds, &write_fds, &except_fds, &timeout); + } +-- +2.12.1 + diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb index 3a43f90..eb1ff65 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb @@ -13,7 +13,9 @@ SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ file://0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch \ file://0001-filedescriptorclient-Typecast-min-arguments-correctl.patch \ file://0001-filedescriptorserver-Include-sys-select.h-before-oth.patch \ -" + file://0001-memset-and-family-needs-to-include-string.h.patch \ + file://0002-Fix-build-problem-on-Mac.patch \ + " SRCREV = "ccbdb41388bdd929828941652da816bf52a0580e" SECTION = "libs" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:41 +0000 Subject: [oe-commits] [meta-openembedded] 16/33: picocom: Upgrade to 2.2 In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.297AA237C5D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 2d5b14144e895971254bc2d453386d76183fd3b1 Author: Khem Raj AuthorDate: Sat Mar 18 10:44:25 2017 -0700 picocom: Upgrade to 2.2 Package has moved to github License file got some cosmetic changes see https://github.com/npat-efault/picocom/commit/13fd331d410c2e8c39fa041bd54c3b0a93df64e1 Signed-off-by: Khem Raj --- meta-oe/recipes-support/picocom/picocom_1.7.bb | 19 ------------------- meta-oe/recipes-support/picocom/picocom_git.bb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/meta-oe/recipes-support/picocom/picocom_1.7.bb b/meta-oe/recipes-support/picocom/picocom_1.7.bb deleted file mode 100644 index d2a76c0..0000000 --- a/meta-oe/recipes-support/picocom/picocom_1.7.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program" -SECTION = "console/utils" -LICENSE = "GPLv2+" -HOMEPAGE = "http://code.google.com/p/picocom/" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI = "http://picocom.googlecode.com/files/picocom-${PV}.tar.gz" - -SRC_URI[md5sum] = "8eaba1d31407e8408674d6e57af447ef" -SRC_URI[sha256sum] = "d0f31c8f7a215a76922d30c81a52b9a2348c89e02a84935517002b3bc2c1129e" - -EXTRA_OEMAKE = "'CC=${CC}' 'LD=${LD}' 'VERSION=${PV}' \ - 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/ -} - diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb new file mode 100644 index 0000000..e091094 --- /dev/null +++ b/meta-oe/recipes-support/picocom/picocom_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "Lightweight and minimal (~20K) dumb-terminal emulation program" +SECTION = "console/utils" +LICENSE = "GPLv2+" +HOMEPAGE = "http://code.google.com/p/picocom/" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" + +BASEPV = "2.2" +PV = "${BASEPV}+git${SRCPV}" + +SRCREV = "deffd18c24145bd6f965f44e735a50b65810ccdc" + +SRC_URI = "git://github.com/npat-efault/picocom" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \ + 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${BPN} pcasc pcxm pcym pczm ${D}${bindir}/ +} + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:48 +0000 Subject: [oe-commits] [meta-openembedded] 23/33: xdebug: 2.2.6 -> 2.5.1 In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.5CAD4237C64@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit a34ab25fc1074593a1f1d9424c5b416e38b595f0 Author: dengke.du at windriver.com AuthorDate: Thu Mar 30 04:49:51 2017 -0400 xdebug: 2.2.6 -> 2.5.1 Upgrade the xdebug to fix the build failure with php 7.1 Signed-off-by: Dengke Du Signed-off-by: Martin Jansa --- .../recipes-php/xdebug/{xdebug_2.2.6.bb => xdebug_2.5.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb b/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb similarity index 86% rename from meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb rename to meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb index f7d6a4e..cc5bf0d 100644 --- a/meta-webserver/recipes-php/xdebug/xdebug_2.2.6.bb +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb @@ -6,8 +6,8 @@ DEPENDS = "php" SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" -SRC_URI[md5sum] = "f216356861e27284580d0208060ea7fa" -SRC_URI[sha256sum] = "6dd1cba0605e75009331aa3625a19ef49ade5a75aa9fe2ff8a818108d2cce84e" +SRC_URI[md5sum] = "6167b1e104f1108d77f08eb561a12b22" +SRC_URI[sha256sum] = "7fda9020fd5a2c549ae5a692fcabbb00f74e39dda81d53d25e622bdab4880ec2" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:45 +0000 Subject: [oe-commits] [meta-openembedded] 20/33: pavucontrol: Backport patches to build with c++11 std In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.47120237C61@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 254a9f82a60e0e60ca625e61b921696b33a3ad30 Author: Khem Raj AuthorDate: Fri Mar 31 14:41:32 2017 -0700 pavucontrol: Backport patches to build with c++11 std Signed-off-by: Khem Raj --- .../0001-build-sys-Use-C-11-for-building.patch | 27 + ...-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch | 624 +++++++++++++++++++++ .../pulseaudio/pavucontrol_3.0.bb | 5 +- 3 files changed, 655 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch new file mode 100644 index 0000000..b59569f --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch @@ -0,0 +1,27 @@ +From 1f92aa5c8d910519e3a74b2e3a9199aa9026a16c Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Mon, 25 Jan 2016 08:41:42 +0530 +Subject: [PATCH 1/2] build-sys: Use C++11 for building + +This requirement was added by gtkmm at some point: + +http://www.murrayc.com/permalink/2015/07/31/gtkmm-now-uses-c11/ +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 5b50e2d..8f28782 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_LN_S + AC_TYPE_SIGNAL + AC_HEADER_STDC ++AX_CXX_COMPILE_STDCXX_11 + + AC_ARG_ENABLE(gtk3, + [AS_HELP_STRING([--disable-gtk3], +-- +2.12.1 + diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch new file mode 100644 index 0000000..97ec37d --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch @@ -0,0 +1,624 @@ +From ccb3eb7b4ff65414a56e2294080885b8966da52b Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Tue, 2 Feb 2016 17:01:47 +0530 +Subject: [PATCH 2/2] build-sys: Add m4 file for AX_CXX_COMPILE_STDCXX_11 + +--- + m4/ax_cxx_compile_stdcxx.m4 | 558 +++++++++++++++++++++++++++++++++++++++++ + m4/ax_cxx_compile_stdcxx_11.m4 | 39 +++ + 2 files changed, 597 insertions(+) + create mode 100644 m4/ax_cxx_compile_stdcxx.m4 + create mode 100644 m4/ax_cxx_compile_stdcxx_11.m4 + +diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 +new file mode 100644 +index 0000000..079e17d +--- /dev/null ++++ b/m4/ax_cxx_compile_stdcxx.m4 +@@ -0,0 +1,558 @@ ++# =========================================================================== ++# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) ++# ++# DESCRIPTION ++# ++# Check for baseline language coverage in the compiler for the specified ++# version of the C++ standard. If necessary, add switches to CXXFLAGS to ++# enable support. VERSION may be '11' (for the C++11 standard) or '14' ++# (for the C++14 standard). ++# ++# The second argument, if specified, indicates whether you insist on an ++# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. ++# -std=c++11). If neither is specified, you get whatever works, with ++# preference for an extended mode. ++# ++# The third argument, if specified 'mandatory' or if left unspecified, ++# indicates that baseline support for the specified C++ standard is ++# required and that the macro should error out if no mode with that ++# support is found. If specified 'optional', then configuration proceeds ++# regardless, after defining HAVE_CXX${VERSION} if and only if a ++# supporting mode is found. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Benjamin Kosnik ++# Copyright (c) 2012 Zack Weinberg ++# Copyright (c) 2013 Roy Stogner ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov ++# Copyright (c) 2015 Paul Norman ++# Copyright (c) 2015 Moritz Klammler ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 1 ++ ++dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro ++dnl (serial version number 13). ++ ++AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl ++ m4_if([$1], [11], [], ++ [$1], [14], [], ++ [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])], ++ [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl ++ m4_if([$2], [], [], ++ [$2], [ext], [], ++ [$2], [noext], [], ++ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl ++ m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], ++ [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], ++ [$3], [optional], [ax_cxx_compile_cxx$1_required=false], ++ [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) ++ AC_LANG_PUSH([C++])dnl ++ ac_success=no ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, ++ ax_cv_cxx_compile_cxx$1, ++ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [ax_cv_cxx_compile_cxx$1=yes], ++ [ax_cv_cxx_compile_cxx$1=no])]) ++ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then ++ ac_success=yes ++ fi ++ ++ m4_if([$2], [noext], [], [dnl ++ if test x$ac_success = xno; then ++ for switch in -std=gnu++$1 -std=gnu++0x; do ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, ++ $cachevar, ++ [ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS $switch" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [eval $cachevar=yes], ++ [eval $cachevar=no]) ++ CXXFLAGS="$ac_save_CXXFLAGS"]) ++ if eval test x\$$cachevar = xyes; then ++ CXXFLAGS="$CXXFLAGS $switch" ++ ac_success=yes ++ break ++ fi ++ done ++ fi]) ++ ++ m4_if([$2], [ext], [], [dnl ++ if test x$ac_success = xno; then ++ dnl HP's aCC needs +std=c++11 according to: ++ dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf ++ dnl Cray's crayCC needs "-h std=c++11" ++ for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do ++ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) ++ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, ++ $cachevar, ++ [ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS $switch" ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], ++ [eval $cachevar=yes], ++ [eval $cachevar=no]) ++ CXXFLAGS="$ac_save_CXXFLAGS"]) ++ if eval test x\$$cachevar = xyes; then ++ CXXFLAGS="$CXXFLAGS $switch" ++ ac_success=yes ++ break ++ fi ++ done ++ fi]) ++ AC_LANG_POP([C++]) ++ if test x$ax_cxx_compile_cxx$1_required = xtrue; then ++ if test x$ac_success = xno; then ++ AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) ++ fi ++ else ++ if test x$ac_success = xno; then ++ HAVE_CXX$1=0 ++ AC_MSG_NOTICE([No compiler with C++$1 support was found]) ++ else ++ HAVE_CXX$1=1 ++ AC_DEFINE(HAVE_CXX$1,1, ++ [define if the compiler supports basic C++$1 syntax]) ++ fi ++ ++ AC_SUBST(HAVE_CXX$1) ++ fi ++]) ++ ++ ++dnl Test body for checking C++11 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++) ++ ++ ++dnl Test body for checking C++14 support ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ++ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ++) ++ ++ ++dnl Tests for new features in C++11 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ ++ ++// If the compiler admits that it is not ready for C++11, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif __cplusplus < 201103L ++ ++#error "This is not a C++11 compiler" ++ ++#else ++ ++namespace cxx11 ++{ ++ ++ namespace test_static_assert ++ { ++ ++ template ++ struct check ++ { ++ static_assert(sizeof(int) <= sizeof(T), "not big enough"); ++ }; ++ ++ } ++ ++ namespace test_final_override ++ { ++ ++ struct Base ++ { ++ virtual void f() {} ++ }; ++ ++ struct Derived : public Base ++ { ++ virtual void f() override {} ++ }; ++ ++ } ++ ++ namespace test_double_right_angle_brackets ++ { ++ ++ template < typename T > ++ struct check {}; ++ ++ typedef check single_type; ++ typedef check> double_type; ++ typedef check>> triple_type; ++ typedef check>>> quadruple_type; ++ ++ } ++ ++ namespace test_decltype ++ { ++ ++ int ++ f() ++ { ++ int a = 1; ++ decltype(a) b = 2; ++ return a + b; ++ } ++ ++ } ++ ++ namespace test_type_deduction ++ { ++ ++ template < typename T1, typename T2 > ++ struct is_same ++ { ++ static const bool value = false; ++ }; ++ ++ template < typename T > ++ struct is_same ++ { ++ static const bool value = true; ++ }; ++ ++ template < typename T1, typename T2 > ++ auto ++ add(T1 a1, T2 a2) -> decltype(a1 + a2) ++ { ++ return a1 + a2; ++ } ++ ++ int ++ test(const int c, volatile int v) ++ { ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == false, ""); ++ static_assert(is_same::value == false, ""); ++ auto ac = c; ++ auto av = v; ++ auto sumi = ac + av + 'x'; ++ auto sumf = ac + av + 1.0; ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == true, ""); ++ static_assert(is_same::value == false, ""); ++ static_assert(is_same::value == true, ""); ++ return (sumf > 0.0) ? sumi : add(c, v); ++ } ++ ++ } ++ ++ namespace test_noexcept ++ { ++ ++ int f() { return 0; } ++ int g() noexcept { return 0; } ++ ++ static_assert(noexcept(f()) == false, ""); ++ static_assert(noexcept(g()) == true, ""); ++ ++ } ++ ++ namespace test_constexpr ++ { ++ ++ template < typename CharT > ++ unsigned long constexpr ++ strlen_c_r(const CharT *const s, const unsigned long acc) noexcept ++ { ++ return *s ? strlen_c_r(s + 1, acc + 1) : acc; ++ } ++ ++ template < typename CharT > ++ unsigned long constexpr ++ strlen_c(const CharT *const s) noexcept ++ { ++ return strlen_c_r(s, 0UL); ++ } ++ ++ static_assert(strlen_c("") == 0UL, ""); ++ static_assert(strlen_c("1") == 1UL, ""); ++ static_assert(strlen_c("example") == 7UL, ""); ++ static_assert(strlen_c("another\0example") == 7UL, ""); ++ ++ } ++ ++ namespace test_rvalue_references ++ { ++ ++ template < int N > ++ struct answer ++ { ++ static constexpr int value = N; ++ }; ++ ++ answer<1> f(int&) { return answer<1>(); } ++ answer<2> f(const int&) { return answer<2>(); } ++ answer<3> f(int&&) { return answer<3>(); } ++ ++ void ++ test() ++ { ++ int i = 0; ++ const int c = 0; ++ static_assert(decltype(f(i))::value == 1, ""); ++ static_assert(decltype(f(c))::value == 2, ""); ++ static_assert(decltype(f(0))::value == 3, ""); ++ } ++ ++ } ++ ++ namespace test_uniform_initialization ++ { ++ ++ struct test ++ { ++ static const int zero {}; ++ static const int one {1}; ++ }; ++ ++ static_assert(test::zero == 0, ""); ++ static_assert(test::one == 1, ""); ++ ++ } ++ ++ namespace test_lambdas ++ { ++ ++ void ++ test1() ++ { ++ auto lambda1 = [](){}; ++ auto lambda2 = lambda1; ++ lambda1(); ++ lambda2(); ++ } ++ ++ int ++ test2() ++ { ++ auto a = [](int i, int j){ return i + j; }(1, 2); ++ auto b = []() -> int { return '0'; }(); ++ auto c = [=](){ return a + b; }(); ++ auto d = [&](){ return c; }(); ++ auto e = [a, &b](int x) mutable { ++ const auto identity = [](int y){ return y; }; ++ for (auto i = 0; i < a; ++i) ++ a += b--; ++ return x + identity(a + b); ++ }(0); ++ return a + b + c + d + e; ++ } ++ ++ int ++ test3() ++ { ++ const auto nullary = [](){ return 0; }; ++ const auto unary = [](int x){ return x; }; ++ using nullary_t = decltype(nullary); ++ using unary_t = decltype(unary); ++ const auto higher1st = [](nullary_t f){ return f(); }; ++ const auto higher2nd = [unary](nullary_t f1){ ++ return [unary, f1](unary_t f2){ return f2(unary(f1())); }; ++ }; ++ return higher1st(nullary) + higher2nd(nullary)(unary); ++ } ++ ++ } ++ ++ namespace test_variadic_templates ++ { ++ ++ template ++ struct sum; ++ ++ template ++ struct sum ++ { ++ static constexpr auto value = N0 + sum::value; ++ }; ++ ++ template <> ++ struct sum<> ++ { ++ static constexpr auto value = 0; ++ }; ++ ++ static_assert(sum<>::value == 0, ""); ++ static_assert(sum<1>::value == 1, ""); ++ static_assert(sum<23>::value == 23, ""); ++ static_assert(sum<1, 2>::value == 3, ""); ++ static_assert(sum<5, 5, 11>::value == 21, ""); ++ static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); ++ ++ } ++ ++ // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae ++ // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function ++ // because of this. ++ namespace test_template_alias_sfinae ++ { ++ ++ struct foo {}; ++ ++ template ++ using member = typename T::member_type; ++ ++ template ++ void func(...) {} ++ ++ template ++ void func(member*) {} ++ ++ void test(); ++ ++ void test() { func(0); } ++ ++ } ++ ++} // namespace cxx11 ++ ++#endif // __cplusplus >= 201103L ++ ++]]) ++ ++ ++dnl Tests for new features in C++14 ++ ++m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ ++ ++// If the compiler admits that it is not ready for C++14, why torture it? ++// Hopefully, this will speed up the test. ++ ++#ifndef __cplusplus ++ ++#error "This is not a C++ compiler" ++ ++#elif __cplusplus < 201402L ++ ++#error "This is not a C++14 compiler" ++ ++#else ++ ++namespace cxx14 ++{ ++ ++ namespace test_polymorphic_lambdas ++ { ++ ++ int ++ test() ++ { ++ const auto lambda = [](auto&&... args){ ++ const auto istiny = [](auto x){ ++ return (sizeof(x) == 1UL) ? 1 : 0; ++ }; ++ const int aretiny[] = { istiny(args)... }; ++ return aretiny[0]; ++ }; ++ return lambda(1, 1L, 1.0f, '1'); ++ } ++ ++ } ++ ++ namespace test_binary_literals ++ { ++ ++ constexpr auto ivii = 0b0000000000101010; ++ static_assert(ivii == 42, "wrong value"); ++ ++ } ++ ++ namespace test_generalized_constexpr ++ { ++ ++ template < typename CharT > ++ constexpr unsigned long ++ strlen_c(const CharT *const s) noexcept ++ { ++ auto length = 0UL; ++ for (auto p = s; *p; ++p) ++ ++length; ++ return length; ++ } ++ ++ static_assert(strlen_c("") == 0UL, ""); ++ static_assert(strlen_c("x") == 1UL, ""); ++ static_assert(strlen_c("test") == 4UL, ""); ++ static_assert(strlen_c("another\0test") == 7UL, ""); ++ ++ } ++ ++ namespace test_lambda_init_capture ++ { ++ ++ int ++ test() ++ { ++ auto x = 0; ++ const auto lambda1 = [a = x](int b){ return a + b; }; ++ const auto lambda2 = [a = lambda1(x)](){ return a; }; ++ return lambda2(); ++ } ++ ++ } ++ ++ namespace test_digit_seperators ++ { ++ ++ constexpr auto ten_million = 100'000'000; ++ static_assert(ten_million == 100000000, ""); ++ ++ } ++ ++ namespace test_return_type_deduction ++ { ++ ++ auto f(int& x) { return x; } ++ decltype(auto) g(int& x) { return x; } ++ ++ template < typename T1, typename T2 > ++ struct is_same ++ { ++ static constexpr auto value = false; ++ }; ++ ++ template < typename T > ++ struct is_same ++ { ++ static constexpr auto value = true; ++ }; ++ ++ int ++ test() ++ { ++ auto x = 0; ++ static_assert(is_same::value, ""); ++ static_assert(is_same::value, ""); ++ return x; ++ } ++ ++ } ++ ++} // namespace cxx14 ++ ++#endif // __cplusplus >= 201402L ++ ++]]) +diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 +new file mode 100644 +index 0000000..09db383 +--- /dev/null ++++ b/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -0,0 +1,39 @@ ++# ============================================================================ ++# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html ++# ============================================================================ ++# ++# SYNOPSIS ++# ++# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional]) ++# ++# DESCRIPTION ++# ++# Check for baseline language coverage in the compiler for the C++11 ++# standard; if necessary, add switches to CXXFLAGS to enable support. ++# ++# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX ++# macro with the version set to C++11. The two optional arguments are ++# forwarded literally as the second and third argument respectively. ++# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for ++# more information. If you want to use this macro, you also need to ++# download the ax_cxx_compile_stdcxx.m4 file. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Benjamin Kosnik ++# Copyright (c) 2012 Zack Weinberg ++# Copyright (c) 2013 Roy Stogner ++# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov ++# Copyright (c) 2015 Paul Norman ++# Copyright (c) 2015 Moritz Klammler ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 14 ++ ++include([ax_cxx_compile_stdcxx.m4]) ++ ++AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) +-- +2.12.1 + diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb index e9f5d49..959068d 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb @@ -8,7 +8,10 @@ inherit gnome distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" +SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \ + file://0001-build-sys-Use-C-11-for-building.patch \ + file://0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch \ + " SRC_URI[md5sum] = "176308d2c03f8f3a7b2bd4f4d284fe71" SRC_URI[sha256sum] = "b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:49 +0000 Subject: [oe-commits] [meta-openembedded] 24/33: python-smbus: upgrade to 3.1.2 In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.6403F237C65@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit ad81891ee769a25a3fae596d4187bc4181805526 Author: Stefan Agner AuthorDate: Thu Mar 30 09:27:21 2017 -0700 python-smbus: upgrade to 3.1.2 Upgrade to 3.1.2 and use Yocto source mirror to follow commit f76fe46e098d ("i2c-tools: point SRC_URI at Yocto source mirrors") in OpenEmbedded cores i2c-tools recipe. With the upgrade to i2c-tools 3.1.2 Python 3 support has been added. To support Python 3 add a common recipe for all common information and one for each supported Python version 2 and 3. Signed-off-by: Stefan Agner Signed-off-by: Martin Jansa --- .../python/{python-smbus_3.1.1.bb => python-smbus.inc} | 10 ++++------ meta-python/recipes-devtools/python/python-smbus_3.1.2.bb | 2 ++ meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-smbus_3.1.1.bb b/meta-python/recipes-devtools/python/python-smbus.inc similarity index 60% rename from meta-python/recipes-devtools/python/python-smbus_3.1.1.bb rename to meta-python/recipes-devtools/python/python-smbus.inc index df47df6..ded30ce 100644 --- a/meta-python/recipes-devtools/python/python-smbus_3.1.1.bb +++ b/meta-python/recipes-devtools/python/python-smbus.inc @@ -2,14 +2,12 @@ SUMMARY = "Set of i2c tools for linux - Python module" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8" -SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \ +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/i2c-tools-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "0fdbff53ebd0b8d9249256d6c56480b1" -SRC_URI[sha256sum] = "14d4d7d60d1c12e43f2befe239c682a5c44c27682f153d4b58c1e392d2db1700" +SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962" +SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441" -DEPENDS = "i2c-tools" - -inherit distutils +DEPENDS += "i2c-tools" S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" diff --git a/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb b/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb new file mode 100644 index 0000000..1b95778 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-smbus_3.1.2.bb @@ -0,0 +1,2 @@ +inherit distutils +require python-smbus.inc diff --git a/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb b/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb new file mode 100644 index 0000000..b357bcd --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-smbus_3.1.2.bb @@ -0,0 +1,2 @@ +inherit distutils3 +require python-smbus.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:43 +0000 Subject: [oe-commits] [meta-openembedded] 18/33: lxdm: Find libexecinfo if its on platform In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.3875D237C5F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit b17f499131ea75b1a5396314dc66acaa234460b3 Author: Khem Raj AuthorDate: Thu Mar 30 13:14:40 2017 -0700 lxdm: Find libexecinfo if its on platform fixes build with musl Signed-off-by: Khem Raj --- ...-for-libexecinfo-providing-backtrace-APIs.patch | 36 ++++++++++++++++++++++ meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 16 +++++----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch new file mode 100644 index 0000000..f9fd497 --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch @@ -0,0 +1,36 @@ +From 1d2425febf2020e38db70188df582acc9f37b136 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:01:33 -0700 +Subject: [PATCH] check for libexecinfo providing backtrace() APIs + +on musl it depends on external library to provide backtrace APIs +unlike glibc where it is bundled in + +Signed-off-by: Khem Raj +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index aa3291c..b15f65d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ AM_PROG_CC_C_O + + # Checks for libraries. + AC_CHECK_LIB([crypt], [crypt]) ++AC_CHECK_LIB([execinfo], [backtrace]) + + # Check for PAM support + AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]), +@@ -33,6 +34,7 @@ AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ]) + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_TYPE_PID_T +-- +2.12.1 + diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 407129d..c98c3a1 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -2,13 +2,13 @@ SUMMARY = "LXDM is the lightweight display manager" HOMEPAGE = "http://blog.lxde.org/?p=531" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ - file://lxdm.conf \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ - ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ - file://0002-let-autotools-create-lxdm.conf.patch \ -" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ + file://lxdm.conf \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ + ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ + file://0002-let-autotools-create-lxdm.conf.patch \ + file://0001-check-for-libexecinfo-providing-backtrace-APIs.patch \ + " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" @@ -16,6 +16,7 @@ PE = "1" DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" +DEPENDS_append_libc-musl = " libexecinfo" # combine oe-core way with angstrom DISTRO_TYPE DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" @@ -25,6 +26,7 @@ inherit autotools pkgconfig gettext systemd distro_features_check REQUIRED_DISTRO_FEATURES = "x11" CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " +LDFLAGS_append_libc-musl = " -lexecinfo" EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:46 +0000 Subject: [oe-commits] [meta-openembedded] 21/33: networkmanager: Fix build on musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.4ED0C237C62@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 38f0f1310b3bae6edaf4d6185b49163c63eaa96d Author: Khem Raj AuthorDate: Fri Mar 31 18:53:16 2017 -0700 networkmanager: Fix build on musl Signed-off-by: Khem Raj --- ...adjust-net-headers-for-musl-compatibility.patch | 82 +++++++++++++++++++ .../0001-check-for-strndupa-before-using-it.patch | 67 ++++++++++++++++ ...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 +++++++ .../networkmanager/0003-Define-ETH_ALEN.patch | 39 +++++++++ ...Define-missing-features-to-cater-for-musl.patch | 93 ++++++++++++++++++++++ ...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 +++++++++ .../networkmanager/networkmanager_1.4.2.bb | 15 ++-- 7 files changed, 357 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch new file mode 100644 index 0000000..ced0c7c --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch @@ -0,0 +1,82 @@ +From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 15:57:05 -0700 +Subject: [PATCH 1/5] adjust net/ headers for musl compatibility + +Signed-off-by: Khem Raj +--- + libnm-core/nm-utils.c | 12 +++++++----- + libnm-core/nm-utils.h | 5 ++--- + src/platform/wifi/wifi-utils.h | 2 +- + 3 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c +index df75d56..868224e 100644 +--- a/libnm-core/nm-utils.c ++++ b/libnm-core/nm-utils.c +@@ -19,24 +19,26 @@ + * Copyright 2005 - 2014 Red Hat, Inc. + */ + +-#include "nm-default.h" +- +-#include "nm-utils.h" +- + #include + #include + #include +-#include + #include + #include + #include + #include + #include ++//#include ++//#include ++#include ++ ++#include "nm-default.h" + ++#include "nm-utils.h" + #if WITH_JANSSON + #include + #endif + ++ + #include "nm-common-macros.h" + #include "nm-utils-private.h" + #include "nm-setting-private.h" +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h +index 407c14e..156ccae 100644 +--- a/libnm-core/nm-utils.h ++++ b/libnm-core/nm-utils.h +@@ -27,11 +27,10 @@ + + #include + +-#include +- + /* For ETH_ALEN and INFINIBAND_ALEN */ +-#include ++//#include + #include ++#include + + #include "nm-core-enum-types.h" + #include "nm-setting-wireless-security.h" +diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h +index 8e2b93f..84f5ce9 100644 +--- a/src/platform/wifi/wifi-utils.h ++++ b/src/platform/wifi/wifi-utils.h +@@ -22,7 +22,7 @@ + #ifndef __WIFI_UTILS_H__ + #define __WIFI_UTILS_H__ + +-#include ++//#include + + #include "nm-dbus-interface.h" + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch new file mode 100644 index 0000000..26f380b --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch @@ -0,0 +1,67 @@ +From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 18:37:19 -0700 +Subject: [PATCH] check for strndupa before using it + +musl does not have strndupa + +Signed-off-by: Khem Raj +--- + config.h.in | 4 ++++ + configure.ac | 1 + + src/systemd/src/basic/alloc-util.h | 12 ++++++++++++ + 3 files changed, 17 insertions(+) + +diff --git a/config.h.in b/config.h.in +index db8c135..c4229ed 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -41,6 +41,10 @@ + */ + #undef HAVE_DCGETTEXT + ++/* Define to 1 if you have the declaration of `strndupa', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_STRNDUPA ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_DLFCN_H + +diff --git a/configure.ac b/configure.ac +index 2630f8d..d0a57fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION) + + GIT_SHA_RECORD(NM_GIT_SHA) + ++AC_CHECK_DECLS([strndupa], [], [], [[#include ]]) + dnl + dnl Checks for typedefs, structures, and compiler characteristics. + dnl +diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h +index ceeee51..924b59c 100644 +--- a/src/systemd/src/basic/alloc-util.h ++++ b/src/systemd/src/basic/alloc-util.h +@@ -25,6 +25,18 @@ + #include + + #include "macro.h" ++#include "config.h" ++ ++#if !HAVE_DECL_STRNDUPA ++#define strndupa(s, n) \ ++ ({ \ ++ const char *__old = (s); \ ++ size_t __len = strnlen(__old, (n)); \ ++ char *__new = (char *)alloca(__len + 1); \ ++ __new[__len] = '\0'; \ ++ (char *)memcpy(__new, __old, __len); \ ++ }) ++#endif + + #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n))) + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch new file mode 100644 index 0000000..22bc6e8 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch @@ -0,0 +1,30 @@ +From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:05:05 -0700 +Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl + +Signed-off-by: Khem Raj +--- + src/systemd/src/basic/socket-util.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h +index 2536b08..76d6107 100644 +--- a/src/systemd/src/basic/socket-util.h ++++ b/src/systemd/src/basic/socket-util.h +@@ -29,6 +29,12 @@ + #include + #include + ++#if !defined(__GLIBC__) ++/* SIOCGSTAMPNS from linux/asm-generic.h ++ * for src/systemd/src/libsystemd-network/sd-lldp.c */ ++#include ++#endif ++ + #include "macro.h" + #include "util.h" + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch new file mode 100644 index 0000000..236914f --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch @@ -0,0 +1,39 @@ +From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:08:45 -0700 +Subject: [PATCH 3/5] Define ETH_ALEN + +Signed-off-by: Khem Raj +--- + libnm-core/nm-utils.h | 1 + + src/platform/wifi/wifi-utils.h | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h +index 156ccae..68e222b 100644 +--- a/libnm-core/nm-utils.h ++++ b/libnm-core/nm-utils.h +@@ -29,6 +29,7 @@ + + /* For ETH_ALEN and INFINIBAND_ALEN */ + //#include ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ + #include + #include + +diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h +index 84f5ce9..33a838d 100644 +--- a/src/platform/wifi/wifi-utils.h ++++ b/src/platform/wifi/wifi-utils.h +@@ -24,6 +24,8 @@ + + //#include + ++#define ETH_ALEN 6 /* Octets in one ethernet addr */ ++ + #include "nm-dbus-interface.h" + + typedef struct WifiData WifiData; +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch new file mode 100644 index 0000000..27c9ae9 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch @@ -0,0 +1,93 @@ +From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:09:41 -0700 +Subject: [PATCH 4/5] Define missing features to cater for musl + +Signed-off-by: Khem Raj +--- + src/systemd/sd-adapt/nm-sd-adapt.h | 2 +- + src/systemd/src/basic/parse-util.c | 5 ++++- + src/systemd/src/basic/stdio-util.h | 2 ++ + src/systemd/src/basic/util.h | 5 +++++ + src/systemd/src/systemd/sd-event.h | 4 ---- + 5 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h +index cf27c1a..72c1b89 100644 +--- a/src/systemd/sd-adapt/nm-sd-adapt.h ++++ b/src/systemd/sd-adapt/nm-sd-adapt.h +@@ -119,7 +119,7 @@ G_STMT_START { \ + # ifdef HAVE___SECURE_GETENV + # define secure_getenv __secure_getenv + # else +-# error neither secure_getenv nor __secure_getenv is available ++# define secure_getenv getenv + # endif + #endif + +diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c +index 2738663..9c21e5a 100644 +--- a/src/systemd/src/basic/parse-util.c ++++ b/src/systemd/src/basic/parse-util.c +@@ -25,8 +25,11 @@ + #include + #include + #include ++#ifdef __GLIBC__ + #include +- ++#else ++#include ++#endif + #include "alloc-util.h" + #include "extract-word.h" + #include "macro.h" +diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h +index bd1144b..c92e935 100644 +--- a/src/systemd/src/basic/stdio-util.h ++++ b/src/systemd/src/basic/stdio-util.h +@@ -19,7 +19,9 @@ + along with systemd; If not, see . + ***/ + ++#ifdef __GLIBC__ + #include ++#endif + #include + #include + #include +diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h +index bb2fc31..fe074a5 100644 +--- a/src/systemd/src/basic/util.h ++++ b/src/systemd/src/basic/util.h +@@ -46,6 +46,11 @@ + #include "missing.h" + #include "time-util.h" + ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + size_t page_size(void) _pure_; + #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) + +diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h +index cc26b7d..c7e0004 100644 +--- a/src/systemd/src/systemd/sd-event.h ++++ b/src/systemd/src/systemd/sd-event.h +@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata); + typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata); + typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata); + typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata); +-#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED + typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata); +-#else +-typedef void* sd_event_child_handler_t; +-#endif + + int sd_event_default(sd_event **e); + +-- +2.12.1 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch new file mode 100644 index 0000000..f4a04c7 --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch @@ -0,0 +1,36 @@ +From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 16:48:00 -0700 +Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over + specified + +Signed-off-by: Khem Raj +--- + src/systemd/src/systemd/sd-lldp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h +=================================================================== +--- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h ++++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h +@@ -22,7 +22,7 @@ + ***/ + + #include +-#include ++//#include + #include + + #include "sd-event.h" +Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c +=================================================================== +--- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c ++++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c +@@ -21,6 +21,7 @@ + #include "nm-sd-adapt.h" + + #include ++#include + + #include "sd-lldp.h" + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb index 064c58b..90499a6 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.2.bb @@ -23,11 +23,16 @@ DEPENDS = " \ inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ - file://0002-Fix-nm-version-macro-includes.patch \ -" +SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ + file://0002-Fix-nm-version-macro-includes.patch \ + file://0001-adjust-net-headers-for-musl-compatibility.patch \ + file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \ + file://0003-Define-ETH_ALEN.patch \ + file://0004-Define-missing-features-to-cater-for-musl.patch \ + file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ + file://0001-check-for-strndupa-before-using-it.patch \ + " SRC_URI[md5sum] = "59b5b5585467756787c6cb535cbd306e" SRC_URI[sha256sum] = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:56 +0000 Subject: [oe-commits] [meta-openembedded] 31/33: dlm: fix ldflags QA warning In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.9920C237C6C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 0e1d1787ede735e7ce4034125283607e3ed2ba52 Author: Martin Jansa AuthorDate: Tue Apr 4 14:24:29 2017 +0200 dlm: fix ldflags QA warning * fixes: dlm-4.0.2: No GNU_HASH in the elf binary: '/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/dlm/4.0.2-r0/packages-split/dlm/usr/lib/libdlmcontrol.so.3.1' No GNU_HASH in the elf binary: '/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/dlm/4.0.2-r0/packages-split/dlm/usr/sbin/dlm_tool' No GNU_HASH in the elf binary: '/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/dlm/4.0.2-r0/packages-split/dlm/usr/sbin/dlm_controld' [ldflags] Signed-off-by: Martin Jansa --- .../respect-ldflags-also-from-bin_ldflags.patch | 36 ++++++++++++++++++++++ meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 4 ++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch new file mode 100644 index 0000000..69b2f90 --- /dev/null +++ b/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch @@ -0,0 +1,36 @@ +diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile +--- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200 ++++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200 +@@ -55,7 +55,7 @@ + BIN_CFLAGS += -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm + +-BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie ++BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie + BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum + + LIB_CFLAGS += $(BIN_CFLAGS) +diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile +--- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200 ++++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200 +@@ -32,7 +32,7 @@ + BIN_CFLAGS += -fPIE -DPIE + BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld + +-BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie ++BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie + BIN_LDFLAGS += -L../libdlm -L../dlm_controld + BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol + +diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile +--- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200 ++++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200 +@@ -59,7 +59,7 @@ + BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum + + LIB_CFLAGS += $(BIN_CFLAGS) +-LIB_LDFLAGS += -Wl,-z,relro -pie ++LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie + + ifeq ($(USE_SD_NOTIFY),yes) + BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \ diff --git a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb b/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb index ff37305..31e411e 100644 --- a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb +++ b/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb @@ -5,7 +5,9 @@ HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz" +SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \ + file://respect-ldflags-also-from-bin_ldflags.patch \ +" SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f" SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:53 +0000 Subject: [oe-commits] [meta-openembedded] 28/33: pngcheck: respect LDFLAGS In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.818FB237C69@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 9097d4a3fbc57d9c77d18e6a96620241c76c5b77 Author: Martin Jansa AuthorDate: Mon Apr 3 15:54:25 2017 +0200 pngcheck: respect LDFLAGS * fixes: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/pngcheck/2.3.0-r0/packages-split/pngcheck/usr/bin/pngcheck' [ldflags] Signed-off-by: Martin Jansa --- meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index d523b7a..6d0dfff 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db256 EXTRA_OEMAKE = "-e MAKEFLAGS=" do_compile() { - oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS=${STAGING_DIR_HOST}${libdir}/libz.a + oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS='${STAGING_DIR_HOST}${libdir}/libz.a ${LDFLAGS}' } do_install() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:55 +0000 Subject: [oe-commits] [meta-openembedded] 30/33: xdotool: prevent compile-host-path QA issues In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.91294237C6B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit ad9c16bb7be00593dd7276f2ea90a19d70c6f2b1 Author: Martin Jansa AuthorDate: Mon Apr 3 20:36:37 2017 +0200 xdotool: prevent compile-host-path QA issues * as shown in the log.do_compile: cc1: warning: include location "/usr/local/include" is unsafe for cross-compilation [-Wpoison-system-directories] * it's caused by Makefile doing: DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include LIBS=$(shell pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)") INC=$(shell pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)") which always uses the DEFAULT_* since RSS, because there was no pkg-config in the recipe sysroot Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb index 474d298..b68e994 100644 --- a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxtst" PR = "r1" -inherit distro_features_check +inherit distro_features_check pkgconfig # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:58 +0000 Subject: [oe-commits] [meta-openembedded] 33/33: caps: Use c99 int types In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.AA164237C4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 2af18f934cd6764ef87977c8b23a924a5cb7fbf7 Author: Khem Raj AuthorDate: Wed Mar 22 11:57:26 2017 -0700 caps: Use c99 int types Fixes build with musl Signed-off-by: Khem Raj --- ...01-basic.h-Use-c99-supported-stdint-types.patch | 46 ++++++++++++++++++++++ .../recipes-multimedia/caps/caps_0.9.24.bb | 8 ++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch new file mode 100644 index 0000000..1087b0e --- /dev/null +++ b/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch @@ -0,0 +1,46 @@ +From a5cea22294a9acb6eed955bd415f562a6cc36482 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Mar 2017 11:54:23 -0700 +Subject: [PATCH] basic.h: Use c99 supported stdint types + +include stdint.h for getting the definitions for int types + +Signed-off-by: Khem Raj +--- + basics.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/basics.h b/basics.h +index 643d96e..1dc2fa7 100644 +--- a/basics.h ++++ b/basics.h +@@ -46,17 +46,18 @@ + + #include + #include ++#include + + #include "ladspa.h" + +-typedef __int8_t int8; +-typedef __uint8_t uint8; +-typedef __int16_t int16; +-typedef __uint16_t uint16; +-typedef __int32_t int32; +-typedef __uint32_t uint32; +-typedef __int64_t int64; +-typedef __uint64_t uint64; ++typedef int8_t int8; ++typedef uint8_t uint8; ++typedef int16_t int16; ++typedef uint16_t uint16; ++typedef int32_t int32; ++typedef uint32_t uint32; ++typedef int64_t int64; ++typedef uint64_t uint64; + + #define MIN_GAIN 1e-6 /* -120 dB */ + /* smallest non-denormal 32 bit IEEE float is 1.18e-38 */ +-- +2.12.0 + diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb index 3e409e6..90a2836 100644 --- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb +++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://quitte.de/dsp/caps.html" LICENSE = "GPL-3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = " \ - http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ - file://Avoid-ambiguity-in-div-invocation.patch \ -" +SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ + file://Avoid-ambiguity-in-div-invocation.patch \ + file://0001-basic.h-Use-c99-supported-stdint-types.patch \ + " SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:54 +0000 Subject: [oe-commits] [meta-openembedded] 29/33: uml-utilities: respect LDFLAGS not only for mconsole but for other binaries as well In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.8A395237C6A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 1214d169f52301bf89b8b15339feb92d84306e2e Author: Martin Jansa AuthorDate: Mon Apr 3 16:01:57 2017 +0200 uml-utilities: respect LDFLAGS not only for mconsole but for other binaries as well Signed-off-by: Martin Jansa --- .../uml-utilities-20040406/fix-ldflags.patch | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch index 05cc537..f4a175c 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch @@ -14,3 +14,91 @@ clean : rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/jailtest/Makefile tools/jailtest/Makefile +--- tools.orig/jailtest/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/jailtest/Makefile 2017-04-03 16:00:04.857449005 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/moo/Makefile tools/moo/Makefile +--- tools.orig/moo/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/moo/Makefile 2017-04-03 15:59:56.466449432 +0200 +@@ -10,10 +10,10 @@ + all : $(BIN) + + uml_moo : $(uml_moo_OBJS) +- $(CC) $(CFLAGS) -o $@ $($@_OBJS) ++ $(CC) $(CFLAGS) -o $@ $($@_OBJS) $(LDFLAGS) + + uml_mkcow : $(uml_mkcow_OBJS) +- $(CC) $(CFLAGS) -o $@ $($@_OBJS) ++ $(CC) $(CFLAGS) -o $@ $($@_OBJS) $(LDFLAGS) + + $(uml_moo_OBJS) $(uml_mkcow_OBJS) : cow.h cow_sys.h + +diff -uNr tools.orig/port-helper/Makefile tools/port-helper/Makefile +--- tools.orig/port-helper/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/port-helper/Makefile 2017-04-03 15:59:41.251450208 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/tunctl/Makefile tools/tunctl/Makefile +--- tools.orig/tunctl/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/tunctl/Makefile 2017-04-03 16:00:01.091449197 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/uml_net/Makefile tools/uml_net/Makefile +--- tools.orig/uml_net/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/uml_net/Makefile 2017-04-03 16:00:12.449448618 +0200 +@@ -14,7 +14,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/uml_router/Makefile tools/uml_router/Makefile +--- tools.orig/uml_router/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/uml_router/Makefile 2017-04-03 16:00:46.796446867 +0200 +@@ -13,7 +13,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ +diff -uNr tools.orig/watchdog/Makefile tools/watchdog/Makefile +--- tools.orig/watchdog/Makefile 2017-04-03 15:56:02.068461380 +0200 ++++ tools/watchdog/Makefile 2017-04-03 15:59:45.216450006 +0200 +@@ -7,7 +7,7 @@ + all : $(BIN) + + $(BIN) : $(OBJS) +- $(CC) $(CFLAGS) -o $(BIN) $(OBJS) ++ $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) + + clean : + rm -f $(BIN) $(OBJS) *~ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:57 +0000 Subject: [oe-commits] [meta-openembedded] 32/33: v4l-utils: Depend on argp-standalone for musl In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.A3021237C4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit 61d1d45d2f34dc57b144300663e8880ac67a01fd Author: Khem Raj AuthorDate: Wed Mar 22 11:49:42 2017 -0700 v4l-utils: Depend on argp-standalone for musl musl does not bundle libargp like glibc Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb index b9732fe..4d87b50 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb @@ -6,6 +6,7 @@ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" +DEPENDS_append_libc-musl = " argp-standalone" inherit autotools gettext pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:50 +0000 Subject: [oe-commits] [meta-openembedded] 25/33: opencv: remove redundant build dependency on python2 In-Reply-To: <149141354531.5149.14314858590355227296@git.openembedded.org> References: <149141354531.5149.14314858590355227296@git.openembedded.org> Message-ID: <20170405173226.6B920237C66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master in repository meta-openembedded. commit b0699e496fcb4fdfa1f4178092e1ebaf7d375e46 Author: Dmitry Rozhkov AuthorDate: Fri Mar 31 14:10:32 2017 +0300 opencv: remove redundant build dependency on python2 The recipe opencv_3.2.bb inherits to either distutils-base or distutils3-base classes or both which do add appropriate build dependency on python or python3 respectively. There's no need to have python in DEPENDS explicitly. It can even make things needlessly complicated in case a user wants to build python3-only images. The redundant build dependency on python is removed from DEPENDS. Signed-off-by: Dmitry Rozhkov Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index f47347a..f50bc05 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -DEPENDS = "libtool swig swig-native python bzip2 zlib glib-2.0 libwebp" +DEPENDS = "libtool swig swig-native bzip2 zlib glib-2.0 libwebp" SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810" SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:40 +0000 Subject: [oe-commits] [meta-openembedded] 01/21: dnsmasq: disable the service by default In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.B909C233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 18a4cc414ff17a0b127205abc0dcc888ae269ac6 Author: Jackie Huang AuthorDate: Mon Feb 27 16:09:59 2017 +0800 dnsmasq: disable the service by default The service will fail to start/stop when dnsmasq and bind (provides named) are both installed since they are using the same port 53: | dnsmasq: failed to create listening socket for port 53: Address already in use So disable the service by default, if the user really want to use two dns servives, the config needs to be changed to use different interfaces or ports. As reference, other distro like centos/fedora also disables the services by default on installation. Signed-off-by: Jackie Huang Signed-off-by: Jackie Huang > Signed-off-by: Martin Jansa --- meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index ef79c5f..3d0386b 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -81,3 +81,4 @@ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "dnsmasq.service" +SYSTEMD_AUTO_ENABLE ?= "disable" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:41 +0000 Subject: [oe-commits] [meta-openembedded] 02/21: ctdb: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.BFB9C23342A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a48f2ceacf0d37a94e018d00deebf09fdd35beed Author: Khem Raj AuthorDate: Wed Mar 22 11:45:28 2017 -0700 ctdb: Fix build with musl Fixes | ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 7cea0f6..b5a6064 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -27,6 +27,9 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" DEPENDS += "popt libtevent libtalloc libldb" +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:39 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (b3f8215 -> 8987a6f) Message-ID: <149141355949.5880.3515607104100298828@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master-next in repository meta-openembedded. discard b3f8215 opencv: remove redundant build dependency on python2 discard b121b06 python-smbus: upgrade to 3.1.2 discard d479e4e xdebug: 2.2.6 -> 2.5.1 discard f504848 jsonrpc: Backport and create patches to build with musl discard 2bf0052 autofs: Patch to build on musl discard 1d84d3b networkmanager: Fix build on musl discard 46aeae3 pavucontrol: Backport patches to build with c++11 std discard 977040b snort: Fix build with musl discard 52a43d0 libunique: Fix build with secutiy flags on discard 30d8307 libnetfilter-queue: Update to git for SRC_URI discard 9817183 lxdm: Find libexecinfo if its on platform discard da896ec libnetfilter-log: Switch to git URI discard f353fcc arptables: Upgrade to 0.0.4 discard ee6b7e6 xarchiver: Fix build with security flags turned on discard 8215a80 libexecinfo: Add recipe discard b8dcf93 picocom: Upgrade to 2.2 discard db9e8c3 libavc1394: Add libargp on musl discard 2824e0b utouch: Fix build on musl discard 2daed6d daq: Fix build with musl discard 20f3a73 vpnc: Update to build from github SRC_URI discard a94127d libgxim: Fix build with security flags turned on discard 4f6c5e6 libqb: Upgrade to 1.0.1 release discard 4bec484 live555: Do not use XLOCALE on musl discard 9334e89 dibbler: Upgrade to 1.0.2RC1 discard 5dfc6e8 faac: Fix with with security flags and on musl discard 9256a18 vsftpd: Fix build with musl discard bc70034 minicoredumper: Update to 2.0.0 discard d16a05c rp-pppoe: Fix build with musl discard 70dcd88 openl2tp: Fix build with musl discard cc7d7bf ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 discard 484b7fd libdc1394: Update to 2.2.5+ discard d96ca29 libraw1394: Update to 2.1.2 release discard 4867738 ttf-inconsolata: Move copying of .otf to .ttf into do_compile discard f5a6e5a aufs-util: Define HOSTCC discard 79ad47b usb-modeswitch-data: Add dep on native tcl discard 9a5ab2b lowpan-tools: Fix build with musl discard d0c2329 mariadb: Do not use ucontext_* APIs with musl discard 97d4370 poco: Upgrade to 1.7.8 discard 6619097 ebtables: Fix build with musl discard fc46373 libnfnetlink: Backport patches to fix musl build discard 5ea2eca tcsh: Update to 6.20.00 release discard de0efe3 xfce4-timer-plugin: Fix build when security flags are enabled with clang discard 593ae29 xfce4-closebutton-plugin: Fix build with clang discard 1c82947 squid: Update to 3.5.23 discard ddec166 lvm2: Fix patch errors found with musl discard 2632060 caps: Use c99 int types discard 6167f73 v4l-utils: Depend on argp-standalone for musl discard b0b2e4f netcat-openbsd: Fix build and whitelist discard 9a3da2f gpm: Update to use git src uri discard b69e091 loop-aes: Add recipe discard 9146958 ntp: update to 4.2.8.p10 discard 6f1d95f wireless-regdb: fix crda failing from missing pubkey discard b906176 libdnet: update SRC_URI discard 4fc0aaf ctdb: Fix build with musl discard 48fe7d3 dnsmasq: disable the service by default add b1b626c xfce4-closebutton-plugin: Fix build with clang add c142219 xfce4-timer-plugin: Fix build when security flags are enabled with clang add 4ecaaf8 tcsh: Update to 6.20.00 release add 211beca poco: Upgrade to 1.7.8 add b545c06 mariadb: Do not use ucontext_* APIs with musl add 43f5811 usb-modeswitch-data: Add dep on native tcl add d021ff0 aufs-util: Define HOSTCC add accb3f4 libraw1394: Update to 2.1.2 release add 217d65c libdc1394: Update to 2.2.5+ add 09a82e1 ntfs-3g-ntfsprogs: Upgrade to 2017.3.23 add c2a7f35 faac: Fix with with security flags and on musl add 6061558 live555: Do not use XLOCALE on musl add 50c14d2 libgxim: Fix build with security flags turned on add 8acb143 utouch: Fix build on musl add 6000766 libavc1394: Add libargp on musl add 2d5b141 picocom: Upgrade to 2.2 add 386f2ea libexecinfo: Add recipe add b17f499 lxdm: Find libexecinfo if its on platform add e2d8066 libunique: Fix build with secutiy flags on add 254a9f8 pavucontrol: Backport patches to build with c++11 std add 38f0f13 networkmanager: Fix build on musl add 01feee2 jsonrpc: Backport and create patches to build with musl add a34ab25 xdebug: 2.2.6 -> 2.5.1 add ad81891 python-smbus: upgrade to 3.1.2 add b0699e4 opencv: remove redundant build dependency on python2 add 490409c flite-alsa: Blacklist as old and unmaintained add 61dc304 logfsprogs: Blacklist, doesn't have proper PV, doesn't respect LDFLAGS add 9097d4a pngcheck: respect LDFLAGS add 1214d16 uml-utilities: respect LDFLAGS not only for mconsole but for other binaries as well add ad9c16b xdotool: prevent compile-host-path QA issues add 0e1d178 dlm: fix ldflags QA warning add 61d1d45 v4l-utils: Depend on argp-standalone for musl add 2af18f9 caps: Use c99 int types new 18a4cc4 dnsmasq: disable the service by default new a48f2ce ctdb: Fix build with musl new c3eb73c libdnet: update SRC_URI new 0042fc5 wireless-regdb: fix crda failing from missing pubkey new 8c65bb4 ntp: update to 4.2.8.p10 new 1496097 netcat-openbsd: Fix build and whitelist new b9b1e9f squid: Update to 3.5.23 new 519face libnfnetlink: Backport patches to fix musl build new 7d49bb1 ebtables: Fix build with musl new bb0a0ce lowpan-tools: Fix build with musl new 1877f3d openl2tp: Fix build with musl new c42897d rp-pppoe: Fix build with musl new e4379aa vsftpd: Fix build with musl new f1feb7c dibbler: Upgrade to 1.0.2RC1 new def2e53 vpnc: Update to build from github SRC_URI new 07e1928 daq: Fix build with musl new 9ea06ff arptables: Upgrade to 0.0.4 new 91a526e libnetfilter-log: Switch to git URI new 86ad4cd libnetfilter-queue: Update to git for SRC_URI new 834d4f1 snort: Fix build with musl new 8987a6f autofs: Patch to build on musl This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b3f8215) \ N -- N -- N refs/heads/master-next (8987a6f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 21 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../logfsprogs/logfsprogs_git.bb | 3 + .../respect-ldflags-also-from-bin_ldflags.patch | 36 +++ meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 4 +- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 --- .../libqb/{libqb_1.0.1.bb => libqb_0.17.2.bb} | 14 +- .../uml-utilities-20040406/fix-ldflags.patch | 88 ++++++ .../ttf-fonts/ttf-inconsolata_20100526.bb | 7 +- .../xdotool/xdotool_1.20100416.2809.bb | 2 +- ...coredumper_2.0.0.bb => minicoredumper_1.0.2.bb} | 19 +- meta-oe/recipes-support/flite/flite-alsa_1.3.bb | 9 + .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 + .../recipes-support/gpm/{gpm => gpm-1.99.7}/init | 0 .../gpm/{gpm => gpm-1.99.7}/no-docs.patch | 2 +- .../gpm/{gpm => gpm-1.99.7}/processcreds.patch | 0 .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 +++++++++++++++++++++ meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 - meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ++++ meta-oe/recipes-support/gpm/gpm_git.bb | 44 --- meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb | 22 -- ...001-implement-libc-specific-reopen_stream.patch | 14 +- ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 14 +- meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb | 2 +- ...formatting-string-to-printf-like-function.patch | 43 --- meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +- 24 files changed, 565 insertions(+), 205 deletions(-) create mode 100644 meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch delete mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch rename meta-oe/recipes-extended/libqb/{libqb_1.0.1.bb => libqb_0.17.2.bb} (67%) rename meta-oe/recipes-kernel/minicoredumper/{minicoredumper_2.0.0.bb => minicoredumper_1.0.2.bb} (64%) create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch rename meta-oe/recipes-support/gpm/{gpm => gpm-1.99.7}/init (100%) rename meta-oe/recipes-support/gpm/{gpm => gpm-1.99.7}/no-docs.patch (93%) rename meta-oe/recipes-support/gpm/{gpm => gpm-1.99.7}/processcreds.patch (100%) create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in create mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb delete mode 100644 meta-oe/recipes-support/gpm/gpm_git.bb delete mode 100644 meta-oe/recipes-support/loop-aes/loop-aes_v3.7j.bb delete mode 100644 meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:42 +0000 Subject: [oe-commits] [meta-openembedded] 03/21: libdnet: update SRC_URI In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.CBBD223342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit c3eb73ca53c6fa2919fec0df2536715d667feb39 Author: Kai Kang AuthorDate: Thu Mar 23 11:04:55 2017 +0800 libdnet: update SRC_URI The official homepage libdnet.googlecode.com has been redirected to github. So update SRC_URI to use git repo on github. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 28b6c82..f48b655 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -4,10 +4,10 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" -SRC_URI = "http://libdnet.googlecode.com/files/libdnet-${PV}.tgz" +SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" +SRCREV = "12fca29a6d4e99d1b923d6820887fe7b24226904" -SRC_URI[md5sum] = "9253ef6de1b5e28e9c9a62b882e44cc9" -SRC_URI[sha256sum] = "83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026" +S = "${WORKDIR}/git" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:43 +0000 Subject: [oe-commits] [meta-openembedded] 04/21: wireless-regdb: fix crda failing from missing pubkey In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.D4FFB23342E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 0042fc543a62497aa52582b6e0ebcec3082c250d Author: Aaron Zinghini AuthorDate: Fri Mar 24 08:54:27 2017 -0700 wireless-regdb: fix crda failing from missing pubkey crda fails with exit code 255 because the public key from wireless-regdb is missing. Signed-off-by: Aaron Zinghini Signed-off-by: Martin Jansa --- .../recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb index a9119ea..64e9401 100644 --- a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb +++ b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb @@ -12,7 +12,9 @@ inherit bin_package do_install() { install -d -m0755 ${D}${libdir}/crda + install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin + install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem } RSUGGESTS_${PN} = "crda" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:46 +0000 Subject: [oe-commits] [meta-openembedded] 07/21: squid: Update to 3.5.23 In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.EA4FB233434@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b9b1e9f0cd22b6db730d6c59850eb81b826421c3 Author: Khem Raj AuthorDate: Wed Mar 22 14:39:47 2017 -0700 squid: Update to 3.5.23 Disable NIS on musl, it doesnt yet build Signed-off-by: Khem Raj --- .../recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb similarity index 95% rename from meta-networking/recipes-daemons/squid/squid_3.5.20.bb rename to meta-networking/recipes-daemons/squid/squid_3.5.23.bb index 2e9e1f1..0fe9673 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb @@ -22,13 +22,12 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ " +SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22" +SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ " -SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60" -SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1" - DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools useradd ptest @@ -45,7 +44,9 @@ PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -BASIC_AUTH = "DB SASL LDAP NIS" +BASIC_AUTH = "DB SASL LDAP" +BASIC_AUTH_append_libc-glibc = " NIS" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:45 +0000 Subject: [oe-commits] [meta-openembedded] 06/21: netcat-openbsd: Fix build and whitelist In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.E3CAB233432@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1496097aa9b69449a28be2302380188889383b48 Author: Khem Raj AuthorDate: Tue Mar 21 10:03:08 2017 -0700 netcat-openbsd: Fix build and whitelist pkgconfig is used so we need to inherit pkgconfig secondly, base64 support is added for it to work with musl Signed-off-by: Khem Raj --- ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 20 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- 3 files changed, 395 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file mode 100644 index 0000000..0966b65 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 11:30:49 -0700 +Subject: [PATCH] bundle own base64 encode/decode functions + +Not all libc implementations provide it. +as an aside libresolv is no longer needed + +Signed-off-by: Khem Raj +--- + Makefile | 4 +- + base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + netcat.c | 2 + + socks.c | 3 + + 4 files changed, 320 insertions(+), 2 deletions(-) + create mode 100644 base64.c + +Index: netcat-openbsd-1.105/Makefile +=================================================================== +--- netcat-openbsd-1.105.orig/Makefile ++++ netcat-openbsd-1.105/Makefile +@@ -1,9 +1,9 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c base64.c + +-LIBS= `pkg-config --libs libbsd` -lresolv ++LIBS= `pkg-config --libs libbsd` + OBJS= $(SRCS:.c=.o) + CFLAGS= -g -O2 + LDFLAGS= -Wl,--no-add-needed +Index: netcat-openbsd-1.105/base64.c +=================================================================== +--- /dev/null ++++ netcat-openbsd-1.105/base64.c +@@ -0,0 +1,313 @@ ++/* ++ * Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#if !defined(LINT) && !defined(CODECENTER) ++static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; ++#endif /* not lint */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define Assert(Cond) if (!(Cond)) abort() ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ size_t i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ Assert(output[3] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++//libresolv_hidden_def (b64_ntop) ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(char const *src, u_char *target, size_t targsize) { ++ int tarindex, state, ch; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = *src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ target[tarindex+1] = ((pos - Base64) & 0x0f) ++ << 4 ; ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ target[tarindex+1] = ((pos - Base64) & 0x03) ++ << 6; ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ default: ++ abort(); ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = *src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = *src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +Index: netcat-openbsd-1.105/netcat.c +=================================================================== +--- netcat-openbsd-1.105.orig/netcat.c ++++ netcat-openbsd-1.105/netcat.c +@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, + socklen_t salen, int ctimeout); + static void quit(); + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int + main(int argc, char *argv[]) + { +Index: netcat-openbsd-1.105/socks.c +=================================================================== +--- netcat-openbsd-1.105.orig/socks.c ++++ netcat-openbsd-1.105/socks.c +@@ -53,6 +53,9 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int remote_connect(const char *, const char *, struct addrinfo); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index e0a0328..76a32a5 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -2,12 +2,15 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch" + ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${PN}-${PV} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" @@ -16,8 +19,6 @@ SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a inherit pkgconfig -S = "${WORKDIR}/${BPN}-${PV}" - EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" do_configure[noexec] = "1" @@ -25,9 +26,18 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} quilt pop -a || true - QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat } +do_unpack[cleandirs] += "${S}" + python do_patch() { bb.build.exec_func('netcat_do_patch', d) bb.build.exec_func('patch_do_patch', d) diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 91a24a1..1544164 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -9,7 +9,7 @@ connection you would need and has several interesting built-in \ capabilities." SECTION = "net" -inherit update-alternatives gettext +inherit update-alternatives gettext pkgconfig ALTERNATIVE_${PN} = "nc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:47 +0000 Subject: [oe-commits] [meta-openembedded] 08/21: libnfnetlink: Backport patches to fix musl build In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.F221B233435@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 519facee91b93317400b3b494cd45163fe8d9b94 Author: Khem Raj AuthorDate: Sun Mar 26 11:49:42 2017 -0700 libnfnetlink: Backport patches to fix musl build There are few upstream patches that are required for getting it working with musl, backport these patches on top of 1.0.1 Signed-off-by: Khem Raj --- ...0001-build-resolve-automake-1.12-warnings.patch | 28 ++ ...rce-code-license-header-in-sync-with-curr.patch | 49 +++ .../0003-configure-uclinux-is-also-linux.patch | 27 ++ ...k-initialize-attribute-padding-to-resolve.patch | 39 ++ .../0005-include-Sync-with-kernel-headers.patch | 110 ++++++ .../0006-src-Use-stdint-types-everywhere.patch | 403 +++++++++++++++++++++ .../libnfnetlink/libnfnetlink_1.0.1.bb | 9 +- 7 files changed, 664 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch new file mode 100644 index 0000000..00d95cd --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch @@ -0,0 +1,28 @@ +From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 9 Oct 2012 15:59:48 +0200 +Subject: [PATCH 1/6] build: resolve automake-1.12 warnings + +am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries +using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-off-by: Jan Engelhardt +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ed549df..0926a1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([-Wall foreign subdir-objects + tar-pax no-dist-gzip dist-bzip2 1.6]) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + dnl kernel style compile messages + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch new file mode 100644 index 0000000..c2fb5e0 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch @@ -0,0 +1,49 @@ +From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Wed, 7 Aug 2013 20:53:57 +0200 +Subject: [PATCH 2/6] src: get source code license header in sync with current + licensing terms + +Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, +propagate that changes to src/iftable.c and src/rtnl.c + +Reported-by: Thomas Woerner +Signed-off-by: Pablo Neira Ayuso +--- + src/iftable.c | 2 +- + src/rtnl.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iftable.c b/src/iftable.c +index 0325335..5976ed8 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -3,7 +3,7 @@ + * (C) 2004 by Astaro AG, written by Harald Welte + * (C) 2008 by Pablo Neira Ayuso + * +- * This software is Free Software and licensed under GNU GPLv2. ++ * This software is Free Software and licensed under GNU GPLv2+. + */ + + /* IFINDEX handling */ +diff --git a/src/rtnl.c b/src/rtnl.c +index 5ccb272..7b4ac7d 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -1,10 +1,10 @@ + /* rtnl - rtnetlink utility functions + * + * (C) 2004 by Astaro AG, written by Harald Welte +- * ++ * + * Adapted to nfnetlink by Eric Leblond + * +- * This software is free software and licensed under GNU GPLv2. ++ * This software is free software and licensed under GNU GPLv2+. + * + */ + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch new file mode 100644 index 0000000..6cb7ed6 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch @@ -0,0 +1,27 @@ +From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Tue, 10 Sep 2013 16:23:29 -0300 +Subject: [PATCH 3/6] configure: uclinux is also linux + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Pablo Neira Ayuso +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0926a1c..b979772 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DISABLE_STATIC + AM_PROG_LIBTOOL + + case "$host" in +-*-*-linux*) ;; ++*-*-linux* | *-*-uclinux*) ;; + *) AC_MSG_ERROR([Linux only, dude!]);; + esac + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch new file mode 100644 index 0000000..cf3a841 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch @@ -0,0 +1,39 @@ +From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Mon, 3 Feb 2014 12:09:29 +0100 +Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve + valgrind warnings + +==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) +==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) +==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) +==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) +==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) +==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) +==12195== by 0x400CB1: main (nfulnl_test.c:77) +==12195== Address 0x7fefff3e9 is on thread 1's stack + +This patch sets to zero the padding that is included to align the +attribute payload. + +Reported-by: Ivan Homoliak +Signed-off-by: Pablo Neira Ayuso +--- + src/libnfnetlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 4b2bcd0..398b7d7 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + nfa->nfa_type = type; + nfa->nfa_len = len; + memcpy(NFA_DATA(nfa), data, alen); ++ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); + n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); + return 0; + } +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch new file mode 100644 index 0000000..383f0e8 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch @@ -0,0 +1,110 @@ +From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:49:07 +0200 +Subject: [PATCH 5/6] include: Sync with kernel headers + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- + include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- + 2 files changed, 12 insertions(+), 44 deletions(-) + +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..44a38d6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -25,9 +25,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ __u8 nfgen_family; /* AF_xxx */ ++ __u8 version; /* nfnetlink version */ ++ __be16 res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -46,40 +46,8 @@ struct nfgenmsg { + #define NFNL_SUBSYS_CTNETLINK_EXP 2 + #define NFNL_SUBSYS_QUEUE 3 + #define NFNL_SUBSYS_ULOG 4 +-#define NFNL_SUBSYS_COUNT 5 ++#define NFNL_SUBSYS_OSF 5 ++#define NFNL_SUBSYS_IPSET 6 ++#define NFNL_SUBSYS_COUNT 7 + +-#ifdef __KERNEL__ +- +-#include +-#include +-#include +- +-struct nfnl_callback +-{ +- int (*call)(struct sock *nl, struct sk_buff *skb, +- struct nlmsghdr *nlh, struct nlattr *cda[]); +- const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ +-}; +- +-struct nfnetlink_subsystem +-{ +- const char *name; +- __u8 subsys_id; /* nfnetlink subsystem ID */ +- __u8 cb_count; /* number of callbacks */ +- const struct nfnl_callback *cb; /* callback for individual types */ +-}; +- +-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); +-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); +- +-extern int nfnetlink_has_listeners(unsigned int group); +-extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, +- int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); +- +-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ +- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +- +-#endif /* __KERNEL__ */ + #endif /* _NFNETLINK_H */ +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..74b9e55 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -1,6 +1,8 @@ + #ifndef _NFNETLINK_COMPAT_H + #define _NFNETLINK_COMPAT_H +-#ifndef __KERNEL__ ++ ++#include ++ + /* Old nfnetlink macros for userspace */ + + /* nfnetlink groups: Up to 32 maximum */ +@@ -18,10 +20,9 @@ + * ! nfnetlink use the same attributes methods. - J. Schulist. + */ + +-struct nfattr +-{ +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++struct nfattr { ++ __u16 nfa_len; ++ __u16 nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +@@ -57,5 +58,4 @@ struct nfattr + + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) + #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) + +-#endif /* ! __KERNEL__ */ + #endif /* _NFNETLINK_COMPAT_H */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch new file mode 100644 index 0000000..72c9987 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch @@ -0,0 +1,403 @@ +From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:59:57 +0200 +Subject: [PATCH 6/6] src: Use stdint types everywhere + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/libnfnetlink.h | 25 ++++++------- + src/iftable.c | 8 ++--- + src/iftable.h | 4 +-- + src/libnfnetlink.c | 72 ++++++++++++++++++------------------- + src/rtnl.c | 4 +-- + src/rtnl.h | 2 +- + 6 files changed, 58 insertions(+), 57 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include + #include /* for sa_family_t */ + #include + #include +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..157f97b 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -27,10 +27,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..655df6b 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,8 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..df57533 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -72,9 +72,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +86,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + } + + /** +- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr ++ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..284eecd 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -30,7 +30,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..2cb22a8 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -7,7 +7,7 @@ + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb index edd0f86..f7951ff 100644 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb @@ -11,7 +11,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar" +SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ + file://0001-build-resolve-automake-1.12-warnings.patch \ + file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ + file://0003-configure-uclinux-is-also-linux.patch \ + file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ + file://0005-include-Sync-with-kernel-headers.patch \ + file://0006-src-Use-stdint-types-everywhere.patch \ + " SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:44 +0000 Subject: [oe-commits] [meta-openembedded] 05/21: ntp: update to 4.2.8.p10 In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173239.DC040233430@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8c65bb4bf2ef2d0fc0e497538399fc97bd202042 Author: Armin Kuster AuthorDate: Fri Mar 24 09:22:55 2017 -0700 ntp: update to 4.2.8.p10 LICENSE_FILE md5 changed do to copyright date change. NTF's NTP Project is releasing ntp-4.2.8p10, which addresses: 6 MEDIUM severity vulnerabilities (1 is about the Windows PPSAPI DLL) 5 LOW severity vulnerabilities (2 are in the Windows Installer) 4 Informational-level vulnerabilities 15 other non-security fixes and improvements All of the security issues in this release are listed in VU#633849. ntp-4.2.8p10 was released on 21 March 2017. Sec 3389 / CVE-2017-6464 / VU#325339: NTP-01-016 NTP: Denial of Service via Malformed Config (Pentest report 01.2017) Sec 3388 / CVE-2017-6462 / VU#325339: NTP-01-014 NTP: Buffer Overflow in DPTS Clock (Pentest report 01.2017) Sec 3387 / CVE-2017-6463 / VU#325339: NTP-01-012 NTP: Authenticated DoS via Malicious Config Option (Pentest report 01.2017) Sec 3386: NTP-01-011 NTP: ntpq_stripquotes() returns incorrect Value (Pentest report 01.2017) Sec 3385: NTP-01-010 NTP: ereallocarray()/eallocarray() underused (Pentest report 01.2017) Sec 3384 / CVE-2017-6455 / VU#325339: NTP-01-009 NTP: Windows: Privileged execution of User Library code (Pentest report 01.2017) Sec 3383 / CVE-2017-6452 / VU#325339: NTP-01-008 NTP: Windows Installer: Stack Buffer Overflow from Command Line (Pentest report 01.2017) Sec 3382 / CVE-2017-6459 / VU#325339: NTP-01-007 NTP: Windows Installer: Data Structure terminated insufficiently (Pentest report 01.2017) Sec 3381: NTP-01-006 NTP: Copious amounts of Unused Code (Pentest report 01.2017) Sec 3380: NTP-01-005 NTP: Off-by-one in Oncore GPS Receiver (Pentest report 01.2017) Sec 3379 / CVE-2017-6458 / VU#325339: NTP-01-004 NTP: Potential Overflows in ctl_put() functions (Pentest report 01.2017) Sec 3378 / CVE-2017-6451 / VU#325339: NTP-01-003 Improper use of snprintf() in mx4200_send() (Pentest report 01.2017) Sec 3377 / CVE-2017-6460 / VU#325339: NTP-01-002 Buffer Overflow in ntpq when fetching reslist (Pentest report 01.2017) Sec 3376: NTP-01-001 Makefile does not enforce Security Flags (Pentest report 01.2017) Sec 3361 / CVE-2016-9042 / VU#325339: 0rigin Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa --- .../recipes-support/ntp/{ntp_4.2.8p9.bb => ntp_4.2.8p10.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb similarity index 96% rename from meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb rename to meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb index 58b31c5..719c60b 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003" DEPENDS = "libevent" @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "857452b05f5f2e033786f77ade1974ed" -SRC_URI[sha256sum] = "b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72" +SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" +SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" inherit autotools update-rc.d useradd systemd pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:50 +0000 Subject: [oe-commits] [meta-openembedded] 11/21: openl2tp: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.1A3E123343A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1877f3d8e4f365120d1bb9c8a4689ab3c8db0cf4 Author: Khem Raj AuthorDate: Tue Mar 28 18:44:44 2017 -0700 openl2tp: Fix build with musl Signed-off-by: Khem Raj --- .../openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch | 29 +++++++++++++++++ .../0001-l2tp_api-Included-needed-headers.patch | 34 ++++++++++++++++++++ ...02-cli-include-fcntl.h-for-O_CREAT-define.patch | 25 +++++++++++++++ .../openl2tp/0002-user-ipv6-structures.patch | 33 ++++++++++++++++++++ ...fine-_GNU_SOURCE-for-getting-sighandler_t.patch | 35 +++++++++++++++++++++ ...linux-kernel-headers-assumptions-on-glibc.patch | 36 ++++++++++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 17 +++++++++- 7 files changed, 208 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch new file mode 100644 index 0000000..d1ee3c5 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -0,0 +1,29 @@ +From 1f8d336a5cd88b87e15596d05980f6fe77a0f226 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:28:41 -0700 +Subject: [PATCH 1/4] Use -1 instead of WAIT_ANY + +WAIT_ANY is not supported by POSIX and some C libraries +e.g. musl do not define this. + +Signed-off-by: Khem Raj +--- + usl/usl_pid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usl/usl_pid.c b/usl/usl_pid.c +index 103458b..9819473 100644 +--- a/usl/usl_pid.c ++++ b/usl/usl_pid.c +@@ -78,7 +78,7 @@ int usl_pid_reap_children(int waitfor) + + /* Wait for processes in our process group. */ + +- while (((pid = waitpid(WAIT_ANY, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { ++ while (((pid = waitpid(-1, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { + have_callback = 0; + usl_list_for_each(walk, tmp, &usl_child_list) { + child = usl_list_entry(walk, struct usl_pid_child, list); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch new file mode 100644 index 0000000..c50f68e --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -0,0 +1,34 @@ +From 25dce20a75bc84ae9e4ec640590cef0c12750789 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 17:48:13 -0700 +Subject: [PATCH 1/2] l2tp_api: Included needed headers + +These are flagged by musl + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index d16f80e..9d6f60a 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -22,9 +22,12 @@ + * Each module implements the required RPC xxx_1_svc() callbacks which + * are called directly by the RPC library. + */ +- ++#define _GNU_SOURCE ++#include ++#include ++#include + #include +-#include ++//#include + + #include "usl.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch new file mode 100644 index 0000000..9df3265 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -0,0 +1,25 @@ +From 2d633f4c18ff3cb52234449fd86a0a63b55d669b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:31:55 -0700 +Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 097ed6a..127136c 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch new file mode 100644 index 0000000..3f8bcaa --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -0,0 +1,33 @@ +From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 18:09:58 -0700 +Subject: [PATCH 2/2] user ipv6 structures + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index 9d6f60a..f0946fd 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -450,10 +450,12 @@ int l2tp_api_rpc_check_request(SVCXPRT *xprt) + * non-loopback interface, reject the request. + */ + if ((!l2tp_opt_remote_rpc) && +- ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && +- (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { ++ ((xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_LOOPBACK)) && ++ (xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_ANY)))) { ++ char straddr[INET6_ADDRSTRLEN]; ++ inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); + if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { +- l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); ++ l2tp_log(LOG_ERR, "Rejecting RPC request from %s", straddr); + } + svcerr_auth(xprt, AUTH_TOOWEAK); + return -EPERM; +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch new file mode 100644 index 0000000..e05be1b --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -0,0 +1,35 @@ +From 74fe72583472bcc3c89a52839cac2ebbad6c8a74 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:34:52 -0700 +Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 127136c..931779b 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -17,7 +17,7 @@ + * Boston, MA 02110-1301 USA + * + *****************************************************************************/ +- ++#define _GNU_SOURCE + #include + #include + #include +@@ -634,7 +634,7 @@ static void cli_rl_uninstall_signal_handlers(void) + + static int cli_rl_install_signal_handlers(void) + { +- __sighandler_t handler; ++ sighandler_t handler; + + rl_catch_signals = 0; + rl_clear_signals(); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch new file mode 100644 index 0000000..0fcba65 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch @@ -0,0 +1,36 @@ +From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:46:56 -0700 +Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc + +Fixes build issues e.g. + +In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: +/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier + IFF_LOWER_UP = 1<<16, /* __volatile__ */ + ^ + +Signed-off-by: Khem Raj +--- + plugins/ppp_unix.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c +index 869066f..5c1e44f 100644 +--- a/plugins/ppp_unix.c ++++ b/plugins/ppp_unix.c +@@ -21,6 +21,11 @@ + * Plugin to use the standard UNIX pppd + */ + ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 67118d8..e1670b3 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -16,14 +16,28 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + file://0001-Use-1-instead-of-WAIT_ANY.patch \ + file://0002-cli-include-fcntl.h-for-O_CREAT-define.patch \ + file://0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch \ + file://0001-l2tp_api-Included-needed-headers.patch \ + " + +SRC_URI_append_libc-musl = "\ + file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://0002-user-ipv6-structures.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig +DEPENDS_append_libc-musl = " libtirpc" +CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ @@ -34,5 +48,6 @@ do_compile_prepend() { -e 's:$(CROSS_COMPILE)nm:${NM}:g' \ -e 's:$(CROSS_COMPILE)strip:${STRIP}:g' \ -e 's:$(CROSS_COMPILE)install:install:g' \ + -e 's:CPPFLAGS-y:CPPFLAGS:g' \ ${S}/Makefile } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:49 +0000 Subject: [oe-commits] [meta-openembedded] 10/21: lowpan-tools: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.11AAD233438@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit bb0a0ce976bfc973c8a8dd81d6b5b937676811a5 Author: Khem Raj AuthorDate: Mon Mar 27 17:59:24 2017 -0700 lowpan-tools: Fix build with musl Signed-off-by: Khem Raj --- ...d-config-parse.y-add-missing-time.h-inclu.patch | 44 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch new file mode 100644 index 0000000..0a81a22 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -0,0 +1,44 @@ +From ab725a3faaeead90ae3c63cbcd370af087c413a5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Mar 2017 17:55:06 -0700 +Subject: [PATCH] addrdb/coord-config-parse.y: add missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The %union definition uses the time_t structure. In order to use this +structure, the header has to be included. Otherwise, the build +breaks with some C libraries, such as musl: + +In file included from coord-config-lex.l:23:0: +coord-config-parse.y:107:2: error: unknown type name ?time_t? + time_t timestamp; + ^ + +This patch includes using the '%code requires' directive of +Yacc. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Khem Raj +--- + addrdb/coord-config-parse.y | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y +index 2e10a88..85ee058 100644 +--- a/addrdb/coord-config-parse.y ++++ b/addrdb/coord-config-parse.y +@@ -102,6 +102,10 @@ + + %} + ++%code requires { ++#include ++} ++ + %union { + unsigned long number; + time_t timestamp; +-- +2.12.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 8c7dbc0..139eb78 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -11,6 +11,7 @@ PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ + file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:48 +0000 Subject: [oe-commits] [meta-openembedded] 09/21: ebtables: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.08BAE233436@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 7d49bb1e7012ea78905f547bea1d5f57359bd079 Author: Khem Raj AuthorDate: Sun Mar 26 14:21:31 2017 -0700 ebtables: Fix build with musl Backport upstream fixes and add fixes to make it work with musl Signed-off-by: Khem Raj --- .../0001-add-RARP-and-update-iana-url.patch | 45 +++++ .../0002-fix-compilation-warning.patch | 25 +++ .../0003-add-info-about-Wl-no-as-needed.patch | 25 +++ ...for-kernel-regression-bug-IPv6-source-des.patch | 28 +++ ...-command-line-support-for-ebtables-restor.patch | 75 +++++++ ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 +++++++ .../0007-extensions-Use-stdint-types.patch | 67 +++++++ ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 +++++ ...low-RETURN-target-rules-in-user-defined-c.patch | 48 +++++ .../0010-Adjust-header-include-sequence.patch | 216 +++++++++++++++++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 12 +- 11 files changed, 657 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch new file mode 100644 index 0000000..90b6979 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch @@ -0,0 +1,45 @@ +From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Tue, 3 Jul 2012 18:47:32 +0000 +Subject: [PATCH 01/10] add RARP and update iana url + +--- + ethertypes | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/ethertypes b/ethertypes +index 5e700f6..813177b 100644 +--- a/ethertypes ++++ b/ethertypes +@@ -5,6 +5,7 @@ + # + # This list could be found on: + # http://www.iana.org/assignments/ethernet-numbers ++# http://www.iana.org/assignments/ieee-802-numbers + # + # ... #Comment + # +@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT + DIAG 6005 # DEC Diagnostics + CUST 6006 # DEC Customer use + SCA 6007 # DEC Systems Comms Arch +-TEB 6558 # Trans Ether Bridging [RFC1701] +-RAW_FR 6559 # Raw Frame Relay [RFC1701] ++TEB 6558 # Trans Ether Bridging [RFC1701] ++RAW_FR 6559 # Raw Frame Relay [RFC1701] ++RARP 8035 # Reverse ARP [RFC903] + AARP 80F3 # Appletalk AARP +-ATALK 809B # Appletalk ++ATALK 809B # Appletalk + 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame + IPX 8137 # Novell IPX + NetBEUI 8191 # NetBEUI + IPv6 86DD ip6 # IP version 6 +-PPP 880B # PPP ++PPP 880B # PPP + ATMMPOA 884C # MultiProtocol over ATM + PPP_DISC 8863 # PPPoE discovery messages + PPP_SES 8864 # PPPoE session messages +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch new file mode 100644 index 0000000..87b0e9b --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch @@ -0,0 +1,25 @@ +From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 +From: Petri Gynther +Date: Sun, 24 Feb 2013 10:56:59 +0100 +Subject: [PATCH 02/10] fix compilation warning + +--- + communication.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/communication.c b/communication.c +index 62ed667..ba058c0 100644 +--- a/communication.c ++++ b/communication.c +@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) + } + close_file: + fclose(file); +- return 0; ++ return ret; + } + + /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch new file mode 100644 index 0000000..c8573a4 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch @@ -0,0 +1,25 @@ +From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Wed, 3 Jul 2013 22:12:47 +0200 +Subject: [PATCH 03/10] add info about -Wl,-no-as-needed + +--- + INSTALL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 4a05c67..e90d5c1 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -39,6 +39,8 @@ That's all + You can also use a base directory different from the root directory (/), + using the DESTDIR option. See the Makefile for more details. + ++You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly ++on your system. + + ADDITIONAL PROGRAMS: + ---------------------- +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch new file mode 100644 index 0000000..d8f2795 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch @@ -0,0 +1,28 @@ +From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 +From: Luis Fernando +Date: Wed, 3 Jul 2013 22:19:55 +0200 +Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 + source/destination addresses are potentially not matched correctly + +--- + extensions/ebt_ip6.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index 0465e77..bbdc4ae 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) + + ipinfo->invflags = 0; + ipinfo->bitmask = 0; ++ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); ++ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); ++ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); ++ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); + } + + #define OPT_SOURCE 0x01 +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch new file mode 100644 index 0000000..9585fd2 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch @@ -0,0 +1,75 @@ +From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 +From: Sanket Shah +Date: Wed, 31 Jul 2013 21:40:08 +0200 +Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore + +--- + ebtables-restore.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/ebtables-restore.c b/ebtables-restore.c +index ea02960..bb4d0cf 100644 +--- a/ebtables-restore.c ++++ b/ebtables-restore.c +@@ -22,13 +22,25 @@ + #include + #include + #include ++#include + #include "include/ebtables_u.h" + ++static const struct option options[] = { ++ {.name = "noflush", .has_arg = 0, .val = 'n'}, ++ { 0 } ++}; ++ + static struct ebt_u_replace replace[3]; + void ebt_early_init_once(); + + #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ + ++static void print_usage() ++{ ++ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); ++ exit(1); ++} ++ + static void copy_table_names() + { + strcpy(replace[0].name, "filter"); +@@ -41,11 +53,20 @@ static void copy_table_names() + int main(int argc_, char *argv_[]) + { + char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; +- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; ++ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; + char ebtables_str[] = "ebtables"; + +- if (argc_ != 1) +- ebtrest_print_error("options are not supported"); ++ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { ++ switch(c) { ++ case 'n': ++ flush = 0; ++ break; ++ default: ++ print_usage(); ++ break; ++ } ++ } ++ + ebt_silent = 0; + copy_table_names(); + ebt_early_init_once(); +@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) + ebtrest_print_error("table '%s' was not recognized", cmdline+1); + table_nr = i; + replace[table_nr].command = 11; +- ebt_get_kernel_table(&replace[table_nr], 1); ++ ebt_get_kernel_table(&replace[table_nr], flush); + replace[table_nr].command = 0; + replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ + continue; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch new file mode 100644 index 0000000..21f8e58 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch @@ -0,0 +1,69 @@ +From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Mon, 14 Apr 2014 22:04:55 +0200 +Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch + by Mariusz Mazur ) + +--- + extensions/ebt_ip6.c | 4 ++-- + include/ebtables_u.h | 1 + + useful_functions.c | 13 +++++++++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index bbdc4ae..e3e0956 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, + if (ipinfo->invflags & EBT_IP6_SOURCE) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); + } + if (ipinfo->bitmask & EBT_IP6_DEST) { + printf("--ip6-dst "); + if (ipinfo->invflags & EBT_IP6_DEST) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); + } + if (ipinfo->bitmask & EBT_IP6_TCLASS) { + printf("--ip6-tclass "); +diff --git a/include/ebtables_u.h b/include/ebtables_u.h +index ab615c1..35a5bcc 100644 +--- a/include/ebtables_u.h ++++ b/include/ebtables_u.h +@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); + void ebt_parse_ip6_address(char *address, struct in6_addr *addr, + struct in6_addr *msk); + char *ebt_ip6_to_numeric(const struct in6_addr *addrp); ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk); + + + int do_command(int argc, char *argv[], int exec_style, +diff --git a/useful_functions.c b/useful_functions.c +index d20b68e..d14cbe9 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) + static char buf[50+1]; + return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); + } ++ ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk) ++{ ++ /* /0000:0000:0000:0000:0000:000.000.000.000 ++ * /0000:0000:0000:0000:0000:0000:0000:0000 */ ++ static char buf[51+1]; ++ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && ++ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) ++ *buf = '\0'; ++ else ++ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); ++ return buf; ++} +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch new file mode 100644 index 0000000..6fbe7df --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch @@ -0,0 +1,67 @@ +From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:22:39 +0200 +Subject: [PATCH 07/10] extensions: Use stdint types + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + extensions/ebt_ip6.c | 4 ++-- + extensions/ebt_limit.c | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index e3e0956..dd48547 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -53,8 +53,8 @@ static const struct option opts[] = + + struct icmpv6_names { + const char *name; +- u_int8_t type; +- u_int8_t code_min, code_max; ++ uint8_t type; ++ uint8_t code_min, code_max; + }; + + static const struct icmpv6_names icmpv6_codes[] = { +diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c +index ee40e5c..d189a09 100644 +--- a/extensions/ebt_limit.c ++++ b/extensions/ebt_limit.c +@@ -59,11 +59,11 @@ static void print_help(void) + " default %u\n", EBT_LIMIT_BURST); + } + +-static int parse_rate(const char *rate, u_int32_t *val) ++static int parse_rate(const char *rate, uint32_t *val) + { + const char *delim; +- u_int32_t r; +- u_int32_t mult = 1; /* Seconds by default. */ ++ uint32_t r; ++ uint32_t mult = 1; /* Seconds by default. */ + + delim = strchr(rate, '/'); + if (delim) { +@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, + struct rates + { + const char *name; +- u_int32_t mult; ++ uint32_t mult; + }; + + static struct rates g_rates[] = +@@ -162,7 +162,7 @@ static struct rates g_rates[] = + { "sec", EBT_LIMIT_SCALE } + }; + +-static void print_rate(u_int32_t period) ++static void print_rate(uint32_t period) + { + unsigned int i; + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch new file mode 100644 index 0000000..df3f521 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch @@ -0,0 +1,48 @@ +From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:31:58 +0200 +Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro + _THROW + +Fixes compilation with musl libc + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/ethernetdb.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/ethernetdb.h b/include/ethernetdb.h +index 46d8bfd..1683abe 100644 +--- a/include/ethernetdb.h ++++ b/include/ethernetdb.h +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch new file mode 100644 index 0000000..248582c --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch @@ -0,0 +1,48 @@ +From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alin=20N=C4=83stac?= +Date: Thu, 22 Oct 2015 16:41:03 +0200 +Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined + chains + +During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if +they're called from a base chain rather than a user defined chain. + +This can be used by ebtables targets that can encode a special return +value to bail out if e.g. RETURN is used from a base chain. + +Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also +copied to called user-defined-chains (i.e., a user defined chain can no +longer be distinguished from a base chain): + +root at OpenWrt:~# ebtables -N foo +root at OpenWrt:~# ebtables -A OUTPUT -j foo +root at OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN +--mark-target RETURN not allowed on base chain. + +This works if -A OUTPUT -j foo is omitted, but will still appear +if we try to call foo from OUTPUT afterwards. + +After this patch we still reject +'-A OUTPUT -j mark .. --mark-target RETURN'. + +Signed-off-by: Florian Westphal +--- + libebtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libebtc.c b/libebtc.c +index 17ba8f2..74830ec 100644 +--- a/libebtc.c ++++ b/libebtc.c +@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) + /* check if we've dealt with this chain already */ + if (entries2->hook_mask & (1<hook_mask |= entries->hook_mask; ++ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); + /* Jump to the chain, make sure we know how to get back */ + stack[sp].chain_nr = chain_nr; + stack[sp].n = j; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch new file mode 100644 index 0000000..a6ef9cd --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,216 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj +--- + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + include/linux/if_ether.h | 126 ---------------------------------------------- + useful_functions.c | 4 +- + 5 files changed, 5 insertions(+), 131 deletions(-) + delete mode 100644 include/linux/if_ether.h + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index f97d07e..b096847 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index c3757f3..c5102a4 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index e6afbf8..8d318d1 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h +deleted file mode 100644 +index 28a15ff..0000000 +--- a/include/linux/if_ether.h ++++ /dev/null +@@ -1,126 +0,0 @@ +-/* +- * INET An implementation of the TCP/IP protocol suite for the LINUX +- * operating system. INET is implemented using the BSD Socket +- * interface as the means of communication with the user level. +- * +- * Global definitions for the Ethernet IEEE 802.3 interface. +- * +- * Version: @(#)if_ether.h 1.0.1a 02/08/94 +- * +- * Author: Fred N. van Kempen, +- * Donald Becker, +- * Alan Cox, +- * Steve Whitehouse, +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. +- */ +- +-#ifndef _LINUX_IF_ETHER_H +-#define _LINUX_IF_ETHER_H +- +-#include +- +-/* +- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +- * and FCS/CRC (frame check sequence). +- */ +- +-#define ETH_ALEN 6 /* Octets in one ethernet addr */ +-#define ETH_HLEN 14 /* Total octets in header. */ +-#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ +-#define ETH_DATA_LEN 1500 /* Max. octets in payload */ +-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +-#define ETH_FCS_LEN 4 /* Octets in the FCS */ +- +-/* +- * These are the defined Ethernet Protocol ID's. +- */ +- +-#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ +-#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ +-#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ +-#define ETH_P_IP 0x0800 /* Internet Protocol packet */ +-#define ETH_P_X25 0x0805 /* CCITT X.25 */ +-#define ETH_P_ARP 0x0806 /* Address Resolution packet */ +-#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ +-#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ +-#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ +-#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ +-#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ +-#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ +-#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ +-#define ETH_P_LAT 0x6004 /* DEC LAT */ +-#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ +-#define ETH_P_CUST 0x6006 /* DEC Customer use */ +-#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ +-#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ +-#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ +-#define ETH_P_ATALK 0x809B /* Appletalk DDP */ +-#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ +-#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ +-#define ETH_P_IPX 0x8137 /* IPX over DIX */ +-#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ +-#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ +-#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ +-#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol +- * defined in draft-wilson-wrec-wccp-v2-00.txt */ +-#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ +-#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ +-#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ +-#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ +-#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ +-#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ +-#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport +- * over Ethernet +- */ +-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ +-#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +-#define ETH_P_TIPC 0x88CA /* TIPC */ +-#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ +-#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +-#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ +-#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ +- +-/* +- * Non DIX types. Won't clash for 1500 types. +- */ +- +-#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ +-#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ +-#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ +-#define ETH_P_802_2 0x0004 /* 802.2 frames */ +-#define ETH_P_SNAP 0x0005 /* Internal only */ +-#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ +-#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ +-#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ +-#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ +-#define ETH_P_CAN 0x000C /* Controller Area Network */ +-#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ +-#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ +-#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz at cafe.net) */ +-#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ +-#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ +-#define ETH_P_ECONET 0x0018 /* Acorn Econet */ +-#define ETH_P_HDLC 0x0019 /* HDLC frames */ +-#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ +-#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ +-#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ +-#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +-#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ +-#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ +- +-/* +- * This is an Ethernet frame header. +- */ +- +-struct ethhdr { +- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ +- unsigned char h_source[ETH_ALEN]; /* source ether addr */ +- __be16 h_proto; /* packet type ID field */ +-} __attribute__((packed)); +- +- +-#endif /* _LINUX_IF_ETHER_H */ +diff --git a/useful_functions.c b/useful_functions.c +index d14cbe9..c304f4d 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include + #include + #include +@@ -33,6 +31,8 @@ + #include + #include + #include ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; + const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index f5e2871..375423d 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -18,7 +18,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://ebtables.common \ file://ebtables.service \ file://no-as-needed.patch \ -" + file://0001-add-RARP-and-update-iana-url.patch \ + file://0002-fix-compilation-warning.patch \ + file://0003-add-info-about-Wl-no-as-needed.patch \ + file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ + file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ + file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ + file://0007-extensions-Use-stdint-types.patch \ + file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ + file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ + file://0010-Adjust-header-include-sequence.patch \ + " SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:51 +0000 Subject: [oe-commits] [meta-openembedded] 12/21: rp-pppoe: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.20C9423343C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit c42897d1a3bb7abf7a53f3f9dd3e112daa6ab267 Author: Khem Raj AuthorDate: Tue Mar 28 19:30:16 2017 -0700 rp-pppoe: Fix build with musl Signed-off-by: Khem Raj --- .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 30 ++++++++++++++++++++++ ...0002-Enable-support-for-the-kernel-module.patch | 25 ++++++++++++++++++ .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 5 +++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch new file mode 100644 index 0000000..11356ce --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -0,0 +1,30 @@ +From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:20:07 -0700 +Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h + +Fixes build with musl + +Signed-off-by: Khem Raj +--- + src/pppoe.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/pppoe.h b/src/pppoe.h +index ec067a0..281879c 100644 +--- a/src/pppoe.h ++++ b/src/pppoe.h +@@ -127,10 +127,6 @@ typedef unsigned long UINT32_t; + #error Could not find a 32-bit integer type + #endif + +-#ifdef HAVE_LINUX_IF_ETHER_H +-#include +-#endif +- + #include + + #ifdef HAVE_NETINET_IF_ETHER_H +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch new file mode 100644 index 0000000..139d1f0 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch @@ -0,0 +1,25 @@ +From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:24:53 -0700 +Subject: [PATCH 2/2] Enable support for the kernel module + +Signed-off-by: Khem Raj +--- + src/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/configure.in b/src/configure.in +index cae0976..951a042 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -33,6 +33,7 @@ AC_CHECK_HEADERS(linux/if_pppox.h, [], [], + #include + #include + #include ++#include + ]) + + dnl Checks for typedefs, structures, and compiler characteristics. +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb index e1ca17f..fbe015f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -17,7 +17,10 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ file://pppoe-server.default \ file://pppoe-server.init \ file://configure.in-Error-fix.patch \ - file://pppoe-server.service" + file://pppoe-server.service \ + file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ + file://0002-Enable-support-for-the-kernel-module.patch \ + " SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:52 +0000 Subject: [oe-commits] [meta-openembedded] 13/21: vsftpd: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.274C823343E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit e4379aa65f7c5567b2a2b32af1165533693bf7fd Author: Khem Raj AuthorDate: Tue Mar 28 20:11:06 2017 -0700 vsftpd: Fix build with musl Signed-off-by: Khem Raj --- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 28 ++++++++++++++++++++++ .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 7 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch new file mode 100644 index 0000000..c3919e1 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -0,0 +1,28 @@ +From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 20:09:12 -0700 +Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx + +Signed-off-by: Khem Raj +--- + sysdeputil.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sysdeputil.c b/sysdeputil.c +index 06f01f4..a8cff3b 100644 +--- a/sysdeputil.c ++++ b/sysdeputil.c +@@ -58,7 +58,9 @@ + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL + #define VSF_SYSDEP_HAVE_LIBCAP +-#define VSF_SYSDEP_HAVE_UTMPX ++#if defined(__GLIBC__) ++ #define VSF_SYSDEP_HAVE_UTMPX ++#endif + + #define __USE_GNU + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 3eaaa30..e524614 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -19,7 +19,10 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ -" + ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ + file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + " LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ @@ -30,13 +33,11 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:55 +0000 Subject: [oe-commits] [meta-openembedded] 16/21: daq: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.3E3D623342A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 07e1928ce0c1541cb72ff348a2f51fefd5acf74b Author: Khem Raj AuthorDate: Thu Mar 30 00:18:57 2017 -0700 daq: Fix build with musl unistd.h is not in sys/ on all platforms use standard location in /usr/include to look for it Signed-off-by: Khem Raj --- .../recipes-connectivity/daq/daq_2.0.6.bb | 4 ++- .../0001-correct-the-location-of-unistd.h.patch | 29 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 952d7a4..47cb163 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -9,7 +9,9 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ - file://disable-run-test-program-while-cross-compiling.patch " + file://disable-run-test-program-while-cross-compiling.patch \ + file://0001-correct-the-location-of-unistd.h.patch \ + " # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch new file mode 100644 index 0000000..4798a77 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -0,0 +1,29 @@ +From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 15:59:43 -0700 +Subject: [PATCH] correct the location of unistd.h + +Signed-off-by: Khem Raj +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb0..c2a4175 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include + #include + #include ++#include + + #include + #include +-#include + + #include + #include +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:58 +0000 Subject: [oe-commits] [meta-openembedded] 19/21: libnetfilter-queue: Update to git for SRC_URI In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.6452723342E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 86ad4cd84a823aacbac0c562787f3e5e7238b8a0 Author: Khem Raj AuthorDate: Thu Mar 30 13:29:01 2017 -0700 libnetfilter-queue: Update to git for SRC_URI brings in the fixes to build on musl Add a typo fix patch Signed-off-by: Khem Raj --- ...o-in-the-location-of-internal.h-in-includ.patch | 26 ++++++++++++++++++++++ .../libnetfilter/libnetfilter-queue_1.0.2.bb | 11 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch new file mode 100644 index 0000000..76d2d5d --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch @@ -0,0 +1,26 @@ +From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:26:56 -0700 +Subject: [PATCH] Correct typo in the location of internal.h in #include + +Signed-off-by: Khem Raj +--- + src/libnetfilter_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c +index 211a8ba..065d618 100644 +--- a/src/libnetfilter_queue.c ++++ b/src/libnetfilter_queue.c +@@ -32,7 +32,7 @@ + + #include + #include +-#include "src/internal.h" ++#include "internal.h" + + /** + * \mainpage +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb index ddf2aa5..0ca074c 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb @@ -6,10 +6,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "df09befac35cb215865b39a36c96a3fa" -SRC_URI[tar.sha256sum] = "838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32" +PV .= "+git${SRCREV}" +SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" -S = "${WORKDIR}/libnetfilter_queue-${PV}" +SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ + file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ + " + +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:54 +0000 Subject: [oe-commits] [meta-openembedded] 15/21: vpnc: Update to build from github SRC_URI In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.35FDC233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit def2e5397b3d1759a8a2c7f98b79fd67f2b627e8 Author: Khem Raj AuthorDate: Thu Mar 30 00:13:12 2017 -0700 vpnc: Update to build from github SRC_URI Fix build for musl add packageconfig for crypto selection Fix build with externalsrc Signed-off-by: Khem Raj --- .../0001-search-for-log-help-in-build-dir.patch | 26 +++++++++ ... 0002-Fix-vpnc-install-for-cross-compile.patch} | 20 ++++++- ...003-error.h-is-specific-to-glibc-on-linux.patch | 30 ++++++++++ ...Use-pkgconfig-instead-of-libgcrypt-config.patch | 30 ++++++++++ ...ude-sys-ttydefaults.h-for-CEOT-definition.patch | 30 ++++++++++ ...header-include-sequence-to-adjust-for-mus.patch | 40 +++++++++++++ ...error-API-when-error.h-is-not-on-platform.patch | 66 ++++++++++++++++++++++ ...0008-include-sysdep.h-before-net-if_tun.h.patch | 36 ++++++++++++ .../recipes-connectivity/vpnc/vpnc/makeman.patch | 11 ---- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 41 +++++++++----- 10 files changed, 302 insertions(+), 28 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch new file mode 100644 index 0000000..184c794 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -0,0 +1,26 @@ +From 48e16e9ae7d8e4c42282bd82cbbd9a6d346a5c00 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 1/8] search for log-help in build dir + +Signed-off-by: Khem Raj +--- + makeman.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makeman.pl b/makeman.pl +index cf241a1..2d73432 100755 +--- a/makeman.pl ++++ b/makeman.pl +@@ -30,7 +30,7 @@ my $vpnc = './vpnc'; + # indenting lists (those originally starting with an asterisk). I hope + # this pays off when converting the manpage to HTML or such. + +-open my $LONGHELP, '-|', "$vpnc --long-help"; ++open my $LONGHELP, '-|', "cat ./long-help"; + my $vpnc_options = ''; + my $relative_indent = 0; + my $indent_needed = 0; +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch similarity index 73% rename from meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch rename to meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 3de65ec..6f00d3b 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -1,6 +1,17 @@ ---- a/Makefile~ 2009-01-20 18:44:30.000000000 +0100 -+++ b/Makefile 2009-01-20 18:44:30.000000000 +0100 -@@ -119,21 +119,21 @@ +From d565b4a5e0045f1e40e0e462920ed5b8faca9eec Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 2/8] Fix vpnc install for cross compile + +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 69f5aca..a15782e 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,21 +133,21 @@ install-common: all else \ install vpnc-script $(DESTDIR)$(ETCDIR); \ fi @@ -33,3 +44,6 @@ uninstall : rm -f $(DESTDIR)$(SBINDIR)/vpnc \ +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch new file mode 100644 index 0000000..bb77306 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -0,0 +1,30 @@ +From 6b49020893f999df56392b49b1a289cb96a113a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:08:17 -0700 +Subject: [PATCH 3/8] error.h is specific to glibc on linux + +Signed-off-by: Khem Raj +--- + sysdep.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 137bf6d..6a323f0 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -37,9 +37,10 @@ int tun_read(int fd, unsigned char *buf, int len); + int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + + /***************************************************************************/ +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__linux__) ++#if defined(__GLIBC__) + #include +- ++#endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 + #define HAVE_ERROR 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch new file mode 100644 index 0000000..f70a138 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -0,0 +1,30 @@ +From 4d1dd61c04f52a7c796debbdea5fc9139ffa271d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:45:05 -0700 +Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a15782e..b537046 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,10 +63,10 @@ RELEASE_VERSION := $(shell cat VERSION) + CC ?= gcc + CFLAGS ?= -O3 -g + CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings +-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) ++CFLAGS += $(shell pkg-config libgcrypt --cflags) $(CRYPTO_CFLAGS) + CPPFLAGS += -DVERSION=\"$(VERSION)\" + LDFLAGS ?= -g +-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) ++LIBS += $(shell pkg-config libgcrypt --libs) $(CRYPTO_LDADD) + + ifeq ($(shell uname -s), SunOS) + LIBS += -lnsl -lresolv -lsocket +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch new file mode 100644 index 0000000..01783f4 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -0,0 +1,30 @@ +From 1947ea776dc38c3377702dd89bd229670f4d948d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:06:52 -0700 +Subject: [PATCH 5/8] include sys/ttydefaults.h for CEOT definition + +Fixes + +config.c:146:25: error: use of undeclared identifier 'CEOT' + if (llen == 0 && c == CEOT) + +Signed-off-by: Khem Raj +--- + config.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.c b/config.c +index 804faa7..1883d12 100644 +--- a/config.c ++++ b/config.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch new file mode 100644 index 0000000..fa89df2 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -0,0 +1,40 @@ +From 56768fc0c2cbd6abcf28c9805ab516db8a0548d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:09:47 -0700 +Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl + +--- + sysdep.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 6a323f0..0122b95 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -17,16 +17,20 @@ + * __SKYOS__ + * + */ ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + #include + #include +-#include + + #if !defined(__CYGWIN__) +-#include +-#include ++//#include ++//#include + #include + #endif ++#include + + #include "config.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch new file mode 100644 index 0000000..de67b47 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -0,0 +1,66 @@ +From b6a027fe4da6f66552b533f1314e5005b16c5455 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:52:36 -0700 +Subject: [PATCH 7/8] add error() API when error.h is not on platform + +sign-off-by: Khem Raj +--- + sysdep.c | 24 ++++++++++++++++++++++++ + sysdep.h | 2 ++ + 2 files changed, 26 insertions(+) + +diff --git a/sysdep.c b/sysdep.c +index d8f181d..2518ec1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -17,6 +17,7 @@ + GNU General Public License for more details. + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -794,3 +795,26 @@ int setenv(const char *name, const char *value, int overwrite) + return ret; + } + #endif ++ ++#ifndef _ERROR_H_ ++#define _ERROR_H_ ++#include ++#include ++#include ++ ++void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ ++ fflush(stdout); ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ":%d", errnum); ++ if (status) ++ exit(status); ++} ++#endif /* _ERROR_H_ */ ++ +diff --git a/sysdep.h b/sysdep.h +index 0122b95..4e60064 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -44,6 +44,8 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + #if defined(__linux__) + #if defined(__GLIBC__) + #include ++#else ++void error(int status, int errnum, const char* format, ...); + #endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch new file mode 100644 index 0000000..62ffdb7 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -0,0 +1,36 @@ +From 7f01847d14a1a3af50f49499743b0551ddef1311 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:54:01 -0700 +Subject: [PATCH 8/8] include sysdep.h before net/if_tun.h + +Fixes duplicate defines in header errors + +Signed-off-by: Khem Raj +--- + sysdep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdep.c b/sysdep.c +index 2518ec1..5624ef1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -57,6 +57,8 @@ + #include + #endif + ++#include "sysdep.h" ++ + #if defined(__DragonFly__) + #include + #elif defined(__linux__) +@@ -69,7 +71,6 @@ + #include + #endif + +-#include "sysdep.h" + + #if !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || !defined(HAVE_ERROR) + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch deleted file mode 100644 index f394e6a..0000000 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vpnc-0.5.1/makeman.pl.old 2008-03-16 02:17:59.000000000 -0500 -+++ vpnc-0.5.1/makeman.pl 2008-03-16 02:29:34.000000000 -0500 -@@ -29,7 +29,7 @@ my $vpnc = './vpnc'; - # indenting lists (those originally starting with an asterisk). I hope - # this pays off when converting the manpage to HTML or such. - --open my $LONGHELP, '-|', "$vpnc --long-help"; -+open my $LONGHELP, '-|', "cat ../long-help"; - my $vpnc_options = ''; - my $relative_indent = 0; - my $indent_needed = 0; diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 1aff045..6f92acd 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -4,17 +4,39 @@ AUTHOR = "Maurice Massar vpnc at unix-ag.uni-kl.de" SECTION = "net" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" -DEPENDS = "libgcrypt" -inherit perlnative +DEPENDS += "libgcrypt" -EXTRA_OEMAKE = "-e MAKEFLAGS=" -CFLAGS_append = ' -DVERSION=\\"${PV}\\"' -LDFLAGS_append = " -lgcrypt -lgpg-error" +PV .= "r550-2jnpr1" +SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" +SRC_URI = "git://github.com/ndpgroup/vpnc \ + file://long-help \ + file://default.conf \ + file://0001-search-for-log-help-in-build-dir.patch \ + file://0002-Fix-vpnc-install-for-cross-compile.patch \ + file://0003-error.h-is-specific-to-glibc-on-linux.patch \ + file://0004-Use-pkgconfig-instead-of-libgcrypt-config.patch \ + file://0005-include-sys-ttydefaults.h-for-CEOT-definition.patch \ + file://0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch \ + file://0007-add-error-API-when-error.h-is-not-on-platform.patch \ + file://0008-include-sysdep.h-before-net-if_tun.h.patch \ + " + +PACKAGECONFIG ?= "gnutls" + +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[openssl] = ",,openssl" + +S = "${WORKDIR}/git" + +inherit perlnative pkgconfig + +#EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure_append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl + cp ${WORKDIR}/long-help ${S} } do_install () { @@ -34,12 +56,3 @@ vpnc_sysroot_preprocess () { CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" RDEPENDS_${PN} = "perl-module-io-file" RRECOMMENDS_${PN} = "kernel-module-tun" - -SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \ - file://makeman.patch \ - file://vpnc-install.patch \ - file://long-help \ - file://default.conf" - -SRC_URI[md5sum] = "4378f9551d5b077e1770bbe09995afb3" -SRC_URI[sha256sum] = "46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:33:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:33:00 +0000 Subject: [oe-commits] [meta-openembedded] 21/21: autofs: Patch to build on musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.77542233444@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8987a6f4674d5aef5da000b517895659757d2249 Author: Khem Raj AuthorDate: Fri Mar 31 19:14:53 2017 -0700 autofs: Patch to build on musl Signed-off-by: Khem Raj --- ...fine-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch | 50 +++++++++++++++++++++ .../0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 51 ++++++++++++++++++++++ .../recipes-daemons/autofs/autofs_5.1.1.bb | 6 ++- 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch new file mode 100644 index 0000000..075af57 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -0,0 +1,50 @@ +From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:10:57 -0700 +Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF + +if they are not defined as is in musl then define +them here + +Signed-off-by: Khem Raj +--- + include/automount.h | 8 ++++++++ + include/nsswitch.h | 3 +++ + 2 files changed, 11 insertions(+) + +diff --git a/include/automount.h b/include/automount.h +index 219b07d..b12c22a 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -42,6 +42,14 @@ + + #define ENABLE_CORES 1 + ++#ifndef __SWORD_TYPE ++# if __WORDSIZE == 32 /* System word size */ ++# define __SWORD_TYPE int ++# else /* __WORDSIZE == 64 */ ++# define __SWORD_TYPE long int ++# endif ++#endif ++ + /* We MUST have the paths to mount(8) and umount(8) */ + #ifndef HAVE_MOUNT + #error Failed to locate mount(8)! +diff --git a/include/nsswitch.h b/include/nsswitch.h +index 2b445a9..3db77b2 100644 +--- a/include/nsswitch.h ++++ b/include/nsswitch.h +@@ -24,6 +24,9 @@ + #include + #include "list.h" + ++#ifndef _PATH_NSSWITCH_CONF ++#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" ++#endif + #define NSSWITCH_FILE _PATH_NSSWITCH_CONF + + enum nsswitch_status { +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch new file mode 100644 index 0000000..6b6ba6d --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -0,0 +1,51 @@ +From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:12:10 -0700 +Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC + +S_IEXEC is portable + +Signed-off-by: Khem Raj +--- + daemon/lookup.c | 4 ++-- + modules/lookup_multi.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/lookup.c b/daemon/lookup.c +index 62071df..1bec97f 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c +index 6ec8434..88d081f 100644 +--- a/modules/lookup_multi.c ++++ b/modules/lookup_multi.c +@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch + continue; + } + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb index 8d55596..d85600e 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS += "libtirpc flex-native bison-native" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" + inherit autotools-brokensep systemd SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ @@ -21,7 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://force-STRIP-to-emtpy.patch \ file://remove-bashism.patch \ file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ -" + file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ + file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ + " SRC_URI[md5sum] = "e143df66b614b8cdb1ff533735f8e12d" SRC_URI[sha256sum] = "795419383b120d15699ab3b89ea0f3d029f6fb28405a83982d305c4b7b61130f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:59 +0000 Subject: [oe-commits] [meta-openembedded] 20/21: snort: Fix build with musl In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.6C1BF233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 834d4f1aa96ed13a70c6436e1dbec06b8fd14d62 Author: Khem Raj AuthorDate: Thu Mar 30 14:53:59 2017 -0700 snort: Fix build with musl Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index c62a8d3..57a04f2 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -5,6 +5,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux" +DEPENDS_append_libc-musl = " libtirpc" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -46,6 +47,9 @@ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + do_install_append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:57 +0000 Subject: [oe-commits] [meta-openembedded] 18/21: libnetfilter-log: Switch to git URI In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.57F8D23342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 91a526e72a612f5009ecc1031bc12d053a5aafc9 Author: Khem Raj AuthorDate: Thu Mar 30 13:13:20 2017 -0700 libnetfilter-log: Switch to git URI Move to tip of tree which has needed fixes for musl build add missing dependency on libmnl Signed-off-by: Khem Raj --- .../recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb index 30c9ae6..2f627d4 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libnfnetlink" +DEPENDS = "libnfnetlink libmnl" +SRCREV = "ba196a97e810746e5660fe3f57c87c0ed0f2b324" +PV .= "+git${SRCPV}" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "2a4bb0654ae675a52d2e8d1c06090b94" -SRC_URI[tar.sha256sum] = "74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21" +SRC_URI = "git://git.netfilter.org/libnetfilter_log" -S = "${WORKDIR}/libnetfilter_log-${PV}" +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:56 +0000 Subject: [oe-commits] [meta-openembedded] 17/21: arptables: Upgrade to 0.0.4 In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.512CB233426@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9ea06ffc19b11eaa276efd62ef0be2967de580c5 Author: Khem Raj AuthorDate: Thu Mar 30 12:39:45 2017 -0700 arptables: Upgrade to 0.0.4 Switch the SRC_URI to git based fetcher Signed-off-by: Khem Raj --- .../arptables-compile-install.patch | 61 ----------------- ...FLAGS-for-package-specific-compiler-flags.patch | 79 ++++++++++++++++++++++ .../arptables-arpt-get-target-fix.patch | 0 .../arptables-init-busybox.patch | 0 .../arptables-remove-bashism.patch | 0 .../arptables.service | 0 .../{arptables_0.0.3-4.bb => arptables_git.bb} | 43 ++++++------ 7 files changed, 98 insertions(+), 85 deletions(-) diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch deleted file mode 100644 index 80e9804..0000000 --- a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: arptables-v0.0.3-4/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/Makefile 2010-03-22 15:52:56.000000000 +0300 -@@ -6,12 +6,11 @@ - LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= - --COPT_FLAGS:=-O2 --CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" - - ifndef ARPT_LIBDIR - ARPT_LIBDIR:=$(LIBDIR)/arptables -@@ -22,16 +21,16 @@ - all: arptables - - arptables.o: arptables.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables-standalone.o: arptables-standalone.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^ - - $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 - mkdir -p $(@D) -@@ -50,6 +49,7 @@ - cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_ - install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ -+ install -d $(DESTDIR)$(INITDIR) - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - -Index: arptables-v0.0.3-4/extensions/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/extensions/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/extensions/Makefile 2010-03-22 15:52:38.000000000 +0300 -@@ -4,4 +4,7 @@ - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) - - extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -+ -+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch new file mode 100644 index 0000000..e8be45e --- /dev/null +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -0,0 +1,79 @@ +From a2021f0bc0f029dfa05dcca5db3d2ec77904d41a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 12:33:51 -0700 +Subject: [PATCH] Use ARPCFLAGS for package specific compiler flags + +This leaves room for setting CFLAGS in environment +which OE uses to pass tweaks + +Signed-off-by: Khem Raj +--- + Makefile | 15 +++++++-------- + extensions/Makefile | 5 ++++- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 7bead0d..336db6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib + BINDIR:=$(PREFIX)/sbin + MANDIR:=$(PREFIX)/man + man8dir=$(MANDIR)/man8 +-INITDIR:=/etc/rc.d/init.d ++INITDIR:=/etc/init.d + SYSCONFIGDIR:=/etc/sysconfig + DESTDIR:= + + MANS = arptables.8 arptables-save.8 arptables-restore.8 + +-COPT_FLAGS:=-O2 +-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG +- ++ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" + ifndef ARPT_LIBDIR + ARPT_LIBDIR:=$(LIBDIR)/arptables + endif +@@ -25,13 +23,13 @@ include extensions/Makefile + all: arptables libarptc/libarptc.a + + arptables.o: arptables.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + arptables-standalone.o: arptables-standalone.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.a: libarptc/libarptc.o + $(AR) rcs $@ $< +@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv + install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore + cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi ++ install -d $(DESTDIR)$(INITDIR) ++ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables + rm -f arptables-save_ arptables-restore_ arptables.sysv_ + + .PHONY: install-man +diff --git a/extensions/Makefile b/extensions/Makefile +index 0189cc9..b046425 100644 +--- a/extensions/Makefile ++++ b/extensions/Makefile +@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK + EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) + + extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h +- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< ++ ++extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< +-- +2.12.1 + diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch b/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/meta-networking/recipes-support/arptables/arptables/arptables.service similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service rename to meta-networking/recipes-support/arptables/arptables/arptables.service diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_git.bb similarity index 61% rename from meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb rename to meta-networking/recipes-support/arptables/arptables_git.bb index f536408..274a55d 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,15 +1,13 @@ SUMMARY = "Administration tool for arp packet filtering" -LICENSE = "GPL-2.0" SECTION = "net" - -PR = "r2" - -RDEPENDS_${PN} += "perl" - +LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" +PV = "0.0.4+git${SRCPV}" + SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ - file://arptables-compile-install.patch \ + git://git.netfilter.org/arptables \ + file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ file://arptables-remove-bashism.patch \ @@ -18,26 +16,23 @@ SRC_URI = " \ SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" -S = "${WORKDIR}/arptables-v${PV}" - -do_compile () { - oe_runmake -} +S = "${WORKDIR}/git" +SYSTEMD_SERVICE_${PN} = "arptables.service" -# the install target is not multi-job safe, but it doesn't do much -# so we just install serially -# -PARALLEL_MAKEINST = "-j1" +inherit systemd -fakeroot do_install () { - oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install -} +EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'" do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + fi } -inherit systemd +RDEPENDS_${PN} += "perl" -SYSTEMD_SERVICE_${PN} = "arptables.service" +# the install target is not multi-job safe, but it doesn't do much +# so we just install serially +# +PARALLEL_MAKEINST = "-j1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 17:32:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 17:32:53 +0000 Subject: [oe-commits] [meta-openembedded] 14/21: dibbler: Upgrade to 1.0.2RC1 In-Reply-To: <149141355949.5880.3515607104100298828@git.openembedded.org> References: <149141355949.5880.3515607104100298828@git.openembedded.org> Message-ID: <20170405173240.2E23D233440@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit f1feb7c449a6b5706b1286fa1d203aac3f5d6d42 Author: Khem Raj AuthorDate: Wed Mar 29 15:36:19 2017 -0700 dibbler: Upgrade to 1.0.2RC1 Delete dibbler from meta-oe Signed-off-by: Khem Raj --- .../dibbler/dibbler_fix_getSize_crash.patch | 56 ++++--------- .../dibbler/dibbler/types.patch | 96 ---------------------- .../dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} | 16 ++-- .../recipes-connectivity/dibbler/dibbler_1.0.1.bb | 40 --------- 4 files changed, 24 insertions(+), 184 deletions(-) diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index adb249f..42d2627 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,32 +1,8 @@ -diff --git a/ClntMessages/ClntMsg.cpp b/ClntMessages/ClntMsg.cpp -index eeaadd0..0cf5dce 100644 ---- a/ClntMessages/ClntMsg.cpp -+++ b/ClntMessages/ClntMsg.cpp -@@ -346,7 +346,9 @@ unsigned long TClntMsg::getTimeout() - - void TClntMsg::send() - { -- char* pkt = new char[getSize()]; -+ size_t size = getSize(); -+ char* pkt = new char[size]; -+ memset(pkt, 0, size); - - srand((uint32_t)time(NULL)); - if (!RC) -@@ -364,7 +366,7 @@ void TClntMsg::send() - - RC++; - -- this->storeSelf(pkt); -+ storeSelf(pkt); - - SPtr ptrIface = ClntIfaceMgr().getIfaceByID(Iface); - if (!ptrIface) { -diff --git a/ClntMessages/ClntMsgRequest.cpp b/ClntMessages/ClntMsgRequest.cpp -index 4a7b5da..f3e40fd 100644 ---- a/ClntMessages/ClntMsgRequest.cpp -+++ b/ClntMessages/ClntMsgRequest.cpp -@@ -143,7 +143,10 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, +Index: git/ClntMessages/ClntMsgRequest.cpp +=================================================================== +--- git.orig/ClntMessages/ClntMsgRequest.cpp ++++ git/ClntMessages/ClntMsgRequest.cpp +@@ -142,7 +142,10 @@ TClntMsgRequest::TClntMsgRequest(List(TA IsDone=false; SPtr ptr; ptr = new TOptDUID(OPTION_CLIENTID, ClntCfgMgr().getDUID(), this ); @@ -38,8 +14,8 @@ index 4a7b5da..f3e40fd 100644 if (!srvDUID) { Log(Error) << "Unable to send REQUEST: ServerId not specified.\n" << LogEnd; -@@ -154,7 +157,9 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, - ptr = (Ptr*) new TOptDUID(OPTION_SERVERID, srvDUID,this); +@@ -153,7 +156,9 @@ TClntMsgRequest::TClntMsgRequest(List(TA + ptr = new TOptDUID(OPTION_SERVERID, srvDUID,this); // all IAs provided by checkSolicit SPtr ClntAddrIA; - Options.push_back( ptr ); @@ -49,21 +25,21 @@ index 4a7b5da..f3e40fd 100644 IAs.first(); while (ClntAddrIA = IAs.get()) -diff --git a/Messages/Msg.cpp b/Messages/Msg.cpp -index baa6c86..6eef6c7 100644 ---- a/Messages/Msg.cpp -+++ b/Messages/Msg.cpp -@@ -66,10 +66,15 @@ int TMsg::getSize() +Index: git/Messages/Msg.cpp +=================================================================== +--- git.orig/Messages/Msg.cpp ++++ git/Messages/Msg.cpp +@@ -69,10 +69,15 @@ int TMsg::getSize() { int pktsize=0; TOptList::iterator opt; -+ int optionCount = 0; ++ int optionCount = 0; for (opt = Options.begin(); opt!=Options.end(); ++opt) { - pktsize += (*opt)->getSize(); -+ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; -+ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; -+ pktsize += (*opt)->getSize(); ++ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; ++ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; ++ pktsize += (*opt)->getSize(); } + Log(Info) << "### CPE Debug - Packet size of option (Add 4) " << pktsize << LogEnd ; + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch deleted file mode 100644 index 28f18ef..0000000 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch +++ /dev/null @@ -1,96 +0,0 @@ -Apply fixes to build on musl - -Signed-off-by: Khem Raj - - -Index: dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/IfaceMgr.cpp -+++ dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include "Portable.h" - #include "IfaceMgr.h" - #include "Iface.h" -Index: dibbler-1.0.1/IfaceMgr/SocketIPv6.h -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/SocketIPv6.h -+++ dibbler-1.0.1/IfaceMgr/SocketIPv6.h -@@ -18,6 +18,7 @@ class TIfaceSocket; - - #include - #include -+#include - - #include "Portable.h" - #include "DHCPConst.h" -Index: dibbler-1.0.1/Port-linux/ethtool-local.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/ethtool-local.h -+++ dibbler-1.0.1/Port-linux/ethtool-local.h -@@ -22,9 +22,9 @@ - */ - - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; - - #include "ethtool-kernel.h" - -Index: dibbler-1.0.1/Port-linux/interface.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/interface.c -+++ dibbler-1.0.1/Port-linux/interface.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -35,13 +36,10 @@ - #include - #include - --#include - - #include "ethtool-local.h" - #include "interface.h" - #include --#include --#include - - void daemon_log(int loglevel, const char *fmt,...) - { -Index: dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/lowlevel-linux-link-state.c -+++ dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - #include "Portable.h" - #include "interface.h" - -Index: dibbler-1.0.1/Port-linux/utils.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/utils.h -+++ dibbler-1.0.1/Port-linux/utils.h -@@ -4,6 +4,7 @@ - #include - //#include - #include -+#include - - #include "libnetlink.h" - #include "ll_map.h" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb similarity index 77% rename from meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb rename to meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 1913d3a..8890e14 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -5,12 +5,14 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${BP}.tar.gz \ - file://dibbler_fix_getSize_crash.patch \ - file://types.patch \ -" -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" +SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" + +SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ + file://dibbler_fix_getSize_crash.patch \ + " +PV = "1.0.1+1.0.2RC1+git${SRCREV}" + +S = "${WORKDIR}/git" PACKAGECONFIG ??= "debug bind-reuse resolvconf dns-update" @@ -27,8 +29,6 @@ inherit autotools DEPENDS += "flex-native" -CFLAGS += "-D_GNU_SOURCE" - PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" FILES_${PN}-client = "${sbindir}/${PN}-client" diff --git a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb deleted file mode 100644 index 41bb78f..0000000 --- a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A portable DHCPv6 implementation" -DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful \ -(i.e. IPv6 address granting and IPv6 prefix delegation) as well as stateless (i.e. \ -option granting) autoconfiguration for IPv6." -HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3 \ - file://bison++/COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://klub.com.pl/dhcpv6/dibbler/dibbler-${PV}.tar.gz" - -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" - -inherit autotools - -PACKAGECONFIG ?= "auth bind-reuse dns-update dst-addr-filter link-state" - -PACKAGECONFIG[auth] = "--enable-auth,--disable-auth" -PACKAGECONFIG[bind-reuse] = "--enable-bind-reuse,--disable-bind-reuse" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[dns-update] = "--enable-dns-update,--disable-dns-update" -PACKAGECONFIG[dst-addr-filter] = "--enable-dst-addr-filter,--disable-dst-addr-filter" -PACKAGECONFIG[link-state] = "--enable-link-state,--disable-link-state" -PACKAGECONFIG[remote-autoconf] = "--enable-remote-autoconf,--disable-remote-autoconf" -PACKAGECONFIG[resolvconf] = "--enable-resolvconf,--disable-resolvconf" - -EXTRA_OECONF += " \ - --disable-efence \ - --with-gtest=no \ -" - -PACKAGES =+ "${PN}-client ${PN}-relay ${PN}-requestor ${PN}-server" - -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:30 +0000 Subject: [oe-commits] [meta-openembedded] 03/35: libdnet: update SRC_URI In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183527.DD01E23342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 05ecc196cde88b4b778156800b2712da1f337095 Author: Kai Kang AuthorDate: Thu Mar 23 11:04:55 2017 +0800 libdnet: update SRC_URI The official homepage libdnet.googlecode.com has been redirected to github. So update SRC_URI to use git repo on github. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 28b6c82..f48b655 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -4,10 +4,10 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" -SRC_URI = "http://libdnet.googlecode.com/files/libdnet-${PV}.tgz" +SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" +SRCREV = "12fca29a6d4e99d1b923d6820887fe7b24226904" -SRC_URI[md5sum] = "9253ef6de1b5e28e9c9a62b882e44cc9" -SRC_URI[sha256sum] = "83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026" +S = "${WORKDIR}/git" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:28 +0000 Subject: [oe-commits] [meta-openembedded] 01/35: dnsmasq: disable the service by default In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183527.C9F50233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 15328d73c22ceca578bd6dfd50927af82299d457 Author: Jackie Huang AuthorDate: Mon Feb 27 16:09:59 2017 +0800 dnsmasq: disable the service by default The service will fail to start/stop when dnsmasq and bind (provides named) are both installed since they are using the same port 53: | dnsmasq: failed to create listening socket for port 53: Address already in use So disable the service by default, if the user really want to use two dns servives, the config needs to be changed to use different interfaces or ports. As reference, other distro like centos/fedora also disables the services by default on installation. Signed-off-by: Jackie Huang Signed-off-by: Jackie Huang > Signed-off-by: Martin Jansa --- meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index ef79c5f..3d0386b 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -81,3 +81,4 @@ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "dnsmasq.service" +SYSTEMD_AUTO_ENABLE ?= "disable" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:29 +0000 Subject: [oe-commits] [meta-openembedded] 02/35: ctdb: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183527.D65BE23342A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit bcf9a08a2a330aa90b8ba61f13687b04f86872c8 Author: Khem Raj AuthorDate: Wed Mar 22 11:45:28 2017 -0700 ctdb: Fix build with musl Fixes | ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 7cea0f6..b5a6064 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -27,6 +27,9 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" DEPENDS += "popt libtevent libtalloc libldb" +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:31 +0000 Subject: [oe-commits] [meta-openembedded] 04/35: wireless-regdb: fix crda failing from missing pubkey In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183527.E8C8423342E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a5a44dbe77d36523b41bb5fe3c07a3520efb816f Author: Aaron Zinghini AuthorDate: Fri Mar 24 08:54:27 2017 -0700 wireless-regdb: fix crda failing from missing pubkey crda fails with exit code 255 because the public key from wireless-regdb is missing. Signed-off-by: Aaron Zinghini Signed-off-by: Martin Jansa --- .../recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb index a9119ea..64e9401 100644 --- a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb +++ b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb @@ -12,7 +12,9 @@ inherit bin_package do_install() { install -d -m0755 ${D}${libdir}/crda + install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin + install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem } RSUGGESTS_${PN} = "crda" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:27 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (8987a6f -> 4280221) Message-ID: <149141732754.23740.14915616574387261994@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master-next in repository meta-openembedded. discard 8987a6f autofs: Patch to build on musl discard 834d4f1 snort: Fix build with musl discard 86ad4cd libnetfilter-queue: Update to git for SRC_URI discard 91a526e libnetfilter-log: Switch to git URI discard 9ea06ff arptables: Upgrade to 0.0.4 discard 07e1928 daq: Fix build with musl discard def2e53 vpnc: Update to build from github SRC_URI discard f1feb7c dibbler: Upgrade to 1.0.2RC1 discard e4379aa vsftpd: Fix build with musl discard c42897d rp-pppoe: Fix build with musl discard 1877f3d openl2tp: Fix build with musl discard bb0a0ce lowpan-tools: Fix build with musl discard 7d49bb1 ebtables: Fix build with musl discard 519face libnfnetlink: Backport patches to fix musl build discard b9b1e9f squid: Update to 3.5.23 discard 1496097 netcat-openbsd: Fix build and whitelist discard 8c65bb4 ntp: update to 4.2.8.p10 discard 0042fc5 wireless-regdb: fix crda failing from missing pubkey discard c3eb73c libdnet: update SRC_URI discard a48f2ce ctdb: Fix build with musl discard 18a4cc4 dnsmasq: disable the service by default add cdb428e recipes: add removal date to PNBLACKLIST messages new 15328d7 dnsmasq: disable the service by default new bcf9a08 ctdb: Fix build with musl new 05ecc19 libdnet: update SRC_URI new a5a44db wireless-regdb: fix crda failing from missing pubkey new 6e2d318 ntp: update to 4.2.8.p10 new 1a01884 netcat-openbsd: Fix build and whitelist new 2f5738e squid: Update to 3.5.23 new 762a074 libnfnetlink: Backport patches to fix musl build new 2ee4969 ebtables: Fix build with musl new 768c920 lowpan-tools: Fix build with musl new 2eab707 openl2tp: Fix build with musl new d572db6 rp-pppoe: Fix build with musl new 4affd6a vsftpd: Fix build with musl new ddcdd8c dibbler: Upgrade to 1.0.2RC1 new c8547c1 vpnc: Update to build from github SRC_URI new 27a6397 daq: Fix build with musl new 2eef0f3 arptables: Upgrade to 0.0.4 new 9debde5 libnetfilter-log: Switch to git URI new 5e4d8e3 libnetfilter-queue: Update to git for SRC_URI new 7406a3f snort: Fix build with musl new eb2b5ae autofs: Patch to build on musl new faa1217 gpm: Update to use git src uri new b23f2d7 lvm2: Fix patch errors found with musl new cb5f9fb ttf-inconsolata: Move copying of .otf to .ttf into do_compile new 0eb71c6 minicoredumper: Update to 2.0.0 new 8ce27d0 libqb: Upgrade to 1.0.1 release new faf2bea xarchiver: Fix build with security flags turned on new 2857e68 vorbis-tools: Fix build with security flags new 0960a20 ntimed: Use adjtimex on musl new 60d17fd libnih: Drop SIGCLD new a4edae0 libuio: Fix build with musl new a0cc3bf uml-utilities: Fix problem founds during musl build new 9f203d0 synergy: Add unzip-native depenedency to right task new 94750cc corosync: Update to 2.4.2 new 4280221 logfsprogs: Pass LDFLAGS to link steps This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8987a6f) \ N -- N -- N refs/heads/master-next (4280221) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 35 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../recipes-devtools/python/python-edbus_1.7.0.bb | 2 +- .../recipes-devtools/python/python-efl_1.15.0.bb | 2 +- meta-efl/recipes-devtools/python/python-efl_git.bb | 2 +- meta-efl/recipes-efl/e17/cpu_svn.bb | 2 +- meta-efl/recipes-efl/e17/diskio_svn.bb | 2 +- meta-efl/recipes-efl/e17/e-tasks_git.bb | 2 +- meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb | 6 +- .../e17/e-wm-theme-illume-efenniht_svn.bb | 4 +- meta-efl/recipes-efl/e17/e-wm_0.18.8.bb | 2 +- meta-efl/recipes-efl/e17/e-wm_0.19.10.bb | 2 +- meta-efl/recipes-efl/e17/e-wm_git.bb | 2 +- meta-efl/recipes-efl/e17/edje-viewer_svn.bb | 2 +- meta-efl/recipes-efl/e17/elbow_git.bb | 2 +- meta-efl/recipes-efl/e17/elfe_git.bb | 2 +- meta-efl/recipes-efl/e17/elmdentica_svn.bb | 2 +- meta-efl/recipes-efl/e17/emprint_svn.bb | 2 +- meta-efl/recipes-efl/e17/enjoy_git.bb | 2 +- meta-efl/recipes-efl/e17/ephoto_svn.bb | 2 +- meta-efl/recipes-efl/e17/exalt-client_svn.bb | 2 +- meta-efl/recipes-efl/e17/exalt_svn.bb | 2 +- meta-efl/recipes-efl/e17/exquisite-theme-illume.bb | 6 +- meta-efl/recipes-efl/e17/exquisite_svn.bb | 2 +- meta-efl/recipes-efl/e17/flame_svn.bb | 2 +- meta-efl/recipes-efl/e17/forecasts_svn.bb | 2 +- meta-efl/recipes-efl/e17/news_svn.bb | 2 +- meta-efl/recipes-efl/e17/places_svn.bb | 2 +- meta-efl/recipes-efl/e17/rage_svn.bb | 2 +- meta-efl/recipes-efl/e17/rain_svn.bb | 2 +- meta-efl/recipes-efl/e17/screenshot_svn.bb | 2 +- meta-efl/recipes-efl/e17/terminology_0.9.1.bb | 2 +- meta-efl/recipes-efl/e17/uptime_svn.bb | 2 +- meta-efl/recipes-efl/efl/azy_svn.bb | 2 +- meta-efl/recipes-efl/efl/edbus_1.7.9.bb | 8 +- meta-efl/recipes-efl/efl/efl.inc | 4 +- .../efl/elementary-theme-efenniht_svn.bb | 6 +- meta-efl/recipes-efl/efl/elementary_1.15.1.bb | 2 +- .../efl/emotion-generic-players_1.15.0.bb | 6 +- meta-efl/recipes-efl/efl/engrave_svn.bb | 2 +- meta-efl/recipes-efl/efl/entrance_svn.bb | 2 +- meta-efl/recipes-efl/efl/epdf_svn.bb | 8 +- .../recipes-efl/efl/evas-generic-loaders_1.15.0.bb | 6 +- meta-efl/recipes-efl/efl/expedite_1.7.9.bb | 20 +- meta-efl/recipes-efl/efl/expedite_git.bb | 20 +- meta-efl/recipes-efl/efl/libeflvala_svn.bb | 2 +- meta-efl/recipes-efl/efl/libeweather_svn.bb | 2 +- .../packagegroups/packagegroup-efl-sdk.bb | 2 +- .../packagegroup-efl-standalone-sdk-target.bb | 2 +- .../packagegroups/packagegroup-x11-illume.bb | 6 +- meta-efl/recipes-efl/webkit/webkit-efl.inc | 2 +- meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb | 2 +- .../0001-Add-LDFLAGS-to-linker-cmdline.patch | 46 +++ .../logfsprogs/logfsprogs_git.bb | 7 +- .../recipes-filesystems/smbnetfs/smbnetfs_git.bb | 2 +- .../unionfs-fuse/unionfs-fuse_0.26.bb | 2 +- .../recipes-utils/dmapi/dmapi_2.2.12.bb | 2 +- .../recipes-utils/xfsdump/xfsdump_3.1.4.bb | 2 +- meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb | 4 +- meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb | 2 +- .../recipes-apps/gnome-mplayer/gmtk_1.0.5.bb | 2 +- .../gnome-mplayer/gnome-mplayer_1.0.5.bb | 2 +- .../gtk-theme-torturer/gtk-theme-torturer_git.bb | 2 +- .../recipes-gnome/devilspie/devilspie2_0.33.bb | 2 +- .../recipes-gnome/gcalctool/gcalctool_5.32.0.bb | 2 +- meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 2 +- .../gnome-backgrounds/gnome-backgrounds_2.32.0.bb | 2 +- .../gnome-control-center_2.32.1.bb | 2 +- .../gnome-desktop/gnome-desktop_2.32.1.bb | 2 +- .../gnome-disk-utility_2.32.0.bb | 2 +- .../gnome-keyring/gnome-keyring_2.32.1.bb | 2 +- .../gnome-menus/gnome-menus_2.30.5.bb | 2 +- .../gnome-panel/gnome-panel3_3.0.2.bb | 4 +- .../gnome-panel/gnome-panel_2.32.1.bb | 2 +- .../gnome-power-manager_2.32.0.bb | 2 +- .../gnome-session/gnome-session_2.32.1.bb | 2 +- .../gnome-settings-daemon_2.32.1.bb | 4 +- .../gnome-system-monitor_2.28.2.bb | 2 +- .../recipes-gnome/gnome/gnome-terminal_2.30.2.bb | 2 +- .../recipes-gnome/gnome/libgnomecups_0.2.3.bb | 2 +- .../recipes-gnome/gnome/libgnomeprint_2.18.8.bb | 2 +- .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb | 2 +- meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 2 +- .../recipes-gnome/gweather/libgweather3_3.0.2.bb | 2 +- .../recipes-gnome/gweather/libgweather_2.30.3.bb | 2 +- .../recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 2 +- .../recipes-gnome/nautilus/nautilus3_3.2.1.bb | 2 +- .../recipes-gnome/nautilus/nautilus_2.32.2.bb | 2 +- meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb | 2 +- meta-gnome/recipes-gnome/pimlico/contacts_git.bb | 2 +- meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb | 2 +- meta-gnome/recipes-gnome/pimlico/tasks_git.bb | 2 +- .../system-tools/system-tools-backends_2.10.2.bb | 2 +- .../recipes-gnome/themes/gnome-themes_2.32.1.bb | 2 +- meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb | 2 +- .../recipes-support/florence/florence_0.5.4.bb | 2 +- .../recipes-support/goffice/goffice_0.10.1.bb | 2 +- .../recipes-support/tracker/tracker_0.14.2.bb | 2 +- meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb | 2 +- .../libgpewidget/libgpewidget_0.117.bb | 2 +- .../recipes-graphics/minilite/minilite_0.50.bb | 2 +- .../recipes-support/fbreader/fbreader_0.12.10.bb | 2 +- meta-gpe/recipes-support/fbreader/fbreader_git.bb | 2 +- .../recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb | 2 +- .../gupnp/gupnp-tools_0.8.10.bb | 2 +- .../recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb | 2 +- .../recipes-dvb/tvheadend/tvheadend_git.bb | 2 +- .../kodi/kodi-addon-pvr-hts_git.bb | 2 +- .../recipes-mediacenter/kodi/kodi-platform_git.bb | 2 +- .../recipes-mediacenter/kodi/kodi-startup.bb | 4 +- .../recipes-mediacenter/kodi/kodi_17.bb | 2 +- .../recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb | 2 +- .../coriander/coriander_2.0.2.bb | 2 +- .../dleyna/renderer-service-upnp_0.3.0.bb | 2 +- .../gstreamer-0.10/gst-ffmpeg_0.10.13.bb | 2 +- .../recipes-multimedia/gstreamer/gst123_0.3.1.bb | 2 +- ...error-blocking-compilation-with-hardening.patch | 26 ++ .../vorbis-tools/vorbis-tools_1.4.0.bb | 1 + .../recipes-daemons/dnrd/dnrd_2.20.3.bb | 2 +- .../recipes-kernel/netmap/netmap-modules_git.bb | 2 +- .../recipes-kernel/netmap/netmap_git.bb | 2 +- .../recipes-protocols/accel-ppp/accel-ppp_git.bb | 2 +- .../recipes-support/nis/ypbind-mt_2.2.bb | 2 +- .../recipes-support/ntimed/ntimed_git.bb | 9 +- .../phoronix-test-suite_6.6.1.bb | 2 +- meta-oe/recipes-benchmark/pmbw/pmbw_git.bb | 2 +- .../recipes-connectivity/gnokii/gnokii_0.6.31.bb | 2 +- .../networkmanager/networkmanager-openvpn_1.2.6.bb | 2 +- meta-oe/recipes-connectivity/soft66/soft66_git.bb | 2 +- .../telepathy/libtelepathy_0.3.3.bb | 2 +- .../telepathy/telepathy-mission-control_5.16.1.bb | 2 +- meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb | 2 +- .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 2 +- .../zeroc-ice/zeroc-ice_3.5.1.bb | 2 +- meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb | 2 +- meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb | 2 +- meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb | 2 +- .../packagegroups/packagegroup-cli-tools.bb | 4 +- meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 2 +- meta-oe/recipes-devtools/dt/dt_18.32.bb | 2 +- meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb | 2 +- .../packagekit/packagekit_0.5.6.bb | 2 +- meta-oe/recipes-devtools/php/php_5.6.26.bb | 2 +- meta-oe/recipes-devtools/php/php_7.1.0.bb | 2 +- .../vala-dbus-binding-tool_0.4.0.bb | 2 +- .../vala-dbus-binding-tool_git.bb | 2 +- .../{corosync_2.4.0.bb => corosync_2.4.2.bb} | 4 +- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 +++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +- .../0001-include-fcntl.h-for-O_RDWR-define.patch | 38 +++ meta-oe/recipes-extended/libuio/libuio_0.2.1.bb | 6 +- .../openlmi/openlmi-networking_0.3.1.bb | 2 +- .../openlmi/openlmi-providers_0.6.0.bb | 2 +- .../openlmi/openlmi-storage_0.8.1.bb | 2 +- .../recipes-extended/subsurface/subsurface_git.bb | 2 +- ...uired-system-header-files-for-fd_set-and-.patch | 41 +++ .../uml-utilities/uml-utilities_20040406.bb | 5 +- meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb | 2 +- meta-oe/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb | 2 +- .../recipes-graphics/clutter/clutter-box2d_git.bb | 2 +- meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 2 +- meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb | 2 +- meta-oe/recipes-graphics/libsexy/libsexy_0.1.11.bb | 2 +- meta-oe/recipes-graphics/slim/slim_1.3.2.bb | 2 +- .../terminus-font/terminus-font_4.38.bb | 2 +- .../ttf-fonts/ttf-inconsolata_20100526.bb | 7 +- .../recipes-graphics/wayland/wayland-fits_git.bb | 2 +- .../recipes-graphics/xorg-app/xstdcmap_1.0.3.bb | 2 +- .../xorg-driver/xf86-input-mtev_git.bb | 2 +- .../xorg-driver/xf86-video-geode_2.11.16.bb | 2 +- .../xorg-driver/xf86-video-glamo_git.bb | 2 +- .../xorg-driver/xf86-video-nouveau_1.0.12.bb | 2 +- .../xorg-font/xorg-fonts-100dpi.bb | 10 +- meta-oe/recipes-kernel/crash/crash_7.1.5.bb | 2 +- meta-oe/recipes-kernel/ktap/ktap-module_git.bb | 2 +- meta-oe/recipes-kernel/ktap/ktap_git.bb | 2 +- ...coredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 20 +- .../recipes-multimedia/minidlna/minidlna_1.1.5.bb | 2 +- meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 2 +- meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb | 2 +- .../recipes-sato/claws-mail/claws-mail_3.9.0.bb | 2 +- .../claws-plugin-gtkhtml2-viewer_0.31.bb | 2 +- .../claws-mail/claws-plugin-mailmbox_1.15.bb | 2 +- .../claws-mail/claws-plugin-rssyl_0.34.bb | 2 +- meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb | 2 +- meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb | 2 +- meta-oe/recipes-support/emacs/emacs_23.4.bb | 2 +- .../recipes-support/farsight/farsight2_0.0.22.bb | 6 +- meta-oe/recipes-support/fftw/benchfft_3.1.bb | 2 +- meta-oe/recipes-support/flite/flite-alsa_1.3.bb | 2 +- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ---- meta-oe/recipes-support/gpm/gpm_git.bb | 45 +++ meta-oe/recipes-support/iksemel/iksemel_1.4.bb | 2 +- .../libdbi/libdbi-drivers_0.8.3-1.bb | 2 +- meta-oe/recipes-support/libetpan/libetpan_0.57.bb | 2 +- ...GCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch | 28 ++ meta-oe/recipes-support/libnih/libnih_1.0.3.bb | 5 +- ...001-implement-libc-specific-reopen_stream.patch | 13 +- ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 13 +- meta-oe/recipes-support/ode/ode_0.13.bb | 4 +- .../open-vcdiff/open-vcdiff_0.8.4.bb | 2 +- .../recipes-support/opencv/opencv-samples_2.4.bb | 2 +- meta-oe/recipes-support/opencv/opencv_2.4.bb | 2 +- .../recipes-support/openmotif/openmotif_2.3.3.bb | 2 +- meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb | 2 +- meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb | 2 +- .../psqlodbc/psqlodbc_09.05.0300.bb | 2 +- meta-oe/recipes-support/synergy/synergy_git.bb | 3 +- .../system-setup-keyboard_0.8.8.bb | 2 +- .../vala-terminal/vala-terminal_git.bb | 2 +- .../vboxguestdrivers/vboxguestdrivers_4.3.36.bb | 2 +- meta-oe/recipes-support/xchat/xchat_2.8.8.bb | 2 +- meta-ruby/recipes-devtools/ruby/bundler_git.bb | 2 +- meta-webserver/recipes-php/xdebug/xdebug_2.5.1.bb | 2 +- ...formatting-string-to-printf-like-function.patch | 40 +++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +- .../recipes-art/cursor-themes/openzone_1.2.3.bb | 2 +- 221 files changed, 621 insertions(+), 683 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch create mode 100644 meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch rename meta-oe/recipes-extended/corosync/{corosync_2.4.0.bb => corosync_2.4.2.bb} (94%) create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch rename meta-oe/recipes-extended/libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} (67%) create mode 100644 meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch create mode 100644 meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch rename meta-oe/recipes-kernel/minicoredumper/{minicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} (63%) delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch create mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/init (100%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/no-docs.patch (93%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/processcreds.patch (100%) delete mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb create mode 100644 meta-oe/recipes-support/gpm/gpm_git.bb create mode 100644 meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch create mode 100644 meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:34 +0000 Subject: [oe-commits] [meta-openembedded] 07/35: squid: Update to 3.5.23 In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.175BF233434@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2f5738eb07d6d58f01f34ce0695f195b6a2673ff Author: Khem Raj AuthorDate: Wed Mar 22 14:39:47 2017 -0700 squid: Update to 3.5.23 Disable NIS on musl, it doesnt yet build Signed-off-by: Khem Raj --- .../recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb similarity index 95% rename from meta-networking/recipes-daemons/squid/squid_3.5.20.bb rename to meta-networking/recipes-daemons/squid/squid_3.5.23.bb index 2e9e1f1..0fe9673 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb @@ -22,13 +22,12 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ " +SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22" +SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ " -SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60" -SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1" - DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools useradd ptest @@ -45,7 +44,9 @@ PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -BASIC_AUTH = "DB SASL LDAP NIS" +BASIC_AUTH = "DB SASL LDAP" +BASIC_AUTH_append_libc-glibc = " NIS" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:36 +0000 Subject: [oe-commits] [meta-openembedded] 09/35: ebtables: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.282AE233436@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2ee49690c33502f5817c00d6068c3b7052573ec7 Author: Khem Raj AuthorDate: Sun Mar 26 14:21:31 2017 -0700 ebtables: Fix build with musl Backport upstream fixes and add fixes to make it work with musl Signed-off-by: Khem Raj --- .../0001-add-RARP-and-update-iana-url.patch | 45 +++++ .../0002-fix-compilation-warning.patch | 25 +++ .../0003-add-info-about-Wl-no-as-needed.patch | 25 +++ ...for-kernel-regression-bug-IPv6-source-des.patch | 28 +++ ...-command-line-support-for-ebtables-restor.patch | 75 +++++++ ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 +++++++ .../0007-extensions-Use-stdint-types.patch | 67 +++++++ ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 +++++ ...low-RETURN-target-rules-in-user-defined-c.patch | 48 +++++ .../0010-Adjust-header-include-sequence.patch | 216 +++++++++++++++++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 12 +- 11 files changed, 657 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch new file mode 100644 index 0000000..90b6979 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch @@ -0,0 +1,45 @@ +From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Tue, 3 Jul 2012 18:47:32 +0000 +Subject: [PATCH 01/10] add RARP and update iana url + +--- + ethertypes | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/ethertypes b/ethertypes +index 5e700f6..813177b 100644 +--- a/ethertypes ++++ b/ethertypes +@@ -5,6 +5,7 @@ + # + # This list could be found on: + # http://www.iana.org/assignments/ethernet-numbers ++# http://www.iana.org/assignments/ieee-802-numbers + # + # ... #Comment + # +@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT + DIAG 6005 # DEC Diagnostics + CUST 6006 # DEC Customer use + SCA 6007 # DEC Systems Comms Arch +-TEB 6558 # Trans Ether Bridging [RFC1701] +-RAW_FR 6559 # Raw Frame Relay [RFC1701] ++TEB 6558 # Trans Ether Bridging [RFC1701] ++RAW_FR 6559 # Raw Frame Relay [RFC1701] ++RARP 8035 # Reverse ARP [RFC903] + AARP 80F3 # Appletalk AARP +-ATALK 809B # Appletalk ++ATALK 809B # Appletalk + 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame + IPX 8137 # Novell IPX + NetBEUI 8191 # NetBEUI + IPv6 86DD ip6 # IP version 6 +-PPP 880B # PPP ++PPP 880B # PPP + ATMMPOA 884C # MultiProtocol over ATM + PPP_DISC 8863 # PPPoE discovery messages + PPP_SES 8864 # PPPoE session messages +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch new file mode 100644 index 0000000..87b0e9b --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch @@ -0,0 +1,25 @@ +From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 +From: Petri Gynther +Date: Sun, 24 Feb 2013 10:56:59 +0100 +Subject: [PATCH 02/10] fix compilation warning + +--- + communication.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/communication.c b/communication.c +index 62ed667..ba058c0 100644 +--- a/communication.c ++++ b/communication.c +@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) + } + close_file: + fclose(file); +- return 0; ++ return ret; + } + + /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch new file mode 100644 index 0000000..c8573a4 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch @@ -0,0 +1,25 @@ +From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Wed, 3 Jul 2013 22:12:47 +0200 +Subject: [PATCH 03/10] add info about -Wl,-no-as-needed + +--- + INSTALL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 4a05c67..e90d5c1 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -39,6 +39,8 @@ That's all + You can also use a base directory different from the root directory (/), + using the DESTDIR option. See the Makefile for more details. + ++You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly ++on your system. + + ADDITIONAL PROGRAMS: + ---------------------- +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch new file mode 100644 index 0000000..d8f2795 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch @@ -0,0 +1,28 @@ +From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 +From: Luis Fernando +Date: Wed, 3 Jul 2013 22:19:55 +0200 +Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 + source/destination addresses are potentially not matched correctly + +--- + extensions/ebt_ip6.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index 0465e77..bbdc4ae 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) + + ipinfo->invflags = 0; + ipinfo->bitmask = 0; ++ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); ++ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); ++ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); ++ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); + } + + #define OPT_SOURCE 0x01 +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch new file mode 100644 index 0000000..9585fd2 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch @@ -0,0 +1,75 @@ +From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 +From: Sanket Shah +Date: Wed, 31 Jul 2013 21:40:08 +0200 +Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore + +--- + ebtables-restore.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/ebtables-restore.c b/ebtables-restore.c +index ea02960..bb4d0cf 100644 +--- a/ebtables-restore.c ++++ b/ebtables-restore.c +@@ -22,13 +22,25 @@ + #include + #include + #include ++#include + #include "include/ebtables_u.h" + ++static const struct option options[] = { ++ {.name = "noflush", .has_arg = 0, .val = 'n'}, ++ { 0 } ++}; ++ + static struct ebt_u_replace replace[3]; + void ebt_early_init_once(); + + #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ + ++static void print_usage() ++{ ++ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); ++ exit(1); ++} ++ + static void copy_table_names() + { + strcpy(replace[0].name, "filter"); +@@ -41,11 +53,20 @@ static void copy_table_names() + int main(int argc_, char *argv_[]) + { + char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; +- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; ++ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; + char ebtables_str[] = "ebtables"; + +- if (argc_ != 1) +- ebtrest_print_error("options are not supported"); ++ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { ++ switch(c) { ++ case 'n': ++ flush = 0; ++ break; ++ default: ++ print_usage(); ++ break; ++ } ++ } ++ + ebt_silent = 0; + copy_table_names(); + ebt_early_init_once(); +@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) + ebtrest_print_error("table '%s' was not recognized", cmdline+1); + table_nr = i; + replace[table_nr].command = 11; +- ebt_get_kernel_table(&replace[table_nr], 1); ++ ebt_get_kernel_table(&replace[table_nr], flush); + replace[table_nr].command = 0; + replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ + continue; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch new file mode 100644 index 0000000..21f8e58 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch @@ -0,0 +1,69 @@ +From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Mon, 14 Apr 2014 22:04:55 +0200 +Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch + by Mariusz Mazur ) + +--- + extensions/ebt_ip6.c | 4 ++-- + include/ebtables_u.h | 1 + + useful_functions.c | 13 +++++++++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index bbdc4ae..e3e0956 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, + if (ipinfo->invflags & EBT_IP6_SOURCE) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); + } + if (ipinfo->bitmask & EBT_IP6_DEST) { + printf("--ip6-dst "); + if (ipinfo->invflags & EBT_IP6_DEST) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); + } + if (ipinfo->bitmask & EBT_IP6_TCLASS) { + printf("--ip6-tclass "); +diff --git a/include/ebtables_u.h b/include/ebtables_u.h +index ab615c1..35a5bcc 100644 +--- a/include/ebtables_u.h ++++ b/include/ebtables_u.h +@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); + void ebt_parse_ip6_address(char *address, struct in6_addr *addr, + struct in6_addr *msk); + char *ebt_ip6_to_numeric(const struct in6_addr *addrp); ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk); + + + int do_command(int argc, char *argv[], int exec_style, +diff --git a/useful_functions.c b/useful_functions.c +index d20b68e..d14cbe9 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) + static char buf[50+1]; + return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); + } ++ ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk) ++{ ++ /* /0000:0000:0000:0000:0000:000.000.000.000 ++ * /0000:0000:0000:0000:0000:0000:0000:0000 */ ++ static char buf[51+1]; ++ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && ++ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) ++ *buf = '\0'; ++ else ++ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); ++ return buf; ++} +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch new file mode 100644 index 0000000..6fbe7df --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch @@ -0,0 +1,67 @@ +From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:22:39 +0200 +Subject: [PATCH 07/10] extensions: Use stdint types + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + extensions/ebt_ip6.c | 4 ++-- + extensions/ebt_limit.c | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index e3e0956..dd48547 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -53,8 +53,8 @@ static const struct option opts[] = + + struct icmpv6_names { + const char *name; +- u_int8_t type; +- u_int8_t code_min, code_max; ++ uint8_t type; ++ uint8_t code_min, code_max; + }; + + static const struct icmpv6_names icmpv6_codes[] = { +diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c +index ee40e5c..d189a09 100644 +--- a/extensions/ebt_limit.c ++++ b/extensions/ebt_limit.c +@@ -59,11 +59,11 @@ static void print_help(void) + " default %u\n", EBT_LIMIT_BURST); + } + +-static int parse_rate(const char *rate, u_int32_t *val) ++static int parse_rate(const char *rate, uint32_t *val) + { + const char *delim; +- u_int32_t r; +- u_int32_t mult = 1; /* Seconds by default. */ ++ uint32_t r; ++ uint32_t mult = 1; /* Seconds by default. */ + + delim = strchr(rate, '/'); + if (delim) { +@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, + struct rates + { + const char *name; +- u_int32_t mult; ++ uint32_t mult; + }; + + static struct rates g_rates[] = +@@ -162,7 +162,7 @@ static struct rates g_rates[] = + { "sec", EBT_LIMIT_SCALE } + }; + +-static void print_rate(u_int32_t period) ++static void print_rate(uint32_t period) + { + unsigned int i; + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch new file mode 100644 index 0000000..df3f521 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch @@ -0,0 +1,48 @@ +From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:31:58 +0200 +Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro + _THROW + +Fixes compilation with musl libc + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/ethernetdb.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/ethernetdb.h b/include/ethernetdb.h +index 46d8bfd..1683abe 100644 +--- a/include/ethernetdb.h ++++ b/include/ethernetdb.h +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch new file mode 100644 index 0000000..248582c --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch @@ -0,0 +1,48 @@ +From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alin=20N=C4=83stac?= +Date: Thu, 22 Oct 2015 16:41:03 +0200 +Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined + chains + +During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if +they're called from a base chain rather than a user defined chain. + +This can be used by ebtables targets that can encode a special return +value to bail out if e.g. RETURN is used from a base chain. + +Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also +copied to called user-defined-chains (i.e., a user defined chain can no +longer be distinguished from a base chain): + +root at OpenWrt:~# ebtables -N foo +root at OpenWrt:~# ebtables -A OUTPUT -j foo +root at OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN +--mark-target RETURN not allowed on base chain. + +This works if -A OUTPUT -j foo is omitted, but will still appear +if we try to call foo from OUTPUT afterwards. + +After this patch we still reject +'-A OUTPUT -j mark .. --mark-target RETURN'. + +Signed-off-by: Florian Westphal +--- + libebtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libebtc.c b/libebtc.c +index 17ba8f2..74830ec 100644 +--- a/libebtc.c ++++ b/libebtc.c +@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) + /* check if we've dealt with this chain already */ + if (entries2->hook_mask & (1<hook_mask |= entries->hook_mask; ++ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); + /* Jump to the chain, make sure we know how to get back */ + stack[sp].chain_nr = chain_nr; + stack[sp].n = j; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch new file mode 100644 index 0000000..a6ef9cd --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,216 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj +--- + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + include/linux/if_ether.h | 126 ---------------------------------------------- + useful_functions.c | 4 +- + 5 files changed, 5 insertions(+), 131 deletions(-) + delete mode 100644 include/linux/if_ether.h + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index f97d07e..b096847 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index c3757f3..c5102a4 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index e6afbf8..8d318d1 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h +deleted file mode 100644 +index 28a15ff..0000000 +--- a/include/linux/if_ether.h ++++ /dev/null +@@ -1,126 +0,0 @@ +-/* +- * INET An implementation of the TCP/IP protocol suite for the LINUX +- * operating system. INET is implemented using the BSD Socket +- * interface as the means of communication with the user level. +- * +- * Global definitions for the Ethernet IEEE 802.3 interface. +- * +- * Version: @(#)if_ether.h 1.0.1a 02/08/94 +- * +- * Author: Fred N. van Kempen, +- * Donald Becker, +- * Alan Cox, +- * Steve Whitehouse, +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. +- */ +- +-#ifndef _LINUX_IF_ETHER_H +-#define _LINUX_IF_ETHER_H +- +-#include +- +-/* +- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +- * and FCS/CRC (frame check sequence). +- */ +- +-#define ETH_ALEN 6 /* Octets in one ethernet addr */ +-#define ETH_HLEN 14 /* Total octets in header. */ +-#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ +-#define ETH_DATA_LEN 1500 /* Max. octets in payload */ +-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +-#define ETH_FCS_LEN 4 /* Octets in the FCS */ +- +-/* +- * These are the defined Ethernet Protocol ID's. +- */ +- +-#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ +-#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ +-#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ +-#define ETH_P_IP 0x0800 /* Internet Protocol packet */ +-#define ETH_P_X25 0x0805 /* CCITT X.25 */ +-#define ETH_P_ARP 0x0806 /* Address Resolution packet */ +-#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ +-#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ +-#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ +-#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ +-#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ +-#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ +-#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ +-#define ETH_P_LAT 0x6004 /* DEC LAT */ +-#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ +-#define ETH_P_CUST 0x6006 /* DEC Customer use */ +-#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ +-#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ +-#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ +-#define ETH_P_ATALK 0x809B /* Appletalk DDP */ +-#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ +-#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ +-#define ETH_P_IPX 0x8137 /* IPX over DIX */ +-#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ +-#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ +-#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ +-#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol +- * defined in draft-wilson-wrec-wccp-v2-00.txt */ +-#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ +-#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ +-#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ +-#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ +-#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ +-#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ +-#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport +- * over Ethernet +- */ +-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ +-#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +-#define ETH_P_TIPC 0x88CA /* TIPC */ +-#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ +-#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +-#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ +-#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ +- +-/* +- * Non DIX types. Won't clash for 1500 types. +- */ +- +-#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ +-#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ +-#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ +-#define ETH_P_802_2 0x0004 /* 802.2 frames */ +-#define ETH_P_SNAP 0x0005 /* Internal only */ +-#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ +-#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ +-#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ +-#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ +-#define ETH_P_CAN 0x000C /* Controller Area Network */ +-#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ +-#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ +-#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz at cafe.net) */ +-#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ +-#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ +-#define ETH_P_ECONET 0x0018 /* Acorn Econet */ +-#define ETH_P_HDLC 0x0019 /* HDLC frames */ +-#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ +-#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ +-#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ +-#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +-#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ +-#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ +- +-/* +- * This is an Ethernet frame header. +- */ +- +-struct ethhdr { +- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ +- unsigned char h_source[ETH_ALEN]; /* source ether addr */ +- __be16 h_proto; /* packet type ID field */ +-} __attribute__((packed)); +- +- +-#endif /* _LINUX_IF_ETHER_H */ +diff --git a/useful_functions.c b/useful_functions.c +index d14cbe9..c304f4d 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include + #include + #include +@@ -33,6 +31,8 @@ + #include + #include + #include ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; + const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index f5e2871..375423d 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -18,7 +18,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://ebtables.common \ file://ebtables.service \ file://no-as-needed.patch \ -" + file://0001-add-RARP-and-update-iana-url.patch \ + file://0002-fix-compilation-warning.patch \ + file://0003-add-info-about-Wl-no-as-needed.patch \ + file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ + file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ + file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ + file://0007-extensions-Use-stdint-types.patch \ + file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ + file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ + file://0010-Adjust-header-include-sequence.patch \ + " SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:35 +0000 Subject: [oe-commits] [meta-openembedded] 08/35: libnfnetlink: Backport patches to fix musl build In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.203F8233435@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 762a0744fea58d33c2038d749326e3c2cd78a338 Author: Khem Raj AuthorDate: Sun Mar 26 11:49:42 2017 -0700 libnfnetlink: Backport patches to fix musl build There are few upstream patches that are required for getting it working with musl, backport these patches on top of 1.0.1 Signed-off-by: Khem Raj --- ...0001-build-resolve-automake-1.12-warnings.patch | 28 ++ ...rce-code-license-header-in-sync-with-curr.patch | 49 +++ .../0003-configure-uclinux-is-also-linux.patch | 27 ++ ...k-initialize-attribute-padding-to-resolve.patch | 39 ++ .../0005-include-Sync-with-kernel-headers.patch | 110 ++++++ .../0006-src-Use-stdint-types-everywhere.patch | 403 +++++++++++++++++++++ .../libnfnetlink/libnfnetlink_1.0.1.bb | 9 +- 7 files changed, 664 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch new file mode 100644 index 0000000..00d95cd --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch @@ -0,0 +1,28 @@ +From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 9 Oct 2012 15:59:48 +0200 +Subject: [PATCH 1/6] build: resolve automake-1.12 warnings + +am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries +using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-off-by: Jan Engelhardt +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ed549df..0926a1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([-Wall foreign subdir-objects + tar-pax no-dist-gzip dist-bzip2 1.6]) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + dnl kernel style compile messages + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch new file mode 100644 index 0000000..c2fb5e0 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch @@ -0,0 +1,49 @@ +From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Wed, 7 Aug 2013 20:53:57 +0200 +Subject: [PATCH 2/6] src: get source code license header in sync with current + licensing terms + +Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, +propagate that changes to src/iftable.c and src/rtnl.c + +Reported-by: Thomas Woerner +Signed-off-by: Pablo Neira Ayuso +--- + src/iftable.c | 2 +- + src/rtnl.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iftable.c b/src/iftable.c +index 0325335..5976ed8 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -3,7 +3,7 @@ + * (C) 2004 by Astaro AG, written by Harald Welte + * (C) 2008 by Pablo Neira Ayuso + * +- * This software is Free Software and licensed under GNU GPLv2. ++ * This software is Free Software and licensed under GNU GPLv2+. + */ + + /* IFINDEX handling */ +diff --git a/src/rtnl.c b/src/rtnl.c +index 5ccb272..7b4ac7d 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -1,10 +1,10 @@ + /* rtnl - rtnetlink utility functions + * + * (C) 2004 by Astaro AG, written by Harald Welte +- * ++ * + * Adapted to nfnetlink by Eric Leblond + * +- * This software is free software and licensed under GNU GPLv2. ++ * This software is free software and licensed under GNU GPLv2+. + * + */ + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch new file mode 100644 index 0000000..6cb7ed6 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch @@ -0,0 +1,27 @@ +From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Tue, 10 Sep 2013 16:23:29 -0300 +Subject: [PATCH 3/6] configure: uclinux is also linux + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Pablo Neira Ayuso +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0926a1c..b979772 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DISABLE_STATIC + AM_PROG_LIBTOOL + + case "$host" in +-*-*-linux*) ;; ++*-*-linux* | *-*-uclinux*) ;; + *) AC_MSG_ERROR([Linux only, dude!]);; + esac + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch new file mode 100644 index 0000000..cf3a841 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch @@ -0,0 +1,39 @@ +From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Mon, 3 Feb 2014 12:09:29 +0100 +Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve + valgrind warnings + +==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) +==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) +==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) +==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) +==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) +==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) +==12195== by 0x400CB1: main (nfulnl_test.c:77) +==12195== Address 0x7fefff3e9 is on thread 1's stack + +This patch sets to zero the padding that is included to align the +attribute payload. + +Reported-by: Ivan Homoliak +Signed-off-by: Pablo Neira Ayuso +--- + src/libnfnetlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 4b2bcd0..398b7d7 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + nfa->nfa_type = type; + nfa->nfa_len = len; + memcpy(NFA_DATA(nfa), data, alen); ++ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); + n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); + return 0; + } +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch new file mode 100644 index 0000000..383f0e8 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch @@ -0,0 +1,110 @@ +From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:49:07 +0200 +Subject: [PATCH 5/6] include: Sync with kernel headers + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- + include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- + 2 files changed, 12 insertions(+), 44 deletions(-) + +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..44a38d6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -25,9 +25,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ __u8 nfgen_family; /* AF_xxx */ ++ __u8 version; /* nfnetlink version */ ++ __be16 res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -46,40 +46,8 @@ struct nfgenmsg { + #define NFNL_SUBSYS_CTNETLINK_EXP 2 + #define NFNL_SUBSYS_QUEUE 3 + #define NFNL_SUBSYS_ULOG 4 +-#define NFNL_SUBSYS_COUNT 5 ++#define NFNL_SUBSYS_OSF 5 ++#define NFNL_SUBSYS_IPSET 6 ++#define NFNL_SUBSYS_COUNT 7 + +-#ifdef __KERNEL__ +- +-#include +-#include +-#include +- +-struct nfnl_callback +-{ +- int (*call)(struct sock *nl, struct sk_buff *skb, +- struct nlmsghdr *nlh, struct nlattr *cda[]); +- const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ +-}; +- +-struct nfnetlink_subsystem +-{ +- const char *name; +- __u8 subsys_id; /* nfnetlink subsystem ID */ +- __u8 cb_count; /* number of callbacks */ +- const struct nfnl_callback *cb; /* callback for individual types */ +-}; +- +-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); +-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); +- +-extern int nfnetlink_has_listeners(unsigned int group); +-extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, +- int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); +- +-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ +- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +- +-#endif /* __KERNEL__ */ + #endif /* _NFNETLINK_H */ +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..74b9e55 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -1,6 +1,8 @@ + #ifndef _NFNETLINK_COMPAT_H + #define _NFNETLINK_COMPAT_H +-#ifndef __KERNEL__ ++ ++#include ++ + /* Old nfnetlink macros for userspace */ + + /* nfnetlink groups: Up to 32 maximum */ +@@ -18,10 +20,9 @@ + * ! nfnetlink use the same attributes methods. - J. Schulist. + */ + +-struct nfattr +-{ +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++struct nfattr { ++ __u16 nfa_len; ++ __u16 nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +@@ -57,5 +58,4 @@ struct nfattr + + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) + #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) + +-#endif /* ! __KERNEL__ */ + #endif /* _NFNETLINK_COMPAT_H */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch new file mode 100644 index 0000000..72c9987 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch @@ -0,0 +1,403 @@ +From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:59:57 +0200 +Subject: [PATCH 6/6] src: Use stdint types everywhere + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/libnfnetlink.h | 25 ++++++------- + src/iftable.c | 8 ++--- + src/iftable.h | 4 +-- + src/libnfnetlink.c | 72 ++++++++++++++++++------------------- + src/rtnl.c | 4 +-- + src/rtnl.h | 2 +- + 6 files changed, 58 insertions(+), 57 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include + #include /* for sa_family_t */ + #include + #include +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..157f97b 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -27,10 +27,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..655df6b 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,8 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..df57533 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -72,9 +72,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +86,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + } + + /** +- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr ++ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..284eecd 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -30,7 +30,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..2cb22a8 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -7,7 +7,7 @@ + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb index edd0f86..f7951ff 100644 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb @@ -11,7 +11,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar" +SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ + file://0001-build-resolve-automake-1.12-warnings.patch \ + file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ + file://0003-configure-uclinux-is-also-linux.patch \ + file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ + file://0005-include-Sync-with-kernel-headers.patch \ + file://0006-src-Use-stdint-types-everywhere.patch \ + " SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:38 +0000 Subject: [oe-commits] [meta-openembedded] 11/35: openl2tp: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.3C4C923343A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2eab70793c219ac25225f4237c48cc7fb13d6135 Author: Khem Raj AuthorDate: Tue Mar 28 18:44:44 2017 -0700 openl2tp: Fix build with musl Signed-off-by: Khem Raj --- .../openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch | 29 +++++++++++++++++ .../0001-l2tp_api-Included-needed-headers.patch | 34 ++++++++++++++++++++ ...02-cli-include-fcntl.h-for-O_CREAT-define.patch | 25 +++++++++++++++ .../openl2tp/0002-user-ipv6-structures.patch | 33 ++++++++++++++++++++ ...fine-_GNU_SOURCE-for-getting-sighandler_t.patch | 35 +++++++++++++++++++++ ...linux-kernel-headers-assumptions-on-glibc.patch | 36 ++++++++++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 17 +++++++++- 7 files changed, 208 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch new file mode 100644 index 0000000..d1ee3c5 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -0,0 +1,29 @@ +From 1f8d336a5cd88b87e15596d05980f6fe77a0f226 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:28:41 -0700 +Subject: [PATCH 1/4] Use -1 instead of WAIT_ANY + +WAIT_ANY is not supported by POSIX and some C libraries +e.g. musl do not define this. + +Signed-off-by: Khem Raj +--- + usl/usl_pid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usl/usl_pid.c b/usl/usl_pid.c +index 103458b..9819473 100644 +--- a/usl/usl_pid.c ++++ b/usl/usl_pid.c +@@ -78,7 +78,7 @@ int usl_pid_reap_children(int waitfor) + + /* Wait for processes in our process group. */ + +- while (((pid = waitpid(WAIT_ANY, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { ++ while (((pid = waitpid(-1, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { + have_callback = 0; + usl_list_for_each(walk, tmp, &usl_child_list) { + child = usl_list_entry(walk, struct usl_pid_child, list); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch new file mode 100644 index 0000000..c50f68e --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -0,0 +1,34 @@ +From 25dce20a75bc84ae9e4ec640590cef0c12750789 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 17:48:13 -0700 +Subject: [PATCH 1/2] l2tp_api: Included needed headers + +These are flagged by musl + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index d16f80e..9d6f60a 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -22,9 +22,12 @@ + * Each module implements the required RPC xxx_1_svc() callbacks which + * are called directly by the RPC library. + */ +- ++#define _GNU_SOURCE ++#include ++#include ++#include + #include +-#include ++//#include + + #include "usl.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch new file mode 100644 index 0000000..9df3265 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -0,0 +1,25 @@ +From 2d633f4c18ff3cb52234449fd86a0a63b55d669b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:31:55 -0700 +Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 097ed6a..127136c 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch new file mode 100644 index 0000000..3f8bcaa --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -0,0 +1,33 @@ +From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 18:09:58 -0700 +Subject: [PATCH 2/2] user ipv6 structures + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index 9d6f60a..f0946fd 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -450,10 +450,12 @@ int l2tp_api_rpc_check_request(SVCXPRT *xprt) + * non-loopback interface, reject the request. + */ + if ((!l2tp_opt_remote_rpc) && +- ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && +- (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { ++ ((xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_LOOPBACK)) && ++ (xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_ANY)))) { ++ char straddr[INET6_ADDRSTRLEN]; ++ inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); + if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { +- l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); ++ l2tp_log(LOG_ERR, "Rejecting RPC request from %s", straddr); + } + svcerr_auth(xprt, AUTH_TOOWEAK); + return -EPERM; +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch new file mode 100644 index 0000000..e05be1b --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -0,0 +1,35 @@ +From 74fe72583472bcc3c89a52839cac2ebbad6c8a74 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:34:52 -0700 +Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 127136c..931779b 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -17,7 +17,7 @@ + * Boston, MA 02110-1301 USA + * + *****************************************************************************/ +- ++#define _GNU_SOURCE + #include + #include + #include +@@ -634,7 +634,7 @@ static void cli_rl_uninstall_signal_handlers(void) + + static int cli_rl_install_signal_handlers(void) + { +- __sighandler_t handler; ++ sighandler_t handler; + + rl_catch_signals = 0; + rl_clear_signals(); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch new file mode 100644 index 0000000..0fcba65 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch @@ -0,0 +1,36 @@ +From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:46:56 -0700 +Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc + +Fixes build issues e.g. + +In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: +/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier + IFF_LOWER_UP = 1<<16, /* __volatile__ */ + ^ + +Signed-off-by: Khem Raj +--- + plugins/ppp_unix.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c +index 869066f..5c1e44f 100644 +--- a/plugins/ppp_unix.c ++++ b/plugins/ppp_unix.c +@@ -21,6 +21,11 @@ + * Plugin to use the standard UNIX pppd + */ + ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 67118d8..e1670b3 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -16,14 +16,28 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + file://0001-Use-1-instead-of-WAIT_ANY.patch \ + file://0002-cli-include-fcntl.h-for-O_CREAT-define.patch \ + file://0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch \ + file://0001-l2tp_api-Included-needed-headers.patch \ + " + +SRC_URI_append_libc-musl = "\ + file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://0002-user-ipv6-structures.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig +DEPENDS_append_libc-musl = " libtirpc" +CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ @@ -34,5 +48,6 @@ do_compile_prepend() { -e 's:$(CROSS_COMPILE)nm:${NM}:g' \ -e 's:$(CROSS_COMPILE)strip:${STRIP}:g' \ -e 's:$(CROSS_COMPILE)install:install:g' \ + -e 's:CPPFLAGS-y:CPPFLAGS:g' \ ${S}/Makefile } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:32 +0000 Subject: [oe-commits] [meta-openembedded] 05/35: ntp: update to 4.2.8.p10 In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183527.F32F9233430@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6e2d3186c347056d774d83f619698e7f9a4a5199 Author: Armin Kuster AuthorDate: Fri Mar 24 09:22:55 2017 -0700 ntp: update to 4.2.8.p10 LICENSE_FILE md5 changed do to copyright date change. NTF's NTP Project is releasing ntp-4.2.8p10, which addresses: 6 MEDIUM severity vulnerabilities (1 is about the Windows PPSAPI DLL) 5 LOW severity vulnerabilities (2 are in the Windows Installer) 4 Informational-level vulnerabilities 15 other non-security fixes and improvements All of the security issues in this release are listed in VU#633849. ntp-4.2.8p10 was released on 21 March 2017. Sec 3389 / CVE-2017-6464 / VU#325339: NTP-01-016 NTP: Denial of Service via Malformed Config (Pentest report 01.2017) Sec 3388 / CVE-2017-6462 / VU#325339: NTP-01-014 NTP: Buffer Overflow in DPTS Clock (Pentest report 01.2017) Sec 3387 / CVE-2017-6463 / VU#325339: NTP-01-012 NTP: Authenticated DoS via Malicious Config Option (Pentest report 01.2017) Sec 3386: NTP-01-011 NTP: ntpq_stripquotes() returns incorrect Value (Pentest report 01.2017) Sec 3385: NTP-01-010 NTP: ereallocarray()/eallocarray() underused (Pentest report 01.2017) Sec 3384 / CVE-2017-6455 / VU#325339: NTP-01-009 NTP: Windows: Privileged execution of User Library code (Pentest report 01.2017) Sec 3383 / CVE-2017-6452 / VU#325339: NTP-01-008 NTP: Windows Installer: Stack Buffer Overflow from Command Line (Pentest report 01.2017) Sec 3382 / CVE-2017-6459 / VU#325339: NTP-01-007 NTP: Windows Installer: Data Structure terminated insufficiently (Pentest report 01.2017) Sec 3381: NTP-01-006 NTP: Copious amounts of Unused Code (Pentest report 01.2017) Sec 3380: NTP-01-005 NTP: Off-by-one in Oncore GPS Receiver (Pentest report 01.2017) Sec 3379 / CVE-2017-6458 / VU#325339: NTP-01-004 NTP: Potential Overflows in ctl_put() functions (Pentest report 01.2017) Sec 3378 / CVE-2017-6451 / VU#325339: NTP-01-003 Improper use of snprintf() in mx4200_send() (Pentest report 01.2017) Sec 3377 / CVE-2017-6460 / VU#325339: NTP-01-002 Buffer Overflow in ntpq when fetching reslist (Pentest report 01.2017) Sec 3376: NTP-01-001 Makefile does not enforce Security Flags (Pentest report 01.2017) Sec 3361 / CVE-2016-9042 / VU#325339: 0rigin Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa --- .../recipes-support/ntp/{ntp_4.2.8p9.bb => ntp_4.2.8p10.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb similarity index 96% rename from meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb rename to meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb index 58b31c5..719c60b 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003" DEPENDS = "libevent" @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "857452b05f5f2e033786f77ade1974ed" -SRC_URI[sha256sum] = "b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72" +SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" +SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" inherit autotools update-rc.d useradd systemd pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:41 +0000 Subject: [oe-commits] [meta-openembedded] 14/35: dibbler: Upgrade to 1.0.2RC1 In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.51471233440@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit ddcdd8c89210a7524bb87297dd933795ef3d759f Author: Khem Raj AuthorDate: Wed Mar 29 15:36:19 2017 -0700 dibbler: Upgrade to 1.0.2RC1 Delete dibbler from meta-oe Signed-off-by: Khem Raj --- .../dibbler/dibbler_fix_getSize_crash.patch | 56 ++++--------- .../dibbler/dibbler/types.patch | 96 ---------------------- .../dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} | 16 ++-- .../recipes-connectivity/dibbler/dibbler_1.0.1.bb | 40 --------- 4 files changed, 24 insertions(+), 184 deletions(-) diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index adb249f..42d2627 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,32 +1,8 @@ -diff --git a/ClntMessages/ClntMsg.cpp b/ClntMessages/ClntMsg.cpp -index eeaadd0..0cf5dce 100644 ---- a/ClntMessages/ClntMsg.cpp -+++ b/ClntMessages/ClntMsg.cpp -@@ -346,7 +346,9 @@ unsigned long TClntMsg::getTimeout() - - void TClntMsg::send() - { -- char* pkt = new char[getSize()]; -+ size_t size = getSize(); -+ char* pkt = new char[size]; -+ memset(pkt, 0, size); - - srand((uint32_t)time(NULL)); - if (!RC) -@@ -364,7 +366,7 @@ void TClntMsg::send() - - RC++; - -- this->storeSelf(pkt); -+ storeSelf(pkt); - - SPtr ptrIface = ClntIfaceMgr().getIfaceByID(Iface); - if (!ptrIface) { -diff --git a/ClntMessages/ClntMsgRequest.cpp b/ClntMessages/ClntMsgRequest.cpp -index 4a7b5da..f3e40fd 100644 ---- a/ClntMessages/ClntMsgRequest.cpp -+++ b/ClntMessages/ClntMsgRequest.cpp -@@ -143,7 +143,10 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, +Index: git/ClntMessages/ClntMsgRequest.cpp +=================================================================== +--- git.orig/ClntMessages/ClntMsgRequest.cpp ++++ git/ClntMessages/ClntMsgRequest.cpp +@@ -142,7 +142,10 @@ TClntMsgRequest::TClntMsgRequest(List(TA IsDone=false; SPtr ptr; ptr = new TOptDUID(OPTION_CLIENTID, ClntCfgMgr().getDUID(), this ); @@ -38,8 +14,8 @@ index 4a7b5da..f3e40fd 100644 if (!srvDUID) { Log(Error) << "Unable to send REQUEST: ServerId not specified.\n" << LogEnd; -@@ -154,7 +157,9 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, - ptr = (Ptr*) new TOptDUID(OPTION_SERVERID, srvDUID,this); +@@ -153,7 +156,9 @@ TClntMsgRequest::TClntMsgRequest(List(TA + ptr = new TOptDUID(OPTION_SERVERID, srvDUID,this); // all IAs provided by checkSolicit SPtr ClntAddrIA; - Options.push_back( ptr ); @@ -49,21 +25,21 @@ index 4a7b5da..f3e40fd 100644 IAs.first(); while (ClntAddrIA = IAs.get()) -diff --git a/Messages/Msg.cpp b/Messages/Msg.cpp -index baa6c86..6eef6c7 100644 ---- a/Messages/Msg.cpp -+++ b/Messages/Msg.cpp -@@ -66,10 +66,15 @@ int TMsg::getSize() +Index: git/Messages/Msg.cpp +=================================================================== +--- git.orig/Messages/Msg.cpp ++++ git/Messages/Msg.cpp +@@ -69,10 +69,15 @@ int TMsg::getSize() { int pktsize=0; TOptList::iterator opt; -+ int optionCount = 0; ++ int optionCount = 0; for (opt = Options.begin(); opt!=Options.end(); ++opt) { - pktsize += (*opt)->getSize(); -+ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; -+ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; -+ pktsize += (*opt)->getSize(); ++ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; ++ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; ++ pktsize += (*opt)->getSize(); } + Log(Info) << "### CPE Debug - Packet size of option (Add 4) " << pktsize << LogEnd ; + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch deleted file mode 100644 index 28f18ef..0000000 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch +++ /dev/null @@ -1,96 +0,0 @@ -Apply fixes to build on musl - -Signed-off-by: Khem Raj - - -Index: dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/IfaceMgr.cpp -+++ dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include "Portable.h" - #include "IfaceMgr.h" - #include "Iface.h" -Index: dibbler-1.0.1/IfaceMgr/SocketIPv6.h -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/SocketIPv6.h -+++ dibbler-1.0.1/IfaceMgr/SocketIPv6.h -@@ -18,6 +18,7 @@ class TIfaceSocket; - - #include - #include -+#include - - #include "Portable.h" - #include "DHCPConst.h" -Index: dibbler-1.0.1/Port-linux/ethtool-local.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/ethtool-local.h -+++ dibbler-1.0.1/Port-linux/ethtool-local.h -@@ -22,9 +22,9 @@ - */ - - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; - - #include "ethtool-kernel.h" - -Index: dibbler-1.0.1/Port-linux/interface.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/interface.c -+++ dibbler-1.0.1/Port-linux/interface.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -35,13 +36,10 @@ - #include - #include - --#include - - #include "ethtool-local.h" - #include "interface.h" - #include --#include --#include - - void daemon_log(int loglevel, const char *fmt,...) - { -Index: dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/lowlevel-linux-link-state.c -+++ dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - #include "Portable.h" - #include "interface.h" - -Index: dibbler-1.0.1/Port-linux/utils.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/utils.h -+++ dibbler-1.0.1/Port-linux/utils.h -@@ -4,6 +4,7 @@ - #include - //#include - #include -+#include - - #include "libnetlink.h" - #include "ll_map.h" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb similarity index 77% rename from meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb rename to meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 1913d3a..8890e14 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -5,12 +5,14 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${BP}.tar.gz \ - file://dibbler_fix_getSize_crash.patch \ - file://types.patch \ -" -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" +SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" + +SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ + file://dibbler_fix_getSize_crash.patch \ + " +PV = "1.0.1+1.0.2RC1+git${SRCREV}" + +S = "${WORKDIR}/git" PACKAGECONFIG ??= "debug bind-reuse resolvconf dns-update" @@ -27,8 +29,6 @@ inherit autotools DEPENDS += "flex-native" -CFLAGS += "-D_GNU_SOURCE" - PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" FILES_${PN}-client = "${sbindir}/${PN}-client" diff --git a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb deleted file mode 100644 index 41bb78f..0000000 --- a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A portable DHCPv6 implementation" -DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful \ -(i.e. IPv6 address granting and IPv6 prefix delegation) as well as stateless (i.e. \ -option granting) autoconfiguration for IPv6." -HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3 \ - file://bison++/COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://klub.com.pl/dhcpv6/dibbler/dibbler-${PV}.tar.gz" - -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" - -inherit autotools - -PACKAGECONFIG ?= "auth bind-reuse dns-update dst-addr-filter link-state" - -PACKAGECONFIG[auth] = "--enable-auth,--disable-auth" -PACKAGECONFIG[bind-reuse] = "--enable-bind-reuse,--disable-bind-reuse" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[dns-update] = "--enable-dns-update,--disable-dns-update" -PACKAGECONFIG[dst-addr-filter] = "--enable-dst-addr-filter,--disable-dst-addr-filter" -PACKAGECONFIG[link-state] = "--enable-link-state,--disable-link-state" -PACKAGECONFIG[remote-autoconf] = "--enable-remote-autoconf,--disable-remote-autoconf" -PACKAGECONFIG[resolvconf] = "--enable-resolvconf,--disable-resolvconf" - -EXTRA_OECONF += " \ - --disable-efence \ - --with-gtest=no \ -" - -PACKAGES =+ "${PN}-client ${PN}-relay ${PN}-requestor ${PN}-server" - -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:37 +0000 Subject: [oe-commits] [meta-openembedded] 10/35: lowpan-tools: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.302CE233438@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 768c92085f48f1eb820d3568ad838fcb88597da5 Author: Khem Raj AuthorDate: Mon Mar 27 17:59:24 2017 -0700 lowpan-tools: Fix build with musl Signed-off-by: Khem Raj --- ...d-config-parse.y-add-missing-time.h-inclu.patch | 44 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch new file mode 100644 index 0000000..0a81a22 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -0,0 +1,44 @@ +From ab725a3faaeead90ae3c63cbcd370af087c413a5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Mar 2017 17:55:06 -0700 +Subject: [PATCH] addrdb/coord-config-parse.y: add missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The %union definition uses the time_t structure. In order to use this +structure, the header has to be included. Otherwise, the build +breaks with some C libraries, such as musl: + +In file included from coord-config-lex.l:23:0: +coord-config-parse.y:107:2: error: unknown type name ?time_t? + time_t timestamp; + ^ + +This patch includes using the '%code requires' directive of +Yacc. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Khem Raj +--- + addrdb/coord-config-parse.y | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y +index 2e10a88..85ee058 100644 +--- a/addrdb/coord-config-parse.y ++++ b/addrdb/coord-config-parse.y +@@ -102,6 +102,10 @@ + + %} + ++%code requires { ++#include ++} ++ + %union { + unsigned long number; + time_t timestamp; +-- +2.12.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 8c7dbc0..139eb78 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -11,6 +11,7 @@ PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ + file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:40 +0000 Subject: [oe-commits] [meta-openembedded] 13/35: vsftpd: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.4AA6223343E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 4affd6a6446fd24ae43e6efb4a409ca12d7d925f Author: Khem Raj AuthorDate: Tue Mar 28 20:11:06 2017 -0700 vsftpd: Fix build with musl Signed-off-by: Khem Raj --- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 28 ++++++++++++++++++++++ .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 7 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch new file mode 100644 index 0000000..c3919e1 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -0,0 +1,28 @@ +From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 20:09:12 -0700 +Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx + +Signed-off-by: Khem Raj +--- + sysdeputil.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sysdeputil.c b/sysdeputil.c +index 06f01f4..a8cff3b 100644 +--- a/sysdeputil.c ++++ b/sysdeputil.c +@@ -58,7 +58,9 @@ + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL + #define VSF_SYSDEP_HAVE_LIBCAP +-#define VSF_SYSDEP_HAVE_UTMPX ++#if defined(__GLIBC__) ++ #define VSF_SYSDEP_HAVE_UTMPX ++#endif + + #define __USE_GNU + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 3eaaa30..e524614 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -19,7 +19,10 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ -" + ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ + file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + " LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ @@ -30,13 +33,11 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:39 +0000 Subject: [oe-commits] [meta-openembedded] 12/35: rp-pppoe: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.434EE23343C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d572db6dbcb1c34d8bc5afa24911ed16f463e17b Author: Khem Raj AuthorDate: Tue Mar 28 19:30:16 2017 -0700 rp-pppoe: Fix build with musl Signed-off-by: Khem Raj --- .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 30 ++++++++++++++++++++++ ...0002-Enable-support-for-the-kernel-module.patch | 25 ++++++++++++++++++ .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 5 +++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch new file mode 100644 index 0000000..11356ce --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -0,0 +1,30 @@ +From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:20:07 -0700 +Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h + +Fixes build with musl + +Signed-off-by: Khem Raj +--- + src/pppoe.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/pppoe.h b/src/pppoe.h +index ec067a0..281879c 100644 +--- a/src/pppoe.h ++++ b/src/pppoe.h +@@ -127,10 +127,6 @@ typedef unsigned long UINT32_t; + #error Could not find a 32-bit integer type + #endif + +-#ifdef HAVE_LINUX_IF_ETHER_H +-#include +-#endif +- + #include + + #ifdef HAVE_NETINET_IF_ETHER_H +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch new file mode 100644 index 0000000..139d1f0 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch @@ -0,0 +1,25 @@ +From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:24:53 -0700 +Subject: [PATCH 2/2] Enable support for the kernel module + +Signed-off-by: Khem Raj +--- + src/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/configure.in b/src/configure.in +index cae0976..951a042 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -33,6 +33,7 @@ AC_CHECK_HEADERS(linux/if_pppox.h, [], [], + #include + #include + #include ++#include + ]) + + dnl Checks for typedefs, structures, and compiler characteristics. +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb index e1ca17f..fbe015f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -17,7 +17,10 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ file://pppoe-server.default \ file://pppoe-server.init \ file://configure.in-Error-fix.patch \ - file://pppoe-server.service" + file://pppoe-server.service \ + file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ + file://0002-Enable-support-for-the-kernel-module.patch \ + " SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:33 +0000 Subject: [oe-commits] [meta-openembedded] 06/35: netcat-openbsd: Fix build and whitelist In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.0ADB1233432@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1a01884f8d8885b6babb3ca07a932f051f64d0d1 Author: Khem Raj AuthorDate: Tue Mar 21 10:03:08 2017 -0700 netcat-openbsd: Fix build and whitelist pkgconfig is used so we need to inherit pkgconfig secondly, base64 support is added for it to work with musl Signed-off-by: Khem Raj --- ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 20 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- 3 files changed, 395 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file mode 100644 index 0000000..0966b65 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 11:30:49 -0700 +Subject: [PATCH] bundle own base64 encode/decode functions + +Not all libc implementations provide it. +as an aside libresolv is no longer needed + +Signed-off-by: Khem Raj +--- + Makefile | 4 +- + base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + netcat.c | 2 + + socks.c | 3 + + 4 files changed, 320 insertions(+), 2 deletions(-) + create mode 100644 base64.c + +Index: netcat-openbsd-1.105/Makefile +=================================================================== +--- netcat-openbsd-1.105.orig/Makefile ++++ netcat-openbsd-1.105/Makefile +@@ -1,9 +1,9 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c base64.c + +-LIBS= `pkg-config --libs libbsd` -lresolv ++LIBS= `pkg-config --libs libbsd` + OBJS= $(SRCS:.c=.o) + CFLAGS= -g -O2 + LDFLAGS= -Wl,--no-add-needed +Index: netcat-openbsd-1.105/base64.c +=================================================================== +--- /dev/null ++++ netcat-openbsd-1.105/base64.c +@@ -0,0 +1,313 @@ ++/* ++ * Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#if !defined(LINT) && !defined(CODECENTER) ++static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; ++#endif /* not lint */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define Assert(Cond) if (!(Cond)) abort() ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ size_t i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ Assert(output[3] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++//libresolv_hidden_def (b64_ntop) ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(char const *src, u_char *target, size_t targsize) { ++ int tarindex, state, ch; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = *src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ target[tarindex+1] = ((pos - Base64) & 0x0f) ++ << 4 ; ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ target[tarindex+1] = ((pos - Base64) & 0x03) ++ << 6; ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ default: ++ abort(); ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = *src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = *src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +Index: netcat-openbsd-1.105/netcat.c +=================================================================== +--- netcat-openbsd-1.105.orig/netcat.c ++++ netcat-openbsd-1.105/netcat.c +@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, + socklen_t salen, int ctimeout); + static void quit(); + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int + main(int argc, char *argv[]) + { +Index: netcat-openbsd-1.105/socks.c +=================================================================== +--- netcat-openbsd-1.105.orig/socks.c ++++ netcat-openbsd-1.105/socks.c +@@ -53,6 +53,9 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int remote_connect(const char *, const char *, struct addrinfo); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index e0a0328..76a32a5 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -2,12 +2,15 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch" + ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${PN}-${PV} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" @@ -16,8 +19,6 @@ SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a inherit pkgconfig -S = "${WORKDIR}/${BPN}-${PV}" - EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" do_configure[noexec] = "1" @@ -25,9 +26,18 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} quilt pop -a || true - QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat } +do_unpack[cleandirs] += "${S}" + python do_patch() { bb.build.exec_func('netcat_do_patch', d) bb.build.exec_func('patch_do_patch', d) diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 91a24a1..1544164 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -9,7 +9,7 @@ connection you would need and has several interesting built-in \ capabilities." SECTION = "net" -inherit update-alternatives gettext +inherit update-alternatives gettext pkgconfig ALTERNATIVE_${PN} = "nc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:42 +0000 Subject: [oe-commits] [meta-openembedded] 15/35: vpnc: Update to build from github SRC_URI In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.601E0233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit c8547c19cccf9df16ac1dee759e51d9b0d8a27d3 Author: Khem Raj AuthorDate: Thu Mar 30 00:13:12 2017 -0700 vpnc: Update to build from github SRC_URI Fix build for musl add packageconfig for crypto selection Fix build with externalsrc Signed-off-by: Khem Raj --- .../0001-search-for-log-help-in-build-dir.patch | 26 +++++++++ ... 0002-Fix-vpnc-install-for-cross-compile.patch} | 20 ++++++- ...003-error.h-is-specific-to-glibc-on-linux.patch | 30 ++++++++++ ...Use-pkgconfig-instead-of-libgcrypt-config.patch | 30 ++++++++++ ...ude-sys-ttydefaults.h-for-CEOT-definition.patch | 30 ++++++++++ ...header-include-sequence-to-adjust-for-mus.patch | 40 +++++++++++++ ...error-API-when-error.h-is-not-on-platform.patch | 66 ++++++++++++++++++++++ ...0008-include-sysdep.h-before-net-if_tun.h.patch | 36 ++++++++++++ .../recipes-connectivity/vpnc/vpnc/makeman.patch | 11 ---- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 41 +++++++++----- 10 files changed, 302 insertions(+), 28 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch new file mode 100644 index 0000000..184c794 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -0,0 +1,26 @@ +From 48e16e9ae7d8e4c42282bd82cbbd9a6d346a5c00 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 1/8] search for log-help in build dir + +Signed-off-by: Khem Raj +--- + makeman.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makeman.pl b/makeman.pl +index cf241a1..2d73432 100755 +--- a/makeman.pl ++++ b/makeman.pl +@@ -30,7 +30,7 @@ my $vpnc = './vpnc'; + # indenting lists (those originally starting with an asterisk). I hope + # this pays off when converting the manpage to HTML or such. + +-open my $LONGHELP, '-|', "$vpnc --long-help"; ++open my $LONGHELP, '-|', "cat ./long-help"; + my $vpnc_options = ''; + my $relative_indent = 0; + my $indent_needed = 0; +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch similarity index 73% rename from meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch rename to meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 3de65ec..6f00d3b 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -1,6 +1,17 @@ ---- a/Makefile~ 2009-01-20 18:44:30.000000000 +0100 -+++ b/Makefile 2009-01-20 18:44:30.000000000 +0100 -@@ -119,21 +119,21 @@ +From d565b4a5e0045f1e40e0e462920ed5b8faca9eec Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 2/8] Fix vpnc install for cross compile + +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 69f5aca..a15782e 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,21 +133,21 @@ install-common: all else \ install vpnc-script $(DESTDIR)$(ETCDIR); \ fi @@ -33,3 +44,6 @@ uninstall : rm -f $(DESTDIR)$(SBINDIR)/vpnc \ +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch new file mode 100644 index 0000000..bb77306 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -0,0 +1,30 @@ +From 6b49020893f999df56392b49b1a289cb96a113a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:08:17 -0700 +Subject: [PATCH 3/8] error.h is specific to glibc on linux + +Signed-off-by: Khem Raj +--- + sysdep.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 137bf6d..6a323f0 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -37,9 +37,10 @@ int tun_read(int fd, unsigned char *buf, int len); + int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + + /***************************************************************************/ +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__linux__) ++#if defined(__GLIBC__) + #include +- ++#endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 + #define HAVE_ERROR 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch new file mode 100644 index 0000000..f70a138 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -0,0 +1,30 @@ +From 4d1dd61c04f52a7c796debbdea5fc9139ffa271d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:45:05 -0700 +Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a15782e..b537046 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,10 +63,10 @@ RELEASE_VERSION := $(shell cat VERSION) + CC ?= gcc + CFLAGS ?= -O3 -g + CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings +-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) ++CFLAGS += $(shell pkg-config libgcrypt --cflags) $(CRYPTO_CFLAGS) + CPPFLAGS += -DVERSION=\"$(VERSION)\" + LDFLAGS ?= -g +-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) ++LIBS += $(shell pkg-config libgcrypt --libs) $(CRYPTO_LDADD) + + ifeq ($(shell uname -s), SunOS) + LIBS += -lnsl -lresolv -lsocket +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch new file mode 100644 index 0000000..01783f4 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -0,0 +1,30 @@ +From 1947ea776dc38c3377702dd89bd229670f4d948d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:06:52 -0700 +Subject: [PATCH 5/8] include sys/ttydefaults.h for CEOT definition + +Fixes + +config.c:146:25: error: use of undeclared identifier 'CEOT' + if (llen == 0 && c == CEOT) + +Signed-off-by: Khem Raj +--- + config.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.c b/config.c +index 804faa7..1883d12 100644 +--- a/config.c ++++ b/config.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch new file mode 100644 index 0000000..fa89df2 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -0,0 +1,40 @@ +From 56768fc0c2cbd6abcf28c9805ab516db8a0548d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:09:47 -0700 +Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl + +--- + sysdep.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 6a323f0..0122b95 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -17,16 +17,20 @@ + * __SKYOS__ + * + */ ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + #include + #include +-#include + + #if !defined(__CYGWIN__) +-#include +-#include ++//#include ++//#include + #include + #endif ++#include + + #include "config.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch new file mode 100644 index 0000000..de67b47 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -0,0 +1,66 @@ +From b6a027fe4da6f66552b533f1314e5005b16c5455 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:52:36 -0700 +Subject: [PATCH 7/8] add error() API when error.h is not on platform + +sign-off-by: Khem Raj +--- + sysdep.c | 24 ++++++++++++++++++++++++ + sysdep.h | 2 ++ + 2 files changed, 26 insertions(+) + +diff --git a/sysdep.c b/sysdep.c +index d8f181d..2518ec1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -17,6 +17,7 @@ + GNU General Public License for more details. + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -794,3 +795,26 @@ int setenv(const char *name, const char *value, int overwrite) + return ret; + } + #endif ++ ++#ifndef _ERROR_H_ ++#define _ERROR_H_ ++#include ++#include ++#include ++ ++void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ ++ fflush(stdout); ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ":%d", errnum); ++ if (status) ++ exit(status); ++} ++#endif /* _ERROR_H_ */ ++ +diff --git a/sysdep.h b/sysdep.h +index 0122b95..4e60064 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -44,6 +44,8 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + #if defined(__linux__) + #if defined(__GLIBC__) + #include ++#else ++void error(int status, int errnum, const char* format, ...); + #endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch new file mode 100644 index 0000000..62ffdb7 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -0,0 +1,36 @@ +From 7f01847d14a1a3af50f49499743b0551ddef1311 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:54:01 -0700 +Subject: [PATCH 8/8] include sysdep.h before net/if_tun.h + +Fixes duplicate defines in header errors + +Signed-off-by: Khem Raj +--- + sysdep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdep.c b/sysdep.c +index 2518ec1..5624ef1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -57,6 +57,8 @@ + #include + #endif + ++#include "sysdep.h" ++ + #if defined(__DragonFly__) + #include + #elif defined(__linux__) +@@ -69,7 +71,6 @@ + #include + #endif + +-#include "sysdep.h" + + #if !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || !defined(HAVE_ERROR) + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch deleted file mode 100644 index f394e6a..0000000 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vpnc-0.5.1/makeman.pl.old 2008-03-16 02:17:59.000000000 -0500 -+++ vpnc-0.5.1/makeman.pl 2008-03-16 02:29:34.000000000 -0500 -@@ -29,7 +29,7 @@ my $vpnc = './vpnc'; - # indenting lists (those originally starting with an asterisk). I hope - # this pays off when converting the manpage to HTML or such. - --open my $LONGHELP, '-|', "$vpnc --long-help"; -+open my $LONGHELP, '-|', "cat ../long-help"; - my $vpnc_options = ''; - my $relative_indent = 0; - my $indent_needed = 0; diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 1aff045..6f92acd 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -4,17 +4,39 @@ AUTHOR = "Maurice Massar vpnc at unix-ag.uni-kl.de" SECTION = "net" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" -DEPENDS = "libgcrypt" -inherit perlnative +DEPENDS += "libgcrypt" -EXTRA_OEMAKE = "-e MAKEFLAGS=" -CFLAGS_append = ' -DVERSION=\\"${PV}\\"' -LDFLAGS_append = " -lgcrypt -lgpg-error" +PV .= "r550-2jnpr1" +SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" +SRC_URI = "git://github.com/ndpgroup/vpnc \ + file://long-help \ + file://default.conf \ + file://0001-search-for-log-help-in-build-dir.patch \ + file://0002-Fix-vpnc-install-for-cross-compile.patch \ + file://0003-error.h-is-specific-to-glibc-on-linux.patch \ + file://0004-Use-pkgconfig-instead-of-libgcrypt-config.patch \ + file://0005-include-sys-ttydefaults.h-for-CEOT-definition.patch \ + file://0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch \ + file://0007-add-error-API-when-error.h-is-not-on-platform.patch \ + file://0008-include-sysdep.h-before-net-if_tun.h.patch \ + " + +PACKAGECONFIG ?= "gnutls" + +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[openssl] = ",,openssl" + +S = "${WORKDIR}/git" + +inherit perlnative pkgconfig + +#EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure_append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl + cp ${WORKDIR}/long-help ${S} } do_install () { @@ -34,12 +56,3 @@ vpnc_sysroot_preprocess () { CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" RDEPENDS_${PN} = "perl-module-io-file" RRECOMMENDS_${PN} = "kernel-module-tun" - -SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \ - file://makeman.patch \ - file://vpnc-install.patch \ - file://long-help \ - file://default.conf" - -SRC_URI[md5sum] = "4378f9551d5b077e1770bbe09995afb3" -SRC_URI[sha256sum] = "46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:47 +0000 Subject: [oe-commits] [meta-openembedded] 20/35: snort: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.9C2DB23342A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 7406a3f77b3c4e681c131eb03a88bfed232286d5 Author: Khem Raj AuthorDate: Thu Mar 30 14:53:59 2017 -0700 snort: Fix build with musl Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index c62a8d3..57a04f2 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -5,6 +5,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux" +DEPENDS_append_libc-musl = " libtirpc" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -46,6 +47,9 @@ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + do_install_append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:45 +0000 Subject: [oe-commits] [meta-openembedded] 18/35: libnetfilter-log: Switch to git URI In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.88030233428@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9debde5e94a35964c334deaef2db9e3cd1b4a61b Author: Khem Raj AuthorDate: Thu Mar 30 13:13:20 2017 -0700 libnetfilter-log: Switch to git URI Move to tip of tree which has needed fixes for musl build add missing dependency on libmnl Signed-off-by: Khem Raj --- .../recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb index 30c9ae6..2f627d4 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libnfnetlink" +DEPENDS = "libnfnetlink libmnl" +SRCREV = "ba196a97e810746e5660fe3f57c87c0ed0f2b324" +PV .= "+git${SRCPV}" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "2a4bb0654ae675a52d2e8d1c06090b94" -SRC_URI[tar.sha256sum] = "74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21" +SRC_URI = "git://git.netfilter.org/libnetfilter_log" -S = "${WORKDIR}/libnetfilter_log-${PV}" +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:51 +0000 Subject: [oe-commits] [meta-openembedded] 24/35: ttf-inconsolata: Move copying of .otf to .ttf into do_compile In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.C4D4223344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit cb5f9fbbd6780011ab2c03b173800d6771d90961 Author: Khem Raj AuthorDate: Mon Mar 27 18:59:49 2017 -0700 ttf-inconsolata: Move copying of .otf to .ttf into do_compile Fixes errors like | mv: cannot stat '/mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf': No such file or directory | WARNING: /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/temp/run.do_configure.2485:1 exit 1 from 'mv /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/Inconsolata.otf /mnt/b/build/tmp-musl/work/all-oe-linux/ttf-inconsolata/20100526-r0/ttf-inconsolata-20100526/Inconsolata.ttf' Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 20041bb..0d6df24 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -13,13 +13,14 @@ S = "${WORKDIR}/ttf-inconsolata-${PV}" FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" -do_configure() { +deltask do_configure + +do_compile_prepend() { mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf } do_install_append() { - install -d ${D}${datadir}/doc/ttf-inconsolata/ - install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ + install -D -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/OFL.txt } SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:52 +0000 Subject: [oe-commits] [meta-openembedded] 25/35: minicoredumper: Update to 2.0.0 In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.CCFC923344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 0eb71c61c99dbb917073db3a53d1a21cb6047d29 Author: Khem Raj AuthorDate: Tue Mar 28 20:02:33 2017 -0700 minicoredumper: Update to 2.0.0 * Clarify licensing and switch to github for fetching * Delete empty /var/run Fixes minicoredumper-2.0.0: minicoredumper: Files/directories were installed but not shipped in any package: /run Signed-off-by: Khem Raj --- ...nicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb similarity index 63% rename from meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb rename to meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index babe544..58cd45a 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -1,17 +1,24 @@ SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ to allow minimal and customized crash dumps" -LICENSE = " LGPLv2.1 & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=45445387350de96a0e70410470ee5cab" -DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux" +LICENSE = " LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=709087c2ed0acda54a4d91497a889e42 \ + file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ + file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ + " +DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRC_URI = "https://linutronix.de/${BPN}/files/${BPN}-${PV}.tar.gz \ +SRCREV = "248019446ccf6079926efb54f8b6dd7be769bbae" + +PR .= "+git${SRCPV}" + +SRC_URI = "git://github.com/Linutronix/minicoredumper-debian;branch=unstable \ file://minicoredumper.service \ file://minicoredumper.init \ " -SRC_URI[md5sum] = "5ba9d116b52a8e2fb93456260644e753" -SRC_URI[sha256sum] = "1b0eeb3d70dbd2ad6f2f673e4e3446e5dd784e132730e21d8f9dc0977e47dd9a" + +S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "minicoredumper.service" SYSTEMD_AUTO_ENABLE = "enable" @@ -21,6 +28,7 @@ INITSCRIPT_NAME_${PN} = "minicoredumper" INITSCRIPT_PARAMS_${PN} = "defaults 89" do_install_append() { + rmdir ${D}${localstatedir}/run install -d ${D}/${sysconfdir}/minicoredumper cp -rf ${S}/etc/* ${D}/${sysconfdir}/ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:43 +0000 Subject: [oe-commits] [meta-openembedded] 16/35: daq: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.6B5C3233444@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 27a6397ebc86736139d80dbb7693e1e7e305ec6d Author: Khem Raj AuthorDate: Thu Mar 30 00:18:57 2017 -0700 daq: Fix build with musl unistd.h is not in sys/ on all platforms use standard location in /usr/include to look for it Signed-off-by: Khem Raj --- .../recipes-connectivity/daq/daq_2.0.6.bb | 4 ++- .../0001-correct-the-location-of-unistd.h.patch | 29 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 952d7a4..47cb163 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -9,7 +9,9 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ - file://disable-run-test-program-while-cross-compiling.patch " + file://disable-run-test-program-while-cross-compiling.patch \ + file://0001-correct-the-location-of-unistd.h.patch \ + " # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch new file mode 100644 index 0000000..4798a77 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -0,0 +1,29 @@ +From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 15:59:43 -0700 +Subject: [PATCH] correct the location of unistd.h + +Signed-off-by: Khem Raj +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb0..c2a4175 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include + #include + #include ++#include + + #include + #include +-#include + + #include + #include +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:55 +0000 Subject: [oe-commits] [meta-openembedded] 28/35: vorbis-tools: Fix build with security flags In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.E8994233452@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2857e6847ab806afcb7660c9992f09bacc2262b1 Author: Khem Raj AuthorDate: Sat Apr 1 08:02:00 2017 -0700 vorbis-tools: Fix build with security flags Signed-off-by: Khem Raj --- ...error-blocking-compilation-with-hardening.patch | 26 ++++++++++++++++++++++ .../vorbis-tools/vorbis-tools_1.4.0.bb | 1 + 2 files changed, 27 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch new file mode 100644 index 0000000..111e98a --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch @@ -0,0 +1,26 @@ +From: Petter Reinholdtsen +Date: Wed, 22 Oct 2014 13:25:21 +0200 +Subject: Fix format error blocking compilation with hardening + +Last-Update: 2014-10-22 +Forwarded: no + +Enabling hardening refuses to compile code with sprintf() calls +with no formatting string. Adjust the code to work with hardening. +--- + ogg123/status.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ogg123/status.c b/ogg123/status.c +index 92b8ff1..ccec389 100644 +--- a/ogg123/status.c ++++ b/ogg123/status.c +@@ -148,7 +148,7 @@ int print_statistics_line (stat_format_t stats[]) + + switch (stats->type) { + case stat_noarg: +- len += sprintf(str+len, stats->formatstr); ++ len += sprintf(str+len, "%s", stats->formatstr); + break; + case stat_intarg: + len += sprintf(str+len, stats->formatstr, stats->arg.intarg); diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb index 2683555..e43cb40 100644 --- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb +++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb @@ -12,6 +12,7 @@ DEPENDS = "libogg libvorbis curl libao" SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ + file://0004-Fix-format-error-blocking-compilation-with-hardening.patch \ " SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:49 +0000 Subject: [oe-commits] [meta-openembedded] 22/35: gpm: Update to use git src uri In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.B766823342E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit faa121728907b3382a96fdc3fe0d7614cd4dffa8 Author: Khem Raj AuthorDate: Mon Mar 6 13:14:15 2017 -0800 gpm: Update to use git src uri Additional patches are upstream to fix build with gcc6 and clang Add systemd unit file Create missing symlink for dev shared object Signed-off-by: Khem Raj --- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ---- meta-oe/recipes-support/gpm/gpm_git.bb | 45 +++ 8 files changed, 55 insertions(+), 392 deletions(-) diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch deleted file mode 100644 index e43bdcb..0000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: pending - ---- gpm-1.99.7.orig/src/daemon/open_console.c 2008-07-24 12:33:05.000000000 +0200 -+++ gpm-1.99.7/src/daemon/open_console.c 2013-01-10 12:39:47.975461947 +0100 -@@ -23,6 +23,7 @@ - #include /* open and co. */ - #include /* stat() */ - #include /* ioctl() */ -+#include /* major() */ - - /* Linux specific (to be outsourced in gpm2 */ - #include /* for serial console check */ diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch deleted file mode 100644 index d2d6cb8..0000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch +++ /dev/null @@ -1,326 +0,0 @@ -Remove nested functions, they are not available in all compilers -e.g. clang will not support them. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: gpm-1.99.7/src/drivers/summa/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/summa/i.c -+++ gpm-1.99.7/src/drivers/summa/i.c -@@ -36,6 +36,28 @@ extern int summamaxy; - - extern signed char summaid; - -+static void resetsumma(int fd) -+{ -+ write(fd, 0, 1); /* Reset */ -+ usleep(400000); /* wait */ -+} -+ -+static int waitsumma(int fd) -+{ -+ struct timeval timeout; -+ -+ fd_set readfds; -+ -+ int err; -+ -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return (err); -+} -+ - Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc, - char **argv) - { -@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short - flags = argc = 0; /* FIXME: 1.99.13 */ - argv = NULL; - -- void resetsumma() { -- write(fd, 0, 1); /* Reset */ -- usleep(400000); /* wait */ -- } -- int waitsumma() { -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return (err); -- } - int err; - - char buffer[255]; -@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short - */ - setspeed(fd, 1200, 9600, 1, - B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD); -- resetsumma(); -+ resetsumma(fd); - - write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE)); - -@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short - * read the Summa Firm-ID - */ - write(fd, SS_FIRMID, strlen(SS_FIRMID)); -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - summaid = 10; /* Original Summagraphics */ - read(fd, buffer, 255); /* Read Firm-ID */ -@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short - } - - if(summaid < 0) { /* Genius-test */ -- resetsumma(); -+ resetsumma(fd); - write(fd, GEN_MMSERIES, 1); - write(fd, &GEN_MODELL, 1); /* Read modell */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { /* read Genius-ID */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - read(fd, &config, 1); - summaid = (config[0] & 224) >> 5; /* genius tablet-id -@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short - * unknown tablet ? - */ - if((summaid < 0) || (summaid == 11)) { -- resetsumma(); -+ resetsumma(fd); - write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3); - } - - /* - * read tablet size - */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) - read(fd, buffer, sizeof(buffer)); - write(fd, SS_READCONFIG, 1); -Index: gpm-1.99.7/src/drivers/wacom/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/wacom/i.c -+++ gpm-1.99.7/src/drivers/wacom/i.c -@@ -30,10 +30,6 @@ - #include "message.h" /* gpm_report */ - #include "wacom.h" /* wacom */ - --Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -- char **argv) --{ -- - /* wacom graphire tablet */ - #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */ - /* -@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short - #define UD_COORD "~C\r" /* Request max coordinates */ - #define UD_STOP "\nSP\r" /* stop sending coordinates */ - -- flags = 0; /* FIXME: 1.99.13 */ - -- void reset_wacom() { -- /* -- * Init Wacom communication; this is modified from xf86Wacom.so module -- */ -- /* -- * Set speed to 19200 -- */ -- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Baudrate Command -- */ -- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -- usleep(250000); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(75000); -- /* -- * Set speed to 9600bps -- */ -- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(250000); -- write(fd, UD_STOP, strlen(UD_STOP)); -- usleep(100000); -- } -+static void reset_wacom(int fd) -+{ -+ /* -+ * Init Wacom communication; this is modified from xf86Wacom.so module -+ */ -+ /* -+ * Set speed to 19200 -+ */ -+ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Baudrate Command -+ */ -+ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -+ usleep(250000); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(75000); -+ /* -+ * Set speed to 9600bps -+ */ -+ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(250000); -+ write(fd, UD_STOP, strlen(UD_STOP)); -+ usleep(100000); -+} - -- int wait_wacom() { -- /* -- * Wait up to 200 ms for Data from Tablet. -- * Do not read that data. -- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -- */ -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return ((err > 0) ? 1 : err); -- } -+static int wait_wacom(int fd) -+{ -+ /* -+ * Wait up to 200 ms for Data from Tablet. -+ * Do not read that data. -+ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -+ */ -+ struct timeval timeout; - -- char buffer[50], *p; -+ fd_set readfds; - -- int RequestData(char *cmd) { -- int err; -+ int err; - -- /* -- * Send cmd if not null, and get back answer from tablet. -- * Get Data to buffer until full or timeout. -- * Give back 0 for timeout and !0 for buffer full -- */ -- if(cmd) -- write(fd, cmd, strlen(cmd)); -- memset(buffer, 0, sizeof(buffer)); -- p = buffer; -- err = wait_wacom(); -- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -- err = wait_wacom(); -- } -- /* -- * return 1 for buffer full -- */ -- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return ((err > 0) ? 1 : err); -+} -+ -+static int RequestData(int fd, char *cmd, char *buffer) -+{ -+ int err; -+ char *p; -+ /* -+ * Send cmd if not null, and get back answer from tablet. -+ * Get Data to buffer until full or timeout. -+ * Give back 0 for timeout and !0 for buffer full -+ */ -+ if(cmd) -+ write(fd, cmd, strlen(cmd)); -+ memset(buffer, 0, sizeof(buffer)); -+ p = buffer; -+ err = wait_wacom(fd); -+ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -+ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -+ err = wait_wacom(fd); - } -+ /* -+ * return 1 for buffer full -+ */ -+ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+} -+ -+Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -+ char **argv) -+{ -+ -+ flags = 0; /* FIXME: 1.99.13 */ -+ -+ char buffer[50]; - - /* - * We do both modes, relative and absolute, with the same function. -@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short - }; - parse_argv(optioninfo, argc, argv); - type->absolute = WacomAbsoluteWanted; -- reset_wacom(); -+ reset_wacom(fd); - - /* - * "Flush" input queque - */ -- while(RequestData(NULL)) ; -+ while(RequestData(fd, NULL, buffer)) ; - - /* - * read WACOM-ID - */ -- RequestData(UD_FIRMID); -+ RequestData(fd, UD_FIRMID, buffer); - - /* - * Search for matching modell -@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short - * read Wacom max size - */ - if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) { -- RequestData(UD_COORD); -+ RequestData(fd, UD_COORD, buffer); - sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy); - wmaxx = (wmaxx - wcmodell[WacomModell].border); - wmaxy = (wmaxy - wcmodell[WacomModell].border); diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in new file mode 100644 index 0000000..ee6c040 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm/init similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/init rename to meta-oe/recipes-support/gpm/gpm/init diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch similarity index 93% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch rename to meta-oe/recipes-support/gpm/gpm/no-docs.patch index f10217a..3faef84 100644 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch +++ b/meta-oe/recipes-support/gpm/gpm/no-docs.patch @@ -11,7 +11,7 @@ Index: gpm-1.99.7/Makefile.in # user-overridable flags, but it's also all the implicit rule looks at. # missing ? --SUBDIRS = src doc contrib gpm2 +-SUBDIRS = src doc contrib +SUBDIRS = src diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb deleted file mode 100644 index bbb8c28..0000000 --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ -for the console and xterm, with sample clients included \ -(emacs, etc)." -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f" - -PR = "r2" - -DEPENDS = "ncurses" - -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ - file://no-docs.patch \ - file://processcreds.patch \ - file://eglibc-2.17.patch \ - file://remove_nested_functions.patch \ - file://init" - -inherit autotools-brokensep update-rc.d - -INITSCRIPT_NAME = "gpm" -INITSCRIPT_PARAMS = "defaults" - -#export LIBS = "-lm" - -# all fields are /* FIXME: gpm 1.99.13 */ -# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable] -# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable] -# cc1: all warnings being treated as errors -CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable" - -# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7 -# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] -# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror] -CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -m 0644 src/headers/gpm.h ${D}${includedir} - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm - cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 -} -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544" -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee" - -FILES_${PN} += "${datadir}/emacs" diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb new file mode 100644 index 0000000..69f12d9 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ +for the console and xterm, with sample clients included \ +(emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" + +PV = "1.99.7+git${SRCREV}" +PR = "r2" +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/telmich/gpm;protocol=git \ + file://no-docs.patch \ + file://processcreds.patch \ + file://gpm.service.in \ + file://init" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep update-rc.d systemd + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" + +do_configure_prepend() { + (cd ${S};./autogen.sh;cd -) +} + +do_install_append () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm + fi + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h + ln -s libgpm.so.2 ${D}${libdir}/libgpm.so +} + +SYSTEMD_SERVICE_${PN} = "gpm.service" + +FILES_${PN} += "${datadir}/emacs" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:44 +0000 Subject: [oe-commits] [meta-openembedded] 17/35: arptables: Upgrade to 0.0.4 In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.77A08233446@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2eef0f351f91fd464577b0a742638862cae00653 Author: Khem Raj AuthorDate: Thu Mar 30 12:39:45 2017 -0700 arptables: Upgrade to 0.0.4 Switch the SRC_URI to git based fetcher Signed-off-by: Khem Raj --- .../arptables-compile-install.patch | 61 ----------------- ...FLAGS-for-package-specific-compiler-flags.patch | 79 ++++++++++++++++++++++ .../arptables-arpt-get-target-fix.patch | 0 .../arptables-init-busybox.patch | 0 .../arptables-remove-bashism.patch | 0 .../arptables.service | 0 .../{arptables_0.0.3-4.bb => arptables_git.bb} | 43 ++++++------ 7 files changed, 98 insertions(+), 85 deletions(-) diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch deleted file mode 100644 index 80e9804..0000000 --- a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: arptables-v0.0.3-4/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/Makefile 2010-03-22 15:52:56.000000000 +0300 -@@ -6,12 +6,11 @@ - LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= - --COPT_FLAGS:=-O2 --CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" - - ifndef ARPT_LIBDIR - ARPT_LIBDIR:=$(LIBDIR)/arptables -@@ -22,16 +21,16 @@ - all: arptables - - arptables.o: arptables.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables-standalone.o: arptables-standalone.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^ - - $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 - mkdir -p $(@D) -@@ -50,6 +49,7 @@ - cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_ - install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ -+ install -d $(DESTDIR)$(INITDIR) - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - -Index: arptables-v0.0.3-4/extensions/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/extensions/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/extensions/Makefile 2010-03-22 15:52:38.000000000 +0300 -@@ -4,4 +4,7 @@ - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) - - extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -+ -+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch new file mode 100644 index 0000000..e8be45e --- /dev/null +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -0,0 +1,79 @@ +From a2021f0bc0f029dfa05dcca5db3d2ec77904d41a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 12:33:51 -0700 +Subject: [PATCH] Use ARPCFLAGS for package specific compiler flags + +This leaves room for setting CFLAGS in environment +which OE uses to pass tweaks + +Signed-off-by: Khem Raj +--- + Makefile | 15 +++++++-------- + extensions/Makefile | 5 ++++- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 7bead0d..336db6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib + BINDIR:=$(PREFIX)/sbin + MANDIR:=$(PREFIX)/man + man8dir=$(MANDIR)/man8 +-INITDIR:=/etc/rc.d/init.d ++INITDIR:=/etc/init.d + SYSCONFIGDIR:=/etc/sysconfig + DESTDIR:= + + MANS = arptables.8 arptables-save.8 arptables-restore.8 + +-COPT_FLAGS:=-O2 +-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG +- ++ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" + ifndef ARPT_LIBDIR + ARPT_LIBDIR:=$(LIBDIR)/arptables + endif +@@ -25,13 +23,13 @@ include extensions/Makefile + all: arptables libarptc/libarptc.a + + arptables.o: arptables.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + arptables-standalone.o: arptables-standalone.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.a: libarptc/libarptc.o + $(AR) rcs $@ $< +@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv + install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore + cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi ++ install -d $(DESTDIR)$(INITDIR) ++ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables + rm -f arptables-save_ arptables-restore_ arptables.sysv_ + + .PHONY: install-man +diff --git a/extensions/Makefile b/extensions/Makefile +index 0189cc9..b046425 100644 +--- a/extensions/Makefile ++++ b/extensions/Makefile +@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK + EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) + + extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h +- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< ++ ++extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< +-- +2.12.1 + diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch b/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/meta-networking/recipes-support/arptables/arptables/arptables.service similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service rename to meta-networking/recipes-support/arptables/arptables/arptables.service diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_git.bb similarity index 61% rename from meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb rename to meta-networking/recipes-support/arptables/arptables_git.bb index f536408..274a55d 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,15 +1,13 @@ SUMMARY = "Administration tool for arp packet filtering" -LICENSE = "GPL-2.0" SECTION = "net" - -PR = "r2" - -RDEPENDS_${PN} += "perl" - +LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" +PV = "0.0.4+git${SRCPV}" + SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ - file://arptables-compile-install.patch \ + git://git.netfilter.org/arptables \ + file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ file://arptables-remove-bashism.patch \ @@ -18,26 +16,23 @@ SRC_URI = " \ SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" -S = "${WORKDIR}/arptables-v${PV}" - -do_compile () { - oe_runmake -} +S = "${WORKDIR}/git" +SYSTEMD_SERVICE_${PN} = "arptables.service" -# the install target is not multi-job safe, but it doesn't do much -# so we just install serially -# -PARALLEL_MAKEINST = "-j1" +inherit systemd -fakeroot do_install () { - oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install -} +EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'" do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + fi } -inherit systemd +RDEPENDS_${PN} += "perl" -SYSTEMD_SERVICE_${PN} = "arptables.service" +# the install target is not multi-job safe, but it doesn't do much +# so we just install serially +# +PARALLEL_MAKEINST = "-j1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:54 +0000 Subject: [oe-commits] [meta-openembedded] 27/35: xarchiver: Fix build with security flags turned on In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.E0AD6233450@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit faf2bea6d2ff3750ad5b47dd71f947b3baa9060d Author: Khem Raj AuthorDate: Thu Mar 30 11:26:23 2017 -0700 xarchiver: Fix build with security flags turned on Signed-off-by: Khem Raj --- ...formatting-string-to-printf-like-function.patch | 40 ++++++++++++++++++++++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch new file mode 100644 index 0000000..a115883 --- /dev/null +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch @@ -0,0 +1,40 @@ +From baf93ea9acf845c5455d577ac19a6f680dac3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 11:22:42 -0700 +Subject: [PATCH] Add proper formatting string to printf-like functions + +Avoids potential security holes and makes compiler happy + +| ../../../../../../../workspace/sources/xarchiver/src/window.c:236:72: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] +| gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); + +Signed-off-by: Khem Raj +--- + src/window.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: git/src/window.c +=================================================================== +--- git.orig/src/window.c ++++ git/src/window.c +@@ -231,9 +231,9 @@ int xa_show_message_dialog (GtkWindow *w + { + int response; + +- dialog = gtk_message_dialog_new (window,mode,type,button,message1); ++ dialog = gtk_message_dialog_new (window,mode,type,button,"%s",message1); + gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_NO); +- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),"%s",message2); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + return response; +@@ -511,7 +511,7 @@ void xa_list_archive (GtkMenuItem *menui + g_fprintf (stream,_("Comment:\n")); + if (bp) + g_fprintf(stream,"
");
+-			g_fprintf (stream,archive[idx]->comment->str);
++			g_fprintf (stream,"%s",archive[idx]->comment->str);
+ 			if (bp)
+ 				g_fprintf(stream,"
"); + g_fprintf (stream,"\n"); diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index ca29922..ea34a52 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master \ + file://0001-Add-proper-formatting-string-to-printf-like-function.patch \ + " SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" PV = "0.5.3" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:36:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:36:00 +0000 Subject: [oe-commits] [meta-openembedded] 33/35: synergy: Add unzip-native depenedency to right task In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.26B16233430@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9f203d09b6ba56d8ba6b7e6fbf08b69d64b7bcc0 Author: Khem Raj AuthorDate: Wed Apr 5 03:05:24 2017 +0000 synergy: Add unzip-native depenedency to right task Fixes run.do_unpack_extra.26047: unzip: not found Signed-off-by: Khem Raj --- meta-oe/recipes-support/synergy/synergy_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb index e6057f4..1c55a8a 100644 --- a/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-oe/recipes-support/synergy/synergy_git.bb @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f366945b209c5523e39889f636af00a" LICENSE = "GPL-2.0" SECTION = "x11/utils" -DEPENDS = "virtual/libx11 libxtst libxinerama unzip-native curl openssl" +DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl" +do_unpack_extra[depends] = "unzip-native:do_populate_sysroot" # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:46 +0000 Subject: [oe-commits] [meta-openembedded] 19/35: libnetfilter-queue: Update to git for SRC_URI In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.95F40233426@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 5e4d8e34df365d6d489e4b763706122f85e43c04 Author: Khem Raj AuthorDate: Thu Mar 30 13:29:01 2017 -0700 libnetfilter-queue: Update to git for SRC_URI brings in the fixes to build on musl Add a typo fix patch Signed-off-by: Khem Raj --- ...o-in-the-location-of-internal.h-in-includ.patch | 26 ++++++++++++++++++++++ .../libnetfilter/libnetfilter-queue_1.0.2.bb | 11 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch new file mode 100644 index 0000000..76d2d5d --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch @@ -0,0 +1,26 @@ +From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:26:56 -0700 +Subject: [PATCH] Correct typo in the location of internal.h in #include + +Signed-off-by: Khem Raj +--- + src/libnetfilter_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c +index 211a8ba..065d618 100644 +--- a/src/libnetfilter_queue.c ++++ b/src/libnetfilter_queue.c +@@ -32,7 +32,7 @@ + + #include + #include +-#include "src/internal.h" ++#include "internal.h" + + /** + * \mainpage +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb index ddf2aa5..0ca074c 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb @@ -6,10 +6,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "df09befac35cb215865b39a36c96a3fa" -SRC_URI[tar.sha256sum] = "838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32" +PV .= "+git${SRCREV}" +SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" -S = "${WORKDIR}/libnetfilter_queue-${PV}" +SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ + file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ + " + +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:56 +0000 Subject: [oe-commits] [meta-openembedded] 29/35: ntimed: Use adjtimex on musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.02BE1233434@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 0960a20233e0d75fa005cc807d064f3aab424e7c Author: Khem Raj AuthorDate: Sat Apr 1 08:36:37 2017 -0700 ntimed: Use adjtimex on musl Drop do_compile, default is same Do not assume that configure is running in S Signed-off-by: Khem Raj --- meta-networking/recipes-support/ntimed/ntimed_git.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-networking/recipes-support/ntimed/ntimed_git.bb index dac5617..527ea33 100644 --- a/meta-networking/recipes-support/ntimed/ntimed_git.bb +++ b/meta-networking/recipes-support/ntimed/ntimed_git.bb @@ -16,6 +16,9 @@ SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2" S = "${WORKDIR}/git" +# use adjtimex on musl +CFLAGS_append_libc-musl = " -Dntp_adjtime=adjtimex" + EXTRA_OEMAKE = "\ 'CC=${CC}' \ 'CFLAGS=${CFLAGS}' \ @@ -23,11 +26,7 @@ EXTRA_OEMAKE = "\ " do_configure () { - sh ./configure -} - -do_compile () { - oe_runmake + sh ${S}/configure } do_install () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:58 +0000 Subject: [oe-commits] [meta-openembedded] 31/35: libuio: Fix build with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.11191233454@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a4edae0d0c4ce46ab3a483c2710aa2305c5b1c1a Author: Khem Raj AuthorDate: Sat Apr 1 09:14:12 2017 -0700 libuio: Fix build with musl It needs fcntl.h which is indirectly included on glibc append SRCPV to version Signed-off-by: Khem Raj --- .../0001-include-fcntl.h-for-O_RDWR-define.patch | 38 ++++++++++++++++++++++ meta-oe/recipes-extended/libuio/libuio_0.2.1.bb | 6 +++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch b/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch new file mode 100644 index 0000000..3cae5c9 --- /dev/null +++ b/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch @@ -0,0 +1,38 @@ +From d39c78d322585a32f9a55c67c25a99602ce08b12 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 1 Apr 2017 09:01:33 -0700 +Subject: [PATCH] include fcntl.h for O_RDWR define + +Signed-off-by: Khem Raj +--- + tools/lsuio.c | 1 + + tools/rwuio.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/tools/lsuio.c b/tools/lsuio.c +index 58eb922..4769446 100644 +--- a/tools/lsuio.c ++++ b/tools/lsuio.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "system.h" + #include "uio_helper.h" +diff --git a/tools/rwuio.c b/tools/rwuio.c +index aef9e90..ebc71e1 100644 +--- a/tools/rwuio.c ++++ b/tools/rwuio.c +@@ -20,6 +20,7 @@ + */ + #include + #include ++#include + #include + #include + +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index f405197..dd34c18 100644 --- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -4,12 +4,16 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "git://git.code.sf.net/p/libuio/code \ - file://replace_inline_with_static-inline.patch" + file://replace_inline_with_static-inline.patch \ + file://0001-include-fcntl.h-for-O_RDWR-define.patch \ + " inherit autotools SRCREV = "ed4f07ea147ac403c28105ab44d01bbf524d36f9" +PV .= "+git${SRCPV}" + S = "${WORKDIR}/git" PACKAGES += "${PN}-tools" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:48 +0000 Subject: [oe-commits] [meta-openembedded] 21/35: autofs: Patch to build on musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.A89DB23342C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit eb2b5ae88449257f3606991f82ecc24cd9f1e71e Author: Khem Raj AuthorDate: Fri Mar 31 19:14:53 2017 -0700 autofs: Patch to build on musl Signed-off-by: Khem Raj --- ...fine-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch | 50 +++++++++++++++++++++ .../0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 51 ++++++++++++++++++++++ .../recipes-daemons/autofs/autofs_5.1.1.bb | 6 ++- 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch new file mode 100644 index 0000000..075af57 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -0,0 +1,50 @@ +From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:10:57 -0700 +Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF + +if they are not defined as is in musl then define +them here + +Signed-off-by: Khem Raj +--- + include/automount.h | 8 ++++++++ + include/nsswitch.h | 3 +++ + 2 files changed, 11 insertions(+) + +diff --git a/include/automount.h b/include/automount.h +index 219b07d..b12c22a 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -42,6 +42,14 @@ + + #define ENABLE_CORES 1 + ++#ifndef __SWORD_TYPE ++# if __WORDSIZE == 32 /* System word size */ ++# define __SWORD_TYPE int ++# else /* __WORDSIZE == 64 */ ++# define __SWORD_TYPE long int ++# endif ++#endif ++ + /* We MUST have the paths to mount(8) and umount(8) */ + #ifndef HAVE_MOUNT + #error Failed to locate mount(8)! +diff --git a/include/nsswitch.h b/include/nsswitch.h +index 2b445a9..3db77b2 100644 +--- a/include/nsswitch.h ++++ b/include/nsswitch.h +@@ -24,6 +24,9 @@ + #include + #include "list.h" + ++#ifndef _PATH_NSSWITCH_CONF ++#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" ++#endif + #define NSSWITCH_FILE _PATH_NSSWITCH_CONF + + enum nsswitch_status { +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch new file mode 100644 index 0000000..6b6ba6d --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -0,0 +1,51 @@ +From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:12:10 -0700 +Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC + +S_IEXEC is portable + +Signed-off-by: Khem Raj +--- + daemon/lookup.c | 4 ++-- + modules/lookup_multi.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/lookup.c b/daemon/lookup.c +index 62071df..1bec97f 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c +index 6ec8434..88d081f 100644 +--- a/modules/lookup_multi.c ++++ b/modules/lookup_multi.c +@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch + continue; + } + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb index 8d55596..d85600e 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS += "libtirpc flex-native bison-native" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" + inherit autotools-brokensep systemd SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ @@ -21,7 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://force-STRIP-to-emtpy.patch \ file://remove-bashism.patch \ file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ -" + file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ + file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ + " SRC_URI[md5sum] = "e143df66b614b8cdb1ff533735f8e12d" SRC_URI[sha256sum] = "795419383b120d15699ab3b89ea0f3d029f6fb28405a83982d305c4b7b61130f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:57 +0000 Subject: [oe-commits] [meta-openembedded] 30/35: libnih: Drop SIGCLD In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.0A74B233453@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 60d17fdb95c26c4132ef57c75bdacecea190e666 Author: Khem Raj AuthorDate: Sat Apr 1 08:53:44 2017 -0700 libnih: Drop SIGCLD Its not portable, especially musl does not support it Signed-off-by: Khem Raj --- ...GCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch | 28 ++++++++++++++++++++++ meta-oe/recipes-support/libnih/libnih_1.0.3.bb | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch new file mode 100644 index 0000000..a43b4b1 --- /dev/null +++ b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch @@ -0,0 +1,28 @@ +From f1b9992caf9910f9f7afae401045e42572cc84ff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 1 Apr 2017 08:50:35 -0700 +Subject: [PATCH] signal.c: SIGCLD and SIGCHILD are same on sytem V systems + +Musl drops the SIGCLD legacy + +Signed-off-by: Khem Raj +--- + nih/signal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nih/signal.c b/nih/signal.c +index a241df9..691c8e6 100644 +--- a/nih/signal.c ++++ b/nih/signal.c +@@ -87,7 +87,7 @@ static const SignalName signal_names[] = { + { SIGSTKFLT, "STKFLT" }, + #endif + { SIGCHLD, "CHLD" }, +- { SIGCLD, "CLD" }, ++ { SIGCHLD, "CLD" }, + { SIGCONT, "CONT" }, + { SIGSTOP, "STOP" }, + { SIGTSTP, "TSTP" }, +-- +2.12.1 + diff --git a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb b/meta-oe/recipes-support/libnih/libnih_1.0.3.bb index 40aa896..02fe805 100644 --- a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb +++ b/meta-oe/recipes-support/libnih/libnih_1.0.3.bb @@ -23,8 +23,9 @@ DEPENDS = "dbus libnih-native" DEPENDS_class-native = "dbus-native" SRC_URI = "https://launchpad.net/${BPN}/1.0/${PV}/+download/${BP}.tar.gz \ - file://libnih_1.0.3-4ubuntu16.patch \ -" + file://libnih_1.0.3-4ubuntu16.patch \ + file://0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch \ + " SRC_URI[md5sum] = "db7990ce55e01daffe19006524a1ccb0" SRC_URI[sha256sum] = "897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:50 +0000 Subject: [oe-commits] [meta-openembedded] 23/35: lvm2: Fix patch errors found with musl In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.BE188233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b23f2d73ebb4e8b401c35ccf19e9493e3ef0cab3 Author: Khem Raj AuthorDate: Wed Mar 22 14:13:42 2017 -0700 lvm2: Fix patch errors found with musl The patches had syntax errors which are only visible when using musl libs Signed-off-by: Khem Raj --- .../lvm2/0001-implement-libc-specific-reopen_stream.patch | 13 ++++++------- .../lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch index f09fd76..5d72402 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch @@ -1,7 +1,7 @@ -From ede7976da9431573b0104dbcfe91a32c02dbea13 Mon Sep 17 00:00:00 2001 +From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:49:40 +0000 -Subject: [PATCH 1/4] implement libc specific reopen_stream +Subject: [PATCH] implement libc specific reopen_stream musl defines stdin/stdio/stderr as constant types which means we can not assign to them as we are doing here but works ok with glibc @@ -13,15 +13,14 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + --- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c -index c933154..638839d 100644 +index c933154..3581084 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ @@ -38,7 +37,7 @@ index c933154..638839d 100644 } +#else +{ -+ return (freopen(NULL, mode, *stream) != NULL) ++ return (freopen(NULL, mode, *stream) != NULL); +} +#endif @@ -76,5 +75,5 @@ index 9a4deb7..f1f18e6 100644 strerror(errno)); return 0; -- -2.9.3 +2.12.0 diff --git a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index 5baafab..95dcede 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -1,20 +1,19 @@ -From 8706a6d33753d8b2cf5bb2a12bd6880b371ce337 Mon Sep 17 00:00:00 2001 +From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH 2/4] Guard use of mallinfo() with __GLIBC__ +Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ This API is glibc-only Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + --- lib/mm/memlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index da90144..c1bf8fb 100644 +index da90144..f34f890 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) @@ -22,10 +21,10 @@ index da90144..c1bf8fb 100644 static void _allocate_memory(void) { -#ifndef VALGRIND_POOL -+#ifndef VALGRIND_POOL && defined(__GLIBC__) ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) void *stack_mem; struct rlimit limit; int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; -- -2.9.3 +2.12.0 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:36:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:36:02 +0000 Subject: [oe-commits] [meta-openembedded] 35/35: logfsprogs: Pass LDFLAGS to link steps In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.3ADF7233438@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 428022106da248bb353f723c21f54ce99b55df1b Author: Khem Raj AuthorDate: Wed Apr 5 17:50:01 2017 +0000 logfsprogs: Pass LDFLAGS to link steps Fixes QA errors about missing GNU_HASH Signed-off-by: Khem Raj --- .../0001-Add-LDFLAGS-to-linker-cmdline.patch | 46 ++++++++++++++++++++++ .../logfsprogs/logfsprogs_git.bb | 7 ++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch new file mode 100644 index 0000000..30ad1b8 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch @@ -0,0 +1,46 @@ +From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 5 Apr 2017 17:36:45 +0000 +Subject: [PATCH] Add $(LDFLAGS) to linker cmdline + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -14,7 +14,7 @@ ZLIB_O := crc32.o deflate.o adler32.o co + CC := gcc + CHECK := cgcc + CHECKFLAGS := -D__CHECK_ENDIAN__ +-CFLAGS := -std=gnu99 ++CFLAGS += -std=gnu99 + CFLAGS += -Wall + CFLAGS += -Os + CFLAGS += -D_FILE_OFFSET_BITS=64 +@@ -28,18 +28,18 @@ $(ZLIB_O): /usr/lib/libz.a + + ifdef S + EXTRA_OBJ := $(ZLIB_O) +-CFLAGS += -static ++LDFLAGS += -static + else +-CFLAGS += -lz ++LDFLAGS += -lz + endif + + mklogfs: $(EXTRA_OBJ) + mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + logfsck: $(ZLIB_O) + logfsck: fsck.o lib.o journal.o super.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + $(OBJ): kerncompat.h logfs.h logfs_abi.h btree.h + diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index 7648667..c41f0ea 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -11,7 +11,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" DEPENDS = "zlib" -SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git" +SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ + file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ +" SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" S = "${WORKDIR}/git" @@ -24,6 +26,3 @@ do_install () { } BBCLASSEXTEND = "native nativesdk" - -# logfsprogs-git: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/logfsprogs/git-r0/packages-split/logfsprogs/usr/bin/mklogfs' [ldflags] -PNBLACKLIST[logfsprogs] ?= "Doesn't have proper PV, doesn't respect LDFLAGS - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:36:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:36:01 +0000 Subject: [oe-commits] [meta-openembedded] 34/35: corosync: Update to 2.4.2 In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.3019E233436@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 94750cccee241496a55a35c9495069ec53bcc81c Author: Khem Raj AuthorDate: Wed Apr 5 16:46:45 2017 +0000 corosync: Update to 2.4.2 Also fixes build with latest libqb 1.0.1+ Signed-off-by: Khem Raj --- .../corosync/{corosync_2.4.0.bb => corosync_2.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb similarity index 94% rename from meta-oe/recipes-extended/corosync/corosync_2.4.0.bb rename to meta-oe/recipes-extended/corosync/corosync_2.4.2.bb index c168e0c..ec1deac 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb @@ -8,8 +8,8 @@ SECTION = "base" inherit autotools pkgconfig systemd SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "11bdd5ee2aed5eb2443dd6d6acd6a1ab" -SRC_URI[sha256sum] = "6fe9523852a892701c4c28c1cd32e067e44cf0e696d5ecf3790afdef1fc309cb" +SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" +SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:53 +0000 Subject: [oe-commits] [meta-openembedded] 26/35: libqb: Upgrade to 1.0.1 release In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183528.D9D0723344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8ce27d00fb6fe191682c1a489135d5e1f7b07307 Author: Khem Raj AuthorDate: Wed Mar 29 16:37:15 2017 -0700 libqb: Upgrade to 1.0.1 release Add a patch needed for cross compiling Signed-off-by: Khem Raj --- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ++++++++++++++++++++++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +++---- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch new file mode 100644 index 0000000..28bc5c0 --- /dev/null +++ b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch @@ -0,0 +1,43 @@ +From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 16:31:38 -0700 +Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC + +Does not work during cross compile + +use a compile-time check to detect whether the +monotonic clock is available. This check can run just fine when we are +cross-compiling. + +Signed-off-by: Khem Raj +--- + configure.ac | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa13ae6..f4f0f46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + ) + + AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include ]], +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], ++[[ ++#include ++int main() { ++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) ++ #error No monotonic clock ++#endif ++ return 0; ++ ++]])], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb similarity index 67% rename from meta-oe/recipes-extended/libqb/libqb_0.17.2.bb rename to meta-oe/recipes-extended/libqb/libqb_1.0.1.bb index 94030b2..e26bb7c 100644 --- a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb @@ -4,22 +4,20 @@ It provides high performance logging, tracing, ipc, and poll." HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" SECTION = "libs" - LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" -inherit autotools-brokensep pkgconfig - -PV = "0.17.2+git${SRCPV}" +inherit autotools pkgconfig -SRCREV = "bd2c587f6ccacd8a5644b275d99324d200c2b378" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git" +PV .= "+git${SRCPV}" +SRCREV = "0a329683a76bc6aeb36f20f2bf6b43ba0440c4dc" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ + file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + " S = "${WORKDIR}/git" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) } - - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:35:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:35:59 +0000 Subject: [oe-commits] [meta-openembedded] 32/35: uml-utilities: Fix problem founds during musl build In-Reply-To: <149141732754.23740.14915616574387261994@git.openembedded.org> References: <149141732754.23740.14915616574387261994@git.openembedded.org> Message-ID: <20170405183529.1C7BF233435@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a0cc3bf0b288d295dccde1ebfa1b5d85235e92c0 Author: Khem Raj AuthorDate: Mon Apr 3 17:17:17 2017 -0700 uml-utilities: Fix problem founds during musl build Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...uired-system-header-files-for-fd_set-and-.patch | 41 ++++++++++++++++++++++ .../uml-utilities/uml-utilities_20040406.bb | 5 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch new file mode 100644 index 0000000..38e945d --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch @@ -0,0 +1,41 @@ +From a8d85949a068ee6cd9a2f923cd039047993f239e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 3 Apr 2017 17:11:32 -0700 +Subject: [PATCH] include required system header files for fd_set and makedev + +fd_set comes from sys/select.h +makedev macro is defined in sys/sysmacros.h + +Signed-off-by: Khem Raj +--- + uml_net/ethertap.c | 1 + + uml_net/host.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/uml_net/ethertap.c b/uml_net/ethertap.c +index ddd41f2..57f7119 100644 +--- a/uml_net/ethertap.c ++++ b/uml_net/ethertap.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include "host.h" +diff --git a/uml_net/host.c b/uml_net/host.c +index 65c20df..fc04cd4 100644 +--- a/uml_net/host.c ++++ b/uml_net/host.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include "output.h" + #include "host.h" + +-- +2.12.2 + diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 45cc2e7..ed19d1e 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -3,10 +3,11 @@ SUMMARY = "Utilities for User-Mode-Linux" LICENSE = "GPL-2.0" DEPENDS = "zlib ncurses readline" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ +SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ file://fix-ldflags.patch \ file://unstrip.patch \ -" + file://0001-include-required-system-header-files-for-fd_set-and-.patch \ + " SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:20 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:20 +0000 Subject: [oe-commits] [meta-openembedded] 02/06: uftp: Add recipe In-Reply-To: <149141779807.26524.4505581670479101278@git.openembedded.org> References: <149141779807.26524.4505581670479101278@git.openembedded.org> Message-ID: <20170405184318.5AED1233446@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit fb19a03530ee098dc18796bfa9c9bcc781c98f46 Author: Jaap de Jong AuthorDate: Mon Apr 3 12:47:17 2017 +0200 uftp: Add recipe To: openembedded-devel at lists.openembedded.org Signed-off-by: Martin Jansa --- meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta-networking/recipes-support/uftp/uftp_4.9.3.bb b/meta-networking/recipes-support/uftp/uftp_4.9.3.bb new file mode 100644 index 0000000..a6eeceb --- /dev/null +++ b/meta-networking/recipes-support/uftp/uftp_4.9.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Encrypted UDP based FTP with multicast" +HOMEPAGE = "https://sourceforge.net/projects/uftp-multicast" +SECTION = "libs/network" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" + +SRC_URI[md5sum] = "231d6ba7820d89a712fe7d727ab0f8e6" +SRC_URI[sha256sum] = "9e9215af0315257c6cc4f40fbc6161057e861be1fff10a38a5564f699e99c78f" + +do_install () { + oe_runmake install DESTDIR=${D} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:22 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:22 +0000 Subject: [oe-commits] [meta-openembedded] 04/06: plymouth: Fix virtual RPROVIDES In-Reply-To: <149141779807.26524.4505581670479101278@git.openembedded.org> References: <149141779807.26524.4505581670479101278@git.openembedded.org> Message-ID: <20170405184318.6851323344A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8284e02a8e80a65caa518a2d6da3c7dc4288bef7 Author: robert_joslyn at selinc.com AuthorDate: Mon Apr 3 13:18:10 2017 -0700 plymouth: Fix virtual RPROVIDES Runtime package names cannot have slashes in them, so replace "virtual/" with "virtual-" in RPROVIDES. Signed-off-by: Robert Joslyn Signed-off-by: Martin Jansa --- meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb index 1c1a02d..6163cff 100644 --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libcap libpng cairo dbus udev" PROVIDES = "virtual/psplash" -RPROVIDES_${PN} = "virtual/psplash virtual/psplash-support" +RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:18 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (4280221 -> 3f2bc0c) Message-ID: <149141779807.26524.4505581670479101278@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master-next in repository meta-openembedded. from 4280221 logfsprogs: Pass LDFLAGS to link steps new 69ab28d wireguard: add WireGuard kernel module and tools new fb19a03 uftp: Add recipe new 8a66761 v4l-utils: update to 1.12.3. new 8284e02 plymouth: Fix virtual RPROVIDES new 2063d6b opencv: do not depend on swig. new 3f2bc0c tinyproxy: Add recipe The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../wireguard/wireguard-module_0.0.20170324.bb | 9 ++ .../wireguard/wireguard-tools_0.0.20170324.bb | 27 +++++ .../recipes-kernel/wireguard/wireguard.inc | 18 ++++ .../tinyproxy/tinyproxy/tinyproxy.service | 14 +++ .../recipes-support/tinyproxy/tinyproxy_1.8.4.bb | 32 ++++++ meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 15 +++ meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 2 +- ...a-ctl-Don-t-install-libmediactl-and-libv4.patch | 18 ++-- ...tem-do-not-assume-building-in-source-tree.patch | 110 +++++++++++++++++++++ .../{v4l-utils_1.10.1.bb => v4l-utils_1.12.3.bb} | 5 +- meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- 11 files changed, 241 insertions(+), 11 deletions(-) create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170324.bb create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170324.bb create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard.inc create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb create mode 100644 meta-networking/recipes-support/uftp/uftp_4.9.3.bb create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.10.1.bb => v4l-utils_1.12.3.bb} (89%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:21 +0000 Subject: [oe-commits] [meta-openembedded] 03/06: v4l-utils: update to 1.12.3. In-Reply-To: <149141779807.26524.4505581670479101278@git.openembedded.org> References: <149141779807.26524.4505581670479101278@git.openembedded.org> Message-ID: <20170405184318.61E0E233448@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8a66761c230bb2252f8e73eebc268cab99a41a55 Author: Ismo Puustinen AuthorDate: Mon Apr 3 15:27:36 2017 +0300 v4l-utils: update to 1.12.3. Also add a patch which fixes building outside the source tree. Signed-off-by: Ismo Puustinen Acked-by: Otavio Salvador Signed-off-by: Martin Jansa --- ...a-ctl-Don-t-install-libmediactl-and-libv4.patch | 18 ++-- ...tem-do-not-assume-building-in-source-tree.patch | 110 +++++++++++++++++++++ .../{v4l-utils_1.10.1.bb => v4l-utils_1.12.3.bb} | 5 +- 3 files changed, 124 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch index 4b3de3c..7413094 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch @@ -1,4 +1,4 @@ -From 4ee15a8a69b84526ece1180a288a37db077bcd9b Mon Sep 17 00:00:00 2001 +From 2d6bfa75b2e16b4d764f1bf00bb902fb4b5e507b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 27 Feb 2015 21:55:36 +0000 Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and @@ -11,23 +11,27 @@ Signed-off-by: Khem Raj Conflicts: utils/media-ctl/Makefile.am --- - utils/media-ctl/Makefile.am | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) + utils/media-ctl/Makefile.am | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index a3931fb..fe1fea5 100644 +index ee7dcc9..d11fa2e 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am -@@ -1,14 +1,9 @@ +@@ -1,8 +1,7 @@ -noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la - +lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h -libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) -libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) -- +libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) +libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) + + media-bus-format-names.h: ../../include/linux/media-bus-format.h + sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ +@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) + nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) libv4l2subdev_la_SOURCES = libv4l2subdev.c libv4l2subdev_la_LIBADD = libmediactl.la -libv4l2subdev_la_CFLAGS = -static @@ -37,5 +41,5 @@ index a3931fb..fe1fea5 100644 noinst_HEADERS = mediactl.h v4l2subdev.h -- -2.1.4 +2.9.3 diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch new file mode 100644 index 0000000..54161f9 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch @@ -0,0 +1,110 @@ +From 806822f5acb756d5acda0f9063c84b28b38b3ffb Mon Sep 17 00:00:00 2001 +From: Ismo Puustinen +Date: Mon, 3 Apr 2017 13:23:38 +0300 +Subject: [PATCH v4l-utils] buildsystem: do not assume building in source tree. + +Use $(top_srcdir) as reference for include paths and buildtime scripts. +Otherwise compilation outside of project root directory will fail +because header and script paths are wrong. + +To reproduce: mkdir b; cd b; ../configure; make + +Upstream-status: Accepted [https://git.linuxtv.org//v4l-utils.git/commit/?id=bd98c9a99bffc8d44c54859345e4dfee0ada4275] + +Signed-off-by: Ismo Puustinen +--- + utils/cec-compliance/Makefile.am | 2 +- + utils/cec-ctl/Makefile.am | 2 +- + utils/cec-follower/Makefile.am | 4 ++-- + utils/qv4l2/Makefile.am | 2 +- + utils/v4l2-compliance/Makefile.am | 2 +- + utils/v4l2-ctl/Makefile.am | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am +index ec5de51..8331aa0 100644 +--- a/utils/cec-compliance/Makefile.am ++++ b/utils/cec-compliance/Makefile.am +@@ -7,7 +7,7 @@ cec_compliance_LDFLAGS = -lrt + cec-compliance.cpp: cec-table.h + + cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + cec-compliance.cpp: version.h + +diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am +index 0a7ef22..6afb6c9 100644 +--- a/utils/cec-ctl/Makefile.am ++++ b/utils/cec-ctl/Makefile.am +@@ -7,7 +7,7 @@ cec_ctl_LDFLAGS = -lrt + cec-ctl.cpp: cec-ctl-gen.h + + cec-ctl-gen.h: msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ./msg2ctl.pl 0 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 0 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + clean-local: + -rm -vf cec-ctl-gen.h +diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am +index 538edb2..fdbf3d9 100644 +--- a/utils/cec-follower/Makefile.am ++++ b/utils/cec-follower/Makefile.am +@@ -7,12 +7,12 @@ cec_follower_LDFLAGS = -lrt + cec-log.cpp: cec-log.h + + cec-log.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ../cec-ctl/msg2ctl.pl 1 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 1 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + cec-follower.cpp: cec-table.h version.h + + cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + version.h: + @if git rev-parse HEAD >/dev/null 2>&1; then \ +diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am +index fd58486..ccd1a2a 100644 +--- a/utils/qv4l2/Makefile.am ++++ b/utils/qv4l2/Makefile.am +@@ -8,7 +8,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c + nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp + qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \ + ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la +-qv4l2_CPPFLAGS = -I../common ++qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common + + if WITH_QTGL + qv4l2_CPPFLAGS += $(QTGL_CFLAGS) +diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am +index 03db8df..18b9892 100644 +--- a/utils/v4l2-compliance/Makefile.am ++++ b/utils/v4l2-compliance/Makefile.am +@@ -5,7 +5,7 @@ DEFS := + v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \ + v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp v4l2-test-buffers.cpp \ + v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h +-v4l2_compliance_CPPFLAGS = -I../common ++v4l2_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common + + if WITH_V4L2_COMPLIANCE_LIBV4L + v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread +diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am +index 955647d..825e53f 100644 +--- a/utils/v4l2-ctl/Makefile.am ++++ b/utils/v4l2-ctl/Makefile.am +@@ -7,7 +7,7 @@ v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cp + v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \ + v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \ + v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c +-v4l2_ctl_CPPFLAGS = -I../common ++v4l2_ctl_CPPFLAGS = -I$(top_srcdir)/utils/common + + if WITH_V4L2_CTL_LIBV4L + v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread +-- +2.9.3 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb similarity index 89% rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb index 4d87b50..42da5cc 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb @@ -15,11 +15,12 @@ PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ + file://0001-buildsystem-do-not-assume-building-in-source-tree.patch \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ " -SRC_URI[md5sum] = "936c9c58343840e91294e4dcec7dc05f" -SRC_URI[sha256sum] = "6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0" +SRC_URI[md5sum] = "89e1ed6c69c94e0489dc0a638c7841aa" +SRC_URI[sha256sum] = "5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:19 +0000 Subject: [oe-commits] [meta-openembedded] 01/06: wireguard: add WireGuard kernel module and tools In-Reply-To: <149141779807.26524.4505581670479101278@git.openembedded.org> References: <149141779807.26524.4505581670479101278@git.openembedded.org> Message-ID: <20170405184318.557BE233444@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 69ab28d380aea4459fbee4b98c27049c39f5c62a Author: Stefan Agner AuthorDate: Sun Apr 2 13:33:09 2017 -0700 wireguard: add WireGuard kernel module and tools WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPSec, while avoiding the massive headache. The recipes add the current experimental snapshot v0.0.20170324 out-of-tree kernel module and tools. The kernel module has some kernel configuration dependencies such as some configuration part of features/netfilter/netfilter.scc, hence netfilter.scc should be part of KERNEL_EXTRA_FEATURES (which is the case by default). Signed-off-by: Stefan Agner Signed-off-by: Martin Jansa --- .../wireguard/wireguard-module_0.0.20170324.bb | 9 ++++++++ .../wireguard/wireguard-tools_0.0.20170324.bb | 27 ++++++++++++++++++++++ .../recipes-kernel/wireguard/wireguard.inc | 18 +++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170324.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170324.bb new file mode 100644 index 0000000..aeb8269 --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170324.bb @@ -0,0 +1,9 @@ +require wireguard.inc + +inherit module + +EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" +MAKE_TARGETS = "module" +MODULES_INSTALL_TARGET = "module-install" + +RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170324.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170324.bb new file mode 100644 index 0000000..79d420f --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170324.bb @@ -0,0 +1,27 @@ +require wireguard.inc + +inherit bash-completion systemd pkgconfig + +DEPENDS = "wireguard-module libmnl" + +do_compile_prepend () { + cd ${S}/tools +} + +do_install () { + cd ${S}/tools + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ + SYSTEMDUNITDIR="${systemd_unitdir}" \ + WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ + WITH_BASHCOMPLETION=yes \ + WITH_WGQUICK=yes \ + install +} + +FILES_${PN} = " \ + ${sysconfdir} \ + ${systemd_unitdir} \ + ${bindir} \ +" + +RDEPENDS_${PN} = "wireguard-module" diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-networking/recipes-kernel/wireguard/wireguard.inc new file mode 100644 index 0000000..cec7260 --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc @@ -0,0 +1,18 @@ +SUMMARY = "WireGuard is an extremely simple yet fast and modern VPN" +DESCRIPTION="WireGuard is a secure network tunnel, operating at layer 3, \ +implemented as a kernel virtual network interface for Linux, which aims to \ +replace both IPsec for most use cases, as well as popular user space and/or \ +TLS-based solutions like OpenVPN, while being more secure, more performant, \ +and easier to use." +SECTION = "networking" +HOMEPAGE = "https://www.wireguard.io/" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" + +SRC_URI[md5sum] = "fead9ae2d7c6729e39f529913584494a" +SRC_URI[sha256sum] = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51" + +S = "${WORKDIR}/WireGuard-${PV}/src/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:24 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:24 +0000 Subject: [oe-commits] [meta-openembedded] 06/06: tinyproxy: Add recipe In-Reply-To: <149141779807.26524.4505581670479101278@git.openembedded.org> References: <149141779807.26524.4505581670479101278@git.openembedded.org> Message-ID: <20170405184318.7755F23344E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 3f2bc0cfa73caf64faa35362f2c2378832b02b7a Author: Benjamin Gaignard AuthorDate: Wed Apr 5 14:53:26 2017 +0200 tinyproxy: Add recipe Signed-off-by: Benjamin Gaignard Signed-off-by: Martin Jansa --- .../tinyproxy/tinyproxy/tinyproxy.service | 14 ++++++++++ .../recipes-support/tinyproxy/tinyproxy_1.8.4.bb | 32 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service new file mode 100644 index 0000000..800d2ad --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service @@ -0,0 +1,14 @@ +[Unit] +Description=Tinyproxy, Lightweight http(s) proxy daemon +RequiresMountsFor=/var + +[Service] +User=root +ExecStartPre=/bin/mkdir -p /var/log/tinyproxy +ExecStartPre=/bin/chown -R nobody.adm /var/log/tinyproxy +ExecStartPre=/bin/mkdir -p /var/run/tinyproxy +ExecStartPre=/bin/chown -R nobody.adm /var/run/tinyproxy +ExecStart=/usr/sbin/tinyproxy -d + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb new file mode 100644 index 0000000..76cec63 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb @@ -0,0 +1,32 @@ +SUMMARY = "Lightweight http(s) proxy daemon" +HOMEPAGE = "https://tinyproxy.github.io/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "https://github.com/tinyproxy/tinyproxy/releases/download/1.8.4/tinyproxy-${PV}.tar.gz" +SRC_URI += "file://tinyproxy.service" + +SRC_URI[md5sum] = "3b60f7d08e0821ed1a3e2cf1e5778cac" +SRC_URI[sha256sum] = "8234c879a129feee61efa98bac14a1a3e46e5cf08f01696a216940872aa70faf" + +EXTRA_OECONF += " \ + --enable-filter \ + --enable-transparent \ + --disable-regexcheck \ + --enable-reverse \ + --enable-upstream \ + --enable-xtinyproxy \ + " + +inherit autotools systemd + +SYSTEMD_PACKAGES += "${PN}" +SYSTEMD_SERVICE_${PN} = "tinyproxy.service" +SYSTEMD_AUTO_ENABLE_${PN} = "enable" + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} +} + +FILES_${PN} =+ "${systemd_system_unitdir}/tinyproxy.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 18:43:23 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 18:43:23 +0000 Subject: [oe-commits] [meta-openembedded] 05/06: opencv: do not depend on swig. In-Reply-To: <149141779807.26524.4505581670479101278@git.openembedded.org> References: <149141779807.26524.4505581670479101278@git.openembedded.org> Message-ID: <20170405184318.6F5B423344C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2063d6bbec28f691767289b9b5a99e91deabb04b Author: Ismo Puustinen AuthorDate: Tue Apr 4 10:40:58 2017 +0300 opencv: do not depend on swig. Since swig is a code generator, just depend on swig-native. Signed-off-by: Ismo Puustinen Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index f50bc05..b5b4968 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -DEPENDS = "libtool swig swig-native bzip2 zlib glib-2.0 libwebp" +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810" SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 22:22:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 22:22:39 +0000 Subject: [oe-commits] [openembedded-core] 01/04: ethtool: Switch to download mirror In-Reply-To: <149143095865.3377.681501801635184121@git.openembedded.org> References: <149143095865.3377.681501801635184121@git.openembedded.org> Message-ID: <20170405222238.E12CE233476@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bb3a0bef3b7e012ba7ce6d31d0470d43e7a21077 Author: Paul Barker AuthorDate: Sun Apr 2 22:31:35 2017 +0100 ethtool: Switch to download mirror The md5sum & sha256sum for ethtool-4.8.tar.gz have changed upstream :( Signed-off-by: Paul Barker Signed-off-by: Ross Burton --- meta/recipes-extended/ethtool/ethtool_4.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/ethtool/ethtool_4.8.bb b/meta/recipes-extended/ethtool/ethtool_4.8.bb index 4ca88d7..afaf2e2 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.8.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.8.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" -SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ +SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/ethtool-${PV}.tar.gz \ file://run-ptest \ file://avoid_parallel_tests.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 22:22:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 22:22:40 +0000 Subject: [oe-commits] [openembedded-core] 02/04: busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE In-Reply-To: <149143095865.3377.681501801635184121@git.openembedded.org> References: <149143095865.3377.681501801635184121@git.openembedded.org> Message-ID: <20170405222238.E942B233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 19be2237798f51c01c1c21a68382d114a2f6ead2 Author: Andre McCurdy AuthorDate: Mon Apr 3 18:58:43 2017 -0700 busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE EXTRA_OEMAKE no longer contains '-e MAKEFLAGS=' so the comment explaining that it needs to be removed / over-ridden is obsolete. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-core/busybox/busybox.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 6246c95..375632d 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -18,7 +18,6 @@ BUSYBOX_SPLIT_SUID ?= "1" export EXTRA_CFLAGS = "${CFLAGS}" export EXTRA_LDFLAGS = "${LDFLAGS}" -# We don't want '-e MAKEFLAGS=' in EXTRA_OEMAKE EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y HOSTCC='${BUILD_CC}' HOSTCPP='${BUILD_CPP}'" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 22:22:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 22:22:41 +0000 Subject: [oe-commits] [openembedded-core] 03/04: net-tools: Fix build with USE_NLS="no" In-Reply-To: <149143095865.3377.681501801635184121@git.openembedded.org> References: <149143095865.3377.681501801635184121@git.openembedded.org> Message-ID: <20170405222238.F2B4323347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 95d6910bb5d9331adb7a693fcb4f7b1271c68cc6 Author: Jussi Kukkonen AuthorDate: Tue Apr 4 11:09:29 2017 +0300 net-tools: Fix build with USE_NLS="no" The configuration change was already done for -native but we really want it when USE_NLS is set. Fixes [YOCTO #11285]. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 115b398..45d7bf4 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -70,21 +70,15 @@ python do_patch() { bb.build.exec_func('patch_do_patch', d) } -# i18n only enabled for the target, doesn't build for native -# and isn't needed there. -disable_i18n() { - sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make -} -disable_i18n_class-target () { - : -} - do_configure() { # net-tools has its own config mechanism requiring "make config" # we pre-generate desired options and copy to source directory instead cp ${WORKDIR}/net-tools-config.h ${S}/config.h cp ${WORKDIR}/net-tools-config.make ${S}/config.make - disable_i18n + + if [ "${USE_NLS}" = "no" ]; then + sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make + fi } do_compile() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 22:22:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 22:22:42 +0000 Subject: [oe-commits] [openembedded-core] 04/04: glibc: fix nativesdk ldd RTLDLIST In-Reply-To: <149143095865.3377.681501801635184121@git.openembedded.org> References: <149143095865.3377.681501801635184121@git.openembedded.org> Message-ID: <20170405222239.084EF23347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3a1cce659156ef2654a55a6e3c6922fa2dc780e4 Author: Ming Liu AuthorDate: Tue Apr 4 17:12:37 2017 +0200 glibc: fix nativesdk ldd RTLDLIST Override RTLDLIST for nativesdk, or else ldd would fail to run on SDK targets. Signed-off-by: Ming Liu Signed-off-by: Ross Burton --- meta/recipes-core/glibc/glibc-ld.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index b89b70a..c1d635d 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc @@ -44,4 +44,5 @@ def glibc_dl_info(d): EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" +RTLDLIST_class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" glibc_dl_info[vardepsexclude] = "OVERRIDES" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 22:22:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 22:22:38 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (3b7111b -> 3a1cce6) Message-ID: <149143095865.3377.681501801635184121@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 3b7111b automake: Adjust shebang lines to remove interpreter path hardcode add 760ab75 recipe_sanity: Drop now unused FILESDIR add c03de90 sanity: explain where TMPDIR is if we're telling the user to delete it add d8b4c58 scripts: change way we find native tools (pseudo) add 6c0fc4d meta-ide-support: exclude this recipe from rm_work add 1910f9e devtool: point runqemu to correct native bindir add 3211d43 kernel.bbclass: move in addtask kernel_link_images statement from linux-yocto.inc add 57357d4 x86-base.inc, qemuarm.conf: prefer 4.10 version of linux-yocto add 3810738 selftest/commands: extend variable regex to include A_B variable notation add 087e120 selftest/devtool: use kernel provider instead of recipe allowing other kernel providers add ebfd79a gpgme: fix configure if 'import distutils' causes output on stderr add 434b485 runtime/dnf : Add ID to the dnf test cases add 79ae1e9 xmlto: replace fedorahosted.org SRC_URI with pagure.io source add bbe3cde libuser: replace fedorahosted.org SRC_URI with pagure.io source add b85905b libnewt: replace fedorahosted.org SRC_URI with pagure.io source add 441ad24 liberation-fonts: replace fedorahosted.org SRC_URI with pagure.io source add b070317 cronie: replace fedorahosted.org SRC_URI with github.com source add 9b3c919 selftest/recipetool: replace fedorahosted.org SRC_URI with github.com source add 0fb5427 chkconfig: replace fedorahosted.org SRC_URI with github.com source add df2e1a8 update_gio_module_cache: Do not chown a non-existing file add 9414382 scripts: Add yocto-compat-layer-wrapper add 402ef1c yocto-compat-layer.py: Add status for skipped items add 57fc8a9 yocto-compat-layer.py: Add --dependency argument add 6e0a268 compatlayer/__init__.py: Allow add_layer to process recursive deps add 4eb0932 yocto-compat-layer.py: Fix the signature validation add f84d0bd scripts/oe-build-perf-report: better guessing of args add 79b90ae scripts/oe-build-perf-report: fix 'charts ready' console message add 0a05ccf scripts/oe-build-perf-report: fix typo add be3d171 build-perf-test-wrapper.sh: make it possible to specify Git branch name add ed43b2d build-perf-test-wrapper.sh: correctly check test script exit status add d8e14df build-perf-test-wrapper.sh: support pushing to remote Git add 46e76ff build-perf-test-wrapper.sh: support sending email reports add e75bd6a Revert "filemap: remove FilemapSeek class" add f0425c0 wic: improve error message add 4b667d2 quilt: Fix paths for patch and perl add 3b1871b libjpeg-turbo: don't depend on NASM for non-x86 targets add 02a76f3 u-boot: Add bc-native to DEPENDS to fix u-boot/spl build. add b5f471b yocto-uninative: Update to the 1.6 release add 3f1be2c libxml2: make dependencies on python conditional add 0375178 selftest/devtool: skip test in case of poky-tiny distro new bb3a0be ethtool: Switch to download mirror new 19be223 busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE new 95d6910 net-tools: Fix build with USE_NLS="no" new 3a1cce6 glibc: fix nativesdk ldd RTLDLIST The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/kernel.bbclass | 1 + meta/classes/recipe_sanity.bbclass | 17 -- meta/classes/sanity.bbclass | 2 +- meta/conf/distro/include/yocto-uninative.inc | 6 +- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- meta/lib/oeqa/runtime/cases/dnf.py | 12 + meta/lib/oeqa/selftest/devtool.py | 25 +- meta/lib/oeqa/selftest/recipetool.py | 8 +- meta/lib/oeqa/utils/commands.py | 2 +- meta/recipes-bsp/u-boot/u-boot_2017.01.bb | 2 +- meta/recipes-core/busybox/busybox.inc | 1 - meta/recipes-core/glibc/glibc-ld.inc | 1 + meta/recipes-core/libxml/libxml2_2.9.4.bb | 20 +- meta/recipes-core/meta/meta-ide-support.bb | 1 + meta/recipes-devtools/quilt/quilt-native.inc | 3 +- meta/recipes-devtools/quilt/quilt.inc | 9 +- ...0001-tests-Allow-different-output-from-mv.patch | 29 ++ meta/recipes-devtools/quilt/quilt_0.65.bb | 10 - meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 4 +- .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 12 +- meta/recipes-extended/cronie/cronie_1.5.1.bb | 6 +- meta/recipes-extended/ethtool/ethtool_4.8.bb | 2 +- meta/recipes-extended/libuser/libuser_0.62.bb | 6 +- .../net-tools/net-tools_1.60-26.bb | 14 +- meta/recipes-extended/newt/libnewt_0.52.19.bb | 4 +- meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb | 10 +- .../ttf-fonts/liberation-fonts_1.04.bb | 4 +- meta/recipes-kernel/linux/linux-yocto.inc | 1 - .../gpgme/gpgme/python-import.patch | 19 ++ meta/recipes-support/gpgme/gpgme_1.8.0.bb | 2 +- scripts/contrib/build-perf-test-wrapper.sh | 70 ++++- scripts/lib/build_perf/html/measurement_chart.html | 6 +- scripts/lib/build_perf/html/report.html | 5 +- scripts/lib/compatlayer/__init__.py | 47 +++- scripts/lib/devtool/runqemu.py | 4 +- scripts/lib/wic/filemap.py | 309 +++++++++++++++++---- scripts/lib/wic/utils/misc.py | 2 +- scripts/oe-build-perf-report | 4 +- scripts/oe-find-native-sysroot | 8 +- .../postinst-intercepts/update_gio_module_cache | 6 +- scripts/yocto-compat-layer-wrapper | 27 ++ scripts/yocto-compat-layer.py | 47 +++- 43 files changed, 576 insertions(+), 196 deletions(-) create mode 100644 meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch create mode 100644 meta/recipes-support/gpgme/gpgme/python-import.patch create mode 100755 scripts/yocto-compat-layer-wrapper -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Apr 5 22:22:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 05 Apr 2017 22:22:48 +0000 Subject: [oe-commits] [bitbake] branch master updated (0476ec4 -> 751c9dc) Message-ID: <149143096889.3840.5468085120440070255@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository bitbake. from 0476ec4 bitbake-user-manual: Fixed special character in -D output add 272f124 lib/bb/data: fix dependency handling for contains and multiple values add 496e3c8 codeparser: improve handling of contains_any() and filter() add 88fda49 bitbake-selftest: add contains tests add c1780bc codeparser: add some comments add 751c9dc fetch/local: Drop FILESDIR No new revisions were added by this update. Summary of changes: conf/bitbake.conf | 1 - .../bitbake-user-manual-fetching.xml | 9 ---- .../bitbake-user-manual-ref-variables.xml | 18 -------- lib/bb/cache.py | 2 +- lib/bb/codeparser.py | 34 +++++++++++++-- lib/bb/data.py | 10 +++-- lib/bb/fetch2/local.py | 9 ---- lib/bb/tests/codeparser.py | 48 ++++++++++++++++++++++ 8 files changed, 86 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 09:14:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 09:14:53 +0000 Subject: [oe-commits] [openembedded-core] 02/03: oeqa/utils/targetbuild: tmp dir improvements In-Reply-To: <149147009123.26101.16666295367062096427@git.openembedded.org> References: <149147009123.26101.16666295367062096427@git.openembedded.org> Message-ID: <20170406091451.632AB233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c43c966e0ed4ed836bdf90b1d4c3f2f45426f1ec Author: Joshua Lock AuthorDate: Wed Apr 5 13:10:54 2017 +0100 oeqa/utils/targetbuild: tmp dir improvements Don't hard-code /tmp as the tmpdir, instead use WORKDIR as the tmpdir if the instantiater doesn't specify a value. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/targetbuild.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/targetbuild.py index 6f237b5..9249fa2 100644 --- a/meta/lib/oeqa/utils/targetbuild.py +++ b/meta/lib/oeqa/utils/targetbuild.py @@ -8,14 +8,19 @@ import os import re import bb.utils import subprocess +import tempfile from abc import ABCMeta, abstractmethod class BuildProject(metaclass=ABCMeta): - def __init__(self, d, uri, foldername=None, tmpdir="/tmp/"): + def __init__(self, d, uri, foldername=None, tmpdir=None): self.d = d self.uri = uri self.archive = os.path.basename(uri) + if not tmpdir: + tmpdir = self.d.getVar('WORKDIR') + if not tmpdir: + tmpdir = tempfile.mkdtemp(prefix='buildproject') self.localarchive = os.path.join(tmpdir,self.archive) if foldername: self.fname = foldername @@ -24,7 +29,6 @@ class BuildProject(metaclass=ABCMeta): # Download self.archive to self.localarchive def _download_archive(self): - dl_dir = self.d.getVar("DL_DIR") if dl_dir and os.path.exists(os.path.join(dl_dir, self.archive)): bb.utils.copyfile(os.path.join(dl_dir, self.archive), self.localarchive) @@ -73,7 +77,7 @@ class TargetBuildProject(BuildProject): def __init__(self, target, d, uri, foldername=None): self.target = target self.targetdir = "~/" - BuildProject.__init__(self, d, uri, foldername, tmpdir="/tmp") + BuildProject.__init__(self, d, uri, foldername) def download_archive(self): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 09:14:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 09:14:52 +0000 Subject: [oe-commits] [openembedded-core] 01/03: oeqa/utils/buildproject: create a more unique tmp dir In-Reply-To: <149147009123.26101.16666295367062096427@git.openembedded.org> References: <149147009123.26101.16666295367062096427@git.openembedded.org> Message-ID: <20170406091451.59408233476@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9425c2658fea0b45468a04574cd77bffc6668a8d Author: Joshua Lock AuthorDate: Wed Apr 5 13:10:53 2017 +0100 oeqa/utils/buildproject: create a more unique tmp dir Rather than hardcoding /tmp as the default tmpdir make a more unique tmpdir with tempfile.mkdtemp() when the caller doesn't specify a tmpdir value. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/buildproject.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/buildproject.py b/meta/lib/oeqa/utils/buildproject.py index fc8879c..487f08b 100644 --- a/meta/lib/oeqa/utils/buildproject.py +++ b/meta/lib/oeqa/utils/buildproject.py @@ -8,14 +8,17 @@ import os import re import subprocess import shutil +import tempfile from abc import ABCMeta, abstractmethod class BuildProject(metaclass=ABCMeta): - def __init__(self, uri, foldername=None, tmpdir="/tmp/", dl_dir=None): + def __init__(self, uri, foldername=None, tmpdir=None, dl_dir=None): self.uri = uri self.archive = os.path.basename(uri) - self.localarchive = os.path.join(tmpdir,self.archive) + if not tmpdir: + tmpdir = tempfile.mkdtemp(prefix='buildproject') + self.localarchive = os.path.join(tmpdir, self.archive) self.dl_dir = dl_dir if foldername: self.fname = foldername -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 09:14:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 09:14:51 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (3a1cce6 -> 901659a) Message-ID: <149147009123.26101.16666295367062096427@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 3a1cce6 glibc: fix nativesdk ldd RTLDLIST new 9425c26 oeqa/utils/buildproject: create a more unique tmp dir new c43c966 oeqa/utils/targetbuild: tmp dir improvements new 901659a oeqa/runtime/utils/targetbuildproject: use parent classes defaults tmpdir The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/runtime/utils/targetbuildproject.py | 3 +-- meta/lib/oeqa/utils/buildproject.py | 7 +++++-- meta/lib/oeqa/utils/targetbuild.py | 10 +++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 09:14:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 09:14:54 +0000 Subject: [oe-commits] [openembedded-core] 03/03: oeqa/runtime/utils/targetbuildproject: use parent classes defaults tmpdir In-Reply-To: <149147009123.26101.16666295367062096427@git.openembedded.org> References: <149147009123.26101.16666295367062096427@git.openembedded.org> Message-ID: <20170406091451.6946F23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 901659a51cd53625a93f57a9c5865e90a07ec09d Author: Joshua Lock AuthorDate: Wed Apr 5 13:10:55 2017 +0100 oeqa/runtime/utils/targetbuildproject: use parent classes defaults tmpdir Rather than hard-coding the tmpdir for TargetBuildProject to /tmp allow the parent's default handling to define an appropriate tmpdir. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/utils/targetbuildproject.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/utils/targetbuildproject.py b/meta/lib/oeqa/runtime/utils/targetbuildproject.py index 551b0b6..5af55d7 100644 --- a/meta/lib/oeqa/runtime/utils/targetbuildproject.py +++ b/meta/lib/oeqa/runtime/utils/targetbuildproject.py @@ -8,8 +8,7 @@ class TargetBuildProject(BuildProject): def __init__(self, target, uri, foldername=None, dl_dir=None): self.target = target self.targetdir = "~/" - BuildProject.__init__(self, uri, foldername, tmpdir="/tmp", - dl_dir=dl_dir) + BuildProject.__init__(self, uri, foldername, dl_dir=dl_dir) def download_archive(self): self._download_archive() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 09:14:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 09:14:56 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (98e921b -> 901659a) Message-ID: <149147009635.26300.16053594311710849079@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 98e921b glibc: fix nativesdk ldd RTLDLIST discard 7d60a36 net-tools: Fix build with USE_NLS="no" discard 72088ae busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE discard 15a732a ethtool: Switch to download mirror discard 612e62c oe-selftest: test wic sparse_copy API add bb3a0be ethtool: Switch to download mirror add 19be223 busybox.inc: drop comment explaining '-e MAKEFLAGS=' in EXTRA_OEMAKE add 95d6910 net-tools: Fix build with USE_NLS="no" add 3a1cce6 glibc: fix nativesdk ldd RTLDLIST add 9425c26 oeqa/utils/buildproject: create a more unique tmp dir add c43c966 oeqa/utils/targetbuild: tmp dir improvements add 901659a oeqa/runtime/utils/targetbuildproject: use parent classes defaults tmpdir This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (98e921b) \ N -- N -- N refs/heads/master-next (901659a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: meta/lib/oeqa/runtime/utils/targetbuildproject.py | 3 +-- meta/lib/oeqa/selftest/wic.py | 26 ----------------------- meta/lib/oeqa/utils/buildproject.py | 7 ++++-- meta/lib/oeqa/utils/targetbuild.py | 10 ++++++--- scripts/lib/wic/filemap.py | 6 ++---- 5 files changed, 15 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:19 +0000 Subject: [oe-commits] [meta-openembedded] 03/37: minicoredumper: Update to 2.0.0 In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.C529C23347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 82dbf3f408ee92b5650629cfe8292407f21b5a5c Author: Khem Raj AuthorDate: Tue Mar 28 20:02:33 2017 -0700 minicoredumper: Update to 2.0.0 * Clarify licensing and switch to github for fetching * Delete empty /var/run Fixes minicoredumper-2.0.0: minicoredumper: Files/directories were installed but not shipped in any package: /run Signed-off-by: Khem Raj --- ...nicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb similarity index 63% rename from meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb rename to meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index babe544..58cd45a 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_1.0.2.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -1,17 +1,24 @@ SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ to allow minimal and customized crash dumps" -LICENSE = " LGPLv2.1 & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=45445387350de96a0e70410470ee5cab" -DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux" +LICENSE = " LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=709087c2ed0acda54a4d91497a889e42 \ + file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ + file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ + " +DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRC_URI = "https://linutronix.de/${BPN}/files/${BPN}-${PV}.tar.gz \ +SRCREV = "248019446ccf6079926efb54f8b6dd7be769bbae" + +PR .= "+git${SRCPV}" + +SRC_URI = "git://github.com/Linutronix/minicoredumper-debian;branch=unstable \ file://minicoredumper.service \ file://minicoredumper.init \ " -SRC_URI[md5sum] = "5ba9d116b52a8e2fb93456260644e753" -SRC_URI[sha256sum] = "1b0eeb3d70dbd2ad6f2f673e4e3446e5dd784e132730e21d8f9dc0977e47dd9a" + +S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "minicoredumper.service" SYSTEMD_AUTO_ENABLE = "enable" @@ -21,6 +28,7 @@ INITSCRIPT_NAME_${PN} = "minicoredumper" INITSCRIPT_PARAMS_${PN} = "defaults 89" do_install_append() { + rmdir ${D}${localstatedir}/run install -d ${D}/${sysconfdir}/minicoredumper cp -rf ${S}/etc/* ${D}/${sysconfdir}/ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:17 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:17 +0000 Subject: [oe-commits] [meta-openembedded] 01/37: gpm: Update to use git src uri In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.B95C0233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 10e27be99770a0f071ae4b8560de65e501f6bd09 Author: Khem Raj AuthorDate: Mon Mar 6 13:14:15 2017 -0800 gpm: Update to use git src uri Additional patches are upstream to fix build with gcc6 and clang Add systemd unit file Create missing symlink for dev shared object Signed-off-by: Khem Raj --- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ---- meta-oe/recipes-support/gpm/gpm_git.bb | 45 +++ 8 files changed, 55 insertions(+), 392 deletions(-) diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch deleted file mode 100644 index e43bdcb..0000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: pending - ---- gpm-1.99.7.orig/src/daemon/open_console.c 2008-07-24 12:33:05.000000000 +0200 -+++ gpm-1.99.7/src/daemon/open_console.c 2013-01-10 12:39:47.975461947 +0100 -@@ -23,6 +23,7 @@ - #include /* open and co. */ - #include /* stat() */ - #include /* ioctl() */ -+#include /* major() */ - - /* Linux specific (to be outsourced in gpm2 */ - #include /* for serial console check */ diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch b/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch deleted file mode 100644 index d2d6cb8..0000000 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch +++ /dev/null @@ -1,326 +0,0 @@ -Remove nested functions, they are not available in all compilers -e.g. clang will not support them. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: gpm-1.99.7/src/drivers/summa/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/summa/i.c -+++ gpm-1.99.7/src/drivers/summa/i.c -@@ -36,6 +36,28 @@ extern int summamaxy; - - extern signed char summaid; - -+static void resetsumma(int fd) -+{ -+ write(fd, 0, 1); /* Reset */ -+ usleep(400000); /* wait */ -+} -+ -+static int waitsumma(int fd) -+{ -+ struct timeval timeout; -+ -+ fd_set readfds; -+ -+ int err; -+ -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return (err); -+} -+ - Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc, - char **argv) - { -@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short - flags = argc = 0; /* FIXME: 1.99.13 */ - argv = NULL; - -- void resetsumma() { -- write(fd, 0, 1); /* Reset */ -- usleep(400000); /* wait */ -- } -- int waitsumma() { -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return (err); -- } - int err; - - char buffer[255]; -@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short - */ - setspeed(fd, 1200, 9600, 1, - B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD); -- resetsumma(); -+ resetsumma(fd); - - write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE)); - -@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short - * read the Summa Firm-ID - */ - write(fd, SS_FIRMID, strlen(SS_FIRMID)); -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - summaid = 10; /* Original Summagraphics */ - read(fd, buffer, 255); /* Read Firm-ID */ -@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short - } - - if(summaid < 0) { /* Genius-test */ -- resetsumma(); -+ resetsumma(fd); - write(fd, GEN_MMSERIES, 1); - write(fd, &GEN_MODELL, 1); /* Read modell */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { /* read Genius-ID */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) { - read(fd, &config, 1); - summaid = (config[0] & 224) >> 5; /* genius tablet-id -@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short - * unknown tablet ? - */ - if((summaid < 0) || (summaid == 11)) { -- resetsumma(); -+ resetsumma(fd); - write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3); - } - - /* - * read tablet size - */ -- err = waitsumma(); -+ err = waitsumma(fd); - if(!((err == -1) || (!err))) - read(fd, buffer, sizeof(buffer)); - write(fd, SS_READCONFIG, 1); -Index: gpm-1.99.7/src/drivers/wacom/i.c -=================================================================== ---- gpm-1.99.7.orig/src/drivers/wacom/i.c -+++ gpm-1.99.7/src/drivers/wacom/i.c -@@ -30,10 +30,6 @@ - #include "message.h" /* gpm_report */ - #include "wacom.h" /* wacom */ - --Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -- char **argv) --{ -- - /* wacom graphire tablet */ - #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */ - /* -@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short - #define UD_COORD "~C\r" /* Request max coordinates */ - #define UD_STOP "\nSP\r" /* stop sending coordinates */ - -- flags = 0; /* FIXME: 1.99.13 */ - -- void reset_wacom() { -- /* -- * Init Wacom communication; this is modified from xf86Wacom.so module -- */ -- /* -- * Set speed to 19200 -- */ -- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Baudrate Command -- */ -- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -- usleep(250000); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(75000); -- /* -- * Set speed to 9600bps -- */ -- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -- /* -- * Send Reset Command -- */ -- write(fd, UD_RESET, strlen(UD_RESET)); -- usleep(250000); -- write(fd, UD_STOP, strlen(UD_STOP)); -- usleep(100000); -- } -+static void reset_wacom(int fd) -+{ -+ /* -+ * Init Wacom communication; this is modified from xf86Wacom.so module -+ */ -+ /* -+ * Set speed to 19200 -+ */ -+ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Baudrate Command -+ */ -+ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); -+ usleep(250000); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(75000); -+ /* -+ * Set speed to 9600bps -+ */ -+ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); -+ /* -+ * Send Reset Command -+ */ -+ write(fd, UD_RESET, strlen(UD_RESET)); -+ usleep(250000); -+ write(fd, UD_STOP, strlen(UD_STOP)); -+ usleep(100000); -+} - -- int wait_wacom() { -- /* -- * Wait up to 200 ms for Data from Tablet. -- * Do not read that data. -- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -- */ -- struct timeval timeout; -- -- fd_set readfds; -- -- int err; -- -- FD_ZERO(&readfds); -- FD_SET(fd, &readfds); -- timeout.tv_sec = 0; -- timeout.tv_usec = 200000; -- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -- return ((err > 0) ? 1 : err); -- } -+static int wait_wacom(int fd) -+{ -+ /* -+ * Wait up to 200 ms for Data from Tablet. -+ * Do not read that data. -+ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent -+ */ -+ struct timeval timeout; - -- char buffer[50], *p; -+ fd_set readfds; - -- int RequestData(char *cmd) { -- int err; -+ int err; - -- /* -- * Send cmd if not null, and get back answer from tablet. -- * Get Data to buffer until full or timeout. -- * Give back 0 for timeout and !0 for buffer full -- */ -- if(cmd) -- write(fd, cmd, strlen(cmd)); -- memset(buffer, 0, sizeof(buffer)); -- p = buffer; -- err = wait_wacom(); -- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -- err = wait_wacom(); -- } -- /* -- * return 1 for buffer full -- */ -- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+ FD_ZERO(&readfds); -+ FD_SET(fd, &readfds); -+ timeout.tv_sec = 0; -+ timeout.tv_usec = 200000; -+ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); -+ return ((err > 0) ? 1 : err); -+} -+ -+static int RequestData(int fd, char *cmd, char *buffer) -+{ -+ int err; -+ char *p; -+ /* -+ * Send cmd if not null, and get back answer from tablet. -+ * Get Data to buffer until full or timeout. -+ * Give back 0 for timeout and !0 for buffer full -+ */ -+ if(cmd) -+ write(fd, cmd, strlen(cmd)); -+ memset(buffer, 0, sizeof(buffer)); -+ p = buffer; -+ err = wait_wacom(fd); -+ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { -+ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); -+ err = wait_wacom(fd); - } -+ /* -+ * return 1 for buffer full -+ */ -+ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); -+} -+ -+Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, -+ char **argv) -+{ -+ -+ flags = 0; /* FIXME: 1.99.13 */ -+ -+ char buffer[50]; - - /* - * We do both modes, relative and absolute, with the same function. -@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short - }; - parse_argv(optioninfo, argc, argv); - type->absolute = WacomAbsoluteWanted; -- reset_wacom(); -+ reset_wacom(fd); - - /* - * "Flush" input queque - */ -- while(RequestData(NULL)) ; -+ while(RequestData(fd, NULL, buffer)) ; - - /* - * read WACOM-ID - */ -- RequestData(UD_FIRMID); -+ RequestData(fd, UD_FIRMID, buffer); - - /* - * Search for matching modell -@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short - * read Wacom max size - */ - if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) { -- RequestData(UD_COORD); -+ RequestData(fd, UD_COORD, buffer); - sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy); - wmaxx = (wmaxx - wcmodell[WacomModell].border); - wmaxy = (wmaxy - wcmodell[WacomModell].border); diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in new file mode 100644 index 0000000..ee6c040 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/init b/meta-oe/recipes-support/gpm/gpm/init similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/init rename to meta-oe/recipes-support/gpm/gpm/init diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch similarity index 93% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch rename to meta-oe/recipes-support/gpm/gpm/no-docs.patch index f10217a..3faef84 100644 --- a/meta-oe/recipes-support/gpm/gpm-1.99.7/no-docs.patch +++ b/meta-oe/recipes-support/gpm/gpm/no-docs.patch @@ -11,7 +11,7 @@ Index: gpm-1.99.7/Makefile.in # user-overridable flags, but it's also all the implicit rule looks at. # missing ? --SUBDIRS = src doc contrib gpm2 +-SUBDIRS = src doc contrib +SUBDIRS = src diff --git a/meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch similarity index 100% rename from meta-oe/recipes-support/gpm/gpm-1.99.7/processcreds.patch rename to meta-oe/recipes-support/gpm/gpm/processcreds.patch diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb deleted file mode 100644 index bbb8c28..0000000 --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ -for the console and xterm, with sample clients included \ -(emacs, etc)." -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpm2/core/main.c;endline=19;md5=66d3c205c4e7ee5704b2ee351dfed72f" - -PR = "r2" - -DEPENDS = "ncurses" - -SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ - file://no-docs.patch \ - file://processcreds.patch \ - file://eglibc-2.17.patch \ - file://remove_nested_functions.patch \ - file://init" - -inherit autotools-brokensep update-rc.d - -INITSCRIPT_NAME = "gpm" -INITSCRIPT_PARAMS = "defaults" - -#export LIBS = "-lm" - -# all fields are /* FIXME: gpm 1.99.13 */ -# gpm-1.99.7/src/lib/libhigh.c:171:43: error: parameter 'clientdata' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:21: error: parameter 'line' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/lib/report-lib.c:28:33: error: parameter 'file' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:23: error: parameter 'fd' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/empty/i.c:26:42: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/etouch/i.c:34:43: error: parameter 'flags' set but not used [-Werror=unused-but-set-parameter] -# gpm-1.99.7/src/drivers/msc/r.c:32:12: error: variable 'dy' set but not used [-Werror=unused-but-set-variable] -# gpm-1.99.7/src/drivers/msc/r.c:32:8: error: variable 'dx' set but not used [-Werror=unused-but-set-variable] -# cc1: all warnings being treated as errors -CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable" - -# twiddler is WIP in 1.99.7 and probably not worth fixing (a lot of changes in gpm-2-dev after 1.99.7 -# gpm-1.99.7/src/drivers/twid/twiddler.c:503:14: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] -# /gpm-1.99.7/src/mice.c:221:5: error: (near initialization for 'mice[32].init') [-Werror] -CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -m 0644 src/headers/gpm.h ${D}${includedir} - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm - cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 -} -SRC_URI[md5sum] = "9fdddf5f53cb11d40bb2bb671d3ac544" -SRC_URI[sha256sum] = "6071378b24494e36ca3ef6377606e7e565040413c86704753a162d2180af32ee" - -FILES_${PN} += "${datadir}/emacs" diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb new file mode 100644 index 0000000..69f12d9 --- /dev/null +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ +for the console and xterm, with sample clients included \ +(emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" + +PV = "1.99.7+git${SRCREV}" +PR = "r2" +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/telmich/gpm;protocol=git \ + file://no-docs.patch \ + file://processcreds.patch \ + file://gpm.service.in \ + file://init" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep update-rc.d systemd + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" + +do_configure_prepend() { + (cd ${S};./autogen.sh;cd -) +} + +do_install_append () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm + fi + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h + ln -s libgpm.so.2 ${D}${libdir}/libgpm.so +} + +SYSTEMD_SERVICE_${PN} = "gpm.service" + +FILES_${PN} += "${datadir}/emacs" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:16 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:16 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3f2bc0c -> d128374) Message-ID: <149147647663.19652.2089149753462559506@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master-next in repository meta-openembedded. discard 3f2bc0c tinyproxy: Add recipe discard 2063d6b opencv: do not depend on swig. discard 8284e02 plymouth: Fix virtual RPROVIDES discard 8a66761 v4l-utils: update to 1.12.3. discard fb19a03 uftp: Add recipe discard 69ab28d wireguard: add WireGuard kernel module and tools discard 4280221 logfsprogs: Pass LDFLAGS to link steps discard 94750cc corosync: Update to 2.4.2 discard 9f203d0 synergy: Add unzip-native depenedency to right task discard a0cc3bf uml-utilities: Fix problem founds during musl build discard a4edae0 libuio: Fix build with musl discard 60d17fd libnih: Drop SIGCLD discard 0960a20 ntimed: Use adjtimex on musl discard 2857e68 vorbis-tools: Fix build with security flags discard faf2bea xarchiver: Fix build with security flags turned on discard 8ce27d0 libqb: Upgrade to 1.0.1 release discard 0eb71c6 minicoredumper: Update to 2.0.0 discard cb5f9fb ttf-inconsolata: Move copying of .otf to .ttf into do_compile discard b23f2d7 lvm2: Fix patch errors found with musl discard faa1217 gpm: Update to use git src uri discard eb2b5ae autofs: Patch to build on musl discard 7406a3f snort: Fix build with musl discard 5e4d8e3 libnetfilter-queue: Update to git for SRC_URI discard 9debde5 libnetfilter-log: Switch to git URI discard 2eef0f3 arptables: Upgrade to 0.0.4 discard 27a6397 daq: Fix build with musl discard c8547c1 vpnc: Update to build from github SRC_URI discard ddcdd8c dibbler: Upgrade to 1.0.2RC1 discard 4affd6a vsftpd: Fix build with musl discard d572db6 rp-pppoe: Fix build with musl discard 2eab707 openl2tp: Fix build with musl discard 768c920 lowpan-tools: Fix build with musl discard 2ee4969 ebtables: Fix build with musl discard 762a074 libnfnetlink: Backport patches to fix musl build discard 2f5738e squid: Update to 3.5.23 discard 1a01884 netcat-openbsd: Fix build and whitelist discard 6e2d318 ntp: update to 4.2.8.p10 discard a5a44db wireless-regdb: fix crda failing from missing pubkey discard 05ecc19 libdnet: update SRC_URI discard bcf9a08 ctdb: Fix build with musl discard 15328d7 dnsmasq: disable the service by default new 10e27be gpm: Update to use git src uri new 3ad787c lvm2: Fix patch errors found with musl new 82dbf3f minicoredumper: Update to 2.0.0 new bc4d1aa libqb: Upgrade to 1.0.1 release new 2ae91dd xarchiver: Fix build with security flags turned on new 401fbd9 vorbis-tools: Fix build with security flags new 6c4caee libnih: Drop SIGCLD new 10ad20d libuio: Fix build with musl new 1250668 uml-utilities: Fix problem founds during musl build new 440258c synergy: Add unzip-native depenedency to right task new 147046c corosync: Update to 2.4.2 new e562c3a logfsprogs: Pass LDFLAGS to link steps new f84a551 v4l-utils: update to 1.12.3. new cea7dff plymouth: Fix virtual RPROVIDES new 2cdea6c opencv: do not depend on swig. new 58ab7e7 dnsmasq: disable the service by default new 6f2211f ctdb: Fix build with musl new 1b4faaa libdnet: update SRC_URI new 71e87d2 wireless-regdb: fix crda failing from missing pubkey new 111f5a1 ntp: update to 4.2.8.p10 new f02bf65 netcat-openbsd: Fix build and whitelist new d10e553 squid: Update to 3.5.23 new 3a6d00d libnfnetlink: Backport patches to fix musl build new a6fdeb5 ebtables: Fix build with musl new ee50a62 lowpan-tools: Fix build with musl new c618865 openl2tp: Fix build with musl new 42ae4be rp-pppoe: Fix build with musl new 8b43571 vsftpd: Fix build with musl new b4be2cf dibbler: Upgrade to 1.0.2RC1 new a1ea1e2 vpnc: Update to build from github SRC_URI new 2a069d2 daq: Fix build with musl new 344d12d arptables: Upgrade to 0.0.4 new e5adeee libnetfilter-log: Switch to git URI new 8a3bacd libnetfilter-queue: Update to git for SRC_URI new 14940fb snort: Fix build with musl new 6ba1224 autofs: Patch to build on musl new d128374 ntimed: Use adjtimex on musl This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3f2bc0c) \ N -- N -- N refs/heads/master-next (d128374) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 37 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../wireguard/wireguard-module_0.0.20170324.bb | 9 ------ .../wireguard/wireguard-tools_0.0.20170324.bb | 27 ------------------ .../recipes-kernel/wireguard/wireguard.inc | 18 ------------ .../tinyproxy/tinyproxy/tinyproxy.service | 14 ---------- .../recipes-support/tinyproxy/tinyproxy_1.8.4.bb | 32 ---------------------- meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 15 ---------- .../ttf-fonts/ttf-inconsolata_20100526.bb | 7 ++--- 7 files changed, 3 insertions(+), 119 deletions(-) delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20170324.bb delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20170324.bb delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard.inc delete mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service delete mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb delete mode 100644 meta-networking/recipes-support/uftp/uftp_4.9.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:20 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:20 +0000 Subject: [oe-commits] [meta-openembedded] 04/37: libqb: Upgrade to 1.0.1 release In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.CCA1523347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit bc4d1aa833f62e1bc270eaed99dfd50c0f7abe3a Author: Khem Raj AuthorDate: Wed Mar 29 16:37:15 2017 -0700 libqb: Upgrade to 1.0.1 release Add a patch needed for cross compiling Signed-off-by: Khem Raj --- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 ++++++++++++++++++++++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +++---- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch new file mode 100644 index 0000000..28bc5c0 --- /dev/null +++ b/meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch @@ -0,0 +1,43 @@ +From e6fbad0c122ba8e87b67a9e2447505adcaafe204 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 16:31:38 -0700 +Subject: [PATCH] Remove runtime check for CLOCK_MONOTONIC + +Does not work during cross compile + +use a compile-time check to detect whether the +monotonic clock is available. This check can run just fine when we are +cross-compiling. + +Signed-off-by: Khem Raj +--- + configure.ac | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fa13ae6..f4f0f46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,9 +175,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + ) + + AC_MSG_CHECKING(for a working clock_getres(CLOCK_MONOTONIC, &ts)) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include ]], +-[[struct timespec ts; if(clock_getres(CLOCK_MONOTONIC, &ts)) return -1;]])], ++[[ ++#include ++int main() { ++#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) ++ #error No monotonic clock ++#endif ++ return 0; ++ ++]])], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE_UNQUOTED([HAVE_CLOCK_GETRES_MONOTONIC], 1, [Define to 1 if clock_getres(CLOCK_MONOTONIC, &ts) works]) +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb similarity index 67% rename from meta-oe/recipes-extended/libqb/libqb_0.17.2.bb rename to meta-oe/recipes-extended/libqb/libqb_1.0.1.bb index 94030b2..e26bb7c 100644 --- a/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.1.bb @@ -4,22 +4,20 @@ It provides high performance logging, tracing, ipc, and poll." HOMEPAGE = "https://github.com/clusterlabs/libqb/wiki" SECTION = "libs" - LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" -inherit autotools-brokensep pkgconfig - -PV = "0.17.2+git${SRCPV}" +inherit autotools pkgconfig -SRCREV = "bd2c587f6ccacd8a5644b275d99324d200c2b378" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git" +PV .= "+git${SRCPV}" +SRCREV = "0a329683a76bc6aeb36f20f2bf6b43ba0440c4dc" +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ + file://0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch \ + " S = "${WORKDIR}/git" do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) } - - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:18 +0000 Subject: [oe-commits] [meta-openembedded] 02/37: lvm2: Fix patch errors found with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.BF0AD23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 3ad787c673817dfa3cc378b8300557fe624e44d9 Author: Khem Raj AuthorDate: Wed Mar 22 14:13:42 2017 -0700 lvm2: Fix patch errors found with musl The patches had syntax errors which are only visible when using musl libs Signed-off-by: Khem Raj --- .../lvm2/0001-implement-libc-specific-reopen_stream.patch | 13 ++++++------- .../lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch index f09fd76..5d72402 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-implement-libc-specific-reopen_stream.patch @@ -1,7 +1,7 @@ -From ede7976da9431573b0104dbcfe91a32c02dbea13 Mon Sep 17 00:00:00 2001 +From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:49:40 +0000 -Subject: [PATCH 1/4] implement libc specific reopen_stream +Subject: [PATCH] implement libc specific reopen_stream musl defines stdin/stdio/stderr as constant types which means we can not assign to them as we are doing here but works ok with glibc @@ -13,15 +13,14 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + --- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c -index c933154..638839d 100644 +index c933154..3581084 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ @@ -38,7 +37,7 @@ index c933154..638839d 100644 } +#else +{ -+ return (freopen(NULL, mode, *stream) != NULL) ++ return (freopen(NULL, mode, *stream) != NULL); +} +#endif @@ -76,5 +75,5 @@ index 9a4deb7..f1f18e6 100644 strerror(errno)); return 0; -- -2.9.3 +2.12.0 diff --git a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch index 5baafab..95dcede 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch @@ -1,20 +1,19 @@ -From 8706a6d33753d8b2cf5bb2a12bd6880b371ce337 Mon Sep 17 00:00:00 2001 +From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH 2/4] Guard use of mallinfo() with __GLIBC__ +Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ This API is glibc-only Signed-off-by: Khem Raj Signed-off-by: Dengke Du ---- -Upstream-Status: Pending + --- lib/mm/memlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index da90144..c1bf8fb 100644 +index da90144..f34f890 100644 --- a/lib/mm/memlock.c +++ b/lib/mm/memlock.c @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, size_t size) @@ -22,10 +21,10 @@ index da90144..c1bf8fb 100644 static void _allocate_memory(void) { -#ifndef VALGRIND_POOL -+#ifndef VALGRIND_POOL && defined(__GLIBC__) ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) void *stack_mem; struct rlimit limit; int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; -- -2.9.3 +2.12.0 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:22 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:22 +0000 Subject: [oe-commits] [meta-openembedded] 06/37: vorbis-tools: Fix build with security flags In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.D8418233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 401fbd9e50e06e8253135ca783adebebbdad44b1 Author: Khem Raj AuthorDate: Sat Apr 1 08:02:00 2017 -0700 vorbis-tools: Fix build with security flags Signed-off-by: Khem Raj --- ...error-blocking-compilation-with-hardening.patch | 26 ++++++++++++++++++++++ .../vorbis-tools/vorbis-tools_1.4.0.bb | 1 + 2 files changed, 27 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch new file mode 100644 index 0000000..111e98a --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch @@ -0,0 +1,26 @@ +From: Petter Reinholdtsen +Date: Wed, 22 Oct 2014 13:25:21 +0200 +Subject: Fix format error blocking compilation with hardening + +Last-Update: 2014-10-22 +Forwarded: no + +Enabling hardening refuses to compile code with sprintf() calls +with no formatting string. Adjust the code to work with hardening. +--- + ogg123/status.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ogg123/status.c b/ogg123/status.c +index 92b8ff1..ccec389 100644 +--- a/ogg123/status.c ++++ b/ogg123/status.c +@@ -148,7 +148,7 @@ int print_statistics_line (stat_format_t stats[]) + + switch (stats->type) { + case stat_noarg: +- len += sprintf(str+len, stats->formatstr); ++ len += sprintf(str+len, "%s", stats->formatstr); + break; + case stat_intarg: + len += sprintf(str+len, stats->formatstr, stats->arg.intarg); diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb index 2683555..e43cb40 100644 --- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb +++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb @@ -12,6 +12,7 @@ DEPENDS = "libogg libvorbis curl libao" SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ + file://0004-Fix-format-error-blocking-compilation-with-hardening.patch \ " SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:23 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:23 +0000 Subject: [oe-commits] [meta-openembedded] 07/37: libnih: Drop SIGCLD In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.DEF49233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6c4caeee6f737e069c871a25110938b7a1e2332e Author: Khem Raj AuthorDate: Sat Apr 1 08:53:44 2017 -0700 libnih: Drop SIGCLD Its not portable, especially musl does not support it Signed-off-by: Khem Raj --- ...GCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch | 28 ++++++++++++++++++++++ meta-oe/recipes-support/libnih/libnih_1.0.3.bb | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch new file mode 100644 index 0000000..a43b4b1 --- /dev/null +++ b/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch @@ -0,0 +1,28 @@ +From f1b9992caf9910f9f7afae401045e42572cc84ff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 1 Apr 2017 08:50:35 -0700 +Subject: [PATCH] signal.c: SIGCLD and SIGCHILD are same on sytem V systems + +Musl drops the SIGCLD legacy + +Signed-off-by: Khem Raj +--- + nih/signal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nih/signal.c b/nih/signal.c +index a241df9..691c8e6 100644 +--- a/nih/signal.c ++++ b/nih/signal.c +@@ -87,7 +87,7 @@ static const SignalName signal_names[] = { + { SIGSTKFLT, "STKFLT" }, + #endif + { SIGCHLD, "CHLD" }, +- { SIGCLD, "CLD" }, ++ { SIGCHLD, "CLD" }, + { SIGCONT, "CONT" }, + { SIGSTOP, "STOP" }, + { SIGTSTP, "TSTP" }, +-- +2.12.1 + diff --git a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb b/meta-oe/recipes-support/libnih/libnih_1.0.3.bb index 40aa896..02fe805 100644 --- a/meta-oe/recipes-support/libnih/libnih_1.0.3.bb +++ b/meta-oe/recipes-support/libnih/libnih_1.0.3.bb @@ -23,8 +23,9 @@ DEPENDS = "dbus libnih-native" DEPENDS_class-native = "dbus-native" SRC_URI = "https://launchpad.net/${BPN}/1.0/${PV}/+download/${BP}.tar.gz \ - file://libnih_1.0.3-4ubuntu16.patch \ -" + file://libnih_1.0.3-4ubuntu16.patch \ + file://0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch \ + " SRC_URI[md5sum] = "db7990ce55e01daffe19006524a1ccb0" SRC_URI[sha256sum] = "897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:26 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:26 +0000 Subject: [oe-commits] [meta-openembedded] 10/37: synergy: Add unzip-native depenedency to right task In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.01B5C23348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 440258c30ae596482ff21ddb93bc7141cb7c9c37 Author: Khem Raj AuthorDate: Wed Apr 5 03:05:24 2017 +0000 synergy: Add unzip-native depenedency to right task Fixes run.do_unpack_extra.26047: unzip: not found Signed-off-by: Khem Raj --- meta-oe/recipes-support/synergy/synergy_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb index e6057f4..1c55a8a 100644 --- a/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-oe/recipes-support/synergy/synergy_git.bb @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f366945b209c5523e39889f636af00a" LICENSE = "GPL-2.0" SECTION = "x11/utils" -DEPENDS = "virtual/libx11 libxtst libxinerama unzip-native curl openssl" +DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl" +do_unpack_extra[depends] = "unzip-native:do_populate_sysroot" # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:24 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:24 +0000 Subject: [oe-commits] [meta-openembedded] 08/37: libuio: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.E5324233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 10ad20d913202e2bdf5d341a73d44f317e4203b5 Author: Khem Raj AuthorDate: Sat Apr 1 09:14:12 2017 -0700 libuio: Fix build with musl It needs fcntl.h which is indirectly included on glibc append SRCPV to version Signed-off-by: Khem Raj --- .../0001-include-fcntl.h-for-O_RDWR-define.patch | 38 ++++++++++++++++++++++ meta-oe/recipes-extended/libuio/libuio_0.2.1.bb | 6 +++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch b/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch new file mode 100644 index 0000000..3cae5c9 --- /dev/null +++ b/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch @@ -0,0 +1,38 @@ +From d39c78d322585a32f9a55c67c25a99602ce08b12 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 1 Apr 2017 09:01:33 -0700 +Subject: [PATCH] include fcntl.h for O_RDWR define + +Signed-off-by: Khem Raj +--- + tools/lsuio.c | 1 + + tools/rwuio.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/tools/lsuio.c b/tools/lsuio.c +index 58eb922..4769446 100644 +--- a/tools/lsuio.c ++++ b/tools/lsuio.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "system.h" + #include "uio_helper.h" +diff --git a/tools/rwuio.c b/tools/rwuio.c +index aef9e90..ebc71e1 100644 +--- a/tools/rwuio.c ++++ b/tools/rwuio.c +@@ -20,6 +20,7 @@ + */ + #include + #include ++#include + #include + #include + +-- +2.12.1 + diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index f405197..dd34c18 100644 --- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -4,12 +4,16 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "git://git.code.sf.net/p/libuio/code \ - file://replace_inline_with_static-inline.patch" + file://replace_inline_with_static-inline.patch \ + file://0001-include-fcntl.h-for-O_RDWR-define.patch \ + " inherit autotools SRCREV = "ed4f07ea147ac403c28105ab44d01bbf524d36f9" +PV .= "+git${SRCPV}" + S = "${WORKDIR}/git" PACKAGES += "${PN}-tools" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:21 +0000 Subject: [oe-commits] [meta-openembedded] 05/37: xarchiver: Fix build with security flags turned on In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.D2982233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2ae91ddd68e1b621873baa319eaa05080719dfd1 Author: Khem Raj AuthorDate: Thu Mar 30 11:26:23 2017 -0700 xarchiver: Fix build with security flags turned on Signed-off-by: Khem Raj --- ...formatting-string-to-printf-like-function.patch | 40 ++++++++++++++++++++++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch new file mode 100644 index 0000000..a115883 --- /dev/null +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch @@ -0,0 +1,40 @@ +From baf93ea9acf845c5455d577ac19a6f680dac3d2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 11:22:42 -0700 +Subject: [PATCH] Add proper formatting string to printf-like functions + +Avoids potential security holes and makes compiler happy + +| ../../../../../../../workspace/sources/xarchiver/src/window.c:236:72: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] +| gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); + +Signed-off-by: Khem Raj +--- + src/window.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: git/src/window.c +=================================================================== +--- git.orig/src/window.c ++++ git/src/window.c +@@ -231,9 +231,9 @@ int xa_show_message_dialog (GtkWindow *w + { + int response; + +- dialog = gtk_message_dialog_new (window,mode,type,button,message1); ++ dialog = gtk_message_dialog_new (window,mode,type,button,"%s",message1); + gtk_dialog_set_default_response (GTK_DIALOG (dialog),GTK_RESPONSE_NO); +- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),message2); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),"%s",message2); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + return response; +@@ -511,7 +511,7 @@ void xa_list_archive (GtkMenuItem *menui + g_fprintf (stream,_("Comment:\n")); + if (bp) + g_fprintf(stream,"
");
+-			g_fprintf (stream,archive[idx]->comment->str);
++			g_fprintf (stream,"%s",archive[idx]->comment->str);
+ 			if (bp)
+ 				g_fprintf(stream,"
"); + g_fprintf (stream,"\n"); diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index ca29922..ea34a52 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" +SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master \ + file://0001-Add-proper-formatting-string-to-printf-like-function.patch \ + " SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" PV = "0.5.3" S = "${WORKDIR}/git" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:27 +0000 Subject: [oe-commits] [meta-openembedded] 11/37: corosync: Update to 2.4.2 In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.07E5823348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 147046ced77e106dacb896fc7c879e0fc507c6b1 Author: Khem Raj AuthorDate: Wed Apr 5 16:46:45 2017 +0000 corosync: Update to 2.4.2 Also fixes build with latest libqb 1.0.1+ Signed-off-by: Khem Raj --- .../corosync/{corosync_2.4.0.bb => corosync_2.4.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb similarity index 94% rename from meta-oe/recipes-extended/corosync/corosync_2.4.0.bb rename to meta-oe/recipes-extended/corosync/corosync_2.4.2.bb index c168e0c..ec1deac 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.0.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb @@ -8,8 +8,8 @@ SECTION = "base" inherit autotools pkgconfig systemd SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "11bdd5ee2aed5eb2443dd6d6acd6a1ab" -SRC_URI[sha256sum] = "6fe9523852a892701c4c28c1cd32e067e44cf0e696d5ecf3790afdef1fc309cb" +SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" +SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:30 +0000 Subject: [oe-commits] [meta-openembedded] 14/37: plymouth: Fix virtual RPROVIDES In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.1B892233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit cea7dff3ef92a704e0592b5dc5ef87ff120ef907 Author: robert_joslyn at selinc.com AuthorDate: Mon Apr 3 13:18:10 2017 -0700 plymouth: Fix virtual RPROVIDES Runtime package names cannot have slashes in them, so replace "virtual/" with "virtual-" in RPROVIDES. Signed-off-by: Robert Joslyn Signed-off-by: Martin Jansa --- meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb index 1c1a02d..6163cff 100644 --- a/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libcap libpng cairo dbus udev" PROVIDES = "virtual/psplash" -RPROVIDES_${PN} = "virtual/psplash virtual/psplash-support" +RPROVIDES_${PN} = "virtual-psplash virtual-psplash-support" SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:25 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:25 +0000 Subject: [oe-commits] [meta-openembedded] 09/37: uml-utilities: Fix problem founds during musl build In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110116.EECB8233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1250668972522b6f1552de23b7cfc4a93701c24b Author: Khem Raj AuthorDate: Mon Apr 3 17:17:17 2017 -0700 uml-utilities: Fix problem founds during musl build Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...uired-system-header-files-for-fd_set-and-.patch | 41 ++++++++++++++++++++++ .../uml-utilities/uml-utilities_20040406.bb | 5 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch new file mode 100644 index 0000000..38e945d --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch @@ -0,0 +1,41 @@ +From a8d85949a068ee6cd9a2f923cd039047993f239e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 3 Apr 2017 17:11:32 -0700 +Subject: [PATCH] include required system header files for fd_set and makedev + +fd_set comes from sys/select.h +makedev macro is defined in sys/sysmacros.h + +Signed-off-by: Khem Raj +--- + uml_net/ethertap.c | 1 + + uml_net/host.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/uml_net/ethertap.c b/uml_net/ethertap.c +index ddd41f2..57f7119 100644 +--- a/uml_net/ethertap.c ++++ b/uml_net/ethertap.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include "host.h" +diff --git a/uml_net/host.c b/uml_net/host.c +index 65c20df..fc04cd4 100644 +--- a/uml_net/host.c ++++ b/uml_net/host.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include "output.h" + #include "host.h" + +-- +2.12.2 + diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 45cc2e7..ed19d1e 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -3,10 +3,11 @@ SUMMARY = "Utilities for User-Mode-Linux" LICENSE = "GPL-2.0" DEPENDS = "zlib ncurses readline" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ +SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ file://fix-ldflags.patch \ file://unstrip.patch \ -" + file://0001-include-required-system-header-files-for-fd_set-and-.patch \ + " SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:29 +0000 Subject: [oe-commits] [meta-openembedded] 13/37: v4l-utils: update to 1.12.3. In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.15F04233490@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit f84a551f2d419df88b85987855fec866d9e84b4a Author: Ismo Puustinen AuthorDate: Mon Apr 3 15:27:36 2017 +0300 v4l-utils: update to 1.12.3. Also add a patch which fixes building outside the source tree. Signed-off-by: Ismo Puustinen Acked-by: Otavio Salvador Signed-off-by: Martin Jansa --- ...a-ctl-Don-t-install-libmediactl-and-libv4.patch | 18 ++-- ...tem-do-not-assume-building-in-source-tree.patch | 110 +++++++++++++++++++++ .../{v4l-utils_1.10.1.bb => v4l-utils_1.12.3.bb} | 5 +- 3 files changed, 124 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch index 4b3de3c..7413094 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch @@ -1,4 +1,4 @@ -From 4ee15a8a69b84526ece1180a288a37db077bcd9b Mon Sep 17 00:00:00 2001 +From 2d6bfa75b2e16b4d764f1bf00bb902fb4b5e507b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 27 Feb 2015 21:55:36 +0000 Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and @@ -11,23 +11,27 @@ Signed-off-by: Khem Raj Conflicts: utils/media-ctl/Makefile.am --- - utils/media-ctl/Makefile.am | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) + utils/media-ctl/Makefile.am | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index a3931fb..fe1fea5 100644 +index ee7dcc9..d11fa2e 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am -@@ -1,14 +1,9 @@ +@@ -1,8 +1,7 @@ -noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la - +lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h -libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) -libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) -- +libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) +libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) + + media-bus-format-names.h: ../../include/linux/media-bus-format.h + sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ +@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) + nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) libv4l2subdev_la_SOURCES = libv4l2subdev.c libv4l2subdev_la_LIBADD = libmediactl.la -libv4l2subdev_la_CFLAGS = -static @@ -37,5 +41,5 @@ index a3931fb..fe1fea5 100644 noinst_HEADERS = mediactl.h v4l2subdev.h -- -2.1.4 +2.9.3 diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch new file mode 100644 index 0000000..54161f9 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch @@ -0,0 +1,110 @@ +From 806822f5acb756d5acda0f9063c84b28b38b3ffb Mon Sep 17 00:00:00 2001 +From: Ismo Puustinen +Date: Mon, 3 Apr 2017 13:23:38 +0300 +Subject: [PATCH v4l-utils] buildsystem: do not assume building in source tree. + +Use $(top_srcdir) as reference for include paths and buildtime scripts. +Otherwise compilation outside of project root directory will fail +because header and script paths are wrong. + +To reproduce: mkdir b; cd b; ../configure; make + +Upstream-status: Accepted [https://git.linuxtv.org//v4l-utils.git/commit/?id=bd98c9a99bffc8d44c54859345e4dfee0ada4275] + +Signed-off-by: Ismo Puustinen +--- + utils/cec-compliance/Makefile.am | 2 +- + utils/cec-ctl/Makefile.am | 2 +- + utils/cec-follower/Makefile.am | 4 ++-- + utils/qv4l2/Makefile.am | 2 +- + utils/v4l2-compliance/Makefile.am | 2 +- + utils/v4l2-ctl/Makefile.am | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am +index ec5de51..8331aa0 100644 +--- a/utils/cec-compliance/Makefile.am ++++ b/utils/cec-compliance/Makefile.am +@@ -7,7 +7,7 @@ cec_compliance_LDFLAGS = -lrt + cec-compliance.cpp: cec-table.h + + cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + cec-compliance.cpp: version.h + +diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am +index 0a7ef22..6afb6c9 100644 +--- a/utils/cec-ctl/Makefile.am ++++ b/utils/cec-ctl/Makefile.am +@@ -7,7 +7,7 @@ cec_ctl_LDFLAGS = -lrt + cec-ctl.cpp: cec-ctl-gen.h + + cec-ctl-gen.h: msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ./msg2ctl.pl 0 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 0 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + clean-local: + -rm -vf cec-ctl-gen.h +diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am +index 538edb2..fdbf3d9 100644 +--- a/utils/cec-follower/Makefile.am ++++ b/utils/cec-follower/Makefile.am +@@ -7,12 +7,12 @@ cec_follower_LDFLAGS = -lrt + cec-log.cpp: cec-log.h + + cec-log.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ../cec-ctl/msg2ctl.pl 1 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 1 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + cec-follower.cpp: cec-table.h version.h + + cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h +- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ ++ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ + + version.h: + @if git rev-parse HEAD >/dev/null 2>&1; then \ +diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am +index fd58486..ccd1a2a 100644 +--- a/utils/qv4l2/Makefile.am ++++ b/utils/qv4l2/Makefile.am +@@ -8,7 +8,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c + nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp + qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \ + ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la +-qv4l2_CPPFLAGS = -I../common ++qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common + + if WITH_QTGL + qv4l2_CPPFLAGS += $(QTGL_CFLAGS) +diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am +index 03db8df..18b9892 100644 +--- a/utils/v4l2-compliance/Makefile.am ++++ b/utils/v4l2-compliance/Makefile.am +@@ -5,7 +5,7 @@ DEFS := + v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \ + v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp v4l2-test-buffers.cpp \ + v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h +-v4l2_compliance_CPPFLAGS = -I../common ++v4l2_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common + + if WITH_V4L2_COMPLIANCE_LIBV4L + v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread +diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am +index 955647d..825e53f 100644 +--- a/utils/v4l2-ctl/Makefile.am ++++ b/utils/v4l2-ctl/Makefile.am +@@ -7,7 +7,7 @@ v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cp + v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \ + v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \ + v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c +-v4l2_ctl_CPPFLAGS = -I../common ++v4l2_ctl_CPPFLAGS = -I$(top_srcdir)/utils/common + + if WITH_V4L2_CTL_LIBV4L + v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread +-- +2.9.3 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb similarity index 89% rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb index 4d87b50..42da5cc 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.10.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb @@ -15,11 +15,12 @@ PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ + file://0001-buildsystem-do-not-assume-building-in-source-tree.patch \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ " -SRC_URI[md5sum] = "936c9c58343840e91294e4dcec7dc05f" -SRC_URI[sha256sum] = "6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0" +SRC_URI[md5sum] = "89e1ed6c69c94e0489dc0a638c7841aa" +SRC_URI[sha256sum] = "5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:31 +0000 Subject: [oe-commits] [meta-openembedded] 15/37: opencv: do not depend on swig. In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.215A3233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2cdea6c5bb09aa90184c17c9157f4fed0e10b3c2 Author: Ismo Puustinen AuthorDate: Tue Apr 4 10:40:58 2017 +0300 opencv: do not depend on swig. Since swig is a code generator, just depend on swig-native. Signed-off-by: Ismo Puustinen Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index f50bc05..b5b4968 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b2f8752cc5edf504d283107d033f544" ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" -DEPENDS = "libtool swig swig-native bzip2 zlib glib-2.0 libwebp" +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" SRCREV_opencv = "70bbf17b133496bd7d54d034b0f94bd869e0e810" SRCREV_contrib = "86342522b0eb2b16fa851c020cc4e0fef4e010b7" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:28 +0000 Subject: [oe-commits] [meta-openembedded] 12/37: logfsprogs: Pass LDFLAGS to link steps In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.0E97823348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit e562c3adeb230bd5c99ff3d9d47eb84af99f509b Author: Khem Raj AuthorDate: Wed Apr 5 17:50:01 2017 +0000 logfsprogs: Pass LDFLAGS to link steps Fixes QA errors about missing GNU_HASH Signed-off-by: Khem Raj --- .../0001-Add-LDFLAGS-to-linker-cmdline.patch | 46 ++++++++++++++++++++++ .../logfsprogs/logfsprogs_git.bb | 7 ++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch new file mode 100644 index 0000000..30ad1b8 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch @@ -0,0 +1,46 @@ +From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 5 Apr 2017 17:36:45 +0000 +Subject: [PATCH] Add $(LDFLAGS) to linker cmdline + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -14,7 +14,7 @@ ZLIB_O := crc32.o deflate.o adler32.o co + CC := gcc + CHECK := cgcc + CHECKFLAGS := -D__CHECK_ENDIAN__ +-CFLAGS := -std=gnu99 ++CFLAGS += -std=gnu99 + CFLAGS += -Wall + CFLAGS += -Os + CFLAGS += -D_FILE_OFFSET_BITS=64 +@@ -28,18 +28,18 @@ $(ZLIB_O): /usr/lib/libz.a + + ifdef S + EXTRA_OBJ := $(ZLIB_O) +-CFLAGS += -static ++LDFLAGS += -static + else +-CFLAGS += -lz ++LDFLAGS += -lz + endif + + mklogfs: $(EXTRA_OBJ) + mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + logfsck: $(ZLIB_O) + logfsck: fsck.o lib.o journal.o super.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + $(OBJ): kerncompat.h logfs.h logfs_abi.h btree.h + diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index 7648667..c41f0ea 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -11,7 +11,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" DEPENDS = "zlib" -SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git" +SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ + file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ +" SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" S = "${WORKDIR}/git" @@ -24,6 +26,3 @@ do_install () { } BBCLASSEXTEND = "native nativesdk" - -# logfsprogs-git: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/logfsprogs/git-r0/packages-split/logfsprogs/usr/bin/mklogfs' [ldflags] -PNBLACKLIST[logfsprogs] ?= "Doesn't have proper PV, doesn't respect LDFLAGS - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:32 +0000 Subject: [oe-commits] [meta-openembedded] 16/37: dnsmasq: disable the service by default In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.27E4D233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 58ab7e758ba380b6a427924ba056f5dff77ee8ce Author: Jackie Huang AuthorDate: Mon Feb 27 16:09:59 2017 +0800 dnsmasq: disable the service by default The service will fail to start/stop when dnsmasq and bind (provides named) are both installed since they are using the same port 53: | dnsmasq: failed to create listening socket for port 53: Address already in use So disable the service by default, if the user really want to use two dns servives, the config needs to be changed to use different interfaces or ports. As reference, other distro like centos/fedora also disables the services by default on installation. Signed-off-by: Jackie Huang Signed-off-by: Jackie Huang > Signed-off-by: Martin Jansa --- meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index ef79c5f..3d0386b 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -81,3 +81,4 @@ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "dnsmasq.service" +SYSTEMD_AUTO_ENABLE ?= "disable" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:35 +0000 Subject: [oe-commits] [meta-openembedded] 19/37: wireless-regdb: fix crda failing from missing pubkey In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.3ABC723349B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 71e87d23376f2ed714ce571ad839d284d4a8a6c3 Author: Aaron Zinghini AuthorDate: Fri Mar 24 08:54:27 2017 -0700 wireless-regdb: fix crda failing from missing pubkey crda fails with exit code 255 because the public key from wireless-regdb is missing. Signed-off-by: Aaron Zinghini Signed-off-by: Martin Jansa --- .../recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb index a9119ea..64e9401 100644 --- a/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb +++ b/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb @@ -12,7 +12,9 @@ inherit bin_package do_install() { install -d -m0755 ${D}${libdir}/crda + install -d -m0755 ${D}${sysconfdir}/wireless-regdb/pubkeys install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin + install -m 0644 sforshee.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/sforshee.key.pub.pem } RSUGGESTS_${PN} = "crda" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:37 +0000 Subject: [oe-commits] [meta-openembedded] 21/37: netcat-openbsd: Fix build and whitelist In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.4911523349F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit f02bf65221f1c74576756c4d2f6a9bda3e6cf8f5 Author: Khem Raj AuthorDate: Tue Mar 21 10:03:08 2017 -0700 netcat-openbsd: Fix build and whitelist pkgconfig is used so we need to inherit pkgconfig secondly, base64 support is added for it to work with musl Signed-off-by: Khem Raj --- ...bundle-own-base64-encode-decode-functions.patch | 379 +++++++++++++++++++++ .../recipes-support/netcat/netcat-openbsd_1.105.bb | 20 +- meta-networking/recipes-support/netcat/netcat.inc | 2 +- 3 files changed, 395 insertions(+), 6 deletions(-) diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch new file mode 100644 index 0000000..0966b65 --- /dev/null +++ b/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch @@ -0,0 +1,379 @@ +From ccd166b73eaae4dd1e1785c63ceb9b303568ed46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 Mar 2017 11:30:49 -0700 +Subject: [PATCH] bundle own base64 encode/decode functions + +Not all libc implementations provide it. +as an aside libresolv is no longer needed + +Signed-off-by: Khem Raj +--- + Makefile | 4 +- + base64.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + netcat.c | 2 + + socks.c | 3 + + 4 files changed, 320 insertions(+), 2 deletions(-) + create mode 100644 base64.c + +Index: netcat-openbsd-1.105/Makefile +=================================================================== +--- netcat-openbsd-1.105.orig/Makefile ++++ netcat-openbsd-1.105/Makefile +@@ -1,9 +1,9 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c base64.c + +-LIBS= `pkg-config --libs libbsd` -lresolv ++LIBS= `pkg-config --libs libbsd` + OBJS= $(SRCS:.c=.o) + CFLAGS= -g -O2 + LDFLAGS= -Wl,--no-add-needed +Index: netcat-openbsd-1.105/base64.c +=================================================================== +--- /dev/null ++++ netcat-openbsd-1.105/base64.c +@@ -0,0 +1,313 @@ ++/* ++ * Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#if !defined(LINT) && !defined(CODECENTER) ++static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $"; ++#endif /* not lint */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define Assert(Cond) if (!(Cond)) abort() ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ size_t i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ Assert(output[3] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ Assert(output[0] < 64); ++ Assert(output[1] < 64); ++ Assert(output[2] < 64); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++//libresolv_hidden_def (b64_ntop) ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(char const *src, u_char *target, size_t targsize) { ++ int tarindex, state, ch; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = *src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ target[tarindex+1] = ((pos - Base64) & 0x0f) ++ << 4 ; ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if ((size_t)tarindex + 1 >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ target[tarindex+1] = ((pos - Base64) & 0x03) ++ << 6; ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if ((size_t)tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ default: ++ abort(); ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = *src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = *src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for ((void)NULL; ch != '\0'; ch = *src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +Index: netcat-openbsd-1.105/netcat.c +=================================================================== +--- netcat-openbsd-1.105.orig/netcat.c ++++ netcat-openbsd-1.105/netcat.c +@@ -169,6 +169,9 @@ static int connect_with_timeout(int fd, + socklen_t salen, int ctimeout); + static void quit(); + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int + main(int argc, char *argv[]) + { +Index: netcat-openbsd-1.105/socks.c +=================================================================== +--- netcat-openbsd-1.105.orig/socks.c ++++ netcat-openbsd-1.105/socks.c +@@ -53,6 +53,9 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const *src, u_char *target, size_t targsize); ++ + int remote_connect(const char *, const char *, struct addrinfo); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index e0a0328..76a32a5 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -2,12 +2,15 @@ require netcat.inc SUMMARY = "OpenBSD Netcat" HOMEPAGE = "http://ftp.debian.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee6bbaacb5db5f2973818f0902c3ae6f" DEPENDS += "glib-2.0 libbsd" +do_patch[depends] = "quilt-native:do_populate_sysroot" SRC_URI = "${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz;name=netcat \ - ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch" + ${DEBIAN_MIRROR}/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz;name=netcat-patch;subdir=${PN}-${PV} \ + file://0001-bundle-own-base64-encode-decode-functions.patch \ + " SRC_URI[netcat.md5sum] = "7e67b22f1ad41a1b7effbb59ff28fca1" SRC_URI[netcat.sha256sum] = "40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e" @@ -16,8 +19,6 @@ SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a inherit pkgconfig -S = "${WORKDIR}/${BPN}-${PV}" - EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" do_configure[noexec] = "1" @@ -25,9 +26,18 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} quilt pop -a || true - QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a + if [ -d ${S}/.pc-netcat ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-netcat ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-netcat } +do_unpack[cleandirs] += "${S}" + python do_patch() { bb.build.exec_func('netcat_do_patch', d) bb.build.exec_func('patch_do_patch', d) diff --git a/meta-networking/recipes-support/netcat/netcat.inc b/meta-networking/recipes-support/netcat/netcat.inc index 91a24a1..1544164 100644 --- a/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-networking/recipes-support/netcat/netcat.inc @@ -9,7 +9,7 @@ connection you would need and has several interesting built-in \ capabilities." SECTION = "net" -inherit update-alternatives gettext +inherit update-alternatives gettext pkgconfig ALTERNATIVE_${PN} = "nc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:33 +0000 Subject: [oe-commits] [meta-openembedded] 17/37: ctdb: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.2DA16233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6f2211fbf7a245148ce5d6955f5bb7b5ca61269f Author: Khem Raj AuthorDate: Wed Mar 22 11:45:28 2017 -0700 ctdb: Fix build with musl Fixes | ./utils/smnotify/smnotify.h:9:10: fatal error: 'rpc/rpc.h' file not found | #include Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 7cea0f6..b5a6064 100644 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -27,6 +27,9 @@ PACKAGECONFIG[libtdb] = "--without-included-tdb,--with-included-tdb,libtdb" PARALLEL_MAKE = "" DEPENDS += "popt libtevent libtalloc libldb" +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" # ctdbd_wrapper requires pgrep, hence procps RDEPENDS_${PN} += "procps" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:36 +0000 Subject: [oe-commits] [meta-openembedded] 20/37: ntp: update to 4.2.8.p10 In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.4196C23349D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 111f5a106973d5e1ad579a3bc4677991ac315bdd Author: Armin Kuster AuthorDate: Fri Mar 24 09:22:55 2017 -0700 ntp: update to 4.2.8.p10 LICENSE_FILE md5 changed do to copyright date change. NTF's NTP Project is releasing ntp-4.2.8p10, which addresses: 6 MEDIUM severity vulnerabilities (1 is about the Windows PPSAPI DLL) 5 LOW severity vulnerabilities (2 are in the Windows Installer) 4 Informational-level vulnerabilities 15 other non-security fixes and improvements All of the security issues in this release are listed in VU#633849. ntp-4.2.8p10 was released on 21 March 2017. Sec 3389 / CVE-2017-6464 / VU#325339: NTP-01-016 NTP: Denial of Service via Malformed Config (Pentest report 01.2017) Sec 3388 / CVE-2017-6462 / VU#325339: NTP-01-014 NTP: Buffer Overflow in DPTS Clock (Pentest report 01.2017) Sec 3387 / CVE-2017-6463 / VU#325339: NTP-01-012 NTP: Authenticated DoS via Malicious Config Option (Pentest report 01.2017) Sec 3386: NTP-01-011 NTP: ntpq_stripquotes() returns incorrect Value (Pentest report 01.2017) Sec 3385: NTP-01-010 NTP: ereallocarray()/eallocarray() underused (Pentest report 01.2017) Sec 3384 / CVE-2017-6455 / VU#325339: NTP-01-009 NTP: Windows: Privileged execution of User Library code (Pentest report 01.2017) Sec 3383 / CVE-2017-6452 / VU#325339: NTP-01-008 NTP: Windows Installer: Stack Buffer Overflow from Command Line (Pentest report 01.2017) Sec 3382 / CVE-2017-6459 / VU#325339: NTP-01-007 NTP: Windows Installer: Data Structure terminated insufficiently (Pentest report 01.2017) Sec 3381: NTP-01-006 NTP: Copious amounts of Unused Code (Pentest report 01.2017) Sec 3380: NTP-01-005 NTP: Off-by-one in Oncore GPS Receiver (Pentest report 01.2017) Sec 3379 / CVE-2017-6458 / VU#325339: NTP-01-004 NTP: Potential Overflows in ctl_put() functions (Pentest report 01.2017) Sec 3378 / CVE-2017-6451 / VU#325339: NTP-01-003 Improper use of snprintf() in mx4200_send() (Pentest report 01.2017) Sec 3377 / CVE-2017-6460 / VU#325339: NTP-01-002 Buffer Overflow in ntpq when fetching reslist (Pentest report 01.2017) Sec 3376: NTP-01-001 Makefile does not enforce Security Flags (Pentest report 01.2017) Sec 3361 / CVE-2016-9042 / VU#325339: 0rigin Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa --- .../recipes-support/ntp/{ntp_4.2.8p9.bb => ntp_4.2.8p10.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb similarity index 96% rename from meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb rename to meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb index 58b31c5..719c60b 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p9.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p10.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f41fedb22dffefcbfafecc85b0f79cfa" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=e877a1d567a6a58996d2b66e3e387003" DEPENDS = "libevent" @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "857452b05f5f2e033786f77ade1974ed" -SRC_URI[sha256sum] = "b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72" +SRC_URI[md5sum] = "745384ed0dedb3f66b33fe84d66466f9" +SRC_URI[sha256sum] = "ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f" inherit autotools update-rc.d useradd systemd pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:34 +0000 Subject: [oe-commits] [meta-openembedded] 18/37: libdnet: update SRC_URI In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.346EE233499@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1b4faaa3fe929187532ef58d66a3e6a4131ce52d Author: Kai Kang AuthorDate: Thu Mar 23 11:04:55 2017 +0800 libdnet: update SRC_URI The official homepage libdnet.googlecode.com has been redirected to github. So update SRC_URI to use git repo on github. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 28b6c82..f48b655 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -4,10 +4,10 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=0036c1b155f4e999f3e0a373490b5db9" -SRC_URI = "http://libdnet.googlecode.com/files/libdnet-${PV}.tgz" +SRC_URI = "git://github.com/dugsong/libdnet.git;nobranch=1" +SRCREV = "12fca29a6d4e99d1b923d6820887fe7b24226904" -SRC_URI[md5sum] = "9253ef6de1b5e28e9c9a62b882e44cc9" -SRC_URI[sha256sum] = "83b33039787cf99990e977cef7f18a5d5e7aaffc4505548a83d31bd3515eb026" +S = "${WORKDIR}/git" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:41 +0000 Subject: [oe-commits] [meta-openembedded] 25/37: lowpan-tools: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.6A38B2334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit ee50a6257f3eef633e6aa83781b4a5b7b39d5804 Author: Khem Raj AuthorDate: Mon Mar 27 17:59:24 2017 -0700 lowpan-tools: Fix build with musl Signed-off-by: Khem Raj --- ...d-config-parse.y-add-missing-time.h-inclu.patch | 44 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 45 insertions(+) diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch new file mode 100644 index 0000000..0a81a22 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch @@ -0,0 +1,44 @@ +From ab725a3faaeead90ae3c63cbcd370af087c413a5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Mon, 27 Mar 2017 17:55:06 -0700 +Subject: [PATCH] addrdb/coord-config-parse.y: add missing include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The %union definition uses the time_t structure. In order to use this +structure, the header has to be included. Otherwise, the build +breaks with some C libraries, such as musl: + +In file included from coord-config-lex.l:23:0: +coord-config-parse.y:107:2: error: unknown type name ?time_t? + time_t timestamp; + ^ + +This patch includes using the '%code requires' directive of +Yacc. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Khem Raj +--- + addrdb/coord-config-parse.y | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y +index 2e10a88..85ee058 100644 +--- a/addrdb/coord-config-parse.y ++++ b/addrdb/coord-config-parse.y +@@ -102,6 +102,10 @@ + + %} + ++%code requires { ++#include ++} ++ + %union { + unsigned long number; + time_t timestamp; +-- +2.12.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 8c7dbc0..139eb78 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -11,6 +11,7 @@ PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ + file://0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch \ " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:50 +0000 Subject: [oe-commits] [meta-openembedded] 34/37: libnetfilter-queue: Update to git for SRC_URI In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.A58A12334B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8a3bacd5dd3edc6c1ca5d017c4f9c4271ef82f39 Author: Khem Raj AuthorDate: Thu Mar 30 13:29:01 2017 -0700 libnetfilter-queue: Update to git for SRC_URI brings in the fixes to build on musl Add a typo fix patch Signed-off-by: Khem Raj --- ...o-in-the-location-of-internal.h-in-includ.patch | 26 ++++++++++++++++++++++ .../libnetfilter/libnetfilter-queue_1.0.2.bb | 11 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch new file mode 100644 index 0000000..76d2d5d --- /dev/null +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch @@ -0,0 +1,26 @@ +From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 13:26:56 -0700 +Subject: [PATCH] Correct typo in the location of internal.h in #include + +Signed-off-by: Khem Raj +--- + src/libnetfilter_queue.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c +index 211a8ba..065d618 100644 +--- a/src/libnetfilter_queue.c ++++ b/src/libnetfilter_queue.c +@@ -32,7 +32,7 @@ + + #include + #include +-#include "src/internal.h" ++#include "internal.h" + + /** + * \mainpage +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb index ddf2aa5..0ca074c 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb @@ -6,10 +6,13 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "df09befac35cb215865b39a36c96a3fa" -SRC_URI[tar.sha256sum] = "838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32" +PV .= "+git${SRCREV}" +SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" -S = "${WORKDIR}/libnetfilter_queue-${PV}" +SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ + file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ + " + +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:47 +0000 Subject: [oe-commits] [meta-openembedded] 31/37: daq: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.91C462334B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2a069d299b8ba1ba991990ecceb7df618d41e63e Author: Khem Raj AuthorDate: Thu Mar 30 00:18:57 2017 -0700 daq: Fix build with musl unistd.h is not in sys/ on all platforms use standard location in /usr/include to look for it Signed-off-by: Khem Raj --- .../recipes-connectivity/daq/daq_2.0.6.bb | 4 ++- .../0001-correct-the-location-of-unistd.h.patch | 29 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 952d7a4..47cb163 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -9,7 +9,9 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet" SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ - file://disable-run-test-program-while-cross-compiling.patch " + file://disable-run-test-program-while-cross-compiling.patch \ + file://0001-correct-the-location-of-unistd.h.patch \ + " # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: diff --git a/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch new file mode 100644 index 0000000..4798a77 --- /dev/null +++ b/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch @@ -0,0 +1,29 @@ +From 10e7d4e4bfcb70344d18f0d4ce36068475747f25 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 15:59:43 -0700 +Subject: [PATCH] correct the location of unistd.h + +Signed-off-by: Khem Raj +--- + os-daq-modules/daq_ipfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c +index 016beb0..c2a4175 100644 +--- a/os-daq-modules/daq_ipfw.c ++++ b/os-daq-modules/daq_ipfw.c +@@ -23,10 +23,10 @@ + #include + #include + #include ++#include + + #include + #include +-#include + + #include + #include +-- +2.12.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:38 +0000 Subject: [oe-commits] [meta-openembedded] 22/37: squid: Update to 3.5.23 In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.506E92334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d10e5533e2140494d7d1e0596cc91d704e14fc6f Author: Khem Raj AuthorDate: Wed Mar 22 14:39:47 2017 -0700 squid: Update to 3.5.23 Disable NIS on musl, it doesnt yet build Signed-off-by: Khem Raj --- .../recipes-daemons/squid/{squid_3.5.20.bb => squid_3.5.23.bb} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb similarity index 95% rename from meta-networking/recipes-daemons/squid/squid_3.5.20.bb rename to meta-networking/recipes-daemons/squid/squid_3.5.23.bb index 2e9e1f1..0fe9673 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb @@ -22,13 +22,12 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://set_sysroot_patch.patch \ file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ " +SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22" +SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd" LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ " -SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60" -SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1" - DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools useradd ptest @@ -45,7 +44,9 @@ PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -BASIC_AUTH = "DB SASL LDAP NIS" +BASIC_AUTH = "DB SASL LDAP" +BASIC_AUTH_append_libc-glibc = " NIS" + DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:43 +0000 Subject: [oe-commits] [meta-openembedded] 27/37: rp-pppoe: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.782532334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 42ae4be5e064daecb4b8569cbe447a85ec99e7ab Author: Khem Raj AuthorDate: Tue Mar 28 19:30:16 2017 -0700 rp-pppoe: Fix build with musl Signed-off-by: Khem Raj --- .../0001-ppoe-Dont-include-linux-if_ether.h.patch | 30 ++++++++++++++++++++++ ...0002-Enable-support-for-the-kernel-module.patch | 25 ++++++++++++++++++ .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 5 +++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch new file mode 100644 index 0000000..11356ce --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch @@ -0,0 +1,30 @@ +From 8d4d452d733bac8c5b55a90bddec8cc323cc9fa8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:20:07 -0700 +Subject: [PATCH 1/2] ppoe: Dont include linux/if_ether.h + +Fixes build with musl + +Signed-off-by: Khem Raj +--- + src/pppoe.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/pppoe.h b/src/pppoe.h +index ec067a0..281879c 100644 +--- a/src/pppoe.h ++++ b/src/pppoe.h +@@ -127,10 +127,6 @@ typedef unsigned long UINT32_t; + #error Could not find a 32-bit integer type + #endif + +-#ifdef HAVE_LINUX_IF_ETHER_H +-#include +-#endif +- + #include + + #ifdef HAVE_NETINET_IF_ETHER_H +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch new file mode 100644 index 0000000..139d1f0 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch @@ -0,0 +1,25 @@ +From aca8473a516a8dc013866105da141fe1cd947474 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 19:24:53 -0700 +Subject: [PATCH 2/2] Enable support for the kernel module + +Signed-off-by: Khem Raj +--- + src/configure.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/configure.in b/src/configure.in +index cae0976..951a042 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -33,6 +33,7 @@ AC_CHECK_HEADERS(linux/if_pppox.h, [], [], + #include + #include + #include ++#include + ]) + + dnl Checks for typedefs, structures, and compiler characteristics. +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb index e1ca17f..fbe015f 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -17,7 +17,10 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ file://pppoe-server.default \ file://pppoe-server.init \ file://configure.in-Error-fix.patch \ - file://pppoe-server.service" + file://pppoe-server.service \ + file://0001-ppoe-Dont-include-linux-if_ether.h.patch \ + file://0002-Enable-support-for-the-kernel-module.patch \ + " SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:45 +0000 Subject: [oe-commits] [meta-openembedded] 29/37: dibbler: Upgrade to 1.0.2RC1 In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.83F9D2334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b4be2cfce38f8d2ebba95a70cd42daac4e2552a2 Author: Khem Raj AuthorDate: Wed Mar 29 15:36:19 2017 -0700 dibbler: Upgrade to 1.0.2RC1 Delete dibbler from meta-oe Signed-off-by: Khem Raj --- .../dibbler/dibbler_fix_getSize_crash.patch | 56 ++++--------- .../dibbler/dibbler/types.patch | 96 ---------------------- .../dibbler/{dibbler_1.0.1.bb => dibbler_git.bb} | 16 ++-- .../recipes-connectivity/dibbler/dibbler_1.0.1.bb | 40 --------- 4 files changed, 24 insertions(+), 184 deletions(-) diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch index adb249f..42d2627 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch +++ b/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch @@ -1,32 +1,8 @@ -diff --git a/ClntMessages/ClntMsg.cpp b/ClntMessages/ClntMsg.cpp -index eeaadd0..0cf5dce 100644 ---- a/ClntMessages/ClntMsg.cpp -+++ b/ClntMessages/ClntMsg.cpp -@@ -346,7 +346,9 @@ unsigned long TClntMsg::getTimeout() - - void TClntMsg::send() - { -- char* pkt = new char[getSize()]; -+ size_t size = getSize(); -+ char* pkt = new char[size]; -+ memset(pkt, 0, size); - - srand((uint32_t)time(NULL)); - if (!RC) -@@ -364,7 +366,7 @@ void TClntMsg::send() - - RC++; - -- this->storeSelf(pkt); -+ storeSelf(pkt); - - SPtr ptrIface = ClntIfaceMgr().getIfaceByID(Iface); - if (!ptrIface) { -diff --git a/ClntMessages/ClntMsgRequest.cpp b/ClntMessages/ClntMsgRequest.cpp -index 4a7b5da..f3e40fd 100644 ---- a/ClntMessages/ClntMsgRequest.cpp -+++ b/ClntMessages/ClntMsgRequest.cpp -@@ -143,7 +143,10 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, +Index: git/ClntMessages/ClntMsgRequest.cpp +=================================================================== +--- git.orig/ClntMessages/ClntMsgRequest.cpp ++++ git/ClntMessages/ClntMsgRequest.cpp +@@ -142,7 +142,10 @@ TClntMsgRequest::TClntMsgRequest(List(TA IsDone=false; SPtr ptr; ptr = new TOptDUID(OPTION_CLIENTID, ClntCfgMgr().getDUID(), this ); @@ -38,8 +14,8 @@ index 4a7b5da..f3e40fd 100644 if (!srvDUID) { Log(Error) << "Unable to send REQUEST: ServerId not specified.\n" << LogEnd; -@@ -154,7 +157,9 @@ TClntMsgRequest::TClntMsgRequest(List(TAddrIA) IAs, - ptr = (Ptr*) new TOptDUID(OPTION_SERVERID, srvDUID,this); +@@ -153,7 +156,9 @@ TClntMsgRequest::TClntMsgRequest(List(TA + ptr = new TOptDUID(OPTION_SERVERID, srvDUID,this); // all IAs provided by checkSolicit SPtr ClntAddrIA; - Options.push_back( ptr ); @@ -49,21 +25,21 @@ index 4a7b5da..f3e40fd 100644 IAs.first(); while (ClntAddrIA = IAs.get()) -diff --git a/Messages/Msg.cpp b/Messages/Msg.cpp -index baa6c86..6eef6c7 100644 ---- a/Messages/Msg.cpp -+++ b/Messages/Msg.cpp -@@ -66,10 +66,15 @@ int TMsg::getSize() +Index: git/Messages/Msg.cpp +=================================================================== +--- git.orig/Messages/Msg.cpp ++++ git/Messages/Msg.cpp +@@ -69,10 +69,15 @@ int TMsg::getSize() { int pktsize=0; TOptList::iterator opt; -+ int optionCount = 0; ++ int optionCount = 0; for (opt = Options.begin(); opt!=Options.end(); ++opt) { - pktsize += (*opt)->getSize(); -+ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; -+ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; -+ pktsize += (*opt)->getSize(); ++ Log(Info) << "### CPE Debug - Option with index " << optionCount++ << LogEnd ; ++ Log(Info) << "### CPE Debug - Option with type " << (*opt)->getOptType() << LogEnd ; ++ pktsize += (*opt)->getSize(); } + Log(Info) << "### CPE Debug - Packet size of option (Add 4) " << pktsize << LogEnd ; + diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch deleted file mode 100644 index 28f18ef..0000000 --- a/meta-networking/recipes-connectivity/dibbler/dibbler/types.patch +++ /dev/null @@ -1,96 +0,0 @@ -Apply fixes to build on musl - -Signed-off-by: Khem Raj - - -Index: dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/IfaceMgr.cpp -+++ dibbler-1.0.1/IfaceMgr/IfaceMgr.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include "Portable.h" - #include "IfaceMgr.h" - #include "Iface.h" -Index: dibbler-1.0.1/IfaceMgr/SocketIPv6.h -=================================================================== ---- dibbler-1.0.1.orig/IfaceMgr/SocketIPv6.h -+++ dibbler-1.0.1/IfaceMgr/SocketIPv6.h -@@ -18,6 +18,7 @@ class TIfaceSocket; - - #include - #include -+#include - - #include "Portable.h" - #include "DHCPConst.h" -Index: dibbler-1.0.1/Port-linux/ethtool-local.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/ethtool-local.h -+++ dibbler-1.0.1/Port-linux/ethtool-local.h -@@ -22,9 +22,9 @@ - */ - - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; - - #include "ethtool-kernel.h" - -Index: dibbler-1.0.1/Port-linux/interface.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/interface.c -+++ dibbler-1.0.1/Port-linux/interface.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -35,13 +36,10 @@ - #include - #include - --#include - - #include "ethtool-local.h" - #include "interface.h" - #include --#include --#include - - void daemon_log(int loglevel, const char *fmt,...) - { -Index: dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/lowlevel-linux-link-state.c -+++ dibbler-1.0.1/Port-linux/lowlevel-linux-link-state.c -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - #include "Portable.h" - #include "interface.h" - -Index: dibbler-1.0.1/Port-linux/utils.h -=================================================================== ---- dibbler-1.0.1.orig/Port-linux/utils.h -+++ dibbler-1.0.1/Port-linux/utils.h -@@ -4,6 +4,7 @@ - #include - //#include - #include -+#include - - #include "libnetlink.h" - #include "ll_map.h" diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb similarity index 77% rename from meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb rename to meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 1913d3a..8890e14 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -5,12 +5,14 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRC_URI = "http://klub.com.pl/dhcpv6/${BPN}/${BP}.tar.gz \ - file://dibbler_fix_getSize_crash.patch \ - file://types.patch \ -" -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" +SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" + +SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ + file://dibbler_fix_getSize_crash.patch \ + " +PV = "1.0.1+1.0.2RC1+git${SRCREV}" + +S = "${WORKDIR}/git" PACKAGECONFIG ??= "debug bind-reuse resolvconf dns-update" @@ -27,8 +29,6 @@ inherit autotools DEPENDS += "flex-native" -CFLAGS += "-D_GNU_SOURCE" - PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" FILES_${PN}-client = "${sbindir}/${PN}-client" diff --git a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb b/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb deleted file mode 100644 index 41bb78f..0000000 --- a/meta-oe/recipes-connectivity/dibbler/dibbler_1.0.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A portable DHCPv6 implementation" -DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful \ -(i.e. IPv6 address granting and IPv6 prefix delegation) as well as stateless (i.e. \ -option granting) autoconfiguration for IPv6." -HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3 \ - file://bison++/COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://klub.com.pl/dhcpv6/dibbler/dibbler-${PV}.tar.gz" - -SRC_URI[md5sum] = "93357bea3ec35b0c1d11242055361409" -SRC_URI[sha256sum] = "27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1" - -inherit autotools - -PACKAGECONFIG ?= "auth bind-reuse dns-update dst-addr-filter link-state" - -PACKAGECONFIG[auth] = "--enable-auth,--disable-auth" -PACKAGECONFIG[bind-reuse] = "--enable-bind-reuse,--disable-bind-reuse" -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[dns-update] = "--enable-dns-update,--disable-dns-update" -PACKAGECONFIG[dst-addr-filter] = "--enable-dst-addr-filter,--disable-dst-addr-filter" -PACKAGECONFIG[link-state] = "--enable-link-state,--disable-link-state" -PACKAGECONFIG[remote-autoconf] = "--enable-remote-autoconf,--disable-remote-autoconf" -PACKAGECONFIG[resolvconf] = "--enable-resolvconf,--disable-resolvconf" - -EXTRA_OECONF += " \ - --disable-efence \ - --with-gtest=no \ -" - -PACKAGES =+ "${PN}-client ${PN}-relay ${PN}-requestor ${PN}-server" - -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:48 +0000 Subject: [oe-commits] [meta-openembedded] 32/37: arptables: Upgrade to 0.0.4 In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.9A2252334B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 344d12d147d6205897fd6be5f3f4173447baf2c1 Author: Khem Raj AuthorDate: Thu Mar 30 12:39:45 2017 -0700 arptables: Upgrade to 0.0.4 Switch the SRC_URI to git based fetcher Signed-off-by: Khem Raj --- .../arptables-compile-install.patch | 61 ----------------- ...FLAGS-for-package-specific-compiler-flags.patch | 79 ++++++++++++++++++++++ .../arptables-arpt-get-target-fix.patch | 0 .../arptables-init-busybox.patch | 0 .../arptables-remove-bashism.patch | 0 .../arptables.service | 0 .../{arptables_0.0.3-4.bb => arptables_git.bb} | 43 ++++++------ 7 files changed, 98 insertions(+), 85 deletions(-) diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch deleted file mode 100644 index 80e9804..0000000 --- a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-compile-install.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: arptables-v0.0.3-4/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/Makefile 2010-03-22 15:52:56.000000000 +0300 -@@ -6,12 +6,11 @@ - LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= - --COPT_FLAGS:=-O2 --CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" - - ifndef ARPT_LIBDIR - ARPT_LIBDIR:=$(LIBDIR)/arptables -@@ -22,16 +21,16 @@ - all: arptables - - arptables.o: arptables.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables-standalone.o: arptables-standalone.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $< - - arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^ - - $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8 - mkdir -p $(@D) -@@ -50,6 +49,7 @@ - cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_ - install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ -+ install -d $(DESTDIR)$(INITDIR) - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - -Index: arptables-v0.0.3-4/extensions/Makefile -=================================================================== ---- arptables-v0.0.3-4.orig/extensions/Makefile 2010-03-08 18:49:28.000000000 +0300 -+++ arptables-v0.0.3-4/extensions/Makefile 2010-03-22 15:52:38.000000000 +0300 -@@ -4,4 +4,7 @@ - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) - - extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -+ -+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch new file mode 100644 index 0000000..e8be45e --- /dev/null +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -0,0 +1,79 @@ +From a2021f0bc0f029dfa05dcca5db3d2ec77904d41a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 30 Mar 2017 12:33:51 -0700 +Subject: [PATCH] Use ARPCFLAGS for package specific compiler flags + +This leaves room for setting CFLAGS in environment +which OE uses to pass tweaks + +Signed-off-by: Khem Raj +--- + Makefile | 15 +++++++-------- + extensions/Makefile | 5 ++++- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 7bead0d..336db6b 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib + BINDIR:=$(PREFIX)/sbin + MANDIR:=$(PREFIX)/man + man8dir=$(MANDIR)/man8 +-INITDIR:=/etc/rc.d/init.d ++INITDIR:=/etc/init.d + SYSCONFIGDIR:=/etc/sysconfig + DESTDIR:= + + MANS = arptables.8 arptables-save.8 arptables-restore.8 + +-COPT_FLAGS:=-O2 +-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG +- ++ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" + ifndef ARPT_LIBDIR + ARPT_LIBDIR:=$(LIBDIR)/arptables + endif +@@ -25,13 +23,13 @@ include extensions/Makefile + all: arptables libarptc/libarptc.a + + arptables.o: arptables.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + arptables-standalone.o: arptables-standalone.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(ARPCFLAGS) $(CFLAGS) -c -o $@ $< + + libarptc/libarptc.a: libarptc/libarptc.o + $(AR) rcs $@ $< +@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv + install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore + cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ + if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi +- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi ++ install -d $(DESTDIR)$(INITDIR) ++ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables + rm -f arptables-save_ arptables-restore_ arptables.sysv_ + + .PHONY: install-man +diff --git a/extensions/Makefile b/extensions/Makefile +index 0189cc9..b046425 100644 +--- a/extensions/Makefile ++++ b/extensions/Makefile +@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK + EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) + + extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h +- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< ++ ++extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h ++ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< +-- +2.12.1 + diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch b/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-arpt-get-target-fix.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-init-busybox.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch rename to meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch diff --git a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/meta-networking/recipes-support/arptables/arptables/arptables.service similarity index 100% rename from meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service rename to meta-networking/recipes-support/arptables/arptables/arptables.service diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_git.bb similarity index 61% rename from meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb rename to meta-networking/recipes-support/arptables/arptables_git.bb index f536408..274a55d 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,15 +1,13 @@ SUMMARY = "Administration tool for arp packet filtering" -LICENSE = "GPL-2.0" SECTION = "net" - -PR = "r2" - -RDEPENDS_${PN} += "perl" - +LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" +PV = "0.0.4+git${SRCPV}" + SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ - file://arptables-compile-install.patch \ + git://git.netfilter.org/arptables \ + file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ file://arptables-remove-bashism.patch \ @@ -18,26 +16,23 @@ SRC_URI = " \ SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" -S = "${WORKDIR}/arptables-v${PV}" - -do_compile () { - oe_runmake -} +S = "${WORKDIR}/git" +SYSTEMD_SERVICE_${PN} = "arptables.service" -# the install target is not multi-job safe, but it doesn't do much -# so we just install serially -# -PARALLEL_MAKEINST = "-j1" +inherit systemd -fakeroot do_install () { - oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install -} +EXTRA_OEMAKE = "'BINDIR=${sbindir}' 'MANDIR=${mandir}'" do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + fi } -inherit systemd +RDEPENDS_${PN} += "perl" -SYSTEMD_SERVICE_${PN} = "arptables.service" +# the install target is not multi-job safe, but it doesn't do much +# so we just install serially +# +PARALLEL_MAKEINST = "-j1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:46 +0000 Subject: [oe-commits] [meta-openembedded] 30/37: vpnc: Update to build from github SRC_URI In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.8AE8F2334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a1ea1e2c889c36b1c9a787592d97aea80fc4ad26 Author: Khem Raj AuthorDate: Thu Mar 30 00:13:12 2017 -0700 vpnc: Update to build from github SRC_URI Fix build for musl add packageconfig for crypto selection Fix build with externalsrc Signed-off-by: Khem Raj --- .../0001-search-for-log-help-in-build-dir.patch | 26 +++++++++ ... 0002-Fix-vpnc-install-for-cross-compile.patch} | 20 ++++++- ...003-error.h-is-specific-to-glibc-on-linux.patch | 30 ++++++++++ ...Use-pkgconfig-instead-of-libgcrypt-config.patch | 30 ++++++++++ ...ude-sys-ttydefaults.h-for-CEOT-definition.patch | 30 ++++++++++ ...header-include-sequence-to-adjust-for-mus.patch | 40 +++++++++++++ ...error-API-when-error.h-is-not-on-platform.patch | 66 ++++++++++++++++++++++ ...0008-include-sysdep.h-before-net-if_tun.h.patch | 36 ++++++++++++ .../recipes-connectivity/vpnc/vpnc/makeman.patch | 11 ---- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 41 +++++++++----- 10 files changed, 302 insertions(+), 28 deletions(-) diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch new file mode 100644 index 0000000..184c794 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch @@ -0,0 +1,26 @@ +From 48e16e9ae7d8e4c42282bd82cbbd9a6d346a5c00 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 1/8] search for log-help in build dir + +Signed-off-by: Khem Raj +--- + makeman.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makeman.pl b/makeman.pl +index cf241a1..2d73432 100755 +--- a/makeman.pl ++++ b/makeman.pl +@@ -30,7 +30,7 @@ my $vpnc = './vpnc'; + # indenting lists (those originally starting with an asterisk). I hope + # this pays off when converting the manpage to HTML or such. + +-open my $LONGHELP, '-|', "$vpnc --long-help"; ++open my $LONGHELP, '-|', "cat ./long-help"; + my $vpnc_options = ''; + my $relative_indent = 0; + my $indent_needed = 0; +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch similarity index 73% rename from meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch rename to meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch index 3de65ec..6f00d3b 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/vpnc-install.patch +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch @@ -1,6 +1,17 @@ ---- a/Makefile~ 2009-01-20 18:44:30.000000000 +0100 -+++ b/Makefile 2009-01-20 18:44:30.000000000 +0100 -@@ -119,21 +119,21 @@ +From d565b4a5e0045f1e40e0e462920ed5b8faca9eec Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 2 Dec 2012 02:16:54 +0100 +Subject: [PATCH 2/8] Fix vpnc install for cross compile + +--- + Makefile | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 69f5aca..a15782e 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,21 +133,21 @@ install-common: all else \ install vpnc-script $(DESTDIR)$(ETCDIR); \ fi @@ -33,3 +44,6 @@ uninstall : rm -f $(DESTDIR)$(SBINDIR)/vpnc \ +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch new file mode 100644 index 0000000..bb77306 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch @@ -0,0 +1,30 @@ +From 6b49020893f999df56392b49b1a289cb96a113a1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:08:17 -0700 +Subject: [PATCH 3/8] error.h is specific to glibc on linux + +Signed-off-by: Khem Raj +--- + sysdep.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 137bf6d..6a323f0 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -37,9 +37,10 @@ int tun_read(int fd, unsigned char *buf, int len); + int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + + /***************************************************************************/ +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__linux__) ++#if defined(__GLIBC__) + #include +- ++#endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 + #define HAVE_ERROR 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch new file mode 100644 index 0000000..f70a138 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch @@ -0,0 +1,30 @@ +From 4d1dd61c04f52a7c796debbdea5fc9139ffa271d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 22:45:05 -0700 +Subject: [PATCH 4/8] Use pkgconfig instead of libgcrypt-config + +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a15782e..b537046 100644 +--- a/Makefile ++++ b/Makefile +@@ -63,10 +63,10 @@ RELEASE_VERSION := $(shell cat VERSION) + CC ?= gcc + CFLAGS ?= -O3 -g + CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings +-CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) ++CFLAGS += $(shell pkg-config libgcrypt --cflags) $(CRYPTO_CFLAGS) + CPPFLAGS += -DVERSION=\"$(VERSION)\" + LDFLAGS ?= -g +-LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) ++LIBS += $(shell pkg-config libgcrypt --libs) $(CRYPTO_LDADD) + + ifeq ($(shell uname -s), SunOS) + LIBS += -lnsl -lresolv -lsocket +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch new file mode 100644 index 0000000..01783f4 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch @@ -0,0 +1,30 @@ +From 1947ea776dc38c3377702dd89bd229670f4d948d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:06:52 -0700 +Subject: [PATCH 5/8] include sys/ttydefaults.h for CEOT definition + +Fixes + +config.c:146:25: error: use of undeclared identifier 'CEOT' + if (llen == 0 && c == CEOT) + +Signed-off-by: Khem Raj +--- + config.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.c b/config.c +index 804faa7..1883d12 100644 +--- a/config.c ++++ b/config.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch new file mode 100644 index 0000000..fa89df2 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch @@ -0,0 +1,40 @@ +From 56768fc0c2cbd6abcf28c9805ab516db8a0548d4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:09:47 -0700 +Subject: [PATCH 6/8] sysdep: Add header include sequence to adjust for musl + +--- + sysdep.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/sysdep.h b/sysdep.h +index 6a323f0..0122b95 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -17,16 +17,20 @@ + * __SKYOS__ + * + */ ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 + + #include + #include +-#include + + #if !defined(__CYGWIN__) +-#include +-#include ++//#include ++//#include + #include + #endif ++#include + + #include "config.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch new file mode 100644 index 0000000..de67b47 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch @@ -0,0 +1,66 @@ +From b6a027fe4da6f66552b533f1314e5005b16c5455 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:52:36 -0700 +Subject: [PATCH 7/8] add error() API when error.h is not on platform + +sign-off-by: Khem Raj +--- + sysdep.c | 24 ++++++++++++++++++++++++ + sysdep.h | 2 ++ + 2 files changed, 26 insertions(+) + +diff --git a/sysdep.c b/sysdep.c +index d8f181d..2518ec1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -17,6 +17,7 @@ + GNU General Public License for more details. + */ + ++#define _GNU_SOURCE + #include + #include + #include +@@ -794,3 +795,26 @@ int setenv(const char *name, const char *value, int overwrite) + return ret; + } + #endif ++ ++#ifndef _ERROR_H_ ++#define _ERROR_H_ ++#include ++#include ++#include ++ ++void error(int status, int errnum, const char* format, ...) ++{ ++ va_list ap; ++ ++ fflush(stdout); ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ":%d", errnum); ++ if (status) ++ exit(status); ++} ++#endif /* _ERROR_H_ */ ++ +diff --git a/sysdep.h b/sysdep.h +index 0122b95..4e60064 100644 +--- a/sysdep.h ++++ b/sysdep.h +@@ -44,6 +44,8 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); + #if defined(__linux__) + #if defined(__GLIBC__) + #include ++#else ++void error(int status, int errnum, const char* format, ...); + #endif + #define HAVE_VASPRINTF 1 + #define HAVE_ASPRINTF 1 +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch new file mode 100644 index 0000000..62ffdb7 --- /dev/null +++ b/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch @@ -0,0 +1,36 @@ +From 7f01847d14a1a3af50f49499743b0551ddef1311 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Mar 2017 23:54:01 -0700 +Subject: [PATCH 8/8] include sysdep.h before net/if_tun.h + +Fixes duplicate defines in header errors + +Signed-off-by: Khem Raj +--- + sysdep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdep.c b/sysdep.c +index 2518ec1..5624ef1 100644 +--- a/sysdep.c ++++ b/sysdep.c +@@ -57,6 +57,8 @@ + #include + #endif + ++#include "sysdep.h" ++ + #if defined(__DragonFly__) + #include + #elif defined(__linux__) +@@ -69,7 +71,6 @@ + #include + #endif + +-#include "sysdep.h" + + #if !defined(HAVE_VASPRINTF) || !defined(HAVE_ASPRINTF) || !defined(HAVE_ERROR) + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch b/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch deleted file mode 100644 index f394e6a..0000000 --- a/meta-networking/recipes-connectivity/vpnc/vpnc/makeman.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vpnc-0.5.1/makeman.pl.old 2008-03-16 02:17:59.000000000 -0500 -+++ vpnc-0.5.1/makeman.pl 2008-03-16 02:29:34.000000000 -0500 -@@ -29,7 +29,7 @@ my $vpnc = './vpnc'; - # indenting lists (those originally starting with an asterisk). I hope - # this pays off when converting the manpage to HTML or such. - --open my $LONGHELP, '-|', "$vpnc --long-help"; -+open my $LONGHELP, '-|', "cat ../long-help"; - my $vpnc_options = ''; - my $relative_indent = 0; - my $indent_needed = 0; diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 1aff045..6f92acd 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -4,17 +4,39 @@ AUTHOR = "Maurice Massar vpnc at unix-ag.uni-kl.de" SECTION = "net" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" -DEPENDS = "libgcrypt" -inherit perlnative +DEPENDS += "libgcrypt" -EXTRA_OEMAKE = "-e MAKEFLAGS=" -CFLAGS_append = ' -DVERSION=\\"${PV}\\"' -LDFLAGS_append = " -lgcrypt -lgpg-error" +PV .= "r550-2jnpr1" +SRCREV = "b1243d29e0c00312ead038b04a2cf5e2fa31d740" +SRC_URI = "git://github.com/ndpgroup/vpnc \ + file://long-help \ + file://default.conf \ + file://0001-search-for-log-help-in-build-dir.patch \ + file://0002-Fix-vpnc-install-for-cross-compile.patch \ + file://0003-error.h-is-specific-to-glibc-on-linux.patch \ + file://0004-Use-pkgconfig-instead-of-libgcrypt-config.patch \ + file://0005-include-sys-ttydefaults.h-for-CEOT-definition.patch \ + file://0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch \ + file://0007-add-error-API-when-error.h-is-not-on-platform.patch \ + file://0008-include-sysdep.h-before-net-if_tun.h.patch \ + " + +PACKAGECONFIG ?= "gnutls" + +PACKAGECONFIG[gnutls] = ",,gnutls" +PACKAGECONFIG[openssl] = ",,openssl" + +S = "${WORKDIR}/git" + +inherit perlnative pkgconfig + +#EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure_append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl + cp ${WORKDIR}/long-help ${S} } do_install () { @@ -34,12 +56,3 @@ vpnc_sysroot_preprocess () { CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" RDEPENDS_${PN} = "perl-module-io-file" RRECOMMENDS_${PN} = "kernel-module-tun" - -SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \ - file://makeman.patch \ - file://vpnc-install.patch \ - file://long-help \ - file://default.conf" - -SRC_URI[md5sum] = "4378f9551d5b077e1770bbe09995afb3" -SRC_URI[sha256sum] = "46cea3bd02f207c62c7c6f2f22133382602baeda1dc320747809e94881414884" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:53 +0000 Subject: [oe-commits] [meta-openembedded] 37/37: ntimed: Use adjtimex on musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.BF7662334BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d128374a403dfc698f03e59db4b45b3e69c4545b Author: Khem Raj AuthorDate: Sat Apr 1 08:36:37 2017 -0700 ntimed: Use adjtimex on musl Drop do_compile, default is same Do not assume that configure is running in S Signed-off-by: Khem Raj --- meta-networking/recipes-support/ntimed/ntimed_git.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-networking/recipes-support/ntimed/ntimed_git.bb index dac5617..527ea33 100644 --- a/meta-networking/recipes-support/ntimed/ntimed_git.bb +++ b/meta-networking/recipes-support/ntimed/ntimed_git.bb @@ -16,6 +16,9 @@ SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2" S = "${WORKDIR}/git" +# use adjtimex on musl +CFLAGS_append_libc-musl = " -Dntp_adjtime=adjtimex" + EXTRA_OEMAKE = "\ 'CC=${CC}' \ 'CFLAGS=${CFLAGS}' \ @@ -23,11 +26,7 @@ EXTRA_OEMAKE = "\ " do_configure () { - sh ./configure -} - -do_compile () { - oe_runmake + sh ${S}/configure } do_install () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:40 +0000 Subject: [oe-commits] [meta-openembedded] 24/37: ebtables: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.629E62334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a6fdeb58dbb168d30d9a540d53914d50fff9f9c3 Author: Khem Raj AuthorDate: Sun Mar 26 14:21:31 2017 -0700 ebtables: Fix build with musl Backport upstream fixes and add fixes to make it work with musl Signed-off-by: Khem Raj --- .../0001-add-RARP-and-update-iana-url.patch | 45 +++++ .../0002-fix-compilation-warning.patch | 25 +++ .../0003-add-info-about-Wl-no-as-needed.patch | 25 +++ ...for-kernel-regression-bug-IPv6-source-des.patch | 28 +++ ...-command-line-support-for-ebtables-restor.patch | 75 +++++++ ...-IPv6-mask-if-it-s-all-ones-based-on-patc.patch | 69 +++++++ .../0007-extensions-Use-stdint-types.patch | 67 +++++++ ...h-Remove-C-specific-compiler-hint-macro-_.patch | 48 +++++ ...low-RETURN-target-rules-in-user-defined-c.patch | 48 +++++ .../0010-Adjust-header-include-sequence.patch | 216 +++++++++++++++++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 12 +- 11 files changed, 657 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch new file mode 100644 index 0000000..90b6979 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch @@ -0,0 +1,45 @@ +From dd35afc9ce1004128a754d5eeb8c5c2cb32ae420 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Tue, 3 Jul 2012 18:47:32 +0000 +Subject: [PATCH 01/10] add RARP and update iana url + +--- + ethertypes | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/ethertypes b/ethertypes +index 5e700f6..813177b 100644 +--- a/ethertypes ++++ b/ethertypes +@@ -5,6 +5,7 @@ + # + # This list could be found on: + # http://www.iana.org/assignments/ethernet-numbers ++# http://www.iana.org/assignments/ieee-802-numbers + # + # ... #Comment + # +@@ -21,15 +22,16 @@ LAT 6004 # DEC LAT + DIAG 6005 # DEC Diagnostics + CUST 6006 # DEC Customer use + SCA 6007 # DEC Systems Comms Arch +-TEB 6558 # Trans Ether Bridging [RFC1701] +-RAW_FR 6559 # Raw Frame Relay [RFC1701] ++TEB 6558 # Trans Ether Bridging [RFC1701] ++RAW_FR 6559 # Raw Frame Relay [RFC1701] ++RARP 8035 # Reverse ARP [RFC903] + AARP 80F3 # Appletalk AARP +-ATALK 809B # Appletalk ++ATALK 809B # Appletalk + 802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame + IPX 8137 # Novell IPX + NetBEUI 8191 # NetBEUI + IPv6 86DD ip6 # IP version 6 +-PPP 880B # PPP ++PPP 880B # PPP + ATMMPOA 884C # MultiProtocol over ATM + PPP_DISC 8863 # PPPoE discovery messages + PPP_SES 8864 # PPPoE session messages +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch new file mode 100644 index 0000000..87b0e9b --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch @@ -0,0 +1,25 @@ +From 2a5333fc8b4825251adfb717d980d89cefde38d6 Mon Sep 17 00:00:00 2001 +From: Petri Gynther +Date: Sun, 24 Feb 2013 10:56:59 +0100 +Subject: [PATCH 02/10] fix compilation warning + +--- + communication.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/communication.c b/communication.c +index 62ed667..ba058c0 100644 +--- a/communication.c ++++ b/communication.c +@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct ebt_u_replace *repl) + } + close_file: + fclose(file); +- return 0; ++ return ret; + } + + /* Gets executed after ebt_deliver_table. Delivers the counters to the kernel +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch new file mode 100644 index 0000000..c8573a4 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch @@ -0,0 +1,25 @@ +From a6faf3b50d6af4768b7b853cb536944fb18e1450 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Wed, 3 Jul 2013 22:12:47 +0200 +Subject: [PATCH 03/10] add info about -Wl,-no-as-needed + +--- + INSTALL | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 4a05c67..e90d5c1 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -39,6 +39,8 @@ That's all + You can also use a base directory different from the root directory (/), + using the DESTDIR option. See the Makefile for more details. + ++You might need to set LDFLAGS=-Wl,-no-as-needed to build ebtables correctly ++on your system. + + ADDITIONAL PROGRAMS: + ---------------------- +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch new file mode 100644 index 0000000..d8f2795 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch @@ -0,0 +1,28 @@ +From b0617af37b8b1aafb43e8019135bea44c2d94c28 Mon Sep 17 00:00:00 2001 +From: Luis Fernando +Date: Wed, 3 Jul 2013 22:19:55 +0200 +Subject: [PATCH 04/10] workaround for kernel regression bug: IPv6 + source/destination addresses are potentially not matched correctly + +--- + extensions/ebt_ip6.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index 0465e77..bbdc4ae 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -312,6 +312,10 @@ static void init(struct ebt_entry_match *match) + + ipinfo->invflags = 0; + ipinfo->bitmask = 0; ++ memset(ipinfo->saddr.s6_addr, 0, sizeof(ipinfo->saddr.s6_addr)); ++ memset(ipinfo->smsk.s6_addr, 0, sizeof(ipinfo->smsk.s6_addr)); ++ memset(ipinfo->daddr.s6_addr, 0, sizeof(ipinfo->daddr.s6_addr)); ++ memset(ipinfo->dmsk.s6_addr, 0, sizeof(ipinfo->dmsk.s6_addr)); + } + + #define OPT_SOURCE 0x01 +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch new file mode 100644 index 0000000..9585fd2 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch @@ -0,0 +1,75 @@ +From 15d3ab8a4a167dc44396b003d2ec01841949972f Mon Sep 17 00:00:00 2001 +From: Sanket Shah +Date: Wed, 31 Jul 2013 21:40:08 +0200 +Subject: [PATCH 05/10] Add --noflush command line support for ebtables-restore + +--- + ebtables-restore.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/ebtables-restore.c b/ebtables-restore.c +index ea02960..bb4d0cf 100644 +--- a/ebtables-restore.c ++++ b/ebtables-restore.c +@@ -22,13 +22,25 @@ + #include + #include + #include ++#include + #include "include/ebtables_u.h" + ++static const struct option options[] = { ++ {.name = "noflush", .has_arg = 0, .val = 'n'}, ++ { 0 } ++}; ++ + static struct ebt_u_replace replace[3]; + void ebt_early_init_once(); + + #define OPT_KERNELDATA 0x800 /* Also defined in ebtables.c */ + ++static void print_usage() ++{ ++ fprintf(stderr, "Usage: ebtables-restore [ --noflush ]\n"); ++ exit(1); ++} ++ + static void copy_table_names() + { + strcpy(replace[0].name, "filter"); +@@ -41,11 +53,20 @@ static void copy_table_names() + int main(int argc_, char *argv_[]) + { + char *argv[EBTD_ARGC_MAX], cmdline[EBTD_CMDLINE_MAXLN]; +- int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace; ++ int i, offset, quotemode = 0, argc, table_nr = -1, line = 0, whitespace, c, flush = 1; + char ebtables_str[] = "ebtables"; + +- if (argc_ != 1) +- ebtrest_print_error("options are not supported"); ++ while ((c = getopt_long(argc_, argv_, "n", options, NULL)) != -1) { ++ switch(c) { ++ case 'n': ++ flush = 0; ++ break; ++ default: ++ print_usage(); ++ break; ++ } ++ } ++ + ebt_silent = 0; + copy_table_names(); + ebt_early_init_once(); +@@ -68,7 +89,7 @@ int main(int argc_, char *argv_[]) + ebtrest_print_error("table '%s' was not recognized", cmdline+1); + table_nr = i; + replace[table_nr].command = 11; +- ebt_get_kernel_table(&replace[table_nr], 1); ++ ebt_get_kernel_table(&replace[table_nr], flush); + replace[table_nr].command = 0; + replace[table_nr].flags = OPT_KERNELDATA; /* Prevent do_command from initialising replace */ + continue; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch new file mode 100644 index 0000000..21f8e58 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch @@ -0,0 +1,69 @@ +From 85a0f6d77a9d5c0e7ef7948395f0f6b1612dc987 Mon Sep 17 00:00:00 2001 +From: Bart De Schuymer +Date: Mon, 14 Apr 2014 22:04:55 +0200 +Subject: [PATCH 06/10] don't print IPv6 mask if it's all ones (based on patch + by Mariusz Mazur ) + +--- + extensions/ebt_ip6.c | 4 ++-- + include/ebtables_u.h | 1 + + useful_functions.c | 13 +++++++++++++ + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index bbdc4ae..e3e0956 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -449,14 +449,14 @@ static void print(const struct ebt_u_entry *entry, + if (ipinfo->invflags & EBT_IP6_SOURCE) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->saddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->smsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk)); + } + if (ipinfo->bitmask & EBT_IP6_DEST) { + printf("--ip6-dst "); + if (ipinfo->invflags & EBT_IP6_DEST) + printf("! "); + printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr)); +- printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk)); ++ printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk)); + } + if (ipinfo->bitmask & EBT_IP6_TCLASS) { + printf("--ip6-tclass "); +diff --git a/include/ebtables_u.h b/include/ebtables_u.h +index ab615c1..35a5bcc 100644 +--- a/include/ebtables_u.h ++++ b/include/ebtables_u.h +@@ -303,6 +303,7 @@ char *ebt_mask_to_dotted(uint32_t mask); + void ebt_parse_ip6_address(char *address, struct in6_addr *addr, + struct in6_addr *msk); + char *ebt_ip6_to_numeric(const struct in6_addr *addrp); ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk); + + + int do_command(int argc, char *argv[], int exec_style, +diff --git a/useful_functions.c b/useful_functions.c +index d20b68e..d14cbe9 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -411,3 +411,16 @@ char *ebt_ip6_to_numeric(const struct in6_addr *addrp) + static char buf[50+1]; + return (char *)inet_ntop(AF_INET6, addrp, buf, sizeof(buf)); + } ++ ++char *ebt_ip6_mask_to_string(const struct in6_addr *msk) ++{ ++ /* /0000:0000:0000:0000:0000:000.000.000.000 ++ * /0000:0000:0000:0000:0000:0000:0000:0000 */ ++ static char buf[51+1]; ++ if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL && ++ msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL) ++ *buf = '\0'; ++ else ++ sprintf(buf, "/%s", ebt_ip6_to_numeric(msk)); ++ return buf; ++} +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch new file mode 100644 index 0000000..6fbe7df --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch @@ -0,0 +1,67 @@ +From a60c7d4a6d05387aceb8ae9c38390d0f9bae84a2 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:22:39 +0200 +Subject: [PATCH 07/10] extensions: Use stdint types + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + extensions/ebt_ip6.c | 4 ++-- + extensions/ebt_limit.c | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c +index e3e0956..dd48547 100644 +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -53,8 +53,8 @@ static const struct option opts[] = + + struct icmpv6_names { + const char *name; +- u_int8_t type; +- u_int8_t code_min, code_max; ++ uint8_t type; ++ uint8_t code_min, code_max; + }; + + static const struct icmpv6_names icmpv6_codes[] = { +diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c +index ee40e5c..d189a09 100644 +--- a/extensions/ebt_limit.c ++++ b/extensions/ebt_limit.c +@@ -59,11 +59,11 @@ static void print_help(void) + " default %u\n", EBT_LIMIT_BURST); + } + +-static int parse_rate(const char *rate, u_int32_t *val) ++static int parse_rate(const char *rate, uint32_t *val) + { + const char *delim; +- u_int32_t r; +- u_int32_t mult = 1; /* Seconds by default. */ ++ uint32_t r; ++ uint32_t mult = 1; /* Seconds by default. */ + + delim = strchr(rate, '/'); + if (delim) { +@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry, + struct rates + { + const char *name; +- u_int32_t mult; ++ uint32_t mult; + }; + + static struct rates g_rates[] = +@@ -162,7 +162,7 @@ static struct rates g_rates[] = + { "sec", EBT_LIMIT_SCALE } + }; + +-static void print_rate(u_int32_t period) ++static void print_rate(uint32_t period) + { + unsigned int i; + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch new file mode 100644 index 0000000..df3f521 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch @@ -0,0 +1,48 @@ +From 6ed23c8c2bc5efc3956e7bb6155afc8f45e6ae1a Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 12:31:58 +0200 +Subject: [PATCH 08/10] ethernetdb.h: Remove C++ specific compiler hint macro + _THROW + +Fixes compilation with musl libc + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/ethernetdb.h | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/include/ethernetdb.h b/include/ethernetdb.h +index 46d8bfd..1683abe 100644 +--- a/include/ethernetdb.h ++++ b/include/ethernetdb.h +@@ -38,21 +38,20 @@ struct ethertypeent { + + /* Open ethertype data base files and mark them as staying open even + after a later search if STAY_OPEN is non-zero. */ +-extern void setethertypeent(int __stay_open) __THROW; ++extern void setethertypeent(int __stay_open); + + /* Close ethertype data base files and clear `stay open' flag. */ +-extern void endethertypeent(void) __THROW; ++extern void endethertypeent(void); + + /* Get next entry from ethertype data base file. Open data base if + necessary. */ +-extern struct ethertypeent *getethertypeent(void) __THROW; ++extern struct ethertypeent *getethertypeent(void); + + /* Return entry from ethertype data base for network with NAME. */ +-extern struct ethertypeent *getethertypebyname(__const char *__name) +- __THROW; ++extern struct ethertypeent *getethertypebyname(__const char *__name); + + /* Return entry from ethertype data base which number is PROTO. */ +-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW; ++extern struct ethertypeent *getethertypebynumber(int __ethertype); + + + #endif /* ethernetdb.h */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch new file mode 100644 index 0000000..248582c --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch @@ -0,0 +1,48 @@ +From e6b367c0c2668341c47242d099f4d2048ae575ef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alin=20N=C4=83stac?= +Date: Thu, 22 Oct 2015 16:41:03 +0200 +Subject: [PATCH 09/10] ebtables: Allow RETURN target rules in user defined + chains + +During loop checking ebtables marks entries with '1 << NF_BR_NUMHOOKS' if +they're called from a base chain rather than a user defined chain. + +This can be used by ebtables targets that can encode a special return +value to bail out if e.g. RETURN is used from a base chain. + +Unfortunately, this is broken, since the '1 << NF_BR_NUMHOOKS' is also +copied to called user-defined-chains (i.e., a user defined chain can no +longer be distinguished from a base chain): + +root at OpenWrt:~# ebtables -N foo +root at OpenWrt:~# ebtables -A OUTPUT -j foo +root at OpenWrt:~# ebtables -A foo -j mark --mark-or 3 --mark-target RETURN +--mark-target RETURN not allowed on base chain. + +This works if -A OUTPUT -j foo is omitted, but will still appear +if we try to call foo from OUTPUT afterwards. + +After this patch we still reject +'-A OUTPUT -j mark .. --mark-target RETURN'. + +Signed-off-by: Florian Westphal +--- + libebtc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libebtc.c b/libebtc.c +index 17ba8f2..74830ec 100644 +--- a/libebtc.c ++++ b/libebtc.c +@@ -1102,7 +1102,7 @@ void ebt_check_for_loops(struct ebt_u_replace *replace) + /* check if we've dealt with this chain already */ + if (entries2->hook_mask & (1<hook_mask |= entries->hook_mask; ++ entries2->hook_mask |= entries->hook_mask & ~(1 << NF_BR_NUMHOOKS); + /* Jump to the chain, make sure we know how to get back */ + stack[sp].chain_nr = chain_nr; + stack[sp].n = j; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch new file mode 100644 index 0000000..a6ef9cd --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch @@ -0,0 +1,216 @@ +From b7cee37734007fced7a4d5ed586c3a9e5ad92878 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 26 Mar 2017 13:12:21 -0700 +Subject: [PATCH 10/10] Adjust header include sequence + +This fixes the build with musl + +Signed-off-by: Khem Raj +--- + extensions/ebt_among.c | 2 +- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + include/linux/if_ether.h | 126 ---------------------------------------------- + useful_functions.c | 4 +- + 5 files changed, 5 insertions(+), 131 deletions(-) + delete mode 100644 include/linux/if_ether.h + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index f97d07e..b096847 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,8 +12,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index c3757f3..c5102a4 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index e6afbf8..8d318d1 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include "../include/ebtables_u.h" + #include ++#include "../include/ebtables_u.h" + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h +deleted file mode 100644 +index 28a15ff..0000000 +--- a/include/linux/if_ether.h ++++ /dev/null +@@ -1,126 +0,0 @@ +-/* +- * INET An implementation of the TCP/IP protocol suite for the LINUX +- * operating system. INET is implemented using the BSD Socket +- * interface as the means of communication with the user level. +- * +- * Global definitions for the Ethernet IEEE 802.3 interface. +- * +- * Version: @(#)if_ether.h 1.0.1a 02/08/94 +- * +- * Author: Fred N. van Kempen, +- * Donald Becker, +- * Alan Cox, +- * Steve Whitehouse, +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. +- */ +- +-#ifndef _LINUX_IF_ETHER_H +-#define _LINUX_IF_ETHER_H +- +-#include +- +-/* +- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble +- * and FCS/CRC (frame check sequence). +- */ +- +-#define ETH_ALEN 6 /* Octets in one ethernet addr */ +-#define ETH_HLEN 14 /* Total octets in header. */ +-#define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ +-#define ETH_DATA_LEN 1500 /* Max. octets in payload */ +-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +-#define ETH_FCS_LEN 4 /* Octets in the FCS */ +- +-/* +- * These are the defined Ethernet Protocol ID's. +- */ +- +-#define ETH_P_LOOP 0x0060 /* Ethernet Loopback packet */ +-#define ETH_P_PUP 0x0200 /* Xerox PUP packet */ +-#define ETH_P_PUPAT 0x0201 /* Xerox PUP Addr Trans packet */ +-#define ETH_P_IP 0x0800 /* Internet Protocol packet */ +-#define ETH_P_X25 0x0805 /* CCITT X.25 */ +-#define ETH_P_ARP 0x0806 /* Address Resolution packet */ +-#define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ +-#define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ +-#define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ +-#define ETH_P_DEC 0x6000 /* DEC Assigned proto */ +-#define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ +-#define ETH_P_DNA_RC 0x6002 /* DEC DNA Remote Console */ +-#define ETH_P_DNA_RT 0x6003 /* DEC DNA Routing */ +-#define ETH_P_LAT 0x6004 /* DEC LAT */ +-#define ETH_P_DIAG 0x6005 /* DEC Diagnostics */ +-#define ETH_P_CUST 0x6006 /* DEC Customer use */ +-#define ETH_P_SCA 0x6007 /* DEC Systems Comms Arch */ +-#define ETH_P_TEB 0x6558 /* Trans Ether Bridging */ +-#define ETH_P_RARP 0x8035 /* Reverse Addr Res packet */ +-#define ETH_P_ATALK 0x809B /* Appletalk DDP */ +-#define ETH_P_AARP 0x80F3 /* Appletalk AARP */ +-#define ETH_P_8021Q 0x8100 /* 802.1Q VLAN Extended Header */ +-#define ETH_P_IPX 0x8137 /* IPX over DIX */ +-#define ETH_P_IPV6 0x86DD /* IPv6 over bluebook */ +-#define ETH_P_PAUSE 0x8808 /* IEEE Pause frames. See 802.3 31B */ +-#define ETH_P_SLOW 0x8809 /* Slow Protocol. See 802.3ad 43B */ +-#define ETH_P_WCCP 0x883E /* Web-cache coordination protocol +- * defined in draft-wilson-wrec-wccp-v2-00.txt */ +-#define ETH_P_PPP_DISC 0x8863 /* PPPoE discovery messages */ +-#define ETH_P_PPP_SES 0x8864 /* PPPoE session messages */ +-#define ETH_P_MPLS_UC 0x8847 /* MPLS Unicast traffic */ +-#define ETH_P_MPLS_MC 0x8848 /* MPLS Multicast traffic */ +-#define ETH_P_ATMMPOA 0x884c /* MultiProtocol Over ATM */ +-#define ETH_P_LINK_CTL 0x886c /* HPNA, wlan link local tunnel */ +-#define ETH_P_ATMFATE 0x8884 /* Frame-based ATM Transport +- * over Ethernet +- */ +-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ +-#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ +-#define ETH_P_TIPC 0x88CA /* TIPC */ +-#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ +-#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +-#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ +-#define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ +- +-/* +- * Non DIX types. Won't clash for 1500 types. +- */ +- +-#define ETH_P_802_3 0x0001 /* Dummy type for 802.3 frames */ +-#define ETH_P_AX25 0x0002 /* Dummy protocol id for AX.25 */ +-#define ETH_P_ALL 0x0003 /* Every packet (be careful!!!) */ +-#define ETH_P_802_2 0x0004 /* 802.2 frames */ +-#define ETH_P_SNAP 0x0005 /* Internal only */ +-#define ETH_P_DDCMP 0x0006 /* DEC DDCMP: Internal only */ +-#define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ +-#define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ +-#define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ +-#define ETH_P_CAN 0x000C /* Controller Area Network */ +-#define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ +-#define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ +-#define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz at cafe.net) */ +-#define ETH_P_CONTROL 0x0016 /* Card specific control frames */ +-#define ETH_P_IRDA 0x0017 /* Linux-IrDA */ +-#define ETH_P_ECONET 0x0018 /* Acorn Econet */ +-#define ETH_P_HDLC 0x0019 /* HDLC frames */ +-#define ETH_P_ARCNET 0x001A /* 1A for ArcNet :-) */ +-#define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ +-#define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ +-#define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +-#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ +-#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */ +- +-/* +- * This is an Ethernet frame header. +- */ +- +-struct ethhdr { +- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ +- unsigned char h_source[ETH_ALEN]; /* source ether addr */ +- __be16 h_proto; /* packet type ID field */ +-} __attribute__((packed)); +- +- +-#endif /* _LINUX_IF_ETHER_H */ +diff --git a/useful_functions.c b/useful_functions.c +index d14cbe9..c304f4d 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -22,8 +22,6 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#include "include/ebtables_u.h" +-#include "include/ethernetdb.h" + #include + #include + #include +@@ -33,6 +31,8 @@ + #include + #include + #include ++#include "include/ebtables_u.h" ++#include "include/ethernetdb.h" + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; + const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index f5e2871..375423d 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -18,7 +18,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://ebtables.common \ file://ebtables.service \ file://no-as-needed.patch \ -" + file://0001-add-RARP-and-update-iana-url.patch \ + file://0002-fix-compilation-warning.patch \ + file://0003-add-info-about-Wl-no-as-needed.patch \ + file://0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch \ + file://0005-Add-noflush-command-line-support-for-ebtables-restor.patch \ + file://0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch \ + file://0007-extensions-Use-stdint-types.patch \ + file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ + file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ + file://0010-Adjust-header-include-sequence.patch \ + " SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:39 +0000 Subject: [oe-commits] [meta-openembedded] 23/37: libnfnetlink: Backport patches to fix musl build In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.589AB2334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 3a6d00dd422db2c9b354e9141bd14dcab61c11b7 Author: Khem Raj AuthorDate: Sun Mar 26 11:49:42 2017 -0700 libnfnetlink: Backport patches to fix musl build There are few upstream patches that are required for getting it working with musl, backport these patches on top of 1.0.1 Signed-off-by: Khem Raj --- ...0001-build-resolve-automake-1.12-warnings.patch | 28 ++ ...rce-code-license-header-in-sync-with-curr.patch | 49 +++ .../0003-configure-uclinux-is-also-linux.patch | 27 ++ ...k-initialize-attribute-padding-to-resolve.patch | 39 ++ .../0005-include-Sync-with-kernel-headers.patch | 110 ++++++ .../0006-src-Use-stdint-types-everywhere.patch | 403 +++++++++++++++++++++ .../libnfnetlink/libnfnetlink_1.0.1.bb | 9 +- 7 files changed, 664 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch new file mode 100644 index 0000000..00d95cd --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch @@ -0,0 +1,28 @@ +From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 9 Oct 2012 15:59:48 +0200 +Subject: [PATCH 1/6] build: resolve automake-1.12 warnings + +am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries +using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-off-by: Jan Engelhardt +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ed549df..0926a1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([-Wall foreign subdir-objects + tar-pax no-dist-gzip dist-bzip2 1.6]) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + + dnl kernel style compile messages + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch new file mode 100644 index 0000000..c2fb5e0 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch @@ -0,0 +1,49 @@ +From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Wed, 7 Aug 2013 20:53:57 +0200 +Subject: [PATCH 2/6] src: get source code license header in sync with current + licensing terms + +Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+, +propagate that changes to src/iftable.c and src/rtnl.c + +Reported-by: Thomas Woerner +Signed-off-by: Pablo Neira Ayuso +--- + src/iftable.c | 2 +- + src/rtnl.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iftable.c b/src/iftable.c +index 0325335..5976ed8 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -3,7 +3,7 @@ + * (C) 2004 by Astaro AG, written by Harald Welte + * (C) 2008 by Pablo Neira Ayuso + * +- * This software is Free Software and licensed under GNU GPLv2. ++ * This software is Free Software and licensed under GNU GPLv2+. + */ + + /* IFINDEX handling */ +diff --git a/src/rtnl.c b/src/rtnl.c +index 5ccb272..7b4ac7d 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -1,10 +1,10 @@ + /* rtnl - rtnetlink utility functions + * + * (C) 2004 by Astaro AG, written by Harald Welte +- * ++ * + * Adapted to nfnetlink by Eric Leblond + * +- * This software is free software and licensed under GNU GPLv2. ++ * This software is free software and licensed under GNU GPLv2+. + * + */ + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch new file mode 100644 index 0000000..6cb7ed6 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch @@ -0,0 +1,27 @@ +From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Tue, 10 Sep 2013 16:23:29 -0300 +Subject: [PATCH 3/6] configure: uclinux is also linux + +Signed-off-by: Gustavo Zacarias +Signed-off-by: Pablo Neira Ayuso +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0926a1c..b979772 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_DISABLE_STATIC + AM_PROG_LIBTOOL + + case "$host" in +-*-*-linux*) ;; ++*-*-linux* | *-*-uclinux*) ;; + *) AC_MSG_ERROR([Linux only, dude!]);; + esac + +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch new file mode 100644 index 0000000..cf3a841 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch @@ -0,0 +1,39 @@ +From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Mon, 3 Feb 2014 12:09:29 +0100 +Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve + valgrind warnings + +==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s) +==12195== at 0x51209C3: __sendto_nocancel (syscall-template.S:81) +==12195== by 0x53E4D12: nfnl_send (libnfnetlink.c:391) +==12195== by 0x53E6952: nfnl_query (libnfnetlink.c:1569) +==12195== by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143) +==12195== by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413) +==12195== by 0x400CB1: main (nfulnl_test.c:77) +==12195== Address 0x7fefff3e9 is on thread 1's stack + +This patch sets to zero the padding that is included to align the +attribute payload. + +Reported-by: Ivan Homoliak +Signed-off-by: Pablo Neira Ayuso +--- + src/libnfnetlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 4b2bcd0..398b7d7 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + nfa->nfa_type = type; + nfa->nfa_len = len; + memcpy(NFA_DATA(nfa), data, alen); ++ memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen); + n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len)); + return 0; + } +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch new file mode 100644 index 0000000..383f0e8 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch @@ -0,0 +1,110 @@ +From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:49:07 +0200 +Subject: [PATCH 5/6] include: Sync with kernel headers + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- + include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- + 2 files changed, 12 insertions(+), 44 deletions(-) + +diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h +index 76a8550..44a38d6 100644 +--- a/include/libnfnetlink/linux_nfnetlink.h ++++ b/include/libnfnetlink/linux_nfnetlink.h +@@ -25,9 +25,9 @@ enum nfnetlink_groups { + /* General form of address family dependent message. + */ + struct nfgenmsg { +- u_int8_t nfgen_family; /* AF_xxx */ +- u_int8_t version; /* nfnetlink version */ +- u_int16_t res_id; /* resource id */ ++ __u8 nfgen_family; /* AF_xxx */ ++ __u8 version; /* nfnetlink version */ ++ __be16 res_id; /* resource id */ + }; + + #define NFNETLINK_V0 0 +@@ -46,40 +46,8 @@ struct nfgenmsg { + #define NFNL_SUBSYS_CTNETLINK_EXP 2 + #define NFNL_SUBSYS_QUEUE 3 + #define NFNL_SUBSYS_ULOG 4 +-#define NFNL_SUBSYS_COUNT 5 ++#define NFNL_SUBSYS_OSF 5 ++#define NFNL_SUBSYS_IPSET 6 ++#define NFNL_SUBSYS_COUNT 7 + +-#ifdef __KERNEL__ +- +-#include +-#include +-#include +- +-struct nfnl_callback +-{ +- int (*call)(struct sock *nl, struct sk_buff *skb, +- struct nlmsghdr *nlh, struct nlattr *cda[]); +- const struct nla_policy *policy; /* netlink attribute policy */ +- const u_int16_t attr_count; /* number of nlattr's */ +-}; +- +-struct nfnetlink_subsystem +-{ +- const char *name; +- __u8 subsys_id; /* nfnetlink subsystem ID */ +- __u8 cb_count; /* number of callbacks */ +- const struct nfnl_callback *cb; /* callback for individual types */ +-}; +- +-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); +-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); +- +-extern int nfnetlink_has_listeners(unsigned int group); +-extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, +- int echo); +-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); +- +-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ +- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) +- +-#endif /* __KERNEL__ */ + #endif /* _NFNETLINK_H */ +diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h +index e145176..74b9e55 100644 +--- a/include/libnfnetlink/linux_nfnetlink_compat.h ++++ b/include/libnfnetlink/linux_nfnetlink_compat.h +@@ -1,6 +1,8 @@ + #ifndef _NFNETLINK_COMPAT_H + #define _NFNETLINK_COMPAT_H +-#ifndef __KERNEL__ ++ ++#include ++ + /* Old nfnetlink macros for userspace */ + + /* nfnetlink groups: Up to 32 maximum */ +@@ -18,10 +20,9 @@ + * ! nfnetlink use the same attributes methods. - J. Schulist. + */ + +-struct nfattr +-{ +- u_int16_t nfa_len; +- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest ++struct nfattr { ++ __u16 nfa_len; ++ __u16 nfa_type; /* we use 15 bits for the type, and the highest + * bit to indicate whether the payload is nested */ + }; + +@@ -57,5 +58,4 @@ struct nfattr + + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) + #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) + +-#endif /* ! __KERNEL__ */ + #endif /* _NFNETLINK_COMPAT_H */ +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch new file mode 100644 index 0000000..72c9987 --- /dev/null +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch @@ -0,0 +1,403 @@ +From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 16 May 2015 14:59:57 +0200 +Subject: [PATCH 6/6] src: Use stdint types everywhere + +Signed-off-by: Felix Janda +Signed-off-by: Pablo Neira Ayuso +--- + include/libnfnetlink/libnfnetlink.h | 25 ++++++------- + src/iftable.c | 8 ++--- + src/iftable.h | 4 +-- + src/libnfnetlink.c | 72 ++++++++++++++++++------------------- + src/rtnl.c | 4 +-- + src/rtnl.h | 2 +- + 6 files changed, 58 insertions(+), 57 deletions(-) + +diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h +index 1d8c49d..cd0be3d 100644 +--- a/include/libnfnetlink/libnfnetlink.h ++++ b/include/libnfnetlink/libnfnetlink.h +@@ -15,6 +15,7 @@ + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif + ++#include + #include /* for sa_family_t */ + #include + #include +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); +diff --git a/src/iftable.c b/src/iftable.c +index 5976ed8..157f97b 100644 +--- a/src/iftable.c ++++ b/src/iftable.c +@@ -27,10 +27,10 @@ + struct ifindex_node { + struct list_head head; + +- u_int32_t index; +- u_int32_t type; +- u_int32_t alen; +- u_int32_t flags; ++ uint32_t index; ++ uint32_t type; ++ uint32_t alen; ++ uint32_t flags; + char addr[8]; + char name[16]; + }; +diff --git a/src/iftable.h b/src/iftable.h +index 8df7f24..655df6b 100644 +--- a/src/iftable.h ++++ b/src/iftable.h +@@ -1,8 +1,8 @@ + #ifndef _IFTABLE_H + #define _IFTABLE_H + +-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); +-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); ++int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); ++int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); + + int iftable_init(void); + void iftable_fini(void); +diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c +index 398b7d7..df57533 100644 +--- a/src/libnfnetlink.c ++++ b/src/libnfnetlink.c +@@ -72,9 +72,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +86,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, + } + + /** +- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr ++ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { +diff --git a/src/rtnl.c b/src/rtnl.c +index 7b4ac7d..284eecd 100644 +--- a/src/rtnl.c ++++ b/src/rtnl.c +@@ -30,7 +30,7 @@ + #define rtnl_log(x, ...) + + static inline struct rtnl_handler * +-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) ++find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) + { + struct rtnl_handler *h; + for (h = rtnl_handle->handlers; h; h = h->next) { +@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) + } + + static int call_handler(struct rtnl_handle *rtnl_handle, +- u_int16_t type, ++ uint16_t type, + struct nlmsghdr *hdr) + { + struct rtnl_handler *h = find_handler(rtnl_handle, type); +diff --git a/src/rtnl.h b/src/rtnl.h +index 0c403dc..2cb22a8 100644 +--- a/src/rtnl.h ++++ b/src/rtnl.h +@@ -7,7 +7,7 @@ + struct rtnl_handler { + struct rtnl_handler *next; + +- u_int16_t nlmsg_type; ++ uint16_t nlmsg_type; + int (*handlefn)(struct nlmsghdr *h, void *arg); + void *arg; + }; +-- +2.12.1 + diff --git a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb index edd0f86..f7951ff 100644 --- a/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb @@ -11,7 +11,14 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar" +SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar \ + file://0001-build-resolve-automake-1.12-warnings.patch \ + file://0002-src-get-source-code-license-header-in-sync-with-curr.patch \ + file://0003-configure-uclinux-is-also-linux.patch \ + file://0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch \ + file://0005-include-Sync-with-kernel-headers.patch \ + file://0006-src-Use-stdint-types-everywhere.patch \ + " SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e" SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:42 +0000 Subject: [oe-commits] [meta-openembedded] 26/37: openl2tp: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.7242E2334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit c61886557252fd134121adc771c0bf7d75dbd4a7 Author: Khem Raj AuthorDate: Tue Mar 28 18:44:44 2017 -0700 openl2tp: Fix build with musl Signed-off-by: Khem Raj --- .../openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch | 29 +++++++++++++++++ .../0001-l2tp_api-Included-needed-headers.patch | 34 ++++++++++++++++++++ ...02-cli-include-fcntl.h-for-O_CREAT-define.patch | 25 +++++++++++++++ .../openl2tp/0002-user-ipv6-structures.patch | 33 ++++++++++++++++++++ ...fine-_GNU_SOURCE-for-getting-sighandler_t.patch | 35 +++++++++++++++++++++ ...linux-kernel-headers-assumptions-on-glibc.patch | 36 ++++++++++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 17 +++++++++- 7 files changed, 208 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch new file mode 100644 index 0000000..d1ee3c5 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch @@ -0,0 +1,29 @@ +From 1f8d336a5cd88b87e15596d05980f6fe77a0f226 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:28:41 -0700 +Subject: [PATCH 1/4] Use -1 instead of WAIT_ANY + +WAIT_ANY is not supported by POSIX and some C libraries +e.g. musl do not define this. + +Signed-off-by: Khem Raj +--- + usl/usl_pid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usl/usl_pid.c b/usl/usl_pid.c +index 103458b..9819473 100644 +--- a/usl/usl_pid.c ++++ b/usl/usl_pid.c +@@ -78,7 +78,7 @@ int usl_pid_reap_children(int waitfor) + + /* Wait for processes in our process group. */ + +- while (((pid = waitpid(WAIT_ANY, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { ++ while (((pid = waitpid(-1, &status, (waitfor ? 0: WNOHANG))) != -1) && (pid != 0)) { + have_callback = 0; + usl_list_for_each(walk, tmp, &usl_child_list) { + child = usl_list_entry(walk, struct usl_pid_child, list); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch new file mode 100644 index 0000000..c50f68e --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch @@ -0,0 +1,34 @@ +From 25dce20a75bc84ae9e4ec640590cef0c12750789 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 17:48:13 -0700 +Subject: [PATCH 1/2] l2tp_api: Included needed headers + +These are flagged by musl + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index d16f80e..9d6f60a 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -22,9 +22,12 @@ + * Each module implements the required RPC xxx_1_svc() callbacks which + * are called directly by the RPC library. + */ +- ++#define _GNU_SOURCE ++#include ++#include ++#include + #include +-#include ++//#include + + #include "usl.h" + +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch new file mode 100644 index 0000000..9df3265 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch @@ -0,0 +1,25 @@ +From 2d633f4c18ff3cb52234449fd86a0a63b55d669b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:31:55 -0700 +Subject: [PATCH 2/4] cli: include fcntl.h for O_CREAT define + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 097ed6a..127136c 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch new file mode 100644 index 0000000..3f8bcaa --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -0,0 +1,33 @@ +From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 18:09:58 -0700 +Subject: [PATCH 2/2] user ipv6 structures + +Signed-off-by: Khem Raj +--- + l2tp_api.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/l2tp_api.c b/l2tp_api.c +index 9d6f60a..f0946fd 100644 +--- a/l2tp_api.c ++++ b/l2tp_api.c +@@ -450,10 +450,12 @@ int l2tp_api_rpc_check_request(SVCXPRT *xprt) + * non-loopback interface, reject the request. + */ + if ((!l2tp_opt_remote_rpc) && +- ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && +- (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { ++ ((xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_LOOPBACK)) && ++ (xprt->xp_raddr.sin6_addr.s6_addr != htonl(INADDR_ANY)))) { ++ char straddr[INET6_ADDRSTRLEN]; ++ inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); + if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { +- l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); ++ l2tp_log(LOG_ERR, "Rejecting RPC request from %s", straddr); + } + svcerr_auth(xprt, AUTH_TOOWEAK); + return -EPERM; +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch new file mode 100644 index 0000000..e05be1b --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch @@ -0,0 +1,35 @@ +From 74fe72583472bcc3c89a52839cac2ebbad6c8a74 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:34:52 -0700 +Subject: [PATCH 3/4] cli: Define _GNU_SOURCE for getting sighandler_t + +Signed-off-by: Khem Raj +--- + cli/cli_readline.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cli/cli_readline.c b/cli/cli_readline.c +index 127136c..931779b 100644 +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -17,7 +17,7 @@ + * Boston, MA 02110-1301 USA + * + *****************************************************************************/ +- ++#define _GNU_SOURCE + #include + #include + #include +@@ -634,7 +634,7 @@ static void cli_rl_uninstall_signal_handlers(void) + + static int cli_rl_install_signal_handlers(void) + { +- __sighandler_t handler; ++ sighandler_t handler; + + rl_catch_signals = 0; + rl_clear_signals(); +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch new file mode 100644 index 0000000..0fcba65 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch @@ -0,0 +1,36 @@ +From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 11:46:56 -0700 +Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc + +Fixes build issues e.g. + +In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if_pppox.h:24: +/mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux-musleabi/openl2tp/1.8-r0/recipe-sysroot/usr/include/linux/if.h:97:2: error: expected identifier + IFF_LOWER_UP = 1<<16, /* __volatile__ */ + ^ + +Signed-off-by: Khem Raj +--- + plugins/ppp_unix.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c +index 869066f..5c1e44f 100644 +--- a/plugins/ppp_unix.c ++++ b/plugins/ppp_unix.c +@@ -21,6 +21,11 @@ + * Plugin to use the standard UNIX pppd + */ + ++/* hack to make sure kernel headers understand that libc (musl) ++ * does define IFF_LOWER_UP et al. ++ */ ++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 ++ + #include + #include + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 67118d8..e1670b3 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -16,14 +16,28 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + file://0001-Use-1-instead-of-WAIT_ANY.patch \ + file://0002-cli-include-fcntl.h-for-O_CREAT-define.patch \ + file://0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch \ + file://0001-l2tp_api-Included-needed-headers.patch \ + " + +SRC_URI_append_libc-musl = "\ + file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ + file://0002-user-ipv6-structures.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig +DEPENDS_append_libc-musl = " libtirpc" +CPPFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ @@ -34,5 +48,6 @@ do_compile_prepend() { -e 's:$(CROSS_COMPILE)nm:${NM}:g' \ -e 's:$(CROSS_COMPILE)strip:${STRIP}:g' \ -e 's:$(CROSS_COMPILE)install:install:g' \ + -e 's:CPPFLAGS-y:CPPFLAGS:g' \ ${S}/Makefile } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:49 +0000 Subject: [oe-commits] [meta-openembedded] 33/37: libnetfilter-log: Switch to git URI In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.9F7352334B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit e5adeee05e3f26410c838175b19debb7a733782c Author: Khem Raj AuthorDate: Thu Mar 30 13:13:20 2017 -0700 libnetfilter-log: Switch to git URI Move to tip of tree which has needed fixes for musl build add missing dependency on libmnl Signed-off-by: Khem Raj --- .../recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb index 30c9ae6..2f627d4 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -DEPENDS = "libnfnetlink" +DEPENDS = "libnfnetlink libmnl" +SRCREV = "ba196a97e810746e5660fe3f57c87c0ed0f2b324" +PV .= "+git${SRCPV}" -SRC_URI = "http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "2a4bb0654ae675a52d2e8d1c06090b94" -SRC_URI[tar.sha256sum] = "74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21" +SRC_URI = "git://git.netfilter.org/libnetfilter_log" -S = "${WORKDIR}/libnetfilter_log-${PV}" +S = "${WORKDIR}/git" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:51 +0000 Subject: [oe-commits] [meta-openembedded] 35/37: snort: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.B02952334BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 14940fb404f7ae9e02adad687556e75daf5aa157 Author: Khem Raj AuthorDate: Thu Mar 30 14:53:59 2017 -0700 snort: Fix build with musl Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index c62a8d3..57a04f2 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -5,6 +5,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux" +DEPENDS_append_libc-musl = " libtirpc" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -46,6 +47,9 @@ PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + do_install_append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:44 +0000 Subject: [oe-commits] [meta-openembedded] 28/37: vsftpd: Fix build with musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.7DE842334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 8b43571d4d50e3d7671bd4732b23a847c34b7a1c Author: Khem Raj AuthorDate: Tue Mar 28 20:11:06 2017 -0700 vsftpd: Fix build with musl Signed-off-by: Khem Raj --- ...c-Fix-with-musl-which-does-not-have-utmpx.patch | 28 ++++++++++++++++++++++ .../recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 7 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch new file mode 100644 index 0000000..c3919e1 --- /dev/null +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch @@ -0,0 +1,28 @@ +From e55135c2a4ea7eae3cb1f4dccf69ca477ea095bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Mar 2017 20:09:12 -0700 +Subject: [PATCH] sysdeputil.c: Fix with musl which does not have utmpx + +Signed-off-by: Khem Raj +--- + sysdeputil.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sysdeputil.c b/sysdeputil.c +index 06f01f4..a8cff3b 100644 +--- a/sysdeputil.c ++++ b/sysdeputil.c +@@ -58,7 +58,9 @@ + #define VSF_SYSDEP_HAVE_SHADOW + #define VSF_SYSDEP_HAVE_USERSHELL + #define VSF_SYSDEP_HAVE_LIBCAP +-#define VSF_SYSDEP_HAVE_UTMPX ++#if defined(__GLIBC__) ++ #define VSF_SYSDEP_HAVE_UTMPX ++#endif + + #define __USE_GNU + #include +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 3eaaa30..e524614 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -19,7 +19,10 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ -" + ${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)} \ + file://0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch \ + " LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ file://COPYRIGHT;md5=04251b2eb0f298dae376d92454f6f72e \ @@ -30,13 +33,11 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:01:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:01:52 +0000 Subject: [oe-commits] [meta-openembedded] 36/37: autofs: Patch to build on musl In-Reply-To: <149147647663.19652.2089149753462559506@git.openembedded.org> References: <149147647663.19652.2089149753462559506@git.openembedded.org> Message-ID: <20170406110117.B85982334BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 6ba12241ea6f48fe6caa692cdfec201bd5433d42 Author: Khem Raj AuthorDate: Fri Mar 31 19:14:53 2017 -0700 autofs: Patch to build on musl Signed-off-by: Khem Raj --- ...fine-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch | 50 +++++++++++++++++++++ .../0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 51 ++++++++++++++++++++++ .../recipes-daemons/autofs/autofs_5.1.1.bb | 6 ++- 3 files changed, 106 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch new file mode 100644 index 0000000..075af57 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch @@ -0,0 +1,50 @@ +From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:10:57 -0700 +Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF + +if they are not defined as is in musl then define +them here + +Signed-off-by: Khem Raj +--- + include/automount.h | 8 ++++++++ + include/nsswitch.h | 3 +++ + 2 files changed, 11 insertions(+) + +diff --git a/include/automount.h b/include/automount.h +index 219b07d..b12c22a 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -42,6 +42,14 @@ + + #define ENABLE_CORES 1 + ++#ifndef __SWORD_TYPE ++# if __WORDSIZE == 32 /* System word size */ ++# define __SWORD_TYPE int ++# else /* __WORDSIZE == 64 */ ++# define __SWORD_TYPE long int ++# endif ++#endif ++ + /* We MUST have the paths to mount(8) and umount(8) */ + #ifndef HAVE_MOUNT + #error Failed to locate mount(8)! +diff --git a/include/nsswitch.h b/include/nsswitch.h +index 2b445a9..3db77b2 100644 +--- a/include/nsswitch.h ++++ b/include/nsswitch.h +@@ -24,6 +24,9 @@ + #include + #include "list.h" + ++#ifndef _PATH_NSSWITCH_CONF ++#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" ++#endif + #define NSSWITCH_FILE _PATH_NSSWITCH_CONF + + enum nsswitch_status { +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch new file mode 100644 index 0000000..6b6ba6d --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -0,0 +1,51 @@ +From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 31 Mar 2017 19:12:10 -0700 +Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC + +S_IEXEC is portable + +Signed-off-by: Khem Raj +--- + daemon/lookup.c | 4 ++-- + modules/lookup_multi.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemon/lookup.c b/daemon/lookup.c +index 62071df..1bec97f 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +@@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ + if (!S_ISREG(st.st_mode)) + return NSS_STATUS_NOTFOUND; + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c +index 6ec8434..88d081f 100644 +--- a/modules/lookup_multi.c ++++ b/modules/lookup_multi.c +@@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch + continue; + } + +- if (st.st_mode & __S_IEXEC) ++ if (st.st_mode & S_IEXEC) + type = src_prog; + else + type = src_file; +-- +2.12.1 + diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb index 8d55596..d85600e 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS += "libtirpc flex-native bison-native" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" + inherit autotools-brokensep systemd SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ @@ -21,7 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://force-STRIP-to-emtpy.patch \ file://remove-bashism.patch \ file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ -" + file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ + file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ + " SRC_URI[md5sum] = "e143df66b614b8cdb1ff533735f8e12d" SRC_URI[sha256sum] = "795419383b120d15699ab3b89ea0f3d029f6fb28405a83982d305c4b7b61130f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:18 +0000 Subject: [oe-commits] [openembedded-core] 01/30: runqemu: fix 2 typos In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.6964E23347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a6152dd9f6f4e17855548ceffa8d864855a67f5c Author: Robert Yang AuthorDate: Wed Apr 5 23:41:33 2017 -0700 runqemu: fix 2 typos * "is it" -> "it is" * Remove ".qemuboot.conf =" in the error message which looked strange. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 23c9efb..251f5f7 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -421,7 +421,7 @@ class BaseConfig(object): elif arg.startswith('ovmf'): self.ovmf_bios.append(arg) else: - # At last, assume is it the MACHINE + # At last, assume it is the MACHINE if (not unknown_arg) or unknown_arg == arg: unknown_arg = arg else: @@ -677,7 +677,7 @@ class BaseConfig(object): return if not os.path.exists(self.qemuboot): - raise Exception("Failed to find .qemuboot.conf = %s (wrong image name or BSP does not support running under qemu?)." % self.qemuboot) + raise Exception("Failed to find %s (wrong image name or BSP does not support running under qemu?)." % self.qemuboot) logger.info('CONFFILE: %s' % self.qemuboot) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:21 +0000 Subject: [oe-commits] [openembedded-core] 04/30: runqemu: run without arguments In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.7ED53233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 49aa0bc438cfde592e04db0347d9999e8f34a2c1 Author: Robert Yang AuthorDate: Wed Apr 5 23:41:36 2017 -0700 runqemu: run without arguments Since we can get MACHINE and others from env vars and "bitbake -e", "runqemu" can work without any arguments. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 23a344d..1b330b7 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -83,6 +83,7 @@ of the following environment variables (in any order): help, -h, --help: print this text Examples: + runqemu runqemu qemuarm runqemu tmp/deploy/images/qemuarm runqemu tmp/deploy/images/qemux86/ @@ -1182,8 +1183,7 @@ class BaseConfig(object): logger.warn("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) def main(): - if len(sys.argv) == 1 or "help" in sys.argv or \ - '-h' in sys.argv or '--help' in sys.argv: + if "help" in sys.argv or '-h' in sys.argv or '--help' in sys.argv: print_usage() return 0 config = BaseConfig() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:17 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:17 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (901659a -> 3a587ed) Message-ID: <149147881709.26962.5549873486005958612@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 901659a oeqa/runtime/utils/targetbuildproject: use parent classes defaults tmpdir new a6152dd runqemu: fix 2 typos new dcf33db runqemu: support env vars explicitly new bccc7f1 runqemu: use self.rootfs to replace self.nfs_dir new 49aa0bc runqemu: run without arguments new c3e36ec runqemu: use realpath for imgdir new 2ca0655 runqemu: do not rely on grepping images new 091aa92 busybox: Security fix CVE-2016-6301 new 72d3ef5 oe-build-perf-report-email.py: fix one file path new c8c83bb yocto-compat-layer: fix also other command invocations new e0cbafa yocto-compat-layer: limit report of signature changes new 7b3eddc package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' new c67726e package.bbclass: add CONFFILES to pkgdata new 2101dd8 ghostscript: CVE-2017-7207 new 72aac42 busybox: Security fix BUG9071 new 1def810 python-pycurl: create python3-pycurl recipe new 4eda138 base-files: profile: Whitespace clean up new f6f6572 base-files: profile: Do not assume that the tty command exists new b31283e logrotate: replace fedorahosted.org SRC_URI with github.com source new db322b0 sanity: Require bitbake 1.33.4 new fbd5ebf glibc/gcc/libgcc-initial: Delete do_build tasks for -initial new 3035cf7 groff: replace "perl -w" with "use warnings" new 67ddf26 mc: replace "perl -w" with "use warnings" new 7d8071f valgrind: set ac_cv_path_PERL to /usr/bin/env perl new ce953a9 m4: do_configure: fix "Argument list too long" new f8284ea guile: do_configure: fix "Argument list too long" new 57e6bd8 autogen-native: fix POSIX_SHELL and perl new f1330b4 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash new 24264c9 eudev: set LGPL-2.1+ for libudev package new 5b8da28 python3: fix run-time deps for core python3 libraries new 3a587ed selftest/wic: skip wic unit tests in case NLS is disable The 30 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/package.bbclass | 1 + meta/classes/package_ipk.bbclass | 6 +- meta/classes/qemuboot.bbclass | 3 + meta/conf/sanity.conf | 2 +- meta/lib/oeqa/selftest/wic.py | 5 +- meta/recipes-core/base-files/base-files/profile | 31 ++--- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 - .../busybox/BUG9071_buffer_overflow_arp.patch | 53 +++++++++ .../busybox/busybox/CVE-2016-6301.patch | 37 ++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 2 + meta/recipes-core/glibc/glibc-initial.inc | 3 + meta/recipes-core/udev/eudev_3.2.1.bb | 3 +- .../autogen/autogen-native_5.18.12.bb | 3 + ...2-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 +++++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 4 + meta/recipes-devtools/gcc/libgcc-initial.inc | 3 + meta/recipes-devtools/guile/guile_2.0.14.bb | 3 + meta/recipes-devtools/m4/m4-1.4.18.inc | 3 + .../python/python-3.5-manifest.inc | 4 +- .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 +- .../python/python-pycurl_7.21.5.bb | 32 +---- .../python/python3-pycurl_7.21.5.bb | 5 + meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 + .../ghostscript/ghostscript/CVE-2017-7207.patch | 39 +++++++ .../ghostscript/ghostscript_9.20.bb | 1 + .../0001-replace-perl-w-with-use-warnings.patch | 102 ++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 3 + meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 19 ++- .../0001-mc-replace-perl-w-with-use-warnings.patch | 129 ++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.18.bb | 3 + meta/recipes-kernel/kmod/kmod.inc | 2 + scripts/contrib/oe-build-perf-report-email.py | 2 +- scripts/contrib/python/generate-manifest-3.5.py | 4 +- scripts/lib/compatlayer/__init__.py | 55 +++++++-- scripts/lib/compatlayer/cases/common.py | 77 +++++++----- scripts/runqemu | 130 ++++++++++++--------- 36 files changed, 649 insertions(+), 164 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch create mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-6301.patch create mode 100644 meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch copy meta/recipes-devtools/python/{python-pycurl_7.21.5.bb => python-pycurl.inc} (92%) create mode 100644 meta/recipes-devtools/python/python3-pycurl_7.21.5.bb create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch create mode 100644 meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch create mode 100644 meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:19 +0000 Subject: [oe-commits] [openembedded-core] 02/30: runqemu: support env vars explicitly In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.7189C23347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dcf33db991b13601b54002c1062592b67e635515 Author: Robert Yang AuthorDate: Wed Apr 5 23:41:34 2017 -0700 runqemu: support env vars explicitly Use self.env_vars to support get vars from environment explicity. The MACHINE, ROOTFS and KERNEL was supported by shell based runqemu, and the help text says support them from env vars, so add them back. [YOCTO #11141] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 71 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 251f5f7..71e3cdb 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -163,12 +163,18 @@ def check_free_port(host, port): class BaseConfig(object): def __init__(self): - # Vars can be merged with .qemuboot.conf, use a dict to manage them. - self.d = { - 'MACHINE': '', - 'DEPLOY_DIR_IMAGE': '', - 'QB_KERNEL_ROOT': '/dev/vda', - } + # The self.d saved vars from self.set(), part of them are from qemuboot.conf + self.d = {'QB_KERNEL_ROOT': '/dev/vda'} + + # Supported env vars, add it here if a var can be got from env, + # and don't use os.getenv in the code. + self.env_vars = ('MACHINE', + 'ROOTFS', + 'KERNEL', + 'DEPLOY_DIR_IMAGE', + 'OE_TMPDIR', + 'OECORE_NATIVE_SYSROOT', + ) self.qemu_opt = '' self.qemu_opt_script = '' @@ -238,6 +244,8 @@ class BaseConfig(object): def get(self, key): if key in self.d: return self.d.get(key) + elif os.getenv(key): + return os.getenv(key) else: return '' @@ -338,10 +346,13 @@ class BaseConfig(object): def check_arg_machine(self, arg): """Check whether it is a machine""" - if self.get('MACHINE') and self.get('MACHINE') != arg or re.search('/', arg): - raise Exception("Unknown arg: %s" % arg) - elif self.get('MACHINE') == arg: + if self.get('MACHINE') == arg: return + elif self.get('MACHINE') and self.get('MACHINE') != arg: + raise Exception("Maybe conflicted MACHINE: %s vs %s" % (self.get('MACHINE'), arg)) + elif re.search('/', arg): + raise Exception("Unknown arg: %s" % arg) + logger.info('Assuming MACHINE = %s' % arg) # if we're running under testimage, or similarly as a child @@ -350,14 +361,14 @@ class BaseConfig(object): # FIXME: testimage.bbclass exports these two variables into env, # are there other scenarios in which we need to support being # invoked by bitbake? - deploy = os.environ.get('DEPLOY_DIR_IMAGE') - bbchild = deploy and os.environ.get('OE_TMPDIR') + deploy = self.get('DEPLOY_DIR_IMAGE') + bbchild = deploy and self.get('OE_TMPDIR') if bbchild: self.set_machine_deploy_dir(arg, deploy) return # also check whether we're running under a sourced toolchain # environment file - if os.environ.get('OECORE_NATIVE_SYSROOT'): + if self.get('OECORE_NATIVE_SYSROOT'): self.set("MACHINE", arg) return @@ -430,20 +441,15 @@ class BaseConfig(object): if unknown_arg: if self.get('MACHINE') == unknown_arg: return - if not self.get('DEPLOY_DIR_IMAGE'): - # Trying to get DEPLOY_DIR_IMAGE from env. - p = os.getenv('DEPLOY_DIR_IMAGE') - if p and self.is_deploy_dir_image(p): - machine = os.path.basename(p) - if unknown_arg == machine: - self.set_machine_deploy_dir(machine, p) - return - else: - logger.info('DEPLOY_DIR_IMAGE: %s' % p) - self.set("DEPLOY_DIR_IMAGE", p) + if self.get('DEPLOY_DIR_IMAGE'): + machine = os.path.basename(self.get('DEPLOY_DIR_IMAGE')) + if unknown_arg == machine: + self.set_machine_deploy_dir(machine, p) + return + self.check_arg_machine(unknown_arg) - if not (self.get('MACHINE') or self.get('DEPLOY_DIR_IMAGE')): + if not self.get('DEPLOY_DIR_IMAGE'): self.load_bitbake_env() s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M) if s: @@ -505,7 +511,16 @@ class BaseConfig(object): def check_rootfs(self): """Check and set rootfs""" - if self.fstype == 'nfs' or self.fstype == "none": + if self.fstype == "none": + return + + if self.get('ROOTFS'): + if not self.rootfs: + self.rootfs = self.get('ROOTFS') + elif self.get('ROOTFS') != self.rootfs: + raise Exception("Maybe conflicted ROOTFS: %s vs %s" % (self.get('ROOTFS'), self.rootfs)) + + if self.fstype == 'nfs': return if self.rootfs and not os.path.exists(self.rootfs): @@ -642,8 +657,6 @@ class BaseConfig(object): if not self.qemuboot: if self.get('DEPLOY_DIR_IMAGE'): deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') - elif os.getenv('DEPLOY_DIR_IMAGE'): - deploy_dir_image = os.getenv('DEPLOY_DIR_IMAGE') else: logger.info("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!") return @@ -720,8 +733,8 @@ class BaseConfig(object): # be able to call `bitbake -e`, then try: # - get OE_TMPDIR from environment and guess paths based on it # - get OECORE_NATIVE_SYSROOT from environment (for sdk) - tmpdir = os.environ.get('OE_TMPDIR', None) - oecore_native_sysroot = os.environ.get('OECORE_NATIVE_SYSROOT', None) + tmpdir = self.get('OE_TMPDIR', None) + oecore_native_sysroot = self.get('OECORE_NATIVE_SYSROOT', None) if tmpdir: logger.info('Setting STAGING_DIR_NATIVE and STAGING_BINDIR_NATIVE relative to OE_TMPDIR (%s)' % tmpdir) hostos, _, _, _, machine = os.uname() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:20 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:20 +0000 Subject: [oe-commits] [openembedded-core] 03/30: runqemu: use self.rootfs to replace self.nfs_dir In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.77BC323347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bccc7f1540346f39dddda965a4d5ecf2c5101ba7 Author: Robert Yang AuthorDate: Wed Apr 5 23:41:35 2017 -0700 runqemu: use self.rootfs to replace self.nfs_dir We can use self.rootfs as self.nfs_dir when self.fstype is nfs, this can reduce the code's complexity and we can re-use the code of checking ROOTFS conflictions. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 71e3cdb..23a344d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -178,7 +178,6 @@ class BaseConfig(object): self.qemu_opt = '' self.qemu_opt_script = '' - self.nfs_dir = '' self.clean_nfs_dir = False self.nfs_server = '' self.rootfs = '' @@ -284,12 +283,11 @@ class BaseConfig(object): def check_arg_nfs(self, p): if os.path.isdir(p): - self.nfs_dir = p + self.rootfs = p else: m = re.match('(.*):(.*)', p) self.nfs_server = m.group(1) - self.nfs_dir = m.group(2) - self.rootfs = "" + self.rootfs = m.group(2) self.check_arg_fstype('nfs') def check_arg_path(self, p): @@ -759,7 +757,7 @@ class BaseConfig(object): print('MACHINE: [%s]' % self.get('MACHINE')) print('FSTYPE: [%s]' % self.fstype) if self.fstype == 'nfs': - print('NFS_DIR: [%s]' % self.nfs_dir) + print('NFS_DIR: [%s]' % self.rootfs) else: print('ROOTFS: [%s]' % self.rootfs) if self.ovmf_bios: @@ -804,13 +802,13 @@ class BaseConfig(object): self.unfs_opts="nfsvers=3,port=%s,mountprog=%s,nfsprog=%s,udp,mountport=%s" % (nfsd_port, mountd_rpcport, nfsd_rpcport, mountd_port) - # Extract .tar.bz2 or .tar.bz if no self.nfs_dir - if not self.nfs_dir: + # Extract .tar.bz2 or .tar.bz if no nfs dir + if not (self.rootfs and os.path.isdir(self.rootfs)): src_prefix = '%s/%s' % (self.get('DEPLOY_DIR_IMAGE'), self.get('IMAGE_LINK_NAME')) dest = "%s-nfsroot" % src_prefix if os.path.exists('%s.pseudo_state' % dest): logger.info('Use %s as NFS_DIR' % dest) - self.nfs_dir = dest + self.rootfs = dest else: src = "" src1 = '%s.tar.bz2' % src_prefix @@ -827,10 +825,10 @@ class BaseConfig(object): if subprocess.call(cmd, shell=True) != 0: raise Exception('Failed to run %s' % cmd) self.clean_nfs_dir = True - self.nfs_dir = dest + self.rootfs = dest # Start the userspace NFS server - cmd = 'runqemu-export-rootfs start %s' % self.nfs_dir + cmd = 'runqemu-export-rootfs start %s' % self.rootfs logger.info('Running %s...' % cmd) if subprocess.call(cmd, shell=True) != 0: raise Exception('Failed to run %s' % cmd) @@ -1001,7 +999,7 @@ class BaseConfig(object): if self.fstype == 'nfs': self.rootfs_options = '' - k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, self.nfs_dir, self.unfs_opts) + k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server, self.rootfs, self.unfs_opts) self.kernel_cmdline = 'root=%s rw highres=off' % k_root if self.fstype == 'none': @@ -1147,7 +1145,7 @@ class BaseConfig(object): if self.nfs_running: logger.info("Shutting down the userspace NFS server...") - cmd = "runqemu-export-rootfs stop %s" % self.nfs_dir + cmd = "runqemu-export-rootfs stop %s" % self.rootfs logger.info('Running %s' % cmd) subprocess.call(cmd, shell=True) @@ -1156,9 +1154,9 @@ class BaseConfig(object): subprocess.call(cmd, shell=True) if self.clean_nfs_dir: - logger.info('Removing %s' % self.nfs_dir) - shutil.rmtree(self.nfs_dir) - shutil.rmtree('%s.pseudo_state' % self.nfs_dir) + logger.info('Removing %s' % self.rootfs) + shutil.rmtree(self.rootfs) + shutil.rmtree('%s.pseudo_state' % self.rootfs) def load_bitbake_env(self, mach=None): if self.bitbake_e: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:25 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:25 +0000 Subject: [oe-commits] [openembedded-core] 08/30: oe-build-perf-report-email.py: fix one file path In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.A3E3C233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72d3ef563e4c050da1a710af842c4b822e2dd5db Author: Markus Lehtonen AuthorDate: Thu Apr 6 10:10:18 2017 +0300 oe-build-perf-report-email.py: fix one file path Sending report email was not working correctly if the script was given an html report path that contained directory components. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/oe-build-perf-report-email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/oe-build-perf-report-email.py b/scripts/contrib/oe-build-perf-report-email.py index 7f4274e..81b58ab 100755 --- a/scripts/contrib/oe-build-perf-report-email.py +++ b/scripts/contrib/oe-build-perf-report-email.py @@ -243,7 +243,7 @@ def main(argv=None): html_report = None if args.html: scrape_html_report(args.html, outdir, args.phantomjs_args) - html_report = os.path.join(outdir, args.html) + html_report = os.path.join(outdir, os.path.basename(args.html)) if args.to: log.info("Sending email to %s", ', '.join(args.to)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:22 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:22 +0000 Subject: [oe-commits] [openembedded-core] 05/30: runqemu: use realpath for imgdir In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.85D7E233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c3e36ecdedf83257f046038aa38c06ce299231d5 Author: Robert Yang AuthorDate: Wed Apr 5 23:41:37 2017 -0700 runqemu: use realpath for imgdir The DEPLOY_DIR_IMAGE maybe relative or absolute path since it can be read from env vars, so use realpath for both imgdir and DEPLOY_DIR_IMAGE when compare. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 1b330b7..b964622 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -705,8 +705,8 @@ class BaseConfig(object): # artefacts are relative to that file, rather than in whatever # directory DEPLOY_DIR_IMAGE in the conf file points to. if self.qbconfload: - imgdir = os.path.dirname(self.qemuboot) - if imgdir != self.get('DEPLOY_DIR_IMAGE'): + imgdir = os.path.realpath(os.path.dirname(self.qemuboot)) + if imgdir != os.path.realpath(self.get('DEPLOY_DIR_IMAGE')): logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir)) self.set('DEPLOY_DIR_IMAGE', imgdir) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:23 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:23 +0000 Subject: [oe-commits] [openembedded-core] 06/30: runqemu: do not rely on grepping images In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.8C71B233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ca0655067061d23b3f339a790ebd452335deb9e Author: Robert Yang AuthorDate: Wed Apr 5 23:41:38 2017 -0700 runqemu: do not rely on grepping images Fixed when the image is large and not enough memory: grep: memory exhausted Aborted [YOCTO #11073] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/qemuboot.bbclass | 3 +++ scripts/runqemu | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 3ca97ca..2870388 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -64,6 +64,9 @@ QB_DEFAULT_FSTYPE ?= "ext4" QB_OPT_APPEND ?= "-show-cursor" QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" +# This should be kept align with ROOT_VM +QB_DRIVE_TYPE ?= "/dev/sd" + # Create qemuboot.conf addtask do_write_qemuboot_conf after do_rootfs before do_image IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete" diff --git a/scripts/runqemu b/scripts/runqemu index b964622..b5fc22a 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -978,23 +978,26 @@ class BaseConfig(object): self.kernel_cmdline = 'root=/dev/ram0 rw debugshell' self.rootfs_options = '-initrd %s' % self.rootfs else: + vm_drive = '' if self.fstype in self.vmtypes: if self.fstype == 'iso': vm_drive = '-cdrom %s' % self.rootfs - else: - cmd1 = "grep -q 'root=/dev/sd' %s" % self.rootfs - cmd2 = "grep -q 'root=/dev/hd' %s" % self.rootfs - if subprocess.call(cmd1, shell=True) == 0: + elif self.get('QB_DRIVE_TYPE'): + drive_type = self.get('QB_DRIVE_TYPE') + if drive_type.startswith("/dev/sd"): logger.info('Using scsi drive') vm_drive = '-drive if=none,id=hd,file=%s,format=%s -device virtio-scsi-pci,id=scsi -device scsi-hd,drive=hd' \ % (self.rootfs, rootfs_format) - elif subprocess.call(cmd2, shell=True) == 0: + elif drive_type.startswith("/dev/hd"): logger.info('Using ide drive') vm_drive = "%s,format=%s" % (self.rootfs, rootfs_format) else: - logger.warn("Can't detect drive type %s" % self.rootfs) - logger.warn('Trying to use virtio block drive') - vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) + logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type) + + if not vm_drive: + logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE") + logger.warn('Trying to use virtio block drive') + vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) self.rootfs_options = '%s -no-reboot' % vm_drive self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT')) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:28 +0000 Subject: [oe-commits] [openembedded-core] 11/30: package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.D094D23348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7b3eddcba1a1502ae81a7d2c5f93e92625f9aa83 Author: Mariano Lopez AuthorDate: Wed Apr 5 11:46:35 2017 -0700 package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' opkg uses empty lines as separator for next package and if an ipk file was packaged with empty lines in DESCRIPTION opkg won't be able to handle such ipk file, this happens at execution time. This commit will replace empty lines in DESCRIPTION with a '.' when generating an ipk package to avoid this issue. [YOCTO #10677] Signed-off-by: Mariano Lopez Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index fa47385..c7cec9d 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -145,7 +145,11 @@ python do_package_ipk () { # We don't limit the width when manually indent, but we do # need the textwrap.fill() to set the initial_indent and # subsequent_indent, so set a large width - ctrlfile.write('%s\n' % textwrap.fill(t.strip(), width=100000, initial_indent=' ', subsequent_indent=' ')) + line = textwrap.fill(t.strip(), + width=100000, + initial_indent=' ', + subsequent_indent=' ') or '.' + ctrlfile.write('%s\n' % line) else: # Auto indent ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:24 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:24 +0000 Subject: [oe-commits] [openembedded-core] 07/30: busybox: Security fix CVE-2016-6301 In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.9B500233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 091aa9216e062c0c7d8ca8d77f7dc01d90baea67 Author: Andrej Valek AuthorDate: Thu Apr 6 09:07:37 2017 +0200 busybox: Security fix CVE-2016-6301 ntpd: NTP server denial of service flaw CVE: CVE-2016-6301 Signed-off-by: Andrej Valek Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- .../busybox/busybox/CVE-2016-6301.patch | 37 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 38 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch new file mode 100644 index 0000000..851bc20 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch @@ -0,0 +1,37 @@ +busybox1.24.1: Fix CVE-2016-6301 + +[No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=1363710 + +ntpd: NTP server denial of service flaw + +The busybox NTP implementation doesn't check the NTP mode of packets +received on the server port and responds to any packet with the right +size. This includes responses from another NTP server. An attacker can +send a packet with a spoofed source address in order to create an +infinite loop of responses between two busybox NTP servers. Adding +more packets to the loop increases the traffic between the servers +until one of them has a fully loaded CPU and/or network. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=150dc7a2b483b8338a3e185c478b4b23ee884e71] +CVE: CVE-2016-6301 +Signed-off-by: Andrej Valek +Signed-off-by: Pascal Bach + +diff --git a/networking/ntpd.c b/networking/ntpd.c +index 9732c9b..0f6a55f 100644 +--- a/networking/ntpd.c ++++ b/networking/ntpd.c +@@ -1985,6 +1985,13 @@ recv_and_process_client_pkt(void /*int fd*/) + goto bail; + } + ++ /* Respond only to client and symmetric active packets */ ++ if ((msg.m_status & MODE_MASK) != MODE_CLIENT ++ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT ++ ) { ++ goto bail; ++ } ++ + query_status = msg.m_status; + query_xmttime = msg.m_xmttime; + diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 41fc641..6013ec9 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -47,6 +47,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2016-2148.patch \ file://CVE-2016-2147.patch \ file://CVE-2016-2147_2.patch \ + file://CVE-2016-6301.patch \ file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \ file://makefile-fix-backport.patch \ file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:27 +0000 Subject: [oe-commits] [openembedded-core] 10/30: yocto-compat-layer: limit report of signature changes In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.C1A8823348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e0cbafa28240b69141126d5d4a54fd0813426de1 Author: Patrick Ohly AuthorDate: Wed Apr 5 15:36:05 2017 +0200 yocto-compat-layer: limit report of signature changes Typically a single change cascades through the entire task dependency chain. Developers had to figure that out themselves, based on hard to read and interpret output (not sorted, no indention, no explanations): $ yocto-compat-layer.py -n meta-xxxx ... AssertionError: True is not false : Layer meta-xxxx changed signatures. webkitgtk:do_install changed fe2edc9082bc0da98f9cb1391c52f565 -> b3a44684c5cd9aacd3f7c6ed88eefab5 gstreamer1.0-plugins-good:do_configure changed 3b2f8211be3fe08422bf6087f3af16d1 -> 7d80e42fa1f4f01ff4dfe2ea4477d382 pulseaudio:do_package_qa changed 5d0a58ada66ff17f5576555302ac319a -> 0e13bcb96143d1ae54c451bc3de0aa30 epiphany:do_prepare_recipe_sysroot changed 29e1b277dbcb005bd54950594c50d91b -> d3c45527b37677a0668ce483c6db3052 ... gst-player:do_packagedata changed 9ce6efdd357dd74919bc4957458b1e95 -> d0c083ce629f37adfc9c4ba9eff81f83 gstreamer1.0-plugins-base:do_install changed 1161cd867d15bea63e5dd5d9abf0519c -> 5bf2b652a2d77fee3eedb35af2f201a0 gstreamer1.0-rtsp-server:do_packagedata changed 6781dc3070f80b843ed1970d74dd323e -> 454620c2e3b9fea87e525d14b6ed0344 alsa-plugins:do_packagedata changed 1808c3f737cb805b169d004e948ea19c -> 480124b7fa5eab1f73bf96440d725231 Now the tool automates the problem analysis: it retrieves the depgraph using the tinfoil API and only reports those tasks with modified signatures whose dependencies have not changed, i.e. those tasks which definitely introduce a change. >From the previous example, that just leaves two tasks that need to be checked: AssertionError: False is not true : Layer meta-xxxx changed 120 signatures, initial differences (first hash without, second with layer): gstreamer1.0-plugins-base:do_fetch: 76973f19f2e30d282152bdd7e4efe5bb -> e6e7c6fa9f2bd59d7d8d107f7c6ca1ac pulseaudio:do_install: 668eb1e30af129df9806b0aa0d7c10cd -> 1196bdb88eef56eeee4613bb06b9387e This pruning might be a bit too aggressive in the sense that tasks which inherit a change and then add more changes themselves won't be reported initially. They will be found when fixing the reported tasks and re-running the check. For a developer it seems better to have something listed which definitely is a problem and needs fixing instead of everything, including the tasks which don't need fixes. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 32 +++++++++++++++++++ scripts/lib/compatlayer/cases/common.py | 54 +++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 9eb862d..b46527a 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -7,6 +7,8 @@ import os import subprocess from enum import Enum +import bb.tinfoil + class LayerType(Enum): BSP = 0 DISTRO = 1 @@ -252,3 +254,33 @@ def get_signatures(builddir, failsafe=False): raise RuntimeError('Can\'t load signatures from %s' % sigs_file) return sigs + +def get_depgraph(targets=['world']): + ''' + Returns the dependency graph for the given target(s). + The dependency graph is taken directly from DepTreeEvent. + ''' + depgraph = None + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=False) + tinfoil.set_event_mask(['bb.event.NoProvider', 'bb.event.DepTreeGenerated', 'bb.command.CommandCompleted']) + if not tinfoil.run_command('generateDepTreeEvent', targets, 'do_build'): + raise RuntimeError('starting generateDepTreeEvent failed') + while True: + event = tinfoil.wait_event(timeout=1000) + if event: + if isinstance(event, bb.command.CommandFailed): + raise RuntimeError('Generating dependency information failed: %s' % event.error) + elif isinstance(event, bb.command.CommandCompleted): + break + elif isinstance(event, bb.event.NoProvider): + if event._reasons: + raise RuntimeError('Nothing provides %s: %s' % (event._item, event._reasons)) + else: + raise RuntimeError('Nothing provides %s.' % (event._item)) + elif isinstance(event, bb.event.DepTreeGenerated): + depgraph = event._depgraph + + if depgraph is None: + raise RuntimeError('Could not retrieve the depgraph.') + return depgraph diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 9cc682e..b91da9b 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -3,7 +3,7 @@ import os import unittest -from compatlayer import get_signatures, LayerType, check_command +from compatlayer import get_signatures, LayerType, check_command, get_depgraph from compatlayer.case import OECompatLayerTestCase class CommonCompatLayer(OECompatLayerTestCase): @@ -31,21 +31,49 @@ class CommonCompatLayer(OECompatLayerTestCase): raise unittest.SkipTest("Layer %s isn't BSP or DISTRO one." \ % self.tc.layer['name']) + # task -> (old signature, new signature) sig_diff = {} - curr_sigs = get_signatures(self.td['builddir'], failsafe=True) for task in self.td['sigs']: - if task not in curr_sigs: - continue - - if self.td['sigs'][task] != curr_sigs[task]: - sig_diff[task] = '%s -> %s' % \ - (self.td['sigs'][task], curr_sigs[task]) + if task in curr_sigs and \ + self.td['sigs'][task] != curr_sigs[task]: + sig_diff[task] = (self.td['sigs'][task], curr_sigs[task]) - detail = '' if sig_diff: - for task in sig_diff: - detail += "%s changed %s\n" % (task, sig_diff[task]) - self.assertFalse(bool(sig_diff), "Layer %s changed signatures.\n%s" % \ - (self.tc.layer['name'], detail)) + # Beware, depgraph uses task=. whereas get_signatures() + # uses :. Need to convert sometimes. The output follows + # the convention from get_signatures() because that seems closer to + # normal bitbake output. + def sig2graph(task): + pn, taskname = task.rsplit(':', 1) + return pn + '.' + taskname + def graph2sig(task): + pn, taskname = task.rsplit('.', 1) + return pn + ':' + taskname + depgraph = get_depgraph() + depends = depgraph['tdepends'] + + # If a task A has a changed signature, but none of its + # dependencies, then we need to report it because it is + # the one which introduces a change. Any task depending on + # A (directly or indirectly) will also have a changed + # signature, but we don't need to report it. It might have + # its own changes, which will become apparent once the + # issues that we do report are fixed and the test gets run + # again. + sig_diff_filtered = [] + for task, (old_sig, new_sig) in sig_diff.items(): + deps_tainted = False + for dep in depends.get(sig2graph(task), ()): + if graph2sig(dep) in sig_diff: + deps_tainted = True + break + if not deps_tainted: + sig_diff_filtered.append((task, old_sig, new_sig)) + msg = [] + msg.append('Layer %s changed %d signatures, initial differences (first hash without, second with layer):' % + (self.tc.layer['name'], len(sig_diff))) + for diff in sorted(sig_diff_filtered): + msg.append(' %s: %s -> %s' % diff) + self.assertTrue(False, '\n'.join(msg)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:26 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:26 +0000 Subject: [oe-commits] [openembedded-core] 09/30: yocto-compat-layer: fix also other command invocations In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.B273423348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c8c83bbc1552deb4c5cbc00a81e0b6d6090809c3 Author: Patrick Ohly AuthorDate: Wed Apr 5 15:36:04 2017 +0200 yocto-compat-layer: fix also other command invocations In commit 5b9ac62ab535d, one place was fixed where a command was invoked such that failures caused double stack traces and stderr was lost. The same problem also occurs elsewhere, triggered for example by a layer with parsing problems. Now a new utility method is used instead of repeating the code. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 23 ++++++++++++++++------- scripts/lib/compatlayer/cases/common.py | 25 +++++-------------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 86f86eb..9eb862d 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -4,6 +4,7 @@ # Released under the MIT license (see COPYING.MIT) import os +import subprocess from enum import Enum class LayerType(Enum): @@ -199,8 +200,20 @@ def add_layer(bblayersconf, layer, layers, logger): return True +def check_command(error_msg, cmd): + ''' + Run a command under a shell, capture stdout and stderr in a single stream, + throw an error when command returns non-zero exit code. Returns the output. + ''' + + p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + output, _ = p.communicate() + if p.returncode: + msg = "%s\nCommand: %s\nOutput:\n%s" % (error_msg, cmd, output.decode('utf-8')) + raise RuntimeError(msg) + return output + def get_signatures(builddir, failsafe=False): - import subprocess import re # some recipes needs to be excluded like meta-world-pkgdata @@ -214,12 +227,8 @@ def get_signatures(builddir, failsafe=False): if failsafe: cmd += '-k ' cmd += '-S none world' - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - output, _ = p.communicate() - if p.returncode: - msg = "Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities.\nCommand: %s\nOutput:\n%s" % (cmd, output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities.', + cmd) sigs_file = os.path.join(builddir, 'locked-sigs.inc') sig_regex = re.compile("^(?P.*:.*):(?P.*) .$") diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 4d328ec..9cc682e 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -2,9 +2,8 @@ # Released under the MIT license (see COPYING.MIT) import os -import subprocess import unittest -from compatlayer import get_signatures, LayerType +from compatlayer import get_signatures, LayerType, check_command from compatlayer.case import OECompatLayerTestCase class CommonCompatLayer(OECompatLayerTestCase): @@ -20,26 +19,12 @@ class CommonCompatLayer(OECompatLayerTestCase): msg="Layer contains README file but is empty.") def test_parse(self): - try: - output = subprocess.check_output('bitbake -p', shell=True, - stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - import traceback - exc = traceback.format_exc() - msg = 'Layer %s failed to parse.\n%s\n%s\n' % (self.tc.layer['name'], - exc, e.output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Layer %s failed to parse.' % self.tc.layer['name'], + 'bitbake -p') def test_show_environment(self): - try: - output = subprocess.check_output('bitbake -e', shell=True, - stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - import traceback - exc = traceback.format_exc() - msg = 'Layer %s failed to show environment.\n%s\n%s\n' % \ - (self.tc.layer['name'], exc, e.output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Layer %s failed to show environment.' % self.tc.layer['name'], + 'bitbake -e') def test_signatures(self): if self.tc.layer['type'] == LayerType.SOFTWARE: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:29 +0000 Subject: [oe-commits] [openembedded-core] 12/30: package.bbclass: add CONFFILES to pkgdata In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.E0E0C233490@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c67726e8919093c7603e63ad05822df331bb58dc Author: David Vincent AuthorDate: Wed Apr 5 17:43:07 2017 +0200 package.bbclass: add CONFFILES to pkgdata Emit CONFFILES variable in pkgdata, or else the get_conffiles function will return 'None' for some packages instead of the expected value. This is especially true for optional module packages. Signed-off-by: David Vincent Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1bc4f6a..cc466bd 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1380,6 +1380,7 @@ python emit_pkgdata() { write_if_exists(sf, pkg, 'PKG') write_if_exists(sf, pkg, 'ALLOW_EMPTY') write_if_exists(sf, pkg, 'FILES') + write_if_exists(sf, pkg, 'CONFFILES') write_if_exists(sf, pkg, 'pkg_postinst') write_if_exists(sf, pkg, 'pkg_postrm') write_if_exists(sf, pkg, 'pkg_preinst') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:30 +0000 Subject: [oe-commits] [openembedded-core] 13/30: ghostscript: CVE-2017-7207 In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114017.EC660233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2101dd8515ca44e0c938a24a9d9b1722405057cc Author: Catalin Enache AuthorDate: Wed Apr 5 15:06:51 2017 +0300 ghostscript: CVE-2017-7207 The mem_get_bits_rectangle function in Artifex Software, Inc. Ghostscript 9.20 allows remote attackers to cause a denial of service (NULL pointer dereference) via a crafted PostScript document. Reference: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-7207 Upstream patch: http://git.ghostscript.com/?p=ghostpdl.git;h=309eca4e0a31ea70dcc844812691439312dad091 Signed-off-by: Catalin Enache Signed-off-by: Richard Purdie --- .../ghostscript/ghostscript/CVE-2017-7207.patch | 39 ++++++++++++++++++++++ .../ghostscript/ghostscript_9.20.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch new file mode 100644 index 0000000..a05dc02 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch @@ -0,0 +1,39 @@ +From 0e88bee1304993668fede72498d656a2dd33a35e Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Mon, 20 Mar 2017 09:34:11 +0000 +Subject: [PATCH] Ensure a device has raster memory, before trying to read it. + +Bug #697676 "Null pointer dereference in mem_get_bits_rectangle()" + +This is only possible by abusing/mis-using Ghostscript-specific +language extensions, so cannot happen in a general PostScript program. + +Nevertheless, Ghostscript should not crash. So this commit checks the +memory device to see if raster memory has been allocated, before trying +to read from it. + +Upstream-Status: Backport +CVE: CVE-2017-7207 + +Author: Ken Sharp +Signed-off-by: Catalin Enache +--- + base/gdevmem.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/base/gdevmem.c b/base/gdevmem.c +index 41108ba..183f96d 100644 +--- a/base/gdevmem.c ++++ b/base/gdevmem.c +@@ -605,6 +605,8 @@ mem_get_bits_rectangle(gx_device * dev, const gs_int_rect * prect, + GB_PACKING_CHUNKY | GB_COLORS_NATIVE | GB_ALPHA_NONE; + return_error(gs_error_rangecheck); + } ++ if (mdev->line_ptrs == 0x00) ++ return_error(gs_error_rangecheck); + if ((w <= 0) | (h <= 0)) { + if ((w | h) < 0) + return_error(gs_error_rangecheck); +-- +2.10.2 + diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb index 210e9a7..e8fc5df 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb @@ -31,6 +31,7 @@ SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.02-genarch.patch \ file://objarch.h \ file://cups-no-gcrypt.patch \ + file://CVE-2017-7207.patch \ " SRC_URI_class-native = "${SRC_URI_BASE} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:35 +0000 Subject: [oe-commits] [openembedded-core] 18/30: logrotate: replace fedorahosted.org SRC_URI with github.com source In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.283E823349B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b31283e5c93f81599e88bda6b19058df0837ea9a Author: Choong YinThong AuthorDate: Thu Apr 6 01:35:26 2017 -0700 logrotate: replace fedorahosted.org SRC_URI with github.com source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to github.com. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Richard Purdie --- meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb index 9c2dfe0..5cbd9ff 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Rotates, compresses, removes and mails system log files" SECTION = "console/utils" -HOMEPAGE = "https://fedorahosted.org/logrotate/" +HOMEPAGE = "https://github.com/logrotate/logrotate/issues" LICENSE = "GPLv2" # TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it. @@ -10,14 +10,25 @@ DEPENDS="coreutils popt" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" -SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ +# When updating logrotate to latest upstream, SRC_URI should point to +# a proper release tarball from https://github.com/logrotate/logrotate/releases +# and we have to take the snapshot for now because there is no such +# tarball available for 3.9.1. + +S = "${WORKDIR}/${PN}-r3-9-1" + +UPSTREAM_CHECK_URI = "https://github.com/${PN}/${PN}/releases" + +SRC_URI = "https://github.com/${PN}/${PN}/archive/r3-9-1.tar.gz \ file://act-as-mv-when-rotate.patch \ file://update-the-manual.patch \ file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "4492b145b6d542e4a2f41e77fa199ab0" -SRC_URI[sha256sum] = "022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545" +# Checksum changed due to tarball source folder changes in upstream + +SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3" +SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:31 +0000 Subject: [oe-commits] [openembedded-core] 14/30: busybox: Security fix BUG9071 In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.0081C233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72aac4217ff85193523de9467b85fe542cadaa5a Author: Martin Balik AuthorDate: Wed Apr 5 12:38:57 2017 +0200 busybox: Security fix BUG9071 Signed-off-by: Martin Balik Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- .../busybox/BUG9071_buffer_overflow_arp.patch | 53 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 54 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch new file mode 100644 index 0000000..828694c --- /dev/null +++ b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch @@ -0,0 +1,53 @@ +busybox1.24.1: Fix busybox - (local) cmdline stack buffer overwrite + +[No upstream tracking] -- https://bugs.busybox.net/show_bug.cgi?id=9071 + +busybox - (local) cmdline stack buffer overwrite + +Busybox provides an `arp` applet which is missing an array bounds check for +command-line parameter `IFNAME`. It is therefore vulnerable to a command-line +based local stack buffer overwrite effectively allowing local users to write +past a 16 bytes fixed stack buffer. This leads to two scenarios, one (A) where +an IOCTL for GET_HW_ADDRESS (`SIOCGIFHWADDR`) fails and results in a corrupted +`va_list` being passed to `*printf()` and one (B) where an attacker might provide +valid params for the IOCTL and trick the program to proceed and result in a +`RET eip overwrite` eventually gaining code execution. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/networking/arp.c?id=88e2b1cb626761b1924305b761a5dfc723613c4e] +BUG: BUG9071 +Signed-off-by: Martin Balik +Signed-off-by: Pascal Bach + +-- + +diff --git a/networking/arp.c b/networking/arp.c +index 0099aa5..87eb327 100644 +--- a/networking/arp.c ++++ b/networking/arp.c +@@ -176,7 +176,7 @@ static int arp_del(char **args) + if (flags == 0) + flags = 3; + +- strncpy(req.arp_dev, device, sizeof(req.arp_dev)); ++ strncpy_IFNAMSIZ(req.arp_dev, device); + + err = -1; + +@@ -217,7 +217,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa) + struct ifreq ifr; + const struct hwtype *xhw; + +- strcpy(ifr.ifr_name, ifname); ++ strncpy_IFNAMSIZ(ifr.ifr_name, ifname); + ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr, + "can't get HW-Address for '%s'", ifname); + if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) { +@@ -330,7 +330,7 @@ static int arp_set(char **args) + /* Fill in the remainder of the request. */ + req.arp_flags = flags; + +- strncpy(req.arp_dev, device, sizeof(req.arp_dev)); ++ strncpy_IFNAMSIZ(req.arp_dev, device); + + /* Call the kernel. */ + if (option_mask32 & ARP_OPT_v) diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 6013ec9..e26dfff 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -56,6 +56,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://makefile-libbb-race.patch \ file://0001-libiproute-handle-table-ids-larger-than-255.patch \ file://ifupdown-pass-interface-device-name-for-ipv6-route-c.patch \ + file://BUG9071_buffer_overflow_arp.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:32 +0000 Subject: [oe-commits] [openembedded-core] 15/30: python-pycurl: create python3-pycurl recipe In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.082AB233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1def810e74985fbdda12c6a4a72559409ce59d66 Author: Dmitry Rozhkov AuthorDate: Wed Apr 5 10:01:20 2017 +0300 python-pycurl: create python3-pycurl recipe The python-pycurl recipe can be used with python2 only even though python3 is officially supported by upstream. Create python3-pycurl recipe enabling the pycurl module for python3. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 ++-- .../python/python-pycurl_7.21.5.bb | 32 +--------------------- .../python/python3-pycurl_7.21.5.bb | 5 ++++ 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl.inc similarity index 92% copy from meta/recipes-devtools/python/python-pycurl_7.21.5.bb copy to meta/recipes-devtools/python/python-pycurl.inc index 7b41f6d..d26318b 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b8 file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" +DEPENDS = "curl ${PYTHON_PN}" +RDEPENDS_${PN} = "${PYTHON_PN}-core curl" SRCNAME = "pycurl" SRC_URI = "\ @@ -19,8 +19,6 @@ SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils - BBCLASSEXTEND = "native" # Ensure the docstrings are generated as make clean will remove them diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb index 7b41f6d..eb70cea 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb @@ -1,33 +1,3 @@ -SUMMARY = "Python bindings for libcurl" -HOMEPAGE = "http://pycurl.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1+ | MIT" -LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b89d4584b693d3680062fb \ - file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ - file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" - -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" -SRCNAME = "pycurl" - -SRC_URI = "\ - http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ - file://no-static-link.patch \ -" - -SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" -SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" -S = "${WORKDIR}/${SRCNAME}-${PV}" +require python-pycurl.inc inherit distutils - -BBCLASSEXTEND = "native" - -# Ensure the docstrings are generated as make clean will remove them -do_compile_prepend() { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings -} - -do_install_append() { - rm -rf ${D}${datadir}/share -} diff --git a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb new file mode 100644 index 0000000..5d11192 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycurl:" + +require python-pycurl.inc + +inherit distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:36 +0000 Subject: [oe-commits] [openembedded-core] 19/30: sanity: Require bitbake 1.33.4 In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.307F423349D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit db322b01eb147b6f83d376a9d45a58e75c8cb420 Author: Richard Purdie AuthorDate: Thu Apr 6 12:22:33 2017 +0100 sanity: Require bitbake 1.33.4 We need the bitbake bug in recrdeptask handling of missing tasks fixed in order to apply a fix for OE-Core. Signed-off-by: Richard Purdie --- meta/conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index 616f11c..46bdbeb 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.33.3" +BB_MIN_VERSION = "1.33.4" SANITY_ABIFILE = "${TMPDIR}/abi_version" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:40 +0000 Subject: [oe-commits] [openembedded-core] 23/30: valgrind: set ac_cv_path_PERL to /usr/bin/env perl In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.58A2E2334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7d8071f450fb7b8204739c3fd8256b4b22aaa7fa Author: Robert Yang AuthorDate: Thu Apr 6 03:05:52 2017 -0700 valgrind: set ac_cv_path_PERL to /usr/bin/env perl The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. Set ac_cv_path_PERL to "/usr/bin/env perl" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index a4a3e72..62a9635 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -56,6 +56,8 @@ EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" EXTRA_OEMAKE = "-w" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + # valgrind likes to control its own optimisation flags. It generally defaults # to -O2 but uses -O0 for some specific test apps etc. Passing our own flags # (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:33 +0000 Subject: [oe-commits] [openembedded-core] 16/30: base-files: profile: Whitespace clean up In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.1209D233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4eda138fada4220f72837d2f4f678e17b2ca61a2 Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:25 2017 +0200 base-files: profile: Whitespace clean up Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index c616616..22dfb4f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -6,28 +6,29 @@ EDITOR="vi" # needed for packages like cron, git-commit test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. if [ "$HOME" = "ROOTHOME" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin fi if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + # works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' fi if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh ; do - if [ -f $i -a -r $i ]; then - . $i - fi - done - unset i + for i in /etc/profile.d/*.sh; do + if [ -f $i -a -r $i ]; then + . $i + fi + done + unset i fi if [ -x /usr/bin/resize ] && termpath="`tty`"; then - # Make sure we are on a serial console (i.e. the device used starts with /dev/tty), - # otherwise we confuse e.g. the eclipse launcher which tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null - esac + # Make sure we are on a serial console (i.e. the device used starts with + # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which + # tries do use ssh + case "$termpath" in + /dev/tty[A-z]*) resize >/dev/null + esac fi export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:39 +0000 Subject: [oe-commits] [openembedded-core] 22/30: mc: replace "perl -w" with "use warnings" In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.4AA2B2334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 67ddf260f1b82e5a6b14b0e74ec9565f064aa30f Author: Robert Yang AuthorDate: Thu Apr 6 03:05:51 2017 -0700 mc: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-mc-replace-perl-w-with-use-warnings.patch | 129 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.18.bb | 3 + 2 files changed, 132 insertions(+) diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..bf8037c --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,129 @@ +From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 02:24:28 -0700 +Subject: [PATCH] mc: replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +The man2hlp.in already has "use warnings;", so just remove '-w' is OK. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + src/man2hlp/man2hlp.in | 2 +- + src/vfs/extfs/helpers/a+.in | 4 +++- + src/vfs/extfs/helpers/mailfs.in | 3 ++- + src/vfs/extfs/helpers/patchfs.in | 3 ++- + src/vfs/extfs/helpers/ulib.in | 4 +++- + src/vfs/extfs/helpers/uzip.in | 3 ++- + 6 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in +index f095830..558a674 100644 +--- a/src/man2hlp/man2hlp.in ++++ b/src/man2hlp/man2hlp.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Man page to help file converter + # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in +index 579441c..fe446f4 100644 +--- a/src/vfs/extfs/helpers/a+.in ++++ b/src/vfs/extfs/helpers/a+.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # External filesystem for mc, using mtools + # Written Ludek Brukner , 1997 +@@ -9,6 +9,8 @@ + + # These mtools components must be in PATH for this to work + ++use warnings; ++ + sub quote { + $_ = shift(@_); + s/([^\w\/.+-])/\\$1/g; +diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in +index e9455be..059f41f 100644 +--- a/src/vfs/extfs/helpers/mailfs.in ++++ b/src/vfs/extfs/helpers/mailfs.in +@@ -1,6 +1,7 @@ +-#! @PERL@ -w ++#! @PERL@ + + use bytes; ++use warnings; + + # MC extfs for (possibly compressed) Berkeley style mailbox files + # Peter Daum (Jan 1998, mc-4.1.24) +diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in +index ef407de..3ad4b53 100644 +--- a/src/vfs/extfs/helpers/patchfs.in ++++ b/src/vfs/extfs/helpers/patchfs.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Written by Adam Byrtek , 2002 + # Rewritten by David Sterba , 2009 +@@ -9,6 +9,7 @@ + + use bytes; + use strict; ++use warnings; + use POSIX; + use File::Temp 'tempfile'; + +diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in +index 418611f..82c7ccf 100644 +--- a/src/vfs/extfs/helpers/ulib.in ++++ b/src/vfs/extfs/helpers/ulib.in +@@ -1,9 +1,11 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # VFS to manage the gputils archives. + # Written by Moln?r K?roly (proton7 at freemail.hu) 2012 + # + ++use warnings; ++ + my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03', + 'apr' => '04', 'may' => '05', 'jun' => '06', + 'jul' => '07', 'aug' => '08', 'sep' => '09', +diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in +index b1c4f90..c8eb335 100644 +--- a/src/vfs/extfs/helpers/uzip.in ++++ b/src/vfs/extfs/helpers/uzip.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # zip file archive Virtual File System for Midnight Commander + # Version 1.4.0 (2001-08-07). +@@ -9,6 +9,7 @@ + use POSIX; + use File::Basename; + use strict; ++use warnings; + + # + # Configuration options +-- +2.10.2 + diff --git a/meta/recipes-extended/mc/mc_4.8.18.bb b/meta/recipes-extended/mc/mc_4.8.18.bb index 78abb27..17f3f73 100644 --- a/meta/recipes-extended/mc/mc_4.8.18.bb +++ b/meta/recipes-extended/mc/mc_4.8.18.bb @@ -7,6 +7,7 @@ DEPENDS = "ncurses glib-2.0 util-linux" RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-mc-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc56f0c9abd63c4caa3636bba3a08bfb" SRC_URI[sha256sum] = "5b591e10dcbea95233434da40cdad4663d360229adf89826576c319667c103cb" @@ -22,6 +23,8 @@ PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:44 +0000 Subject: [oe-commits] [openembedded-core] 27/30: kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.80888233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f1330b4a92a6a8ea2a78ac681d65aa861a30d7c7 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:56 2017 -0700 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/bash is longer than 128: /bin/sh: ./doltcompile: [snip]: bad interpreter: No such file or directory Set ac_cv_path_DOLT_BASH to "/usr/bin/env bash" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-kernel/kmod/kmod.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index cfa409d..ba80fc5 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -30,6 +30,8 @@ S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" EXTRA_OECONF +=" --enable-tools --with-zlib" +CACHED_CONFIGUREVARS += "ac_cv_path_DOLT_BASH='/usr/bin/env bash'" + PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:34 +0000 Subject: [oe-commits] [openembedded-core] 17/30: base-files: profile: Do not assume that the tty command exists In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.19ECA233499@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f6f6572aa3a00374d4f33b86acc76e1f62da294f Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:26 2017 +0200 base-files: profile: Do not assume that the tty command exists This avoids the following error when logging in to a host that does not have the tty command: -sh: tty: not found Reported-by: Cristian Ionescu-Idbohrn Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 6 +++--- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 22dfb4f..ceaf15f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -22,12 +22,12 @@ if [ -d /etc/profile.d ]; then unset i fi -if [ -x /usr/bin/resize ] && termpath="`tty`"; then +if command -v resize >/dev/null && command -v tty >/dev/null; then # Make sure we are on a serial console (i.e. the device used starts with # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which # tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null + case $(tty) in + /dev/tty[A-z]*) resize >/dev/null;; esac fi diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index f56969c..ca7bf06 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -128,10 +128,6 @@ do_install () { install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd - if [ "/usr/bin" != "${bindir}" ]; then - sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile - fi - ln -sf /proc/mounts ${D}${sysconfdir}/mtab } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:37 +0000 Subject: [oe-commits] [openembedded-core] 20/30: glibc/gcc/libgcc-initial: Delete do_build tasks for -initial In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.38B9B23349F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fbd5ebf81698e4e30b62531de2495db04c189b44 Author: Richard Purdie AuthorDate: Wed Apr 5 17:27:20 2017 +0100 glibc/gcc/libgcc-initial: Delete do_build tasks for -initial We've had a lot of users running into RSS issues where -initial recipes were being installed into sysroots alongside their counterparts and causing overlapping files issues. In general this was through do_build dependencies. Such dependencies are bad in general and I'd encourage people to compare the taskgraphs with using a more specific dependency like do_populate_sysroot, do_image_complete or do_deploy as often the more specific dependency will result in a much cleaner build. Regardless, we don't want -initial dependencies getting in the way like this and there are cases a do_build dependency could make sense. Deleting the do_build task in these cases makes sense since this is not a build "endpoint" we'd ever want a user to use, its a behind the scenes piece of bootstrappping. Unfortunately to make this work, we need a newer bitbake version which has a bitbake bug fixed. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-initial.inc | 3 +++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 4 ++++ meta/recipes-devtools/gcc/libgcc-initial.inc | 3 +++ 3 files changed, 10 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc index f94603c..b86e2fb 100644 --- a/meta/recipes-core/glibc/glibc-initial.inc +++ b/meta/recipes-core/glibc/glibc-initial.inc @@ -52,3 +52,6 @@ do_siteconfig () { } inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 5c0208a..d440d88 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -82,3 +82,7 @@ do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_AR inherit nopackages COMPILERINITIAL = "-initial" + + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc index 5b4bc3b..950ad86 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial.inc +++ b/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -15,3 +15,6 @@ EXTRA_OECONF += "--disable-shared" COMPILERINITIAL = "-initial" inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:46 +0000 Subject: [oe-commits] [openembedded-core] 29/30: python3: fix run-time deps for core python3 libraries In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.911FC23347C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5b8da2881b36d55f081289a3d34ee7873190ea7a Author: Dmitry Rozhkov AuthorDate: Thu Apr 6 08:07:44 2017 +0300 python3: fix run-time deps for core python3 libraries The http.server module from python3-netclient imports the html module which is in python3-html. Also xmlrpc.server imports pydoc which is a part of python3-pydoc. But those run-time dependencies are missing from python3-netclient and python3-xmlrpc respectively. Add the missing run-time dependencies. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-3.5-manifest.inc | 4 ++-- scripts/contrib/python/generate-manifest-3.5.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 55bcc4b..ec30eb9 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc @@ -153,7 +153,7 @@ RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN FILES_${PN}-multiprocessing="${libdir}/python3.5/lib-dynload/_multiprocessing.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_multiprocessing.*.so ${libdir}/python3.5/multiprocessing ${libdir}/python3.5/multiprocessing/__pycache__ " SUMMARY_${PN}-netclient="Python Internet Protocol clients" -RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" +RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html" FILES_${PN}-netclient="${libdir}/python3.5/*Cookie*.* ${libdir}/python3.5/__pycache__/*Cookie*.* ${libdir}/python3.5/base64.* ${libdir}/python3.5/__pycache__/base64.* ${libdir}/python3.5/cookielib.* ${libdir}/python3.5/__pycache__/cookielib.* ${libdir}/python3.5/ftplib.* ${libdir}/python3.5/__pycache__/ftplib.* ${libdir}/python3.5/gopherlib.* ${libdir}/python3.5/__pycache__/gopherlib.* ${libdir}/python3.5/hmac.* ${libdir}/python3.5/__pycache__/hmac.* ${libdir}/python3.5/http* ${libdir}/p [...] SUMMARY_${PN}-netserver="Python Internet Protocol servers" @@ -273,7 +273,7 @@ RDEPENDS_${PN}-xml="${PN}-core ${PN}-re" FILES_${PN}-xml="${libdir}/python3.5/lib-dynload/_elementtree.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_elementtree.*.so ${libdir}/python3.5/lib-dynload/pyexpat.*.so ${libdir}/python3.5/lib-dynload/__pycache__/pyexpat.*.so ${libdir}/python3.5/xml ${libdir}/python3.5/xml/__pycache__ ${libdir}/python3.5/xmllib.* ${libdir}/python3.5/__pycache__/xmllib.* " SUMMARY_${PN}-xmlrpc="Python XML-RPC support" -RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" +RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc" FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ " SUMMARY_${PN}-modules="All Python modules" diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 386bdfc..5835de8 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py @@ -340,7 +340,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-multiprocessing", "Python multiprocessing support", "${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap", "lib-dynload/_multiprocessing.*.so multiprocessing" ) # package - m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime", + m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html", "*Cookie*.* " + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* http* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib uuid.* rfc822.* mimetools.*" ) @@ -422,7 +422,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re", "lib-dynload/_elementtree.*.so lib-dynload/pyexpat.*.so xml xmllib.*" ) # package - m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang", + m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc", "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.* xmlrpc" ) m.addPackage( "${PN}-mailbox", "Python mailbox format support", "${PN}-core ${PN}-mime", -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:41 +0000 Subject: [oe-commits] [openembedded-core] 24/30: m4: do_configure: fix "Argument list too long" In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.643D82334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ce953a9583770fc23df0afa8e66a409158a0588c Author: Robert Yang AuthorDate: Thu Apr 6 03:05:53 2017 -0700 m4: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/m4/m4-1.4.18.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc index 5652b74..d7c8648 100644 --- a/meta/recipes-devtools/m4/m4-1.4.18.inc +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc @@ -15,5 +15,8 @@ SRC_URI_append_class-target = "\ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28" SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:42 +0000 Subject: [oe-commits] [openembedded-core] 25/30: guile: do_configure: fix "Argument list too long" In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.6BA622334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f8284ea56bfecf2a3e8bf4d951458bb05ec1495f Author: Robert Yang AuthorDate: Thu Apr 6 03:05:54 2017 -0700 guile: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/guile/guile_2.0.14.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/guile/guile_2.0.14.bb b/meta/recipes-devtools/guile/guile_2.0.14.bb index d2306e6..7a36ba0 100644 --- a/meta/recipes-devtools/guile/guile_2.0.14.bb +++ b/meta/recipes-devtools/guile/guile_2.0.14.bb @@ -30,6 +30,9 @@ SRC_URI[sha256sum] = "e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8 inherit autotools gettext pkgconfig texinfo BBCLASSEXTEND = "native" +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline" # add guile-native only to the target recipe's DEPENDS DEPENDS_append_class-target = " guile-native libatomic-ops" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:47 +0000 Subject: [oe-commits] [openembedded-core] 30/30: selftest/wic: skip wic unit tests in case NLS is disable In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.9813523347E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a587edc2d88f1b1a42251ec941a126381bc86a1 Author: Leonardo Sandoval AuthorDate: Wed Apr 5 15:34:26 2017 -0700 selftest/wic: skip wic unit tests in case NLS is disable WIC test case requires wic-tools which in turn depends on intltool-native and gettext-native. However, if NLS is disable, the gettext-minimal-native is used instead of gettext-native causing a failure on intltool-native as seen below: checking for msgfmt... no checking for gmsgfmt... no configure: error: GNU gettext tools not found; required for intltool ERROR: Function failed: do_configure (log file is located at /home/lsandov1/poky/build/tmp/work/i586-poky-linux-musl/systemd-boot/232-r0/temp/log.do_configure.7518) ERROR: Task (/home/lsandov1/poky/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb:do_configure) failed with exit code '1' NOTE: Tasks Summary: Attempted 609 tasks of which 604 didn't need to be rerun and 1 failed. [YOCTO #10902] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index df5e060..8030c35 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -77,7 +77,10 @@ class Wic(oeSelfTest): # clean up which can result in the native tools built earlier in # setUpClass being unavailable. if not Wic.image_is_ready: - bitbake('wic-tools') + if get_bb_var('USE_NLS') == 'yes': + bitbake('wic-tools') + else: + self.skipTest('wic-tools cannot be built due its (intltool|gettext)-native dependency and NLS disable') bitbake('core-image-minimal') Wic.image_is_ready = True -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:38 +0000 Subject: [oe-commits] [openembedded-core] 21/30: groff: replace "perl -w" with "use warnings" In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.428FA2334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3035cf75756ac6adfb72fc57a50e5ac177fe1064 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:50 2017 -0700 groff: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-replace-perl-w-with-use-warnings.patch | 102 +++++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 3 + 2 files changed, 105 insertions(+) diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..f1db5b0 --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,102 @@ +From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 01:46:00 -0700 +Subject: [PATCH] replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + font/devpdf/util/BuildFoundries.pl | 3 ++- + src/devices/gropdf/gropdf.pl | 3 ++- + src/devices/gropdf/pdfmom.pl | 3 ++- + src/utils/afmtodit/afmtodit.pl | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl +index 39f2f0d..a2bfd8e 100644 +--- a/font/devpdf/util/BuildFoundries.pl ++++ b/font/devpdf/util/BuildFoundries.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/perl + # + # BuildFoundries : Given a Foundry file generate groff and download files + # Deri James : Monday 07 Feb 2011 +@@ -22,6 +22,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + my $where=shift||''; + my $devps=shift||'../devps'; +diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl +index 035d123..b933b32 100644 +--- a/src/devices/gropdf/gropdf.pl ++++ b/src/devices/gropdf/gropdf.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # gropdf : PDF post processor for groff + # +@@ -21,6 +21,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use Getopt::Long qw(:config bundling); + use Compress::Zlib; + +diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl +index beec820..4b46ea4 100644 +--- a/src/devices/gropdf/pdfmom.pl ++++ b/src/devices/gropdf/pdfmom.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # pdfmom : Frontend to run groff -mom to produce PDFs + # Deri James : Friday 16 Mar 2012 +@@ -24,6 +24,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use File::Temp qw/tempfile/; + my @cmd; + my $dev='pdf'; +diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl +index 4f2ce83..5c078ff 100644 +--- a/src/utils/afmtodit/afmtodit.pl ++++ b/src/utils/afmtodit/afmtodit.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#! /usr/bin/perl + # -*- Perl -*- + # Copyright (C) 1989-2014 Free Software Foundation, Inc. + # Written by James Clark (jjc at jclark.com) +@@ -19,6 +19,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + @afmtodit.tables@ + +-- +2.10.2 + diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index dd241f3..7472f59 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0001-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" @@ -24,6 +25,8 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_configure_prepend() { if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then sed -i \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:45 +0000 Subject: [oe-commits] [openembedded-core] 28/30: eudev: set LGPL-2.1+ for libudev package In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.86EAC233478@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 24264c95cce6f9d295d5716ab4a77dfec9d1c17a Author: Martin Jansa AuthorDate: Thu Apr 6 13:02:27 2017 +0200 eudev: set LGPL-2.1+ for libudev package Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/udev/eudev_3.2.1.bb b/meta/recipes-core/udev/eudev_3.2.1.bb index 4a1a26a..bdfb544 100644 --- a/meta/recipes-core/udev/eudev_3.2.1.bb +++ b/meta/recipes-core/udev/eudev_3.2.1.bb @@ -1,6 +1,7 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" -LICENSE = "GPLv2.0+" +LICENSE = "GPLv2.0+ & LGPL-2.1+" +LICENSE_libudev = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:43 +0000 Subject: [oe-commits] [openembedded-core] 26/30: autogen-native: fix POSIX_SHELL and perl In-Reply-To: <149147881709.26962.5549873486005958612@git.openembedded.org> References: <149147881709.26962.5549873486005958612@git.openembedded.org> Message-ID: <20170406114018.73A5023347A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 57e6bd8020ddb493929ce1cc84990313d71f6310 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:55 2017 -0700 autogen-native: fix POSIX_SHELL and perl The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. This patch fixes the problem when POSIX_SHELL and perl are used as the interpreters. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.18.12.bb | 3 ++ ...2-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb index 0004389..853477c 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ file://fix-script-err-when-processing-libguile.patch \ file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ + file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \ " SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" @@ -30,6 +31,8 @@ inherit autotools texinfo native pkgconfig export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" +export POSIX_SHELL = "/usr/bin/env sh" + do_install_append () { create_wrapper ${D}/${bindir}/autogen \ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ diff --git a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch new file mode 100644 index 0000000..d5fe143 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch @@ -0,0 +1,32 @@ +From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Mon, 13 Mar 2017 20:33:30 -0700 +Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path + +Use "which perl" as shebang doesn't work when it is longer than +BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to +instead of. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 093e808..8dfc6dd 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -98,7 +98,7 @@ fix_scripts() { + st=`sed 1q $f` + + case "$st" in +- *perl ) echo '#!' `which perl` ++ *perl ) echo '#!/usr/bin/env perl' + sed 1d $f + ;; + +-- +2.10.2 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:28 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (751c9dc -> fe5d8a0) Message-ID: <149147882866.27524.3728732365021321488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from 751c9dc fetch/local: Drop FILESDIR new f93a77f runqueue: Allow recrdeptask not to exist for all recipes new fe5d8a0 Bump version to 1.33.4 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bin/bitbake | 2 +- lib/bb/__init__.py | 2 +- lib/bb/runqueue.py | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:29 +0000 Subject: [oe-commits] [bitbake] 01/02: runqueue: Allow recrdeptask not to exist for all recipes In-Reply-To: <149147882866.27524.3728732365021321488@git.openembedded.org> References: <149147882866.27524.3728732365021321488@git.openembedded.org> Message-ID: <20170406114028.BA90F233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit f93a77f2f188e18de9e3d812e86d77c2f3c71889 Author: Richard Purdie AuthorDate: Wed Apr 5 17:27:40 2017 +0100 runqueue: Allow recrdeptask not to exist for all recipes Currently if you specify a recrdeptask, it must exist for all recipes or you get a python traceback. This is a bug and it should be possible to have recipes which don't have the specified task. As well as preventing such a traceback (which shouldn't happen, it should be a user readable error), this allows us to fix issues in OE-Core which would otherwise trigger the traceback. Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 701ef1d..7d2ff81 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -697,6 +697,9 @@ class RunQueueData: seendeps.add(t) newdeps.add(t) for i in newdeps: + if i not in self.runtaskentries: + # Not all recipes might have the recrdeptask task as a task + continue task = self.runtaskentries[i].task for n in self.runtaskentries[i].depends: if n not in seendeps: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:40:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:40:30 +0000 Subject: [oe-commits] [bitbake] 02/02: Bump version to 1.33.4 In-Reply-To: <149147882866.27524.3728732365021321488@git.openembedded.org> References: <149147882866.27524.3728732365021321488@git.openembedded.org> Message-ID: <20170406114028.C44AF233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit fe5d8a0fdaec99721455dead626ecfb72bdeb616 Author: Richard Purdie AuthorDate: Thu Apr 6 12:18:13 2017 +0100 Bump version to 1.33.4 Signed-off-by: Richard Purdie --- bin/bitbake | 2 +- lib/bb/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/bitbake b/bin/bitbake index 787d4fd..10115d2 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -38,7 +38,7 @@ from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException if sys.getfilesystemencoding() != "utf-8": sys.exit("Please use a locale setting which supports utf-8.\nPython can't change the filesystem locale after loading so we need a utf-8 when python starts or things won't work.") -__version__ = "1.33.3" +__version__ = "1.33.4" if __name__ == "__main__": if __version__ != bb.__version__: diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 42977d0..b3567b1 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -21,7 +21,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -__version__ = "1.33.3" +__version__ = "1.33.4" import sys if sys.version_info < (3, 4, 0): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:46:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:46:21 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: license.bbclass: improve reproducibility Message-ID: <149147918148.28681.8089173964062170984@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. The following commit(s) were added to refs/heads/master-next by this push: new ae414db license.bbclass: improve reproducibility ae414db is described below commit ae414db432a57b213d26778e16548d9fd37dd566 Author: Juro Bystricky AuthorDate: Wed Apr 5 14:51:31 2017 -0700 license.bbclass: improve reproducibility Two identical builds can end up having deploy/licenses folders that differ. This is observed in cases where there are several different license files of the same name in different folders, i.e. "COPYING". In those case we have to differentiate the files somehow and we do it via file expensions such as COPYING.0, COPYING.1. However, which file will get which extension is presently random. This means, for example, that COPYING.0 in one build is the same as COPYING.1 in the other (and vice versa). Although there is mothing wrong with this, for the sake of binary reproducibility it is preferable to have a deterministic outcome. Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 81458e7..d4be478 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -505,7 +505,7 @@ def find_license_files(d): bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF'))) # Add files from LIC_FILES_CHKSUM to list of license files lic_chksum_paths = defaultdict(OrderedDict) - for path, data in lic_chksums.items(): + for path, data in sorted(lic_chksums.items()): lic_chksum_paths[os.path.basename(path)][data] = (os.path.join(srcdir, path), data[1], data[2]) for basename, files in lic_chksum_paths.items(): if len(files) == 1: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:46:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:46:31 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (fe5d8a0 -> eaeddaf) Message-ID: <149147919107.28884.13878806262347247580@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from fe5d8a0 Bump version to 1.33.4 new 6fb6429 toaster: toastergui: implement machine name validation new eaeddaf toaster:test:Create selenium tests for project dashboard page The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: lib/toaster/tests/builds/buildtest.py | 110 +++++----- .../commands => tests/functional}/__init__.py | 0 lib/toaster/tests/functional/functional_helpers.py | 122 +++++++++++ .../tests/functional/test_functional_basic.py | 243 +++++++++++++++++++++ lib/toaster/toastergui/static/js/projectpage.js | 17 ++ lib/toaster/toastergui/templates/project.html | 3 +- 6 files changed, 440 insertions(+), 55 deletions(-) copy lib/toaster/{toastermain/management/commands => tests/functional}/__init__.py (100%) create mode 100644 lib/toaster/tests/functional/functional_helpers.py create mode 100644 lib/toaster/tests/functional/test_functional_basic.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:46:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:46:32 +0000 Subject: [oe-commits] [bitbake] 01/02: toaster: toastergui: implement machine name validation In-Reply-To: <149147919107.28884.13878806262347247580@git.openembedded.org> References: <149147919107.28884.13878806262347247580@git.openembedded.org> Message-ID: <20170406114631.3108823348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 6fb642935a3787659aa316ca906025d2d87964cf Author: Belal, Awais AuthorDate: Wed Apr 5 00:12:48 2017 -0700 toaster: toastergui: implement machine name validation Valid machine names cannot include spaces anywhere in the name and doing so will result in a build failure. This implements a mechanism to alert the user against such a misconfiguration and does not allow input of such machine names. [YOCTO #8721] Signed-off-by: Awais Belal Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- lib/toaster/toastergui/static/js/projectpage.js | 17 +++++++++++++++++ lib/toaster/toastergui/templates/project.html | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/toaster/toastergui/static/js/projectpage.js b/lib/toaster/toastergui/static/js/projectpage.js index 4536703..21adf81 100644 --- a/lib/toaster/toastergui/static/js/projectpage.js +++ b/lib/toaster/toastergui/static/js/projectpage.js @@ -12,6 +12,8 @@ function projectPageInit(ctx) { var machineChangeFormToggle = $("#change-machine-toggle"); var machineNameTitle = $("#project-machine-name"); var machineChangeCancel = $("#cancel-machine-change"); + var machineInputForm = $("#machine-input-form"); + var invalidMachineNameHelp = $("#invalid-machine-name-help"); var freqBuildBtn = $("#freq-build-btn"); var freqBuildList = $("#freq-build-list"); @@ -208,8 +210,23 @@ function projectPageInit(ctx) { /* Change machine functionality */ + machineChangeInput.keyup(function(){ + if ($(this).val().indexOf(' ') >= 0) { + machineChangeBtn.attr("disabled", "disabled"); + invalidMachineNameHelp.show(); + machineInputForm.addClass('has-error'); + } else { + machineChangeBtn.removeAttr("disabled"); + invalidMachineNameHelp.hide(); + machineInputForm.removeClass('has-error'); + } + }); machineChangeFormToggle.click(function(){ + machineChangeInput.val(machineNameTitle.text()); + machineChangeBtn.removeAttr("disabled"); + invalidMachineNameHelp.hide(); + machineInputForm.removeClass('has-error'); machineForm.slideDown(); machineNameTitle.hide(); $(this).hide(); diff --git a/lib/toaster/toastergui/templates/project.html b/lib/toaster/toastergui/templates/project.html index 5abe241..ab7e665 100644 --- a/lib/toaster/toastergui/templates/project.html +++ b/lib/toaster/toastergui/templates/project.html @@ -67,11 +67,12 @@ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 11:46:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 11:46:33 +0000 Subject: [oe-commits] [bitbake] 02/02: toaster:test:Create selenium tests for project dashboard page In-Reply-To: <149147919107.28884.13878806262347247580@git.openembedded.org> References: <149147919107.28884.13878806262347247580@git.openembedded.org> Message-ID: <20170406114631.39BBE23348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit eaeddaf96efb8079b307652eac208f4ab5019ad4 Author: David Reyna AuthorDate: Wed Apr 5 15:18:20 2017 -0700 toaster:test:Create selenium tests for project dashboard page Added 7 new testcases that verify the UI interface and elements of the project detail page. This testcases can be found on testopia in the links: Verifies that the project is created and that you get redirected to the configuration page https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1514 Verifies that the left side bar menu, all links are clickable and they show on the UI https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1515 Verifies that after creating a project the default project configuration is created https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1516 Verifies that the default machine is set, once creating the project https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1517 Verifies the built recipes information of the project detail page https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1518 Verifies the default release information of the project https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1519 Verifies that the default layers are assigned to the project https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1520 Verifies that the links to the Configuration, Builds, Import layer and New Custom Image are present and work. [YOCTO #9808] Signed-off-by: Libertad Cruz Signed-off-by: An?bal Lim?n Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- lib/toaster/tests/builds/buildtest.py | 110 +++++----- lib/toaster/tests/functional/__init__.py | 0 lib/toaster/tests/functional/functional_helpers.py | 122 +++++++++++ .../tests/functional/test_functional_basic.py | 243 +++++++++++++++++++++ 4 files changed, 421 insertions(+), 54 deletions(-) diff --git a/lib/toaster/tests/builds/buildtest.py b/lib/toaster/tests/builds/buildtest.py index bf147f0..5a56a11 100644 --- a/lib/toaster/tests/builds/buildtest.py +++ b/lib/toaster/tests/builds/buildtest.py @@ -41,6 +41,61 @@ logger = logging.getLogger("toaster") # want to wrap everything in a database transaction as an external process # (bitbake needs access to the database) +def load_build_environment(): + call_command('loaddata', 'settings.xml', app_label="orm") + call_command('loaddata', 'poky.xml', app_label="orm") + + current_builddir = os.environ.get("BUILDDIR") + if current_builddir: + BuildTest.BUILDDIR = current_builddir + else: + # Setup a builddir based on default layout + # bitbake inside openebedded-core + oe_init_build_env_path = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + os.pardir, + os.pardir, + os.pardir, + os.pardir, + os.pardir, + 'oe-init-build-env' + ) + if not os.path.exists(oe_init_build_env_path): + raise Exception("We had no BUILDDIR set and couldn't " + "find oe-init-build-env to set this up " + "ourselves please run oe-init-build-env " + "before running these tests") + + oe_init_build_env_path = os.path.realpath(oe_init_build_env_path) + cmd = "bash -c 'source oe-init-build-env %s'" % BuildTest.BUILDDIR + p = subprocess.Popen( + cmd, + cwd=os.path.dirname(oe_init_build_env_path), + shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + output, err = p.communicate() + p.wait() + + logger.info("oe-init-build-env %s %s" % (output, err)) + + os.environ['BUILDDIR'] = BuildTest.BUILDDIR + + # Setup the path to bitbake we know where to find this + bitbake_path = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + os.pardir, + os.pardir, + os.pardir, + os.pardir, + 'bin', + 'bitbake') + if not os.path.exists(bitbake_path): + raise Exception("Could not find bitbake at the expected path %s" + % bitbake_path) + + os.environ['BBBASEDIR'] = bitbake_path class BuildTest(unittest.TestCase): @@ -59,60 +114,7 @@ class BuildTest(unittest.TestCase): if built: return built - call_command('loaddata', 'settings.xml', app_label="orm") - call_command('loaddata', 'poky.xml', app_label="orm") - - current_builddir = os.environ.get("BUILDDIR") - if current_builddir: - BuildTest.BUILDDIR = current_builddir - else: - # Setup a builddir based on default layout - # bitbake inside openebedded-core - oe_init_build_env_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - os.pardir, - os.pardir, - os.pardir, - os.pardir, - os.pardir, - 'oe-init-build-env' - ) - if not os.path.exists(oe_init_build_env_path): - raise Exception("We had no BUILDDIR set and couldn't " - "find oe-init-build-env to set this up " - "ourselves please run oe-init-build-env " - "before running these tests") - - oe_init_build_env_path = os.path.realpath(oe_init_build_env_path) - cmd = "bash -c 'source oe-init-build-env %s'" % BuildTest.BUILDDIR - p = subprocess.Popen( - cmd, - cwd=os.path.dirname(oe_init_build_env_path), - shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - - output, err = p.communicate() - p.wait() - - logger.info("oe-init-build-env %s %s" % (output, err)) - - os.environ['BUILDDIR'] = BuildTest.BUILDDIR - - # Setup the path to bitbake we know where to find this - bitbake_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - os.pardir, - os.pardir, - os.pardir, - os.pardir, - 'bin', - 'bitbake') - if not os.path.exists(bitbake_path): - raise Exception("Could not find bitbake at the expected path %s" - % bitbake_path) - - os.environ['BBBASEDIR'] = bitbake_path + load_build_environment() BuildEnvironment.objects.get_or_create( betype=BuildEnvironment.TYPE_LOCAL, diff --git a/lib/toaster/tests/functional/__init__.py b/lib/toaster/tests/functional/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/toaster/tests/functional/functional_helpers.py b/lib/toaster/tests/functional/functional_helpers.py new file mode 100644 index 0000000..486078a --- /dev/null +++ b/lib/toaster/tests/functional/functional_helpers.py @@ -0,0 +1,122 @@ +#! /usr/bin/env python +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# BitBake Toaster functional tests implementation +# +# Copyright (C) 2017 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os +import logging +import subprocess +import signal +import time +import re + +from tests.browser.selenium_helpers_base import SeleniumTestCaseBase +from tests.builds.buildtest import load_build_environment + +logger = logging.getLogger("toaster") + +class SeleniumFunctionalTestCase(SeleniumTestCaseBase): + wait_toaster_time = 5 + + @classmethod + def setUpClass(cls): + # So that the buildinfo helper uses the test database' + if os.environ.get('DJANGO_SETTINGS_MODULE', '') != \ + 'toastermain.settings_test': + raise RuntimeError("Please initialise django with the tests settings: " \ + "DJANGO_SETTINGS_MODULE='toastermain.settings_test'") + + load_build_environment() + + # start toaster + cmd = "bash -c 'source toaster start'" + p = subprocess.Popen( + cmd, + cwd=os.environ.get("BUILDDIR"), + shell=True) + if p.wait() != 0: + raise RuntimeError("Can't initialize toaster") + + super(SeleniumFunctionalTestCase, cls).setUpClass() + cls.live_server_url = 'http://localhost:8000/' + + @classmethod + def tearDownClass(cls): + super(SeleniumFunctionalTestCase, cls).tearDownClass() + + # XXX: source toaster stop gets blocked, to review why? + # from now send SIGTERM by hand + time.sleep(cls.wait_toaster_time) + builddir = os.environ.get("BUILDDIR") + + with open(os.path.join(builddir, '.toastermain.pid'), 'r') as f: + toastermain_pid = int(f.read()) + os.kill(toastermain_pid, signal.SIGTERM) + with open(os.path.join(builddir, '.runbuilds.pid'), 'r') as f: + runbuilds_pid = int(f.read()) + os.kill(runbuilds_pid, signal.SIGTERM) + + + def get_URL(self): + rc=self.get_page_source() + project_url=re.search("(projectPageUrl\s:\s\")(.*)(\",)",rc) + return project_url.group(2) + + + def find_element_by_link_text_in_table(self, table_id, link_text): + """ + Assume there're multiple suitable "find_element_by_link_text". + In this circumstance we need to specify "table". + """ + try: + table_element = self.get_table_element(table_id) + element = table_element.find_element_by_link_text(link_text) + except NoSuchElementException as e: + print('no element found') + raise + return element + + def get_table_element(self, table_id, *coordinate): + if len(coordinate) == 0: +#return whole-table element + element_xpath = "//*[@id='" + table_id + "']" + try: + element = self.driver.find_element_by_xpath(element_xpath) + except NoSuchElementException as e: + raise + return element + row = coordinate[0] + + if len(coordinate) == 1: +#return whole-row element + element_xpath = "//*[@id='" + table_id + "']/tbody/tr[" + str(row) + "]" + try: + element = self.driver.find_element_by_xpath(element_xpath) + except NoSuchElementException as e: + return False + return element +#now we are looking for an element with specified X and Y + column = coordinate[1] + + element_xpath = "//*[@id='" + table_id + "']/tbody/tr[" + str(row) + "]/td[" + str(column) + "]" + try: + element = self.driver.find_element_by_xpath(element_xpath) + except NoSuchElementException as e: + return False + return element diff --git a/lib/toaster/tests/functional/test_functional_basic.py b/lib/toaster/tests/functional/test_functional_basic.py new file mode 100644 index 0000000..cfa2b0f --- /dev/null +++ b/lib/toaster/tests/functional/test_functional_basic.py @@ -0,0 +1,243 @@ +#! /usr/bin/env python +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# BitBake Toaster functional tests implementation +# +# Copyright (C) 2017 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import time +import re +from tests.functional.functional_helpers import SeleniumFunctionalTestCase +from orm.models import Project + +class FuntionalTestBasic(SeleniumFunctionalTestCase): + +# testcase (1514) + def test_create_slenium_project(self): + project_name = 'selenium-project' + self.get('') + self.driver.find_element_by_link_text("To start building, create your first Toaster project").click() + self.driver.find_element_by_id("new-project-name").send_keys(project_name) + self.driver.find_element_by_id('projectversion').click() + self.driver.find_element_by_id("create-project-button").click() + element = self.wait_until_visible('#project-created-notification') + self.assertTrue(self.element_exists('#project-created-notification'),'Project creation notification not shown') + self.assertTrue(project_name in element.text, + "New project name not in new project notification") + self.assertTrue(Project.objects.filter(name=project_name).count(), + "New project not found in database") + + # testcase (1515) + def test_verify_left_bar_menu(self): + self.get('') + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + self.assertTrue(self.element_exists('#config-nav'),'Configuration Tab does not exist') + project_URL=self.get_URL() + self.driver.find_element_by_xpath('//a[@href="'+project_URL+'"]').click() + + try: + self.driver.find_element_by_xpath("//*[@id='config-nav']/ul/li/a[@href="+'"'+project_URL+'customimages/"'+"]").click() + self.assertTrue(re.search("Custom images",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'Custom images information is not loading properly') + except: + self.fail(msg='No Custom images tab available') + + try: + self.driver.find_element_by_xpath("//*[@id='config-nav']/ul/li/a[@href="+'"'+project_URL+'images/"'+"]").click() + self.assertTrue(re.search("Compatible image recipes",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'The Compatible image recipes information is not loading properly') + except: + self.fail(msg='No Compatible image tab available') + + try: + self.driver.find_element_by_xpath("//*[@id='config-nav']/ul/li/a[@href="+'"'+project_URL+'softwarerecipes/"'+"]").click() + self.assertTrue(re.search("Compatible software recipes",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'The Compatible software recipe information is not loading properly') + except: + self.fail(msg='No Compatible software recipe tab available') + + try: + self.driver.find_element_by_xpath("//*[@id='config-nav']/ul/li/a[@href="+'"'+project_URL+'machines/"'+"]").click() + self.assertTrue(re.search("Compatible machines",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'The Compatible machine information is not loading properly') + except: + self.fail(msg='No Compatible machines tab available') + + try: + self.driver.find_element_by_xpath("//*[@id='config-nav']/ul/li/a[@href="+'"'+project_URL+'layers/"'+"]").click() + self.assertTrue(re.search("Compatible layers",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'The Compatible layer information is not loading properly') + except: + self.fail(msg='No Compatible layers tab available') + + try: + self.driver.find_element_by_xpath("//*[@id='config-nav']/ul/li/a[@href="+'"'+project_URL+'configuration"'+"]").click() + self.assertTrue(re.search("Bitbake variables",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'The Bitbake variables information is not loading properly') + except: + self.fail(msg='No Bitbake variables tab available') + +# testcase (1516) + def test_review_configuration_information(self): + self.get('') + self.driver.find_element_by_xpath("//div[@id='global-nav']/ul/li/a[@href="+'"'+'/toastergui/projects/'+'"'+"]").click() + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + project_URL=self.get_URL() + + try: + self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') + self.assertTrue(re.search("qemux86",self.driver.find_element_by_xpath("//span[@id='project-machine-name']").text),'The machine type is not assigned') + self.driver.find_element_by_xpath("//span[@id='change-machine-toggle']").click() + self.wait_until_visible('#select-machine-form') + self.wait_until_visible('#cancel-machine-change') + self.driver.find_element_by_xpath("//form[@id='select-machine-form']/a[@id='cancel-machine-change']").click() + except: + self.fail(msg='The machine information is wrong in the configuration page') + + try: + self.driver.find_element_by_id('no-most-built') + except: + self.fail(msg='No Most built information in project detail page') + + try: + self.assertTrue(re.search("Yocto Project master",self.driver.find_element_by_xpath("//span[@id='project-release-title']").text),'The project release is not defined') + except: + self.fail(msg='No project release title information in project detail page') + + try: + self.driver.find_element_by_xpath("//div[@id='layer-container']") + self.assertTrue(re.search("3",self.driver.find_element_by_id("project-layers-count").text),'There should be 3 layers listed in the layer count') + layer_list = self.driver.find_element_by_id("layers-in-project-list") + layers = layer_list.find_elements_by_tag_name("li") + for layer in layers: + if re.match ("openembedded-core",layer.text): + print ("openembedded-core layer is a default layer in the project configuration") + elif re.match ("meta-poky",layer.text): + print ("meta-poky layer is a default layer in the project configuration") + elif re.match ("meta-yocto-bsp",layer.text): + print ("meta-yocto-bsp is a default layer in the project configuratoin") + else: + self.fail(msg='default layers are missing from the project configuration') + except: + self.fail(msg='No Layer information in project detail page') + +# testcase (1517) + def test_verify_machine_information(self): + self.get('') + self.driver.find_element_by_xpath("//div[@id='global-nav']/ul/li/a[@href="+'"'+'/toastergui/projects/'+'"'+"]").click() + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + + try: + self.assertTrue(self.element_exists('#machine-section'),'Machine section for the project configuration page does not exist') + self.assertTrue(re.search("qemux86",self.driver.find_element_by_id("project-machine-name").text),'The machine type is not assigned') + self.driver.find_element_by_id("change-machine-toggle").click() + self.wait_until_visible('#select-machine-form') + self.wait_until_visible('#cancel-machine-change') + self.driver.find_element_by_id("cancel-machine-change").click() + except: + self.fail(msg='The machine information is wrong in the configuration page') + +# testcase (1518) + def test_verify_most_built_recipes_information(self): + self.get('') + self.driver.find_element_by_xpath("//div[@id='global-nav']/ul/li/a[@href="+'"'+'/toastergui/projects/'+'"'+"]").click() + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + project_URL=self.get_URL() + + try: + self.assertTrue(re.search("You haven't built any recipes yet",self.driver.find_element_by_id("no-most-built").text),'Default message of no builds is not present') + self.driver.find_element_by_xpath("//div[@id='no-most-built']/p/a[@href="+'"'+project_URL+'images/"'+"]").click() + self.assertTrue(re.search("Compatible image recipes",self.driver.find_element_by_xpath("//div[@class='col-md-10']").text),'The Choose a recipe to build link is not working properly') + except: + self.fail(msg='No Most built information in project detail page') + +# testcase (1519) + def test_verify_project_release_information(self): + self.get('') + self.driver.find_element_by_xpath("//div[@id='global-nav']/ul/li/a[@href="+'"'+'/toastergui/projects/'+'"'+"]").click() + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + + try: + self.assertTrue(re.search("Yocto Project master",self.driver.find_element_by_id("project-release-title").text),'The project release is not defined') + except: + self.fail(msg='No project release title information in project detail page') + +# testcase (1520) + def test_verify_layer_information(self): + self.get('') + self.driver.find_element_by_xpath("//div[@id='global-nav']/ul/li/a[@href="+'"'+'/toastergui/projects/'+'"'+"]").click() + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + project_URL=self.get_URL() + + try: + self.driver.find_element_by_xpath("//div[@id='layer-container']") + self.assertTrue(re.search("3",self.driver.find_element_by_id("project-layers-count").text),'There should be 3 layers listed in the layer count') + layer_list = self.driver.find_element_by_id("layers-in-project-list") + layers = layer_list.find_elements_by_tag_name("li") + + for layer in layers: + if re.match ("openembedded-core",layer.text): + print ("openembedded-core layer is a default layer in the project configuration") + elif re.match ("meta-poky",layer.text): + print ("meta-poky layer is a default layer in the project configuration") + elif re.match ("meta-yocto-bsp",layer.text): + print ("meta-yocto-bsp is a default layer in the project configuratoin") + else: + self.fail(msg='default layers are missing from the project configuration') + + self.driver.find_element_by_xpath("//input[@id='layer-add-input']") + self.driver.find_element_by_xpath("//button[@id='add-layer-btn']") + self.driver.find_element_by_xpath("//div[@id='layer-container']/form[@class='form-inline']/p/a[@id='view-compatible-layers']") + self.driver.find_element_by_xpath("//div[@id='layer-container']/form[@class='form-inline']/p/a[@href="+'"'+project_URL+'importlayer"'+"]") + except: + self.fail(msg='No Layer information in project detail page') + +# testcase (1521) + def test_verify_project_detail_links(self): + self.get('') + self.driver.find_element_by_xpath("//div[@id='global-nav']/ul/li/a[@href="+'"'+'/toastergui/projects/'+'"'+"]").click() + self.wait_until_visible('#projectstable') + self.find_element_by_link_text_in_table('projectstable', 'selenium-project').click() + project_URL=self.get_URL() + + self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li[@id='topbar-configuration-tab']/a[@href="+'"'+project_URL+'"'+"]").click() + self.assertTrue(re.search("Configuration",self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li[@id='topbar-configuration-tab']/a[@href="+'"'+project_URL+'"'+"]").text), 'Configuration tab in project topbar is misspelled') + + try: + self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li/a[@href="+'"'+project_URL+'builds/"'+"]").click() + self.assertTrue(re.search("Builds",self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li/a[@href="+'"'+project_URL+'builds/"'+"]").text), 'Builds tab in project topbar is misspelled') + self.driver.find_element_by_xpath("//div[@id='empty-state-projectbuildstable']") + except: + self.fail(msg='Builds tab information is not present') + + try: + self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li/a[@href="+'"'+project_URL+'importlayer"'+"]").click() + self.assertTrue(re.search("Import layer",self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li/a[@href="+'"'+project_URL+'importlayer"'+"]").text), 'Import layer tab in project topbar is misspelled') + self.driver.find_element_by_xpath("//fieldset[@id='repo-select']") + self.driver.find_element_by_xpath("//fieldset[@id='git-repo']") + except: + self.fail(msg='Import layer tab not loading properly') + + try: + self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li/a[@href="+'"'+project_URL+'newcustomimage/"'+"]").click() + self.assertTrue(re.search("New custom image",self.driver.find_element_by_xpath("//div[@id='project-topbar']/ul[@class='nav nav-tabs']/li/a[@href="+'"'+project_URL+'newcustomimage/"'+"]").text), 'New custom image tab in project topbar is misspelled') + self.assertTrue(re.search("Select the image recipe you want to customise",self.driver.find_element_by_xpath("//div[@class='col-md-12']/h2").text),'The new custom image tab is not loading correctly') + except: + self.fail(msg='New custom image tab not loading properly') + + + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:41 +0000 Subject: [oe-commits] [openembedded-core] 01/39: runqemu: use realpath for imgdir In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.0FBB323348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dad9f27278850d0d3818344fea877835632576cb Author: Robert Yang AuthorDate: Wed Apr 5 23:41:37 2017 -0700 runqemu: use realpath for imgdir The DEPLOY_DIR_IMAGE maybe relative or absolute path since it can be read from env vars, so use realpath for both imgdir and DEPLOY_DIR_IMAGE when compare. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 251f5f7..b696202 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -693,8 +693,8 @@ class BaseConfig(object): # artefacts are relative to that file, rather than in whatever # directory DEPLOY_DIR_IMAGE in the conf file points to. if self.qbconfload: - imgdir = os.path.dirname(self.qemuboot) - if imgdir != self.get('DEPLOY_DIR_IMAGE'): + imgdir = os.path.realpath(os.path.dirname(self.qemuboot)) + if imgdir != os.path.realpath(self.get('DEPLOY_DIR_IMAGE')): logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir)) self.set('DEPLOY_DIR_IMAGE', imgdir) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:44 +0000 Subject: [oe-commits] [openembedded-core] 04/39: oe-build-perf-report-email.py: fix one file path In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.2CB18233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 73ae473a48829e9486c71223e5f9c2968300042c Author: Markus Lehtonen AuthorDate: Thu Apr 6 10:10:18 2017 +0300 oe-build-perf-report-email.py: fix one file path Sending report email was not working correctly if the script was given an html report path that contained directory components. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/oe-build-perf-report-email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/oe-build-perf-report-email.py b/scripts/contrib/oe-build-perf-report-email.py index 7f4274e..81b58ab 100755 --- a/scripts/contrib/oe-build-perf-report-email.py +++ b/scripts/contrib/oe-build-perf-report-email.py @@ -243,7 +243,7 @@ def main(argv=None): html_report = None if args.html: scrape_html_report(args.html, outdir, args.phantomjs_args) - html_report = os.path.join(outdir, args.html) + html_report = os.path.join(outdir, os.path.basename(args.html)) if args.to: log.info("Sending email to %s", ', '.join(args.to)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:40 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ae414db -> 0bf66bc) Message-ID: <149152270065.17936.6112987537125783399@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard ae414db license.bbclass: improve reproducibility discard 3a587ed selftest/wic: skip wic unit tests in case NLS is disable discard 5b8da28 python3: fix run-time deps for core python3 libraries discard 24264c9 eudev: set LGPL-2.1+ for libudev package discard f1330b4 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash discard 57e6bd8 autogen-native: fix POSIX_SHELL and perl discard f8284ea guile: do_configure: fix "Argument list too long" discard ce953a9 m4: do_configure: fix "Argument list too long" discard 7d8071f valgrind: set ac_cv_path_PERL to /usr/bin/env perl discard 67ddf26 mc: replace "perl -w" with "use warnings" discard 3035cf7 groff: replace "perl -w" with "use warnings" discard fbd5ebf glibc/gcc/libgcc-initial: Delete do_build tasks for -initial discard db322b0 sanity: Require bitbake 1.33.4 discard b31283e logrotate: replace fedorahosted.org SRC_URI with github.com source discard f6f6572 base-files: profile: Do not assume that the tty command exists discard 4eda138 base-files: profile: Whitespace clean up discard 1def810 python-pycurl: create python3-pycurl recipe discard 72aac42 busybox: Security fix BUG9071 discard 2101dd8 ghostscript: CVE-2017-7207 discard c67726e package.bbclass: add CONFFILES to pkgdata discard 7b3eddc package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' discard e0cbafa yocto-compat-layer: limit report of signature changes discard c8c83bb yocto-compat-layer: fix also other command invocations discard 72d3ef5 oe-build-perf-report-email.py: fix one file path discard 091aa92 busybox: Security fix CVE-2016-6301 discard 2ca0655 runqemu: do not rely on grepping images discard c3e36ec runqemu: use realpath for imgdir discard 49aa0bc runqemu: run without arguments discard bccc7f1 runqemu: use self.rootfs to replace self.nfs_dir discard dcf33db runqemu: support env vars explicitly new dad9f27 runqemu: use realpath for imgdir new 5cc0631 runqemu: do not rely on grepping images new 3dd0fe2 busybox: Security fix CVE-2016-6301 new 73ae473 oe-build-perf-report-email.py: fix one file path new a11f67d yocto-compat-layer: fix also other command invocations new 00f154b yocto-compat-layer: limit report of signature changes new 33e1c9d package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' new 63033df package.bbclass: add CONFFILES to pkgdata new 4cb2319 ghostscript: CVE-2017-7207 new fcf2eb9 busybox: Security fix BUG9071 new f5cd94b python-pycurl: create python3-pycurl recipe new f794b7d base-files: profile: Whitespace clean up new b5fc80d base-files: profile: Do not assume that the tty command exists new 7defd6b logrotate: replace fedorahosted.org SRC_URI with github.com source new dcb6948 sanity: Require bitbake 1.33.4 new 8bf71bf glibc/gcc/libgcc-initial: Delete do_build tasks for -initial new afc467f groff: replace "perl -w" with "use warnings" new 57a35fe mc: replace "perl -w" with "use warnings" new 963875c valgrind: set ac_cv_path_PERL to /usr/bin/env perl new 6cbec3d m4: do_configure: fix "Argument list too long" new 80825a1 guile: do_configure: fix "Argument list too long" new 3c448ed autogen-native: fix POSIX_SHELL and perl new e266ec8 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash new 39ade16 eudev: set LGPL-2.1+ for libudev package new 25ff02b python3: fix run-time deps for core python3 libraries new 8c3e6bd selftest/wic: skip wic unit tests in case NLS is disable new 1666b8b license.bbclass: improve reproducibility new 8854c5c sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks new 50d6e20 elfutils: fix building elfutils-native with GCC7 new 736e901 gcc-6.3: backport fix of check for empty string in ubsan.c new ca3024a qemux86*.conf: changed dependency task for syslinux new abba9f5 selftest/recipetool: skip create_git in case x11 feature is not present new c5ca7eb qemu: use python2.7 instead of python2 new d8fa636 lib/oe/sstatesig: fix finding native siginfo files in sstate-cache new 056a16a lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate new d31fb8a cross.bbclass: override TARGET_* flags new 9b77ddc crosssdk.bbclass: override TARGET_* flags new c612bcd nativesdk.bbclass: override TARGET_* flags new 0bf66bc cross-canadian.bbclass: override TARGET_* flags This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ae414db) \ N -- N -- N refs/heads/master-next (0bf66bc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 39 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/cross-canadian.bbclass | 5 + meta/classes/cross.bbclass | 5 + meta/classes/crosssdk.bbclass | 5 + meta/classes/nativesdk.bbclass | 4 + meta/classes/sstate.bbclass | 4 + meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- meta/lib/oe/sstatesig.py | 39 ++++---- meta/lib/oeqa/selftest/recipetool.py | 2 + .../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 +++++++++ .../elfutils/elfutils-0.168/fallthrough.patch | 36 +++++++ meta/recipes-devtools/elfutils/elfutils_0.168.bb | 3 + meta/recipes-devtools/gcc/gcc-6.3.inc | 1 + .../gcc/gcc-6.3/ubsan-fix-check-empty-string.patch | 28 ++++++ meta/recipes-devtools/qemu/qemu.inc | 2 +- scripts/runqemu | 103 +++++++++------------ 16 files changed, 206 insertions(+), 79 deletions(-) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch create mode 100644 meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:42 +0000 Subject: [oe-commits] [openembedded-core] 02/39: runqemu: do not rely on grepping images In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.163B023348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5cc0631bfa71eade94cce64351bfe62ce91143cb Author: Robert Yang AuthorDate: Wed Apr 5 23:41:38 2017 -0700 runqemu: do not rely on grepping images Fixed when the image is large and not enough memory: grep: memory exhausted Aborted [YOCTO #11073] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/qemuboot.bbclass | 3 +++ scripts/runqemu | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 3ca97ca..2870388 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -64,6 +64,9 @@ QB_DEFAULT_FSTYPE ?= "ext4" QB_OPT_APPEND ?= "-show-cursor" QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" +# This should be kept align with ROOT_VM +QB_DRIVE_TYPE ?= "/dev/sd" + # Create qemuboot.conf addtask do_write_qemuboot_conf after do_rootfs before do_image IMGDEPLOYDIR ?= "${WORKDIR}/deploy-${PN}-image-complete" diff --git a/scripts/runqemu b/scripts/runqemu index b696202..0a1bdfe 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -966,23 +966,26 @@ class BaseConfig(object): self.kernel_cmdline = 'root=/dev/ram0 rw debugshell' self.rootfs_options = '-initrd %s' % self.rootfs else: + vm_drive = '' if self.fstype in self.vmtypes: if self.fstype == 'iso': vm_drive = '-cdrom %s' % self.rootfs - else: - cmd1 = "grep -q 'root=/dev/sd' %s" % self.rootfs - cmd2 = "grep -q 'root=/dev/hd' %s" % self.rootfs - if subprocess.call(cmd1, shell=True) == 0: + elif self.get('QB_DRIVE_TYPE'): + drive_type = self.get('QB_DRIVE_TYPE') + if drive_type.startswith("/dev/sd"): logger.info('Using scsi drive') vm_drive = '-drive if=none,id=hd,file=%s,format=%s -device virtio-scsi-pci,id=scsi -device scsi-hd,drive=hd' \ % (self.rootfs, rootfs_format) - elif subprocess.call(cmd2, shell=True) == 0: + elif drive_type.startswith("/dev/hd"): logger.info('Using ide drive') vm_drive = "%s,format=%s" % (self.rootfs, rootfs_format) else: - logger.warn("Can't detect drive type %s" % self.rootfs) - logger.warn('Trying to use virtio block drive') - vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) + logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type) + + if not vm_drive: + logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE") + logger.warn('Trying to use virtio block drive') + vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) self.rootfs_options = '%s -no-reboot' % vm_drive self.kernel_cmdline = 'root=%s rw highres=off' % (self.get('QB_KERNEL_ROOT')) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:43 +0000 Subject: [oe-commits] [openembedded-core] 03/39: busybox: Security fix CVE-2016-6301 In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.1F71F233490@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3dd0fe263ecf54f1816a884056b16261eef3c66b Author: Andrej Valek AuthorDate: Thu Apr 6 09:07:37 2017 +0200 busybox: Security fix CVE-2016-6301 ntpd: NTP server denial of service flaw CVE: CVE-2016-6301 Signed-off-by: Andrej Valek Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- .../busybox/busybox/CVE-2016-6301.patch | 37 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 38 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch new file mode 100644 index 0000000..851bc20 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch @@ -0,0 +1,37 @@ +busybox1.24.1: Fix CVE-2016-6301 + +[No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=1363710 + +ntpd: NTP server denial of service flaw + +The busybox NTP implementation doesn't check the NTP mode of packets +received on the server port and responds to any packet with the right +size. This includes responses from another NTP server. An attacker can +send a packet with a spoofed source address in order to create an +infinite loop of responses between two busybox NTP servers. Adding +more packets to the loop increases the traffic between the servers +until one of them has a fully loaded CPU and/or network. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=150dc7a2b483b8338a3e185c478b4b23ee884e71] +CVE: CVE-2016-6301 +Signed-off-by: Andrej Valek +Signed-off-by: Pascal Bach + +diff --git a/networking/ntpd.c b/networking/ntpd.c +index 9732c9b..0f6a55f 100644 +--- a/networking/ntpd.c ++++ b/networking/ntpd.c +@@ -1985,6 +1985,13 @@ recv_and_process_client_pkt(void /*int fd*/) + goto bail; + } + ++ /* Respond only to client and symmetric active packets */ ++ if ((msg.m_status & MODE_MASK) != MODE_CLIENT ++ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT ++ ) { ++ goto bail; ++ } ++ + query_status = msg.m_status; + query_xmttime = msg.m_xmttime; + diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 41fc641..6013ec9 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -47,6 +47,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2016-2148.patch \ file://CVE-2016-2147.patch \ file://CVE-2016-2147_2.patch \ + file://CVE-2016-6301.patch \ file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \ file://makefile-fix-backport.patch \ file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:47 +0000 Subject: [oe-commits] [openembedded-core] 07/39: package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.421C2233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 33e1c9d2878e2b73f8ffdb817a6785fd1c73d4b5 Author: Mariano Lopez AuthorDate: Wed Apr 5 11:46:35 2017 -0700 package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' opkg uses empty lines as separator for next package and if an ipk file was packaged with empty lines in DESCRIPTION opkg won't be able to handle such ipk file, this happens at execution time. This commit will replace empty lines in DESCRIPTION with a '.' when generating an ipk package to avoid this issue. [YOCTO #10677] Signed-off-by: Mariano Lopez Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index fa47385..c7cec9d 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -145,7 +145,11 @@ python do_package_ipk () { # We don't limit the width when manually indent, but we do # need the textwrap.fill() to set the initial_indent and # subsequent_indent, so set a large width - ctrlfile.write('%s\n' % textwrap.fill(t.strip(), width=100000, initial_indent=' ', subsequent_indent=' ')) + line = textwrap.fill(t.strip(), + width=100000, + initial_indent=' ', + subsequent_indent=' ') or '.' + ctrlfile.write('%s\n' % line) else: # Auto indent ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:48 +0000 Subject: [oe-commits] [openembedded-core] 08/39: package.bbclass: add CONFFILES to pkgdata In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.4EC2C233499@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 63033dfd1a8d378d1525008aecc1b5f966fae112 Author: David Vincent AuthorDate: Wed Apr 5 17:43:07 2017 +0200 package.bbclass: add CONFFILES to pkgdata Emit CONFFILES variable in pkgdata, or else the get_conffiles function will return 'None' for some packages instead of the expected value. This is especially true for optional module packages. Signed-off-by: David Vincent Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1bc4f6a..cc466bd 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1380,6 +1380,7 @@ python emit_pkgdata() { write_if_exists(sf, pkg, 'PKG') write_if_exists(sf, pkg, 'ALLOW_EMPTY') write_if_exists(sf, pkg, 'FILES') + write_if_exists(sf, pkg, 'CONFFILES') write_if_exists(sf, pkg, 'pkg_postinst') write_if_exists(sf, pkg, 'pkg_postrm') write_if_exists(sf, pkg, 'pkg_preinst') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:46 +0000 Subject: [oe-commits] [openembedded-core] 06/39: yocto-compat-layer: limit report of signature changes In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.39950233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 00f154bc1cc499f5ebf88599b4d0b325cbe47625 Author: Patrick Ohly AuthorDate: Wed Apr 5 15:36:05 2017 +0200 yocto-compat-layer: limit report of signature changes Typically a single change cascades through the entire task dependency chain. Developers had to figure that out themselves, based on hard to read and interpret output (not sorted, no indention, no explanations): $ yocto-compat-layer.py -n meta-xxxx ... AssertionError: True is not false : Layer meta-xxxx changed signatures. webkitgtk:do_install changed fe2edc9082bc0da98f9cb1391c52f565 -> b3a44684c5cd9aacd3f7c6ed88eefab5 gstreamer1.0-plugins-good:do_configure changed 3b2f8211be3fe08422bf6087f3af16d1 -> 7d80e42fa1f4f01ff4dfe2ea4477d382 pulseaudio:do_package_qa changed 5d0a58ada66ff17f5576555302ac319a -> 0e13bcb96143d1ae54c451bc3de0aa30 epiphany:do_prepare_recipe_sysroot changed 29e1b277dbcb005bd54950594c50d91b -> d3c45527b37677a0668ce483c6db3052 ... gst-player:do_packagedata changed 9ce6efdd357dd74919bc4957458b1e95 -> d0c083ce629f37adfc9c4ba9eff81f83 gstreamer1.0-plugins-base:do_install changed 1161cd867d15bea63e5dd5d9abf0519c -> 5bf2b652a2d77fee3eedb35af2f201a0 gstreamer1.0-rtsp-server:do_packagedata changed 6781dc3070f80b843ed1970d74dd323e -> 454620c2e3b9fea87e525d14b6ed0344 alsa-plugins:do_packagedata changed 1808c3f737cb805b169d004e948ea19c -> 480124b7fa5eab1f73bf96440d725231 Now the tool automates the problem analysis: it retrieves the depgraph using the tinfoil API and only reports those tasks with modified signatures whose dependencies have not changed, i.e. those tasks which definitely introduce a change. >From the previous example, that just leaves two tasks that need to be checked: AssertionError: False is not true : Layer meta-xxxx changed 120 signatures, initial differences (first hash without, second with layer): gstreamer1.0-plugins-base:do_fetch: 76973f19f2e30d282152bdd7e4efe5bb -> e6e7c6fa9f2bd59d7d8d107f7c6ca1ac pulseaudio:do_install: 668eb1e30af129df9806b0aa0d7c10cd -> 1196bdb88eef56eeee4613bb06b9387e This pruning might be a bit too aggressive in the sense that tasks which inherit a change and then add more changes themselves won't be reported initially. They will be found when fixing the reported tasks and re-running the check. For a developer it seems better to have something listed which definitely is a problem and needs fixing instead of everything, including the tasks which don't need fixes. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 32 +++++++++++++++++++ scripts/lib/compatlayer/cases/common.py | 54 +++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 9eb862d..b46527a 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -7,6 +7,8 @@ import os import subprocess from enum import Enum +import bb.tinfoil + class LayerType(Enum): BSP = 0 DISTRO = 1 @@ -252,3 +254,33 @@ def get_signatures(builddir, failsafe=False): raise RuntimeError('Can\'t load signatures from %s' % sigs_file) return sigs + +def get_depgraph(targets=['world']): + ''' + Returns the dependency graph for the given target(s). + The dependency graph is taken directly from DepTreeEvent. + ''' + depgraph = None + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=False) + tinfoil.set_event_mask(['bb.event.NoProvider', 'bb.event.DepTreeGenerated', 'bb.command.CommandCompleted']) + if not tinfoil.run_command('generateDepTreeEvent', targets, 'do_build'): + raise RuntimeError('starting generateDepTreeEvent failed') + while True: + event = tinfoil.wait_event(timeout=1000) + if event: + if isinstance(event, bb.command.CommandFailed): + raise RuntimeError('Generating dependency information failed: %s' % event.error) + elif isinstance(event, bb.command.CommandCompleted): + break + elif isinstance(event, bb.event.NoProvider): + if event._reasons: + raise RuntimeError('Nothing provides %s: %s' % (event._item, event._reasons)) + else: + raise RuntimeError('Nothing provides %s.' % (event._item)) + elif isinstance(event, bb.event.DepTreeGenerated): + depgraph = event._depgraph + + if depgraph is None: + raise RuntimeError('Could not retrieve the depgraph.') + return depgraph diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 9cc682e..b91da9b 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -3,7 +3,7 @@ import os import unittest -from compatlayer import get_signatures, LayerType, check_command +from compatlayer import get_signatures, LayerType, check_command, get_depgraph from compatlayer.case import OECompatLayerTestCase class CommonCompatLayer(OECompatLayerTestCase): @@ -31,21 +31,49 @@ class CommonCompatLayer(OECompatLayerTestCase): raise unittest.SkipTest("Layer %s isn't BSP or DISTRO one." \ % self.tc.layer['name']) + # task -> (old signature, new signature) sig_diff = {} - curr_sigs = get_signatures(self.td['builddir'], failsafe=True) for task in self.td['sigs']: - if task not in curr_sigs: - continue - - if self.td['sigs'][task] != curr_sigs[task]: - sig_diff[task] = '%s -> %s' % \ - (self.td['sigs'][task], curr_sigs[task]) + if task in curr_sigs and \ + self.td['sigs'][task] != curr_sigs[task]: + sig_diff[task] = (self.td['sigs'][task], curr_sigs[task]) - detail = '' if sig_diff: - for task in sig_diff: - detail += "%s changed %s\n" % (task, sig_diff[task]) - self.assertFalse(bool(sig_diff), "Layer %s changed signatures.\n%s" % \ - (self.tc.layer['name'], detail)) + # Beware, depgraph uses task=. whereas get_signatures() + # uses :. Need to convert sometimes. The output follows + # the convention from get_signatures() because that seems closer to + # normal bitbake output. + def sig2graph(task): + pn, taskname = task.rsplit(':', 1) + return pn + '.' + taskname + def graph2sig(task): + pn, taskname = task.rsplit('.', 1) + return pn + ':' + taskname + depgraph = get_depgraph() + depends = depgraph['tdepends'] + + # If a task A has a changed signature, but none of its + # dependencies, then we need to report it because it is + # the one which introduces a change. Any task depending on + # A (directly or indirectly) will also have a changed + # signature, but we don't need to report it. It might have + # its own changes, which will become apparent once the + # issues that we do report are fixed and the test gets run + # again. + sig_diff_filtered = [] + for task, (old_sig, new_sig) in sig_diff.items(): + deps_tainted = False + for dep in depends.get(sig2graph(task), ()): + if graph2sig(dep) in sig_diff: + deps_tainted = True + break + if not deps_tainted: + sig_diff_filtered.append((task, old_sig, new_sig)) + msg = [] + msg.append('Layer %s changed %d signatures, initial differences (first hash without, second with layer):' % + (self.tc.layer['name'], len(sig_diff))) + for diff in sorted(sig_diff_filtered): + msg.append(' %s: %s -> %s' % diff) + self.assertTrue(False, '\n'.join(msg)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:45 +0000 Subject: [oe-commits] [openembedded-core] 05/39: yocto-compat-layer: fix also other command invocations In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.33122233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a11f67d2d68a4ad0b94a6b04386e4eb835859a32 Author: Patrick Ohly AuthorDate: Wed Apr 5 15:36:04 2017 +0200 yocto-compat-layer: fix also other command invocations In commit 5b9ac62ab535d, one place was fixed where a command was invoked such that failures caused double stack traces and stderr was lost. The same problem also occurs elsewhere, triggered for example by a layer with parsing problems. Now a new utility method is used instead of repeating the code. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 23 ++++++++++++++++------- scripts/lib/compatlayer/cases/common.py | 25 +++++-------------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 86f86eb..9eb862d 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -4,6 +4,7 @@ # Released under the MIT license (see COPYING.MIT) import os +import subprocess from enum import Enum class LayerType(Enum): @@ -199,8 +200,20 @@ def add_layer(bblayersconf, layer, layers, logger): return True +def check_command(error_msg, cmd): + ''' + Run a command under a shell, capture stdout and stderr in a single stream, + throw an error when command returns non-zero exit code. Returns the output. + ''' + + p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + output, _ = p.communicate() + if p.returncode: + msg = "%s\nCommand: %s\nOutput:\n%s" % (error_msg, cmd, output.decode('utf-8')) + raise RuntimeError(msg) + return output + def get_signatures(builddir, failsafe=False): - import subprocess import re # some recipes needs to be excluded like meta-world-pkgdata @@ -214,12 +227,8 @@ def get_signatures(builddir, failsafe=False): if failsafe: cmd += '-k ' cmd += '-S none world' - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - output, _ = p.communicate() - if p.returncode: - msg = "Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities.\nCommand: %s\nOutput:\n%s" % (cmd, output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities.', + cmd) sigs_file = os.path.join(builddir, 'locked-sigs.inc') sig_regex = re.compile("^(?P.*:.*):(?P.*) .$") diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 4d328ec..9cc682e 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -2,9 +2,8 @@ # Released under the MIT license (see COPYING.MIT) import os -import subprocess import unittest -from compatlayer import get_signatures, LayerType +from compatlayer import get_signatures, LayerType, check_command from compatlayer.case import OECompatLayerTestCase class CommonCompatLayer(OECompatLayerTestCase): @@ -20,26 +19,12 @@ class CommonCompatLayer(OECompatLayerTestCase): msg="Layer contains README file but is empty.") def test_parse(self): - try: - output = subprocess.check_output('bitbake -p', shell=True, - stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - import traceback - exc = traceback.format_exc() - msg = 'Layer %s failed to parse.\n%s\n%s\n' % (self.tc.layer['name'], - exc, e.output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Layer %s failed to parse.' % self.tc.layer['name'], + 'bitbake -p') def test_show_environment(self): - try: - output = subprocess.check_output('bitbake -e', shell=True, - stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - import traceback - exc = traceback.format_exc() - msg = 'Layer %s failed to show environment.\n%s\n%s\n' % \ - (self.tc.layer['name'], exc, e.output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Layer %s failed to show environment.' % self.tc.layer['name'], + 'bitbake -e') def test_signatures(self): if self.tc.layer['type'] == LayerType.SOFTWARE: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:52 +0000 Subject: [oe-commits] [openembedded-core] 12/39: base-files: profile: Whitespace clean up In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.76C272334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f794b7dde53809df5b98237b2ab7406de41c5d18 Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:25 2017 +0200 base-files: profile: Whitespace clean up Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index c616616..22dfb4f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -6,28 +6,29 @@ EDITOR="vi" # needed for packages like cron, git-commit test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. if [ "$HOME" = "ROOTHOME" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin fi if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + # works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' fi if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh ; do - if [ -f $i -a -r $i ]; then - . $i - fi - done - unset i + for i in /etc/profile.d/*.sh; do + if [ -f $i -a -r $i ]; then + . $i + fi + done + unset i fi if [ -x /usr/bin/resize ] && termpath="`tty`"; then - # Make sure we are on a serial console (i.e. the device used starts with /dev/tty), - # otherwise we confuse e.g. the eclipse launcher which tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null - esac + # Make sure we are on a serial console (i.e. the device used starts with + # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which + # tries do use ssh + case "$termpath" in + /dev/tty[A-z]*) resize >/dev/null + esac fi export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:53 +0000 Subject: [oe-commits] [openembedded-core] 13/39: base-files: profile: Do not assume that the tty command exists In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.812AB2334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5fc80d570b7fc4ebae8d46cbbdc636ad06e49d3 Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:26 2017 +0200 base-files: profile: Do not assume that the tty command exists This avoids the following error when logging in to a host that does not have the tty command: -sh: tty: not found Reported-by: Cristian Ionescu-Idbohrn Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 6 +++--- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 22dfb4f..ceaf15f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -22,12 +22,12 @@ if [ -d /etc/profile.d ]; then unset i fi -if [ -x /usr/bin/resize ] && termpath="`tty`"; then +if command -v resize >/dev/null && command -v tty >/dev/null; then # Make sure we are on a serial console (i.e. the device used starts with # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which # tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null + case $(tty) in + /dev/tty[A-z]*) resize >/dev/null;; esac fi diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index f56969c..ca7bf06 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -128,10 +128,6 @@ do_install () { install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd - if [ "/usr/bin" != "${bindir}" ]; then - sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile - fi - ln -sf /proc/mounts ${D}${sysconfdir}/mtab } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:50 +0000 Subject: [oe-commits] [openembedded-core] 10/39: busybox: Security fix BUG9071 In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.5DBB123349D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fcf2eb92862192ff217e12a5bf57430166cf5d62 Author: Martin Balik AuthorDate: Wed Apr 5 12:38:57 2017 +0200 busybox: Security fix BUG9071 Signed-off-by: Martin Balik Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- .../busybox/BUG9071_buffer_overflow_arp.patch | 53 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 54 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch new file mode 100644 index 0000000..828694c --- /dev/null +++ b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch @@ -0,0 +1,53 @@ +busybox1.24.1: Fix busybox - (local) cmdline stack buffer overwrite + +[No upstream tracking] -- https://bugs.busybox.net/show_bug.cgi?id=9071 + +busybox - (local) cmdline stack buffer overwrite + +Busybox provides an `arp` applet which is missing an array bounds check for +command-line parameter `IFNAME`. It is therefore vulnerable to a command-line +based local stack buffer overwrite effectively allowing local users to write +past a 16 bytes fixed stack buffer. This leads to two scenarios, one (A) where +an IOCTL for GET_HW_ADDRESS (`SIOCGIFHWADDR`) fails and results in a corrupted +`va_list` being passed to `*printf()` and one (B) where an attacker might provide +valid params for the IOCTL and trick the program to proceed and result in a +`RET eip overwrite` eventually gaining code execution. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/networking/arp.c?id=88e2b1cb626761b1924305b761a5dfc723613c4e] +BUG: BUG9071 +Signed-off-by: Martin Balik +Signed-off-by: Pascal Bach + +-- + +diff --git a/networking/arp.c b/networking/arp.c +index 0099aa5..87eb327 100644 +--- a/networking/arp.c ++++ b/networking/arp.c +@@ -176,7 +176,7 @@ static int arp_del(char **args) + if (flags == 0) + flags = 3; + +- strncpy(req.arp_dev, device, sizeof(req.arp_dev)); ++ strncpy_IFNAMSIZ(req.arp_dev, device); + + err = -1; + +@@ -217,7 +217,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa) + struct ifreq ifr; + const struct hwtype *xhw; + +- strcpy(ifr.ifr_name, ifname); ++ strncpy_IFNAMSIZ(ifr.ifr_name, ifname); + ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr, + "can't get HW-Address for '%s'", ifname); + if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) { +@@ -330,7 +330,7 @@ static int arp_set(char **args) + /* Fill in the remainder of the request. */ + req.arp_flags = flags; + +- strncpy(req.arp_dev, device, sizeof(req.arp_dev)); ++ strncpy_IFNAMSIZ(req.arp_dev, device); + + /* Call the kernel. */ + if (option_mask32 & ARP_OPT_v) diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 6013ec9..e26dfff 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -56,6 +56,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://makefile-libbb-race.patch \ file://0001-libiproute-handle-table-ids-larger-than-255.patch \ file://ifupdown-pass-interface-device-name-for-ipv6-route-c.patch \ + file://BUG9071_buffer_overflow_arp.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:54 +0000 Subject: [oe-commits] [openembedded-core] 14/39: logrotate: replace fedorahosted.org SRC_URI with github.com source In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.889962334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7defd6bceaab6d538954fce863ec83f110098d89 Author: Choong YinThong AuthorDate: Thu Apr 6 01:35:26 2017 -0700 logrotate: replace fedorahosted.org SRC_URI with github.com source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to github.com. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Richard Purdie --- meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb index 9c2dfe0..5cbd9ff 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Rotates, compresses, removes and mails system log files" SECTION = "console/utils" -HOMEPAGE = "https://fedorahosted.org/logrotate/" +HOMEPAGE = "https://github.com/logrotate/logrotate/issues" LICENSE = "GPLv2" # TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it. @@ -10,14 +10,25 @@ DEPENDS="coreutils popt" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" -SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ +# When updating logrotate to latest upstream, SRC_URI should point to +# a proper release tarball from https://github.com/logrotate/logrotate/releases +# and we have to take the snapshot for now because there is no such +# tarball available for 3.9.1. + +S = "${WORKDIR}/${PN}-r3-9-1" + +UPSTREAM_CHECK_URI = "https://github.com/${PN}/${PN}/releases" + +SRC_URI = "https://github.com/${PN}/${PN}/archive/r3-9-1.tar.gz \ file://act-as-mv-when-rotate.patch \ file://update-the-manual.patch \ file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "4492b145b6d542e4a2f41e77fa199ab0" -SRC_URI[sha256sum] = "022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545" +# Checksum changed due to tarball source folder changes in upstream + +SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3" +SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:49 +0000 Subject: [oe-commits] [openembedded-core] 09/39: ghostscript: CVE-2017-7207 In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.56F2923349B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4cb2319dbffacd08b77daf74ec1b65da0ab3a778 Author: Catalin Enache AuthorDate: Wed Apr 5 15:06:51 2017 +0300 ghostscript: CVE-2017-7207 The mem_get_bits_rectangle function in Artifex Software, Inc. Ghostscript 9.20 allows remote attackers to cause a denial of service (NULL pointer dereference) via a crafted PostScript document. Reference: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-7207 Upstream patch: http://git.ghostscript.com/?p=ghostpdl.git;h=309eca4e0a31ea70dcc844812691439312dad091 Signed-off-by: Catalin Enache Signed-off-by: Richard Purdie --- .../ghostscript/ghostscript/CVE-2017-7207.patch | 39 ++++++++++++++++++++++ .../ghostscript/ghostscript_9.20.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch new file mode 100644 index 0000000..a05dc02 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch @@ -0,0 +1,39 @@ +From 0e88bee1304993668fede72498d656a2dd33a35e Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Mon, 20 Mar 2017 09:34:11 +0000 +Subject: [PATCH] Ensure a device has raster memory, before trying to read it. + +Bug #697676 "Null pointer dereference in mem_get_bits_rectangle()" + +This is only possible by abusing/mis-using Ghostscript-specific +language extensions, so cannot happen in a general PostScript program. + +Nevertheless, Ghostscript should not crash. So this commit checks the +memory device to see if raster memory has been allocated, before trying +to read from it. + +Upstream-Status: Backport +CVE: CVE-2017-7207 + +Author: Ken Sharp +Signed-off-by: Catalin Enache +--- + base/gdevmem.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/base/gdevmem.c b/base/gdevmem.c +index 41108ba..183f96d 100644 +--- a/base/gdevmem.c ++++ b/base/gdevmem.c +@@ -605,6 +605,8 @@ mem_get_bits_rectangle(gx_device * dev, const gs_int_rect * prect, + GB_PACKING_CHUNKY | GB_COLORS_NATIVE | GB_ALPHA_NONE; + return_error(gs_error_rangecheck); + } ++ if (mdev->line_ptrs == 0x00) ++ return_error(gs_error_rangecheck); + if ((w <= 0) | (h <= 0)) { + if ((w | h) < 0) + return_error(gs_error_rangecheck); +-- +2.10.2 + diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb index 210e9a7..e8fc5df 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb @@ -31,6 +31,7 @@ SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.02-genarch.patch \ file://objarch.h \ file://cups-no-gcrypt.patch \ + file://CVE-2017-7207.patch \ " SRC_URI_class-native = "${SRC_URI_BASE} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:51 +0000 Subject: [oe-commits] [openembedded-core] 11/39: python-pycurl: create python3-pycurl recipe In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.6A8F323349F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f5cd94b22196c280f22ab678531359f882c1e699 Author: Dmitry Rozhkov AuthorDate: Wed Apr 5 10:01:20 2017 +0300 python-pycurl: create python3-pycurl recipe The python-pycurl recipe can be used with python2 only even though python3 is officially supported by upstream. Create python3-pycurl recipe enabling the pycurl module for python3. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 ++-- .../python/python-pycurl_7.21.5.bb | 32 +--------------------- .../python/python3-pycurl_7.21.5.bb | 5 ++++ 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl.inc similarity index 92% copy from meta/recipes-devtools/python/python-pycurl_7.21.5.bb copy to meta/recipes-devtools/python/python-pycurl.inc index 7b41f6d..d26318b 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b8 file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" +DEPENDS = "curl ${PYTHON_PN}" +RDEPENDS_${PN} = "${PYTHON_PN}-core curl" SRCNAME = "pycurl" SRC_URI = "\ @@ -19,8 +19,6 @@ SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils - BBCLASSEXTEND = "native" # Ensure the docstrings are generated as make clean will remove them diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb index 7b41f6d..eb70cea 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb @@ -1,33 +1,3 @@ -SUMMARY = "Python bindings for libcurl" -HOMEPAGE = "http://pycurl.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1+ | MIT" -LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b89d4584b693d3680062fb \ - file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ - file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" - -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" -SRCNAME = "pycurl" - -SRC_URI = "\ - http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ - file://no-static-link.patch \ -" - -SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" -SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" -S = "${WORKDIR}/${SRCNAME}-${PV}" +require python-pycurl.inc inherit distutils - -BBCLASSEXTEND = "native" - -# Ensure the docstrings are generated as make clean will remove them -do_compile_prepend() { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings -} - -do_install_append() { - rm -rf ${D}${datadir}/share -} diff --git a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb new file mode 100644 index 0000000..5d11192 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycurl:" + +require python-pycurl.inc + +inherit distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:55 +0000 Subject: [oe-commits] [openembedded-core] 15/39: sanity: Require bitbake 1.33.4 In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.900A72334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dcb694890695b8fcdd87141c1f79674ce2e934de Author: Richard Purdie AuthorDate: Thu Apr 6 12:22:33 2017 +0100 sanity: Require bitbake 1.33.4 We need the bitbake bug in recrdeptask handling of missing tasks fixed in order to apply a fix for OE-Core. Signed-off-by: Richard Purdie --- meta/conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index 616f11c..46bdbeb 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.33.3" +BB_MIN_VERSION = "1.33.4" SANITY_ABIFILE = "${TMPDIR}/abi_version" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:59 +0000 Subject: [oe-commits] [openembedded-core] 19/39: valgrind: set ac_cv_path_PERL to /usr/bin/env perl In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.BA0102334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 963875cd5242452870888ca624a54a86cb4ac73d Author: Robert Yang AuthorDate: Thu Apr 6 03:05:52 2017 -0700 valgrind: set ac_cv_path_PERL to /usr/bin/env perl The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. Set ac_cv_path_PERL to "/usr/bin/env perl" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index a4a3e72..62a9635 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -56,6 +56,8 @@ EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" EXTRA_OEMAKE = "-w" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + # valgrind likes to control its own optimisation flags. It generally defaults # to -O2 but uses -O0 for some specific test apps etc. Passing our own flags # (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:00 +0000 Subject: [oe-commits] [openembedded-core] 20/39: m4: do_configure: fix "Argument list too long" In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.C2E5A2334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6cbec3df1b98a847e46e1295d4f0029b843c67cd Author: Robert Yang AuthorDate: Thu Apr 6 03:05:53 2017 -0700 m4: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/m4/m4-1.4.18.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc index 5652b74..d7c8648 100644 --- a/meta/recipes-devtools/m4/m4-1.4.18.inc +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc @@ -15,5 +15,8 @@ SRC_URI_append_class-target = "\ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28" SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:57 +0000 Subject: [oe-commits] [openembedded-core] 17/39: groff: replace "perl -w" with "use warnings" In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.A47FA2334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit afc467fec6bf927229a523f959766deac0fb6d09 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:50 2017 -0700 groff: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-replace-perl-w-with-use-warnings.patch | 102 +++++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 3 + 2 files changed, 105 insertions(+) diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..f1db5b0 --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,102 @@ +From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 01:46:00 -0700 +Subject: [PATCH] replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + font/devpdf/util/BuildFoundries.pl | 3 ++- + src/devices/gropdf/gropdf.pl | 3 ++- + src/devices/gropdf/pdfmom.pl | 3 ++- + src/utils/afmtodit/afmtodit.pl | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl +index 39f2f0d..a2bfd8e 100644 +--- a/font/devpdf/util/BuildFoundries.pl ++++ b/font/devpdf/util/BuildFoundries.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/perl + # + # BuildFoundries : Given a Foundry file generate groff and download files + # Deri James : Monday 07 Feb 2011 +@@ -22,6 +22,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + my $where=shift||''; + my $devps=shift||'../devps'; +diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl +index 035d123..b933b32 100644 +--- a/src/devices/gropdf/gropdf.pl ++++ b/src/devices/gropdf/gropdf.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # gropdf : PDF post processor for groff + # +@@ -21,6 +21,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use Getopt::Long qw(:config bundling); + use Compress::Zlib; + +diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl +index beec820..4b46ea4 100644 +--- a/src/devices/gropdf/pdfmom.pl ++++ b/src/devices/gropdf/pdfmom.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # pdfmom : Frontend to run groff -mom to produce PDFs + # Deri James : Friday 16 Mar 2012 +@@ -24,6 +24,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use File::Temp qw/tempfile/; + my @cmd; + my $dev='pdf'; +diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl +index 4f2ce83..5c078ff 100644 +--- a/src/utils/afmtodit/afmtodit.pl ++++ b/src/utils/afmtodit/afmtodit.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#! /usr/bin/perl + # -*- Perl -*- + # Copyright (C) 1989-2014 Free Software Foundation, Inc. + # Written by James Clark (jjc at jclark.com) +@@ -19,6 +19,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + @afmtodit.tables@ + +-- +2.10.2 + diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index dd241f3..7472f59 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0001-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" @@ -24,6 +25,8 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_configure_prepend() { if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then sed -i \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:03 +0000 Subject: [oe-commits] [openembedded-core] 23/39: kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.DBFD5233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e266ec8dcc223e64b1c71bb9d11dc4cc57aef9e0 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:56 2017 -0700 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/bash is longer than 128: /bin/sh: ./doltcompile: [snip]: bad interpreter: No such file or directory Set ac_cv_path_DOLT_BASH to "/usr/bin/env bash" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-kernel/kmod/kmod.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index cfa409d..ba80fc5 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -30,6 +30,8 @@ S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" EXTRA_OECONF +=" --enable-tools --with-zlib" +CACHED_CONFIGUREVARS += "ac_cv_path_DOLT_BASH='/usr/bin/env bash'" + PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:07 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:07 +0000 Subject: [oe-commits] [openembedded-core] 27/39: license.bbclass: improve reproducibility In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.0B99B233490@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1666b8bb7e23d61612f62398776df3f7d14d5d12 Author: Juro Bystricky AuthorDate: Wed Apr 5 14:51:31 2017 -0700 license.bbclass: improve reproducibility Two identical builds can end up having deploy/licenses folders that differ. This is observed in cases where there are several different license files of the same name in different folders, i.e. "COPYING". In those case we have to differentiate the files somehow and we do it via file expensions such as COPYING.0, COPYING.1. However, which file will get which extension is presently random. This means, for example, that COPYING.0 in one build is the same as COPYING.1 in the other (and vice versa). Although there is mothing wrong with this, for the sake of binary reproducibility it is preferable to have a deterministic outcome. Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 81458e7..d4be478 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -505,7 +505,7 @@ def find_license_files(d): bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF'))) # Add files from LIC_FILES_CHKSUM to list of license files lic_chksum_paths = defaultdict(OrderedDict) - for path, data in lic_chksums.items(): + for path, data in sorted(lic_chksums.items()): lic_chksum_paths[os.path.basename(path)][data] = (os.path.join(srcdir, path), data[1], data[2]) for basename, files in lic_chksum_paths.items(): if len(files) == 1: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:06 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:06 +0000 Subject: [oe-commits] [openembedded-core] 26/39: selftest/wic: skip wic unit tests in case NLS is disable In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.043C923348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8c3e6bdac0674755a1c8acf49ed38952a15fdff8 Author: Leonardo Sandoval AuthorDate: Wed Apr 5 15:34:26 2017 -0700 selftest/wic: skip wic unit tests in case NLS is disable WIC test case requires wic-tools which in turn depends on intltool-native and gettext-native. However, if NLS is disable, the gettext-minimal-native is used instead of gettext-native causing a failure on intltool-native as seen below: checking for msgfmt... no checking for gmsgfmt... no configure: error: GNU gettext tools not found; required for intltool ERROR: Function failed: do_configure (log file is located at /home/lsandov1/poky/build/tmp/work/i586-poky-linux-musl/systemd-boot/232-r0/temp/log.do_configure.7518) ERROR: Task (/home/lsandov1/poky/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb:do_configure) failed with exit code '1' NOTE: Tasks Summary: Attempted 609 tasks of which 604 didn't need to be rerun and 1 failed. [YOCTO #10902] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index df5e060..8030c35 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -77,7 +77,10 @@ class Wic(oeSelfTest): # clean up which can result in the native tools built earlier in # setUpClass being unavailable. if not Wic.image_is_ready: - bitbake('wic-tools') + if get_bb_var('USE_NLS') == 'yes': + bitbake('wic-tools') + else: + self.skipTest('wic-tools cannot be built due its (intltool|gettext)-native dependency and NLS disable') bitbake('core-image-minimal') Wic.image_is_ready = True -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:11 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:11 +0000 Subject: [oe-commits] [openembedded-core] 31/39: qemux86*.conf: changed dependency task for syslinux In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.2AFE12334BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ca3024a084e13570badaf284e699db5318cdbff9 Author: Ed Bartosh AuthorDate: Thu Apr 6 17:48:17 2017 +0300 qemux86*.conf: changed dependency task for syslinux Changed dependency task for syslinux from do_build to do_populate_sysroot as do_build dependency caused conflicts in populating image recipe sysroot using conflicting recipes. This makes do_image_wic task to fail with FileExistsError trying to copy the same file from two conflicting recipes. This should also speed up image creation a bit as do_populate_sysroot task is faster than do_build. [YOCTO #11295] Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 150d745..10189cb 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -30,4 +30,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1b478e9..c26dda2 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -29,4 +29,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:05 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:05 +0000 Subject: [oe-commits] [openembedded-core] 25/39: python3: fix run-time deps for core python3 libraries In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.EE3C62334B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 25ff02be680b584c03b344fe24d7ec2ccfe9182f Author: Dmitry Rozhkov AuthorDate: Thu Apr 6 08:07:44 2017 +0300 python3: fix run-time deps for core python3 libraries The http.server module from python3-netclient imports the html module which is in python3-html. Also xmlrpc.server imports pydoc which is a part of python3-pydoc. But those run-time dependencies are missing from python3-netclient and python3-xmlrpc respectively. Add the missing run-time dependencies. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-3.5-manifest.inc | 4 ++-- scripts/contrib/python/generate-manifest-3.5.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 55bcc4b..ec30eb9 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc @@ -153,7 +153,7 @@ RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN FILES_${PN}-multiprocessing="${libdir}/python3.5/lib-dynload/_multiprocessing.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_multiprocessing.*.so ${libdir}/python3.5/multiprocessing ${libdir}/python3.5/multiprocessing/__pycache__ " SUMMARY_${PN}-netclient="Python Internet Protocol clients" -RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" +RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html" FILES_${PN}-netclient="${libdir}/python3.5/*Cookie*.* ${libdir}/python3.5/__pycache__/*Cookie*.* ${libdir}/python3.5/base64.* ${libdir}/python3.5/__pycache__/base64.* ${libdir}/python3.5/cookielib.* ${libdir}/python3.5/__pycache__/cookielib.* ${libdir}/python3.5/ftplib.* ${libdir}/python3.5/__pycache__/ftplib.* ${libdir}/python3.5/gopherlib.* ${libdir}/python3.5/__pycache__/gopherlib.* ${libdir}/python3.5/hmac.* ${libdir}/python3.5/__pycache__/hmac.* ${libdir}/python3.5/http* ${libdir}/p [...] SUMMARY_${PN}-netserver="Python Internet Protocol servers" @@ -273,7 +273,7 @@ RDEPENDS_${PN}-xml="${PN}-core ${PN}-re" FILES_${PN}-xml="${libdir}/python3.5/lib-dynload/_elementtree.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_elementtree.*.so ${libdir}/python3.5/lib-dynload/pyexpat.*.so ${libdir}/python3.5/lib-dynload/__pycache__/pyexpat.*.so ${libdir}/python3.5/xml ${libdir}/python3.5/xml/__pycache__ ${libdir}/python3.5/xmllib.* ${libdir}/python3.5/__pycache__/xmllib.* " SUMMARY_${PN}-xmlrpc="Python XML-RPC support" -RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" +RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc" FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ " SUMMARY_${PN}-modules="All Python modules" diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 386bdfc..5835de8 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py @@ -340,7 +340,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-multiprocessing", "Python multiprocessing support", "${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap", "lib-dynload/_multiprocessing.*.so multiprocessing" ) # package - m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime", + m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html", "*Cookie*.* " + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* http* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib uuid.* rfc822.* mimetools.*" ) @@ -422,7 +422,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re", "lib-dynload/_elementtree.*.so lib-dynload/pyexpat.*.so xml xmllib.*" ) # package - m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang", + m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc", "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.* xmlrpc" ) m.addPackage( "${PN}-mailbox", "Python mailbox format support", "${PN}-core ${PN}-mime", -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:02 +0000 Subject: [oe-commits] [openembedded-core] 22/39: autogen-native: fix POSIX_SHELL and perl In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.D562923348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c448ed0ff9c6f63a5f9bd5d6f565e9ef3762025 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:55 2017 -0700 autogen-native: fix POSIX_SHELL and perl The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. This patch fixes the problem when POSIX_SHELL and perl are used as the interpreters. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.18.12.bb | 3 ++ ...2-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb index 0004389..853477c 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ file://fix-script-err-when-processing-libguile.patch \ file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ + file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \ " SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" @@ -30,6 +31,8 @@ inherit autotools texinfo native pkgconfig export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" +export POSIX_SHELL = "/usr/bin/env sh" + do_install_append () { create_wrapper ${D}/${bindir}/autogen \ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ diff --git a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch new file mode 100644 index 0000000..d5fe143 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch @@ -0,0 +1,32 @@ +From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Mon, 13 Mar 2017 20:33:30 -0700 +Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path + +Use "which perl" as shebang doesn't work when it is longer than +BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to +instead of. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 093e808..8dfc6dd 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -98,7 +98,7 @@ fix_scripts() { + st=`sed 1q $f` + + case "$st" in +- *perl ) echo '#!' `which perl` ++ *perl ) echo '#!/usr/bin/env perl' + sed 1d $f + ;; + +-- +2.10.2 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:01 +0000 Subject: [oe-commits] [openembedded-core] 21/39: guile: do_configure: fix "Argument list too long" In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.CC2D52334B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 80825a1d157069263de76993a86353fb5c97b4e1 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:54 2017 -0700 guile: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/guile/guile_2.0.14.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/guile/guile_2.0.14.bb b/meta/recipes-devtools/guile/guile_2.0.14.bb index d2306e6..7a36ba0 100644 --- a/meta/recipes-devtools/guile/guile_2.0.14.bb +++ b/meta/recipes-devtools/guile/guile_2.0.14.bb @@ -30,6 +30,9 @@ SRC_URI[sha256sum] = "e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8 inherit autotools gettext pkgconfig texinfo BBCLASSEXTEND = "native" +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline" # add guile-native only to the target recipe's DEPENDS DEPENDS_append_class-target = " guile-native libatomic-ops" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:58 +0000 Subject: [oe-commits] [openembedded-core] 18/39: mc: replace "perl -w" with "use warnings" In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.AE5BD2334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 57a35fe58795c9b9a83bf8d6cde0ecf435912967 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:51 2017 -0700 mc: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-mc-replace-perl-w-with-use-warnings.patch | 129 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.18.bb | 3 + 2 files changed, 132 insertions(+) diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..bf8037c --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,129 @@ +From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 02:24:28 -0700 +Subject: [PATCH] mc: replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +The man2hlp.in already has "use warnings;", so just remove '-w' is OK. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + src/man2hlp/man2hlp.in | 2 +- + src/vfs/extfs/helpers/a+.in | 4 +++- + src/vfs/extfs/helpers/mailfs.in | 3 ++- + src/vfs/extfs/helpers/patchfs.in | 3 ++- + src/vfs/extfs/helpers/ulib.in | 4 +++- + src/vfs/extfs/helpers/uzip.in | 3 ++- + 6 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in +index f095830..558a674 100644 +--- a/src/man2hlp/man2hlp.in ++++ b/src/man2hlp/man2hlp.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Man page to help file converter + # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in +index 579441c..fe446f4 100644 +--- a/src/vfs/extfs/helpers/a+.in ++++ b/src/vfs/extfs/helpers/a+.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # External filesystem for mc, using mtools + # Written Ludek Brukner , 1997 +@@ -9,6 +9,8 @@ + + # These mtools components must be in PATH for this to work + ++use warnings; ++ + sub quote { + $_ = shift(@_); + s/([^\w\/.+-])/\\$1/g; +diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in +index e9455be..059f41f 100644 +--- a/src/vfs/extfs/helpers/mailfs.in ++++ b/src/vfs/extfs/helpers/mailfs.in +@@ -1,6 +1,7 @@ +-#! @PERL@ -w ++#! @PERL@ + + use bytes; ++use warnings; + + # MC extfs for (possibly compressed) Berkeley style mailbox files + # Peter Daum (Jan 1998, mc-4.1.24) +diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in +index ef407de..3ad4b53 100644 +--- a/src/vfs/extfs/helpers/patchfs.in ++++ b/src/vfs/extfs/helpers/patchfs.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Written by Adam Byrtek , 2002 + # Rewritten by David Sterba , 2009 +@@ -9,6 +9,7 @@ + + use bytes; + use strict; ++use warnings; + use POSIX; + use File::Temp 'tempfile'; + +diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in +index 418611f..82c7ccf 100644 +--- a/src/vfs/extfs/helpers/ulib.in ++++ b/src/vfs/extfs/helpers/ulib.in +@@ -1,9 +1,11 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # VFS to manage the gputils archives. + # Written by Moln?r K?roly (proton7 at freemail.hu) 2012 + # + ++use warnings; ++ + my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03', + 'apr' => '04', 'may' => '05', 'jun' => '06', + 'jul' => '07', 'aug' => '08', 'sep' => '09', +diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in +index b1c4f90..c8eb335 100644 +--- a/src/vfs/extfs/helpers/uzip.in ++++ b/src/vfs/extfs/helpers/uzip.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # zip file archive Virtual File System for Midnight Commander + # Version 1.4.0 (2001-08-07). +@@ -9,6 +9,7 @@ + use POSIX; + use File::Basename; + use strict; ++use warnings; + + # + # Configuration options +-- +2.10.2 + diff --git a/meta/recipes-extended/mc/mc_4.8.18.bb b/meta/recipes-extended/mc/mc_4.8.18.bb index 78abb27..17f3f73 100644 --- a/meta/recipes-extended/mc/mc_4.8.18.bb +++ b/meta/recipes-extended/mc/mc_4.8.18.bb @@ -7,6 +7,7 @@ DEPENDS = "ncurses glib-2.0 util-linux" RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-mc-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc56f0c9abd63c4caa3636bba3a08bfb" SRC_URI[sha256sum] = "5b591e10dcbea95233434da40cdad4663d360229adf89826576c319667c103cb" @@ -22,6 +23,8 @@ PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:16 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:16 +0000 Subject: [oe-commits] [openembedded-core] 36/39: cross.bbclass: override TARGET_* flags In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.6519F233499@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d31fb8aeaf7b3ea82a1aa293321b7fd5da5e28fa Author: Ming Liu AuthorDate: Thu Apr 6 14:09:41 2017 +0200 cross.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a cross recipe even they are not in use at all. This can lead a lot of churn when the cross sysroot are shared by machines while they have defined different TARGET_* flags. And sometimes it even causes "Taskhash mismatch" errors. Fix it by overriding with BUILD_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/cross.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 2602153..8757303 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -28,6 +28,11 @@ MULTIMACH_TARGET_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" export PKG_CONFIG_DIR = "${exec_prefix}/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "" +TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" +TARGET_CFLAGS = "${BUILD_CFLAGS}" +TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILD_LDFLAGS}" + CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:04 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:04 +0000 Subject: [oe-commits] [openembedded-core] 24/39: eudev: set LGPL-2.1+ for libudev package In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.E7E3F23348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 39ade16db8471ecac43bc5009d6e7b606db04c34 Author: Martin Jansa AuthorDate: Thu Apr 6 13:02:27 2017 +0200 eudev: set LGPL-2.1+ for libudev package Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/udev/eudev_3.2.1.bb b/meta/recipes-core/udev/eudev_3.2.1.bb index 4a1a26a..bdfb544 100644 --- a/meta/recipes-core/udev/eudev_3.2.1.bb +++ b/meta/recipes-core/udev/eudev_3.2.1.bb @@ -1,6 +1,7 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" -LICENSE = "GPLv2.0+" +LICENSE = "GPLv2.0+ & LGPL-2.1+" +LICENSE_libudev = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:08 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:08 +0000 Subject: [oe-commits] [openembedded-core] 28/39: sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.12D652334B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8854c5c0acf0f0079dc22a6eb893e4d8f68bba9d Author: Richard Purdie AuthorDate: Wed Apr 5 15:37:12 2017 +0100 sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks We never need these tasks as dependencies of other sstate tasks since they're only ever needed to build artefacts so we can always skip them and save some time/space. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index af58854..bc0ec54 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -915,6 +915,10 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): if taskdependees[task][1] == "do_populate_lic": return True + # stash_locale and gcc_stash_builddir are never needed as a dependency for built objects + if taskdependees[task][1] == "do_stash_locale" or taskdependees[task][1] == "do_gcc_stash_builddir": + return True + # We only need to trigger packagedata through direct dependencies # but need to preserve packagedata on packagedata links if taskdependees[task][1] == "do_packagedata": -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:17 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:17 +0000 Subject: [oe-commits] [openembedded-core] 37/39: crosssdk.bbclass: override TARGET_* flags In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.6D964233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9b77ddc62cc7dc456eb656742067cae2b3c3661d Author: Ming Liu AuthorDate: Thu Apr 6 14:09:42 2017 +0200 crosssdk.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a crosssdk recipe even they are not in use at all. This can lead a lot of churn when the crosssdk sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILD_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index a5ffd97..ddb98d2 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -21,8 +21,13 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" +TARGET_CFLAGS = "${BUILD_CFLAGS}" +TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILD_LDFLAGS}" TARGET_FPU = "" + target_libdir = "${SDKPATHNATIVE}${libdir_nativesdk}" target_includedir = "${SDKPATHNATIVE}${includedir_nativesdk}" target_base_libdir = "${SDKPATHNATIVE}${base_libdir_nativesdk}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:10 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:10 +0000 Subject: [oe-commits] [openembedded-core] 30/39: gcc-6.3: backport fix of check for empty string in ubsan.c In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.23B892334BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 736e901df5cfb060c333fd742c2927a92c7bb6b4 Author: Joshua Lock AuthorDate: Thu Apr 6 14:23:14 2017 +0100 gcc-6.3: backport fix of check for empty string in ubsan.c Building gcc-cross-initial with GCC7 on the host fails due to the comparison of a pointer to an integer in ubsan_use_new_style_p, which is forbidden by ISO C++: ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] || xloc.file == '\0' || xloc.file[0] == '\xff' Backport the fix from upstream GCC to enable the build with GCC 7 Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-6.3.inc | 1 + .../gcc/gcc-6.3/ubsan-fix-check-empty-string.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-6.3.inc b/meta/recipes-devtools/gcc/gcc-6.3.inc index da7a083..71d0aff 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3.inc +++ b/meta/recipes-devtools/gcc/gcc-6.3.inc @@ -84,6 +84,7 @@ SRC_URI = "\ " BACKPORTS = "\ file://CVE-2016-6131.patch \ + file://ubsan-fix-check-empty-string.patch \ " SRC_URI[md5sum] = "677a7623c7ef6ab99881bc4e048debb6" SRC_URI[sha256sum] = "f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f" diff --git a/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch new file mode 100644 index 0000000..c012719 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch @@ -0,0 +1,28 @@ +From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 +From: kyukhin +Date: Sat, 3 Sep 2016 10:57:05 +0000 +Subject: [PATCH] gcc/ * ubsan.c (ubsan_use_new_style_p): Fix check for empty + string. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk at 239971 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Signed-off-by: Joshua Lock + +--- + gcc/ubsan.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: gcc-6.3.0/gcc/ubsan.c +=================================================================== +--- gcc-6.3.0.orig/gcc/ubsan.c ++++ gcc-6.3.0/gcc/ubsan.c +@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) + + expanded_location xloc = expand_location (loc); + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 +- || xloc.file == '\0' || xloc.file[0] == '\xff' ++ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' + || xloc.file[1] == '\xff') + return false; + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:15 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:15 +0000 Subject: [oe-commits] [openembedded-core] 35/39: lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.5E1D4233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 056a16a45a323efe7bc8ca85d2b6a338c676a067 Author: Paul Eggleton AuthorDate: Fri Apr 7 10:01:44 2017 +1200 lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate In find_siginfo(), which is used by bitbake-diffsigs among other things, avoid adding a siginfo file from the sstate-cache where we've already collected a sigdata file from the stamps directory with the same hash. This avoids the possibility that the top two files (as picked by default using the bitbake-diffsigs -t option) are for the same signature and thus the tool would report no differences. In order to do that, just use the hashfiles dict that we already have - we just need to change the code to populate that even if we're collecting matching files without looking for a fixed set of hashes (i.e. taskhashlist isn't set). This replaces previous code in bitbake-diffsigs that attempted to filter these out with limited success. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index a76a031..8d93013 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -254,9 +254,6 @@ def find_siginfo(pn, taskname, taskhashlist, d): import fnmatch import glob - if taskhashlist: - hashfiles = {} - if not taskname: # We have to derive pn and taskname key = pn @@ -266,8 +263,15 @@ def find_siginfo(pn, taskname, taskhashlist, d): if key.startswith('virtual:native:'): pn = pn + '-native' + hashfiles = {} filedates = {} + def get_hashval(siginfo): + if siginfo.endswith('.siginfo'): + return siginfo.rpartition(':')[2].partition('_')[0] + else: + return siginfo.rpartition('.')[2] + # First search in stamps dir localdata = d.createCopy() localdata.setVar('MULTIMACH_TARGET_SYS', '*') @@ -297,6 +301,8 @@ def find_siginfo(pn, taskname, taskhashlist, d): filedates[fullpath] = os.stat(fullpath).st_mtime except OSError: continue + hashval = get_hashval(fullpath) + hashfiles[hashval] = fullpath if not taskhashlist or (len(filedates) < 2 and not foundall): # That didn't work, look in sstate-cache @@ -320,9 +326,11 @@ def find_siginfo(pn, taskname, taskhashlist, d): matchedfiles = glob.glob(filespec) for fullpath in matchedfiles: - if taskhashlist: - hashfiles[hashval] = fullpath - else: + actual_hashval = get_hashval(fullpath) + if actual_hashval in hashfiles: + continue + hashfiles[hashval] = fullpath + if not taskhashlist: try: filedates[fullpath] = os.stat(fullpath).st_mtime except: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:19 +0000 Subject: [oe-commits] [openembedded-core] 39/39: cross-canadian.bbclass: override TARGET_* flags In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.7C8EC2334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0bf66bc21e80f31938c1b6eff984add665e4b59c Author: Ming Liu AuthorDate: Thu Apr 6 14:09:44 2017 +0200 cross-canadian.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a cross-canadian recipe even they are not in use at all. This can lead a lot of churn when the cross-canadian sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILDSDK_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 3120f46..49388d4 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -115,6 +115,11 @@ HOST_CC_ARCH = "${SDK_CC_ARCH}" HOST_LD_ARCH = "${SDK_LD_ARCH}" HOST_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +TARGET_CFLAGS = "${BUILDSDK_CFLAGS}" +TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" + #assign DPKG_ARCH DPKG_ARCH = "${@debian_arch_map(d.getVar('SDK_ARCH'), '')}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:18 +0000 Subject: [oe-commits] [openembedded-core] 38/39: nativesdk.bbclass: override TARGET_* flags In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.762DA233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c612bcd4c7a93722699ecb2ed1c53489baa989e3 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:43 2017 +0200 nativesdk.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a nativesdk recipe even they are not in use at all. This can lead a lot of churn when the nativesdk sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILDSDK_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/nativesdk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index a97f5a7..ebcfb2d 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -43,6 +43,10 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +TARGET_CFLAGS = "${BUILDSDK_CFLAGS}" +TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" TARGET_FPU = "" EXTRA_OECONF_GCC_FLOAT = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:12 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:12 +0000 Subject: [oe-commits] [openembedded-core] 32/39: selftest/recipetool: skip create_git in case x11 feature is not present In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.384412334BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit abba9f5b3e006eecaf17599f646b408be7cf2f06 Author: Leonardo Sandoval AuthorDate: Thu Apr 6 09:41:51 2017 -0700 selftest/recipetool: skip create_git in case x11 feature is not present The unit test requires x11 as distro feature, otherwise it will fail while building the test requirements. [YOCTO #10903] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/recipetool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index d47b9dd..7bfb02f 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py @@ -382,6 +382,8 @@ class RecipetoolTests(RecipetoolBase): @testcase(1194) def test_recipetool_create_git(self): + if 'x11' not in get_bb_var('DISTRO_FEATURES'): + self.skipTest('Test requires x11 as distro feature') # Ensure we have the right data in shlibs/pkgdata bitbake('libpng pango libx11 libxext jpeg libcheck') # Try adding a recipe -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:14 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:14 +0000 Subject: [oe-commits] [openembedded-core] 34/39: lib/oe/sstatesig: fix finding native siginfo files in sstate-cache In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.4F0982334C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d8fa63694a0a996fc5cdcf5c645d1f11b930362b Author: Paul Eggleton AuthorDate: Fri Apr 7 10:01:43 2017 +1200 lib/oe/sstatesig: fix finding native siginfo files in sstate-cache When comparing signatures with bitbake-diffsigs -t or bitbake -S printdiff, we use this find_siginfo() function implemented in this module to find the siginfo/sigdata files corresponding to the tasks we're looking for. However, native sstate files go into a NATIVELSBSTRING subdirectory and there was no handling for this when asking about native recipes. I'm not even sure why we were walking SSTATE_DIR in order to find this - we don't need to, we just need to run glob.glob() on the filespec we calculate, which should be a little bit more efficient. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 13fd3bd..a76a031 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -318,22 +318,15 @@ def find_siginfo(pn, taskname, taskhashlist, d): sstatename = taskname[3:] filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG'), sstatename) - if hashval != '*': - sstatedir = "%s/%s" % (d.getVar('SSTATE_DIR'), hashval[:2]) - else: - sstatedir = d.getVar('SSTATE_DIR') - - for root, dirs, files in os.walk(sstatedir): - for fn in files: - fullpath = os.path.join(root, fn) - if fnmatch.fnmatch(fullpath, filespec): - if taskhashlist: - hashfiles[hashval] = fullpath - else: - try: - filedates[fullpath] = os.stat(fullpath).st_mtime - except: - continue + matchedfiles = glob.glob(filespec) + for fullpath in matchedfiles: + if taskhashlist: + hashfiles[hashval] = fullpath + else: + try: + filedates[fullpath] = os.stat(fullpath).st_mtime + except: + continue if taskhashlist: return hashfiles -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:13 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:13 +0000 Subject: [oe-commits] [openembedded-core] 33/39: qemu: use python2.7 instead of python2 In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.417302334C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c5ca7eba6e02860b34684a07df9e7bea8baeea6a Author: Martin Kelly AuthorDate: Thu Apr 6 12:48:39 2017 -0700 qemu: use python2.7 instead of python2 meta/conf/bitbake.conf puts python2.7 into the HOSTTOOLS variable but not python2, so only python2.7 is guaranteed. In addition, on some distros -- such as Amazon Linux -- /usr/bin/python2 doesn't exist but python2.7 does. So, use python2.7 for the --python= argument in the qemu configure step. Signed-off-by: Martin Kelly Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 383cc64..0e1411a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ --with-system-pixman \ --extra-cflags='${CFLAGS}' \ " -EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2" +EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2.7" EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:09 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:09 +0000 Subject: [oe-commits] [openembedded-core] 29/39: elfutils: fix building elfutils-native with GCC7 In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235142.195382334B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 50d6e2066e09c6257c58e1dacd8a21e3c65961b7 Author: Joshua Lock AuthorDate: Thu Apr 6 14:23:13 2017 +0100 elfutils: fix building elfutils-native with GCC7 Backport a fix from upstream for a -Wformat-truncation=2 warning and implement a simple fix for a -Wimplicit-fallthrough warning. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- .../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 ++++++++++++++++++++++ .../elfutils/elfutils-0.168/fallthrough.patch | 36 ++++++++++++++++++ meta/recipes-devtools/elfutils/elfutils_0.168.bb | 3 ++ 3 files changed, 83 insertions(+) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch new file mode 100644 index 0000000..d88f4eb --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch @@ -0,0 +1,44 @@ +From 93c51144c3f664d4e9709da75a1d0fa00ea0fe95 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Sun, 12 Feb 2017 21:51:34 +0100 +Subject: [PATCH] libasm: Fix one GCC7 -Wformat-truncation=2 warning. + +Make sure that if we have really lots of labels the tempsym doesn't get +truncated because it is too small to hold the whole name. + +This doesn't enable -Wformat-truncation=2 or fix other "issues" pointed +out by enabling this warning because there are currently some issues +with it. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79448 + +Signed-off-by: Mark Wielaard + +Upstream-Status: Backport (https://sourceware.org/git/?p=elfutils.git;a=commit;h=93c51144c3f664d4e9709da75a1d0fa00ea0fe95) +Signed-off-by: Joshua Lock + +--- + libasm/ChangeLog | 6 +++++- + libasm/asm_newsym.c | 6 ++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +Index: elfutils-0.168/libasm/asm_newsym.c +=================================================================== +--- elfutils-0.168.orig/libasm/asm_newsym.c ++++ elfutils-0.168/libasm/asm_newsym.c +@@ -1,5 +1,5 @@ + /* Define new symbol for current position in given section. +- Copyright (C) 2002, 2005, 2016 Red Hat, Inc. ++ Copyright (C) 2002, 2005, 2016, 2017 Red Hat, Inc. + This file is part of elfutils. + Written by Ulrich Drepper , 2002. + +@@ -44,7 +44,9 @@ AsmSym_t * + asm_newsym (AsmScn_t *asmscn, const char *name, GElf_Xword size, + int type, int binding) + { +-#define TEMPSYMLEN 10 ++/* We don't really expect labels with many digits, but in theory it could ++ be 10 digits (plus ".L" and a zero terminator). */ ++#define TEMPSYMLEN 13 + char tempsym[TEMPSYMLEN]; + AsmSym_t *result; + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch new file mode 100644 index 0000000..b2623f9 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch @@ -0,0 +1,36 @@ +GCC7 adds -Wimplicit-fallthrough to warn when a switch case falls through, +however this causes warnings (which are promoted to errors) with the elfutils +patches from Debian for mips and parisc, which use fallthrough's by design. + +Explicitly mark the intentional fallthrough switch cases with a comment to +disable the warnings where the fallthrough behaviour is desired. + +Upstream-Status: Pending [debian] +Signed-off-by: Joshua Lock + +Index: elfutils-0.168/backends/parisc_retval.c +=================================================================== +--- elfutils-0.168.orig/backends/parisc_retval.c ++++ elfutils-0.168/backends/parisc_retval.c +@@ -166,7 +166,7 @@ parisc_return_value_location_ (Dwarf_Die + return nloc_intregpair; + + /* Else fall through. */ +- } ++ } // fallthrough + + case DW_TAG_structure_type: + case DW_TAG_class_type: +Index: elfutils-0.168/backends/mips_retval.c +=================================================================== +--- elfutils-0.168.orig/backends/mips_retval.c ++++ elfutils-0.168/backends/mips_retval.c +@@ -387,7 +387,7 @@ mips_return_value_location (Dwarf_Die *f + else + return nloc_intregpair; + } +- } ++ } // fallthrough + + /* Fallthrough to handle large types */ + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb index 9557933..3b8f2a3 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://0001-remove-the-unneed-checking.patch \ file://0001-fix-a-stack-usage-warning.patch \ file://aarch64_uio.patch \ + file://Fix_one_GCC7_warning.patch \ file://shadow.patch \ " @@ -35,6 +36,8 @@ SRC_URI += "\ file://debian/hurd_path.patch \ file://debian/ignore_strmerge.diff \ " +# Fix the patches from Debian with GCC7 +SRC_URI += "file://fallthrough.patch" SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch " # The buildsystem wants to generate 2 .h files from source using a binary it just built, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:56 +0000 Subject: [oe-commits] [openembedded-core] 16/39: glibc/gcc/libgcc-initial: Delete do_build tasks for -initial In-Reply-To: <149152270065.17936.6112987537125783399@git.openembedded.org> References: <149152270065.17936.6112987537125783399@git.openembedded.org> Message-ID: <20170406235141.975F42334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8bf71bff2e8e12cde7021b76a29fe7d5cea8d2ba Author: Richard Purdie AuthorDate: Wed Apr 5 17:27:20 2017 +0100 glibc/gcc/libgcc-initial: Delete do_build tasks for -initial We've had a lot of users running into RSS issues where -initial recipes were being installed into sysroots alongside their counterparts and causing overlapping files issues. In general this was through do_build dependencies. Such dependencies are bad in general and I'd encourage people to compare the taskgraphs with using a more specific dependency like do_populate_sysroot, do_image_complete or do_deploy as often the more specific dependency will result in a much cleaner build. Regardless, we don't want -initial dependencies getting in the way like this and there are cases a do_build dependency could make sense. Deleting the do_build task in these cases makes sense since this is not a build "endpoint" we'd ever want a user to use, its a behind the scenes piece of bootstrappping. Unfortunately to make this work, we need a newer bitbake version which has a bitbake bug fixed. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-initial.inc | 3 +++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 4 ++++ meta/recipes-devtools/gcc/libgcc-initial.inc | 3 +++ 3 files changed, 10 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc index f94603c..b86e2fb 100644 --- a/meta/recipes-core/glibc/glibc-initial.inc +++ b/meta/recipes-core/glibc/glibc-initial.inc @@ -52,3 +52,6 @@ do_siteconfig () { } inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 5c0208a..d440d88 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -82,3 +82,7 @@ do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_AR inherit nopackages COMPILERINITIAL = "-initial" + + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc index 5b4bc3b..950ad86 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial.inc +++ b/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -15,3 +15,6 @@ EXTRA_OECONF += "--disable-shared" COMPILERINITIAL = "-initial" inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:53 +0000 Subject: [oe-commits] [bitbake] 01/11: bitbake-diffsigs: fix -t picking wrong files to compare In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.C3BE623349D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 99f49b56115b1f8d1a0a0b911da62ffd1f997b5f Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:01 2017 +1200 bitbake-diffsigs: fix -t picking wrong files to compare We weren't picking the right files to compare here - according to the order in which the list is sorted (by mtime), we need to be taking the last two items and not the first two. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index 1e3de09..b2ebe91 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -84,9 +84,9 @@ def find_compare_task(bbhandler, pn, taskname): return recout # Recurse into signature comparison - logger.debug("Signature file (previous): %s" % latestfiles[0]) - logger.debug("Signature file (latest): %s" % latestfiles[1]) - output = bb.siggen.compare_sigfiles(latestfiles[0], latestfiles[1], recursecb) + logger.debug("Signature file (previous): %s" % latestfiles[-2]) + logger.debug("Signature file (latest): %s" % latestfiles[-1]) + output = bb.siggen.compare_sigfiles(latestfiles[-2], latestfiles[-1], recursecb) if output: print('\n'.join(output)) sys.exit(0) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:52 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (eaeddaf -> 04a023c) Message-ID: <149152271266.18555.3956262822499937748@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository bitbake. from eaeddaf toaster:test:Create selenium tests for project dashboard page new 99f49b5 bitbake-diffsigs: fix -t picking wrong files to compare new 55cd404 lib/bb/siggen: add missing path separator to cleaned paths new c87764b bitbake-diffsigs: properly report which signature is missing new f0d7ab2 bitbake-diffsigs: drop naive logic for removing duplicate files new 4d254ae lib/bb/siggen: show a diff when dumping changes to multi-line values new cb17054 lib/bb/siggen: don't show unchanged runtaskdeps list new 7f130e0 bitbake-diffsigs: change to use argparse new d9813b1 bitbake-diffsigs: add an option to find and compare specific signatures new 6543a59 lib/bb/siggen: add collapsed mode to compare_sigfiles() new 20db6b6 lib/bb/siggen: show word-diff for single-line values containing spaces new 04a023c bitbake-diffsigs: colourise output The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: LICENSE | 2 + bin/bitbake-diffsigs | 175 +++++++++++++++++++++------------------ lib/bb/siggen.py | 166 +++++++++++++++++++++++++++++-------- lib/simplediff/LICENSE | 22 +++++ lib/simplediff/__init__.py | 198 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 453 insertions(+), 110 deletions(-) create mode 100644 lib/simplediff/LICENSE create mode 100644 lib/simplediff/__init__.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:55 +0000 Subject: [oe-commits] [bitbake] 03/11: bitbake-diffsigs: properly report which signature is missing In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.D24D72334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit c87764b9147792a10efad3ed5378f36f0a055bc6 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:03 2017 +1200 bitbake-diffsigs: properly report which signature is missing If just one of the two signatures we want to compare aren't available, report that one rather than misleadingly claiming both are missing. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index b2ebe91..f84188d 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -75,11 +75,15 @@ def find_compare_task(bbhandler, pn, taskname): hashfiles = bb.siggen.find_siginfo(key, None, hashes, bbhandler.config_data) recout = [] - if len(hashfiles) == 2: + if len(hashfiles) == 0: + recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2)) + elif not hash1 in hashfiles: + recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1)) + elif not hash2 in hashfiles: + recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) + else: out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb) recout.extend(list(' ' + l for l in out2)) - else: - recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2)) return recout -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:54 +0000 Subject: [oe-commits] [bitbake] 02/11: lib/bb/siggen: add missing path separator to cleaned paths In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.CB43023349F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 55cd4045a37afc954f4d5091f524756b266064fc Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:02 2017 +1200 lib/bb/siggen: add missing path separator to cleaned paths Printing "pbzip2pbzip2_1.1.13.bb" is ugly, we need to add a separating slash so that we get "pbzip2/pbzip2_1.1.13.bb" instead. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 3ceeef1..f47af6d 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -355,7 +355,7 @@ def clean_basepath(a): mc = None if a.startswith("multiconfig:"): _, mc, a = a.split(":", 2) - b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2] + b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] if a.startswith("virtual:"): b = b + ":" + a.rsplit(":", 1)[0] if mc: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:58 +0000 Subject: [oe-commits] [bitbake] 06/11: lib/bb/siggen: don't show unchanged runtaskdeps list In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.E9AAA2334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit cb170543605288b3e8badfac3a54c588f4c95413 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:06 2017 +1200 lib/bb/siggen: don't show unchanged runtaskdeps list If the runtaskdeps list hasn't actually changed (but the signatures of some of the tasks did) then it doesn't make sense to print out the old and new lists as they are both the same and may be very long, e.g. for do_rootfs in OE. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index f497fb9..c6b14c2 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -506,10 +506,14 @@ def compare_sigfiles(a, b, recursecb = None): changed.append("%s with hash %s\n changed to\n%s with hash %s" % (a, a_data['runtaskhashes'][a], b, b_data['runtaskhashes'][b])) if changed: - output.append("runtaskdeps changed from %s to %s" % (clean_basepaths_list(a_data['runtaskdeps']), clean_basepaths_list(b_data['runtaskdeps']))) + clean_a = clean_basepaths_list(a_data['runtaskdeps']) + clean_b = clean_basepaths_list(b_data['runtaskdeps']) + if clean_a != clean_b: + output.append("runtaskdeps changed from %s to %s" % (clean_a, clean_b)) + else: + output.append("runtaskdeps changed:") output.append("\n".join(changed)) - if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: a = a_data['runtaskhashes'] b = b_data['runtaskhashes'] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:56 +0000 Subject: [oe-commits] [bitbake] 04/11: bitbake-diffsigs: drop naive logic for removing duplicate files In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.DA8EF2334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit f0d7ab259d8ef95643e7229474b7850608aa4426 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:04 2017 +1200 bitbake-diffsigs: drop naive logic for removing duplicate files This logic doesn't work in practice, certainly not with current versions where sigdata files are preserved in the stamps directory and therefore there will often be multiple sigdata files - you can now easily get files for the same signature from sstate and the stamps directory with the result that bitbake-diffsigs reports nothing has changed. Instead, let's change the find_siginfo function in OE-Core to simply not return duplicates so we don't have to filter them out here. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index f84188d..5400e5b 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -37,12 +37,6 @@ logger = bb.msg.logger_create('bitbake-diffsigs') def find_compare_task(bbhandler, pn, taskname): """ Find the most recent signature files for the specified PN/task and compare them """ - def get_hashval(siginfo): - if siginfo.endswith('.siginfo'): - return siginfo.rpartition(':')[2].partition('_')[0] - else: - return siginfo.rpartition('.')[2] - if not hasattr(bb.siggen, 'find_siginfo'): logger.error('Metadata does not support finding signature data files') sys.exit(1) @@ -59,16 +53,6 @@ def find_compare_task(bbhandler, pn, taskname): logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname)) sys.exit(1) else: - # It's possible that latestfiles contain 3 elements and the first two have the same hash value. - # In this case, we delete the second element. - # The above case is actually the most common one. Because we may have sigdata file and siginfo - # file having the same hash value. Comparing such two files makes no sense. - if len(latestfiles) == 3: - hash0 = get_hashval(latestfiles[0]) - hash1 = get_hashval(latestfiles[1]) - if hash0 == hash1: - latestfiles.pop(1) - # Define recursion callback def recursecb(key, hash1, hash2): hashes = [hash1, hash2] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:02 +0000 Subject: [oe-commits] [bitbake] 10/11: lib/bb/siggen: show word-diff for single-line values containing spaces In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235153.16A702334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 20db6b6553c80e18afc4f43dc2495435f7477822 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:10 2017 +1200 lib/bb/siggen: show word-diff for single-line values containing spaces If a variable value has changed and either the new or old value contains spaces, a word diff should be appropriate and may be a bit more readable. Import the "simplediff" module and use it to show a word diff (in the style of GNU wdiff and git diff --word-diff). Also use a similar style diff to show changes in the runtaskhashes list. I didn't use an actual word-diff here since it's a little different - we can be sure that the list is a list and not simply a free-format string. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- LICENSE | 2 + lib/bb/siggen.py | 38 ++++++++- lib/simplediff/LICENSE | 22 +++++ lib/simplediff/__init__.py | 198 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 5d4a4c2..7d4e5f4 100644 --- a/LICENSE +++ b/LICENSE @@ -15,3 +15,5 @@ Foundation and individual contributors. * QUnit is redistributed under the MIT license. * Font Awesome fonts redistributed under the SIL Open Font License 1.1 + +* simplediff is distributed under the zlib license. diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 3c5d862..d40c721 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -6,6 +6,7 @@ import tempfile import pickle import bb.data import difflib +import simplediff from bb.checksum import FileChecksumCache logger = logging.getLogger('BitBake.SigGen') @@ -352,6 +353,39 @@ def dump_this_task(outfile, d): referencestamp = bb.build.stamp_internal(task, d, None, True) bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) +def worddiff_str(oldstr, newstr): + diff = simplediff.diff(oldstr.split(' '), newstr.split(' ')) + ret = [] + for change, value in diff: + value = ' '.join(value) + if change == '=': + ret.append(value) + elif change == '+': + item = '{+%s+}' % value + ret.append(item) + elif change == '-': + item = '[-%s-]' % value + ret.append(item) + whitespace_note = '' + if oldstr != newstr and ' '.join(oldstr.split()) == ' '.join(newstr.split()): + whitespace_note = ' (whitespace changed)' + return '"%s"%s' % (' '.join(ret), whitespace_note) + +def list_inline_diff(oldlist, newlist): + diff = simplediff.diff(oldlist, newlist) + ret = [] + for change, value in diff: + value = ' '.join(value) + if change == '=': + ret.append("'%s'" % value) + elif change == '+': + item = "+'%s'" % value + ret.append(item) + elif change == '-': + item = "-'%s'" % value + ret.append(item) + return '[%s]' % (', '.join(ret)) + def clean_basepath(a): mc = None if a.startswith("multiconfig:"): @@ -471,6 +505,8 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): # the old/new filename (they are blank anyway in this case) difflines = list(diff)[2:] output.append("Variable %s value changed:\n%s" % (dep, '\n'.join(difflines))) + elif newval and oldval and (' ' in oldval or ' ' in newval): + output.append("Variable %s value changed:\n%s" % (dep, worddiff_str(oldval, newval))) else: output.append("Variable %s value changed from '%s' to '%s'" % (dep, oldval, newval)) @@ -510,7 +546,7 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): clean_a = clean_basepaths_list(a_data['runtaskdeps']) clean_b = clean_basepaths_list(b_data['runtaskdeps']) if clean_a != clean_b: - output.append("runtaskdeps changed from %s to %s" % (clean_a, clean_b)) + output.append("runtaskdeps changed:\n%s" % list_inline_diff(clean_a, clean_b)) else: output.append("runtaskdeps changed:") output.append("\n".join(changed)) diff --git a/lib/simplediff/LICENSE b/lib/simplediff/LICENSE new file mode 100644 index 0000000..8242dde --- /dev/null +++ b/lib/simplediff/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) 2008 - 2013 Paul Butler and contributors + +This sofware may be used under a zlib/libpng-style license: + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use +of this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim +that you wrote the original software. If you use this software in a product, an +acknowledgment in the product documentation would be appreciated but is not +required. + +2. Altered source versions must be plainly marked as such, and must not be +misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + diff --git a/lib/simplediff/__init__.py b/lib/simplediff/__init__.py new file mode 100644 index 0000000..57ee3c5 --- /dev/null +++ b/lib/simplediff/__init__.py @@ -0,0 +1,198 @@ +''' +Simple Diff for Python version 1.0 + +Annotate two versions of a list with the values that have been +changed between the versions, similar to unix's `diff` but with +a dead-simple Python interface. + +(C) Paul Butler 2008-2012 +May be used and distributed under the zlib/libpng license + +''' + +__all__ = ['diff', 'string_diff', 'html_diff'] +__version__ = '1.0' + + +def diff(old, new): + ''' + Find the differences between two lists. Returns a list of pairs, where the + first value is in ['+','-','='] and represents an insertion, deletion, or + no change for that list. The second value of the pair is the list + of elements. + + Params: + old the old list of immutable, comparable values (ie. a list + of strings) + new the new list of immutable, comparable values + + Returns: + A list of pairs, with the first part of the pair being one of three + strings ('-', '+', '=') and the second part being a list of values from + the original old and/or new lists. The first part of the pair + corresponds to whether the list of values is a deletion, insertion, or + unchanged, respectively. + + Examples: + >>> diff([1,2,3,4],[1,3,4]) + [('=', [1]), ('-', [2]), ('=', [3, 4])] + + >>> diff([1,2,3,4],[2,3,4,1]) + [('-', [1]), ('=', [2, 3, 4]), ('+', [1])] + + >>> diff('The quick brown fox jumps over the lazy dog'.split(), + ... 'The slow blue cheese drips over the lazy carrot'.split()) + ... # doctest: +NORMALIZE_WHITESPACE + [('=', ['The']), + ('-', ['quick', 'brown', 'fox', 'jumps']), + ('+', ['slow', 'blue', 'cheese', 'drips']), + ('=', ['over', 'the', 'lazy']), + ('-', ['dog']), + ('+', ['carrot'])] + + ''' + + # Create a map from old values to their indices + old_index_map = dict() + for i, val in enumerate(old): + old_index_map.setdefault(val,list()).append(i) + + # Find the largest substring common to old and new. + # We use a dynamic programming approach here. + # + # We iterate over each value in the `new` list, calling the + # index `inew`. At each iteration, `overlap[i]` is the + # length of the largest suffix of `old[:i]` equal to a suffix + # of `new[:inew]` (or unset when `old[i]` != `new[inew]`). + # + # At each stage of iteration, the new `overlap` (called + # `_overlap` until the original `overlap` is no longer needed) + # is built from the old one. + # + # If the length of overlap exceeds the largest substring + # seen so far (`sub_length`), we update the largest substring + # to the overlapping strings. + + overlap = dict() + # `sub_start_old` is the index of the beginning of the largest overlapping + # substring in the old list. `sub_start_new` is the index of the beginning + # of the same substring in the new list. `sub_length` is the length that + # overlaps in both. + # These track the largest overlapping substring seen so far, so naturally + # we start with a 0-length substring. + sub_start_old = 0 + sub_start_new = 0 + sub_length = 0 + + for inew, val in enumerate(new): + _overlap = dict() + for iold in old_index_map.get(val,list()): + # now we are considering all values of iold such that + # `old[iold] == new[inew]`. + _overlap[iold] = (iold and overlap.get(iold - 1, 0)) + 1 + if(_overlap[iold] > sub_length): + # this is the largest substring seen so far, so store its + # indices + sub_length = _overlap[iold] + sub_start_old = iold - sub_length + 1 + sub_start_new = inew - sub_length + 1 + overlap = _overlap + + if sub_length == 0: + # If no common substring is found, we return an insert and delete... + return (old and [('-', old)] or []) + (new and [('+', new)] or []) + else: + # ...otherwise, the common substring is unchanged and we recursively + # diff the text before and after that substring + return diff(old[ : sub_start_old], new[ : sub_start_new]) + \ + [('=', new[sub_start_new : sub_start_new + sub_length])] + \ + diff(old[sub_start_old + sub_length : ], + new[sub_start_new + sub_length : ]) + + +def string_diff(old, new): + ''' + Returns the difference between the old and new strings when split on + whitespace. Considers punctuation a part of the word + + This function is intended as an example; you'll probably want + a more sophisticated wrapper in practice. + + Params: + old the old string + new the new string + + Returns: + the output of `diff` on the two strings after splitting them + on whitespace (a list of change instructions; see the docstring + of `diff`) + + Examples: + >>> string_diff('The quick brown fox', 'The fast blue fox') + ... # doctest: +NORMALIZE_WHITESPACE + [('=', ['The']), + ('-', ['quick', 'brown']), + ('+', ['fast', 'blue']), + ('=', ['fox'])] + + ''' + return diff(old.split(), new.split()) + + +def html_diff(old, new): + ''' + Returns the difference between two strings (as in stringDiff) in + HTML format. HTML code in the strings is NOT escaped, so you + will get weird results if the strings contain HTML. + + This function is intended as an example; you'll probably want + a more sophisticated wrapper in practice. + + Params: + old the old string + new the new string + + Returns: + the output of the diff expressed with HTML and + tags. + + Examples: + >>> html_diff('The quick brown fox', 'The fast blue fox') + 'The quick brown fast blue fox' + ''' + con = {'=': (lambda x: x), + '+': (lambda x: "" + x + ""), + '-': (lambda x: "" + x + "")} + return " ".join([(con[a])(" ".join(b)) for a, b in string_diff(old, new)]) + + +def check_diff(old, new): + ''' + This tests that diffs returned by `diff` are valid. You probably won't + want to use this function, but it's provided for documentation and + testing. + + A diff should satisfy the property that the old input is equal to the + elements of the result annotated with '-' or '=' concatenated together. + Likewise, the new input is equal to the elements of the result annotated + with '+' or '=' concatenated together. This function compares `old`, + `new`, and the results of `diff(old, new)` to ensure this is true. + + Tests: + >>> check_diff('ABCBA', 'CBABA') + >>> check_diff('Foobarbaz', 'Foobarbaz') + >>> check_diff('Foobarbaz', 'Boobazbam') + >>> check_diff('The quick brown fox', 'Some quick brown car') + >>> check_diff('A thick red book', 'A quick blue book') + >>> check_diff('dafhjkdashfkhasfjsdafdasfsda', 'asdfaskjfhksahkfjsdha') + >>> check_diff('88288822828828288282828', '88288882882828282882828') + >>> check_diff('1234567890', '24689') + ''' + old = list(old) + new = list(new) + result = diff(old, new) + _old = [val for (a, vals) in result if (a in '=-') for val in vals] + assert old == _old, 'Expected %s, got %s' % (old, _old) + _new = [val for (a, vals) in result if (a in '=+') for val in vals] + assert new == _new, 'Expected %s, got %s' % (new, _new) + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:00 +0000 Subject: [oe-commits] [bitbake] 08/11: bitbake-diffsigs: add an option to find and compare specific signatures In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235153.07ABF2334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit d9813b1a4223cf8dc80cab90e467ddf4bf8d1078 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:08 2017 +1200 bitbake-diffsigs: add an option to find and compare specific signatures With the -t option which recurses to find the ultimate cause of a signature change, it was hardcoded to take the last two executions of the specified task. On the other hand, if you have two specific task hashes (say from bitbake output, or some other tool) then you'll want to pick those, so provide an option to specify those as well. (Note, the new -s option needs to be specified alongside -t rather than instead of it.) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 95 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index e3f848d..e9fdb48 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -34,7 +34,7 @@ import bb.msg logger = bb.msg.logger_create('bitbake-diffsigs') -def find_compare_task(bbhandler, pn, taskname): +def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None): """ Find the most recent signature files for the specified PN/task and compare them """ if not hasattr(bb.siggen, 'find_siginfo'): @@ -44,41 +44,54 @@ def find_compare_task(bbhandler, pn, taskname): if not taskname.startswith('do_'): taskname = 'do_%s' % taskname - filedates = bb.siggen.find_siginfo(pn, taskname, None, bbhandler.config_data) - latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-3:] - if not latestfiles: - logger.error('No sigdata files found matching %s %s' % (pn, taskname)) - sys.exit(1) - elif len(latestfiles) < 2: - logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname)) - sys.exit(1) + if sig1 and sig2: + sigfiles = bb.siggen.find_siginfo(pn, taskname, [sig1, sig2], bbhandler.config_data) + if len(sigfiles) == 0: + logger.error('No sigdata files found matching %s %s matching either %s or %s' % (pn, taskname, sig1, sig2)) + sys.exit(1) + elif not sig1 in sigfiles: + logger.error('No sigdata files found matching %s %s with signature %s' % (pn, taskname, sig1)) + sys.exit(1) + elif not sig2 in sigfiles: + logger.error('No sigdata files found matching %s %s with signature %s' % (pn, taskname, sig2)) + sys.exit(1) + latestfiles = [sigfiles[sig1], sigfiles[sig2]] else: - # Define recursion callback - def recursecb(key, hash1, hash2): - hashes = [hash1, hash2] - hashfiles = bb.siggen.find_siginfo(key, None, hashes, bbhandler.config_data) - - recout = [] - if len(hashfiles) == 0: - recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2)) - elif not hash1 in hashfiles: - recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1)) - elif not hash2 in hashfiles: - recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) - else: - out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb) - for change in out2: - for line in change.splitlines(): - recout.append(' ' + line) - - return recout - - # Recurse into signature comparison - logger.debug("Signature file (previous): %s" % latestfiles[-2]) - logger.debug("Signature file (latest): %s" % latestfiles[-1]) - output = bb.siggen.compare_sigfiles(latestfiles[-2], latestfiles[-1], recursecb) - if output: - print('\n'.join(output)) + filedates = bb.siggen.find_siginfo(pn, taskname, None, bbhandler.config_data) + latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-3:] + if not latestfiles: + logger.error('No sigdata files found matching %s %s' % (pn, taskname)) + sys.exit(1) + elif len(latestfiles) < 2: + logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (pn, taskname)) + sys.exit(1) + + # Define recursion callback + def recursecb(key, hash1, hash2): + hashes = [hash1, hash2] + hashfiles = bb.siggen.find_siginfo(key, None, hashes, bbhandler.config_data) + + recout = [] + if len(hashfiles) == 0: + recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2)) + elif not hash1 in hashfiles: + recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1)) + elif not hash2 in hashfiles: + recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) + else: + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb) + for change in out2: + for line in change.splitlines(): + recout.append(' ' + line) + + return recout + + # Recurse into signature comparison + logger.debug("Signature file (previous): %s" % latestfiles[-2]) + logger.debug("Signature file (latest): %s" % latestfiles[-1]) + output = bb.siggen.compare_sigfiles(latestfiles[-2], latestfiles[-1], recursecb) + if output: + print('\n'.join(output)) sys.exit(0) @@ -94,6 +107,10 @@ parser.add_argument("-t", "--task", help="find the signature data files for last two runs of the specified task and compare them", action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname')) +parser.add_argument("-s", "--signature", + help="With -t/--task, specify the signatures to look for instead of taking the last two", + action="store", dest="sigargs", nargs=2, metavar=('fromsig', 'tosig')) + parser.add_argument("sigdatafile1", help="First signature file to compare (or signature file to dump, if second not specified). Not used when using -t/--task.", action="store", nargs='?') @@ -111,8 +128,14 @@ if options.debug: if options.taskargs: with bb.tinfoil.Tinfoil() as tinfoil: tinfoil.prepare(config_only=True) - find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1]) + if options.sigargs: + find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0], options.sigargs[1]) + else: + find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1]) else: + if options.sigargs: + logger.error('-s/--signature can only be used together with -t/--task') + sys.exit(1) try: if options.sigdatafile1 and options.sigdatafile2: output = bb.siggen.compare_sigfiles(options.sigdatafile1, options.sigdatafile2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:57 +0000 Subject: [oe-commits] [bitbake] 05/11: lib/bb/siggen: show a diff when dumping changes to multi-line values In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.E233C2334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 4d254ae63a35231c98e3f73f669b040ed1144042 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:05 2017 +1200 lib/bb/siggen: show a diff when dumping changes to multi-line values When dumping changes to signatures e.g. output of bitbake -s printdiff, if for example a function has changed, it's much more readable to see a unified diff of the changes rather than just printing the old function followed by the new function, so use difflib to do that. Note: I elected to keep to one item in the returned list per change, rather than one line per line of output, so that the caller can still look at changes individually if needed. Thus I've added some handling to bitbake-diffsigs to split the change into lines so that each line is displayed indented. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 4 +++- lib/bb/siggen.py | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index 5400e5b..4ca085f 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -67,7 +67,9 @@ def find_compare_task(bbhandler, pn, taskname): recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) else: out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb) - recout.extend(list(' ' + l for l in out2)) + for change in out2: + for line in change.splitlines(): + recout.append(' ' + line) return recout diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index f47af6d..f497fb9 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -5,6 +5,7 @@ import re import tempfile import pickle import bb.data +import difflib from bb.checksum import FileChecksumCache logger = logging.getLogger('BitBake.SigGen') @@ -462,7 +463,16 @@ def compare_sigfiles(a, b, recursecb = None): changed, added, removed = dict_diff(a_data['varvals'], b_data['varvals']) if changed: for dep in changed: - output.append("Variable %s value changed from '%s' to '%s'" % (dep, a_data['varvals'][dep], b_data['varvals'][dep])) + oldval = a_data['varvals'][dep] + newval = b_data['varvals'][dep] + if newval and oldval and ('\n' in oldval or '\n' in newval): + diff = difflib.unified_diff(oldval.splitlines(), newval.splitlines(), lineterm='') + # Cut off the first two lines, since we aren't interested in + # the old/new filename (they are blank anyway in this case) + difflines = list(diff)[2:] + output.append("Variable %s value changed:\n%s" % (dep, '\n'.join(difflines))) + else: + output.append("Variable %s value changed from '%s' to '%s'" % (dep, oldval, newval)) if not 'file_checksum_values' in a_data: a_data['file_checksum_values'] = {} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:01 +0000 Subject: [oe-commits] [bitbake] 09/11: lib/bb/siggen: add collapsed mode to compare_sigfiles() In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235153.0F4DE2334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 6543a59b1ebd3194a7c6421cffc66ebe31a67c62 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:09 2017 +1200 lib/bb/siggen: add collapsed mode to compare_sigfiles() If we just want to drill down to the actual differences then we don't need to see certain things in the output, e.g. basehash changing or the signature of dependent tasks. This will be used for comparing signatures within buildhistory-diff in OE-Core; the default mode as used by bitbake-diffsigs and bitbake -S printdiff remains unchanged for the moment. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 51 ++++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index c6b14c2..3c5d862 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -375,7 +375,7 @@ def clean_basepaths_list(a): b.append(clean_basepath(x)) return b -def compare_sigfiles(a, b, recursecb = None): +def compare_sigfiles(a, b, recursecb=None, collapsed=False): output = [] with open(a, 'rb') as f: @@ -443,7 +443,7 @@ def compare_sigfiles(a, b, recursecb = None): if a_data['taskdeps'] != b_data['taskdeps']: output.append("Task dependencies changed from:\n%s\nto:\n%s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps']))) - if a_data['basehash'] != b_data['basehash']: + if a_data['basehash'] != b_data['basehash'] and not collapsed: output.append("basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])) changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist']) @@ -495,24 +495,25 @@ def compare_sigfiles(a, b, recursecb = None): if not 'runtaskdeps' in b_data: b_data['runtaskdeps'] = {} - if len(a_data['runtaskdeps']) != len(b_data['runtaskdeps']): - changed = ["Number of task dependencies changed"] - else: - changed = [] - for idx, task in enumerate(a_data['runtaskdeps']): - a = a_data['runtaskdeps'][idx] - b = b_data['runtaskdeps'][idx] - if a_data['runtaskhashes'][a] != b_data['runtaskhashes'][b]: - changed.append("%s with hash %s\n changed to\n%s with hash %s" % (a, a_data['runtaskhashes'][a], b, b_data['runtaskhashes'][b])) - - if changed: - clean_a = clean_basepaths_list(a_data['runtaskdeps']) - clean_b = clean_basepaths_list(b_data['runtaskdeps']) - if clean_a != clean_b: - output.append("runtaskdeps changed from %s to %s" % (clean_a, clean_b)) + if not collapsed: + if len(a_data['runtaskdeps']) != len(b_data['runtaskdeps']): + changed = ["Number of task dependencies changed"] else: - output.append("runtaskdeps changed:") - output.append("\n".join(changed)) + changed = [] + for idx, task in enumerate(a_data['runtaskdeps']): + a = a_data['runtaskdeps'][idx] + b = b_data['runtaskdeps'][idx] + if a_data['runtaskhashes'][a] != b_data['runtaskhashes'][b]: + changed.append("%s with hash %s\n changed to\n%s with hash %s" % (a, a_data['runtaskhashes'][a], b, b_data['runtaskhashes'][b])) + + if changed: + clean_a = clean_basepaths_list(a_data['runtaskdeps']) + clean_b = clean_basepaths_list(b_data['runtaskdeps']) + if clean_a != clean_b: + output.append("runtaskdeps changed from %s to %s" % (clean_a, clean_b)) + else: + output.append("runtaskdeps changed:") + output.append("\n".join(changed)) if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: a = a_data['runtaskhashes'] @@ -540,13 +541,17 @@ def compare_sigfiles(a, b, recursecb = None): output.append("Dependency on task %s was removed with hash %s" % (clean_basepath(dep), a[dep])) if changed: for dep in changed: - output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep])) + if not collapsed: + output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep])) if callable(recursecb): - # If a dependent hash changed, might as well print the line above and then defer to the changes in - # that hash since in all likelyhood, they're the same changes this task also saw. recout = recursecb(dep, a[dep], b[dep]) if recout: - output = [output[-1]] + recout + if collapsed: + output.extend(recout) + else: + # If a dependent hash changed, might as well print the line above and then defer to the changes in + # that hash since in all likelyhood, they're the same changes this task also saw. + output = [output[-1]] + recout a_taint = a_data.get('taint', None) b_taint = b_data.get('taint', None) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:52:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:52:03 +0000 Subject: [oe-commits] [bitbake] 11/11: bitbake-diffsigs: colourise output In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235153.1FB8D2334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 04a023c8fdea1e1812fcdcaf00345aab59f9abe1 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:11 2017 +1200 bitbake-diffsigs: colourise output If the output is a TTY, add colour to the output in order to make it easier to read. At the moment this is fairly basic, just add colour to the "titles" of each change and to the diff output. I tried to introduce this without changing the code too much - rather than moving everything over to the new python formatting style, I've introduced a color_format() function which takes care of the colour formatting, either accepting additional format arguments or alternatively leaving the caller to use the old-style formatting (%) to insert values. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 18 ++++++--- lib/bb/siggen.py | 101 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 85 insertions(+), 34 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index e9fdb48..884be1e 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -34,7 +34,7 @@ import bb.msg logger = bb.msg.logger_create('bitbake-diffsigs') -def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None): +def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None, color=False): """ Find the most recent signature files for the specified PN/task and compare them """ if not hasattr(bb.siggen, 'find_siginfo'): @@ -79,7 +79,7 @@ def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None): elif not hash2 in hashfiles: recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) else: - out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb) + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, color=color) for change in out2: for line in change.splitlines(): recout.append(' ' + line) @@ -89,7 +89,7 @@ def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None): # Recurse into signature comparison logger.debug("Signature file (previous): %s" % latestfiles[-2]) logger.debug("Signature file (latest): %s" % latestfiles[-1]) - output = bb.siggen.compare_sigfiles(latestfiles[-2], latestfiles[-1], recursecb) + output = bb.siggen.compare_sigfiles(latestfiles[-2], latestfiles[-1], recursecb, color=color) if output: print('\n'.join(output)) sys.exit(0) @@ -103,6 +103,10 @@ parser.add_argument('-d', '--debug', help='Enable debug output', action='store_true') +parser.add_argument('--color', + help='Colorize output (where %(metavar)s is %(choices)s)', + choices=['auto', 'always', 'never'], default='auto', metavar='color') + parser.add_argument("-t", "--task", help="find the signature data files for last two runs of the specified task and compare them", action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname')) @@ -125,20 +129,22 @@ options = parser.parse_args() if options.debug: logger.setLevel(logging.DEBUG) +color = (options.color == 'always' or (options.color == 'auto' and sys.stdout.isatty())) + if options.taskargs: with bb.tinfoil.Tinfoil() as tinfoil: tinfoil.prepare(config_only=True) if options.sigargs: - find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0], options.sigargs[1]) + find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0], options.sigargs[1], color=color) else: - find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1]) + find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1], color=color) else: if options.sigargs: logger.error('-s/--signature can only be used together with -t/--task') sys.exit(1) try: if options.sigdatafile1 and options.sigdatafile2: - output = bb.siggen.compare_sigfiles(options.sigdatafile1, options.sigdatafile2) + output = bb.siggen.compare_sigfiles(options.sigdatafile1, options.sigdatafile2, color=color) elif options.sigdatafile1: output = bb.siggen.dump_sigfile(options.sigdatafile1) except IOError as e: diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index d40c721..25ad3e9 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -353,7 +353,23 @@ def dump_this_task(outfile, d): referencestamp = bb.build.stamp_internal(task, d, None, True) bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile:" + referencestamp) -def worddiff_str(oldstr, newstr): +def init_colors(enable_color): + """Initialise colour dict for passing to compare_sigfiles()""" + # First set up the colours + colors = {'color_title': '\033[1;37;40m', + 'color_default': '\033[0;37;40m', + 'color_add': '\033[1;32;40m', + 'color_remove': '\033[1;31;40m', + } + # Leave all keys present but clear the values + if not enable_color: + for k in colors.keys(): + colors[k] = '' + return colors + +def worddiff_str(oldstr, newstr, colors=None): + if not colors: + colors = init_colors(False) diff = simplediff.diff(oldstr.split(' '), newstr.split(' ')) ret = [] for change, value in diff: @@ -361,17 +377,19 @@ def worddiff_str(oldstr, newstr): if change == '=': ret.append(value) elif change == '+': - item = '{+%s+}' % value + item = '{color_add}{{+{value}+}}{color_default}'.format(value=value, **colors) ret.append(item) elif change == '-': - item = '[-%s-]' % value + item = '{color_remove}[-{value}-]{color_default}'.format(value=value, **colors) ret.append(item) whitespace_note = '' if oldstr != newstr and ' '.join(oldstr.split()) == ' '.join(newstr.split()): whitespace_note = ' (whitespace changed)' return '"%s"%s' % (' '.join(ret), whitespace_note) -def list_inline_diff(oldlist, newlist): +def list_inline_diff(oldlist, newlist, colors=None): + if not colors: + colors = init_colors(False) diff = simplediff.diff(oldlist, newlist) ret = [] for change, value in diff: @@ -379,10 +397,10 @@ def list_inline_diff(oldlist, newlist): if change == '=': ret.append("'%s'" % value) elif change == '+': - item = "+'%s'" % value + item = '{color_add}+{value}{color_default}'.format(value=value, **colors) ret.append(item) elif change == '-': - item = "-'%s'" % value + item = '{color_remove}-{value}{color_default}'.format(value=value, **colors) ret.append(item) return '[%s]' % (', '.join(ret)) @@ -409,9 +427,26 @@ def clean_basepaths_list(a): b.append(clean_basepath(x)) return b -def compare_sigfiles(a, b, recursecb=None, collapsed=False): +def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False): output = [] + colors = init_colors(color) + def color_format(formatstr, **values): + """ + Return colour formatted string. + NOTE: call with the format string, not an already formatted string + containing values (otherwise you could have trouble with { and } + characters) + """ + if not formatstr.endswith('{color_default}'): + formatstr += '{color_default}' + # In newer python 3 versions you can pass both of these directly, + # but we only require 3.4 at the moment + formatparams = {} + formatparams.update(colors) + formatparams.update(values) + return formatstr.format(**formatparams) + with open(a, 'rb') as f: p1 = pickle.Unpickler(f) a_data = p1.load() @@ -465,33 +500,33 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): return changed, added, removed if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']: - output.append("basewhitelist changed from '%s' to '%s'" % (a_data['basewhitelist'], b_data['basewhitelist'])) + output.append(color_format("{color_title}basewhitelist changed{color_default} from '%s' to '%s'") % (a_data['basewhitelist'], b_data['basewhitelist'])) if a_data['basewhitelist'] and b_data['basewhitelist']: output.append("changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist'])) if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']: - output.append("taskwhitelist changed from '%s' to '%s'" % (a_data['taskwhitelist'], b_data['taskwhitelist'])) + output.append(color_format("{color_title}taskwhitelist changed{color_default} from '%s' to '%s'") % (a_data['taskwhitelist'], b_data['taskwhitelist'])) if a_data['taskwhitelist'] and b_data['taskwhitelist']: output.append("changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist'])) if a_data['taskdeps'] != b_data['taskdeps']: - output.append("Task dependencies changed from:\n%s\nto:\n%s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps']))) + output.append(color_format("{color_title}Task dependencies changed{color_default} from:\n%s\nto:\n%s") % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps']))) if a_data['basehash'] != b_data['basehash'] and not collapsed: - output.append("basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])) + output.append(color_format("{color_title}basehash changed{color_default} from %s to %s") % (a_data['basehash'], b_data['basehash'])) changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist']) if changed: for dep in changed: - output.append("List of dependencies for variable %s changed from '%s' to '%s'" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])) + output.append(color_format("{color_title}List of dependencies for variable %s changed from '{color_default}%s{color_title}' to '{color_default}%s{color_title}'") % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])) if a_data['gendeps'][dep] and b_data['gendeps'][dep]: output.append("changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep])) if added: for dep in added: - output.append("Dependency on variable %s was added" % (dep)) + output.append(color_format("{color_title}Dependency on variable %s was added") % (dep)) if removed: for dep in removed: - output.append("Dependency on Variable %s was removed" % (dep)) + output.append(color_format("{color_title}Dependency on Variable %s was removed") % (dep)) changed, added, removed = dict_diff(a_data['varvals'], b_data['varvals']) @@ -504,11 +539,20 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): # Cut off the first two lines, since we aren't interested in # the old/new filename (they are blank anyway in this case) difflines = list(diff)[2:] - output.append("Variable %s value changed:\n%s" % (dep, '\n'.join(difflines))) + if color: + # Add colour to diff output + for i, line in enumerate(difflines): + if line.startswith('+'): + line = color_format('{color_add}{line}', line=line) + difflines[i] = line + elif line.startswith('-'): + line = color_format('{color_remove}{line}', line=line) + difflines[i] = line + output.append(color_format("{color_title}Variable {var} value changed:{color_default}\n{diff}", var=dep, diff='\n'.join(difflines))) elif newval and oldval and (' ' in oldval or ' ' in newval): - output.append("Variable %s value changed:\n%s" % (dep, worddiff_str(oldval, newval))) + output.append(color_format("{color_title}Variable {var} value changed:{color_default}\n{diff}", var=dep, diff=worddiff_str(oldval, newval, colors))) else: - output.append("Variable %s value changed from '%s' to '%s'" % (dep, oldval, newval)) + output.append(color_format("{color_title}Variable {var} value changed from '{color_default}{oldval}{color_title}' to '{color_default}{newval}{color_title}'{color_default}", var=dep, oldval=oldval, newval=newval)) if not 'file_checksum_values' in a_data: a_data['file_checksum_values'] = {} @@ -518,13 +562,13 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): changed, added, removed = file_checksums_diff(a_data['file_checksum_values'], b_data['file_checksum_values']) if changed: for f, old, new in changed: - output.append("Checksum for file %s changed from %s to %s" % (f, old, new)) + output.append(color_format("{color_title}Checksum for file %s changed{color_default} from %s to %s") % (f, old, new)) if added: for f in added: - output.append("Dependency on checksum of file %s was added" % (f)) + output.append(color_format("{color_title}Dependency on checksum of file %s was added") % (f)) if removed: for f in removed: - output.append("Dependency on checksum of file %s was removed" % (f)) + output.append(color_format("{color_title}Dependency on checksum of file %s was removed") % (f)) if not 'runtaskdeps' in a_data: a_data['runtaskdeps'] = {} @@ -539,18 +583,19 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): for idx, task in enumerate(a_data['runtaskdeps']): a = a_data['runtaskdeps'][idx] b = b_data['runtaskdeps'][idx] - if a_data['runtaskhashes'][a] != b_data['runtaskhashes'][b]: - changed.append("%s with hash %s\n changed to\n%s with hash %s" % (a, a_data['runtaskhashes'][a], b, b_data['runtaskhashes'][b])) + if a_data['runtaskhashes'][a] != b_data['runtaskhashes'][b] and not collapsed: + changed.append("%s with hash %s\n changed to\n%s with hash %s" % (clean_basepath(a), a_data['runtaskhashes'][a], clean_basepath(b), b_data['runtaskhashes'][b])) if changed: clean_a = clean_basepaths_list(a_data['runtaskdeps']) clean_b = clean_basepaths_list(b_data['runtaskdeps']) if clean_a != clean_b: - output.append("runtaskdeps changed:\n%s" % list_inline_diff(clean_a, clean_b)) + output.append(color_format("{color_title}runtaskdeps changed:{color_default}\n%s") % list_inline_diff(clean_a, clean_b, colors)) else: - output.append("runtaskdeps changed:") + output.append(color_format("{color_title}runtaskdeps changed:")) output.append("\n".join(changed)) + if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data: a = a_data['runtaskhashes'] b = b_data['runtaskhashes'] @@ -564,7 +609,7 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): #output.append("Dependency on task %s was replaced by %s with same hash" % (dep, bdep)) bdep_found = True if not bdep_found: - output.append("Dependency on task %s was added with hash %s" % (clean_basepath(dep), b[dep])) + output.append(color_format("{color_title}Dependency on task %s was added{color_default} with hash %s") % (clean_basepath(dep), b[dep])) if removed: for dep in removed: adep_found = False @@ -574,11 +619,11 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): #output.append("Dependency on task %s was replaced by %s with same hash" % (adep, dep)) adep_found = True if not adep_found: - output.append("Dependency on task %s was removed with hash %s" % (clean_basepath(dep), a[dep])) + output.append(color_format("{color_title}Dependency on task %s was removed{color_default} with hash %s") % (clean_basepath(dep), a[dep])) if changed: for dep in changed: if not collapsed: - output.append("Hash for dependent task %s changed from %s to %s" % (clean_basepath(dep), a[dep], b[dep])) + output.append(color_format("{color_title}Hash for dependent task %s changed{color_default} from %s to %s") % (clean_basepath(dep), a[dep], b[dep])) if callable(recursecb): recout = recursecb(dep, a[dep], b[dep]) if recout: @@ -592,7 +637,7 @@ def compare_sigfiles(a, b, recursecb=None, collapsed=False): a_taint = a_data.get('taint', None) b_taint = b_data.get('taint', None) if a_taint != b_taint: - output.append("Taint (by forced/invalidated task) changed from %s to %s" % (a_taint, b_taint)) + output.append(color_format("{color_title}Taint (by forced/invalidated task) changed{color_default} from %s to %s") % (a_taint, b_taint)) return output -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Apr 6 23:51:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 06 Apr 2017 23:51:59 +0000 Subject: [oe-commits] [bitbake] 07/11: bitbake-diffsigs: change to use argparse In-Reply-To: <149152271266.18555.3956262822499937748@git.openembedded.org> References: <149152271266.18555.3956262822499937748@git.openembedded.org> Message-ID: <20170406235152.F09C12334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 7f130e0b5ce6cfc6b35176465f260092cd3b3d64 Author: Paul Eggleton AuthorDate: Fri Apr 7 09:52:07 2017 +1200 bitbake-diffsigs: change to use argparse Argparse is a bit easier to deal with than optparse, and since we're about to add some options, migrate this script over. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 64 +++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index 4ca085f..e3f848d 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -3,7 +3,7 @@ # bitbake-diffsigs # BitBake task signature data comparison utility # -# Copyright (C) 2012-2013 Intel Corporation +# Copyright (C) 2012-2013, 2017 Intel Corporation # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -22,7 +22,7 @@ import os import sys import warnings import fnmatch -import optparse +import argparse import logging import pickle @@ -83,22 +83,27 @@ def find_compare_task(bbhandler, pn, taskname): -parser = optparse.OptionParser( - description = "Compares siginfo/sigdata files written out by BitBake", - usage = """ - %prog -t recipename taskname - %prog sigdatafile1 sigdatafile2 - %prog sigdatafile1""") +parser = argparse.ArgumentParser( + description="Compares siginfo/sigdata files written out by BitBake") -parser.add_option("-D", "--debug", - help = "enable debug", - action = "store_true", dest="debug", default = False) +parser.add_argument('-d', '--debug', + help='Enable debug output', + action='store_true') -parser.add_option("-t", "--task", - help = "find the signature data files for last two runs of the specified task and compare them", - action="store", dest="taskargs", nargs=2, metavar='recipename taskname') +parser.add_argument("-t", "--task", + help="find the signature data files for last two runs of the specified task and compare them", + action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname')) -options, args = parser.parse_args(sys.argv) +parser.add_argument("sigdatafile1", + help="First signature file to compare (or signature file to dump, if second not specified). Not used when using -t/--task.", + action="store", nargs='?') + +parser.add_argument("sigdatafile2", + help="Second signature file to compare", + action="store", nargs='?') + + +options = parser.parse_args() if options.debug: logger.setLevel(logging.DEBUG) @@ -108,20 +113,17 @@ if options.taskargs: tinfoil.prepare(config_only=True) find_compare_task(tinfoil, options.taskargs[0], options.taskargs[1]) else: - if len(args) == 1: - parser.print_help() - else: - try: - if len(args) == 2: - output = bb.siggen.dump_sigfile(sys.argv[1]) - else: - output = bb.siggen.compare_sigfiles(sys.argv[1], sys.argv[2]) - except IOError as e: - logger.error(str(e)) - sys.exit(1) - except (pickle.UnpicklingError, EOFError): - logger.error('Invalid signature data - ensure you are specifying sigdata/siginfo files') - sys.exit(1) + try: + if options.sigdatafile1 and options.sigdatafile2: + output = bb.siggen.compare_sigfiles(options.sigdatafile1, options.sigdatafile2) + elif options.sigdatafile1: + output = bb.siggen.dump_sigfile(options.sigdatafile1) + except IOError as e: + logger.error(str(e)) + sys.exit(1) + except (pickle.UnpicklingError, EOFError): + logger.error('Invalid signature data - ensure you are specifying sigdata/siginfo files') + sys.exit(1) - if output: - print('\n'.join(output)) + if output: + print('\n'.join(output)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:42 +0000 Subject: [oe-commits] [openembedded-core] 02/39: base-files: profile: Do not assume that the tty command exists In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.2626D2334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9514fb17b777a2a1c7a89694c05d01279d128766 Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:26 2017 +0200 base-files: profile: Do not assume that the tty command exists This avoids the following error when logging in to a host that does not have the tty command: -sh: tty: not found Reported-by: Cristian Ionescu-Idbohrn Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 6 +++--- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 22dfb4f..ceaf15f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -22,12 +22,12 @@ if [ -d /etc/profile.d ]; then unset i fi -if [ -x /usr/bin/resize ] && termpath="`tty`"; then +if command -v resize >/dev/null && command -v tty >/dev/null; then # Make sure we are on a serial console (i.e. the device used starts with # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which # tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null + case $(tty) in + /dev/tty[A-z]*) resize >/dev/null;; esac fi diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index f56969c..ca7bf06 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -128,10 +128,6 @@ do_install () { install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd - if [ "/usr/bin" != "${bindir}" ]; then - sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile - fi - ln -sf /proc/mounts ${D}${sysconfdir}/mtab } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:41 +0000 Subject: [oe-commits] [openembedded-core] 01/39: base-files: profile: Whitespace clean up In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.1E9702334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 40c49337acaa8310333a4424eba74fc8ed08dbde Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:25 2017 +0200 base-files: profile: Whitespace clean up Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index c616616..22dfb4f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -6,28 +6,29 @@ EDITOR="vi" # needed for packages like cron, git-commit test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. if [ "$HOME" = "ROOTHOME" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin fi if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + # works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' fi if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh ; do - if [ -f $i -a -r $i ]; then - . $i - fi - done - unset i + for i in /etc/profile.d/*.sh; do + if [ -f $i -a -r $i ]; then + . $i + fi + done + unset i fi if [ -x /usr/bin/resize ] && termpath="`tty`"; then - # Make sure we are on a serial console (i.e. the device used starts with /dev/tty), - # otherwise we confuse e.g. the eclipse launcher which tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null - esac + # Make sure we are on a serial console (i.e. the device used starts with + # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which + # tries do use ssh + case "$termpath" in + /dev/tty[A-z]*) resize >/dev/null + esac fi export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:43 +0000 Subject: [oe-commits] [openembedded-core] 03/39: sanity: Require bitbake 1.33.4 In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.2D70E2334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e7993628cd600c669add9385eff0150992478fd Author: Richard Purdie AuthorDate: Thu Apr 6 12:22:33 2017 +0100 sanity: Require bitbake 1.33.4 We need the bitbake bug in recrdeptask handling of missing tasks fixed in order to apply a fix for OE-Core. Signed-off-by: Richard Purdie --- meta/conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index 616f11c..46bdbeb 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.33.3" +BB_MIN_VERSION = "1.33.4" SANITY_ABIFILE = "${TMPDIR}/abi_version" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:40 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (0bf66bc -> 145b2d4) Message-ID: <149158360094.19080.9923306818619776851@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 0bf66bc cross-canadian.bbclass: override TARGET_* flags discard c612bcd nativesdk.bbclass: override TARGET_* flags discard 9b77ddc crosssdk.bbclass: override TARGET_* flags discard d31fb8a cross.bbclass: override TARGET_* flags discard 056a16a lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate discard d8fa636 lib/oe/sstatesig: fix finding native siginfo files in sstate-cache discard c5ca7eb qemu: use python2.7 instead of python2 discard abba9f5 selftest/recipetool: skip create_git in case x11 feature is not present discard ca3024a qemux86*.conf: changed dependency task for syslinux discard 736e901 gcc-6.3: backport fix of check for empty string in ubsan.c discard 50d6e20 elfutils: fix building elfutils-native with GCC7 discard 8854c5c sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks discard 1666b8b license.bbclass: improve reproducibility discard 8c3e6bd selftest/wic: skip wic unit tests in case NLS is disable discard 25ff02b python3: fix run-time deps for core python3 libraries discard 39ade16 eudev: set LGPL-2.1+ for libudev package discard e266ec8 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash discard 3c448ed autogen-native: fix POSIX_SHELL and perl discard 80825a1 guile: do_configure: fix "Argument list too long" discard 6cbec3d m4: do_configure: fix "Argument list too long" discard 963875c valgrind: set ac_cv_path_PERL to /usr/bin/env perl discard 57a35fe mc: replace "perl -w" with "use warnings" discard afc467f groff: replace "perl -w" with "use warnings" discard 8bf71bf glibc/gcc/libgcc-initial: Delete do_build tasks for -initial discard dcb6948 sanity: Require bitbake 1.33.4 discard 7defd6b logrotate: replace fedorahosted.org SRC_URI with github.com source discard b5fc80d base-files: profile: Do not assume that the tty command exists discard f794b7d base-files: profile: Whitespace clean up discard f5cd94b python-pycurl: create python3-pycurl recipe new 40c4933 base-files: profile: Whitespace clean up new 9514fb1 base-files: profile: Do not assume that the tty command exists new 6e79936 sanity: Require bitbake 1.33.4 new f8066e7 glibc/gcc/libgcc-initial: Delete do_build tasks for -initial new c44854a groff: replace "perl -w" with "use warnings" new ac8cc90 mc: replace "perl -w" with "use warnings" new cae4235 valgrind: set ac_cv_path_PERL to /usr/bin/env perl new 757a924 m4: do_configure: fix "Argument list too long" new 8f950b9 guile: do_configure: fix "Argument list too long" new 791b9dc autogen-native: fix POSIX_SHELL and perl new 108d2b6 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash new de7ba6f eudev: set LGPL-2.1+ for libudev package new ee5a94e python3: fix run-time deps for core python3 libraries new eb5c420 selftest/wic: skip wic unit tests in case NLS is disable new 114bb98 license.bbclass: improve reproducibility new e0a30ca sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks new 5b86b3a elfutils: fix building elfutils-native with GCC7 new b812141 gcc-6.3: backport fix of check for empty string in ubsan.c new fec5837 qemux86*.conf: changed dependency task for syslinux new 2f078fb selftest/recipetool: skip create_git in case x11 feature is not present new 891bdd3 qemu: use python2.7 instead of python2 new e6e634c lib/oe/sstatesig: fix finding native siginfo files in sstate-cache new d37488b lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate new 4ebf517 cross.bbclass: override TARGET_* flags new 629997b crosssdk.bbclass: override TARGET_* flags new d02654e nativesdk.bbclass: override TARGET_* flags new c2e8d8f cross-canadian.bbclass: override TARGET_* flags new cdc6c15 mkfontdir: Remove x11 requirement new 7a9e09e mkfontscale: Remove x11 requirement new a9e98d0 xorg-font-common.inc: Remove x11 requirement new be2d8a8 native.bbclass: Use fixed DISTRO_FEATURES new f022276 selftest/sstatetests: Replace glibc-initial with linux-libc-headers new 322855a no-static-libs: Add entry for ncurses new 5117d95 ncurses: Drop incorrect option new c9e8666 uninative-flags.inc: Build binutils-native as pie new 998e2d0 build-perf-test-wrapper.sh: support extra args for email script new 90c9182 oe-build-perf-report-email.py: use proper fallback email address new 61ab19f scripts/oe-build-perf-report: improve guessing of args new 145b2d4 python-pycurl: create python3-pycurl recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0bf66bc) \ N -- N -- N refs/heads/master-next (145b2d4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 39 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/native.bbclass | 12 ++++++++---- meta/conf/bitbake.conf | 2 ++ meta/conf/distro/include/no-static-libs.inc | 4 ++++ meta/conf/distro/include/security_flags.inc | 1 + meta/conf/distro/include/uninative-flags.inc | 8 ++++++++ meta/lib/oeqa/selftest/sstatetests.py | 20 +++++--------------- meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 19 ++++--------------- meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 4 ++++ meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb | 3 +++ meta/recipes-graphics/xorg-font/xorg-font-common.inc | 3 --- scripts/contrib/build-perf-test-wrapper.sh | 2 +- scripts/contrib/oe-build-perf-report-email.py | 4 +++- scripts/oe-build-perf-report | 2 +- 14 files changed, 44 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:44 +0000 Subject: [oe-commits] [openembedded-core] 04/39: glibc/gcc/libgcc-initial: Delete do_build tasks for -initial In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.3409A2334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f8066e7d65169873243dd316ffe9f5f5cf96b0dd Author: Richard Purdie AuthorDate: Wed Apr 5 17:27:20 2017 +0100 glibc/gcc/libgcc-initial: Delete do_build tasks for -initial We've had a lot of users running into RSS issues where -initial recipes were being installed into sysroots alongside their counterparts and causing overlapping files issues. In general this was through do_build dependencies. Such dependencies are bad in general and I'd encourage people to compare the taskgraphs with using a more specific dependency like do_populate_sysroot, do_image_complete or do_deploy as often the more specific dependency will result in a much cleaner build. Regardless, we don't want -initial dependencies getting in the way like this and there are cases a do_build dependency could make sense. Deleting the do_build task in these cases makes sense since this is not a build "endpoint" we'd ever want a user to use, its a behind the scenes piece of bootstrappping. Unfortunately to make this work, we need a newer bitbake version which has a bitbake bug fixed. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-initial.inc | 3 +++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 4 ++++ meta/recipes-devtools/gcc/libgcc-initial.inc | 3 +++ 3 files changed, 10 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc index f94603c..b86e2fb 100644 --- a/meta/recipes-core/glibc/glibc-initial.inc +++ b/meta/recipes-core/glibc/glibc-initial.inc @@ -52,3 +52,6 @@ do_siteconfig () { } inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 5c0208a..d440d88 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -82,3 +82,7 @@ do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_AR inherit nopackages COMPILERINITIAL = "-initial" + + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc index 5b4bc3b..950ad86 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial.inc +++ b/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -15,3 +15,6 @@ EXTRA_OECONF += "--disable-shared" COMPILERINITIAL = "-initial" inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:49 +0000 Subject: [oe-commits] [openembedded-core] 09/39: guile: do_configure: fix "Argument list too long" In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.5B8A82334B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8f950b94ffb9ada6a1a5e7144ba79231b36b4732 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:54 2017 -0700 guile: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/guile/guile_2.0.14.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/guile/guile_2.0.14.bb b/meta/recipes-devtools/guile/guile_2.0.14.bb index d2306e6..7a36ba0 100644 --- a/meta/recipes-devtools/guile/guile_2.0.14.bb +++ b/meta/recipes-devtools/guile/guile_2.0.14.bb @@ -30,6 +30,9 @@ SRC_URI[sha256sum] = "e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8 inherit autotools gettext pkgconfig texinfo BBCLASSEXTEND = "native" +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline" # add guile-native only to the target recipe's DEPENDS DEPENDS_append_class-target = " guile-native libatomic-ops" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:48 +0000 Subject: [oe-commits] [openembedded-core] 08/39: m4: do_configure: fix "Argument list too long" In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.530402334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 757a924ece01e1185068ca4938114dd8e0e771cf Author: Robert Yang AuthorDate: Thu Apr 6 03:05:53 2017 -0700 m4: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/m4/m4-1.4.18.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc index 5652b74..d7c8648 100644 --- a/meta/recipes-devtools/m4/m4-1.4.18.inc +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc @@ -15,5 +15,8 @@ SRC_URI_append_class-target = "\ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28" SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:47 +0000 Subject: [oe-commits] [openembedded-core] 07/39: valgrind: set ac_cv_path_PERL to /usr/bin/env perl In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.4B28C2334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cae4235337735b13d0dff594f611690c843a115e Author: Robert Yang AuthorDate: Thu Apr 6 03:05:52 2017 -0700 valgrind: set ac_cv_path_PERL to /usr/bin/env perl The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. Set ac_cv_path_PERL to "/usr/bin/env perl" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index a4a3e72..62a9635 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -56,6 +56,8 @@ EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" EXTRA_OEMAKE = "-w" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + # valgrind likes to control its own optimisation flags. It generally defaults # to -O2 but uses -O0 for some specific test apps etc. Passing our own flags # (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:52 +0000 Subject: [oe-commits] [openembedded-core] 12/39: eudev: set LGPL-2.1+ for libudev package In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.700F22334B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit de7ba6fe59feb4f2e93e75d4ee4913f9842dcd5c Author: Martin Jansa AuthorDate: Thu Apr 6 13:02:27 2017 +0200 eudev: set LGPL-2.1+ for libudev package Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/udev/eudev_3.2.1.bb b/meta/recipes-core/udev/eudev_3.2.1.bb index 4a1a26a..bdfb544 100644 --- a/meta/recipes-core/udev/eudev_3.2.1.bb +++ b/meta/recipes-core/udev/eudev_3.2.1.bb @@ -1,6 +1,7 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" -LICENSE = "GPLv2.0+" +LICENSE = "GPLv2.0+ & LGPL-2.1+" +LICENSE_libudev = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:51 +0000 Subject: [oe-commits] [openembedded-core] 11/39: kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.697C62334B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 108d2b652333d06926b4e2c2828b770bec2e7e1e Author: Robert Yang AuthorDate: Thu Apr 6 03:05:56 2017 -0700 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/bash is longer than 128: /bin/sh: ./doltcompile: [snip]: bad interpreter: No such file or directory Set ac_cv_path_DOLT_BASH to "/usr/bin/env bash" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-kernel/kmod/kmod.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index cfa409d..ba80fc5 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -30,6 +30,8 @@ S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" EXTRA_OECONF +=" --enable-tools --with-zlib" +CACHED_CONFIGUREVARS += "ac_cv_path_DOLT_BASH='/usr/bin/env bash'" + PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:46 +0000 Subject: [oe-commits] [openembedded-core] 06/39: mc: replace "perl -w" with "use warnings" In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.42DDB2334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ac8cc90ed0bad07c8602c5e430463b189449deef Author: Robert Yang AuthorDate: Thu Apr 6 03:05:51 2017 -0700 mc: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-mc-replace-perl-w-with-use-warnings.patch | 129 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.18.bb | 3 + 2 files changed, 132 insertions(+) diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..bf8037c --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,129 @@ +From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 02:24:28 -0700 +Subject: [PATCH] mc: replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +The man2hlp.in already has "use warnings;", so just remove '-w' is OK. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + src/man2hlp/man2hlp.in | 2 +- + src/vfs/extfs/helpers/a+.in | 4 +++- + src/vfs/extfs/helpers/mailfs.in | 3 ++- + src/vfs/extfs/helpers/patchfs.in | 3 ++- + src/vfs/extfs/helpers/ulib.in | 4 +++- + src/vfs/extfs/helpers/uzip.in | 3 ++- + 6 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in +index f095830..558a674 100644 +--- a/src/man2hlp/man2hlp.in ++++ b/src/man2hlp/man2hlp.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Man page to help file converter + # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in +index 579441c..fe446f4 100644 +--- a/src/vfs/extfs/helpers/a+.in ++++ b/src/vfs/extfs/helpers/a+.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # External filesystem for mc, using mtools + # Written Ludek Brukner , 1997 +@@ -9,6 +9,8 @@ + + # These mtools components must be in PATH for this to work + ++use warnings; ++ + sub quote { + $_ = shift(@_); + s/([^\w\/.+-])/\\$1/g; +diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in +index e9455be..059f41f 100644 +--- a/src/vfs/extfs/helpers/mailfs.in ++++ b/src/vfs/extfs/helpers/mailfs.in +@@ -1,6 +1,7 @@ +-#! @PERL@ -w ++#! @PERL@ + + use bytes; ++use warnings; + + # MC extfs for (possibly compressed) Berkeley style mailbox files + # Peter Daum (Jan 1998, mc-4.1.24) +diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in +index ef407de..3ad4b53 100644 +--- a/src/vfs/extfs/helpers/patchfs.in ++++ b/src/vfs/extfs/helpers/patchfs.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Written by Adam Byrtek , 2002 + # Rewritten by David Sterba , 2009 +@@ -9,6 +9,7 @@ + + use bytes; + use strict; ++use warnings; + use POSIX; + use File::Temp 'tempfile'; + +diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in +index 418611f..82c7ccf 100644 +--- a/src/vfs/extfs/helpers/ulib.in ++++ b/src/vfs/extfs/helpers/ulib.in +@@ -1,9 +1,11 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # VFS to manage the gputils archives. + # Written by Moln?r K?roly (proton7 at freemail.hu) 2012 + # + ++use warnings; ++ + my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03', + 'apr' => '04', 'may' => '05', 'jun' => '06', + 'jul' => '07', 'aug' => '08', 'sep' => '09', +diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in +index b1c4f90..c8eb335 100644 +--- a/src/vfs/extfs/helpers/uzip.in ++++ b/src/vfs/extfs/helpers/uzip.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # zip file archive Virtual File System for Midnight Commander + # Version 1.4.0 (2001-08-07). +@@ -9,6 +9,7 @@ + use POSIX; + use File::Basename; + use strict; ++use warnings; + + # + # Configuration options +-- +2.10.2 + diff --git a/meta/recipes-extended/mc/mc_4.8.18.bb b/meta/recipes-extended/mc/mc_4.8.18.bb index 78abb27..17f3f73 100644 --- a/meta/recipes-extended/mc/mc_4.8.18.bb +++ b/meta/recipes-extended/mc/mc_4.8.18.bb @@ -7,6 +7,7 @@ DEPENDS = "ncurses glib-2.0 util-linux" RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-mc-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc56f0c9abd63c4caa3636bba3a08bfb" SRC_URI[sha256sum] = "5b591e10dcbea95233434da40cdad4663d360229adf89826576c319667c103cb" @@ -22,6 +23,8 @@ PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:54 +0000 Subject: [oe-commits] [openembedded-core] 14/39: selftest/wic: skip wic unit tests in case NLS is disable In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.7EDC12334BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eb5c4205b843f3be99125dad1d0ab27754052724 Author: Leonardo Sandoval AuthorDate: Wed Apr 5 15:34:26 2017 -0700 selftest/wic: skip wic unit tests in case NLS is disable WIC test case requires wic-tools which in turn depends on intltool-native and gettext-native. However, if NLS is disable, the gettext-minimal-native is used instead of gettext-native causing a failure on intltool-native as seen below: checking for msgfmt... no checking for gmsgfmt... no configure: error: GNU gettext tools not found; required for intltool ERROR: Function failed: do_configure (log file is located at /home/lsandov1/poky/build/tmp/work/i586-poky-linux-musl/systemd-boot/232-r0/temp/log.do_configure.7518) ERROR: Task (/home/lsandov1/poky/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb:do_configure) failed with exit code '1' NOTE: Tasks Summary: Attempted 609 tasks of which 604 didn't need to be rerun and 1 failed. [YOCTO #10902] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index df5e060..8030c35 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -77,7 +77,10 @@ class Wic(oeSelfTest): # clean up which can result in the native tools built earlier in # setUpClass being unavailable. if not Wic.image_is_ready: - bitbake('wic-tools') + if get_bb_var('USE_NLS') == 'yes': + bitbake('wic-tools') + else: + self.skipTest('wic-tools cannot be built due its (intltool|gettext)-native dependency and NLS disable') bitbake('core-image-minimal') Wic.image_is_ready = True -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:50 +0000 Subject: [oe-commits] [openembedded-core] 10/39: autogen-native: fix POSIX_SHELL and perl In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.62AB82334B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 791b9dcf5c342c78b6b74fe6231dd7bc0ef600ae Author: Robert Yang AuthorDate: Thu Apr 6 03:05:55 2017 -0700 autogen-native: fix POSIX_SHELL and perl The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. This patch fixes the problem when POSIX_SHELL and perl are used as the interpreters. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.18.12.bb | 3 ++ ...2-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb index 0004389..853477c 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ file://fix-script-err-when-processing-libguile.patch \ file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ + file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \ " SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" @@ -30,6 +31,8 @@ inherit autotools texinfo native pkgconfig export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" +export POSIX_SHELL = "/usr/bin/env sh" + do_install_append () { create_wrapper ${D}/${bindir}/autogen \ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ diff --git a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch new file mode 100644 index 0000000..d5fe143 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch @@ -0,0 +1,32 @@ +From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Mon, 13 Mar 2017 20:33:30 -0700 +Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path + +Use "which perl" as shebang doesn't work when it is longer than +BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to +instead of. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 093e808..8dfc6dd 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -98,7 +98,7 @@ fix_scripts() { + st=`sed 1q $f` + + case "$st" in +- *perl ) echo '#!' `which perl` ++ *perl ) echo '#!/usr/bin/env perl' + sed 1d $f + ;; + +-- +2.10.2 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:45 +0000 Subject: [oe-commits] [openembedded-core] 05/39: groff: replace "perl -w" with "use warnings" In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.3B5802334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c44854a9270cf4cab6a64a496c0fed2205dffbf9 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:50 2017 -0700 groff: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-replace-perl-w-with-use-warnings.patch | 102 +++++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 3 + 2 files changed, 105 insertions(+) diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..f1db5b0 --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,102 @@ +From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 01:46:00 -0700 +Subject: [PATCH] replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + font/devpdf/util/BuildFoundries.pl | 3 ++- + src/devices/gropdf/gropdf.pl | 3 ++- + src/devices/gropdf/pdfmom.pl | 3 ++- + src/utils/afmtodit/afmtodit.pl | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl +index 39f2f0d..a2bfd8e 100644 +--- a/font/devpdf/util/BuildFoundries.pl ++++ b/font/devpdf/util/BuildFoundries.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/perl + # + # BuildFoundries : Given a Foundry file generate groff and download files + # Deri James : Monday 07 Feb 2011 +@@ -22,6 +22,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + my $where=shift||''; + my $devps=shift||'../devps'; +diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl +index 035d123..b933b32 100644 +--- a/src/devices/gropdf/gropdf.pl ++++ b/src/devices/gropdf/gropdf.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # gropdf : PDF post processor for groff + # +@@ -21,6 +21,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use Getopt::Long qw(:config bundling); + use Compress::Zlib; + +diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl +index beec820..4b46ea4 100644 +--- a/src/devices/gropdf/pdfmom.pl ++++ b/src/devices/gropdf/pdfmom.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # pdfmom : Frontend to run groff -mom to produce PDFs + # Deri James : Friday 16 Mar 2012 +@@ -24,6 +24,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use File::Temp qw/tempfile/; + my @cmd; + my $dev='pdf'; +diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl +index 4f2ce83..5c078ff 100644 +--- a/src/utils/afmtodit/afmtodit.pl ++++ b/src/utils/afmtodit/afmtodit.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#! /usr/bin/perl + # -*- Perl -*- + # Copyright (C) 1989-2014 Free Software Foundation, Inc. + # Written by James Clark (jjc at jclark.com) +@@ -19,6 +19,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + @afmtodit.tables@ + +-- +2.10.2 + diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index dd241f3..7472f59 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0001-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" @@ -24,6 +25,8 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_configure_prepend() { if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then sed -i \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:53 +0000 Subject: [oe-commits] [openembedded-core] 13/39: python3: fix run-time deps for core python3 libraries In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.77B232334BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ee5a94e06b3ee5a430fcfd127c1198e7f34edebb Author: Dmitry Rozhkov AuthorDate: Thu Apr 6 08:07:44 2017 +0300 python3: fix run-time deps for core python3 libraries The http.server module from python3-netclient imports the html module which is in python3-html. Also xmlrpc.server imports pydoc which is a part of python3-pydoc. But those run-time dependencies are missing from python3-netclient and python3-xmlrpc respectively. Add the missing run-time dependencies. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-3.5-manifest.inc | 4 ++-- scripts/contrib/python/generate-manifest-3.5.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 55bcc4b..ec30eb9 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc @@ -153,7 +153,7 @@ RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN FILES_${PN}-multiprocessing="${libdir}/python3.5/lib-dynload/_multiprocessing.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_multiprocessing.*.so ${libdir}/python3.5/multiprocessing ${libdir}/python3.5/multiprocessing/__pycache__ " SUMMARY_${PN}-netclient="Python Internet Protocol clients" -RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" +RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html" FILES_${PN}-netclient="${libdir}/python3.5/*Cookie*.* ${libdir}/python3.5/__pycache__/*Cookie*.* ${libdir}/python3.5/base64.* ${libdir}/python3.5/__pycache__/base64.* ${libdir}/python3.5/cookielib.* ${libdir}/python3.5/__pycache__/cookielib.* ${libdir}/python3.5/ftplib.* ${libdir}/python3.5/__pycache__/ftplib.* ${libdir}/python3.5/gopherlib.* ${libdir}/python3.5/__pycache__/gopherlib.* ${libdir}/python3.5/hmac.* ${libdir}/python3.5/__pycache__/hmac.* ${libdir}/python3.5/http* ${libdir}/p [...] SUMMARY_${PN}-netserver="Python Internet Protocol servers" @@ -273,7 +273,7 @@ RDEPENDS_${PN}-xml="${PN}-core ${PN}-re" FILES_${PN}-xml="${libdir}/python3.5/lib-dynload/_elementtree.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_elementtree.*.so ${libdir}/python3.5/lib-dynload/pyexpat.*.so ${libdir}/python3.5/lib-dynload/__pycache__/pyexpat.*.so ${libdir}/python3.5/xml ${libdir}/python3.5/xml/__pycache__ ${libdir}/python3.5/xmllib.* ${libdir}/python3.5/__pycache__/xmllib.* " SUMMARY_${PN}-xmlrpc="Python XML-RPC support" -RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" +RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc" FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ " SUMMARY_${PN}-modules="All Python modules" diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 386bdfc..5835de8 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py @@ -340,7 +340,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-multiprocessing", "Python multiprocessing support", "${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap", "lib-dynload/_multiprocessing.*.so multiprocessing" ) # package - m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime", + m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html", "*Cookie*.* " + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* http* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib uuid.* rfc822.* mimetools.*" ) @@ -422,7 +422,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re", "lib-dynload/_elementtree.*.so lib-dynload/pyexpat.*.so xml xmllib.*" ) # package - m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang", + m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc", "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.* xmlrpc" ) m.addPackage( "${PN}-mailbox", "Python mailbox format support", "${PN}-core ${PN}-mime", -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:55 +0000 Subject: [oe-commits] [openembedded-core] 15/39: license.bbclass: improve reproducibility In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.85D0F2334BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 114bb9802d5967619bfe5c15e88fdc85752432ba Author: Juro Bystricky AuthorDate: Wed Apr 5 14:51:31 2017 -0700 license.bbclass: improve reproducibility Two identical builds can end up having deploy/licenses folders that differ. This is observed in cases where there are several different license files of the same name in different folders, i.e. "COPYING". In those case we have to differentiate the files somehow and we do it via file expensions such as COPYING.0, COPYING.1. However, which file will get which extension is presently random. This means, for example, that COPYING.0 in one build is the same as COPYING.1 in the other (and vice versa). Although there is mothing wrong with this, for the sake of binary reproducibility it is preferable to have a deterministic outcome. Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 81458e7..d4be478 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -505,7 +505,7 @@ def find_license_files(d): bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF'))) # Add files from LIC_FILES_CHKSUM to list of license files lic_chksum_paths = defaultdict(OrderedDict) - for path, data in lic_chksums.items(): + for path, data in sorted(lic_chksums.items()): lic_chksum_paths[os.path.basename(path)][data] = (os.path.join(srcdir, path), data[1], data[2]) for basename, files in lic_chksum_paths.items(): if len(files) == 1: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:58 +0000 Subject: [oe-commits] [openembedded-core] 18/39: gcc-6.3: backport fix of check for empty string in ubsan.c In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.9B5D72334C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b81214128e8659cdb06ad21d5ae174b103f32007 Author: Joshua Lock AuthorDate: Thu Apr 6 14:23:14 2017 +0100 gcc-6.3: backport fix of check for empty string in ubsan.c Building gcc-cross-initial with GCC7 on the host fails due to the comparison of a pointer to an integer in ubsan_use_new_style_p, which is forbidden by ISO C++: ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] || xloc.file == '\0' || xloc.file[0] == '\xff' Backport the fix from upstream GCC to enable the build with GCC 7 Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-6.3.inc | 1 + .../gcc/gcc-6.3/ubsan-fix-check-empty-string.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-6.3.inc b/meta/recipes-devtools/gcc/gcc-6.3.inc index da7a083..71d0aff 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3.inc +++ b/meta/recipes-devtools/gcc/gcc-6.3.inc @@ -84,6 +84,7 @@ SRC_URI = "\ " BACKPORTS = "\ file://CVE-2016-6131.patch \ + file://ubsan-fix-check-empty-string.patch \ " SRC_URI[md5sum] = "677a7623c7ef6ab99881bc4e048debb6" SRC_URI[sha256sum] = "f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f" diff --git a/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch new file mode 100644 index 0000000..c012719 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch @@ -0,0 +1,28 @@ +From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 +From: kyukhin +Date: Sat, 3 Sep 2016 10:57:05 +0000 +Subject: [PATCH] gcc/ * ubsan.c (ubsan_use_new_style_p): Fix check for empty + string. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk at 239971 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Signed-off-by: Joshua Lock + +--- + gcc/ubsan.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: gcc-6.3.0/gcc/ubsan.c +=================================================================== +--- gcc-6.3.0.orig/gcc/ubsan.c ++++ gcc-6.3.0/gcc/ubsan.c +@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) + + expanded_location xloc = expand_location (loc); + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 +- || xloc.file == '\0' || xloc.file[0] == '\xff' ++ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' + || xloc.file[1] == '\xff') + return false; + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:56 +0000 Subject: [oe-commits] [openembedded-core] 16/39: sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.8CDE92334C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e0a30caacdf4667bce48ccc7d9cdb2cf47bfd46e Author: Richard Purdie AuthorDate: Wed Apr 5 15:37:12 2017 +0100 sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks We never need these tasks as dependencies of other sstate tasks since they're only ever needed to build artefacts so we can always skip them and save some time/space. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index af58854..bc0ec54 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -915,6 +915,10 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): if taskdependees[task][1] == "do_populate_lic": return True + # stash_locale and gcc_stash_builddir are never needed as a dependency for built objects + if taskdependees[task][1] == "do_stash_locale" or taskdependees[task][1] == "do_gcc_stash_builddir": + return True + # We only need to trigger packagedata through direct dependencies # but need to preserve packagedata on packagedata links if taskdependees[task][1] == "do_packagedata": -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:59 +0000 Subject: [oe-commits] [openembedded-core] 19/39: qemux86*.conf: changed dependency task for syslinux In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.A30A32334C5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fec583777a32fcacc1f42ca2bec56d07a25a9afd Author: Ed Bartosh AuthorDate: Thu Apr 6 17:48:17 2017 +0300 qemux86*.conf: changed dependency task for syslinux Changed dependency task for syslinux from do_build to do_populate_sysroot as do_build dependency caused conflicts in populating image recipe sysroot using conflicting recipes. This makes do_image_wic task to fail with FileExistsError trying to copy the same file from two conflicting recipes. This should also speed up image creation a bit as do_populate_sysroot task is faster than do_build. [YOCTO #11295] Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 150d745..10189cb 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -30,4 +30,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1b478e9..c26dda2 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -29,4 +29,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:00 +0000 Subject: [oe-commits] [openembedded-core] 20/39: selftest/recipetool: skip create_git in case x11 feature is not present In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.AA8772334C6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2f078fb331dc6d0f9244beed7d0bf003844c1873 Author: Leonardo Sandoval AuthorDate: Thu Apr 6 09:41:51 2017 -0700 selftest/recipetool: skip create_git in case x11 feature is not present The unit test requires x11 as distro feature, otherwise it will fail while building the test requirements. [YOCTO #10903] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/recipetool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index d47b9dd..7bfb02f 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py @@ -382,6 +382,8 @@ class RecipetoolTests(RecipetoolBase): @testcase(1194) def test_recipetool_create_git(self): + if 'x11' not in get_bb_var('DISTRO_FEATURES'): + self.skipTest('Test requires x11 as distro feature') # Ensure we have the right data in shlibs/pkgdata bitbake('libpng pango libx11 libxext jpeg libcheck') # Try adding a recipe -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:01 +0000 Subject: [oe-commits] [openembedded-core] 21/39: qemu: use python2.7 instead of python2 In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.B0D5C2334C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 891bdd36fe18dc26e48a6b7e30571c87443f5600 Author: Martin Kelly AuthorDate: Thu Apr 6 12:48:39 2017 -0700 qemu: use python2.7 instead of python2 meta/conf/bitbake.conf puts python2.7 into the HOSTTOOLS variable but not python2, so only python2.7 is guaranteed. In addition, on some distros -- such as Amazon Linux -- /usr/bin/python2 doesn't exist but python2.7 does. So, use python2.7 for the --python= argument in the qemu configure step. Signed-off-by: Martin Kelly Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 383cc64..0e1411a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ --with-system-pixman \ --extra-cflags='${CFLAGS}' \ " -EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2" +EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2.7" EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:04 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:04 +0000 Subject: [oe-commits] [openembedded-core] 24/39: cross.bbclass: override TARGET_* flags In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.C44682334CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4ebf51764fb812b2104ba72b745dfee19666da5b Author: Ming Liu AuthorDate: Thu Apr 6 14:09:41 2017 +0200 cross.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a cross recipe even they are not in use at all. This can lead a lot of churn when the cross sysroot are shared by machines while they have defined different TARGET_* flags. And sometimes it even causes "Taskhash mismatch" errors. Fix it by overriding with BUILD_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/cross.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 2602153..8757303 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -28,6 +28,11 @@ MULTIMACH_TARGET_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" export PKG_CONFIG_DIR = "${exec_prefix}/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "" +TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" +TARGET_CFLAGS = "${BUILD_CFLAGS}" +TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILD_LDFLAGS}" + CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:07 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:07 +0000 Subject: [oe-commits] [openembedded-core] 27/39: cross-canadian.bbclass: override TARGET_* flags In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.DB7DC2334D0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c2e8d8ff9a46f2d4382ab57340a39363f185fe58 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:44 2017 +0200 cross-canadian.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a cross-canadian recipe even they are not in use at all. This can lead a lot of churn when the cross-canadian sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILDSDK_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 3120f46..49388d4 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -115,6 +115,11 @@ HOST_CC_ARCH = "${SDK_CC_ARCH}" HOST_LD_ARCH = "${SDK_LD_ARCH}" HOST_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +TARGET_CFLAGS = "${BUILDSDK_CFLAGS}" +TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" + #assign DPKG_ARCH DPKG_ARCH = "${@debian_arch_map(d.getVar('SDK_ARCH'), '')}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:10 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:10 +0000 Subject: [oe-commits] [openembedded-core] 30/39: xorg-font-common.inc: Remove x11 requirement In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.F04492334D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a9e98d01da66c119e6c87d73406f0165d4c79bc6 Author: Jussi Kukkonen AuthorDate: Fri Apr 7 09:09:35 2017 +0300 xorg-font-common.inc: Remove x11 requirement Remove the fake news about mkfontscale-native needing x11. Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-font/xorg-font-common.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index cdbebcf..82a8487 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -16,9 +16,6 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig distro_features_check -# The mkfontscale-native requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" do_install_append() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:15 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:15 +0000 Subject: [oe-commits] [openembedded-core] 35/39: uninative-flags.inc: Build binutils-native as pie In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.21FF82334DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c9e8666fc0983c208c59aa619db8018696ecc92b Author: Richard Purdie AuthorDate: Fri Apr 7 17:39:43 2017 +0100 uninative-flags.inc: Build binutils-native as pie Some distros (ubuntu 16.10, debian-testing) default to gcc configured with --enable-default-pie (see gcc -v). This breaks e.g. prelink-native on a pie default system if binutils-native was built on a system which is not pie default We therefore enable pie unconditionally for native recipes where static libs are used such as libiberty from binutils, for now, until our minimum distro set is all default pie. Signed-off-by: Richard Purdie --- meta/conf/distro/include/uninative-flags.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/distro/include/uninative-flags.inc b/meta/conf/distro/include/uninative-flags.inc index e9f82c3..b6a944e 100644 --- a/meta/conf/distro/include/uninative-flags.inc +++ b/meta/conf/distro/include/uninative-flags.inc @@ -7,3 +7,11 @@ BUILD_CXXFLAGS_append = " -D_GLIBCXX_USE_CXX11_ABI=0" # icu configure defaults to CXX11 if no -std= option is passed in CXXFLAGS # therefore pass one BUILD_CXXFLAGS_append_pn-icu-native = " -std=c++98" + +# Some distros (ubuntu 16.10, debian-testing) default to gcc configured with +# --enable-default-pie (see gcc -v). This breaks e.g. prelink-native on a pie +# default system if binutils-native was built on a system which is not pie default +# We therefore enable pie unconditionally for native recipes where static libs are +# used such as libiberty from binutils, for now, until our minimum distro set is +# all default pie. +BUILD_CFLAGS_append_pn-binutils-native = " -pie -fpie" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:13 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:13 +0000 Subject: [oe-commits] [openembedded-core] 33/39: no-static-libs: Add entry for ncurses In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.10F7D2334DC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 322855a8951eaf3e40a56bc6fe85ccf5fdd03a2f Author: Richard Purdie AuthorDate: Fri Apr 7 15:30:01 2017 +0100 no-static-libs: Add entry for ncurses Yes, the option to disable static libraries in boost really is "--without-normal". Add this for ncurses and its variants. Signed-off-by: Richard Purdie --- meta/conf/distro/include/no-static-libs.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc index 54f34a7..f8d8c09 100644 --- a/meta/conf/distro/include/no-static-libs.inc +++ b/meta/conf/distro/include/no-static-libs.inc @@ -33,3 +33,7 @@ DISABLE_STATIC_pn-libusb1-native = "" EXTRA_OECONF_append = "${DISABLE_STATIC}" EXTRA_OECMAKE_append_pn-libical = " -DSHARED_ONLY=True" + +EXCONFIG_ARGS_append_pn-ncurses = " --without-normal" +EXCONFIG_ARGS_append_pn-ncurses-native = " --without-normal" +EXCONFIG_ARGS_append_pn-nativesdk-ncurses = " --without-normal" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:17 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:17 +0000 Subject: [oe-commits] [openembedded-core] 37/39: oe-build-perf-report-email.py: use proper fallback email address In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.2ECCB2334E2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 90c9182b003543597231cdaca9afa38980d37dd2 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:40 2017 +0300 oe-build-perf-report-email.py: use proper fallback email address Use properly formatted fallback email address instead of just the username. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/oe-build-perf-report-email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/contrib/oe-build-perf-report-email.py b/scripts/contrib/oe-build-perf-report-email.py index 81b58ab..055a7b1 100755 --- a/scripts/contrib/oe-build-perf-report-email.py +++ b/scripts/contrib/oe-build-perf-report-email.py @@ -21,6 +21,7 @@ import pwd import re import shutil import smtplib +import socket import subprocess import sys import tempfile @@ -211,7 +212,8 @@ def send_email(text_fn, html_fn, subject, recipients): raise ReportError("Neither plain text nor html body specified") full_name = pwd.getpwuid(os.getuid()).pw_gecos.split(',')[0] - email = os.environ.get('EMAIL', os.getlogin()) + email = os.environ.get('EMAIL', + '{}@{}'.format(os.getlogin(), socket.getfqdn())) msg['From'] = "{} <{}>".format(full_name, email) msg['To'] = ', '.join(recipients) msg['Subject'] = subject -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:02 +0000 Subject: [oe-commits] [openembedded-core] 22/39: lib/oe/sstatesig: fix finding native siginfo files in sstate-cache In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.B73CA2334C9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e6e634c004ddbf55d1a6b31cb5c592ab8f19d8d4 Author: Paul Eggleton AuthorDate: Fri Apr 7 10:01:43 2017 +1200 lib/oe/sstatesig: fix finding native siginfo files in sstate-cache When comparing signatures with bitbake-diffsigs -t or bitbake -S printdiff, we use this find_siginfo() function implemented in this module to find the siginfo/sigdata files corresponding to the tasks we're looking for. However, native sstate files go into a NATIVELSBSTRING subdirectory and there was no handling for this when asking about native recipes. I'm not even sure why we were walking SSTATE_DIR in order to find this - we don't need to, we just need to run glob.glob() on the filespec we calculate, which should be a little bit more efficient. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 13fd3bd..a76a031 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -318,22 +318,15 @@ def find_siginfo(pn, taskname, taskhashlist, d): sstatename = taskname[3:] filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG'), sstatename) - if hashval != '*': - sstatedir = "%s/%s" % (d.getVar('SSTATE_DIR'), hashval[:2]) - else: - sstatedir = d.getVar('SSTATE_DIR') - - for root, dirs, files in os.walk(sstatedir): - for fn in files: - fullpath = os.path.join(root, fn) - if fnmatch.fnmatch(fullpath, filespec): - if taskhashlist: - hashfiles[hashval] = fullpath - else: - try: - filedates[fullpath] = os.stat(fullpath).st_mtime - except: - continue + matchedfiles = glob.glob(filespec) + for fullpath in matchedfiles: + if taskhashlist: + hashfiles[hashval] = fullpath + else: + try: + filedates[fullpath] = os.stat(fullpath).st_mtime + except: + continue if taskhashlist: return hashfiles -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:46:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:46:57 +0000 Subject: [oe-commits] [openembedded-core] 17/39: elfutils: fix building elfutils-native with GCC7 In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.94B1A2334C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5b86b3a0c5c50ca28f1a2e2f47f6a50a309e15ca Author: Joshua Lock AuthorDate: Thu Apr 6 14:23:13 2017 +0100 elfutils: fix building elfutils-native with GCC7 Backport a fix from upstream for a -Wformat-truncation=2 warning and implement a simple fix for a -Wimplicit-fallthrough warning. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- .../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 ++++++++++++++++++++++ .../elfutils/elfutils-0.168/fallthrough.patch | 36 ++++++++++++++++++ meta/recipes-devtools/elfutils/elfutils_0.168.bb | 3 ++ 3 files changed, 83 insertions(+) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch new file mode 100644 index 0000000..d88f4eb --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch @@ -0,0 +1,44 @@ +From 93c51144c3f664d4e9709da75a1d0fa00ea0fe95 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Sun, 12 Feb 2017 21:51:34 +0100 +Subject: [PATCH] libasm: Fix one GCC7 -Wformat-truncation=2 warning. + +Make sure that if we have really lots of labels the tempsym doesn't get +truncated because it is too small to hold the whole name. + +This doesn't enable -Wformat-truncation=2 or fix other "issues" pointed +out by enabling this warning because there are currently some issues +with it. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79448 + +Signed-off-by: Mark Wielaard + +Upstream-Status: Backport (https://sourceware.org/git/?p=elfutils.git;a=commit;h=93c51144c3f664d4e9709da75a1d0fa00ea0fe95) +Signed-off-by: Joshua Lock + +--- + libasm/ChangeLog | 6 +++++- + libasm/asm_newsym.c | 6 ++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +Index: elfutils-0.168/libasm/asm_newsym.c +=================================================================== +--- elfutils-0.168.orig/libasm/asm_newsym.c ++++ elfutils-0.168/libasm/asm_newsym.c +@@ -1,5 +1,5 @@ + /* Define new symbol for current position in given section. +- Copyright (C) 2002, 2005, 2016 Red Hat, Inc. ++ Copyright (C) 2002, 2005, 2016, 2017 Red Hat, Inc. + This file is part of elfutils. + Written by Ulrich Drepper , 2002. + +@@ -44,7 +44,9 @@ AsmSym_t * + asm_newsym (AsmScn_t *asmscn, const char *name, GElf_Xword size, + int type, int binding) + { +-#define TEMPSYMLEN 10 ++/* We don't really expect labels with many digits, but in theory it could ++ be 10 digits (plus ".L" and a zero terminator). */ ++#define TEMPSYMLEN 13 + char tempsym[TEMPSYMLEN]; + AsmSym_t *result; + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch new file mode 100644 index 0000000..b2623f9 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch @@ -0,0 +1,36 @@ +GCC7 adds -Wimplicit-fallthrough to warn when a switch case falls through, +however this causes warnings (which are promoted to errors) with the elfutils +patches from Debian for mips and parisc, which use fallthrough's by design. + +Explicitly mark the intentional fallthrough switch cases with a comment to +disable the warnings where the fallthrough behaviour is desired. + +Upstream-Status: Pending [debian] +Signed-off-by: Joshua Lock + +Index: elfutils-0.168/backends/parisc_retval.c +=================================================================== +--- elfutils-0.168.orig/backends/parisc_retval.c ++++ elfutils-0.168/backends/parisc_retval.c +@@ -166,7 +166,7 @@ parisc_return_value_location_ (Dwarf_Die + return nloc_intregpair; + + /* Else fall through. */ +- } ++ } // fallthrough + + case DW_TAG_structure_type: + case DW_TAG_class_type: +Index: elfutils-0.168/backends/mips_retval.c +=================================================================== +--- elfutils-0.168.orig/backends/mips_retval.c ++++ elfutils-0.168/backends/mips_retval.c +@@ -387,7 +387,7 @@ mips_return_value_location (Dwarf_Die *f + else + return nloc_intregpair; + } +- } ++ } // fallthrough + + /* Fallthrough to handle large types */ + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb index 9557933..3b8f2a3 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://0001-remove-the-unneed-checking.patch \ file://0001-fix-a-stack-usage-warning.patch \ file://aarch64_uio.patch \ + file://Fix_one_GCC7_warning.patch \ file://shadow.patch \ " @@ -35,6 +36,8 @@ SRC_URI += "\ file://debian/hurd_path.patch \ file://debian/ignore_strmerge.diff \ " +# Fix the patches from Debian with GCC7 +SRC_URI += "file://fallthrough.patch" SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch " # The buildsystem wants to generate 2 .h files from source using a binary it just built, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:08 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:08 +0000 Subject: [oe-commits] [openembedded-core] 28/39: mkfontdir: Remove x11 requirement In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.E341F2334D2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cdc6c15cc61e099d675b4c7ef3f9295e462abaec Author: Jussi Kukkonen AuthorDate: Fri Apr 7 09:09:33 2017 +0300 mkfontdir: Remove x11 requirement Build does not need libx11, so also does not need the distro feature. Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb index a453e24..371d9a1 100644 --- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb @@ -11,6 +11,10 @@ files." PE = "1" PR = "${INC_PR}.0" +# We don't actually need x11 as xorg-app-common claims +DEPENDS = "util-macros-native" +REQUIRED_DISTRO_FEATURES = "" + RDEPENDS_${PN} += "mkfontscale" RDEPENDS_${PN}_class-native += "mkfontscale-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:16 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:16 +0000 Subject: [oe-commits] [openembedded-core] 36/39: build-perf-test-wrapper.sh: support extra args for email script In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.289432334E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 998e2d03c6afb0f82e2139424696a5831bb31853 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:39 2017 +0300 build-perf-test-wrapper.sh: support extra args for email script Make it possible to provide (extra) command line arguments to the oe-build-perf-test-email script via a new environment variable OE_BUILD_PERF_REPORT_EMAIL_EXTRA_ARGS. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/build-perf-test-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index 49bc298..3da3253 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -193,7 +193,7 @@ if [ -n "$results_repo" ]; then os_name=`get_os_release_var PRETTY_NAME` oe-build-perf-report -r "$results_repo" > report.txt oe-build-perf-report -r "$results_repo" --html > report.html - "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html + "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html "${OE_BUILD_PERF_REPORT_EMAIL_EXTRA_ARGS[@]}" fi fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:05 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:05 +0000 Subject: [oe-commits] [openembedded-core] 25/39: crosssdk.bbclass: override TARGET_* flags In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.CC4762334CD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 629997b38fd1c3441fe51083d2915996b044dc9a Author: Ming Liu AuthorDate: Thu Apr 6 14:09:42 2017 +0200 crosssdk.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a crosssdk recipe even they are not in use at all. This can lead a lot of churn when the crosssdk sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILD_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index a5ffd97..ddb98d2 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -21,8 +21,13 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" +TARGET_CFLAGS = "${BUILD_CFLAGS}" +TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILD_LDFLAGS}" TARGET_FPU = "" + target_libdir = "${SDKPATHNATIVE}${libdir_nativesdk}" target_includedir = "${SDKPATHNATIVE}${includedir_nativesdk}" target_base_libdir = "${SDKPATHNATIVE}${base_libdir_nativesdk}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:06 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:06 +0000 Subject: [oe-commits] [openembedded-core] 26/39: nativesdk.bbclass: override TARGET_* flags In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.D26B92334CF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d02654e1f5e2fafa31a7e89efaaddd1c133838b8 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:43 2017 +0200 nativesdk.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a nativesdk recipe even they are not in use at all. This can lead a lot of churn when the nativesdk sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILDSDK_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/nativesdk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index a97f5a7..ebcfb2d 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -43,6 +43,10 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +TARGET_CFLAGS = "${BUILDSDK_CFLAGS}" +TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" TARGET_FPU = "" EXTRA_OECONF_GCC_FLOAT = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:18 +0000 Subject: [oe-commits] [openembedded-core] 38/39: scripts/oe-build-perf-report: improve guessing of args In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.34A022334E4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 61ab19f79022fa8e768bd67c7d749d7f36dfc489 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:41 2017 +0300 scripts/oe-build-perf-report: improve guessing of args Search remote branches, too, when finding the latest commit. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/oe-build-perf-report | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index 6f2db49..ced5ff2 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -380,7 +380,7 @@ def auto_args(repo, args): """Guess arguments, if not defined by the user""" # Get the latest commit in the repo log.debug("Guessing arguments from the latest commit") - msg = repo.run_cmd(['log', '-1', '--branches', '--format=%b']) + msg = repo.run_cmd(['log', '-1', '--branches', '--remotes', '--format=%b']) for line in msg.splitlines(): split = line.split(':', 1) if len(split) != 2: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:03 +0000 Subject: [oe-commits] [openembedded-core] 23/39: lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.BDE4A2334CB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d37488b9d6e5a61c902a6435bce712182e593d36 Author: Paul Eggleton AuthorDate: Fri Apr 7 10:01:44 2017 +1200 lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate In find_siginfo(), which is used by bitbake-diffsigs among other things, avoid adding a siginfo file from the sstate-cache where we've already collected a sigdata file from the stamps directory with the same hash. This avoids the possibility that the top two files (as picked by default using the bitbake-diffsigs -t option) are for the same signature and thus the tool would report no differences. In order to do that, just use the hashfiles dict that we already have - we just need to change the code to populate that even if we're collecting matching files without looking for a fixed set of hashes (i.e. taskhashlist isn't set). This replaces previous code in bitbake-diffsigs that attempted to filter these out with limited success. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index a76a031..8d93013 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -254,9 +254,6 @@ def find_siginfo(pn, taskname, taskhashlist, d): import fnmatch import glob - if taskhashlist: - hashfiles = {} - if not taskname: # We have to derive pn and taskname key = pn @@ -266,8 +263,15 @@ def find_siginfo(pn, taskname, taskhashlist, d): if key.startswith('virtual:native:'): pn = pn + '-native' + hashfiles = {} filedates = {} + def get_hashval(siginfo): + if siginfo.endswith('.siginfo'): + return siginfo.rpartition(':')[2].partition('_')[0] + else: + return siginfo.rpartition('.')[2] + # First search in stamps dir localdata = d.createCopy() localdata.setVar('MULTIMACH_TARGET_SYS', '*') @@ -297,6 +301,8 @@ def find_siginfo(pn, taskname, taskhashlist, d): filedates[fullpath] = os.stat(fullpath).st_mtime except OSError: continue + hashval = get_hashval(fullpath) + hashfiles[hashval] = fullpath if not taskhashlist or (len(filedates) < 2 and not foundall): # That didn't work, look in sstate-cache @@ -320,9 +326,11 @@ def find_siginfo(pn, taskname, taskhashlist, d): matchedfiles = glob.glob(filespec) for fullpath in matchedfiles: - if taskhashlist: - hashfiles[hashval] = fullpath - else: + actual_hashval = get_hashval(fullpath) + if actual_hashval in hashfiles: + continue + hashfiles[hashval] = fullpath + if not taskhashlist: try: filedates[fullpath] = os.stat(fullpath).st_mtime except: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:14 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:14 +0000 Subject: [oe-commits] [openembedded-core] 34/39: ncurses: Drop incorrect option In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.1850C2334DE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5117d951df1d67f0076bed116b267f02d44fd0fe Author: Richard Purdie AuthorDate: Fri Apr 7 15:54:12 2017 +0100 ncurses: Drop incorrect option The --disable-static option doesn't exist in ncurses. Its equivalent is --without-normal so remove the option which does nothing. Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 3f4bf67..8990b0f 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -66,7 +66,6 @@ ncurses_configure() { cd $1 shift oe_runconf \ - --disable-static \ --without-debug \ --without-ada \ --without-gpm \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:12 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:12 +0000 Subject: [oe-commits] [openembedded-core] 32/39: selftest/sstatetests: Replace glibc-initial with linux-libc-headers In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.0A74A2334DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f0222760c04fab5d04b183bf4ca975cc90d13958 Author: Richard Purdie AuthorDate: Fri Apr 7 15:26:30 2017 +0100 selftest/sstatetests: Replace glibc-initial with linux-libc-headers The intent in these tests was to find something early in the bootstrap process to run tests against which didn't require long build times. This breaks with the removal of the glibc-initial do_build target. Replacing it with linux-libc-headers seems like a good choice and simplifies the conditionals too. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/sstatetests.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 5814815..e35ddff 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -49,15 +49,11 @@ class SStateTests(SStateBase): @testcase(976) def test_sstate_creation_distro_nonspecific_pass(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1375) def test_sstate_creation_distro_nonspecific_fail(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) + self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) # Test the sstate files deletion part of the do_cleansstate task def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True): @@ -79,23 +75,17 @@ class SStateTests(SStateBase): @testcase(977) def test_cleansstate_task_distro_specific_nonspecific(self): targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - targets.append('glibc-initial') + targets.append('linux-libc-headers') self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) @testcase(1376) def test_cleansstate_task_distro_nonspecific(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1377) def test_cleansstate_task_distro_specific(self): targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - targets.append('glibc-initial') + targets.append('linux-libc-headers') self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:19 +0000 Subject: [oe-commits] [openembedded-core] 39/39: python-pycurl: create python3-pycurl recipe In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.3ABA92334E5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 145b2d45f18b73e81daa19f9993f09a379372fee Author: Dmitry Rozhkov AuthorDate: Fri Apr 7 16:14:16 2017 +0300 python-pycurl: create python3-pycurl recipe The python-pycurl recipe can be used with python2 only even though python3 is officially supported by upstream. Create python3-pycurl recipe enabling the pycurl module for python3. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/conf/distro/include/security_flags.inc | 1 + .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 ++-- .../python/python-pycurl_7.21.5.bb | 32 +--------------------- .../python/python3-pycurl_7.21.5.bb | 5 ++++ 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 6df1842..e162abe 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -76,6 +76,7 @@ SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-pycairo = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-python3-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-pygpgme = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl.inc similarity index 92% copy from meta/recipes-devtools/python/python-pycurl_7.21.5.bb copy to meta/recipes-devtools/python/python-pycurl.inc index 7b41f6d..d26318b 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b8 file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" +DEPENDS = "curl ${PYTHON_PN}" +RDEPENDS_${PN} = "${PYTHON_PN}-core curl" SRCNAME = "pycurl" SRC_URI = "\ @@ -19,8 +19,6 @@ SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils - BBCLASSEXTEND = "native" # Ensure the docstrings are generated as make clean will remove them diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb index 7b41f6d..eb70cea 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb @@ -1,33 +1,3 @@ -SUMMARY = "Python bindings for libcurl" -HOMEPAGE = "http://pycurl.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1+ | MIT" -LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b89d4584b693d3680062fb \ - file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ - file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" - -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" -SRCNAME = "pycurl" - -SRC_URI = "\ - http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ - file://no-static-link.patch \ -" - -SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" -SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" -S = "${WORKDIR}/${SRCNAME}-${PV}" +require python-pycurl.inc inherit distutils - -BBCLASSEXTEND = "native" - -# Ensure the docstrings are generated as make clean will remove them -do_compile_prepend() { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings -} - -do_install_append() { - rm -rf ${D}${datadir}/share -} diff --git a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb new file mode 100644 index 0000000..5d11192 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycurl:" + +require python-pycurl.inc + +inherit distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:09 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:09 +0000 Subject: [oe-commits] [openembedded-core] 29/39: mkfontscale: Remove x11 requirement In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164641.E9C8F2334D4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a9e09e513f0952af3630c4614fd0c771bc56d22 Author: Jussi Kukkonen AuthorDate: Fri Apr 7 09:09:34 2017 +0300 mkfontscale: Remove x11 requirement Build does not need libx11, so also does not need the distro feature. Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb index 31cf186..066f4a7 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb @@ -10,6 +10,9 @@ is used by the mkfontdir program." DEPENDS = "util-macros-native zlib libfontenc freetype xproto" +# We don't actually need x11 as xorg-app-common claims +REQUIRED_DISTRO_FEATURES = "" + BBCLASSEXTEND = "native" LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 16:47:11 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 16:47:11 +0000 Subject: [oe-commits] [openembedded-core] 31/39: native.bbclass: Use fixed DISTRO_FEATURES In-Reply-To: <149158360094.19080.9923306818619776851@git.openembedded.org> References: <149158360094.19080.9923306818619776851@git.openembedded.org> Message-ID: <20170407164642.039E02334D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit be2d8a81bb2df7b637f484b8c0ea12f15c7b1e0c Author: Jussi Kukkonen AuthorDate: Fri Apr 7 09:09:36 2017 +0300 native.bbclass: Use fixed DISTRO_FEATURES There seems to be no advantage to letting distro features affect native builds. There is a significant disadvantage: a change to DISTRO_FEATURES will trigger a lot of unnecessary native tasks. In a test like this: $ bitbake core-image-minimal # append " systemd" to DISTRO_FEATURES $ bitbake core-image-minimal The latter build takes 44 minutes (28%) of cpu-time less with this patch (skipping 135 native tasks). Sadly wall clock time was not affected as glibc remains the bottleneck. Set DISTRO_FEATURES to a fixed value for native recipes to avoid the unnecessary tasks: currently the default value is empty. Do the variable setting in native_virtclass_handler() because otherwise it could still be overridden by appends and the feature backfilling. Shuffle the early returns so DISTRO_FEATURES gets set as long as the packagename ends with "-native". Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/classes/native.bbclass | 12 ++++++++---- meta/conf/bitbake.conf | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 1919fbc..fbca4c6 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -121,14 +121,18 @@ PATH_prepend = "${COREBASE}/scripts/native-intercept:" SSTATE_SCAN_CMD ?= "${SSTATE_SCAN_CMD_NATIVE}" python native_virtclass_handler () { - classextend = e.data.getVar('BBCLASSEXTEND') or "" - if "native" not in classextend: - return - pn = e.data.getVar("PN") if not pn.endswith("-native"): return + # Set features here to prevent appends and distro features backfill + # from modifying native distro features + d.setVar("DISTRO_FEATURES", "${NATIVE_DISTRO_FEATURES}") + + classextend = e.data.getVar('BBCLASSEXTEND') or "" + if "native" not in classextend: + return + def map_dependencies(varname, d, suffix = ""): if suffix: varname = varname + "_" + suffix diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 5e98d45..78a3470 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -789,6 +789,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" EXTRA_IMAGE_FEATURES ??= "" IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" +NATIVE_DISTRO_FEATURES ?= "" + DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data ldconfig" MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:50 +0000 Subject: [oe-commits] [openembedded-core] 03/08: ncurses: Drop incorrect option In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.940732334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5a6ce8409cbac9d2364e119fad953f578b847024 Author: Richard Purdie AuthorDate: Fri Apr 7 15:54:12 2017 +0100 ncurses: Drop incorrect option The --disable-static option doesn't exist in ncurses. Its equivalent is --without-normal so remove the option which does nothing. Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 3f4bf67..8990b0f 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -66,7 +66,6 @@ ncurses_configure() { cd $1 shift oe_runconf \ - --disable-static \ --without-debug \ --without-ada \ --without-gpm \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:49 +0000 Subject: [oe-commits] [openembedded-core] 02/08: no-static-libs: Add entry for ncurses In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.8AE7B2334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 15729b8388edf24196e3ad7998e0de4050238192 Author: Richard Purdie AuthorDate: Fri Apr 7 15:30:01 2017 +0100 no-static-libs: Add entry for ncurses Yes, the option to disable static libraries in boost really is "--without-normal". Add this for ncurses and its variants. Signed-off-by: Richard Purdie --- meta/conf/distro/include/no-static-libs.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc index 54f34a7..f8d8c09 100644 --- a/meta/conf/distro/include/no-static-libs.inc +++ b/meta/conf/distro/include/no-static-libs.inc @@ -33,3 +33,7 @@ DISABLE_STATIC_pn-libusb1-native = "" EXTRA_OECONF_append = "${DISABLE_STATIC}" EXTRA_OECMAKE_append_pn-libical = " -DSHARED_ONLY=True" + +EXCONFIG_ARGS_append_pn-ncurses = " --without-normal" +EXCONFIG_ARGS_append_pn-ncurses-native = " --without-normal" +EXCONFIG_ARGS_append_pn-nativesdk-ncurses = " --without-normal" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (145b2d4 -> 5307fee) Message-ID: <149160502738.16586.7511761529518242290@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 145b2d4 python-pycurl: create python3-pycurl recipe discard 61ab19f scripts/oe-build-perf-report: improve guessing of args discard 90c9182 oe-build-perf-report-email.py: use proper fallback email address discard 998e2d0 build-perf-test-wrapper.sh: support extra args for email script discard c9e8666 uninative-flags.inc: Build binutils-native as pie discard 5117d95 ncurses: Drop incorrect option discard 322855a no-static-libs: Add entry for ncurses discard f022276 selftest/sstatetests: Replace glibc-initial with linux-libc-headers discard be2d8a8 native.bbclass: Use fixed DISTRO_FEATURES discard a9e98d0 xorg-font-common.inc: Remove x11 requirement discard 7a9e09e mkfontscale: Remove x11 requirement discard cdc6c15 mkfontdir: Remove x11 requirement new 41d8d5e selftest/sstatetests: Replace glibc-initial with linux-libc-headers new 15729b8 no-static-libs: Add entry for ncurses new 5a6ce84 ncurses: Drop incorrect option new da9971b uninative-flags.inc: Build binutils-native as pie new 1e64bf4 build-perf-test-wrapper.sh: support extra args for email script new 35f28c3 oe-build-perf-report-email.py: use proper fallback email address new da71b65 scripts/oe-build-perf-report: improve guessing of args new 5307fee python-pycurl: create python3-pycurl recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (145b2d4) \ N -- N -- N refs/heads/master-next (5307fee) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/native.bbclass | 12 ++++-------- meta/conf/bitbake.conf | 2 -- meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 4 ---- meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb | 3 --- meta/recipes-graphics/xorg-font/xorg-font-common.inc | 3 +++ 5 files changed, 7 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:51 +0000 Subject: [oe-commits] [openembedded-core] 04/08: uninative-flags.inc: Build binutils-native as pie In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.9D9A32334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit da9971b0d41610e00b3a52efbcdbcf173d343e11 Author: Richard Purdie AuthorDate: Fri Apr 7 17:39:43 2017 +0100 uninative-flags.inc: Build binutils-native as pie Some distros (ubuntu 16.10, debian-testing) default to gcc configured with --enable-default-pie (see gcc -v). This breaks e.g. prelink-native on a pie default system if binutils-native was built on a system which is not pie default We therefore enable pie unconditionally for native recipes where static libs are used such as libiberty from binutils, for now, until our minimum distro set is all default pie. Signed-off-by: Richard Purdie --- meta/conf/distro/include/uninative-flags.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/distro/include/uninative-flags.inc b/meta/conf/distro/include/uninative-flags.inc index e9f82c3..b6a944e 100644 --- a/meta/conf/distro/include/uninative-flags.inc +++ b/meta/conf/distro/include/uninative-flags.inc @@ -7,3 +7,11 @@ BUILD_CXXFLAGS_append = " -D_GLIBCXX_USE_CXX11_ABI=0" # icu configure defaults to CXX11 if no -std= option is passed in CXXFLAGS # therefore pass one BUILD_CXXFLAGS_append_pn-icu-native = " -std=c++98" + +# Some distros (ubuntu 16.10, debian-testing) default to gcc configured with +# --enable-default-pie (see gcc -v). This breaks e.g. prelink-native on a pie +# default system if binutils-native was built on a system which is not pie default +# We therefore enable pie unconditionally for native recipes where static libs are +# used such as libiberty from binutils, for now, until our minimum distro set is +# all default pie. +BUILD_CFLAGS_append_pn-binutils-native = " -pie -fpie" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:48 +0000 Subject: [oe-commits] [openembedded-core] 01/08: selftest/sstatetests: Replace glibc-initial with linux-libc-headers In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.82E362334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 41d8d5e8978e65ba1883b2178c556795af47a72d Author: Richard Purdie AuthorDate: Fri Apr 7 15:26:30 2017 +0100 selftest/sstatetests: Replace glibc-initial with linux-libc-headers The intent in these tests was to find something early in the bootstrap process to run tests against which didn't require long build times. This breaks with the removal of the glibc-initial do_build target. Replacing it with linux-libc-headers seems like a good choice and simplifies the conditionals too. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/sstatetests.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 5814815..e35ddff 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -49,15 +49,11 @@ class SStateTests(SStateBase): @testcase(976) def test_sstate_creation_distro_nonspecific_pass(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1375) def test_sstate_creation_distro_nonspecific_fail(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) + self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) # Test the sstate files deletion part of the do_cleansstate task def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True): @@ -79,23 +75,17 @@ class SStateTests(SStateBase): @testcase(977) def test_cleansstate_task_distro_specific_nonspecific(self): targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - targets.append('glibc-initial') + targets.append('linux-libc-headers') self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) @testcase(1376) def test_cleansstate_task_distro_nonspecific(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1377) def test_cleansstate_task_distro_specific(self): targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - targets.append('glibc-initial') + targets.append('linux-libc-headers') self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:53 +0000 Subject: [oe-commits] [openembedded-core] 06/08: oe-build-perf-report-email.py: use proper fallback email address In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.B0D232334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 35f28c3cfe412f0e46523dda17e7e7611bb0f4ff Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:40 2017 +0300 oe-build-perf-report-email.py: use proper fallback email address Use properly formatted fallback email address instead of just the username. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/oe-build-perf-report-email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/contrib/oe-build-perf-report-email.py b/scripts/contrib/oe-build-perf-report-email.py index 81b58ab..055a7b1 100755 --- a/scripts/contrib/oe-build-perf-report-email.py +++ b/scripts/contrib/oe-build-perf-report-email.py @@ -21,6 +21,7 @@ import pwd import re import shutil import smtplib +import socket import subprocess import sys import tempfile @@ -211,7 +212,8 @@ def send_email(text_fn, html_fn, subject, recipients): raise ReportError("Neither plain text nor html body specified") full_name = pwd.getpwuid(os.getuid()).pw_gecos.split(',')[0] - email = os.environ.get('EMAIL', os.getlogin()) + email = os.environ.get('EMAIL', + '{}@{}'.format(os.getlogin(), socket.getfqdn())) msg['From'] = "{} <{}>".format(full_name, email) msg['To'] = ', '.join(recipients) msg['Subject'] = subject -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:54 +0000 Subject: [oe-commits] [openembedded-core] 07/08: scripts/oe-build-perf-report: improve guessing of args In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.B7F192334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit da71b65bd8a5d58427f65e00d4ff3d618fd98e58 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:41 2017 +0300 scripts/oe-build-perf-report: improve guessing of args Search remote branches, too, when finding the latest commit. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/oe-build-perf-report | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index 6f2db49..ced5ff2 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -380,7 +380,7 @@ def auto_args(repo, args): """Guess arguments, if not defined by the user""" # Get the latest commit in the repo log.debug("Guessing arguments from the latest commit") - msg = repo.run_cmd(['log', '-1', '--branches', '--format=%b']) + msg = repo.run_cmd(['log', '-1', '--branches', '--remotes', '--format=%b']) for line in msg.splitlines(): split = line.split(':', 1) if len(split) != 2: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:52 +0000 Subject: [oe-commits] [openembedded-core] 05/08: build-perf-test-wrapper.sh: support extra args for email script In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.A77F52334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1e64bf4b8d0e334272c3be34046c094aad3868e6 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:39 2017 +0300 build-perf-test-wrapper.sh: support extra args for email script Make it possible to provide (extra) command line arguments to the oe-build-perf-test-email script via a new environment variable OE_BUILD_PERF_REPORT_EMAIL_EXTRA_ARGS. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/build-perf-test-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index 49bc298..3da3253 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -193,7 +193,7 @@ if [ -n "$results_repo" ]; then os_name=`get_os_release_var PRETTY_NAME` oe-build-perf-report -r "$results_repo" > report.txt oe-build-perf-report -r "$results_repo" --html > report.html - "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html + "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html "${OE_BUILD_PERF_REPORT_EMAIL_EXTRA_ARGS[@]}" fi fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Apr 7 22:43:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 07 Apr 2017 22:43:55 +0000 Subject: [oe-commits] [openembedded-core] 08/08: python-pycurl: create python3-pycurl recipe In-Reply-To: <149160502738.16586.7511761529518242290@git.openembedded.org> References: <149160502738.16586.7511761529518242290@git.openembedded.org> Message-ID: <20170407224347.BE53B2334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5307feec0acb217c84a0bb5464c33a808c7c37e8 Author: Dmitry Rozhkov AuthorDate: Fri Apr 7 16:14:16 2017 +0300 python-pycurl: create python3-pycurl recipe The python-pycurl recipe can be used with python2 only even though python3 is officially supported by upstream. Create python3-pycurl recipe enabling the pycurl module for python3. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/conf/distro/include/security_flags.inc | 1 + .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 ++-- .../python/python-pycurl_7.21.5.bb | 32 +--------------------- .../python/python3-pycurl_7.21.5.bb | 5 ++++ 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 6df1842..e162abe 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -76,6 +76,7 @@ SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-pycairo = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-python3-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-pygpgme = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl.inc similarity index 92% copy from meta/recipes-devtools/python/python-pycurl_7.21.5.bb copy to meta/recipes-devtools/python/python-pycurl.inc index 7b41f6d..d26318b 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b8 file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" +DEPENDS = "curl ${PYTHON_PN}" +RDEPENDS_${PN} = "${PYTHON_PN}-core curl" SRCNAME = "pycurl" SRC_URI = "\ @@ -19,8 +19,6 @@ SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils - BBCLASSEXTEND = "native" # Ensure the docstrings are generated as make clean will remove them diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb index 7b41f6d..eb70cea 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb @@ -1,33 +1,3 @@ -SUMMARY = "Python bindings for libcurl" -HOMEPAGE = "http://pycurl.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1+ | MIT" -LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b89d4584b693d3680062fb \ - file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ - file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" - -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" -SRCNAME = "pycurl" - -SRC_URI = "\ - http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ - file://no-static-link.patch \ -" - -SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" -SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" -S = "${WORKDIR}/${SRCNAME}-${PV}" +require python-pycurl.inc inherit distutils - -BBCLASSEXTEND = "native" - -# Ensure the docstrings are generated as make clean will remove them -do_compile_prepend() { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings -} - -do_install_append() { - rm -rf ${D}${datadir}/share -} diff --git a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb new file mode 100644 index 0000000..5d11192 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycurl:" + +require python-pycurl.inc + +inherit distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:41 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (5307fee -> 6cb9c0a) Message-ID: <149168812197.24617.3077768668322362353@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 5307fee python-pycurl: create python3-pycurl recipe discard da71b65 scripts/oe-build-perf-report: improve guessing of args discard 35f28c3 oe-build-perf-report-email.py: use proper fallback email address discard 1e64bf4 build-perf-test-wrapper.sh: support extra args for email script discard da9971b uninative-flags.inc: Build binutils-native as pie discard 5a6ce84 ncurses: Drop incorrect option discard 15729b8 no-static-libs: Add entry for ncurses discard 41d8d5e selftest/sstatetests: Replace glibc-initial with linux-libc-headers discard c2e8d8f cross-canadian.bbclass: override TARGET_* flags discard d02654e nativesdk.bbclass: override TARGET_* flags discard 629997b crosssdk.bbclass: override TARGET_* flags discard 4ebf517 cross.bbclass: override TARGET_* flags discard d37488b lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate discard e6e634c lib/oe/sstatesig: fix finding native siginfo files in sstate-cache discard 891bdd3 qemu: use python2.7 instead of python2 discard 2f078fb selftest/recipetool: skip create_git in case x11 feature is not present discard fec5837 qemux86*.conf: changed dependency task for syslinux discard b812141 gcc-6.3: backport fix of check for empty string in ubsan.c discard 5b86b3a elfutils: fix building elfutils-native with GCC7 discard e0a30ca sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks discard 114bb98 license.bbclass: improve reproducibility discard eb5c420 selftest/wic: skip wic unit tests in case NLS is disable discard ee5a94e python3: fix run-time deps for core python3 libraries discard de7ba6f eudev: set LGPL-2.1+ for libudev package discard 108d2b6 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash discard 791b9dc autogen-native: fix POSIX_SHELL and perl discard 8f950b9 guile: do_configure: fix "Argument list too long" discard 757a924 m4: do_configure: fix "Argument list too long" discard cae4235 valgrind: set ac_cv_path_PERL to /usr/bin/env perl discard ac8cc90 mc: replace "perl -w" with "use warnings" discard c44854a groff: replace "perl -w" with "use warnings" discard f8066e7 glibc/gcc/libgcc-initial: Delete do_build tasks for -initial discard 6e79936 sanity: Require bitbake 1.33.4 discard 9514fb1 base-files: profile: Do not assume that the tty command exists discard 40c4933 base-files: profile: Whitespace clean up discard fcf2eb9 busybox: Security fix BUG9071 discard 4cb2319 ghostscript: CVE-2017-7207 discard 63033df package.bbclass: add CONFFILES to pkgdata discard 33e1c9d package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' discard 00f154b yocto-compat-layer: limit report of signature changes discard a11f67d yocto-compat-layer: fix also other command invocations discard 73ae473 oe-build-perf-report-email.py: fix one file path discard 3dd0fe2 busybox: Security fix CVE-2016-6301 discard 5cc0631 runqemu: do not rely on grepping images new 301dc9d busybox: Security fix CVE-2016-6301 new 1da6416 oe-build-perf-report-email.py: fix one file path new b6c72c0 yocto-compat-layer: fix also other command invocations new 7ab0e09 yocto-compat-layer: limit report of signature changes new 3e678d9 package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' new ee44dab package.bbclass: add CONFFILES to pkgdata new 0f22a27 ghostscript: CVE-2017-7207 new 0354a9b busybox: Security fix BUG9071 new 479a620 base-files: profile: Whitespace clean up new e77cdb7 base-files: profile: Do not assume that the tty command exists new ef16288 sanity: Require bitbake 1.33.4 new 04c053d glibc/gcc/libgcc-initial: Delete do_build tasks for -initial new f3408bc groff: replace "perl -w" with "use warnings" new 85decf2 mc: replace "perl -w" with "use warnings" new e828223 valgrind: set ac_cv_path_PERL to /usr/bin/env perl new 7e8fece m4: do_configure: fix "Argument list too long" new 123df94 guile: do_configure: fix "Argument list too long" new 0558382 autogen-native: fix POSIX_SHELL and perl new fd2758e kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash new d9430de eudev: set LGPL-2.1+ for libudev package new 8e30b72 python3: fix run-time deps for core python3 libraries new ccd2fac selftest/wic: skip wic unit tests in case NLS is disable new 007ebc8 license.bbclass: improve reproducibility new 246df3d sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks new aaf4c4f elfutils: fix building elfutils-native with GCC7 new 7a7fcba gcc-6.3: backport fix of check for empty string in ubsan.c new b7bb029 qemux86*.conf: changed dependency task for syslinux new 2fe8f39 selftest/recipetool: skip create_git in case x11 feature is not present new 88dc8b5 qemu: use python2.7 instead of python2 new 8cb472e lib/oe/sstatesig: fix finding native siginfo files in sstate-cache new 5b69eef lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate new 55c83cb cross.bbclass: override TARGET_* flags new 3facbe7 crosssdk.bbclass: override TARGET_* flags new 85b69a5 nativesdk.bbclass: override TARGET_* flags new 767335c cross-canadian.bbclass: override TARGET_* flags new c37d610 selftest/sstatetests: Replace glibc-initial with linux-libc-headers new 6b386e4 no-static-libs: Add entry for ncurses new 974ddd2 ncurses: Drop incorrect option new 80b450c uninative-flags.inc: Build binutils-native as pie new 9cdd4ea build-perf-test-wrapper.sh: support extra args for email script new 5e07504 oe-build-perf-report-email.py: use proper fallback email address new 7b50270 scripts/oe-build-perf-report: improve guessing of args new 6cb9c0a python-pycurl: create python3-pycurl recipe This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5307fee) \ N -- N -- N refs/heads/master-next (6cb9c0a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 43 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/qemuboot.bbclass | 3 --- scripts/runqemu | 19 ++++++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:43 +0000 Subject: [oe-commits] [openembedded-core] 02/43: oe-build-perf-report-email.py: fix one file path In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.31B422334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1da641661bb5963fcbd7ac2c20bc997c3eae6f18 Author: Markus Lehtonen AuthorDate: Thu Apr 6 10:10:18 2017 +0300 oe-build-perf-report-email.py: fix one file path Sending report email was not working correctly if the script was given an html report path that contained directory components. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/oe-build-perf-report-email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/oe-build-perf-report-email.py b/scripts/contrib/oe-build-perf-report-email.py index 7f4274e..81b58ab 100755 --- a/scripts/contrib/oe-build-perf-report-email.py +++ b/scripts/contrib/oe-build-perf-report-email.py @@ -243,7 +243,7 @@ def main(argv=None): html_report = None if args.html: scrape_html_report(args.html, outdir, args.phantomjs_args) - html_report = os.path.join(outdir, args.html) + html_report = os.path.join(outdir, os.path.basename(args.html)) if args.to: log.info("Sending email to %s", ', '.join(args.to)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:44 +0000 Subject: [oe-commits] [openembedded-core] 03/43: yocto-compat-layer: fix also other command invocations In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.3C2B42334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b6c72c0d169473e2626938be2ee59f850624612e Author: Patrick Ohly AuthorDate: Wed Apr 5 15:36:04 2017 +0200 yocto-compat-layer: fix also other command invocations In commit 5b9ac62ab535d, one place was fixed where a command was invoked such that failures caused double stack traces and stderr was lost. The same problem also occurs elsewhere, triggered for example by a layer with parsing problems. Now a new utility method is used instead of repeating the code. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 23 ++++++++++++++++------- scripts/lib/compatlayer/cases/common.py | 25 +++++-------------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 86f86eb..9eb862d 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -4,6 +4,7 @@ # Released under the MIT license (see COPYING.MIT) import os +import subprocess from enum import Enum class LayerType(Enum): @@ -199,8 +200,20 @@ def add_layer(bblayersconf, layer, layers, logger): return True +def check_command(error_msg, cmd): + ''' + Run a command under a shell, capture stdout and stderr in a single stream, + throw an error when command returns non-zero exit code. Returns the output. + ''' + + p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + output, _ = p.communicate() + if p.returncode: + msg = "%s\nCommand: %s\nOutput:\n%s" % (error_msg, cmd, output.decode('utf-8')) + raise RuntimeError(msg) + return output + def get_signatures(builddir, failsafe=False): - import subprocess import re # some recipes needs to be excluded like meta-world-pkgdata @@ -214,12 +227,8 @@ def get_signatures(builddir, failsafe=False): if failsafe: cmd += '-k ' cmd += '-S none world' - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - output, _ = p.communicate() - if p.returncode: - msg = "Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities.\nCommand: %s\nOutput:\n%s" % (cmd, output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities.', + cmd) sigs_file = os.path.join(builddir, 'locked-sigs.inc') sig_regex = re.compile("^(?P.*:.*):(?P.*) .$") diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 4d328ec..9cc682e 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -2,9 +2,8 @@ # Released under the MIT license (see COPYING.MIT) import os -import subprocess import unittest -from compatlayer import get_signatures, LayerType +from compatlayer import get_signatures, LayerType, check_command from compatlayer.case import OECompatLayerTestCase class CommonCompatLayer(OECompatLayerTestCase): @@ -20,26 +19,12 @@ class CommonCompatLayer(OECompatLayerTestCase): msg="Layer contains README file but is empty.") def test_parse(self): - try: - output = subprocess.check_output('bitbake -p', shell=True, - stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - import traceback - exc = traceback.format_exc() - msg = 'Layer %s failed to parse.\n%s\n%s\n' % (self.tc.layer['name'], - exc, e.output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Layer %s failed to parse.' % self.tc.layer['name'], + 'bitbake -p') def test_show_environment(self): - try: - output = subprocess.check_output('bitbake -e', shell=True, - stderr=subprocess.PIPE) - except subprocess.CalledProcessError as e: - import traceback - exc = traceback.format_exc() - msg = 'Layer %s failed to show environment.\n%s\n%s\n' % \ - (self.tc.layer['name'], exc, e.output.decode('utf-8')) - raise RuntimeError(msg) + check_command('Layer %s failed to show environment.' % self.tc.layer['name'], + 'bitbake -e') def test_signatures(self): if self.tc.layer['type'] == LayerType.SOFTWARE: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:45 +0000 Subject: [oe-commits] [openembedded-core] 04/43: yocto-compat-layer: limit report of signature changes In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.435112334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7ab0e09de75bfd7e7498bfa72d1f2f5d02a96747 Author: Patrick Ohly AuthorDate: Wed Apr 5 15:36:05 2017 +0200 yocto-compat-layer: limit report of signature changes Typically a single change cascades through the entire task dependency chain. Developers had to figure that out themselves, based on hard to read and interpret output (not sorted, no indention, no explanations): $ yocto-compat-layer.py -n meta-xxxx ... AssertionError: True is not false : Layer meta-xxxx changed signatures. webkitgtk:do_install changed fe2edc9082bc0da98f9cb1391c52f565 -> b3a44684c5cd9aacd3f7c6ed88eefab5 gstreamer1.0-plugins-good:do_configure changed 3b2f8211be3fe08422bf6087f3af16d1 -> 7d80e42fa1f4f01ff4dfe2ea4477d382 pulseaudio:do_package_qa changed 5d0a58ada66ff17f5576555302ac319a -> 0e13bcb96143d1ae54c451bc3de0aa30 epiphany:do_prepare_recipe_sysroot changed 29e1b277dbcb005bd54950594c50d91b -> d3c45527b37677a0668ce483c6db3052 ... gst-player:do_packagedata changed 9ce6efdd357dd74919bc4957458b1e95 -> d0c083ce629f37adfc9c4ba9eff81f83 gstreamer1.0-plugins-base:do_install changed 1161cd867d15bea63e5dd5d9abf0519c -> 5bf2b652a2d77fee3eedb35af2f201a0 gstreamer1.0-rtsp-server:do_packagedata changed 6781dc3070f80b843ed1970d74dd323e -> 454620c2e3b9fea87e525d14b6ed0344 alsa-plugins:do_packagedata changed 1808c3f737cb805b169d004e948ea19c -> 480124b7fa5eab1f73bf96440d725231 Now the tool automates the problem analysis: it retrieves the depgraph using the tinfoil API and only reports those tasks with modified signatures whose dependencies have not changed, i.e. those tasks which definitely introduce a change. >From the previous example, that just leaves two tasks that need to be checked: AssertionError: False is not true : Layer meta-xxxx changed 120 signatures, initial differences (first hash without, second with layer): gstreamer1.0-plugins-base:do_fetch: 76973f19f2e30d282152bdd7e4efe5bb -> e6e7c6fa9f2bd59d7d8d107f7c6ca1ac pulseaudio:do_install: 668eb1e30af129df9806b0aa0d7c10cd -> 1196bdb88eef56eeee4613bb06b9387e This pruning might be a bit too aggressive in the sense that tasks which inherit a change and then add more changes themselves won't be reported initially. They will be found when fixing the reported tasks and re-running the check. For a developer it seems better to have something listed which definitely is a problem and needs fixing instead of everything, including the tasks which don't need fixes. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 32 +++++++++++++++++++ scripts/lib/compatlayer/cases/common.py | 54 +++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 9eb862d..b46527a 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -7,6 +7,8 @@ import os import subprocess from enum import Enum +import bb.tinfoil + class LayerType(Enum): BSP = 0 DISTRO = 1 @@ -252,3 +254,33 @@ def get_signatures(builddir, failsafe=False): raise RuntimeError('Can\'t load signatures from %s' % sigs_file) return sigs + +def get_depgraph(targets=['world']): + ''' + Returns the dependency graph for the given target(s). + The dependency graph is taken directly from DepTreeEvent. + ''' + depgraph = None + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=False) + tinfoil.set_event_mask(['bb.event.NoProvider', 'bb.event.DepTreeGenerated', 'bb.command.CommandCompleted']) + if not tinfoil.run_command('generateDepTreeEvent', targets, 'do_build'): + raise RuntimeError('starting generateDepTreeEvent failed') + while True: + event = tinfoil.wait_event(timeout=1000) + if event: + if isinstance(event, bb.command.CommandFailed): + raise RuntimeError('Generating dependency information failed: %s' % event.error) + elif isinstance(event, bb.command.CommandCompleted): + break + elif isinstance(event, bb.event.NoProvider): + if event._reasons: + raise RuntimeError('Nothing provides %s: %s' % (event._item, event._reasons)) + else: + raise RuntimeError('Nothing provides %s.' % (event._item)) + elif isinstance(event, bb.event.DepTreeGenerated): + depgraph = event._depgraph + + if depgraph is None: + raise RuntimeError('Could not retrieve the depgraph.') + return depgraph diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 9cc682e..b91da9b 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -3,7 +3,7 @@ import os import unittest -from compatlayer import get_signatures, LayerType, check_command +from compatlayer import get_signatures, LayerType, check_command, get_depgraph from compatlayer.case import OECompatLayerTestCase class CommonCompatLayer(OECompatLayerTestCase): @@ -31,21 +31,49 @@ class CommonCompatLayer(OECompatLayerTestCase): raise unittest.SkipTest("Layer %s isn't BSP or DISTRO one." \ % self.tc.layer['name']) + # task -> (old signature, new signature) sig_diff = {} - curr_sigs = get_signatures(self.td['builddir'], failsafe=True) for task in self.td['sigs']: - if task not in curr_sigs: - continue - - if self.td['sigs'][task] != curr_sigs[task]: - sig_diff[task] = '%s -> %s' % \ - (self.td['sigs'][task], curr_sigs[task]) + if task in curr_sigs and \ + self.td['sigs'][task] != curr_sigs[task]: + sig_diff[task] = (self.td['sigs'][task], curr_sigs[task]) - detail = '' if sig_diff: - for task in sig_diff: - detail += "%s changed %s\n" % (task, sig_diff[task]) - self.assertFalse(bool(sig_diff), "Layer %s changed signatures.\n%s" % \ - (self.tc.layer['name'], detail)) + # Beware, depgraph uses task=. whereas get_signatures() + # uses :. Need to convert sometimes. The output follows + # the convention from get_signatures() because that seems closer to + # normal bitbake output. + def sig2graph(task): + pn, taskname = task.rsplit(':', 1) + return pn + '.' + taskname + def graph2sig(task): + pn, taskname = task.rsplit('.', 1) + return pn + ':' + taskname + depgraph = get_depgraph() + depends = depgraph['tdepends'] + + # If a task A has a changed signature, but none of its + # dependencies, then we need to report it because it is + # the one which introduces a change. Any task depending on + # A (directly or indirectly) will also have a changed + # signature, but we don't need to report it. It might have + # its own changes, which will become apparent once the + # issues that we do report are fixed and the test gets run + # again. + sig_diff_filtered = [] + for task, (old_sig, new_sig) in sig_diff.items(): + deps_tainted = False + for dep in depends.get(sig2graph(task), ()): + if graph2sig(dep) in sig_diff: + deps_tainted = True + break + if not deps_tainted: + sig_diff_filtered.append((task, old_sig, new_sig)) + msg = [] + msg.append('Layer %s changed %d signatures, initial differences (first hash without, second with layer):' % + (self.tc.layer['name'], len(sig_diff))) + for diff in sorted(sig_diff_filtered): + msg.append(' %s: %s -> %s' % diff) + self.assertTrue(False, '\n'.join(msg)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:47 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:47 +0000 Subject: [oe-commits] [openembedded-core] 06/43: package.bbclass: add CONFFILES to pkgdata In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.51F792334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ee44dabc065912ac17f1ee5f06f12695c90b5482 Author: David Vincent AuthorDate: Wed Apr 5 17:43:07 2017 +0200 package.bbclass: add CONFFILES to pkgdata Emit CONFFILES variable in pkgdata, or else the get_conffiles function will return 'None' for some packages instead of the expected value. This is especially true for optional module packages. Signed-off-by: David Vincent Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1bc4f6a..cc466bd 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1380,6 +1380,7 @@ python emit_pkgdata() { write_if_exists(sf, pkg, 'PKG') write_if_exists(sf, pkg, 'ALLOW_EMPTY') write_if_exists(sf, pkg, 'FILES') + write_if_exists(sf, pkg, 'CONFFILES') write_if_exists(sf, pkg, 'pkg_postinst') write_if_exists(sf, pkg, 'pkg_postrm') write_if_exists(sf, pkg, 'pkg_preinst') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:42 +0000 Subject: [oe-commits] [openembedded-core] 01/43: busybox: Security fix CVE-2016-6301 In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.2B9A92334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 301dc9df16cce1f4649f90af47159bc21be0de59 Author: Andrej Valek AuthorDate: Thu Apr 6 09:07:37 2017 +0200 busybox: Security fix CVE-2016-6301 ntpd: NTP server denial of service flaw CVE: CVE-2016-6301 Signed-off-by: Andrej Valek Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- .../busybox/busybox/CVE-2016-6301.patch | 37 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 38 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch new file mode 100644 index 0000000..851bc20 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2016-6301.patch @@ -0,0 +1,37 @@ +busybox1.24.1: Fix CVE-2016-6301 + +[No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=1363710 + +ntpd: NTP server denial of service flaw + +The busybox NTP implementation doesn't check the NTP mode of packets +received on the server port and responds to any packet with the right +size. This includes responses from another NTP server. An attacker can +send a packet with a spoofed source address in order to create an +infinite loop of responses between two busybox NTP servers. Adding +more packets to the loop increases the traffic between the servers +until one of them has a fully loaded CPU and/or network. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?id=150dc7a2b483b8338a3e185c478b4b23ee884e71] +CVE: CVE-2016-6301 +Signed-off-by: Andrej Valek +Signed-off-by: Pascal Bach + +diff --git a/networking/ntpd.c b/networking/ntpd.c +index 9732c9b..0f6a55f 100644 +--- a/networking/ntpd.c ++++ b/networking/ntpd.c +@@ -1985,6 +1985,13 @@ recv_and_process_client_pkt(void /*int fd*/) + goto bail; + } + ++ /* Respond only to client and symmetric active packets */ ++ if ((msg.m_status & MODE_MASK) != MODE_CLIENT ++ && (msg.m_status & MODE_MASK) != MODE_SYM_ACT ++ ) { ++ goto bail; ++ } ++ + query_status = msg.m_status; + query_xmttime = msg.m_xmttime; + diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 41fc641..6013ec9 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -47,6 +47,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2016-2148.patch \ file://CVE-2016-2147.patch \ file://CVE-2016-2147_2.patch \ + file://CVE-2016-6301.patch \ file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \ file://makefile-fix-backport.patch \ file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:46 +0000 Subject: [oe-commits] [openembedded-core] 05/43: package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.49F552334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc Author: Mariano Lopez AuthorDate: Wed Apr 5 11:46:35 2017 -0700 package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' opkg uses empty lines as separator for next package and if an ipk file was packaged with empty lines in DESCRIPTION opkg won't be able to handle such ipk file, this happens at execution time. This commit will replace empty lines in DESCRIPTION with a '.' when generating an ipk package to avoid this issue. [YOCTO #10677] Signed-off-by: Mariano Lopez Signed-off-by: Richard Purdie --- meta/classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index fa47385..c7cec9d 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -145,7 +145,11 @@ python do_package_ipk () { # We don't limit the width when manually indent, but we do # need the textwrap.fill() to set the initial_indent and # subsequent_indent, so set a large width - ctrlfile.write('%s\n' % textwrap.fill(t.strip(), width=100000, initial_indent=' ', subsequent_indent=' ')) + line = textwrap.fill(t.strip(), + width=100000, + initial_indent=' ', + subsequent_indent=' ') or '.' + ctrlfile.write('%s\n' % line) else: # Auto indent ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:52 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:52 +0000 Subject: [oe-commits] [openembedded-core] 11/43: sanity: Require bitbake 1.33.4 In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.735142334B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ef16288f3e1e801e5c763ed49fad8eb0c885183e Author: Richard Purdie AuthorDate: Thu Apr 6 12:22:33 2017 +0100 sanity: Require bitbake 1.33.4 We need the bitbake bug in recrdeptask handling of missing tasks fixed in order to apply a fix for OE-Core. Signed-off-by: Richard Purdie --- meta/conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index 616f11c..46bdbeb 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.33.3" +BB_MIN_VERSION = "1.33.4" SANITY_ABIFILE = "${TMPDIR}/abi_version" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:50 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:50 +0000 Subject: [oe-commits] [openembedded-core] 09/43: base-files: profile: Whitespace clean up In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.65D6B2334B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 479a6202236832367bb48e4e089a6d99818685e5 Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:25 2017 +0200 base-files: profile: Whitespace clean up Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index c616616..22dfb4f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -6,28 +6,29 @@ EDITOR="vi" # needed for packages like cron, git-commit test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. if [ "$HOME" = "ROOTHOME" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin fi if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' + # works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' fi if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh ; do - if [ -f $i -a -r $i ]; then - . $i - fi - done - unset i + for i in /etc/profile.d/*.sh; do + if [ -f $i -a -r $i ]; then + . $i + fi + done + unset i fi if [ -x /usr/bin/resize ] && termpath="`tty`"; then - # Make sure we are on a serial console (i.e. the device used starts with /dev/tty), - # otherwise we confuse e.g. the eclipse launcher which tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null - esac + # Make sure we are on a serial console (i.e. the device used starts with + # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which + # tries do use ssh + case "$termpath" in + /dev/tty[A-z]*) resize >/dev/null + esac fi export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:54 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:54 +0000 Subject: [oe-commits] [openembedded-core] 13/43: groff: replace "perl -w" with "use warnings" In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.7FA7D2334BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f3408bcf9d2710b07f5825683931e28571de130c Author: Robert Yang AuthorDate: Thu Apr 6 03:05:50 2017 -0700 groff: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-replace-perl-w-with-use-warnings.patch | 102 +++++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 3 + 2 files changed, 105 insertions(+) diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..f1db5b0 --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,102 @@ +From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 01:46:00 -0700 +Subject: [PATCH] replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + font/devpdf/util/BuildFoundries.pl | 3 ++- + src/devices/gropdf/gropdf.pl | 3 ++- + src/devices/gropdf/pdfmom.pl | 3 ++- + src/utils/afmtodit/afmtodit.pl | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl +index 39f2f0d..a2bfd8e 100644 +--- a/font/devpdf/util/BuildFoundries.pl ++++ b/font/devpdf/util/BuildFoundries.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/perl + # + # BuildFoundries : Given a Foundry file generate groff and download files + # Deri James : Monday 07 Feb 2011 +@@ -22,6 +22,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + my $where=shift||''; + my $devps=shift||'../devps'; +diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl +index 035d123..b933b32 100644 +--- a/src/devices/gropdf/gropdf.pl ++++ b/src/devices/gropdf/gropdf.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # gropdf : PDF post processor for groff + # +@@ -21,6 +21,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use Getopt::Long qw(:config bundling); + use Compress::Zlib; + +diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl +index beec820..4b46ea4 100644 +--- a/src/devices/gropdf/pdfmom.pl ++++ b/src/devices/gropdf/pdfmom.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # pdfmom : Frontend to run groff -mom to produce PDFs + # Deri James : Friday 16 Mar 2012 +@@ -24,6 +24,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + use File::Temp qw/tempfile/; + my @cmd; + my $dev='pdf'; +diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl +index 4f2ce83..5c078ff 100644 +--- a/src/utils/afmtodit/afmtodit.pl ++++ b/src/utils/afmtodit/afmtodit.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#! /usr/bin/perl + # -*- Perl -*- + # Copyright (C) 1989-2014 Free Software Foundation, Inc. + # Written by James Clark (jjc at jclark.com) +@@ -19,6 +19,7 @@ + # along with this program. If not, see . + + use strict; ++use warnings; + + @afmtodit.tables@ + +-- +2.10.2 + diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index dd241f3..7472f59 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0001-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" @@ -24,6 +25,8 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_configure_prepend() { if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then sed -i \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:51 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:51 +0000 Subject: [oe-commits] [openembedded-core] 10/43: base-files: profile: Do not assume that the tty command exists In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.6D0742334B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e77cdb761169e404556487ac650dc562000da406 Author: Peter Kjellerstedt AuthorDate: Mon Apr 3 14:48:26 2017 +0200 base-files: profile: Do not assume that the tty command exists This avoids the following error when logging in to a host that does not have the tty command: -sh: tty: not found Reported-by: Cristian Ionescu-Idbohrn Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files/profile | 6 +++--- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 22dfb4f..ceaf15f 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -22,12 +22,12 @@ if [ -d /etc/profile.d ]; then unset i fi -if [ -x /usr/bin/resize ] && termpath="`tty`"; then +if command -v resize >/dev/null && command -v tty >/dev/null; then # Make sure we are on a serial console (i.e. the device used starts with # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which # tries do use ssh - case "$termpath" in - /dev/tty[A-z]*) resize >/dev/null + case $(tty) in + /dev/tty[A-z]*) resize >/dev/null;; esac fi diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index f56969c..ca7bf06 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -128,10 +128,6 @@ do_install () { install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd - if [ "/usr/bin" != "${bindir}" ]; then - sed -i "s,/usr/bin/resize,${bindir}/resize," ${D}${sysconfdir}/profile - fi - ln -sf /proc/mounts ${D}${sysconfdir}/mtab } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:48 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:48 +0000 Subject: [oe-commits] [openembedded-core] 07/43: ghostscript: CVE-2017-7207 In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.5801F2334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0f22a27c2abd2f2dd9119681f139dd85dcb6479d Author: Catalin Enache AuthorDate: Wed Apr 5 15:06:51 2017 +0300 ghostscript: CVE-2017-7207 The mem_get_bits_rectangle function in Artifex Software, Inc. Ghostscript 9.20 allows remote attackers to cause a denial of service (NULL pointer dereference) via a crafted PostScript document. Reference: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-7207 Upstream patch: http://git.ghostscript.com/?p=ghostpdl.git;h=309eca4e0a31ea70dcc844812691439312dad091 Signed-off-by: Catalin Enache Signed-off-by: Richard Purdie --- .../ghostscript/ghostscript/CVE-2017-7207.patch | 39 ++++++++++++++++++++++ .../ghostscript/ghostscript_9.20.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch new file mode 100644 index 0000000..a05dc02 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch @@ -0,0 +1,39 @@ +From 0e88bee1304993668fede72498d656a2dd33a35e Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Mon, 20 Mar 2017 09:34:11 +0000 +Subject: [PATCH] Ensure a device has raster memory, before trying to read it. + +Bug #697676 "Null pointer dereference in mem_get_bits_rectangle()" + +This is only possible by abusing/mis-using Ghostscript-specific +language extensions, so cannot happen in a general PostScript program. + +Nevertheless, Ghostscript should not crash. So this commit checks the +memory device to see if raster memory has been allocated, before trying +to read from it. + +Upstream-Status: Backport +CVE: CVE-2017-7207 + +Author: Ken Sharp +Signed-off-by: Catalin Enache +--- + base/gdevmem.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/base/gdevmem.c b/base/gdevmem.c +index 41108ba..183f96d 100644 +--- a/base/gdevmem.c ++++ b/base/gdevmem.c +@@ -605,6 +605,8 @@ mem_get_bits_rectangle(gx_device * dev, const gs_int_rect * prect, + GB_PACKING_CHUNKY | GB_COLORS_NATIVE | GB_ALPHA_NONE; + return_error(gs_error_rangecheck); + } ++ if (mdev->line_ptrs == 0x00) ++ return_error(gs_error_rangecheck); + if ((w <= 0) | (h <= 0)) { + if ((w | h) < 0) + return_error(gs_error_rangecheck); +-- +2.10.2 + diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb index 210e9a7..e8fc5df 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb @@ -31,6 +31,7 @@ SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.02-genarch.patch \ file://objarch.h \ file://cups-no-gcrypt.patch \ + file://CVE-2017-7207.patch \ " SRC_URI_class-native = "${SRC_URI_BASE} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:49 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:49 +0000 Subject: [oe-commits] [openembedded-core] 08/43: busybox: Security fix BUG9071 In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.5EFA92334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0354a9b7adad27b012bcd6bb6cab54dfe0297bcd Author: Martin Balik AuthorDate: Wed Apr 5 12:38:57 2017 +0200 busybox: Security fix BUG9071 Signed-off-by: Martin Balik Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- .../busybox/BUG9071_buffer_overflow_arp.patch | 53 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 54 insertions(+) diff --git a/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch new file mode 100644 index 0000000..828694c --- /dev/null +++ b/meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch @@ -0,0 +1,53 @@ +busybox1.24.1: Fix busybox - (local) cmdline stack buffer overwrite + +[No upstream tracking] -- https://bugs.busybox.net/show_bug.cgi?id=9071 + +busybox - (local) cmdline stack buffer overwrite + +Busybox provides an `arp` applet which is missing an array bounds check for +command-line parameter `IFNAME`. It is therefore vulnerable to a command-line +based local stack buffer overwrite effectively allowing local users to write +past a 16 bytes fixed stack buffer. This leads to two scenarios, one (A) where +an IOCTL for GET_HW_ADDRESS (`SIOCGIFHWADDR`) fails and results in a corrupted +`va_list` being passed to `*printf()` and one (B) where an attacker might provide +valid params for the IOCTL and trick the program to proceed and result in a +`RET eip overwrite` eventually gaining code execution. + +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/networking/arp.c?id=88e2b1cb626761b1924305b761a5dfc723613c4e] +BUG: BUG9071 +Signed-off-by: Martin Balik +Signed-off-by: Pascal Bach + +-- + +diff --git a/networking/arp.c b/networking/arp.c +index 0099aa5..87eb327 100644 +--- a/networking/arp.c ++++ b/networking/arp.c +@@ -176,7 +176,7 @@ static int arp_del(char **args) + if (flags == 0) + flags = 3; + +- strncpy(req.arp_dev, device, sizeof(req.arp_dev)); ++ strncpy_IFNAMSIZ(req.arp_dev, device); + + err = -1; + +@@ -217,7 +217,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa) + struct ifreq ifr; + const struct hwtype *xhw; + +- strcpy(ifr.ifr_name, ifname); ++ strncpy_IFNAMSIZ(ifr.ifr_name, ifname); + ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr, + "can't get HW-Address for '%s'", ifname); + if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) { +@@ -330,7 +330,7 @@ static int arp_set(char **args) + /* Fill in the remainder of the request. */ + req.arp_flags = flags; + +- strncpy(req.arp_dev, device, sizeof(req.arp_dev)); ++ strncpy_IFNAMSIZ(req.arp_dev, device); + + /* Call the kernel. */ + if (option_mask32 & ARP_OPT_v) diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 6013ec9..e26dfff 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -56,6 +56,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://makefile-libbb-race.patch \ file://0001-libiproute-handle-table-ids-larger-than-255.patch \ file://ifupdown-pass-interface-device-name-for-ipv6-route-c.patch \ + file://BUG9071_buffer_overflow_arp.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:53 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:53 +0000 Subject: [oe-commits] [openembedded-core] 12/43: glibc/gcc/libgcc-initial: Delete do_build tasks for -initial In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.79A1C2334B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 04c053d42ab05f77b2d1ca93a0fabae44073d57e Author: Richard Purdie AuthorDate: Wed Apr 5 17:27:20 2017 +0100 glibc/gcc/libgcc-initial: Delete do_build tasks for -initial We've had a lot of users running into RSS issues where -initial recipes were being installed into sysroots alongside their counterparts and causing overlapping files issues. In general this was through do_build dependencies. Such dependencies are bad in general and I'd encourage people to compare the taskgraphs with using a more specific dependency like do_populate_sysroot, do_image_complete or do_deploy as often the more specific dependency will result in a much cleaner build. Regardless, we don't want -initial dependencies getting in the way like this and there are cases a do_build dependency could make sense. Deleting the do_build task in these cases makes sense since this is not a build "endpoint" we'd ever want a user to use, its a behind the scenes piece of bootstrappping. Unfortunately to make this work, we need a newer bitbake version which has a bitbake bug fixed. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-initial.inc | 3 +++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 4 ++++ meta/recipes-devtools/gcc/libgcc-initial.inc | 3 +++ 3 files changed, 10 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc index f94603c..b86e2fb 100644 --- a/meta/recipes-core/glibc/glibc-initial.inc +++ b/meta/recipes-core/glibc/glibc-initial.inc @@ -52,3 +52,6 @@ do_siteconfig () { } inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc index 5c0208a..d440d88 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc @@ -82,3 +82,7 @@ do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_AR inherit nopackages COMPILERINITIAL = "-initial" + + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc index 5b4bc3b..950ad86 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial.inc +++ b/meta/recipes-devtools/gcc/libgcc-initial.inc @@ -15,3 +15,6 @@ EXTRA_OECONF += "--disable-shared" COMPILERINITIAL = "-initial" inherit nopackages + +# We really only want this built by things that need it, not any recrdeptask +deltask do_build -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:55 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:55 +0000 Subject: [oe-commits] [openembedded-core] 14/43: mc: replace "perl -w" with "use warnings" In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.86F222334BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85decf26fe580acdf072baf561418bf73b7bfca4 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:51 2017 -0700 mc: replace "perl -w" with "use warnings" The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 There would be errors when @PERL@ (hostools/perl) is longer than 128, use '/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' doesn't work: /usr/bin/env: perl -w: No such file or directory So replace "perl -w" with "use warnings" to make it work. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../0001-mc-replace-perl-w-with-use-warnings.patch | 129 +++++++++++++++++++++ meta/recipes-extended/mc/mc_4.8.18.bb | 3 + 2 files changed, 132 insertions(+) diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch new file mode 100644 index 0000000..bf8037c --- /dev/null +++ b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,129 @@ +From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 6 Apr 2017 02:24:28 -0700 +Subject: [PATCH] mc: replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +The man2hlp.in already has "use warnings;", so just remove '-w' is OK. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + src/man2hlp/man2hlp.in | 2 +- + src/vfs/extfs/helpers/a+.in | 4 +++- + src/vfs/extfs/helpers/mailfs.in | 3 ++- + src/vfs/extfs/helpers/patchfs.in | 3 ++- + src/vfs/extfs/helpers/ulib.in | 4 +++- + src/vfs/extfs/helpers/uzip.in | 3 ++- + 6 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in +index f095830..558a674 100644 +--- a/src/man2hlp/man2hlp.in ++++ b/src/man2hlp/man2hlp.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Man page to help file converter + # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in +index 579441c..fe446f4 100644 +--- a/src/vfs/extfs/helpers/a+.in ++++ b/src/vfs/extfs/helpers/a+.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # External filesystem for mc, using mtools + # Written Ludek Brukner , 1997 +@@ -9,6 +9,8 @@ + + # These mtools components must be in PATH for this to work + ++use warnings; ++ + sub quote { + $_ = shift(@_); + s/([^\w\/.+-])/\\$1/g; +diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in +index e9455be..059f41f 100644 +--- a/src/vfs/extfs/helpers/mailfs.in ++++ b/src/vfs/extfs/helpers/mailfs.in +@@ -1,6 +1,7 @@ +-#! @PERL@ -w ++#! @PERL@ + + use bytes; ++use warnings; + + # MC extfs for (possibly compressed) Berkeley style mailbox files + # Peter Daum (Jan 1998, mc-4.1.24) +diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in +index ef407de..3ad4b53 100644 +--- a/src/vfs/extfs/helpers/patchfs.in ++++ b/src/vfs/extfs/helpers/patchfs.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # Written by Adam Byrtek , 2002 + # Rewritten by David Sterba , 2009 +@@ -9,6 +9,7 @@ + + use bytes; + use strict; ++use warnings; + use POSIX; + use File::Temp 'tempfile'; + +diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in +index 418611f..82c7ccf 100644 +--- a/src/vfs/extfs/helpers/ulib.in ++++ b/src/vfs/extfs/helpers/ulib.in +@@ -1,9 +1,11 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # VFS to manage the gputils archives. + # Written by Moln?r K?roly (proton7 at freemail.hu) 2012 + # + ++use warnings; ++ + my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03', + 'apr' => '04', 'may' => '05', 'jun' => '06', + 'jul' => '07', 'aug' => '08', 'sep' => '09', +diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in +index b1c4f90..c8eb335 100644 +--- a/src/vfs/extfs/helpers/uzip.in ++++ b/src/vfs/extfs/helpers/uzip.in +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#! @PERL@ + # + # zip file archive Virtual File System for Midnight Commander + # Version 1.4.0 (2001-08-07). +@@ -9,6 +9,7 @@ + use POSIX; + use File::Basename; + use strict; ++use warnings; + + # + # Configuration options +-- +2.10.2 + diff --git a/meta/recipes-extended/mc/mc_4.8.18.bb b/meta/recipes-extended/mc/mc_4.8.18.bb index 78abb27..17f3f73 100644 --- a/meta/recipes-extended/mc/mc_4.8.18.bb +++ b/meta/recipes-extended/mc/mc_4.8.18.bb @@ -7,6 +7,7 @@ DEPENDS = "ncurses glib-2.0 util-linux" RDEPENDS_${PN} = "ncurses-terminfo" SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-mc-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc56f0c9abd63c4caa3636bba3a08bfb" SRC_URI[sha256sum] = "5b591e10dcbea95233434da40cdad4663d360229adf89826576c319667c103cb" @@ -22,6 +23,8 @@ PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* sed -i -e '1s,#!.*python,#!${bindir}/env python,' ${D}${libexecdir}/mc/extfs.d/* -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:58 +0000 Subject: [oe-commits] [openembedded-core] 17/43: guile: do_configure: fix "Argument list too long" In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.9B4452334C1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 123df94f511cbaad088b25bbbae1f1137f957c7e Author: Robert Yang AuthorDate: Thu Apr 6 03:05:54 2017 -0700 guile: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/guile/guile_2.0.14.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/guile/guile_2.0.14.bb b/meta/recipes-devtools/guile/guile_2.0.14.bb index d2306e6..7a36ba0 100644 --- a/meta/recipes-devtools/guile/guile_2.0.14.bb +++ b/meta/recipes-devtools/guile/guile_2.0.14.bb @@ -30,6 +30,9 @@ SRC_URI[sha256sum] = "e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8 inherit autotools gettext pkgconfig texinfo BBCLASSEXTEND = "native" +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline" # add guile-native only to the target recipe's DEPENDS DEPENDS_append_class-target = " guile-native libatomic-ops" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:00 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:00 +0000 Subject: [oe-commits] [openembedded-core] 19/43: kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.A777B2334C5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fd2758ed26e8ed6d76c66af0275c4aafbec758ac Author: Robert Yang AuthorDate: Thu Apr 6 03:05:56 2017 -0700 kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/bash is longer than 128: /bin/sh: ./doltcompile: [snip]: bad interpreter: No such file or directory Set ac_cv_path_DOLT_BASH to "/usr/bin/env bash" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-kernel/kmod/kmod.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index cfa409d..ba80fc5 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -30,6 +30,8 @@ S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" EXTRA_OECONF +=" --enable-tools --with-zlib" +CACHED_CONFIGUREVARS += "ac_cv_path_DOLT_BASH='/usr/bin/env bash'" + PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:56 +0000 Subject: [oe-commits] [openembedded-core] 15/43: valgrind: set ac_cv_path_PERL to /usr/bin/env perl In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.8CE2B2334BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e828223a8238d85d47e9314e1dcc30b83b7ba3da Author: Robert Yang AuthorDate: Thu Apr 6 03:05:52 2017 -0700 valgrind: set ac_cv_path_PERL to /usr/bin/env perl The shebang's max length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. Set ac_cv_path_PERL to "/usr/bin/env perl" to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index a4a3e72..62a9635 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -56,6 +56,8 @@ EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" EXTRA_OEMAKE = "-w" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + # valgrind likes to control its own optimisation flags. It generally defaults # to -O2 but uses -O0 for some specific test apps etc. Passing our own flags # (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:03 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:03 +0000 Subject: [oe-commits] [openembedded-core] 22/43: selftest/wic: skip wic unit tests in case NLS is disable In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.BB2952334C9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ccd2faca99331e010badbb78d42b0ee644ca1a0a Author: Leonardo Sandoval AuthorDate: Wed Apr 5 15:34:26 2017 -0700 selftest/wic: skip wic unit tests in case NLS is disable WIC test case requires wic-tools which in turn depends on intltool-native and gettext-native. However, if NLS is disable, the gettext-minimal-native is used instead of gettext-native causing a failure on intltool-native as seen below: checking for msgfmt... no checking for gmsgfmt... no configure: error: GNU gettext tools not found; required for intltool ERROR: Function failed: do_configure (log file is located at /home/lsandov1/poky/build/tmp/work/i586-poky-linux-musl/systemd-boot/232-r0/temp/log.do_configure.7518) ERROR: Task (/home/lsandov1/poky/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb:do_configure) failed with exit code '1' NOTE: Tasks Summary: Attempted 609 tasks of which 604 didn't need to be rerun and 1 failed. [YOCTO #10902] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/wic.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index df5e060..8030c35 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -77,7 +77,10 @@ class Wic(oeSelfTest): # clean up which can result in the native tools built earlier in # setUpClass being unavailable. if not Wic.image_is_ready: - bitbake('wic-tools') + if get_bb_var('USE_NLS') == 'yes': + bitbake('wic-tools') + else: + self.skipTest('wic-tools cannot be built due its (intltool|gettext)-native dependency and NLS disable') bitbake('core-image-minimal') Wic.image_is_ready = True -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:05 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:05 +0000 Subject: [oe-commits] [openembedded-core] 24/43: sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.C9E0C2334CC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 246df3df4b7da4b75de0745938438124c2b1d4a5 Author: Richard Purdie AuthorDate: Wed Apr 5 15:37:12 2017 +0100 sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks We never need these tasks as dependencies of other sstate tasks since they're only ever needed to build artefacts so we can always skip them and save some time/space. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index af58854..bc0ec54 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -915,6 +915,10 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): if taskdependees[task][1] == "do_populate_lic": return True + # stash_locale and gcc_stash_builddir are never needed as a dependency for built objects + if taskdependees[task][1] == "do_stash_locale" or taskdependees[task][1] == "do_gcc_stash_builddir": + return True + # We only need to trigger packagedata through direct dependencies # but need to preserve packagedata on packagedata links if taskdependees[task][1] == "do_packagedata": -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:08 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:08 +0000 Subject: [oe-commits] [openembedded-core] 27/43: qemux86*.conf: changed dependency task for syslinux In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.E0CAA2334CF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7 Author: Ed Bartosh AuthorDate: Thu Apr 6 17:48:17 2017 +0300 qemux86*.conf: changed dependency task for syslinux Changed dependency task for syslinux from do_build to do_populate_sysroot as do_build dependency caused conflicts in populating image recipe sysroot using conflicting recipes. This makes do_image_wic task to fail with FileExistsError trying to copy the same file from two conflicting recipes. This should also speed up image creation a bit as do_populate_sysroot task is faster than do_build. [YOCTO #11295] Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 150d745..10189cb 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -30,4 +30,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1b478e9..c26dda2 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -29,4 +29,4 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" +do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:57 +0000 Subject: [oe-commits] [openembedded-core] 16/43: m4: do_configure: fix "Argument list too long" In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.940902334C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7e8fece3a09bed18bc72c529b8b471ccbc144bf5 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:53 2017 -0700 m4: do_configure: fix "Argument list too long" Fixed when len(TMPDIR) = 410: Can't exec "/bin/sh": Argument list too long at /usr/lib/perl/5.18/IO/File.pm line 65. This is becuase it has a lot of m4 files, use relative path for them can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/m4/m4-1.4.18.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc index 5652b74..d7c8648 100644 --- a/meta/recipes-devtools/m4/m4-1.4.18.inc +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc @@ -15,5 +15,8 @@ SRC_URI_append_class-target = "\ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28" SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:02 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:02 +0000 Subject: [oe-commits] [openembedded-core] 21/43: python3: fix run-time deps for core python3 libraries In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.B360B2334C7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8e30b726c44f873e5fd9d3f36c3464a29b97abd8 Author: Dmitry Rozhkov AuthorDate: Thu Apr 6 08:07:44 2017 +0300 python3: fix run-time deps for core python3 libraries The http.server module from python3-netclient imports the html module which is in python3-html. Also xmlrpc.server imports pydoc which is a part of python3-pydoc. But those run-time dependencies are missing from python3-netclient and python3-xmlrpc respectively. Add the missing run-time dependencies. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-3.5-manifest.inc | 4 ++-- scripts/contrib/python/generate-manifest-3.5.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index 55bcc4b..ec30eb9 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc @@ -153,7 +153,7 @@ RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN FILES_${PN}-multiprocessing="${libdir}/python3.5/lib-dynload/_multiprocessing.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_multiprocessing.*.so ${libdir}/python3.5/multiprocessing ${libdir}/python3.5/multiprocessing/__pycache__ " SUMMARY_${PN}-netclient="Python Internet Protocol clients" -RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" +RDEPENDS_${PN}-netclient="${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html" FILES_${PN}-netclient="${libdir}/python3.5/*Cookie*.* ${libdir}/python3.5/__pycache__/*Cookie*.* ${libdir}/python3.5/base64.* ${libdir}/python3.5/__pycache__/base64.* ${libdir}/python3.5/cookielib.* ${libdir}/python3.5/__pycache__/cookielib.* ${libdir}/python3.5/ftplib.* ${libdir}/python3.5/__pycache__/ftplib.* ${libdir}/python3.5/gopherlib.* ${libdir}/python3.5/__pycache__/gopherlib.* ${libdir}/python3.5/hmac.* ${libdir}/python3.5/__pycache__/hmac.* ${libdir}/python3.5/http* ${libdir}/p [...] SUMMARY_${PN}-netserver="Python Internet Protocol servers" @@ -273,7 +273,7 @@ RDEPENDS_${PN}-xml="${PN}-core ${PN}-re" FILES_${PN}-xml="${libdir}/python3.5/lib-dynload/_elementtree.*.so ${libdir}/python3.5/lib-dynload/__pycache__/_elementtree.*.so ${libdir}/python3.5/lib-dynload/pyexpat.*.so ${libdir}/python3.5/lib-dynload/__pycache__/pyexpat.*.so ${libdir}/python3.5/xml ${libdir}/python3.5/xml/__pycache__ ${libdir}/python3.5/xmllib.* ${libdir}/python3.5/__pycache__/xmllib.* " SUMMARY_${PN}-xmlrpc="Python XML-RPC support" -RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" +RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc" FILES_${PN}-xmlrpc="${libdir}/python3.5/xmlrpclib.* ${libdir}/python3.5/__pycache__/xmlrpclib.* ${libdir}/python3.5/SimpleXMLRPCServer.* ${libdir}/python3.5/__pycache__/SimpleXMLRPCServer.* ${libdir}/python3.5/DocXMLRPCServer.* ${libdir}/python3.5/__pycache__/DocXMLRPCServer.* ${libdir}/python3.5/xmlrpc ${libdir}/python3.5/xmlrpc/__pycache__ " SUMMARY_${PN}-modules="All Python modules" diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index 386bdfc..5835de8 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py @@ -340,7 +340,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-multiprocessing", "Python multiprocessing support", "${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap", "lib-dynload/_multiprocessing.*.so multiprocessing" ) # package - m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime", + m.addPackage( "${PN}-netclient", "Python Internet Protocol clients", "${PN}-argparse ${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime ${PN}-html", "*Cookie*.* " + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* http* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib uuid.* rfc822.* mimetools.*" ) @@ -422,7 +422,7 @@ if __name__ == "__main__": m.addPackage( "${PN}-xml", "Python basic XML support", "${PN}-core ${PN}-re", "lib-dynload/_elementtree.*.so lib-dynload/pyexpat.*.so xml xmllib.*" ) # package - m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang", + m.addPackage( "${PN}-xmlrpc", "Python XML-RPC support", "${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang ${PN}-pydoc", "xmlrpclib.* SimpleXMLRPCServer.* DocXMLRPCServer.* xmlrpc" ) m.addPackage( "${PN}-mailbox", "Python mailbox format support", "${PN}-core ${PN}-mime", -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:09 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:09 +0000 Subject: [oe-commits] [openembedded-core] 28/43: selftest/recipetool: skip create_git in case x11 feature is not present In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.E8FCE2334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2fe8f39b5f5e7390cc46f8cb47c2503b3c5f78e2 Author: Leonardo Sandoval AuthorDate: Thu Apr 6 09:41:51 2017 -0700 selftest/recipetool: skip create_git in case x11 feature is not present The unit test requires x11 as distro feature, otherwise it will fail while building the test requirements. [YOCTO #10903] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/recipetool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index d47b9dd..7bfb02f 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py @@ -382,6 +382,8 @@ class RecipetoolTests(RecipetoolBase): @testcase(1194) def test_recipetool_create_git(self): + if 'x11' not in get_bb_var('DISTRO_FEATURES'): + self.skipTest('Test requires x11 as distro feature') # Ensure we have the right data in shlibs/pkgdata bitbake('libpng pango libx11 libxext jpeg libcheck') # Try adding a recipe -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:15 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:15 +0000 Subject: [oe-commits] [openembedded-core] 34/43: nativesdk.bbclass: override TARGET_* flags In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.21E3D2334D4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85b69a5ec9ba9ea9ebdcd8ac18e1e147ddb1ff33 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:43 2017 +0200 nativesdk.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a nativesdk recipe even they are not in use at all. This can lead a lot of churn when the nativesdk sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILDSDK_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/nativesdk.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index a97f5a7..ebcfb2d 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -43,6 +43,10 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +TARGET_CFLAGS = "${BUILDSDK_CFLAGS}" +TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" TARGET_FPU = "" EXTRA_OECONF_GCC_FLOAT = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:10 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:10 +0000 Subject: [oe-commits] [openembedded-core] 29/43: qemu: use python2.7 instead of python2 In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.EF2212334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 88dc8b532817f4779b35422a413d5c700c130a74 Author: Martin Kelly AuthorDate: Thu Apr 6 12:48:39 2017 -0700 qemu: use python2.7 instead of python2 meta/conf/bitbake.conf puts python2.7 into the HOSTTOOLS variable but not python2, so only python2.7 is guaranteed. In addition, on some distros -- such as Amazon Linux -- /usr/bin/python2 doesn't exist but python2.7 does. So, use python2.7 for the --python= argument in the qemu configure step. Signed-off-by: Martin Kelly Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 383cc64..0e1411a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ --with-system-pixman \ --extra-cflags='${CFLAGS}' \ " -EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2" +EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2.7" EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:14 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:14 +0000 Subject: [oe-commits] [openembedded-core] 33/43: crosssdk.bbclass: override TARGET_* flags In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.1A1892334D2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3facbe700a2f28a11620c4954686ed5d5e47a3d9 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:42 2017 +0200 crosssdk.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a crosssdk recipe even they are not in use at all. This can lead a lot of churn when the crosssdk sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILD_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/crosssdk.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index a5ffd97..ddb98d2 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -21,8 +21,13 @@ TARGET_PREFIX = "${SDK_PREFIX}" TARGET_CC_ARCH = "${SDK_CC_ARCH}" TARGET_LD_ARCH = "${SDK_LD_ARCH}" TARGET_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" +TARGET_CFLAGS = "${BUILD_CFLAGS}" +TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILD_LDFLAGS}" TARGET_FPU = "" + target_libdir = "${SDKPATHNATIVE}${libdir_nativesdk}" target_includedir = "${SDKPATHNATIVE}${includedir_nativesdk}" target_base_libdir = "${SDKPATHNATIVE}${base_libdir_nativesdk}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:18 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:18 +0000 Subject: [oe-commits] [openembedded-core] 37/43: no-static-libs: Add entry for ncurses In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.394C82334DA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6b386e444e494b852b59a9f9e80426d564382139 Author: Richard Purdie AuthorDate: Fri Apr 7 15:30:01 2017 +0100 no-static-libs: Add entry for ncurses Yes, the option to disable static libraries in boost really is "--without-normal". Add this for ncurses and its variants. Signed-off-by: Richard Purdie --- meta/conf/distro/include/no-static-libs.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc index 54f34a7..f8d8c09 100644 --- a/meta/conf/distro/include/no-static-libs.inc +++ b/meta/conf/distro/include/no-static-libs.inc @@ -33,3 +33,7 @@ DISABLE_STATIC_pn-libusb1-native = "" EXTRA_OECONF_append = "${DISABLE_STATIC}" EXTRA_OECMAKE_append_pn-libical = " -DSHARED_ONLY=True" + +EXCONFIG_ARGS_append_pn-ncurses = " --without-normal" +EXCONFIG_ARGS_append_pn-ncurses-native = " --without-normal" +EXCONFIG_ARGS_append_pn-nativesdk-ncurses = " --without-normal" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:48:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:48:59 +0000 Subject: [oe-commits] [openembedded-core] 18/43: autogen-native: fix POSIX_SHELL and perl In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.A1B112334C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 055838283349530e6f60f4169d9190aa5b59b190 Author: Robert Yang AuthorDate: Thu Apr 6 03:05:55 2017 -0700 autogen-native: fix POSIX_SHELL and perl The shebang's length is usually 128 as defined in /usr/include/linux/binfmts.h: #define BINPRM_BUF_SIZE 128 So there would be errors when /path/to/hosttools/perl is longer than 128. This patch fixes the problem when POSIX_SHELL and perl are used as the interpreters. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.18.12.bb | 3 ++ ...2-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb index 0004389..853477c 100644 --- a/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb +++ b/meta/recipes-devtools/autogen/autogen-native_5.18.12.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \ file://fix-script-err-when-processing-libguile.patch \ file://0001-config-libopts.m4-regenerate-it-from-config-libopts..patch \ + file://0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch \ " SRC_URI[md5sum] = "551d15ccbf5b5fc5658da375d5003389" @@ -30,6 +31,8 @@ inherit autotools texinfo native pkgconfig export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" +export POSIX_SHELL = "/usr/bin/env sh" + do_install_append () { create_wrapper ${D}/${bindir}/autogen \ GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ diff --git a/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch new file mode 100644 index 0000000..d5fe143 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch @@ -0,0 +1,32 @@ +From 9f69f3f5ef22bf1bcffb0e651efc260889cfaa46 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Mon, 13 Mar 2017 20:33:30 -0700 +Subject: [PATCH] autoopts/mk-tpl-config.sh: fix perl path + +Use "which perl" as shebang doesn't work when it is longer than +BINPRM_BUF_SIZE which is 128 usually. So use "/usr/bin/env perl" to +instead of. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + autoopts/mk-tpl-config.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autoopts/mk-tpl-config.sh b/autoopts/mk-tpl-config.sh +index 093e808..8dfc6dd 100755 +--- a/autoopts/mk-tpl-config.sh ++++ b/autoopts/mk-tpl-config.sh +@@ -98,7 +98,7 @@ fix_scripts() { + st=`sed 1q $f` + + case "$st" in +- *perl ) echo '#!' `which perl` ++ *perl ) echo '#!/usr/bin/env perl' + sed 1d $f + ;; + +-- +2.10.2 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:04 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:04 +0000 Subject: [oe-commits] [openembedded-core] 23/43: license.bbclass: improve reproducibility In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.C371B2334CB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 007ebc84979b1bc8b7520097793c7ab6d646c243 Author: Juro Bystricky AuthorDate: Wed Apr 5 14:51:31 2017 -0700 license.bbclass: improve reproducibility Two identical builds can end up having deploy/licenses folders that differ. This is observed in cases where there are several different license files of the same name in different folders, i.e. "COPYING". In those case we have to differentiate the files somehow and we do it via file expensions such as COPYING.0, COPYING.1. However, which file will get which extension is presently random. This means, for example, that COPYING.0 in one build is the same as COPYING.1 in the other (and vice versa). Although there is mothing wrong with this, for the sake of binary reproducibility it is preferable to have a deterministic outcome. Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 81458e7..d4be478 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -505,7 +505,7 @@ def find_license_files(d): bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF'))) # Add files from LIC_FILES_CHKSUM to list of license files lic_chksum_paths = defaultdict(OrderedDict) - for path, data in lic_chksums.items(): + for path, data in sorted(lic_chksums.items()): lic_chksum_paths[os.path.basename(path)][data] = (os.path.join(srcdir, path), data[1], data[2]) for basename, files in lic_chksum_paths.items(): if len(files) == 1: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:17 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:17 +0000 Subject: [oe-commits] [openembedded-core] 36/43: selftest/sstatetests: Replace glibc-initial with linux-libc-headers In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.332302334D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c37d610272f9d0a506334ff9f724c025acace137 Author: Richard Purdie AuthorDate: Fri Apr 7 15:26:30 2017 +0100 selftest/sstatetests: Replace glibc-initial with linux-libc-headers The intent in these tests was to find something early in the bootstrap process to run tests against which didn't require long build times. This breaks with the removal of the glibc-initial do_build target. Replacing it with linux-libc-headers seems like a good choice and simplifies the conditionals too. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/sstatetests.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/meta/lib/oeqa/selftest/sstatetests.py b/meta/lib/oeqa/selftest/sstatetests.py index 5814815..e35ddff 100644 --- a/meta/lib/oeqa/selftest/sstatetests.py +++ b/meta/lib/oeqa/selftest/sstatetests.py @@ -49,15 +49,11 @@ class SStateTests(SStateBase): @testcase(976) def test_sstate_creation_distro_nonspecific_pass(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_sstate_creation(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1375) def test_sstate_creation_distro_nonspecific_fail(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_sstate_creation(['glibc-initial'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) + self.run_test_sstate_creation(['linux-libc-headers'], distro_specific=True, distro_nonspecific=False, temp_sstate_location=True, should_pass=False) # Test the sstate files deletion part of the do_cleansstate task def run_test_cleansstate_task(self, targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True): @@ -79,23 +75,17 @@ class SStateTests(SStateBase): @testcase(977) def test_cleansstate_task_distro_specific_nonspecific(self): targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - targets.append('glibc-initial') + targets.append('linux-libc-headers') self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=True, temp_sstate_location=True) @testcase(1376) def test_cleansstate_task_distro_nonspecific(self): - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - self.run_test_cleansstate_task(['glibc-initial'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) + self.run_test_cleansstate_task(['linux-libc-headers'], distro_specific=False, distro_nonspecific=True, temp_sstate_location=True) @testcase(1377) def test_cleansstate_task_distro_specific(self): targets = ['binutils-cross-'+ self.tune_arch, 'binutils-native'] - # glibc-initial is intended only for the glibc C library - if self.tclibc == 'glibc': - targets.append('glibc-initial') + targets.append('linux-libc-headers') self.run_test_cleansstate_task(targets, distro_specific=True, distro_nonspecific=False, temp_sstate_location=True) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:07 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:07 +0000 Subject: [oe-commits] [openembedded-core] 26/43: gcc-6.3: backport fix of check for empty string in ubsan.c In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.D8BBC2334CD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a7fcbab0365b9501c737dbc02715be14dda72a3 Author: Joshua Lock AuthorDate: Thu Apr 6 14:23:14 2017 +0100 gcc-6.3: backport fix of check for empty string in ubsan.c Building gcc-cross-initial with GCC7 on the host fails due to the comparison of a pointer to an integer in ubsan_use_new_style_p, which is forbidden by ISO C++: ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] || xloc.file == '\0' || xloc.file[0] == '\xff' Backport the fix from upstream GCC to enable the build with GCC 7 Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-6.3.inc | 1 + .../gcc/gcc-6.3/ubsan-fix-check-empty-string.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-6.3.inc b/meta/recipes-devtools/gcc/gcc-6.3.inc index da7a083..71d0aff 100644 --- a/meta/recipes-devtools/gcc/gcc-6.3.inc +++ b/meta/recipes-devtools/gcc/gcc-6.3.inc @@ -84,6 +84,7 @@ SRC_URI = "\ " BACKPORTS = "\ file://CVE-2016-6131.patch \ + file://ubsan-fix-check-empty-string.patch \ " SRC_URI[md5sum] = "677a7623c7ef6ab99881bc4e048debb6" SRC_URI[sha256sum] = "f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f" diff --git a/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch new file mode 100644 index 0000000..c012719 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch @@ -0,0 +1,28 @@ +From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 +From: kyukhin +Date: Sat, 3 Sep 2016 10:57:05 +0000 +Subject: [PATCH] gcc/ * ubsan.c (ubsan_use_new_style_p): Fix check for empty + string. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk at 239971 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Signed-off-by: Joshua Lock + +--- + gcc/ubsan.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: gcc-6.3.0/gcc/ubsan.c +=================================================================== +--- gcc-6.3.0.orig/gcc/ubsan.c ++++ gcc-6.3.0/gcc/ubsan.c +@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) + + expanded_location xloc = expand_location (loc); + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 +- || xloc.file == '\0' || xloc.file[0] == '\xff' ++ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' + || xloc.file[1] == '\xff') + return false; + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:19 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:19 +0000 Subject: [oe-commits] [openembedded-core] 38/43: ncurses: Drop incorrect option In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.402062334DC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 974ddd2f99be04f44978c1bce054ed75c9367631 Author: Richard Purdie AuthorDate: Fri Apr 7 15:54:12 2017 +0100 ncurses: Drop incorrect option The --disable-static option doesn't exist in ncurses. Its equivalent is --without-normal so remove the option which does nothing. Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 3f4bf67..8990b0f 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -66,7 +66,6 @@ ncurses_configure() { cd $1 shift oe_runconf \ - --disable-static \ --without-debug \ --without-ada \ --without-gpm \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:20 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:20 +0000 Subject: [oe-commits] [openembedded-core] 39/43: uninative-flags.inc: Build binutils-native as pie In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.4689A2334DE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 80b450cca746f068dd63e4546fa4c1eef2d86a0d Author: Richard Purdie AuthorDate: Fri Apr 7 17:39:43 2017 +0100 uninative-flags.inc: Build binutils-native as pie Some distros (ubuntu 16.10, debian-testing) default to gcc configured with --enable-default-pie (see gcc -v). This breaks e.g. prelink-native on a pie default system if binutils-native was built on a system which is not pie default We therefore enable pie unconditionally for native recipes where static libs are used such as libiberty from binutils, for now, until our minimum distro set is all default pie. Signed-off-by: Richard Purdie --- meta/conf/distro/include/uninative-flags.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/distro/include/uninative-flags.inc b/meta/conf/distro/include/uninative-flags.inc index e9f82c3..b6a944e 100644 --- a/meta/conf/distro/include/uninative-flags.inc +++ b/meta/conf/distro/include/uninative-flags.inc @@ -7,3 +7,11 @@ BUILD_CXXFLAGS_append = " -D_GLIBCXX_USE_CXX11_ABI=0" # icu configure defaults to CXX11 if no -std= option is passed in CXXFLAGS # therefore pass one BUILD_CXXFLAGS_append_pn-icu-native = " -std=c++98" + +# Some distros (ubuntu 16.10, debian-testing) default to gcc configured with +# --enable-default-pie (see gcc -v). This breaks e.g. prelink-native on a pie +# default system if binutils-native was built on a system which is not pie default +# We therefore enable pie unconditionally for native recipes where static libs are +# used such as libiberty from binutils, for now, until our minimum distro set is +# all default pie. +BUILD_CFLAGS_append_pn-binutils-native = " -pie -fpie" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:13 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:13 +0000 Subject: [oe-commits] [openembedded-core] 32/43: cross.bbclass: override TARGET_* flags In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.12A012334D0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 55c83cb239df5faf5e2143fffca47f2f16931cb3 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:41 2017 +0200 cross.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a cross recipe even they are not in use at all. This can lead a lot of churn when the cross sysroot are shared by machines while they have defined different TARGET_* flags. And sometimes it even causes "Taskhash mismatch" errors. Fix it by overriding with BUILD_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/cross.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 2602153..8757303 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -28,6 +28,11 @@ MULTIMACH_TARGET_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" export PKG_CONFIG_DIR = "${exec_prefix}/lib/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "" +TARGET_CPPFLAGS = "${BUILD_CPPFLAGS}" +TARGET_CFLAGS = "${BUILD_CFLAGS}" +TARGET_CXXFLAGS = "${BUILD_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILD_LDFLAGS}" + CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:21 +0000 Subject: [oe-commits] [openembedded-core] 40/43: build-perf-test-wrapper.sh: support extra args for email script In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.4CD9E2334DF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9cdd4ea5e006fe326bdf39ea437b9ba61a66b778 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:39 2017 +0300 build-perf-test-wrapper.sh: support extra args for email script Make it possible to provide (extra) command line arguments to the oe-build-perf-test-email script via a new environment variable OE_BUILD_PERF_REPORT_EMAIL_EXTRA_ARGS. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/build-perf-test-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/contrib/build-perf-test-wrapper.sh b/scripts/contrib/build-perf-test-wrapper.sh index 49bc298..3da3253 100755 --- a/scripts/contrib/build-perf-test-wrapper.sh +++ b/scripts/contrib/build-perf-test-wrapper.sh @@ -193,7 +193,7 @@ if [ -n "$results_repo" ]; then os_name=`get_os_release_var PRETTY_NAME` oe-build-perf-report -r "$results_repo" > report.txt oe-build-perf-report -r "$results_repo" --html > report.html - "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html + "$script_dir"/oe-build-perf-report-email.py --to "$email_to" --subject "Build Perf Test Report for $os_name" --text report.txt --html report.html "${OE_BUILD_PERF_REPORT_EMAIL_EXTRA_ARGS[@]}" fi fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:22 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:22 +0000 Subject: [oe-commits] [openembedded-core] 41/43: oe-build-perf-report-email.py: use proper fallback email address In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.536E42334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5e07504d7a74f0641e2a374b9d12590ce9c9cc89 Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:40 2017 +0300 oe-build-perf-report-email.py: use proper fallback email address Use properly formatted fallback email address instead of just the username. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/contrib/oe-build-perf-report-email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/contrib/oe-build-perf-report-email.py b/scripts/contrib/oe-build-perf-report-email.py index 81b58ab..055a7b1 100755 --- a/scripts/contrib/oe-build-perf-report-email.py +++ b/scripts/contrib/oe-build-perf-report-email.py @@ -21,6 +21,7 @@ import pwd import re import shutil import smtplib +import socket import subprocess import sys import tempfile @@ -211,7 +212,8 @@ def send_email(text_fn, html_fn, subject, recipients): raise ReportError("Neither plain text nor html body specified") full_name = pwd.getpwuid(os.getuid()).pw_gecos.split(',')[0] - email = os.environ.get('EMAIL', os.getlogin()) + email = os.environ.get('EMAIL', + '{}@{}'.format(os.getlogin(), socket.getfqdn())) msg['From'] = "{} <{}>".format(full_name, email) msg['To'] = ', '.join(recipients) msg['Subject'] = subject -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:06 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:06 +0000 Subject: [oe-commits] [openembedded-core] 25/43: elfutils: fix building elfutils-native with GCC7 In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.D07BC2334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aaf4c4f3d09ac3897205417eb15e19d54e0c0d05 Author: Joshua Lock AuthorDate: Thu Apr 6 14:23:13 2017 +0100 elfutils: fix building elfutils-native with GCC7 Backport a fix from upstream for a -Wformat-truncation=2 warning and implement a simple fix for a -Wimplicit-fallthrough warning. Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- .../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 ++++++++++++++++++++++ .../elfutils/elfutils-0.168/fallthrough.patch | 36 ++++++++++++++++++ meta/recipes-devtools/elfutils/elfutils_0.168.bb | 3 ++ 3 files changed, 83 insertions(+) diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch new file mode 100644 index 0000000..d88f4eb --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch @@ -0,0 +1,44 @@ +From 93c51144c3f664d4e9709da75a1d0fa00ea0fe95 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Sun, 12 Feb 2017 21:51:34 +0100 +Subject: [PATCH] libasm: Fix one GCC7 -Wformat-truncation=2 warning. + +Make sure that if we have really lots of labels the tempsym doesn't get +truncated because it is too small to hold the whole name. + +This doesn't enable -Wformat-truncation=2 or fix other "issues" pointed +out by enabling this warning because there are currently some issues +with it. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79448 + +Signed-off-by: Mark Wielaard + +Upstream-Status: Backport (https://sourceware.org/git/?p=elfutils.git;a=commit;h=93c51144c3f664d4e9709da75a1d0fa00ea0fe95) +Signed-off-by: Joshua Lock + +--- + libasm/ChangeLog | 6 +++++- + libasm/asm_newsym.c | 6 ++++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +Index: elfutils-0.168/libasm/asm_newsym.c +=================================================================== +--- elfutils-0.168.orig/libasm/asm_newsym.c ++++ elfutils-0.168/libasm/asm_newsym.c +@@ -1,5 +1,5 @@ + /* Define new symbol for current position in given section. +- Copyright (C) 2002, 2005, 2016 Red Hat, Inc. ++ Copyright (C) 2002, 2005, 2016, 2017 Red Hat, Inc. + This file is part of elfutils. + Written by Ulrich Drepper , 2002. + +@@ -44,7 +44,9 @@ AsmSym_t * + asm_newsym (AsmScn_t *asmscn, const char *name, GElf_Xword size, + int type, int binding) + { +-#define TEMPSYMLEN 10 ++/* We don't really expect labels with many digits, but in theory it could ++ be 10 digits (plus ".L" and a zero terminator). */ ++#define TEMPSYMLEN 13 + char tempsym[TEMPSYMLEN]; + AsmSym_t *result; + diff --git a/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch b/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch new file mode 100644 index 0000000..b2623f9 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch @@ -0,0 +1,36 @@ +GCC7 adds -Wimplicit-fallthrough to warn when a switch case falls through, +however this causes warnings (which are promoted to errors) with the elfutils +patches from Debian for mips and parisc, which use fallthrough's by design. + +Explicitly mark the intentional fallthrough switch cases with a comment to +disable the warnings where the fallthrough behaviour is desired. + +Upstream-Status: Pending [debian] +Signed-off-by: Joshua Lock + +Index: elfutils-0.168/backends/parisc_retval.c +=================================================================== +--- elfutils-0.168.orig/backends/parisc_retval.c ++++ elfutils-0.168/backends/parisc_retval.c +@@ -166,7 +166,7 @@ parisc_return_value_location_ (Dwarf_Die + return nloc_intregpair; + + /* Else fall through. */ +- } ++ } // fallthrough + + case DW_TAG_structure_type: + case DW_TAG_class_type: +Index: elfutils-0.168/backends/mips_retval.c +=================================================================== +--- elfutils-0.168.orig/backends/mips_retval.c ++++ elfutils-0.168/backends/mips_retval.c +@@ -387,7 +387,7 @@ mips_return_value_location (Dwarf_Die *f + else + return nloc_intregpair; + } +- } ++ } // fallthrough + + /* Fallthrough to handle large types */ + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb index 9557933..3b8f2a3 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://0001-remove-the-unneed-checking.patch \ file://0001-fix-a-stack-usage-warning.patch \ file://aarch64_uio.patch \ + file://Fix_one_GCC7_warning.patch \ file://shadow.patch \ " @@ -35,6 +36,8 @@ SRC_URI += "\ file://debian/hurd_path.patch \ file://debian/ignore_strmerge.diff \ " +# Fix the patches from Debian with GCC7 +SRC_URI += "file://fallthrough.patch" SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch " # The buildsystem wants to generate 2 .h files from source using a binary it just built, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:11 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:11 +0000 Subject: [oe-commits] [openembedded-core] 30/43: lib/oe/sstatesig: fix finding native siginfo files in sstate-cache In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.039602334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8cb472e4ed25e56ec0d9cf6d8d101d1ab6687a5b Author: Paul Eggleton AuthorDate: Fri Apr 7 10:01:43 2017 +1200 lib/oe/sstatesig: fix finding native siginfo files in sstate-cache When comparing signatures with bitbake-diffsigs -t or bitbake -S printdiff, we use this find_siginfo() function implemented in this module to find the siginfo/sigdata files corresponding to the tasks we're looking for. However, native sstate files go into a NATIVELSBSTRING subdirectory and there was no handling for this when asking about native recipes. I'm not even sure why we were walking SSTATE_DIR in order to find this - we don't need to, we just need to run glob.glob() on the filespec we calculate, which should be a little bit more efficient. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 13fd3bd..a76a031 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -318,22 +318,15 @@ def find_siginfo(pn, taskname, taskhashlist, d): sstatename = taskname[3:] filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG'), sstatename) - if hashval != '*': - sstatedir = "%s/%s" % (d.getVar('SSTATE_DIR'), hashval[:2]) - else: - sstatedir = d.getVar('SSTATE_DIR') - - for root, dirs, files in os.walk(sstatedir): - for fn in files: - fullpath = os.path.join(root, fn) - if fnmatch.fnmatch(fullpath, filespec): - if taskhashlist: - hashfiles[hashval] = fullpath - else: - try: - filedates[fullpath] = os.stat(fullpath).st_mtime - except: - continue + matchedfiles = glob.glob(filespec) + for fullpath in matchedfiles: + if taskhashlist: + hashfiles[hashval] = fullpath + else: + try: + filedates[fullpath] = os.stat(fullpath).st_mtime + except: + continue if taskhashlist: return hashfiles -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:23 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:23 +0000 Subject: [oe-commits] [openembedded-core] 42/43: scripts/oe-build-perf-report: improve guessing of args In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.59DDF2334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7b502702be5d484c6f1f903426ba63cf04f8ca4a Author: Markus Lehtonen AuthorDate: Fri Apr 7 14:51:41 2017 +0300 scripts/oe-build-perf-report: improve guessing of args Search remote branches, too, when finding the latest commit. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/oe-build-perf-report | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index 6f2db49..ced5ff2 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -380,7 +380,7 @@ def auto_args(repo, args): """Guess arguments, if not defined by the user""" # Get the latest commit in the repo log.debug("Guessing arguments from the latest commit") - msg = repo.run_cmd(['log', '-1', '--branches', '--format=%b']) + msg = repo.run_cmd(['log', '-1', '--branches', '--remotes', '--format=%b']) for line in msg.splitlines(): split = line.split(':', 1) if len(split) != 2: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:12 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:12 +0000 Subject: [oe-commits] [openembedded-core] 31/43: lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.0AA152334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5b69eef40868180c59400624096d7ebbbbea446b Author: Paul Eggleton AuthorDate: Fri Apr 7 10:01:44 2017 +1200 lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate In find_siginfo(), which is used by bitbake-diffsigs among other things, avoid adding a siginfo file from the sstate-cache where we've already collected a sigdata file from the stamps directory with the same hash. This avoids the possibility that the top two files (as picked by default using the bitbake-diffsigs -t option) are for the same signature and thus the tool would report no differences. In order to do that, just use the hashfiles dict that we already have - we just need to change the code to populate that even if we're collecting matching files without looking for a fixed set of hashes (i.e. taskhashlist isn't set). This replaces previous code in bitbake-diffsigs that attempted to filter these out with limited success. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index a76a031..8d93013 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -254,9 +254,6 @@ def find_siginfo(pn, taskname, taskhashlist, d): import fnmatch import glob - if taskhashlist: - hashfiles = {} - if not taskname: # We have to derive pn and taskname key = pn @@ -266,8 +263,15 @@ def find_siginfo(pn, taskname, taskhashlist, d): if key.startswith('virtual:native:'): pn = pn + '-native' + hashfiles = {} filedates = {} + def get_hashval(siginfo): + if siginfo.endswith('.siginfo'): + return siginfo.rpartition(':')[2].partition('_')[0] + else: + return siginfo.rpartition('.')[2] + # First search in stamps dir localdata = d.createCopy() localdata.setVar('MULTIMACH_TARGET_SYS', '*') @@ -297,6 +301,8 @@ def find_siginfo(pn, taskname, taskhashlist, d): filedates[fullpath] = os.stat(fullpath).st_mtime except OSError: continue + hashval = get_hashval(fullpath) + hashfiles[hashval] = fullpath if not taskhashlist or (len(filedates) < 2 and not foundall): # That didn't work, look in sstate-cache @@ -320,9 +326,11 @@ def find_siginfo(pn, taskname, taskhashlist, d): matchedfiles = glob.glob(filespec) for fullpath in matchedfiles: - if taskhashlist: - hashfiles[hashval] = fullpath - else: + actual_hashval = get_hashval(fullpath) + if actual_hashval in hashfiles: + continue + hashfiles[hashval] = fullpath + if not taskhashlist: try: filedates[fullpath] = os.stat(fullpath).st_mtime except: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:16 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:16 +0000 Subject: [oe-commits] [openembedded-core] 35/43: cross-canadian.bbclass: override TARGET_* flags In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.2A8902334D6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 767335c92b7cc657a008722a908380a3c89c3c66 Author: Ming Liu AuthorDate: Thu Apr 6 14:09:44 2017 +0200 cross-canadian.bbclass: override TARGET_* flags Some TARGET_* flags are being exported in bitbake.conf currently, so they are impacting all the tasks of a cross-canadian recipe even they are not in use at all. This can lead a lot of churn when the cross-canadian sysroot are shared by machines while they have defined different TARGET_* flags. Fix it by overriding with BUILDSDK_* flags. Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 3120f46..49388d4 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -115,6 +115,11 @@ HOST_CC_ARCH = "${SDK_CC_ARCH}" HOST_LD_ARCH = "${SDK_LD_ARCH}" HOST_AS_ARCH = "${SDK_AS_ARCH}" +TARGET_CPPFLAGS = "${BUILDSDK_CPPFLAGS}" +TARGET_CFLAGS = "${BUILDSDK_CFLAGS}" +TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" +TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" + #assign DPKG_ARCH DPKG_ARCH = "${@debian_arch_map(d.getVar('SDK_ARCH'), '')}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:01 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:01 +0000 Subject: [oe-commits] [openembedded-core] 20/43: eudev: set LGPL-2.1+ for libudev package In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214842.AD6D32334C6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d9430de1b8b40b5f6cba74de20ea2bf69667e64c Author: Martin Jansa AuthorDate: Thu Apr 6 13:02:27 2017 +0200 eudev: set LGPL-2.1+ for libudev package Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/udev/eudev_3.2.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/udev/eudev_3.2.1.bb b/meta/recipes-core/udev/eudev_3.2.1.bb index 4a1a26a..bdfb544 100644 --- a/meta/recipes-core/udev/eudev_3.2.1.bb +++ b/meta/recipes-core/udev/eudev_3.2.1.bb @@ -1,6 +1,7 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" -LICENSE = "GPLv2.0+" +LICENSE = "GPLv2.0+ & LGPL-2.1+" +LICENSE_libudev = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Apr 8 21:49:24 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 08 Apr 2017 21:49:24 +0000 Subject: [oe-commits] [openembedded-core] 43/43: python-pycurl: create python3-pycurl recipe In-Reply-To: <149168812197.24617.3077768668322362353@git.openembedded.org> References: <149168812197.24617.3077768668322362353@git.openembedded.org> Message-ID: <20170408214843.6099E2334E1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6cb9c0a4e75c647b38c81d2d7217b54b2fdfd972 Author: Dmitry Rozhkov AuthorDate: Fri Apr 7 16:14:16 2017 +0300 python-pycurl: create python3-pycurl recipe The python-pycurl recipe can be used with python2 only even though python3 is officially supported by upstream. Create python3-pycurl recipe enabling the pycurl module for python3. Signed-off-by: Dmitry Rozhkov Signed-off-by: Richard Purdie --- meta/conf/distro/include/security_flags.inc | 1 + .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 ++-- .../python/python-pycurl_7.21.5.bb | 32 +--------------------- .../python/python3-pycurl_7.21.5.bb | 5 ++++ 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 6df1842..e162abe 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -76,6 +76,7 @@ SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-numpy = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-pycairo = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-python3-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3-pygpgme = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl.inc similarity index 92% copy from meta/recipes-devtools/python/python-pycurl_7.21.5.bb copy to meta/recipes-devtools/python/python-pycurl.inc index 7b41f6d..d26318b 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b8 file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" +DEPENDS = "curl ${PYTHON_PN}" +RDEPENDS_${PN} = "${PYTHON_PN}-core curl" SRCNAME = "pycurl" SRC_URI = "\ @@ -19,8 +19,6 @@ SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils - BBCLASSEXTEND = "native" # Ensure the docstrings are generated as make clean will remove them diff --git a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb index 7b41f6d..eb70cea 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.21.5.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.21.5.bb @@ -1,33 +1,3 @@ -SUMMARY = "Python bindings for libcurl" -HOMEPAGE = "http://pycurl.sourceforge.net/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1+ | MIT" -LIC_FILES_CHKSUM = "file://README.rst;beginline=166;endline=182;md5=a84a1caa65b89d4584b693d3680062fb \ - file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ - file://COPYING-MIT;md5=b7e434aeb228ed731c00bcf177e79b19" - -DEPENDS = "curl python" -RDEPENDS_${PN} = "python-core curl" -SRCNAME = "pycurl" - -SRC_URI = "\ - http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \ - file://no-static-link.patch \ -" - -SRC_URI[archive.md5sum] = "bca7bf47320082588db544ced2ba8717" -SRC_URI[archive.sha256sum] = "8a1e0eb55573388275a1d6c2534ca4cfca5d7fa772b99b505c08fa149b27aed0" -S = "${WORKDIR}/${SRCNAME}-${PV}" +require python-pycurl.inc inherit distutils - -BBCLASSEXTEND = "native" - -# Ensure the docstrings are generated as make clean will remove them -do_compile_prepend() { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py docstrings -} - -do_install_append() { - rm -rf ${D}${datadir}/share -} diff --git a/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb new file mode 100644 index 0000000..5d11192 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pycurl_7.21.5.bb @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycurl:" + +require python-pycurl.inc + +inherit distutils3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:45:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:45:27 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (cdb428e -> 2cdea6c) Message-ID: <149182472796.29501.8305081358431038022@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master in repository meta-openembedded. from cdb428e recipes: add removal date to PNBLACKLIST messages add 10e27be gpm: Update to use git src uri add 3ad787c lvm2: Fix patch errors found with musl add 82dbf3f minicoredumper: Update to 2.0.0 add bc4d1aa libqb: Upgrade to 1.0.1 release add 2ae91dd xarchiver: Fix build with security flags turned on add 401fbd9 vorbis-tools: Fix build with security flags add 6c4caee libnih: Drop SIGCLD add 10ad20d libuio: Fix build with musl add 1250668 uml-utilities: Fix problem founds during musl build add 440258c synergy: Add unzip-native depenedency to right task add 147046c corosync: Update to 2.4.2 add e562c3a logfsprogs: Pass LDFLAGS to link steps add f84a551 v4l-utils: update to 1.12.3. add cea7dff plymouth: Fix virtual RPROVIDES add 2cdea6c opencv: do not depend on swig. No new revisions were added by this update. Summary of changes: .../0001-Add-LDFLAGS-to-linker-cmdline.patch | 46 +++ .../logfsprogs/logfsprogs_git.bb | 7 +- ...error-blocking-compilation-with-hardening.patch | 26 ++ .../vorbis-tools/vorbis-tools_1.4.0.bb | 1 + meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb | 2 +- .../{corosync_2.4.0.bb => corosync_2.4.2.bb} | 4 +- ...-Remove-runtime-check-for-CLOCK_MONOTONIC.patch | 43 +++ .../libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} | 14 +- .../0001-include-fcntl.h-for-O_RDWR-define.patch | 38 +++ meta-oe/recipes-extended/libuio/libuio_0.2.1.bb | 6 +- ...uired-system-header-files-for-fd_set-and-.patch | 41 +++ .../uml-utilities/uml-utilities_20040406.bb | 5 +- ...coredumper_1.0.2.bb => minicoredumper_2.0.0.bb} | 20 +- ...a-ctl-Don-t-install-libmediactl-and-libv4.patch | 18 +- ...tem-do-not-assume-building-in-source-tree.patch | 110 +++++++ .../{v4l-utils_1.10.1.bb => v4l-utils_1.12.3.bb} | 5 +- .../gpm/gpm-1.99.7/eglibc-2.17.patch | 12 - .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 --------------------- meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 + .../recipes-support/gpm/{gpm-1.99.7 => gpm}/init | 0 .../gpm/{gpm-1.99.7 => gpm}/no-docs.patch | 2 +- .../gpm/{gpm-1.99.7 => gpm}/processcreds.patch | 0 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 53 ---- meta-oe/recipes-support/gpm/gpm_git.bb | 45 +++ ...GCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch | 28 ++ meta-oe/recipes-support/libnih/libnih_1.0.3.bb | 5 +- ...001-implement-libc-specific-reopen_stream.patch | 13 +- ...0002-Guard-use-of-mallinfo-with-__GLIBC__.patch | 13 +- meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 +- meta-oe/recipes-support/synergy/synergy_git.bb | 3 +- ...formatting-string-to-printf-like-function.patch | 40 +++ meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb | 4 +- 32 files changed, 497 insertions(+), 444 deletions(-) create mode 100644 meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch create mode 100644 meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch rename meta-oe/recipes-extended/corosync/{corosync_2.4.0.bb => corosync_2.4.2.bb} (94%) create mode 100644 meta-oe/recipes-extended/libqb/libqb/0001-Remove-runtime-check-for-CLOCK_MONOTONIC.patch rename meta-oe/recipes-extended/libqb/{libqb_0.17.2.bb => libqb_1.0.1.bb} (67%) create mode 100644 meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch create mode 100644 meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch rename meta-oe/recipes-kernel/minicoredumper/{minicoredumper_1.0.2.bb => minicoredumper_2.0.0.bb} (63%) create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.10.1.bb => v4l-utils_1.12.3.bb} (89%) delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/eglibc-2.17.patch delete mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch create mode 100644 meta-oe/recipes-support/gpm/gpm/gpm.service.in rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/init (100%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/no-docs.patch (93%) rename meta-oe/recipes-support/gpm/{gpm-1.99.7 => gpm}/processcreds.patch (100%) delete mode 100644 meta-oe/recipes-support/gpm/gpm_1.99.7.bb create mode 100644 meta-oe/recipes-support/gpm/gpm_git.bb create mode 100644 meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch create mode 100644 meta-xfce/recipes-apps/xarchiver/xarchiver/0001-Add-proper-formatting-string-to-printf-like-function.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:32 +0000 Subject: [oe-commits] [meta-openembedded] 01/15: python-gsocketpool: add new recipe In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.5F4122334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a42d2a561fc83452a9fcf117611c2b2e5aa36d36 Author: Andrej Rode AuthorDate: Wed Apr 5 18:04:51 2017 -0700 python-gsocketpool: add new recipe Adds recipe for python-gsocketpool as a dependency for python-mprpc Signed-off-by: Andrej Rode Signed-off-by: Martin Jansa --- .../python-gsocketpool/python-gsocketpool_0.1.5.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.5.bb b/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.5.bb new file mode 100644 index 0000000..ae7f264 --- /dev/null +++ b/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.5.bb @@ -0,0 +1,12 @@ +SUMMARY = "A simple connection pool for gevent" +DESCRIPTION = "creates a pool of connections that can be used with gevent" +HOMEPAGE = "https://github.com/studio-ousia/gsocketpool" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ba825394aec026b5f94edca44426859" +DEPENDS += "python-gevent" +RDEPENDS_${PN} += "python-gevent" + +SRC_URI[md5sum] = "04f618864b18d6b06f774994f172ef49" +SRC_URI[sha256sum] = "b6b73deab9bcbc428d4813697eebe5c3b9c40a971f62e13607b881aa749af9d0" + +inherit pypi setuptools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:35 +0000 Subject: [oe-commits] [meta-openembedded] 04/15: uftp: Add recipe In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.770F42334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit b4482572004c36af587190bd09fcfe4be8498b72 Author: Jaap de Jong AuthorDate: Thu Apr 6 12:17:09 2017 +0200 uftp: Add recipe To: openembedded-devel at lists.openembedded.org Signed-off-by: Martin Jansa --- meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta-networking/recipes-support/uftp/uftp_4.9.3.bb b/meta-networking/recipes-support/uftp/uftp_4.9.3.bb new file mode 100644 index 0000000..1166f9a --- /dev/null +++ b/meta-networking/recipes-support/uftp/uftp_4.9.3.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Encrypted UDP based FTP with multicast" +HOMEPAGE = "https://sourceforge.net/projects/uftp-multicast" +SECTION = "libs/network" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${SOURCEFORGE_MIRROR}/uftp-multicast/source-tar/uftp-${PV}.tar.gz" +SRC_URI[md5sum] = "231d6ba7820d89a712fe7d727ab0f8e6" +SRC_URI[sha256sum] = "9e9215af0315257c6cc4f40fbc6161057e861be1fff10a38a5564f699e99c78f" + +DEPENDS = "openssl" + +do_install () { + oe_runmake install DESTDIR=${D} +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:33 +0000 Subject: [oe-commits] [meta-openembedded] 02/15: python-mprpc: add new recipe In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.66C122334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 2e157929d6fae92558ae3237af60629fe70ad912 Author: Andrej Rode AuthorDate: Wed Apr 5 18:04:52 2017 -0700 python-mprpc: add new recipe Add recipe for python-mprpc, a messagepack RPC library for python Signed-off-by: Andrej Rode Signed-off-by: Martin Jansa --- .../python-mprpc/python-mprpc_0.1.13.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.13.bb b/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.13.bb new file mode 100644 index 0000000..88f11b7 --- /dev/null +++ b/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.13.bb @@ -0,0 +1,13 @@ +SUMMARY = "A gevent based messagpack rpc library" +DESCRIPTION = "mprpc is a fast implementation of the messagepack rpc protocol for python. \ +It is based on gevent for handling connections and enabling concurrent connections." +HOMEPAGE = "https://github.com/studio-ousia/mprpc" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ba825394aec026b5f94edca44426859" +DEPENDS += "python-gevent" +RDEPENDS_${PN} += "python-gevent python-msgpack python-gsocketpool" + +SRC_URI[md5sum] = "449e6239eb5ff07b9cceb86e1ab0c2ee" +SRC_URI[sha256sum] = "5881cc7fbb8de814e2b4aa5958bfe147c5c301e46749190f0e6abf373cf56d82" + +inherit pypi setuptools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:34 +0000 Subject: [oe-commits] [meta-openembedded] 03/15: f2fs-tools: Update to Version 1.8.0 In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.700502334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 90edc47a2da08470a788cd5f6250805fc9ef866a Author: Yong, Jonathan AuthorDate: Thu Apr 6 08:41:29 2017 +0000 f2fs-tools: Update to Version 1.8.0 Signed-off-by: Yong, Jonathan Signed-off-by: Martin Jansa --- .../0002-Fix-mkfs-out-of-tree-builds.patch | 37 ++++++++++++++++++++++ .../{f2fs-tools_1.4.0.bb => f2fs-tools_1.8.0.bb} | 5 +-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch new file mode 100644 index 0000000..9e561cb --- /dev/null +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch @@ -0,0 +1,37 @@ +From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001 +From: "Yong, Jonathan" +Date: Thu, 30 Mar 2017 08:03:37 +0000 +Subject: [PATCH] Fix mkfs out of tree builds + +Libraries are built in builddir, not srcdir, fix Makefile.am +accordingly. + +Signed-off-by: Yong, Jonathan +Signed-off-by: Jaegeuk Kim + +The patch was imported from the f2fs-tools repo +(git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git) +commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a. + +Upstream-Status: Accepted, expected to be included in 1.9.0. + +Signed-off-by: Yong, Jonathan + +--- + mkfs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am +index 162a0cf..0ea8b49 100644 +--- a/mkfs/Makefile.am ++++ b/mkfs/Makefile.am +@@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la + libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c + libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD + libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include +-libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \ ++libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \ + -version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE) +-- +2.10.2 + diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb similarity index 81% rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb index 1a558e7..691cb6e 100644 --- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.4.0.bb +++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid DEPENDS = "util-linux" -SRCREV = "baac4b4e6f41ceb02511da49dd3707674f3fea21" +SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \ - file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch" + file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \ + file://0002-Fix-mkfs-out-of-tree-builds.patch" S = "${WORKDIR}/git" inherit pkgconfig autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:41 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:41 +0000 Subject: [oe-commits] [meta-openembedded] 10/15: jack: remove (non-existing) package jack from dependencies of jack-dev In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.AA4692334B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 02a5014fb0f6fe21c42eee6a98b99e17377f38c6 Author: Florian Wickert AuthorDate: Fri Apr 7 09:57:47 2017 +0200 jack: remove (non-existing) package jack from dependencies of jack-dev jack-dev depends on jack, which does not exist. This patch removes this dependency. Signed-off-by: Florian Wickert Signed-off-by: Martin Jansa --- meta-oe/recipes-multimedia/jack/jack_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb index be5f7bb..f0e91eb 100644 --- a/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-oe/recipes-multimedia/jack/jack_git.bb @@ -34,6 +34,8 @@ EXTRA_OECONF = "--portaudio=no" PACKAGES =+ "libjack jack-server jack-utils" +RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" + FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" FILES_jack-server = "${bindir}/jackd" FILES_jack-utils = "${bindir}/*" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:31 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (d128374 -> ac433ce) Message-ID: <149182497111.30339.10763465188123418617@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a change to branch master-next in repository meta-openembedded. from d128374 ntimed: Use adjtimex on musl new a42d2a5 python-gsocketpool: add new recipe new 2e15792 python-mprpc: add new recipe new 90edc47 f2fs-tools: Update to Version 1.8.0 new b448257 uftp: Add recipe new 1446151 gd : CVE-2016-10166 new a7cfd07 python-paho-mqtt: make recipe available as python3 version new 5c759ac tinyproxy: Add recipe new cef662c nfacct: fixed SRC_URI and dropped workdir statement new 1c9fbae librcf: install missing SF headers new 02a5014 jack: remove (non-existing) package jack from dependencies of jack-dev new 9c0837e gd : CVE-2016-10167, CVE-2016-10168 new 3a35b31 python-pyalsaaudio: Extend recipe to support Python 3 new a08189e fbida: Fix compile-host-path error new d8009ab postfix: do NOT create directory /var/spool/mail new ac433ce waf-samba.bbclass: redefine WAF_CROSS_ANSWERS_PATH The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../0002-Fix-mkfs-out-of-tree-builds.patch | 37 +++++++++++++ .../{f2fs-tools_1.4.0.bb => f2fs-tools_1.8.0.bb} | 5 +- meta-networking/classes/waf-samba.bbclass | 1 + meta-networking/conf/layer.conf | 3 -- .../recipes-daemons/postfix/postfix.inc | 2 - .../recipes-filter/nfacct/nfacct_1.0.2.bb | 4 +- .../tinyproxy/tinyproxy/tinyproxy.service | 14 +++++ .../recipes-support/tinyproxy/tinyproxy_1.8.4.bb | 41 +++++++++++++++ meta-networking/recipes-support/uftp/uftp_4.9.3.bb | 16 ++++++ .../librcf/librcf/0001-Add-CMake-build-files.patch | 7 +-- meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 4 +- .../fbida/files/0001-Avoid-using-host-path.patch | 34 ++++++++++++ meta-oe/recipes-multimedia/jack/jack_git.bb | 2 + meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch | 60 ++++++++++++++++++++++ meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch | 48 +++++++++++++++++ meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch | 38 ++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.3.bb | 5 +- .../python-gsocketpool/python-gsocketpool_0.1.5.bb | 12 +++++ .../python-mprpc/python-mprpc_0.1.13.bb | 13 +++++ ...ython-paho-mqtt_1.2.bb => python-paho-mqtt.inc} | 13 +++-- .../python/python-paho-mqtt_1.2.bb | 16 +----- ...pyalsaaudio_0.8.4.bb => python-pyalsaaudio.inc} | 2 - .../python/python-pyalsaaudio_0.8.4.bb | 13 +---- .../python/python3-paho-mqtt_1.2.bb | 3 ++ .../python/python3-pyalsaaudio_0.8.4.bb | 2 + 25 files changed, 345 insertions(+), 50 deletions(-) create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.4.0.bb => f2fs-tools_1.8.0.bb} (81%) create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service create mode 100644 meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb create mode 100644 meta-networking/recipes-support/uftp/uftp_4.9.3.bb create mode 100644 meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch create mode 100644 meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.5.bb create mode 100644 meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.13.bb copy meta-python/recipes-devtools/python/{python-paho-mqtt_1.2.bb => python-paho-mqtt.inc} (73%) copy meta-python/recipes-devtools/python/{python-pyalsaaudio_0.8.4.bb => python-pyalsaaudio.inc} (93%) create mode 100644 meta-python/recipes-devtools/python/python3-paho-mqtt_1.2.bb create mode 100644 meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:38 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:38 +0000 Subject: [oe-commits] [meta-openembedded] 07/15: tinyproxy: Add recipe In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.91AA72334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 5c759ac7f591c6a17ebb8f91f9bbcf679b58040e Author: Benjamin Gaignard AuthorDate: Thu Apr 6 15:42:25 2017 +0200 tinyproxy: Add recipe Signed-off-by: Benjamin Gaignard Signed-off-by: Martin Jansa --- .../tinyproxy/tinyproxy/tinyproxy.service | 14 ++++++++ .../recipes-support/tinyproxy/tinyproxy_1.8.4.bb | 41 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service new file mode 100644 index 0000000..ea079f9 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service @@ -0,0 +1,14 @@ +[Unit] +Description=Tinyproxy, Lightweight http(s) proxy daemon +RequiresMountsFor=/var + +[Service] +Group=tinyproxy +ExecStartPre=/bin/mkdir -p /var/log/tinyproxy +ExecStartPre=/bin/chown -R nobody.tinyproxy /var/log/tinyproxy +ExecStartPre=/bin/mkdir -p /var/run/tinyproxy +ExecStartPre=/bin/chown -R nobody.tinyproxy /var/run/tinyproxy +ExecStart=/usr/sbin/tinyproxy -d + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb new file mode 100644 index 0000000..ef2a2d8 --- /dev/null +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb @@ -0,0 +1,41 @@ +SUMMARY = "Lightweight http(s) proxy daemon" +HOMEPAGE = "https://tinyproxy.github.io/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ + file://tinyproxy.service" + +SRC_URI[md5sum] = "3b60f7d08e0821ed1a3e2cf1e5778cac" +SRC_URI[sha256sum] = "8234c879a129feee61efa98bac14a1a3e46e5cf08f01696a216940872aa70faf" + +DEPENDS = "asciidoc-native" + +EXTRA_OECONF += " \ + --enable-filter \ + --enable-transparent \ + --disable-regexcheck \ + --enable-reverse \ + --enable-upstream \ + --enable-xtinyproxy \ + " + +inherit autotools systemd useradd + +#User specific +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "nobody" +GROUPADD_PARAM_${PN} = "--system tinyproxy" + +SYSTEMD_PACKAGES += "${BPN}" +SYSTEMD_SERVICE_${PN} = "tinyproxy.service" +SYSTEMD_AUTO_ENABLE_${PN} = "enable" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} + fi +} + +FILES_${PN} =+ "${systemd_system_unitdir}/tinyproxy.service" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:39 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:39 +0000 Subject: [oe-commits] [meta-openembedded] 08/15: nfacct: fixed SRC_URI and dropped workdir statement In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.9824D2334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit cef662c5580a9fb7788fb234c52f6c45f5dd45ed Author: Oliver Graute AuthorDate: Thu Apr 6 16:44:51 2017 +0200 nfacct: fixed SRC_URI and dropped workdir statement Signed-off-by: Oliver Graute Signed-off-by: Martin Jansa --- meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb b/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb index d92f7c0..8177ebc 100644 --- a/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb +++ b/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://netfilter.org/projects/nfacct/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -SRC_URI = "ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2" +SRC_URI = "ftp://ftp.netfilter.org/pub/${BPN}/${BP}.tar.bz2" SRC_URI[md5sum] = "94faafdaaed85ca9220c5692be8a408e" SRC_URI[sha256sum] = "ecff2218754be318bce3c3a5d1775bab93bf4168b2c4aac465785de5655fbd69" @@ -11,7 +11,5 @@ DEPENDS = "libnfnetlink libmnl libnetfilter-acct" EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' -S = "${WORKDIR}/nfacct-${PV}" - inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:40 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:40 +0000 Subject: [oe-commits] [meta-openembedded] 09/15: librcf: install missing SF headers In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.A16A42334B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 1c9fbaed97e21171d4b51268bf2d5cae152ee44a Author: Ming Liu AuthorDate: Fri Apr 7 08:33:43 2017 +0200 librcf: install missing SF headers A flaw was introduced by commit 414426a3: [ librcf: add new recipe ] in which, the SF headers wasn't installed, this could cause build errors in projects that compiling/linking to librcf while librcf was built with LIBRCF_USE_SF_SERIALIZATION option enabled. Signed-off-by: Ming Liu Signed-off-by: Martin Jansa --- .../librcf/librcf/0001-Add-CMake-build-files.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch b/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch index 34d0f62..cd0d143 100644 --- a/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch +++ b/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch @@ -10,8 +10,8 @@ Signed-off-by: Peter Liu CMakeLists.txt | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++ FindLibRcf.cmake | 63 +++++++++++++++++++++++ VERSION.cmake | 21 ++++++++ - src/CMakeLists.txt | 24 +++++++++ - 4 files changed, 255 insertions(+) + src/CMakeLists.txt | 25 +++++++++ + 4 files changed, 256 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 FindLibRcf.cmake create mode 100644 VERSION.cmake @@ -271,7 +271,7 @@ new file mode 100755 index 0000000..c227901 --- /dev/null +++ b/src/CMakeLists.txt -@@ -0,0 +1,24 @@ +@@ -0,0 +1,25 @@ +IF (NOT LIBRCF_BUILD_SHARED_LIBS) + ADD_LIBRARY (rcf STATIC RCF/RCF.cpp) +ELSE (NOT LIBRCF_BUILD_SHARED_LIBS) @@ -287,6 +287,7 @@ index 0000000..c227901 +SET_TARGET_PROPERTIES (rcf PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}) + +INSTALL (DIRECTORY "${CMAKE_SOURCE_DIR}/include/RCF" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++INSTALL (DIRECTORY "${CMAKE_SOURCE_DIR}/include/SF" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +INSTALL (TARGETS rcf LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +IF (LIBRCF_BUILD_STATIC_LIBS AND LIBRCF_BUILD_SHARED_LIBS) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:36 +0000 Subject: [oe-commits] [meta-openembedded] 05/15: gd : CVE-2016-10166 In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.821F62334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 14461519a9f73eeeae2adf65dbfee69192fdeba8 Author: Catalin Enache AuthorDate: Thu Apr 6 14:08:36 2017 +0300 gd : CVE-2016-10166 Integer underflow in the _gdContributionsAlloc function in gd_interpolation.c in the GD Graphics Library (aka libgd) before 2.2.4 allows remote attackers to have unspecified impact via vectors related to decrementing the u variable. Reference: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10166 Upstream patch: https://github.com/libgd/libgd/commit/60bfb401ad5a4a8ae995dcd36372fe15c71e1a35 Signed-off-by: Catalin Enache Signed-off-by: Martin Jansa --- meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch | 60 ++++++++++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.3.bb | 3 +- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch b/meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch new file mode 100644 index 0000000..7ccfbea --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2016-10166.patch @@ -0,0 +1,60 @@ +From c92240c1670c20c2f854761d3a89ab61dd158c91 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" +Date: Sat, 6 Aug 2016 10:08:53 +0200 +Subject: [PATCH] Fix potential unsigned underflow + +No need to decrease `u`, so we don't do it. While we're at it, we also factor +out the overflow check of the loop, what improves performance and readability. + +This issue has been reported by Stefan Esser to security at libgd.org. + +Upstream-Status: Backport +CVE: CVE-2016-10166 + +Signed-off-by: Catalin Enache +--- + src/gd_interpolation.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c +index 7e7943d..9944349 100644 +--- a/src/gd_interpolation.c ++++ b/src/gd_interpolation.c +@@ -829,8 +829,13 @@ static inline LineContribType * _gdContributionsAlloc(unsigned int line_length, + { + unsigned int u = 0; + LineContribType *res; +- int overflow_error = 0; ++ size_t weights_size; + ++ if (overflow2(windows_size, sizeof(double))) { ++ return NULL; ++ } else { ++ weights_size = windows_size * sizeof(double); ++ } + res = (LineContribType *) gdMalloc(sizeof(LineContribType)); + if (!res) { + return NULL; +@@ -847,15 +852,11 @@ static inline LineContribType * _gdContributionsAlloc(unsigned int line_length, + return NULL; + } + for (u = 0 ; u < line_length ; u++) { +- if (overflow2(windows_size, sizeof(double))) { +- overflow_error = 1; +- } else { +- res->ContribRow[u].Weights = (double *) gdMalloc(windows_size * sizeof(double)); +- } +- if (overflow_error == 1 || res->ContribRow[u].Weights == NULL) { ++ res->ContribRow[u].Weights = (double *) gdMalloc(weights_size); ++ if (res->ContribRow[u].Weights == NULL) { + unsigned int i; +- u--; +- for (i=0;i<=u;i++) { ++ ++ for (i=0;iContribRow[i].Weights); + } + gdFree(res->ContribRow); +-- +2.10.2 + diff --git a/meta-oe/recipes-support/gd/gd_2.2.3.bb b/meta-oe/recipes-support/gd/gd_2.2.3.bb index c5aff66..4ff6b756 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.3.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.3.bb @@ -13,7 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c97638cafd3581eb87abd37332137669" DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ - file://fix-gcc-unused-functions.patch" + file://fix-gcc-unused-functions.patch \ + file://CVE-2016-10166.patch" SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:44 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:44 +0000 Subject: [oe-commits] [meta-openembedded] 13/15: fbida: Fix compile-host-path error In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.C09C32334BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a08189e86c5d60d92bbd346e0afb3fda2db85248 Author: Marek Vasut AuthorDate: Fri Apr 7 23:36:46 2017 +0200 fbida: Fix compile-host-path error Remove the explicit reference to /usr/local/* in Variables.mk. This is completely bogus and causes failure during cross-compilation. Signed-off-by: Marek Vasut Signed-off-by: Martin Jansa --- meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 4 ++- .../fbida/files/0001-Avoid-using-host-path.patch | 34 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb index 2322476..eb31f7b 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" -SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz" +SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ + file://0001-Avoid-using-host-path.patch \ + " SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6" diff --git a/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch b/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch new file mode 100644 index 0000000..cdf2c25 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch @@ -0,0 +1,34 @@ +From 8d8fa9f22d9f6a95523bac63ac3af724faf5ff92 Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Fri, 7 Apr 2017 23:26:09 +0200 +Subject: [PATCH] Avoid using host-path + +Remove the explicit reference to /usr/local/* , this is completely +bogus and causes trouble during cross-compilation. + +Signed-off-by: Marek Vasut +Upstream-Status: Inappropriate [upstream requires this] +--- + mk/Variables.mk | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/mk/Variables.mk b/mk/Variables.mk +index 99f787c..3ffd87a 100644 +--- a/mk/Variables.mk ++++ b/mk/Variables.mk +@@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ + -Wpointer-arith -Wunused + CXXFLAGS += -Wall -Wpointer-arith -Wunused + +-# add /usr/local to the search path if something is in there ... +-ifneq ($(wildcard /usr/local/include/*.h),) +- CFLAGS += -I/usr/local/include +- LDFLAGS += -L/usr/local/$(LIB) +-endif +- + # fixup include path for $(srcdir) != "." + ifneq ($(srcdir),.) + CFLAGS += -I. -I$(srcdir) +-- +2.11.0 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:37 +0000 Subject: [oe-commits] [meta-openembedded] 06/15: python-paho-mqtt: make recipe available as python3 version In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.8B30D2334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit a7cfd0732554eb3d68913e6a2dfc6c39d6ed5a2b Author: Pascal Bach AuthorDate: Thu Apr 6 14:05:21 2017 +0200 python-paho-mqtt: make recipe available as python3 version Signed-off-by: Pascal Bach Signed-off-by: Martin Jansa --- .../{python-paho-mqtt_1.2.bb => python-paho-mqtt.inc} | 13 ++++++------- .../recipes-devtools/python/python-paho-mqtt_1.2.bb | 16 ++-------------- .../recipes-devtools/python/python3-paho-mqtt_1.2.bb | 3 +++ 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb b/meta-python/recipes-devtools/python/python-paho-mqtt.inc similarity index 73% copy from meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb copy to meta-python/recipes-devtools/python/python-paho-mqtt.inc index c8acfc5..7ff3fb2 100644 --- a/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb +++ b/meta-python/recipes-devtools/python/python-paho-mqtt.inc @@ -3,13 +3,12 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eb48c6ee2cb9f5b8b9fe75e6f817bdfc" SRCNAME = "paho-mqtt" -inherit pypi setuptools +inherit pypi +SRC_URI[md5sum] = "241150b3fcb920ddca4d33181f3238b1" +SRC_URI[sha256sum] = "9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f" RDEPENDS_${PN} = "\ - python-math \ - python-io \ - python-threading \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-threading \ " - -SRC_URI[md5sum] = "241150b3fcb920ddca4d33181f3238b1" -SRC_URI[sha256sum] = "9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f" diff --git a/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb b/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb index c8acfc5..f369b2e 100644 --- a/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb +++ b/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb @@ -1,15 +1,3 @@ -SUMMARY = "MQTT version 3.1/3.1.1 client library" -LICENSE = "EPL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eb48c6ee2cb9f5b8b9fe75e6f817bdfc" -SRCNAME = "paho-mqtt" +inherit setuptools +require python-paho-mqtt.inc -inherit pypi setuptools - -RDEPENDS_${PN} = "\ - python-math \ - python-io \ - python-threading \ -" - -SRC_URI[md5sum] = "241150b3fcb920ddca4d33181f3238b1" -SRC_URI[sha256sum] = "9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f" diff --git a/meta-python/recipes-devtools/python/python3-paho-mqtt_1.2.bb b/meta-python/recipes-devtools/python/python3-paho-mqtt_1.2.bb new file mode 100644 index 0000000..4981e61 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-paho-mqtt_1.2.bb @@ -0,0 +1,3 @@ +inherit setuptools3 +require python-paho-mqtt.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:43 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:43 +0000 Subject: [oe-commits] [meta-openembedded] 12/15: python-pyalsaaudio: Extend recipe to support Python 3 In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.B9D172334B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 3a35b31b5ee09bee580e3bf4482ff66a2e205336 Author: Stefan Agner AuthorDate: Fri Apr 7 10:32:22 2017 -0700 python-pyalsaaudio: Extend recipe to support Python 3 alsaaudio support Python 3 already, add a Python 3 recipe so we can build alsaaudio for Python 3. Signed-off-by: Stefan Agner Signed-off-by: Martin Jansa --- .../{python-pyalsaaudio_0.8.4.bb => python-pyalsaaudio.inc} | 2 -- .../recipes-devtools/python/python-pyalsaaudio_0.8.4.bb | 13 +------------ .../recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb | 2 ++ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb b/meta-python/recipes-devtools/python/python-pyalsaaudio.inc similarity index 93% copy from meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb copy to meta-python/recipes-devtools/python/python-pyalsaaudio.inc index b443570..d150409 100644 --- a/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb +++ b/meta-python/recipes-devtools/python/python-pyalsaaudio.inc @@ -8,6 +8,4 @@ SRC_URI[sha256sum] = "84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ec DEPENDS += "alsa-lib" -inherit pypi setuptools - RDEPENDS_${PN} += "libasound" diff --git a/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb b/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb index b443570..e515342 100644 --- a/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb +++ b/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb @@ -1,13 +1,2 @@ -SUMMARY = "Support for the Linux 2.6.x ALSA Sound System" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1a3b161aa0fcec32a0c8907a2219ad9d" - -SRC_URI[md5sum] = "b46f69561bc85fc52e698b2440ca251e" -SRC_URI[sha256sum] = "84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085" - -DEPENDS += "alsa-lib" - +require python-pyalsaaudio.inc inherit pypi setuptools - -RDEPENDS_${PN} += "libasound" diff --git a/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb b/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb new file mode 100644 index 0000000..b7da1a4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb @@ -0,0 +1,2 @@ +require python-pyalsaaudio.inc +inherit pypi setuptools3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:45 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:45 +0000 Subject: [oe-commits] [meta-openembedded] 14/15: postfix: do NOT create directory /var/spool/mail In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.C7FB72334BC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit d8009abc81a432cf91168f59cfc43e816ad0c04d Author: Kai Kang AuthorDate: Mon Apr 10 10:18:15 2017 +0800 postfix: do NOT create directory /var/spool/mail postfix installs directory /var/spool/mail which conflicts with package shadow. | Error: Transaction check error: | file /var/spool/mail conflicts between attempted installs of | postfix-3.1.1-r0.ppc64e6500 and shadow-4.2.1-r0.1.ppc64e6500 Make postfix not create /var/spool/mail that it does NOT create the directory on Fedora and Ubuntu either. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- meta-networking/recipes-daemons/postfix/postfix.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 5bb2491..4c794ff 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -164,8 +164,6 @@ do_install () { install -m 770 -d ${D}${localstatedir}/spool/postfix chown postfix:postfix ${D}${localstatedir}/spool/postfix - install -m 2755 -d ${D}${localstatedir}/spool/mail - chown postfix:nogroup ${D}${localstatedir}/spool/mail install -m 0755 -d ${D}${localstatedir}/lib/postfix chown postfix:nogroup ${D}${localstatedir}/lib/postfix install -m 0755 -d ${D}${localstatedir}/spool/postfix -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:46 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:46 +0000 Subject: [oe-commits] [meta-openembedded] 15/15: waf-samba.bbclass: redefine WAF_CROSS_ANSWERS_PATH In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.D04CF2334BE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit ac433ce67b6a893d0b9dc74fdf533869e096da53 Author: Mingli Yu AuthorDate: Mon Apr 10 14:04:17 2017 +0800 waf-samba.bbclass: redefine WAF_CROSS_ANSWERS_PATH * Redefine WAF_CROSS_ANSWERS_PATH in waf-samba.bbclass to fix checksum mismatch for those packages which inherit waf-samba.bbclass when install eSDK # bitbake-diffsigs $Prj/build/sdkext_dir/tmp/stamps/core2-64-wrs-linux/libtalloc/2.1.8-r0.do_configure.sigdata.8a0fd2871f1e464f4586c32f0e67378f $Prj/build/tmp/stamps/core2-64-wrs-linux/libtalloc/2.1.8-r0.do_configure.sigdata.16b87e6ddccb52ca5e988e928f111e5a basehash changed from ea2fea38e7efe710a11fa9d13c7ad94c to 943a7ead4ed10ce794532a942569bcf9 Variable WAF_CROSS_ANSWERS_PATH value changed from '$Prj/build/sdkext_dir/layers/meta-networking/files/waf-cross-answers' to '$Prj/layers/meta-openembedded/meta-networking/files/waf-cross-answers' * Remove the previous WAF_CROSS_ANSWERS_PATH definition in layer.conf Signed-off-by: Mingli Yu Signed-off-by: Martin Jansa --- meta-networking/classes/waf-samba.bbclass | 1 + meta-networking/conf/layer.conf | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass index b94ed48..e490176 100644 --- a/meta-networking/classes/waf-samba.bbclass +++ b/meta-networking/classes/waf-samba.bbclass @@ -45,6 +45,7 @@ CROSS_METHOD ?= "answer" do_configure() { # Prepare the cross-answers file + WAF_CROSS_ANSWERS_PATH="${THISDIR}/../../files/waf-cross-answers" CROSS_ANSWERS="${B}/cross-answers-${TARGET_ARCH}.txt" if [ -e ${CROSS_ANSWERS} ]; then rm -f ${CROSS_ANSWERS} diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index c09ba4a..85ad93b 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -19,8 +19,5 @@ LAYERDEPENDS_networking-layer += "meta-python" LICENSE_PATH += "${LAYERDIR}/licenses" -# used by waf-samba.bbclass -WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers" - # Override security flags require conf/distro/include/meta_networking_security_flags.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 11:49:42 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 11:49:42 +0000 Subject: [oe-commits] [meta-openembedded] 11/15: gd : CVE-2016-10167, CVE-2016-10168 In-Reply-To: <149182497111.30339.10763465188123418617@git.openembedded.org> References: <149182497111.30339.10763465188123418617@git.openembedded.org> Message-ID: <20170410114931.B39CB2334B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. martin_jansa pushed a commit to branch master-next in repository meta-openembedded. commit 9c0837ea8b3a78898cb20d0a2eb1db4e3aac110f Author: Catalin Enache AuthorDate: Fri Apr 7 13:10:53 2017 +0300 gd : CVE-2016-10167, CVE-2016-10168 The gdImageCreateFromGd2Ctx function in gd_gd2.c in the GD Graphics Library (aka libgd) before 2.2.4 allows remote attackers to cause a denial of service (application crash) via a crafted image file. Integer overflow in gd_io.c in the GD Graphics Library (aka libgd) before 2.2.4 allows remote attackers to have unspecified impact via vectors involving the number of horizontal and vertical chunks in an image. References: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10167 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10168 Upstream patches: https://github.com/libgd/libgd/commit/fe9ed49dafa993e3af96b6a5a589efeea9bfb36f https://github.com/libgd/libgd/commit/69d2fd2c597ffc0c217de1238b9bf4d4bceba8e6 Signed-off-by: Catalin Enache Signed-off-by: Martin Jansa --- meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch | 48 ++++++++++++++++++++++ meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch | 38 +++++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.3.bb | 4 +- 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch b/meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch new file mode 100644 index 0000000..54ef22c --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2016-10167.patch @@ -0,0 +1,48 @@ +From 6ab531ef0d82efb9e00236ee5ea23928335d221f Mon Sep 17 00:00:00 2001 +From: Catalin Enache +Date: Fri, 7 Apr 2017 12:30:22 +0300 +Subject: [PATCH] Fix DOS vulnerability in gdImageCreateFromGd2Ctx() + +We must not pretend that there are image data if there are none. Instead +we fail reading the image file gracefully. + +Upstream-Status: Backport +CVE: CVE-2016-10167 + +Signed-off-by: Catalin Enache +--- + src/gd_gd2.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/gd_gd2.c b/src/gd_gd2.c +index 8df93c1..bae65ea 100644 +--- a/src/gd_gd2.c ++++ b/src/gd_gd2.c +@@ -445,18 +445,16 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2Ctx (gdIOCtxPtr in) + + if (im->trueColor) { + if (!gdGetInt (&im->tpixels[y][x], in)) { +- /*printf("EOF while reading\n"); */ +- /*gdImageDestroy(im); */ +- /*return 0; */ +- im->tpixels[y][x] = 0; ++ gd_error("gd2: EOF while reading\n"); ++ gdImageDestroy(im); ++ return NULL; + } + } else { + int ch; + if (!gdGetByte (&ch, in)) { +- /*printf("EOF while reading\n"); */ +- /*gdImageDestroy(im); */ +- /*return 0; */ +- ch = 0; ++ gd_error("gd2: EOF while reading\n"); ++ gdImageDestroy(im); ++ return NULL; + } + im->pixels[y][x] = ch; + } +-- +2.10.2 + diff --git a/meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch b/meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch new file mode 100644 index 0000000..aef1060 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2016-10168.patch @@ -0,0 +1,38 @@ +From 2d37bdc03a6e2b820fe380016f22592a7733e0be Mon Sep 17 00:00:00 2001 +From: Catalin Enache +Date: Fri, 7 Apr 2017 12:32:49 +0300 +Subject: [PATCH] Fix #354: Signed Integer Overflow gd_io.c + +GD2 stores the number of horizontal and vertical chunks as words (i.e. 2 +byte unsigned). These values are multiplied and assigned to an int when +reading the image, what can cause integer overflows. We have to avoid +that, and also make sure that either chunk count is actually greater +than zero. If illegal chunk counts are detected, we bail out from +reading the image. + +Upstream-Status: Backport +CVE: CVE-2016-10168 + +Signed-off-by: Catalin Enache +--- + src/gd_gd2.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gd_gd2.c b/src/gd_gd2.c +index bae65ea..9006bd2 100644 +--- a/src/gd_gd2.c ++++ b/src/gd_gd2.c +@@ -151,6 +151,10 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy, + GD2_DBG (printf ("%d Chunks vertically\n", *ncy)); + + if (gd2_compressed (*fmt)) { ++ if (*ncx <= 0 || *ncy <= 0 || *ncx > INT_MAX / *ncy) { ++ GD2_DBG(printf ("Illegal chunk counts: %d * %d\n", *ncx, *ncy)); ++ goto fail1; ++ } + nc = (*ncx) * (*ncy); + + GD2_DBG (printf ("Reading %d chunk index entries\n", nc)); +-- +2.10.2 + diff --git a/meta-oe/recipes-support/gd/gd_2.2.3.bb b/meta-oe/recipes-support/gd/gd_2.2.3.bb index 4ff6b756..4e21d53 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.3.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.3.bb @@ -14,7 +14,9 @@ DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ file://fix-gcc-unused-functions.patch \ - file://CVE-2016-10166.patch" + file://CVE-2016-10166.patch \ + file://CVE-2016-10167.patch \ + file://CVE-2016-10168.patch" SRCREV = "46ceef5970bf3a847ff61d1bdde7501d66c11d0c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 16:03:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 16:03:58 +0000 Subject: [oe-commits] [openembedded-core] 01/02: oeqa/selftest: Don't use cleanup-workdir In-Reply-To: <149184023715.11157.12783227871747360042@git.openembedded.org> References: <149184023715.11157.12783227871747360042@git.openembedded.org> Message-ID: <20170410160357.40BD52334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b20ed70b68509b012f4c68b6711870b9b32319a9 Author: Richard Purdie AuthorDate: Mon Apr 10 16:58:48 2017 +0100 oeqa/selftest: Don't use cleanup-workdir Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/buildoptions.py | 2 -- meta/lib/oeqa/selftest/oescripts.py | 1 - 2 files changed, 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index d155f64..a6e0203 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py @@ -163,7 +163,6 @@ class BuildhistoryTests(BuildhistoryBase): @testcase(294) def test_buildhistory_buildtime_pr_backwards(self): - self.add_command_to_tearDown('cleanup-workdir') target = 'xcursor-transparent-theme' error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds from (.*-r1.* to .*-r0.*)" % target self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) @@ -175,7 +174,6 @@ class ArchiverTest(oeSelfTest): """ Test for archiving the work directory and exporting the source files. """ - self.add_command_to_tearDown('cleanup-workdir') self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"") res = bitbake("xcursor-transparent-theme", ignore_status=True) self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % res.output) diff --git a/meta/lib/oeqa/selftest/oescripts.py b/meta/lib/oeqa/selftest/oescripts.py index baf3b6a..c2e2b45 100644 --- a/meta/lib/oeqa/selftest/oescripts.py +++ b/meta/lib/oeqa/selftest/oescripts.py @@ -41,7 +41,6 @@ class BuildhistoryDiffTests(BuildhistoryBase): @testcase(295) def test_buildhistory_diff(self): - self.add_command_to_tearDown('cleanup-workdir') target = 'xcursor-transparent-theme' self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 16:03:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 16:03:57 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6cb9c0a -> 00a5c7c) Message-ID: <149184023715.11157.12783227871747360042@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 6cb9c0a python-pycurl: create python3-pycurl recipe new b20ed70 oeqa/selftest: Don't use cleanup-workdir new 00a5c7c scripts: Drop cleanup-workdir The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/lib/oeqa/selftest/buildoptions.py | 2 - meta/lib/oeqa/selftest/oescripts.py | 28 ----- scripts/cleanup-workdir | 198 --------------------------------- 3 files changed, 228 deletions(-) delete mode 100755 scripts/cleanup-workdir -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 16:03:59 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 16:03:59 +0000 Subject: [oe-commits] [openembedded-core] 02/02: scripts: Drop cleanup-workdir In-Reply-To: <149184023715.11157.12783227871747360042@git.openembedded.org> References: <149184023715.11157.12783227871747360042@git.openembedded.org> Message-ID: <20170410160357.4AFC52334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 00a5c7c0e5cf9ee279d86bc18eba41b45f9ece7e Author: Richard Purdie AuthorDate: Mon Apr 10 17:00:37 2017 +0100 scripts: Drop cleanup-workdir Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/oescripts.py | 27 ----- scripts/cleanup-workdir | 198 ------------------------------------ 2 files changed, 225 deletions(-) diff --git a/meta/lib/oeqa/selftest/oescripts.py b/meta/lib/oeqa/selftest/oescripts.py index c2e2b45..29547f5 100644 --- a/meta/lib/oeqa/selftest/oescripts.py +++ b/meta/lib/oeqa/selftest/oescripts.py @@ -10,33 +10,6 @@ from oeqa.selftest.buildhistory import BuildhistoryBase from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var, get_test_layer from oeqa.utils.decorators import testcase -class TestScripts(oeSelfTest): - - @testcase(300) - def test_cleanup_workdir(self): - path = os.path.dirname(get_bb_var('WORKDIR', 'selftest-ed')) - old_version_recipe = os.path.join(get_bb_var('COREBASE'), 'meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb') - old_version = '0.5' - bitbake("-c clean selftest-ed") - bitbake("-c clean -b %s" % old_version_recipe) - - if os.path.exists(path): - initial_contents = os.listdir(path) - else: - initial_contents = [] - - bitbake('selftest-ed') - intermediary_contents = os.listdir(path) - bitbake("-b %s" % old_version_recipe) - runCmd('cleanup-workdir') - remaining_contents = os.listdir(path) - - expected_contents = [x for x in intermediary_contents if x not in initial_contents] - remaining_not_expected = [x for x in remaining_contents if x not in expected_contents] - self.assertFalse(remaining_not_expected, msg="Not all necessary content has been deleted from %s: %s" % (path, ', '.join(map(str, remaining_not_expected)))) - expected_not_remaining = [x for x in expected_contents if x not in remaining_contents] - self.assertFalse(expected_not_remaining, msg="The script removed extra contents from %s: %s" % (path, ', '.join(map(str, expected_not_remaining)))) - class BuildhistoryDiffTests(BuildhistoryBase): @testcase(295) diff --git a/scripts/cleanup-workdir b/scripts/cleanup-workdir deleted file mode 100755 index 98769f6..0000000 --- a/scripts/cleanup-workdir +++ /dev/null @@ -1,198 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (c) 2012 Wind River Systems, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import os -import sys -import optparse -import re -import subprocess -import shutil - -pkg_cur_dirs = {} -obsolete_dirs = [] -parser = None - -def err_quit(msg): - print(msg) - parser.print_usage() - sys.exit(1) - -def parse_version(verstr): - elems = verstr.split(':') - epoch = elems[0] - if len(epoch) == 0: - return elems[1] - else: - return epoch + '_' + elems[1] - -def run_command(cmd): - pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) - output = pipe.communicate()[0] - if pipe.returncode != 0: - print("Execute command '%s' failed." % cmd) - sys.exit(1) - return output.decode('utf-8') - -def get_cur_arch_dirs(workdir, arch_dirs): - pattern = workdir + '/(.*?)/' - - cmd = "bitbake -e | grep ^SDK_SYS=" - output = run_command(cmd) - sdk_sys = output.split('"')[1] - - # select thest 5 packages to get the dirs of current arch - pkgs = ['hicolor-icon-theme', 'base-files', 'acl-native', 'binutils-crosssdk-' + sdk_sys, 'nativesdk-autoconf'] - - for pkg in pkgs: - cmd = "bitbake -e " + pkg + " | grep ^IMAGE_ROOTFS=" - output = run_command(cmd) - output = output.split('"')[1] - m = re.match(pattern, output) - arch_dirs.append(m.group(1)) - -def main(): - global parser - parser = optparse.OptionParser( - usage = """%prog - -%prog removes the obsolete packages' build directories in WORKDIR. -This script must be ran under BUILDDIR after source file \"oe-init-build-env\". - -Any file or directory under WORKDIR which is not created by Yocto -will be deleted. Be CAUTIOUS.""") - - options, args = parser.parse_args(sys.argv) - - builddir = run_command('echo $BUILDDIR').strip() - if len(builddir) == 0: - err_quit("Please source file \"oe-init-build-env\" first.\n") - - if os.getcwd() != builddir: - err_quit("Please run %s under: %s\n" % (os.path.basename(args[0]), builddir)) - - print('Updating bitbake caches...') - cmd = "bitbake -s" - output = run_command(cmd) - - output = output.split('\n') - index = 0 - while len(output[index]) > 0: - index += 1 - alllines = output[index+1:] - - for line in alllines: - # empty again means end of the versions output - if len(line) == 0: - break - line = line.strip() - line = re.sub('\s+', ' ', line) - elems = line.split(' ') - if len(elems) == 2: - version = parse_version(elems[1]) - else: - version = parse_version(elems[2]) - pkg_cur_dirs[elems[0]] = version - - cmd = "bitbake -e" - output = run_command(cmd) - - tmpdir = None - image_rootfs = None - output = output.split('\n') - for line in output: - if tmpdir and image_rootfs: - break - - if not tmpdir: - m = re.match('TMPDIR="(.*)"', line) - if m: - tmpdir = m.group(1) - - if not image_rootfs: - m = re.match('IMAGE_ROOTFS="(.*)"', line) - if m: - image_rootfs = m.group(1) - - # won't fail just in case - if not tmpdir or not image_rootfs: - print("Can't get TMPDIR or IMAGE_ROOTFS.") - return 1 - - pattern = tmpdir + '/(.*?)/(.*?)/' - m = re.match(pattern, image_rootfs) - if not m: - print("Can't get WORKDIR.") - return 1 - - workdir = os.path.join(tmpdir, m.group(1)) - - # we only deal the dirs of current arch, total numbers of dirs are 6 - cur_arch_dirs = [m.group(2)] - get_cur_arch_dirs(workdir, cur_arch_dirs) - - for workroot, dirs, files in os.walk(workdir): - # For the files, they should NOT exist in WORKDIR. Remove them. - for f in files: - obsolete_dirs.append(os.path.join(workroot, f)) - - for d in dirs: - if d not in cur_arch_dirs: - continue - - for pkgroot, pkgdirs, filenames in os.walk(os.path.join(workroot, d)): - for f in filenames: - obsolete_dirs.append(os.path.join(pkgroot, f)) - - for pkgdir in sorted(pkgdirs): - if pkgdir not in pkg_cur_dirs: - obsolete_dirs.append(os.path.join(pkgroot, pkgdir)) - else: - for verroot, verdirs, verfiles in os.walk(os.path.join(pkgroot, pkgdir)): - for f in verfiles: - obsolete_dirs.append(os.path.join(pkgroot, f)) - for v in sorted(verdirs): - if v not in pkg_cur_dirs[pkgdir]: - obsolete_dirs.append(os.path.join(pkgroot, pkgdir, v)) - break - - # just process the top dir of every package under tmp/work/*/, - # then jump out of the above os.walk() - break - - # it is convenient to use os.walk() to get dirs and files at same time - # both of them have been dealed in the loop, so jump out - break - - for d in obsolete_dirs: - print("Deleting %s" % d) - shutil.rmtree(d, True) - - if len(obsolete_dirs): - print('\nTotal %d items.' % len(obsolete_dirs)) - else: - print('\nNo obsolete directory found under %s.' % workdir) - - return 0 - -if __name__ == '__main__': - try: - ret = main() - except Exception: - ret = 2 - import traceback - traceback.print_exc() - sys.exit(ret) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:15 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:15 +0000 Subject: [oe-commits] [openembedded-core] 03/03: staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch In-Reply-To: <149186359263.17763.6670417387732400964@git.openembedded.org> References: <149186359263.17763.6670417387732400964@git.openembedded.org> Message-ID: <20170410223313.97BCB2334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cd5e0a32184d98beb8d81e6b5527166d3ca4fb3c Author: Richard Purdie AuthorDate: Mon Apr 10 19:59:33 2017 +0100 staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch Dependencies on svn:// urls were failing as the cleandirs on do_fetch was destroying any sysroot setup by the extend_recipe_sysroot function. Add code so that if the task do_fetch, we move the cleandirs to the extend_recipe_sysroot task else we'd wipe out the sysroot we just created. This allows fetcher do_populate_sysroot dependencies to work correctly again. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 27fcd1e..c50abd0 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -647,6 +647,11 @@ python staging_taskhandler() { deps = d.getVarFlag(task, "depends") if deps and "populate_sysroot" in deps: d.appendVarFlag(task, "prefuncs", " extend_recipe_sysroot") + # If this is do_fetch, we need to move the cleandirs above to the extend_recipe_sysroot task + # else we'd wipe out the sysroot we just created. + if task == "do_fetch": + d.setVarFlag("extend_recipe_sysroot", "cleandirs", d.getVarFlag(task, "cleandirs")) + d.delVarFlag(task, "cleandirs") } staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess" addhandler staging_taskhandler -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:14 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:14 +0000 Subject: [oe-commits] [openembedded-core] 02/03: scripts: Drop cleanup-workdir In-Reply-To: <149186359263.17763.6670417387732400964@git.openembedded.org> References: <149186359263.17763.6670417387732400964@git.openembedded.org> Message-ID: <20170410223313.7F0752334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 809b23c829f352c0eae455ea89f53e2a9ee87f06 Author: Richard Purdie AuthorDate: Mon Apr 10 17:00:37 2017 +0100 scripts: Drop cleanup-workdir This script appears broken and is actively breaking build directories. For example, binutils-cross-i586 gets run do_fetch to do_populate_sysroot by: $ oe-selftest -r devtool.DevtoolTests.test_devtool_virtual_kernel_modify then: $ oe-selftest -r oescripts.BuildhistoryDiffTests.test_buildhistory_diff wipes out the contents of tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/ but does not wipe out the corresponding stamps, then: $ oe-selftest -r runtime-test.Postinst.test_postinst_rootfs_and_boot needs binutils-cross-i586:do_populate_lic and if and only if this is unavailable from sstate, it fails since it thinks the source is already unpacked when it isn't resulting in: WARNING: binutils-cross-i586-2.28-r0 do_populate_lic: Could not copy license file /home/pokybuild/yocto-autobuilder/yocto-worker/nigh tly-oe-selftest/build/build/tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/git/COPYING3.LIB to /home/pokybuild/yocto-autobuilder/yocto -worker/nightly-oe-selftest/build/build/tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/license-destdir/binutils-cross-i586/COPYING3.LI B: [Errno 2] No such file or directory: '/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/x86_64-l inux/binutils-cross-i586/2.28-r0/git/COPYING3.LIB' ERROR: binutils-cross-i586-2.28-r0 do_populate_lic: QA Issue: binutils-cross-i586: LIC_FILES_CHKSUM points to an invalid file: /home/ pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/git/COPYING3 [license-checksum] and similar errors. Its safer for users to wipe tmp than try and maintain scripts which try to remove pieces of tmp and get it wrong so remove the script. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/oescripts.py | 27 ----- scripts/cleanup-workdir | 198 ------------------------------------ 2 files changed, 225 deletions(-) diff --git a/meta/lib/oeqa/selftest/oescripts.py b/meta/lib/oeqa/selftest/oescripts.py index c2e2b45..29547f5 100644 --- a/meta/lib/oeqa/selftest/oescripts.py +++ b/meta/lib/oeqa/selftest/oescripts.py @@ -10,33 +10,6 @@ from oeqa.selftest.buildhistory import BuildhistoryBase from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var, get_test_layer from oeqa.utils.decorators import testcase -class TestScripts(oeSelfTest): - - @testcase(300) - def test_cleanup_workdir(self): - path = os.path.dirname(get_bb_var('WORKDIR', 'selftest-ed')) - old_version_recipe = os.path.join(get_bb_var('COREBASE'), 'meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb') - old_version = '0.5' - bitbake("-c clean selftest-ed") - bitbake("-c clean -b %s" % old_version_recipe) - - if os.path.exists(path): - initial_contents = os.listdir(path) - else: - initial_contents = [] - - bitbake('selftest-ed') - intermediary_contents = os.listdir(path) - bitbake("-b %s" % old_version_recipe) - runCmd('cleanup-workdir') - remaining_contents = os.listdir(path) - - expected_contents = [x for x in intermediary_contents if x not in initial_contents] - remaining_not_expected = [x for x in remaining_contents if x not in expected_contents] - self.assertFalse(remaining_not_expected, msg="Not all necessary content has been deleted from %s: %s" % (path, ', '.join(map(str, remaining_not_expected)))) - expected_not_remaining = [x for x in expected_contents if x not in remaining_contents] - self.assertFalse(expected_not_remaining, msg="The script removed extra contents from %s: %s" % (path, ', '.join(map(str, expected_not_remaining)))) - class BuildhistoryDiffTests(BuildhistoryBase): @testcase(295) diff --git a/scripts/cleanup-workdir b/scripts/cleanup-workdir deleted file mode 100755 index 98769f6..0000000 --- a/scripts/cleanup-workdir +++ /dev/null @@ -1,198 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright (c) 2012 Wind River Systems, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import os -import sys -import optparse -import re -import subprocess -import shutil - -pkg_cur_dirs = {} -obsolete_dirs = [] -parser = None - -def err_quit(msg): - print(msg) - parser.print_usage() - sys.exit(1) - -def parse_version(verstr): - elems = verstr.split(':') - epoch = elems[0] - if len(epoch) == 0: - return elems[1] - else: - return epoch + '_' + elems[1] - -def run_command(cmd): - pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) - output = pipe.communicate()[0] - if pipe.returncode != 0: - print("Execute command '%s' failed." % cmd) - sys.exit(1) - return output.decode('utf-8') - -def get_cur_arch_dirs(workdir, arch_dirs): - pattern = workdir + '/(.*?)/' - - cmd = "bitbake -e | grep ^SDK_SYS=" - output = run_command(cmd) - sdk_sys = output.split('"')[1] - - # select thest 5 packages to get the dirs of current arch - pkgs = ['hicolor-icon-theme', 'base-files', 'acl-native', 'binutils-crosssdk-' + sdk_sys, 'nativesdk-autoconf'] - - for pkg in pkgs: - cmd = "bitbake -e " + pkg + " | grep ^IMAGE_ROOTFS=" - output = run_command(cmd) - output = output.split('"')[1] - m = re.match(pattern, output) - arch_dirs.append(m.group(1)) - -def main(): - global parser - parser = optparse.OptionParser( - usage = """%prog - -%prog removes the obsolete packages' build directories in WORKDIR. -This script must be ran under BUILDDIR after source file \"oe-init-build-env\". - -Any file or directory under WORKDIR which is not created by Yocto -will be deleted. Be CAUTIOUS.""") - - options, args = parser.parse_args(sys.argv) - - builddir = run_command('echo $BUILDDIR').strip() - if len(builddir) == 0: - err_quit("Please source file \"oe-init-build-env\" first.\n") - - if os.getcwd() != builddir: - err_quit("Please run %s under: %s\n" % (os.path.basename(args[0]), builddir)) - - print('Updating bitbake caches...') - cmd = "bitbake -s" - output = run_command(cmd) - - output = output.split('\n') - index = 0 - while len(output[index]) > 0: - index += 1 - alllines = output[index+1:] - - for line in alllines: - # empty again means end of the versions output - if len(line) == 0: - break - line = line.strip() - line = re.sub('\s+', ' ', line) - elems = line.split(' ') - if len(elems) == 2: - version = parse_version(elems[1]) - else: - version = parse_version(elems[2]) - pkg_cur_dirs[elems[0]] = version - - cmd = "bitbake -e" - output = run_command(cmd) - - tmpdir = None - image_rootfs = None - output = output.split('\n') - for line in output: - if tmpdir and image_rootfs: - break - - if not tmpdir: - m = re.match('TMPDIR="(.*)"', line) - if m: - tmpdir = m.group(1) - - if not image_rootfs: - m = re.match('IMAGE_ROOTFS="(.*)"', line) - if m: - image_rootfs = m.group(1) - - # won't fail just in case - if not tmpdir or not image_rootfs: - print("Can't get TMPDIR or IMAGE_ROOTFS.") - return 1 - - pattern = tmpdir + '/(.*?)/(.*?)/' - m = re.match(pattern, image_rootfs) - if not m: - print("Can't get WORKDIR.") - return 1 - - workdir = os.path.join(tmpdir, m.group(1)) - - # we only deal the dirs of current arch, total numbers of dirs are 6 - cur_arch_dirs = [m.group(2)] - get_cur_arch_dirs(workdir, cur_arch_dirs) - - for workroot, dirs, files in os.walk(workdir): - # For the files, they should NOT exist in WORKDIR. Remove them. - for f in files: - obsolete_dirs.append(os.path.join(workroot, f)) - - for d in dirs: - if d not in cur_arch_dirs: - continue - - for pkgroot, pkgdirs, filenames in os.walk(os.path.join(workroot, d)): - for f in filenames: - obsolete_dirs.append(os.path.join(pkgroot, f)) - - for pkgdir in sorted(pkgdirs): - if pkgdir not in pkg_cur_dirs: - obsolete_dirs.append(os.path.join(pkgroot, pkgdir)) - else: - for verroot, verdirs, verfiles in os.walk(os.path.join(pkgroot, pkgdir)): - for f in verfiles: - obsolete_dirs.append(os.path.join(pkgroot, f)) - for v in sorted(verdirs): - if v not in pkg_cur_dirs[pkgdir]: - obsolete_dirs.append(os.path.join(pkgroot, pkgdir, v)) - break - - # just process the top dir of every package under tmp/work/*/, - # then jump out of the above os.walk() - break - - # it is convenient to use os.walk() to get dirs and files at same time - # both of them have been dealed in the loop, so jump out - break - - for d in obsolete_dirs: - print("Deleting %s" % d) - shutil.rmtree(d, True) - - if len(obsolete_dirs): - print('\nTotal %d items.' % len(obsolete_dirs)) - else: - print('\nNo obsolete directory found under %s.' % workdir) - - return 0 - -if __name__ == '__main__': - try: - ret = main() - except Exception: - ret = 2 - import traceback - traceback.print_exc() - sys.exit(ret) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:12 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:12 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (901659a -> cd5e0a3) Message-ID: <149186359263.17763.6670417387732400964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository openembedded-core. from 901659a oeqa/runtime/utils/targetbuildproject: use parent classes defaults tmpdir add a6152dd runqemu: fix 2 typos add dad9f27 runqemu: use realpath for imgdir add 301dc9d busybox: Security fix CVE-2016-6301 add 1da6416 oe-build-perf-report-email.py: fix one file path add b6c72c0 yocto-compat-layer: fix also other command invocations add 7ab0e09 yocto-compat-layer: limit report of signature changes add 3e678d9 package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.' add ee44dab package.bbclass: add CONFFILES to pkgdata add 0f22a27 ghostscript: CVE-2017-7207 add 0354a9b busybox: Security fix BUG9071 add 479a620 base-files: profile: Whitespace clean up add e77cdb7 base-files: profile: Do not assume that the tty command exists add ef16288 sanity: Require bitbake 1.33.4 add 04c053d glibc/gcc/libgcc-initial: Delete do_build tasks for -initial add f3408bc groff: replace "perl -w" with "use warnings" add 85decf2 mc: replace "perl -w" with "use warnings" add e828223 valgrind: set ac_cv_path_PERL to /usr/bin/env perl add 7e8fece m4: do_configure: fix "Argument list too long" add 123df94 guile: do_configure: fix "Argument list too long" add 0558382 autogen-native: fix POSIX_SHELL and perl add fd2758e kmod: set ac_cv_path_DOLT_BASH to /usr/bin/env bash add d9430de eudev: set LGPL-2.1+ for libudev package add 8e30b72 python3: fix run-time deps for core python3 libraries add ccd2fac selftest/wic: skip wic unit tests in case NLS is disable add 007ebc8 license.bbclass: improve reproducibility add 246df3d sstate: Skip glibc do_stash_locale and gcc do_gcc_stash_builddir tasks add aaf4c4f elfutils: fix building elfutils-native with GCC7 add 7a7fcba gcc-6.3: backport fix of check for empty string in ubsan.c add b7bb029 qemux86*.conf: changed dependency task for syslinux add 2fe8f39 selftest/recipetool: skip create_git in case x11 feature is not present add 88dc8b5 qemu: use python2.7 instead of python2 add 8cb472e lib/oe/sstatesig: fix finding native siginfo files in sstate-cache add 5b69eef lib/oe/sstatesig: avoid reporting duplicate siginfo files from sstate add 55c83cb cross.bbclass: override TARGET_* flags add 3facbe7 crosssdk.bbclass: override TARGET_* flags add 85b69a5 nativesdk.bbclass: override TARGET_* flags add 767335c cross-canadian.bbclass: override TARGET_* flags add c37d610 selftest/sstatetests: Replace glibc-initial with linux-libc-headers add 6b386e4 no-static-libs: Add entry for ncurses add 974ddd2 ncurses: Drop incorrect option add 80b450c uninative-flags.inc: Build binutils-native as pie add 9cdd4ea build-perf-test-wrapper.sh: support extra args for email script add 5e07504 oe-build-perf-report-email.py: use proper fallback email address add 7b50270 scripts/oe-build-perf-report: improve guessing of args add 6cb9c0a python-pycurl: create python3-pycurl recipe new a668570 oeqa/selftest: Don't use cleanup-workdir new 809b23c scripts: Drop cleanup-workdir new cd5e0a3 staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/cross-canadian.bbclass | 5 + meta/classes/cross.bbclass | 5 + meta/classes/crosssdk.bbclass | 5 + meta/classes/license.bbclass | 2 +- meta/classes/nativesdk.bbclass | 4 + meta/classes/package.bbclass | 1 + meta/classes/package_ipk.bbclass | 6 +- meta/classes/sstate.bbclass | 4 + meta/classes/staging.bbclass | 5 + meta/conf/distro/include/no-static-libs.inc | 4 + meta/conf/distro/include/security_flags.inc | 1 + meta/conf/distro/include/uninative-flags.inc | 8 + meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- meta/conf/sanity.conf | 2 +- meta/lib/oe/sstatesig.py | 39 ++-- meta/lib/oeqa/selftest/buildoptions.py | 2 - meta/lib/oeqa/selftest/oescripts.py | 28 --- meta/lib/oeqa/selftest/recipetool.py | 2 + meta/lib/oeqa/selftest/sstatetests.py | 20 +-- meta/lib/oeqa/selftest/wic.py | 5 +- meta/recipes-core/base-files/base-files/profile | 31 ++-- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 - .../busybox/BUG9071_buffer_overflow_arp.patch | 53 ++++++ .../busybox/busybox/CVE-2016-6301.patch | 37 ++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 2 + meta/recipes-core/glibc/glibc-initial.inc | 3 + meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/udev/eudev_3.2.1.bb | 3 +- .../autogen/autogen-native_5.18.12.bb | 3 + ...2-autoopts-mk-tpl-config.sh-fix-perl-path.patch | 32 ++++ .../elfutils-0.168/Fix_one_GCC7_warning.patch | 44 +++++ .../elfutils/elfutils-0.168/fallthrough.patch | 36 ++++ meta/recipes-devtools/elfutils/elfutils_0.168.bb | 3 + meta/recipes-devtools/gcc/gcc-6.3.inc | 1 + .../gcc/gcc-6.3/ubsan-fix-check-empty-string.patch | 28 +++ meta/recipes-devtools/gcc/gcc-cross-initial.inc | 4 + meta/recipes-devtools/gcc/libgcc-initial.inc | 3 + meta/recipes-devtools/guile/guile_2.0.14.bb | 3 + meta/recipes-devtools/m4/m4-1.4.18.inc | 3 + .../python/python-3.5-manifest.inc | 4 +- .../{python-pycurl_7.21.5.bb => python-pycurl.inc} | 6 +- .../python/python-pycurl_7.21.5.bb | 32 +--- .../python/python3-pycurl_7.21.5.bb | 5 + meta/recipes-devtools/qemu/qemu.inc | 2 +- meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 2 + .../ghostscript/ghostscript/CVE-2017-7207.patch | 39 ++++ .../ghostscript/ghostscript_9.20.bb | 1 + .../0001-replace-perl-w-with-use-warnings.patch | 102 +++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 3 + .../0001-mc-replace-perl-w-with-use-warnings.patch | 129 ++++++++++++++ meta/recipes-extended/mc/mc_4.8.18.bb | 3 + meta/recipes-kernel/kmod/kmod.inc | 2 + scripts/cleanup-workdir | 198 --------------------- scripts/contrib/build-perf-test-wrapper.sh | 2 +- scripts/contrib/oe-build-perf-report-email.py | 6 +- scripts/contrib/python/generate-manifest-3.5.py | 4 +- scripts/lib/compatlayer/__init__.py | 55 +++++- scripts/lib/compatlayer/cases/common.py | 77 ++++---- scripts/oe-build-perf-report | 2 +- scripts/runqemu | 8 +- 61 files changed, 752 insertions(+), 376 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox/BUG9071_buffer_overflow_arp.patch create mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-6301.patch create mode 100644 meta/recipes-devtools/autogen/autogen/0002-autoopts-mk-tpl-config.sh-fix-perl-path.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/Fix_one_GCC7_warning.patch create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.168/fallthrough.patch create mode 100644 meta/recipes-devtools/gcc/gcc-6.3/ubsan-fix-check-empty-string.patch copy meta/recipes-devtools/python/{python-pycurl_7.21.5.bb => python-pycurl.inc} (92%) create mode 100644 meta/recipes-devtools/python/python3-pycurl_7.21.5.bb create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch create mode 100644 meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch create mode 100644 meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch delete mode 100755 scripts/cleanup-workdir -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:13 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:13 +0000 Subject: [oe-commits] [openembedded-core] 01/03: oeqa/selftest: Don't use cleanup-workdir In-Reply-To: <149186359263.17763.6670417387732400964@git.openembedded.org> References: <149186359263.17763.6670417387732400964@git.openembedded.org> Message-ID: <20170410223313.632422334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit a66857096df3f68d38271b3a6792150f009a54b1 Author: Richard Purdie AuthorDate: Mon Apr 10 16:58:48 2017 +0100 oeqa/selftest: Don't use cleanup-workdir cleanup-workdir isn't a partcularly good way to attempt to cleanup after tests and in some cases is actively breaking the workdir. Whilst this is a bug in cleanup-workdir, I'd prefer it didn't break tests, particularly when as far as I can see, these calls are "belt and braces" and don't appear to serve a specific purpose. If this introduces bugs, we should fix this bugs. For the purposes of history, binutils-cross-i586 gets run do_fetch to do_populate_sysroot by: $ oe-selftest -r devtool.DevtoolTests.test_devtool_virtual_kernel_modify then: $ oe-selftest -r oescripts.BuildhistoryDiffTests.test_buildhistory_diff wipes out the contents of tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/ but does not wipe out the corresponding stamps, then: $ oe-selftest -r runtime-test.Postinst.test_postinst_rootfs_and_boot needs binutils-cross-i586:do_populate_lic and if and only if this is unavailable from sstate, it fails since it thinks the source is already unpacked when it isn't resulting in: WARNING: binutils-cross-i586-2.28-r0 do_populate_lic: Could not copy license file /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/git/COPYING3.LIB to /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/license-destdir/binutils-cross-i586/COPYING3.LIB: [Errno 2] No such file or directory: '/home/pokybuild/yocto-autobuilder/yocto-w [...] ERROR: binutils-cross-i586-2.28-r0 do_populate_lic: QA Issue: binutils-cross-i586: LIC_FILES_CHKSUM points to an invalid file: /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/x86_64-linux/binutils-cross-i586/2.28-r0/git/COPYING3 [license-checksum] and similar errors. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/buildoptions.py | 2 -- meta/lib/oeqa/selftest/oescripts.py | 1 - 2 files changed, 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index d155f64..a6e0203 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py @@ -163,7 +163,6 @@ class BuildhistoryTests(BuildhistoryBase): @testcase(294) def test_buildhistory_buildtime_pr_backwards(self): - self.add_command_to_tearDown('cleanup-workdir') target = 'xcursor-transparent-theme' error = "ERROR:.*QA Issue: Package version for package %s went backwards which would break package feeds from (.*-r1.* to .*-r0.*)" % target self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) @@ -175,7 +174,6 @@ class ArchiverTest(oeSelfTest): """ Test for archiving the work directory and exporting the source files. """ - self.add_command_to_tearDown('cleanup-workdir') self.write_config("INHERIT += \"archiver\"\nARCHIVER_MODE[src] = \"original\"\nARCHIVER_MODE[srpm] = \"1\"") res = bitbake("xcursor-transparent-theme", ignore_status=True) self.assertEqual(res.status, 0, "\nCouldn't build xcursortransparenttheme.\nbitbake output %s" % res.output) diff --git a/meta/lib/oeqa/selftest/oescripts.py b/meta/lib/oeqa/selftest/oescripts.py index baf3b6a..c2e2b45 100644 --- a/meta/lib/oeqa/selftest/oescripts.py +++ b/meta/lib/oeqa/selftest/oescripts.py @@ -41,7 +41,6 @@ class BuildhistoryDiffTests(BuildhistoryBase): @testcase(295) def test_buildhistory_diff(self): - self.add_command_to_tearDown('cleanup-workdir') target = 'xcursor-transparent-theme' self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:21 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:21 +0000 Subject: [oe-commits] [openembedded-core] 01/17: classutils.py: deterministic sorting In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223320.BCCBB2334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b71687b7ab30f8d68b6cbca0abf748b761f8fa87 Author: Juro Bystricky AuthorDate: Mon Apr 10 13:59:36 2017 -0700 classutils.py: deterministic sorting The method "prioritized" returns a list sorted by the value of the "priority" field, in descending order. However, if several list items have the same priority, the ordering of those items within the priority-sorted list becomes random. As a consequence, we may end up with a non-deterministic oe-terminal spawning, as several terminals have the same priority. So running commands such as $ bitbake xxx -cdevshell $ bitbake yyy -cmenuconfig may spawn a different terminal each time, for example sometimes Gnome and sometimes Konsole as hey have the same priority. Rather than modifying the priorities so they all differ, we sub-sort the list based on (terminal) names. This way we achieve a deterministic outcome. [YOCTO#10938] Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/lib/oe/classutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/classutils.py b/meta/lib/oe/classutils.py index e7856c8..45cd524 100644 --- a/meta/lib/oe/classutils.py +++ b/meta/lib/oe/classutils.py @@ -36,7 +36,7 @@ abstract base classes out of the registry).""" @classmethod def prioritized(tcls): return sorted(list(tcls.registry.values()), - key=lambda v: v.priority, reverse=True) + key=lambda v: (v.priority, v.name), reverse=True) def unregister(cls): for key in cls.registry.keys(): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:23 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:23 +0000 Subject: [oe-commits] [openembedded-core] 03/17: gnu-efi: copy header files for x32 build In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223320.CDE672334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1e09a355d4224733e885548c2e12ec08e5c84dfa Author: Saul Wold AuthorDate: Mon Apr 10 08:58:30 2017 -0700 gnu-efi: copy header files for x32 build Gnu-efi needs to be build for 64bit since it is a boot time tool. It needs these 2 headers to be in 64 bit versions, we can use the existing 32bit ones as there is not really any difference. [YOCTO #11051] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb index f46381d..6f235b7 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb @@ -24,6 +24,11 @@ SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" COMPATIBLE_HOST_armv4 = 'null' +do_configure_linux-gnux32_prepend() { + cp ${STAGING_INCDIR}/gnu/stubs-x32.h ${STAGING_INCDIR}/gnu/stubs-64.h + cp ${STAGING_INCDIR}/bits/long-double-32.h ${STAGING_INCDIR}/bits/long-double-64.h +} + def gnu_efi_arch(d): import re tarch = d.getVar("TARGET_ARCH") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:20 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:20 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (00a5c7c -> 4b31521) Message-ID: <149186360065.18199.8921337038633924043@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. discard 00a5c7c scripts: Drop cleanup-workdir discard b20ed70 oeqa/selftest: Don't use cleanup-workdir add a668570 oeqa/selftest: Don't use cleanup-workdir add 809b23c scripts: Drop cleanup-workdir add cd5e0a3 staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch new b71687b classutils.py: deterministic sorting new 1beccb5 libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution new 1e09a35 gnu-efi: copy header files for x32 build new 3572a54 openssl: fix the reference to native perl in ptests new 85a9dcf package_manager.py: Split feed_archs for RPM repo URIs new 5681c62 buildhistory.bbclass: do not influence sstate of do_rootfs new 62de7ff python2/3: Move config/Makefile from core package to dev package new 451bbd8 logrotate: replace fedorahosted.org SRC_URI with github.com source new b9e0f65 yocto-compat-layer: include bitbake-diffsigs output new 01c6e3e yocto-compat-layer: also determine tune flags for each task new e863c87 musl: Upgrade to latest tip new 68d0dfc buildhistory-diff: operate from buildhistory directory new f1b5664 classes/buildhistory: write out task signatures on every build new 019820c buildhistory-diff: add option to compare task signature list new 9409503 buildhistory-diff: add option to compare actual signature differences new fa5c83f classes/uninative: set SSTATEPOSTUNPACKFUNCS[vardepvalueexclude] properly new 4b31521 classes/buildhistory: save output file signatures for sstate tasks This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (00a5c7c) \ N -- N -- N refs/heads/master-next (4b31521) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 17 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/buildhistory.bbclass | 50 +++++- meta/classes/staging.bbclass | 5 + meta/classes/uninative.bbclass | 2 +- meta/lib/oe/buildhistory_analysis.py | 109 +++++++++++- meta/lib/oe/classutils.py | 2 +- meta/lib/oe/package_manager.py | 2 +- meta/lib/oe/sstatesig.py | 10 ++ meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 5 + meta/recipes-connectivity/openssl/openssl.inc | 4 + meta/recipes-core/musl/musl_git.bb | 2 +- .../python/python-2.7-manifest.inc | 4 +- .../python/python-3.5-manifest.inc | 4 +- ...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++---- meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 19 ++- scripts/buildhistory-diff | 13 +- scripts/lib/compatlayer/__init__.py | 9 +- scripts/lib/compatlayer/cases/common.py | 14 +- scripts/yocto-compat-layer.py | 2 +- 18 files changed, 384 insertions(+), 58 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:22 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:22 +0000 Subject: [oe-commits] [openembedded-core] 02/17: libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223320.C40F42334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1beccb5de6bfa9c024be5614a1c2c136607cdb18 Author: Mark Hatle AuthorDate: Mon Apr 10 15:58:28 2017 -0500 libsolve: 0001-Add-fallback-fopencookie-implementation.patch fix attribution This patch has no technical change, but attempts to properly restore the attribution of the original patch to Neal Gompa. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- ...1-Add-fallback-fopencookie-implementation.patch | 186 +++++++++++++++++---- 1 file changed, 150 insertions(+), 36 deletions(-) diff --git a/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch b/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch index 851fe57..c75611c 100644 --- a/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch +++ b/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch @@ -1,30 +1,48 @@ -From 0a8e50f7322832efdaf33da87839fbba05a755de Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -Date: Mon, 21 Nov 2016 11:46:00 +0200 -Subject: [PATCH] Add fallback fopencookie() implementation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Add the following patch to fix build with musl: + +Original patch from: + https://patch-diff.githubusercontent.com/raw/openSUSE/libsolv/pull/112.patch + +Patch was original integrated (dcc5d6bc2e3e5848f36fe1001b8cb65576047b7d) + by Maxin B. John : + 0.6.19 -> 0.6.20 + + Added the following patch to fix build with musl: + 0001-Add-fallback-fopencookie-implementation.patch + +Later updated (60d6c0018c6855e669ced66c420b761d9e7ddd78) + by Maxin B. John : + libsolv: upgrade to 0.6.24 + Refreshed the following patch: + a) 0001-Add-fallback-fopencookie-implementation.patch + +The later update modified the ext/CMakeLists.txt. + +Upstream-Status: Submitted [ https://github.com/openSUSE/libsolv/pull/112 ] + +Signed-off-by: Mark Hatle + +From 63ab8d928ab38f9686405d186d427f2496a9cce5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= + =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= + +Date: Wed, 11 Nov 2015 20:32:17 -0500 +Subject: [PATCH 1/2] Add fallback fopencookie() implementation In environments where neither fopencookie() nor funopen() are implemented, we need to provide a suitable implementation of fopencookie() that we can use. - -Upstream-Status: Denied [ https://github.com/openSUSE/libsolv/pull/112 ] - -Signed-off-by: Neal Gompa (?????????) -Signed-off-by: Maxin B. John --- ext/CMakeLists.txt | 7 ++ ext/solv_xfopen.c | 10 +-- - ext/solv_xfopen_fallback_fopencookie.c | 124 +++++++++++++++++++++++++++++++++ + ext/solv_xfopen_fallback_fopencookie.c | 123 +++++++++++++++++++++++++++++++++ ext/solv_xfopen_fallback_fopencookie.h | 28 ++++++++ - 4 files changed, 165 insertions(+), 4 deletions(-) + 4 files changed, 164 insertions(+), 4 deletions(-) create mode 100644 ext/solv_xfopen_fallback_fopencookie.c create mode 100644 ext/solv_xfopen_fallback_fopencookie.h diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -index 586eda8..477a2ef 100644 +index ad52495..4f282ce 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -4,6 +4,13 @@ SET (libsolvext_SRCS @@ -38,7 +56,8 @@ index 586eda8..477a2ef 100644 + solv_xfopen_fallback_fopencookie.h) +ENDIF (NOT HAVE_FOPENCOOKIE AND NOT HAVE_FUNOPEN) + - IF (ENABLE_RPMDB OR ENABLE_RPMPKG) +-IF (ENABLE_RPMDB) ++IF (ENABLE_RPMDB OR ENABLE_RPMPKG) SET (libsolvext_SRCS ${libsolvext_SRCS} pool_fileconflicts.c repo_rpmdb.c) diff --git a/ext/solv_xfopen.c b/ext/solv_xfopen.c @@ -85,17 +104,17 @@ index b0421bf..31345dd 100644 diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c new file mode 100644 -index 0000000..89426a9 +index 0000000..0ce2571 --- /dev/null +++ b/ext/solv_xfopen_fallback_fopencookie.c -@@ -0,0 +1,124 @@ -+/* +@@ -0,0 +1,123 @@ ++/* + * Provides a very limited fopencookie() for environments with a libc + * that lacks it. -+ * -+ * Authors: zhasha & nsz ++ * ++ * Author: zhasha + * Modified for libsolv by Neal Gompa -+ * ++ * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information. + * @@ -124,7 +143,7 @@ index 0000000..89426a9 +{ + struct ctx *ctx = arg; + ssize_t r; -+ size_t n, k; ++ size_t n; + + pthread_detach(pthread_self()); + @@ -138,18 +157,17 @@ index 0000000..89426a9 + } + if (r == 0) { break; } + -+ n = r, k = 0; + while (n > 0) { + r = ctx->io.write ? -+ (ctx->io.write)(ctx->cookie, ctx->buf + k, n) : -+ write(ctx->fd, ctx->buf + k, n); ++ (ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) : ++ write(ctx->fd, ctx->buf + ((size_t)r - n), n); + if (r < 0) { + if (errno != EINTR) { break; } + continue; + } + if (r == 0) { break; } + -+ n -= r, k += r; ++ n -= (size_t)r; + } + if (n > 0) { break; } + } @@ -169,8 +187,8 @@ index 0000000..89426a9 + + switch (mode[0]) { + case 'a': -+ case 'w': wr = 1; break; + case 'r': rd = 1; break; ++ case 'w': wr = 1; break; + default: + errno = EINVAL; + return NULL; @@ -215,20 +233,20 @@ index 0000000..89426a9 +} diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h new file mode 100644 -index 0000000..7223e3f +index 0000000..6a7bfee --- /dev/null +++ b/ext/solv_xfopen_fallback_fopencookie.h @@ -0,0 +1,28 @@ -+/* ++/* + * Provides a very limited fopencookie() for environments with a libc + * that lacks it. -+ * -+ * Authors: zhasha & nsz ++ * ++ * Author: zhasha + * Modified for libsolv by Neal Gompa -+ * ++ * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information. -+ * ++ * + */ + +#ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H @@ -247,6 +265,102 @@ index 0000000..7223e3f +FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t io); + +#endif --- -2.4.0 +From 18987b909007435ca878289d0e7d516052710f73 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= + =?UTF-8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= + +Date: Mon, 23 Nov 2015 18:19:41 -0500 +Subject: [PATCH 2/2] Fixes to internal fopencookie() implementation + +Credits to the fixes go to nsz on #musl on Freenode, +who gloriously fixed the implementation such that +the tests all pass. +--- + ext/solv_xfopen_fallback_fopencookie.c | 19 ++++++++++--------- + ext/solv_xfopen_fallback_fopencookie.h | 10 +++++----- + 2 files changed, 15 insertions(+), 14 deletions(-) + +diff --git a/ext/solv_xfopen_fallback_fopencookie.c b/ext/solv_xfopen_fallback_fopencookie.c +index 0ce2571..89426a9 100644 +--- a/ext/solv_xfopen_fallback_fopencookie.c ++++ b/ext/solv_xfopen_fallback_fopencookie.c +@@ -1,10 +1,10 @@ +-/* ++/* + * Provides a very limited fopencookie() for environments with a libc + * that lacks it. +- * +- * Author: zhasha ++ * ++ * Authors: zhasha & nsz + * Modified for libsolv by Neal Gompa +- * ++ * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information. + * +@@ -33,7 +33,7 @@ static void *proxy(void *arg) + { + struct ctx *ctx = arg; + ssize_t r; +- size_t n; ++ size_t n, k; + + pthread_detach(pthread_self()); + +@@ -47,17 +47,18 @@ static void *proxy(void *arg) + } + if (r == 0) { break; } + ++ n = r, k = 0; + while (n > 0) { + r = ctx->io.write ? +- (ctx->io.write)(ctx->cookie, ctx->buf + ((size_t)r - n), n) : +- write(ctx->fd, ctx->buf + ((size_t)r - n), n); ++ (ctx->io.write)(ctx->cookie, ctx->buf + k, n) : ++ write(ctx->fd, ctx->buf + k, n); + if (r < 0) { + if (errno != EINTR) { break; } + continue; + } + if (r == 0) { break; } + +- n -= (size_t)r; ++ n -= r, k += r; + } + if (n > 0) { break; } + } +@@ -77,8 +78,8 @@ FILE *fopencookie(void *cookie, const char *mode, struct cookie_io_functions_t i + + switch (mode[0]) { + case 'a': +- case 'r': rd = 1; break; + case 'w': wr = 1; break; ++ case 'r': rd = 1; break; + default: + errno = EINVAL; + return NULL; +diff --git a/ext/solv_xfopen_fallback_fopencookie.h b/ext/solv_xfopen_fallback_fopencookie.h +index 6a7bfee..7223e3f 100644 +--- a/ext/solv_xfopen_fallback_fopencookie.h ++++ b/ext/solv_xfopen_fallback_fopencookie.h +@@ -1,13 +1,13 @@ +-/* ++/* + * Provides a very limited fopencookie() for environments with a libc + * that lacks it. +- * +- * Author: zhasha ++ * ++ * Authors: zhasha & nsz + * Modified for libsolv by Neal Gompa +- * ++ * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information. +- * ++ * + */ + + #ifndef SOLV_XFOPEN_FALLBACK_FOPENCOOKIE_H -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:24 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:24 +0000 Subject: [oe-commits] [openembedded-core] 04/17: openssl: fix the reference to native perl in ptests In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223320.D5BA42334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3572a549f5bfe335822262edb1b113e58a24b702 Author: Alexander Kanavin AuthorDate: Mon Apr 10 22:16:51 2017 +0300 openssl: fix the reference to native perl in ptests This was causing a couple of ptest failures. [YOCTO #10840] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 481a444..c721d8c 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -205,6 +205,10 @@ do_install () { do_install_ptest () { cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH} + + # Replace the path to native perl with the path to target perl + sed -i 's,^PERL=.*,PERL=${bindir}/perl,' ${D}${PTEST_PATH}/Makefile + cp Configure config e_os.h ${D}${PTEST_PATH} cp -r -L include ${D}${PTEST_PATH} ln -sf ${libdir}/libcrypto.a ${D}${PTEST_PATH} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:25 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:25 +0000 Subject: [oe-commits] [openembedded-core] 05/17: package_manager.py: Split feed_archs for RPM repo URIs In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223320.DF14B2334AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85a9dcfb45bd35dac2c83db5661e9f2f6f010124 Author: Ian.Arkver AuthorDate: Mon Apr 10 11:50:14 2017 +0100 package_manager.py: Split feed_archs for RPM repo URIs By default the feed_archs variable is split into single characters resulting in very many broken short repo_uris. Add a split() to split the string into words first. Signed-off-by: Ian.Arkver Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 54a3c5e..23bf51f 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -552,7 +552,7 @@ class RpmPM(PackageManager): for uri in remote_uris: repo_name = "oe-remote-repo" + "-".join(urlparse(uri).path.split("/")) if feed_archs is not None: - repo_uris = [uri + "/" + arch for arch in feed_archs] + repo_uris = [uri + "/" + arch for arch in feed_archs.split()] else: repo_uris = [uri] open(oe.path.join(self.target_rootfs, "etc", "yum.repos.d", repo_name + ".repo"), 'w').write("[%s]\nbaseurl=%s\n" % (repo_name, " ".join(repo_uris))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:26 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:26 +0000 Subject: [oe-commits] [openembedded-core] 06/17: buildhistory.bbclass: do not influence sstate of do_rootfs In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223320.EB0532334AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5681c629715b097e9ce197b48eb9bd6df9efec0e Author: Patrick Ohly AuthorDate: Mon Apr 10 10:28:12 2017 +0200 buildhistory.bbclass: do not influence sstate of do_rootfs Enabling or disabling buildhistory caused a rebuild of images, which is undesirable. For example, it prevented image reuse from a main build with buildhistory in a following oe-selftest where buildhistory must be disabled. The reason are the additional ROOTFS_POSTUNINSTALL_COMMAND and ROOTFS_POSTUNINSTALL_COMMAND entries. Those need to be excluded both via vardepvalueexclude and vardepsexclude. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 109b375..eea1e72 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -579,10 +579,14 @@ python buildhistory_get_extra_sdkinfo() { # By using ROOTFS_POSTUNINSTALL_COMMAND we get in after uninstallation of # unneeded packages but before the removal of packaging files -ROOTFS_POSTUNINSTALL_COMMAND += " buildhistory_list_installed_image ;\ - buildhistory_get_image_installed ; " - -IMAGE_POSTPROCESS_COMMAND += " buildhistory_get_imageinfo ; " +ROOTFS_POSTUNINSTALL_COMMAND += "buildhistory_list_installed_image ;" +ROOTFS_POSTUNINSTALL_COMMAND += "buildhistory_get_image_installed ;" +ROOTFS_POSTUNINSTALL_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_image ;| buildhistory_get_image_installed ;" +ROOTFS_POSTUNINSTALL_COMMAND[vardepsexclude] += "buildhistory_list_installed_image buildhistory_get_image_installed" + +IMAGE_POSTPROCESS_COMMAND += "buildhistory_get_imageinfo ;" +IMAGE_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_imageinfo ;" +IMAGE_POSTPROCESS_COMMAND[vardepsexclude] += "buildhistory_get_imageinfo" # We want these to be the last run so that we get called after complementary package installation POPULATE_SDK_POST_TARGET_COMMAND_append = " buildhistory_list_installed_sdk_target;" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:28 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:28 +0000 Subject: [oe-commits] [openembedded-core] 08/17: logrotate: replace fedorahosted.org SRC_URI with github.com source In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.08B6A2334B0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 451bbd8a6b0471514a4b0d2f3087331f15201556 Author: Choong YinThong AuthorDate: Sun Apr 9 16:33:18 2017 -0700 logrotate: replace fedorahosted.org SRC_URI with github.com source fedorahosted.org was retired on March 1st, 2017. This is to update the SRC_URI to point to github.com. Update the ${PN} to ${BPN} in order to pass the autobuilder mulitlib enable configuration. [YOCTO #11226] Signed-off-by: Choong YinThong Signed-off-by: Richard Purdie --- meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb index 9c2dfe0..a871b45 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Rotates, compresses, removes and mails system log files" SECTION = "console/utils" -HOMEPAGE = "https://fedorahosted.org/logrotate/" +HOMEPAGE = "https://github.com/logrotate/logrotate/issues" LICENSE = "GPLv2" # TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it. @@ -10,14 +10,25 @@ DEPENDS="coreutils popt" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" -SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ +# When updating logrotate to latest upstream, SRC_URI should point to +# a proper release tarball from https://github.com/logrotate/logrotate/releases +# and we have to take the snapshot for now because there is no such +# tarball available for 3.9.1. + +S = "${WORKDIR}/${BPN}-r3-9-1" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + +SRC_URI = "https://github.com/${BPN}/${BPN}/archive/r3-9-1.tar.gz \ file://act-as-mv-when-rotate.patch \ file://update-the-manual.patch \ file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "4492b145b6d542e4a2f41e77fa199ab0" -SRC_URI[sha256sum] = "022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545" +# Checksum changed due to tarball source folder changes in upstream + +SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3" +SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:27 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:27 +0000 Subject: [oe-commits] [openembedded-core] 07/17: python2/3: Move config/Makefile from core package to dev package In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.0024B2334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 62de7ff9f762291815be85c1d2713a37850eb3ee Author: Li Zhou AuthorDate: Sun Apr 9 23:41:24 2017 -0700 python2/3: Move config/Makefile from core package to dev package Move config/Makefile in libdir from core package to dev package for python, because it is only needed in development process. Signed-off-by: Li Zhou Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-2.7-manifest.inc | 4 ++-- meta/recipes-devtools/python/python-3.5-manifest.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc index 413405a..7ed254b 100644 --- a/meta/recipes-devtools/python/python-2.7-manifest.inc +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc @@ -46,7 +46,7 @@ FILES_${PN}-contextlib="${libdir}/python${PYTHON_MAJMIN}/contextlib.* " SUMMARY_${PN}-core="Python interpreter and core modules" RDEPENDS_${PN}-core="${PN}-lang ${PN}-re" -FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/ast.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* $ [...] +FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/ast.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* $ [...] SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" RDEPENDS_${PN}-crypt="${PN}-core" @@ -74,7 +74,7 @@ FILES_${PN}-debugger="${libdir}/python2.7/bdb.* ${libdir}/python2.7/pdb.* " SUMMARY_${PN}-dev="Python development package" RDEPENDS_${PN}-dev="${PN}-core" -FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig " +FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig ${libdir}/python2.7/config/Makefile " SUMMARY_${PN}-difflib="Python helpers for computing deltas between objects" RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc index ec30eb9..16b72d5 100644 --- a/meta/recipes-devtools/python/python-3.5-manifest.inc +++ b/meta/recipes-devtools/python/python-3.5-manifest.inc @@ -38,7 +38,7 @@ FILES_${PN}-compression="${libdir}/python3.5/gzip.* ${libdir}/python3.5/__pycach SUMMARY_${PN}-core="Python interpreter and core modules" RDEPENDS_${PN}-core="${PN}-lang ${PN}-re ${PN}-reprlib ${PN}-codecs ${PN}-io ${PN}-math" -FILES_${PN}-core="${libdir}/python3.5/__future__.* ${libdir}/python3.5/__pycache__/__future__.* ${libdir}/python3.5/_abcoll.* ${libdir}/python3.5/__pycache__/_abcoll.* ${libdir}/python3.5/abc.* ${libdir}/python3.5/__pycache__/abc.* ${libdir}/python3.5/ast.* ${libdir}/python3.5/__pycache__/ast.* ${libdir}/python3.5/copy.* ${libdir}/python3.5/__pycache__/copy.* ${libdir}/python3.5/copyreg.* ${libdir}/python3.5/__pycache__/copyreg.* ${libdir}/python3.5/configparser.* ${libdir}/python3.5/__p [...] +FILES_${PN}-core="${libdir}/python3.5/__future__.* ${libdir}/python3.5/__pycache__/__future__.* ${libdir}/python3.5/_abcoll.* ${libdir}/python3.5/__pycache__/_abcoll.* ${libdir}/python3.5/abc.* ${libdir}/python3.5/__pycache__/abc.* ${libdir}/python3.5/ast.* ${libdir}/python3.5/__pycache__/ast.* ${libdir}/python3.5/copy.* ${libdir}/python3.5/__pycache__/copy.* ${libdir}/python3.5/copyreg.* ${libdir}/python3.5/__pycache__/copyreg.* ${libdir}/python3.5/configparser.* ${libdir}/python3.5/__p [...] SUMMARY_${PN}-crypt="Python basic cryptographic and hashing support" RDEPENDS_${PN}-crypt="${PN}-core" @@ -66,7 +66,7 @@ FILES_${PN}-debugger="${libdir}/python3.5/bdb.* ${libdir}/python3.5/__pycache__/ SUMMARY_${PN}-dev="Python development package" RDEPENDS_${PN}-dev="${PN}-core" -FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig " +FILES_${PN}-dev="${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig ${libdir}/python3.5/config/Makefile " SUMMARY_${PN}-difflib="Python helpers for computing deltas between objects" RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:31 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:31 +0000 Subject: [oe-commits] [openembedded-core] 11/17: musl: Upgrade to latest tip In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.2A6732334B6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e863c87641ed70cf90f25cf0940c28552c1b95e7 Author: Khem Raj AuthorDate: Thu Apr 6 22:14:09 2017 -0700 musl: Upgrade to latest tip * 54807d47 aarch64: add single instruction math functions * b6e1fe0d fix strptime output for %C without %y * 834ef7af fix processing of strptime %p format * 85dfab7e fix off-by-one in strptime %j * 9571c531 regex: fix newline matching with negated brackets * e6917ece increase limit on locale name length from 15 to 23 bytes * e4fc9ad7 search locale name variants for gettext translations * 16319a5d make setlocale return a single name for LC_ALL if all categories match * 0c53178e fix dlopen/dlsym regression opening libs already loaded at startup * dbff2bb8 fix POSIX-format TZ dst transition times for southern hemisphere * 74bca42e s390x: fix fpreg_t and remove unused per_struct * a393d5cc precalculate gnu hash rather than doing it lazily in find_sym inner loop * 8cba1dc4 fix threshold constants in j0f, y0f, j1f, y1f Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 39745f5..a88bc4d 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -3,7 +3,7 @@ require musl.inc -SRCREV = "cb525397bb053ea49cf160965477a17b17286eb3" +SRCREV = "54807d47acecab778498ced88ce8f62bfa16e379" PV = "1.1.16+git${SRCPV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:32 +0000 Subject: [oe-commits] [openembedded-core] 12/17: buildhistory-diff: operate from buildhistory directory In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.3927D2334B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 68d0dfcb7cd2c8b77dac0049475d7b9b5143b0ac Author: Paul Eggleton AuthorDate: Fri Apr 7 16:57:18 2017 +1200 buildhistory-diff: operate from buildhistory directory If the cwd is named "buildhistory" and the user hasn't specified an alternative path on the command line, then assume that the current directory is the buildhistory directory. This makes it easier to run buildhistory-diff and also interact with the buildhistory git repository as you no longer have to jump into the buildhistory directory and up to the parent again when doing so. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/buildhistory-diff | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index d8ca12d..e03ccc5 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -46,6 +46,11 @@ def main(): sys.exit(1) if not os.path.exists(options.buildhistory_dir): + if options.buildhistory_dir == 'buildhistory/': + cwd = os.getcwd() + if os.path.basename(cwd) == 'buildhistory': + options.buildhistory_dir = cwd + if not os.path.exists(options.buildhistory_dir): sys.stderr.write('Buildhistory directory "%s" does not exist\n\n' % options.buildhistory_dir) parser.print_help() sys.exit(1) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:30 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:30 +0000 Subject: [oe-commits] [openembedded-core] 10/17: yocto-compat-layer: also determine tune flags for each task In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.1F3D12334B4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 01c6e3e6d93561e74e10634b7a75fb3fa3f6c03c Author: Patrick Ohly AuthorDate: Fri Apr 7 18:38:19 2017 +0200 yocto-compat-layer: also determine tune flags for each task locked-sigs.inc groups tasks according to their tune flags (allarch, i586, etc.). Also retrieve that information while getting signatures, it will be needed to determine when setting a machine changes tasks that aren't machine-specific. Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/__init__.py | 9 ++++++++- scripts/lib/compatlayer/cases/common.py | 2 +- scripts/yocto-compat-layer.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index b46527a..6130b85 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py @@ -224,6 +224,7 @@ def get_signatures(builddir, failsafe=False): exclude_recipes = ('meta-world-pkgdata',) sigs = {} + tune2tasks = {} cmd = 'bitbake ' if failsafe: @@ -234,9 +235,14 @@ def get_signatures(builddir, failsafe=False): sigs_file = os.path.join(builddir, 'locked-sigs.inc') sig_regex = re.compile("^(?P.*:.*):(?P.*) .$") + tune_regex = re.compile("(^|\s)SIGGEN_LOCKEDSIGS_t-(?P\S*)\s*=\s*") + current_tune = None with open(sigs_file, 'r') as f: for line in f.readlines(): line = line.strip() + t = tune_regex.search(line) + if t: + current_tune = t.group('tune') s = sig_regex.match(line) if s: exclude = False @@ -249,11 +255,12 @@ def get_signatures(builddir, failsafe=False): continue sigs[s.group('task')] = s.group('hash') + tune2tasks.setdefault(current_tune, []).append(s.group('task')) if not sigs: raise RuntimeError('Can\'t load signatures from %s' % sigs_file) - return sigs + return (sigs, tune2tasks) def get_depgraph(targets=['world']): ''' diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index 6eb29c1..aa46984 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -33,7 +33,7 @@ class CommonCompatLayer(OECompatLayerTestCase): # task -> (old signature, new signature) sig_diff = {} - curr_sigs = get_signatures(self.td['builddir'], failsafe=True) + curr_sigs, _ = get_signatures(self.td['builddir'], failsafe=True) for task in self.td['sigs']: if task in curr_sigs and \ self.td['sigs'][task] != curr_sigs[task]: diff --git a/scripts/yocto-compat-layer.py b/scripts/yocto-compat-layer.py index 22c0c2d..2ebddb6 100755 --- a/scripts/yocto-compat-layer.py +++ b/scripts/yocto-compat-layer.py @@ -139,7 +139,7 @@ def main(): td['bbvars'] = get_bb_vars() logger.info('Getting initial signatures ...') td['builddir'] = builddir - td['sigs'] = get_signatures(td['builddir']) + td['sigs'], td['tunetasks'] = get_signatures(td['builddir']) if not add_layer(bblayersconf, layer, dep_layers, logger): logger.info('Skipping %s ???.' % layer['name']) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:29 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:29 +0000 Subject: [oe-commits] [openembedded-core] 09/17: yocto-compat-layer: include bitbake-diffsigs output In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.12A092334B2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b9e0f65e4fd2bc9f9086c14bed2da9d8b5199a18 Author: Patrick Ohly AuthorDate: Fri Apr 7 18:38:18 2017 +0200 yocto-compat-layer: include bitbake-diffsigs output After filtering out potential false positives, it becomes feasible to include the output of bitbake-diffsigs for those tasks which definitely have a change. Depends on bitbake-diffsigs with the "--signature" parameter. Enhanced output now is: AssertionError: False is not true : Layer meta-xxxx changed 120 signatures, initial differences (first hash without, second with layer): gstreamer1.0-plugins-base:do_fetch: 76973f19f2e30d282152bdd7e4efe5bb -> e6e7c6fa9f2bd59d7d8d107f7c6ca1ac Task dependencies changed from: ['PV', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'base_do_fetch'] to: ['GST_IMX_PATCHES_TO_APPEND', 'PV', 'SRCREV', 'SRC_URI', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]', 'base_do_fetch'] basehash changed from d679d30bd1ea41c56e57419b57587f3c to 090a79b45f5fa26d10f9d34e2ed7a1e6 List of dependencies for variable SRC_URI changed from '{'PV', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]'}' to '{'GST_IMX_PATCHES_TO_APPEND', 'PV', 'SRC_URI[md5sum]', 'SRC_URI[sha256sum]'}' changed items: {'GST_IMX_PATCHES_TO_APPEND'} Dependency on variable GST_IMX_PATCHES_TO_APPEND was added Variable SRC_URI value changed: " http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz file://get-caps-from-src-pad-when-query-caps.patch file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch file://encodebin-Need-more-buffers-in-output-queue-for-bett.patch file://make-gio_unix_2_0-dependency-configurable.patch file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON. [...] pulseaudio:do_install: 6bb6fe23e11a6d5fef9c3a25e73e4f9c -> 3f54ea75673a792e307197cfa6ef2694 basehash changed from ac4efcfa783bd04a5a98a2c38719aedd to 37679d99623a37c8df955da3a01415a5 Variable do_install value changed: @@ -1,3 +1,7 @@ autotools_do_install install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse + if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then + install -m 0644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf + install -m 0644 ${WORKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa + fi [YOCTO #11161] Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- scripts/lib/compatlayer/cases/common.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/lib/compatlayer/cases/common.py b/scripts/lib/compatlayer/cases/common.py index b91da9b..6eb29c1 100644 --- a/scripts/lib/compatlayer/cases/common.py +++ b/scripts/lib/compatlayer/cases/common.py @@ -76,4 +76,14 @@ class CommonCompatLayer(OECompatLayerTestCase): (self.tc.layer['name'], len(sig_diff))) for diff in sorted(sig_diff_filtered): msg.append(' %s: %s -> %s' % diff) - self.assertTrue(False, '\n'.join(msg)) + try: + recipe, taskname = diff[0].rsplit(':', 1) + output = check_command('Determining signature difference failed.', + 'bitbake-diffsigs --task %s %s --signature %s %s' % + (recipe, taskname, diff[1], diff[2])).decode('utf-8') + except RuntimeError as error: + output = str(error) + if output: + msg.extend([' ' + line for line in output.splitlines()]) + msg.append('') + self.fail('\n'.join(msg)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:36 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:36 +0000 Subject: [oe-commits] [openembedded-core] 16/17: classes/uninative: set SSTATEPOSTUNPACKFUNCS[vardepvalueexclude] properly In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.7009C2334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fa5c83fcf74c2cb86c41dd404087329183e16c1e Author: Paul Eggleton AuthorDate: Fri Apr 7 16:57:22 2017 +1200 classes/uninative: set SSTATEPOSTUNPACKFUNCS[vardepvalueexclude] properly Append to the value with appendVarFlag() instead of setting it outright, so that we can also append to it in other places. Accordingly, this varflag is pipe-separated (since we want to be able to exclude any string fragment, in this case including the leading space), thus put a leading pipe character to play nicely with any existing value. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index b578031..8f34483 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -100,7 +100,7 @@ def enable_uninative(d): bb.debug(2, "Enabling uninative") d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d)) d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") - d.setVarFlag("SSTATEPOSTUNPACKFUNCS", "vardepvalueexclude", " uninative_changeinterp") + d.appendVarFlag("SSTATEPOSTUNPACKFUNCS", "vardepvalueexclude", "| uninative_changeinterp") d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:") python uninative_changeinterp () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:34 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:34 +0000 Subject: [oe-commits] [openembedded-core] 14/17: buildhistory-diff: add option to compare task signature list In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.5A0ED2334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 019820c72e82406fc4f8911aec34e50dae75e450 Author: Paul Eggleton AuthorDate: Fri Apr 7 16:57:20 2017 +1200 buildhistory-diff: add option to compare task signature list Having added writing out of the task signature list to buildhistory (when BUILDHISTORY_FEATURES includes "task"), we now need a way to compare the list. This just shows which tasks have been added / changed signature / removed. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/buildhistory_analysis.py | 49 ++++++++++++++++++++++++++++++++++-- meta/lib/oe/sstatesig.py | 6 ++--- scripts/buildhistory-diff | 5 +++- 3 files changed, 54 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 19b3bc4..449446f 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -1,6 +1,6 @@ # Report significant differences in the buildhistory repository since a specific revision # -# Copyright (C) 2012 Intel Corporation +# Copyright (C) 2012-2013, 2016-2017 Intel Corporation # Author: Paul Eggleton # # Note: requires GitPython 0.3.1+ @@ -410,13 +410,58 @@ def compare_dict_blobs(path, ablob, bblob, report_all, report_ver): return changes -def process_changes(repopath, revision1, revision2='HEAD', report_all=False, report_ver=False): +def compare_siglists(a_blob, b_blob): + # FIXME collapse down a recipe's tasks? + alines = a_blob.data_stream.read().decode('utf-8').splitlines() + blines = b_blob.data_stream.read().decode('utf-8').splitlines() + keys = [] + pnmap = {} + def readsigs(lines): + sigs = {} + for line in lines: + linesplit = line.split() + if len(linesplit) > 2: + sigs[linesplit[0]] = linesplit[2] + if not linesplit[0] in keys: + keys.append(linesplit[0]) + pnmap[linesplit[1]] = linesplit[0].rsplit('.', 1)[0] + return sigs + adict = readsigs(alines) + bdict = readsigs(blines) + out = [] + changecount = 0 + addcount = 0 + removecount = 0 + for key in keys: + siga = adict.get(key, None) + sigb = bdict.get(key, None) + if siga is not None and sigb is not None and siga != sigb: + out.append('%s changed from %s to %s' % (key, siga, sigb)) + changecount += 1 + elif siga is None: + out.append('%s was added' % key) + addcount += 1 + elif sigb is None: + removecount += 1 + out.append('%s was removed' % key) + out.append('Summary: %d tasks added, %d tasks removed, %d tasks modified (%.1f%%)' % (addcount, removecount, changecount, (changecount / float(len(bdict)) * 100))) + return '\n'.join(out) + + +def process_changes(repopath, revision1, revision2='HEAD', report_all=False, report_ver=False, sigs=False): repo = git.Repo(repopath) assert repo.bare == False commit = repo.commit(revision1) diff = commit.diff(revision2) changes = [] + + if sigs: + for d in diff.iter_change_type('M'): + if d.a_blob.path == 'siglist.txt': + changes.append(compare_siglists(d.a_blob, d.b_blob)) + return changes + for d in diff.iter_change_type('M'): path = os.path.dirname(d.a_blob.path) if path.startswith('packages/'): diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 3239bc6..f087a01 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -217,9 +217,9 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash): for taskitem in self.taskhash: (fn, task) = taskitem.rsplit(".", 1) pn = self.lockedpnmap[fn] - tasks.append((pn, task, self.taskhash[taskitem])) - for (pn, task, taskhash) in sorted(tasks): - f.write('%s.%s %s\n' % (pn, task, taskhash)) + tasks.append((pn, task, fn, self.taskhash[taskitem])) + for (pn, task, fn, taskhash) in sorted(tasks): + f.write('%s.%s %s %s\n' % (pn, task, fn, taskhash)) def checkhashes(self, missed, ret, sq_fn, sq_task, sq_hash, sq_hashfn, d): warn_msgs = [] diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index e03ccc5..e8e3e11 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -33,6 +33,9 @@ def main(): parser.add_option("-a", "--report-all", help = "Report all changes, not just the default significant ones", action="store_true", dest="report_all", default=False) + parser.add_option("-s", "--signatures", + help = "Report on signature differences instead of output", + action="store_true", dest="sigs", default=False) options, args = parser.parse_args(sys.argv) @@ -86,7 +89,7 @@ def main(): import gitdb try: - changes = oe.buildhistory_analysis.process_changes(options.buildhistory_dir, fromrev, torev, options.report_all, options.report_ver) + changes = oe.buildhistory_analysis.process_changes(options.buildhistory_dir, fromrev, torev, options.report_all, options.report_ver, options.sigs) except gitdb.exc.BadObject as e: if len(args) == 1: sys.stderr.write("Unable to find previous build revision in buildhistory repository\n\n") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:33 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:33 +0000 Subject: [oe-commits] [openembedded-core] 13/17: classes/buildhistory: write out task signatures on every build In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.485102334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f1b5664add0900f958755178f0d910745226b915 Author: Paul Eggleton AuthorDate: Fri Apr 7 16:57:19 2017 +1200 classes/buildhistory: write out task signatures on every build If we want to determine what changed since the last build, one angle from which to look at it is to check the signatures. However, if we don't actually have the signatures from the last build we don't have anywhere to start. Save the signatures on each build in order to give us the starting point. NOTE: you need to set your BUILDHISTORY_FEATURES value to include "task" to enable collection of these signatures as it is is disabled by default. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 12 ++++++++++++ meta/lib/oe/sstatesig.py | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index eea1e72..4fc19a0 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -600,6 +600,17 @@ POPULATE_SDK_POST_HOST_COMMAND[vardepvalueexclude] .= "| buildhistory_list_insta SDK_POSTPROCESS_COMMAND_append = " buildhistory_get_sdkinfo ; buildhistory_get_extra_sdkinfo; " SDK_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_sdkinfo ; buildhistory_get_extra_sdkinfo; " +python buildhistory_write_sigs() { + if not "task" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): + return + + # Create sigs file + if hasattr(bb.parse.siggen, 'dump_siglist'): + taskoutdir = os.path.join(d.getVar('BUILDHISTORY_DIR'), 'task') + bb.utils.mkdirhier(taskoutdir) + bb.parse.siggen.dump_siglist(os.path.join(taskoutdir, 'tasksigs.txt')) +} + def buildhistory_get_build_id(d): if d.getVar('BB_WORKERCONTEXT') != '1': return "" @@ -765,6 +776,7 @@ python buildhistory_eventhandler() { shutil.rmtree(olddir) if e.data.getVar("BUILDHISTORY_COMMIT") == "1": bb.note("Writing buildhistory") + bb.build.exec_func("buildhistory_write_sigs", d) localdata = bb.data.createCopy(e.data) localdata.setVar('BUILDHISTORY_BUILD_FAILURES', str(e._failures)) interrupted = getattr(e, '_interrupted', 0) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 8d93013..3239bc6 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -211,6 +211,16 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash): f.write(' "\n') f.write('SIGGEN_LOCKEDSIGS_TYPES_%s = "%s"' % (self.machine, " ".join(l))) + def dump_siglist(self, sigfile): + with open(sigfile, "w") as f: + tasks = [] + for taskitem in self.taskhash: + (fn, task) = taskitem.rsplit(".", 1) + pn = self.lockedpnmap[fn] + tasks.append((pn, task, self.taskhash[taskitem])) + for (pn, task, taskhash) in sorted(tasks): + f.write('%s.%s %s\n' % (pn, task, taskhash)) + def checkhashes(self, missed, ret, sq_fn, sq_task, sq_hash, sq_hashfn, d): warn_msgs = [] error_msgs = [] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:35 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:35 +0000 Subject: [oe-commits] [openembedded-core] 15/17: buildhistory-diff: add option to compare actual signature differences In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.624D92334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 94095039ac9ee9f033b2d346bc8b14d44b93e2bd Author: Paul Eggleton AuthorDate: Fri Apr 7 16:57:21 2017 +1200 buildhistory-diff: add option to compare actual signature differences Use the code underpinning bitbake-diffsigs to add an option to buildhistory-diff to determine and display the differences between the actual signature inputs, with a twist - we collapse identical changes across different tasks, showing only the most recent task to have that difference, meaning that there's less noise to wade through when you just want to know what changed in order to cause some rebuilding you're seeing. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/buildhistory_analysis.py | 92 +++++++++++++++++++++++++++++------- scripts/buildhistory-diff | 7 ++- 2 files changed, 81 insertions(+), 18 deletions(-) diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 449446f..3a5b7b6 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -13,7 +13,10 @@ import os.path import difflib import git import re +import hashlib +import collections import bb.utils +import bb.tinfoil # How to display fields @@ -410,7 +413,7 @@ def compare_dict_blobs(path, ablob, bblob, report_all, report_ver): return changes -def compare_siglists(a_blob, b_blob): +def compare_siglists(a_blob, b_blob, taskdiff=False): # FIXME collapse down a recipe's tasks? alines = a_blob.data_stream.read().decode('utf-8').splitlines() blines = b_blob.data_stream.read().decode('utf-8').splitlines() @@ -429,26 +432,83 @@ def compare_siglists(a_blob, b_blob): adict = readsigs(alines) bdict = readsigs(blines) out = [] + changecount = 0 addcount = 0 removecount = 0 - for key in keys: - siga = adict.get(key, None) - sigb = bdict.get(key, None) - if siga is not None and sigb is not None and siga != sigb: - out.append('%s changed from %s to %s' % (key, siga, sigb)) - changecount += 1 - elif siga is None: - out.append('%s was added' % key) - addcount += 1 - elif sigb is None: - removecount += 1 - out.append('%s was removed' % key) + if taskdiff: + with bb.tinfoil.Tinfoil() as tinfoil: + tinfoil.prepare(config_only=True) + + changes = collections.OrderedDict() + + def compare_hashfiles(pn, taskname, hash1, hash2): + hashes = [hash1, hash2] + hashfiles = bb.siggen.find_siginfo(pn, taskname, hashes, tinfoil.config_data) + + if not taskname: + (pn, taskname) = pn.rsplit('.', 1) + pn = pnmap.get(pn, pn) + desc = '%s.%s' % (pn, taskname) + + if len(hashfiles) == 0: + out.append("Unable to find matching sigdata for %s with hashes %s or %s" % (desc, hash1, hash2)) + elif not hash1 in hashfiles: + out.append("Unable to find matching sigdata for %s with hash %s" % (desc, hash1)) + elif not hash2 in hashfiles: + out.append("Unable to find matching sigdata for %s with hash %s" % (desc, hash2)) + else: + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, collapsed=True) + for line in out2: + m = hashlib.sha256() + m.update(line.encode('utf-8')) + entry = changes.get(m.hexdigest(), (line, [])) + if desc not in entry[1]: + changes[m.hexdigest()] = (line, entry[1] + [desc]) + + # Define recursion callback + def recursecb(key, hash1, hash2): + compare_hashfiles(key, None, hash1, hash2) + return [] + + for key in keys: + siga = adict.get(key, None) + sigb = bdict.get(key, None) + if siga is not None and sigb is not None and siga != sigb: + changecount += 1 + (pn, taskname) = key.rsplit('.', 1) + compare_hashfiles(pn, taskname, siga, sigb) + elif siga is None: + addcount += 1 + elif sigb is None: + removecount += 1 + for key, item in changes.items(): + line, tasks = item + if len(tasks) == 1: + desc = tasks[0] + elif len(tasks) == 2: + desc = '%s and %s' % (tasks[0], tasks[1]) + else: + desc = '%s and %d others' % (tasks[-1], len(tasks)-1) + out.append('%s: %s' % (desc, line)) + else: + for key in keys: + siga = adict.get(key, None) + sigb = bdict.get(key, None) + if siga is not None and sigb is not None and siga != sigb: + out.append('%s changed from %s to %s' % (key, siga, sigb)) + changecount += 1 + elif siga is None: + out.append('%s was added' % key) + addcount += 1 + elif sigb is None: + out.append('%s was removed' % key) + removecount += 1 out.append('Summary: %d tasks added, %d tasks removed, %d tasks modified (%.1f%%)' % (addcount, removecount, changecount, (changecount / float(len(bdict)) * 100))) return '\n'.join(out) -def process_changes(repopath, revision1, revision2='HEAD', report_all=False, report_ver=False, sigs=False): +def process_changes(repopath, revision1, revision2='HEAD', report_all=False, report_ver=False, sigs=False, sigsdiff=False): repo = git.Repo(repopath) assert repo.bare == False commit = repo.commit(revision1) @@ -456,10 +516,10 @@ def process_changes(repopath, revision1, revision2='HEAD', report_all=False, rep changes = [] - if sigs: + if sigs or sigsdiff: for d in diff.iter_change_type('M'): if d.a_blob.path == 'siglist.txt': - changes.append(compare_siglists(d.a_blob, d.b_blob)) + changes.append(compare_siglists(d.a_blob, d.b_blob, taskdiff=sigsdiff)) return changes for d in diff.iter_change_type('M'): diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index e8e3e11..dd9745e 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -34,8 +34,11 @@ def main(): help = "Report all changes, not just the default significant ones", action="store_true", dest="report_all", default=False) parser.add_option("-s", "--signatures", - help = "Report on signature differences instead of output", + help = "Report list of signatures differing instead of output", action="store_true", dest="sigs", default=False) + parser.add_option("-S", "--signatures-with-diff", + help = "Report on actual signature differences instead of output (requires signature data to have been generated, either by running the actual tasks or using bitbake -S)", + action="store_true", dest="sigsdiff", default=False) options, args = parser.parse_args(sys.argv) @@ -89,7 +92,7 @@ def main(): import gitdb try: - changes = oe.buildhistory_analysis.process_changes(options.buildhistory_dir, fromrev, torev, options.report_all, options.report_ver, options.sigs) + changes = oe.buildhistory_analysis.process_changes(options.buildhistory_dir, fromrev, torev, options.report_all, options.report_ver, options.sigs, options.sigsdiff) except gitdb.exc.BadObject as e: if len(args) == 1: sys.stderr.write("Unable to find previous build revision in buildhistory repository\n\n") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:37 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:37 +0000 Subject: [oe-commits] [openembedded-core] 17/17: classes/buildhistory: save output file signatures for sstate tasks In-Reply-To: <149186360065.18199.8921337038633924043@git.openembedded.org> References: <149186360065.18199.8921337038633924043@git.openembedded.org> Message-ID: <20170410223321.7DED42334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4b31521b6f0d3b16d622acaad6ae9137ac1694e6 Author: Paul Eggleton AuthorDate: Fri Apr 7 16:57:23 2017 +1200 classes/buildhistory: save output file signatures for sstate tasks Save a file per task listing sha256sums for each file staged, i.e. the output of the task. Some caveats: 1) This only covers sstate tasks since it uses SSTATEPOSTUNPACKFUNCS, however those are generally the most interesting in terms of output anyway. 2) The signature is taken before applying any relocations, so any relocated files will actually have different signatures, but that's churn that you probably won't want to see here. 3) At the moment if you run the same build twice without sstate you will very likely see changes in the output for certain tasks due to things like timestamps being present in the binary output. Fixing that is a general Linux ecosystem problem - see this page for our efforts to resolve it on our side: https://wiki.yoctoproject.org/wiki/Reproducible_Builds NOTE: you need to set your BUILDHISTORY_FEATURES value to include "task" to enable collection of these signatures as it is is disabled by default. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 4fc19a0..f543bb7 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -47,6 +47,11 @@ sstate_install[vardepsexclude] += "buildhistory_emit_pkghistory" # then the value added to SSTATEPOSTINSTFUNCS: SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory" +# Similarly for our function that gets the output signatures +SSTATEPOSTUNPACKFUNCS_append = " buildhistory_emit_outputsigs" +sstate_installpkgdir[vardepsexclude] += "buildhistory_emit_outputsigs" +SSTATEPOSTUNPACKFUNCS[vardepvalueexclude] .= "| buildhistory_emit_outputsigs" + # All items excepts those listed here will be removed from a recipe's # build history directory by buildhistory_emit_pkghistory(). This is # necessary because some of these items (package directories, files that @@ -292,6 +297,29 @@ python buildhistory_emit_pkghistory() { bb.build.exec_func("buildhistory_list_pkg_files", d) } +python buildhistory_emit_outputsigs() { + if not "task" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): + return + + taskoutdir = os.path.join(d.getVar('BUILDHISTORY_DIR'), 'task', 'output') + bb.utils.mkdirhier(taskoutdir) + currenttask = d.getVar('BB_CURRENTTASK') + pn = d.getVar('PN') + taskfile = os.path.join(taskoutdir, '%s.%s' % (pn, currenttask)) + + cwd = os.getcwd() + filesigs = {} + for root, _, files in os.walk(cwd): + for fname in files: + if fname == 'fixmepath': + continue + fullpath = os.path.join(root, fname) + filesigs[os.path.relpath(fullpath, cwd)] = bb.utils.sha256_file(fullpath) + with open(taskfile, 'w') as f: + for fpath, fsig in sorted(filesigs.items(), key=lambda item: item[0]): + f.write('%s %s\n' % (fpath, fsig)) +} + def write_recipehistory(rcpinfo, d): bb.debug(2, "Writing recipe history") -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:33:32 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:33:32 +0000 Subject: [oe-commits] [bitbake] branch master updated (751c9dc -> 04a023c) Message-ID: <149186361280.18537.2639115044032985836@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master in repository bitbake. from 751c9dc fetch/local: Drop FILESDIR add f93a77f runqueue: Allow recrdeptask not to exist for all recipes add fe5d8a0 Bump version to 1.33.4 add 6fb6429 toaster: toastergui: implement machine name validation add eaeddaf toaster:test:Create selenium tests for project dashboard page add 99f49b5 bitbake-diffsigs: fix -t picking wrong files to compare add 55cd404 lib/bb/siggen: add missing path separator to cleaned paths add c87764b bitbake-diffsigs: properly report which signature is missing add f0d7ab2 bitbake-diffsigs: drop naive logic for removing duplicate files add 4d254ae lib/bb/siggen: show a diff when dumping changes to multi-line values add cb17054 lib/bb/siggen: don't show unchanged runtaskdeps list add 7f130e0 bitbake-diffsigs: change to use argparse add d9813b1 bitbake-diffsigs: add an option to find and compare specific signatures add 6543a59 lib/bb/siggen: add collapsed mode to compare_sigfiles() add 20db6b6 lib/bb/siggen: show word-diff for single-line values containing spaces add 04a023c bitbake-diffsigs: colourise output No new revisions were added by this update. Summary of changes: LICENSE | 2 + bin/bitbake | 2 +- bin/bitbake-diffsigs | 175 ++++++++------- lib/bb/__init__.py | 2 +- lib/bb/runqueue.py | 3 + lib/bb/siggen.py | 166 +++++++++++--- lib/simplediff/LICENSE | 22 ++ lib/simplediff/__init__.py | 198 +++++++++++++++++ lib/toaster/tests/builds/buildtest.py | 110 +++++----- .../commands => tests/functional}/__init__.py | 0 lib/toaster/tests/functional/functional_helpers.py | 122 +++++++++++ .../tests/functional/test_functional_basic.py | 243 +++++++++++++++++++++ lib/toaster/toastergui/static/js/projectpage.js | 17 ++ lib/toaster/toastergui/templates/project.html | 3 +- 14 files changed, 898 insertions(+), 167 deletions(-) create mode 100644 lib/simplediff/LICENSE create mode 100644 lib/simplediff/__init__.py copy lib/toaster/{toastermain/management/commands => tests/functional}/__init__.py (100%) create mode 100644 lib/toaster/tests/functional/functional_helpers.py create mode 100644 lib/toaster/tests/functional/test_functional_basic.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:53:56 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:53:56 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (4b31521 -> 1d9549a) Message-ID: <149186483599.23432.3779217592088707142@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a change to branch master-next in repository openembedded-core. from 4b31521 classes/buildhistory: save output file signatures for sstate tasks new 4a4f55c mtd-utils: refresh patches now merged upstream new 1d9549a toaster: fix SDK artifact capture The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: meta/classes/toaster.bbclass | 21 +++++++--- .../mtd/mtd-utils/0001-Fix-build-with-musl.patch | 15 ++++---- .../mtd/mtd-utils/010-fix-rpmatch.patch | 45 ++++++++++++++++++++-- .../mtd/mtd-utils/fix-armv7-neon-alignment.patch | 21 +++++++--- meta/recipes-devtools/mtd/mtd-utils_git.bb | 3 +- 5 files changed, 82 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:53:58 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:53:58 +0000 Subject: [oe-commits] [openembedded-core] 02/02: toaster: fix SDK artifact capture In-Reply-To: <149186483599.23432.3779217592088707142@git.openembedded.org> References: <149186483599.23432.3779217592088707142@git.openembedded.org> Message-ID: <20170410225356.26EB32334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1d9549a6f20ffd7f00aef2a3a35dfbaa7f875da7 Author: David Reyna AuthorDate: Sun Apr 9 15:38:51 2017 -0700 toaster: fix SDK artifact capture Use the TaskArtifacts event to scan the SDK and ESDK manifests to cleanly collect the respective artifact files. The previous method was broken when the SDK file deployment moved from the do_populate_sdk[_ext] tasks to their sstate tasks. That method is disabled (but not yet removed) in preparation for the rest of refactor work for the parent #10283 work. [YOCTO #10850] Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 4de380b..296e476 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -328,8 +328,18 @@ python toaster_artifacts() { if e.taskname in ["do_deploy", "do_image_complete", "do_populate_sdk", "do_populate_sdk_ext"]: d2 = d.createCopy() d2.setVar('FILE', e.taskfile) - d2.setVar('SSTATE_MANMACH', d2.expand("${MACHINE}")) + # Use 'stamp-extra-info' if present, else use workaround + # to determine 'SSTATE_MANMACH' + extrainf = d2.getVarFlag(e.taskname, 'stamp-extra-info') + if extrainf: + d2.setVar('SSTATE_MANMACH', extrainf) + else: + if "do_populate_sdk" == e.taskname: + d2.setVar('SSTATE_MANMACH', d2.expand("${MACHINE}${SDKMACHINE}")) + else: + d2.setVar('SSTATE_MANMACH', d2.expand("${MACHINE}")) manifest = oe.sstatesig.sstate_get_manifest_filename(e.taskname[3:], d2)[0] + if os.access(manifest, os.R_OK): with open(manifest) as fmanifest: artifacts = [fname.strip() for fname in fmanifest] @@ -356,8 +366,9 @@ do_packagedata_setscene[vardepsexclude] += "toaster_package_dumpdata " do_package[postfuncs] += "toaster_package_dumpdata " do_package[vardepsexclude] += "toaster_package_dumpdata " -do_populate_sdk[postfuncs] += "toaster_artifact_dumpdata " -do_populate_sdk[vardepsexclude] += "toaster_artifact_dumpdata " +#do_populate_sdk[postfuncs] += "toaster_artifact_dumpdata " +#do_populate_sdk[vardepsexclude] += "toaster_artifact_dumpdata " + +#do_populate_sdk_ext[postfuncs] += "toaster_artifact_dumpdata " +#do_populate_sdk_ext[vardepsexclude] += "toaster_artifact_dumpdata " -do_populate_sdk_ext[postfuncs] += "toaster_artifact_dumpdata " -do_populate_sdk_ext[vardepsexclude] += "toaster_artifact_dumpdata " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:53:57 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:53:57 +0000 Subject: [oe-commits] [openembedded-core] 01/02: mtd-utils: refresh patches now merged upstream In-Reply-To: <149186483599.23432.3779217592088707142@git.openembedded.org> References: <149186483599.23432.3779217592088707142@git.openembedded.org> Message-ID: <20170410225356.1D1D02334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4a4f55cd54774ed75e8ef6081474ef0564f99e6d Author: Andre McCurdy AuthorDate: Thu Apr 6 15:43:53 2017 -0700 mtd-utils: refresh patches now merged upstream Update Upstream-Status tags and apply 010-fix-rpmatch.patch unconditionally, since it's merged unconditionally upstream. Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- .../mtd/mtd-utils/0001-Fix-build-with-musl.patch | 15 ++++---- .../mtd/mtd-utils/010-fix-rpmatch.patch | 45 ++++++++++++++++++++-- .../mtd/mtd-utils/fix-armv7-neon-alignment.patch | 21 +++++++--- meta/recipes-devtools/mtd/mtd-utils_git.bb | 3 +- 4 files changed, 66 insertions(+), 18 deletions(-) diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch index 6a9bd1c..bf3f98f 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/0001-Fix-build-with-musl.patch @@ -1,19 +1,18 @@ -From e16fa28bc57c29923ab60af2ac343da83e1992d8 Mon Sep 17 00:00:00 2001 +From 4dab9bed1033f797ef9b482c77342fe3fe26d0be Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Oct 2015 23:51:34 +0000 Subject: [PATCH] Fix build with musl -Upstream-Status: Pending +Upstream-Status: Backport Signed-off-by: Khem Raj +Signed-off-by: David Oberhollenzer --- - mkfs.jffs2.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- - recv_image.c | 1 - - serve_image.c | 1 - - 3 files changed, 42 insertions(+), 4 deletions(-) + jffsX-utils/mkfs.jffs2.c | 1 + + 1 file changed, 1 insertion(+) -diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c -index f09c0b2..ed2dc43 100644 +diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c +index 5446a16..ca5e0d5 100644 --- a/jffsX-utils/mkfs.jffs2.c +++ b/jffsX-utils/mkfs.jffs2.c @@ -72,6 +72,7 @@ diff --git a/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch b/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch index 7d783e7..853de6a 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/010-fix-rpmatch.patch @@ -1,11 +1,48 @@ -Replace rpmatch() usage with checking first character of line +From 82839c3c0371ca2a1643a99d7d01f5bc1c850b28 Mon Sep 17 00:00:00 2001 +From: David Oberhollenzer +Date: Thu, 2 Mar 2017 11:40:36 +0100 +Subject: [PATCH] Replace rpmatch() usage with checking first character of line + +This is based on the patch from Khem Raj used by openembedded. In +addition to the original patch, this also removes the fallback +implementation that was provided for C libraries that don't implement +rpmatch. + +Upstream-Status: Backport -Upstream-Status: Pending Signed-off-by: Khem Raj +Signed-off-by: David Oberhollenzer +--- + include/common.h | 25 ++++++------------------- + 1 file changed, 6 insertions(+), 19 deletions(-) +diff --git a/include/common.h b/include/common.h +index d0c706d..d609257 100644 --- a/include/common.h +++ b/include/common.h -@@ -122,10 +122,12 @@ +@@ -129,21 +129,6 @@ extern "C" { + fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \ + } while(0) + +-/* uClibc versions before 0.9.34 and musl don't have rpmatch() */ +-#if defined(__UCLIBC__) && \ +- (__UCLIBC_MAJOR__ == 0 && \ +- (__UCLIBC_MINOR__ < 9 || \ +- (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 34))) || \ +- !defined(__GLIBC__) +-#undef rpmatch +-#define rpmatch __rpmatch +-static inline int __rpmatch(const char *resp) +-{ +- return (resp[0] == 'y' || resp[0] == 'Y') ? 1 : +- (resp[0] == 'n' || resp[0] == 'N') ? 0 : -1; +-} +-#endif +- + /** + * prompt the user for confirmation + */ +@@ -164,10 +149,12 @@ static inline bool prompt(const char *msg, bool def) } if (strcmp("\n", line) != 0) { @@ -22,3 +59,5 @@ Signed-off-by: Khem Raj puts("unknown response; please try again"); continue; } +-- +2.6.1 diff --git a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch index a279d84..6fc594f 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/fix-armv7-neon-alignment.patch @@ -1,16 +1,25 @@ -Upstream-Status: Pending +From 7d026a85946a08b8167dcd792ea6660bf6a49e08 Mon Sep 17 00:00:00 2001 +From: Yuanjie Huang +Date: Thu, 2 Mar 2017 10:43:56 +0100 +Subject: [PATCH] Fix alignment trap triggered by NEON instructions NEON instruction VLD1.64 was used to copy 64 bits data after type casting, and they will trigger alignment trap. This patch uses memcpy to avoid alignment problem. +Upstream-Status: Backport + Signed-off-by: Yuanjie Huang +Signed-off-by: David Oberhollenzer +--- + ubifs-utils/mkfs.ubifs/key.h | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) -diff --git a/mkfs.ubifs/key.h b/mkfs.ubifs/key.h -index d3a02d4..e7e9218 100644 +diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h +index 39379fd..118858b 100644 --- a/ubifs-utils/mkfs.ubifs/key.h +++ b/ubifs-utils/mkfs.ubifs/key.h -@@ -141,10 +141,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum, +@@ -159,10 +159,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum, */ static inline void key_write(const union ubifs_key *from, void *to) { @@ -26,7 +35,7 @@ index d3a02d4..e7e9218 100644 memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8); } -@@ -156,10 +158,12 @@ static inline void key_write(const union ubifs_key *from, void *to) +@@ -174,10 +176,12 @@ static inline void key_write(const union ubifs_key *from, void *to) */ static inline void key_write_idx(const union ubifs_key *from, void *to) { @@ -42,3 +51,5 @@ index d3a02d4..e7e9218 100644 } /** +-- +2.6.1 diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 30cf13c..4fbc54f 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb @@ -17,10 +17,9 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://fix-armv7-neon-alignment.patch \ file://mtd-utils-fix-corrupt-cleanmarker-with-flash_erase--j-command.patch \ file://0001-Fix-build-with-musl.patch \ + file://010-fix-rpmatch.patch \ " -SRC_URI_append_libc-musl = " file://010-fix-rpmatch.patch " - S = "${WORKDIR}/git/" # xattr support creates an additional compile-time dependency on acl because -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Apr 10 22:54:08 2017 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 10 Apr 2017 22:54:08 +0000 Subject: [oe-commits] [bitbake] 02/05: toaster: fix add layer button for Machines In-Reply-To: <149186484618.23704.8330072402124019163@git.openembedded.org> References: <149186484618.23704.8330072402124019163@git.openembedded.org> Message-ID: <20170410225406.54C492334AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository bitbake. commit 54d61e7c64c97799de85b3563119f0f5d051675e Author: David Reyna AuthorDate: Sun Apr 9 22:12:57 2017 -0700 toaster: fix add layer button for Machines Fix a missing close quote in the layer add button, and use the layer index for the xhr_layer call. [YOCTO #11213] Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- lib/toaster/toastergui/templates/machine_btn.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/toaster/toastergui/templates/machine_btn.html b/lib/toaster/toastergui/templates/machine_btn.html index 12b5c96..6debe65 100644 --- a/lib/toaster/toastergui/templates/machine_btn.html +++ b/lib/toaster/toastergui/templates/machine_btn.html @@ -7,8 +7,8 @@