* [PATCH 00/43] Warrior patch review
@ 2019-05-04 15:26 Armin Kuster
2019-05-04 15:26 ` [PATCH 01/43] curl: update to 7.64.1 Armin Kuster
` (42 more replies)
0 siblings, 43 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
Community patch review opportunity.
The following changes since commit f571b188177788d8ed0a7f3efe3569f153b1b0d3:
build-appliance-image: Update to warrior head revision (2019-04-14 21:27:58 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/warrior-next
http://cgit.openembedded.org//log/?h=stable/warrior-next
Adrian Bunk (3):
gnutls: upgrade 3.6.5 -> 3.6.7
dhcp: Replace OE specific patch for compatibility with latest bind
with upstream patch
gnome-doc-utils: Remove stale patch
Alexander Kanavin (2):
python3: add another multilib fix
buildhistory: call a dependency parser only on actual dependency lists
Anuj Mittal (4):
gcc: fix CVE-2018-18484
gdb: fix CVE-2017-9778
binutils: fix CVE-2019-9074 CVE-2019-9075 CVE-2019-9076 CVE-2019-9077
openssh: fix CVE-2018-20685, CVE-2019-6109, CVE-2019-6111
Bruce Ashfield (8):
linux-yocto/5.0: update to v5.0.5
linux-yocto-rt: update to 5.0.5-rt3
linux-yocto/5.0: update to v5.0.7
linux-yocto/4.19: update to v4.19.34
linux-yocto-rt/4.19: fix merge conflict in lru_drain
linux-yocto/5.0: port RAID configuration tweaks from master
linux-yocto/5.0: integrate TCP timeout / hang fix
linux-yocto/5.0: update TCP patch to mainline version
Changqing Li (2):
waffle: supprt build waffle without x11
piglit: support build piglit without x11
Chen Qi (4):
busybox: fix ptest failure about 'dc'
base-files: move hostname operations out of issue file settings
dropbear: set CVE_PRODUCT
libsdl: set CVE_PRODUCT
Dengke Du (1):
linux-yocto_5.0: set devicetree for armv5
He Zhe (1):
ltp: Fix setrlimit03 call succeeded unexpectedly
Jaewon Lee (1):
Adding back wrapper and using OEPYTHON3HOME variable for python3
Jens Rehsack (1):
kernel-module-split.bbclass: support CONFIG_MODULE_COMPRESS=y
Joshua Watt (2):
resulttool: Load results from URL
resulttool: Add log subcommand
Kai Kang (1):
cryptodev: fix module loading error
Mardegan, Alberto (1):
oeqa/core/runner: dump stdout and stderr of each test case
Mariano Lopez (1):
ptest.bbclass: Use d.getVar instead of os.environ
Martin Jansa (2):
icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH
glibc: always use bfd linker
Naveen Saini (2):
core-image-rt: make sure that we append to DEPENDS
core-image-rt-sdk: make sure that we append to DEPENDS
Oleksandr Kravchuk (1):
curl: update to 7.64.1
Richard Purdie (4):
core-image-sato-sdk-ptest: Try and keep image below 4GB limit
resultool/resultutils: Fix module import error
utils/multiprocess_launch: Improve failing subprocess output
python3: Drop ptest hack
Steven Hung (洪于玉) (1):
kernel.bbclass: convert base_do_unpack_append() to a task
sangeeta jain (1):
resulttool/manualexecution: Enable test case configuration option
meta/classes/icecc.bbclass | 1 +
meta/classes/kernel-module-split.bbclass | 20 +-
meta/classes/kernel.bbclass | 3 +-
meta/classes/ptest.bbclass | 4 +-
meta/classes/testimage.bbclass | 3 +-
meta/lib/oe/buildhistory_analysis.py | 2 +-
meta/lib/oe/utils.py | 7 +-
meta/lib/oeqa/core/runner.py | 20 +-
...eplace-custom-isc_boolean_t-with-C-standa.patch | 2882 --------------------
...d-includes-of-new-BIND9-compatibility-hea.patch | 79 +
meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 2 +-
...ve-progressmeter-force-an-update-at-the-b.patch | 121 +
.../openssh/openssh/CVE-2018-20685.patch | 40 +
.../openssh/openssh/CVE-2019-6109.patch | 275 ++
.../openssh/openssh/CVE-2019-6111.patch | 187 ++
meta/recipes-connectivity/openssh/openssh_7.9p1.bb | 4 +
meta/recipes-core/base-files/base-files_3.0.14.bb | 7 +-
...ix-two-test-case-to-also-depend-on-DC_BIG.patch | 39 +
meta/recipes-core/busybox/busybox_1.30.1.bb | 1 +
meta/recipes-core/dropbear/dropbear.inc | 2 +
meta/recipes-core/glibc/glibc_2.29.bb | 2 +-
meta/recipes-devtools/binutils/binutils-2.32.inc | 4 +
.../binutils/binutils/CVE-2019-9074.patch | 68 +
.../binutils/binutils/CVE-2019-9075.patch | 119 +
.../binutils/binutils/CVE-2019-9076.patch | 49 +
.../binutils/binutils/CVE-2019-9077.patch | 37 +
meta/recipes-devtools/gcc/gcc-8.3.inc | 1 +
...sion-limit-to-libiberty-s-demangling-code.patch | 325 +++
meta/recipes-devtools/gdb/gdb-8.2.1.inc | 1 +
meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch | 99 +
...ig.py-fix-another-place-where-lib-is-hard.patch | 31 +
...EPYTHON3HOME-is-set-use-instead-of-PYTHON.patch | 47 +
.../python/python3/ptesthack.patch | 60 -
meta/recipes-devtools/python/python3_3.7.2.bb | 9 +-
...trlimit03.c-read-proc-sys-fs-nr_open-for-.patch | 70 +
meta/recipes-extended/ltp/ltp_20190115.bb | 1 +
...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 40 -
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +
meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb | 2 +
meta/recipes-graphics/piglit/piglit_git.bb | 13 +-
meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +-
meta/recipes-kernel/cryptodev/cryptodev.inc | 4 +-
...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 +
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 +-
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 8 +-
meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 +-
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 21 +-
meta/recipes-rt/images/core-image-rt-sdk.bb | 2 +-
meta/recipes-rt/images/core-image-rt.bb | 2 +-
.../images/core-image-sato-sdk-ptest.bb | 4 +-
.../curl/{curl_7.64.0.bb => curl_7.64.1.bb} | 4 +-
.../gnutls/{gnutls_3.6.5.bb => gnutls_3.6.7.bb} | 7 +-
scripts/lib/resulttool/log.py | 56 +
scripts/lib/resulttool/manualexecution.py | 14 +-
scripts/lib/resulttool/merge.py | 8 +-
scripts/lib/resulttool/regression.py | 6 +-
scripts/lib/resulttool/report.py | 2 +-
scripts/lib/resulttool/resultutils.py | 23 +-
scripts/lib/resulttool/store.py | 4 +-
scripts/resulttool | 2 +
62 files changed, 1882 insertions(+), 3070 deletions(-)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2019-6109.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
create mode 100644 meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch
create mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
delete mode 100644 meta/recipes-devtools/python/python3/ptesthack.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch
delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
rename meta/recipes-support/curl/{curl_7.64.0.bb => curl_7.64.1.bb} (95%)
rename meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.7.bb} (88%)
create mode 100644 scripts/lib/resulttool/log.py
--
2.7.4
^ permalink raw reply [flat|nested] 51+ messages in thread
* [PATCH 01/43] curl: update to 7.64.1
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 02/43] gnutls: upgrade 3.6.5 -> 3.6.7 Armin Kuster
` (41 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Bug fix only update]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-support/curl/{curl_7.64.0.bb => curl_7.64.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/curl/{curl_7.64.0.bb => curl_7.64.1.bb} (95%)
diff --git a/meta/recipes-support/curl/curl_7.64.0.bb b/meta/recipes-support/curl/curl_7.64.1.bb
similarity index 95%
rename from meta/recipes-support/curl/curl_7.64.0.bb
rename to meta/recipes-support/curl/curl_7.64.1.bb
index a1b5e7d..47c28be 100644
--- a/meta/recipes-support/curl/curl_7.64.0.bb
+++ b/meta/recipes-support/curl/curl_7.64.1.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://0001-replace-krb5-config-with-pkg-config.patch \
"
-SRC_URI[md5sum] = "d0bcc586873cfef08b4b9594e5395a33"
-SRC_URI[sha256sum] = "d573ba1c2d1cf9d8533fadcce480d778417964e8d04ccddcc76e591d544cf2eb"
+SRC_URI[md5sum] = "790c101927845208a9d7e8c429ddd1b2"
+SRC_URI[sha256sum] = "4cc7c738b35250d0680f29e93e0820c4cb40035f43514ea3ec8d60322d41a45d"
CVE_PRODUCT = "curl libcurl"
inherit autotools pkgconfig binconfig multilib_header
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 02/43] gnutls: upgrade 3.6.5 -> 3.6.7
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
2019-05-04 15:26 ` [PATCH 01/43] curl: update to 7.64.1 Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 03/43] dhcp: Replace OE specific patch for compatibility with latest bind with upstream patch Armin Kuster
` (40 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Adrian Bunk <bunk@stusta.de>
This is a new upstream release from the same stable branch
bringing new features and bugfixes (including CVE fixes).
COPYING changed http -> https.
configure no longer has a --without-libunistring-prefix option.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[includes: CVE-2019-3836 CVE-2019-3829]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.7.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.6.5.bb => gnutls_3.6.7.bb} (88%)
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.5.bb b/meta/recipes-support/gnutls/gnutls_3.6.7.bb
similarity index 88%
rename from meta/recipes-support/gnutls/gnutls_3.6.5.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.7.bb
index dfc3507..e05dc2b 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.5.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.7.bb
@@ -9,7 +9,7 @@ LICENSE_${PN}-bin = "GPLv3+"
LICENSE_${PN}-openssl = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \
- file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+ file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
DEPENDS = "nettle gmp virtual/libiconv libunistring"
@@ -21,8 +21,8 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
file://arm_eabi.patch \
"
-SRC_URI[md5sum] = "3474849e1bbd4d16403b82ab2579000b"
-SRC_URI[sha256sum] = "073eced3acef49a3883e69ffd5f0f0b5f46e2760ad86eddc6c0866df4e7abb35"
+SRC_URI[md5sum] = "c4ac669c500df939d4fbfea722367929"
+SRC_URI[sha256sum] = "5b3409ad5aaf239808730d1ee12fdcd148c0be00262c7edf157af655a8a188e2"
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
@@ -44,7 +44,6 @@ EXTRA_OECONF = " \
--enable-local-libopts \
--enable-openssl-compatibility \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
- --without-libunistring-prefix \
"
LDFLAGS_append_libc-musl = " -largp"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 03/43] dhcp: Replace OE specific patch for compatibility with latest bind with upstream patch
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
2019-05-04 15:26 ` [PATCH 01/43] curl: update to 7.64.1 Armin Kuster
2019-05-04 15:26 ` [PATCH 02/43] gnutls: upgrade 3.6.5 -> 3.6.7 Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 04/43] ptest.bbclass: Use d.getVar instead of os.environ Armin Kuster
` (39 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Adrian Bunk <bunk@stusta.de>
This also fixes a dhcp breakage noticed by Enrico Scholz.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...eplace-custom-isc_boolean_t-with-C-standa.patch | 2882 --------------------
...d-includes-of-new-BIND9-compatibility-hea.patch | 79 +
meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 2 +-
3 files changed, 80 insertions(+), 2883 deletions(-)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
deleted file mode 100644
index d2e5771..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch
+++ /dev/null
@@ -1,2882 +0,0 @@
-From ffb1d1325bd6503df9a324befac5f5039ac77432 Mon Sep 17 00:00:00 2001
-From: Armin Kuster <akuster@mvista.com>
-Date: Tue, 23 Oct 2018 10:36:56 +0000
-Subject: [PATCH] dhcpd: fix Replace custom isc_boolean_t with C standard bool
- type
-
-
-Upstream-Status: Pending
-
-Fixes issues introduced by bind when they changed their headers.
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
----
- includes/dhcpd.h | 34 +++++++++++++++++-----------------
- includes/heap.h | 2 +-
- includes/omapip/omapip.h | 2 +-
- includes/omapip/omapip_p.h | 6 +++---
- includes/tree.h | 2 +-
- 5 files changed, 23 insertions(+), 23 deletions(-)
-
-Index: dhcp-4.4.1/includes/dhcpd.h
-===================================================================
---- dhcp-4.4.1.orig/includes/dhcpd.h
-+++ dhcp-4.4.1/includes/dhcpd.h
-@@ -461,20 +461,20 @@ struct packet {
- * options we got in a previous exchange were still there, we need
- * to signal this in a reliable way.
- */
-- isc_boolean_t agent_options_stashed;
-+ bool agent_options_stashed;
-
- /*
- * ISC_TRUE if packet received unicast (as opposed to multicast).
- * Only used in DHCPv6.
- */
-- isc_boolean_t unicast;
-+ bool unicast;
-
- /* Propagates server value SV_ECHO_CLIENT_ID so it is available
- * in cons_options() */
- int sv_echo_client_id;
-
- /* Relay port check */
-- isc_boolean_t relay_source_port;
-+ bool relay_source_port;
- };
-
- /*
-@@ -1174,7 +1174,7 @@ struct dhc6_lease {
- struct dhc6_lease *next;
- struct data_string server_id;
-
-- isc_boolean_t released;
-+ bool released;
- int score;
- u_int8_t pref;
-
-@@ -1695,8 +1695,8 @@ struct ipv6_pool {
- int bits; /* number of bits, CIDR style */
- int units; /* allocation unit in bits */
- iasubopt_hash_t *leases; /* non-free leases */
-- isc_uint64_t num_active; /* count of active leases */
-- isc_uint64_t num_abandoned; /* count of abandoned leases */
-+ uint64_t num_active; /* count of active leases */
-+ uint64_t num_abandoned; /* count of abandoned leases */
- isc_heap_t *active_timeouts; /* timeouts for active leases */
- int num_inactive; /* count of inactive leases */
- isc_heap_t *inactive_timeouts; /* timeouts for expired or
-@@ -1732,11 +1732,11 @@ struct ipv6_pond {
- struct ipv6_pool **ipv6_pools; /* NULL-terminated array */
- int last_ipv6_pool; /* offset of last IPv6 pool
- used to issue a lease */
-- isc_uint64_t num_total; /* Total number of elements in the pond */
-- isc_uint64_t num_active; /* Number of elements in the pond in use */
-- isc_uint64_t num_abandoned; /* count of abandoned leases */
-+ uint64_t num_total; /* Total number of elements in the pond */
-+ uint64_t num_active; /* Number of elements in the pond in use */
-+ uint64_t num_abandoned; /* count of abandoned leases */
- int logged; /* already logged a message */
-- isc_uint64_t low_threshold; /* low threshold to restart logging */
-+ uint64_t low_threshold; /* low threshold to restart logging */
- int jumbo_range;
- #ifdef EUI_64
- int use_eui_64; /* use EUI-64 address assignment when true */
-@@ -1745,9 +1745,9 @@ struct ipv6_pond {
-
- /*
- * Max addresses in a pond that can be supported by log threshold
-- * Currently based on max value supported by isc_uint64_t.
-+ * Currently based on max value supported by uint64_t.
- */
--#define POND_TRACK_MAX ISC_UINT64_MAX
-+#define POND_TRACK_MAX UINT64_MAX
-
- /* Flags for dhcp_ddns_cb_t */
- #define DDNS_UPDATE_ADDR 0x0001
-@@ -1868,7 +1868,7 @@ lookup_fqdn6_option(struct universe *uni
- unsigned code);
- void
- save_fqdn6_option(struct universe *universe, struct option_state *options,
-- struct option_cache *oc, isc_boolean_t appendp);
-+ struct option_cache *oc, bool appendp);
- void
- delete_fqdn6_option(struct universe *universe, struct option_state *options,
- int code);
-@@ -1953,7 +1953,7 @@ void save_option(struct universe *, stru
- void also_save_option(struct universe *, struct option_state *,
- struct option_cache *);
- void save_hashed_option(struct universe *, struct option_state *,
-- struct option_cache *, isc_boolean_t appendp);
-+ struct option_cache *, bool appendp);
- void delete_option (struct universe *, struct option_state *, int);
- void delete_hashed_option (struct universe *,
- struct option_state *, int);
-@@ -2041,7 +2041,7 @@ int linked_option_state_dereference (str
- struct option_state *,
- const char *, int);
- void save_linked_option(struct universe *, struct option_state *,
-- struct option_cache *, isc_boolean_t appendp);
-+ struct option_cache *, bool appendp);
- void linked_option_space_foreach (struct packet *, struct lease *,
- struct client_state *,
- struct option_state *,
-@@ -2069,7 +2069,7 @@ void do_packet (struct interface_info *,
- struct dhcp_packet *, unsigned,
- unsigned int, struct iaddr, struct hardware *);
- void do_packet6(struct interface_info *, const char *,
-- int, int, const struct iaddr *, isc_boolean_t);
-+ int, int, const struct iaddr *, bool);
- int packet6_len_okay(const char *, int);
-
- int validate_packet(struct packet *);
-@@ -2224,7 +2224,7 @@ uint32_t parse_byte_order_uint32(const v
- int ddns_updates(struct packet *, struct lease *, struct lease *,
- struct iasubopt *, struct iasubopt *, struct option_state *);
- isc_result_t ddns_removals(struct lease *, struct iasubopt *,
-- struct dhcp_ddns_cb *, isc_boolean_t);
-+ struct dhcp_ddns_cb *, bool);
- u_int16_t get_conflict_mask(struct option_state *input_options);
- #if defined (TRACING)
- void trace_ddns_init(void);
-@@ -2450,7 +2450,7 @@ void dhcpleasequery (struct packet *, in
- void dhcpv6_leasequery (struct data_string *, struct packet *);
-
- /* dhcpv6.c */
--isc_boolean_t server_duid_isset(void);
-+bool server_duid_isset(void);
- void copy_server_duid(struct data_string *ds, const char *file, int line);
- void set_server_duid(struct data_string *new_duid);
- isc_result_t set_server_duid_from_option(void);
-@@ -2852,7 +2852,7 @@ extern void (*bootp_packet_handler) (str
- struct iaddr, struct hardware *);
- extern void (*dhcpv6_packet_handler)(struct interface_info *,
- const char *, int,
-- int, const struct iaddr *, isc_boolean_t);
-+ int, const struct iaddr *, bool);
- extern struct timeout *timeouts;
- extern omapi_object_type_t *dhcp_type_interface;
- #if defined (TRACING)
-@@ -2943,7 +2943,7 @@ int addr_or(struct iaddr *result,
- const struct iaddr *a1, const struct iaddr *a2);
- int addr_and(struct iaddr *result,
- const struct iaddr *a1, const struct iaddr *a2);
--isc_boolean_t is_cidr_mask_valid(const struct iaddr *addr, int bits);
-+bool is_cidr_mask_valid(const struct iaddr *addr, int bits);
- isc_result_t range2cidr(struct iaddrcidrnetlist **result,
- const struct iaddr *lo, const struct iaddr *hi);
- isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
-@@ -3787,7 +3787,7 @@ isc_result_t ia_add_iasubopt(struct ia_x
- const char *file, int line);
- void ia_remove_iasubopt(struct ia_xx *ia, struct iasubopt *iasubopt,
- const char *file, int line);
--isc_boolean_t ia_equal(const struct ia_xx *a, const struct ia_xx *b);
-+bool ia_equal(const struct ia_xx *a, const struct ia_xx *b);
-
- isc_result_t ipv6_pool_allocate(struct ipv6_pool **pool, u_int16_t type,
- const struct in6_addr *start_addr,
-@@ -3820,9 +3820,9 @@ isc_result_t expire_lease6(struct iasubo
- struct ipv6_pool *pool, time_t now);
- isc_result_t release_lease6(struct ipv6_pool *pool, struct iasubopt *lease);
- isc_result_t decline_lease6(struct ipv6_pool *pool, struct iasubopt *lease);
--isc_boolean_t lease6_exists(const struct ipv6_pool *pool,
-+bool lease6_exists(const struct ipv6_pool *pool,
- const struct in6_addr *addr);
--isc_boolean_t lease6_usable(struct iasubopt *lease);
-+bool lease6_usable(struct iasubopt *lease);
- isc_result_t cleanup_lease6(ia_hash_t *ia_table,
- struct ipv6_pool *pool,
- struct iasubopt *lease,
-@@ -3834,13 +3834,13 @@ isc_result_t create_prefix6(struct ipv6_
- unsigned int *attempts,
- const struct data_string *uid,
- time_t soft_lifetime_end_time);
--isc_boolean_t prefix6_exists(const struct ipv6_pool *pool,
-+bool prefix6_exists(const struct ipv6_pool *pool,
- const struct in6_addr *pref, u_int8_t plen);
-
- isc_result_t add_ipv6_pool(struct ipv6_pool *pool);
- isc_result_t find_ipv6_pool(struct ipv6_pool **pool, u_int16_t type,
- const struct in6_addr *addr);
--isc_boolean_t ipv6_in_pool(const struct in6_addr *addr,
-+bool ipv6_in_pool(const struct in6_addr *addr,
- const struct ipv6_pool *pool);
- isc_result_t ipv6_pond_allocate(struct ipv6_pond **pond,
- const char *file, int line);
-Index: dhcp-4.4.1/includes/heap.h
-===================================================================
---- dhcp-4.4.1.orig/includes/heap.h
-+++ dhcp-4.4.1/includes/heap.h
-@@ -26,7 +26,7 @@
- * The comparision function returns ISC_TRUE if the first argument has
- * higher priority than the second argument, and ISC_FALSE otherwise.
- */
--typedef isc_boolean_t (*isc_heapcompare_t)(void *, void *);
-+typedef bool (*isc_heapcompare_t)(void *, void *);
-
- /*%
- * The index function allows the client of the heap to receive a callback
-Index: dhcp-4.4.1/includes/omapip/omapip.h
-===================================================================
---- dhcp-4.4.1.orig/includes/omapip/omapip.h
-+++ dhcp-4.4.1/includes/omapip/omapip.h
-@@ -264,7 +264,7 @@ isc_result_t omapi_protocol_connect (oma
- isc_result_t omapi_connect_list (omapi_object_t *, omapi_addr_list_t *,
- omapi_addr_t *);
- isc_result_t omapi_protocol_listen (omapi_object_t *, unsigned, int);
--isc_boolean_t omapi_protocol_authenticated (omapi_object_t *);
-+bool omapi_protocol_authenticated (omapi_object_t *);
- isc_result_t omapi_protocol_configure_security (omapi_object_t *,
- isc_result_t (*)
- (omapi_object_t *,
-Index: dhcp-4.4.1/includes/omapip/omapip_p.h
-===================================================================
---- dhcp-4.4.1.orig/includes/omapip/omapip_p.h
-+++ dhcp-4.4.1/includes/omapip/omapip_p.h
-@@ -149,7 +149,7 @@ typedef struct __omapi_protocol_object {
- omapi_remote_auth_t *remote_auth_list; /* Authenticators active on
- this connection. */
-
-- isc_boolean_t insecure; /* Set to allow unauthenticated
-+ bool insecure; /* Set to allow unauthenticated
- messages. */
-
- isc_result_t (*verify_auth) (omapi_object_t *, omapi_auth_key_t *);
-@@ -158,7 +158,7 @@ typedef struct __omapi_protocol_object {
- typedef struct {
- OMAPI_OBJECT_PREAMBLE;
-
-- isc_boolean_t insecure; /* Set to allow unauthenticated
-+ bool insecure; /* Set to allow unauthenticated
- messages. */
-
- isc_result_t (*verify_auth) (omapi_object_t *, omapi_auth_key_t *);
-@@ -208,7 +208,7 @@ typedef struct __omapi_io_object {
- isc_result_t (*writer) (omapi_object_t *);
- isc_result_t (*reaper) (omapi_object_t *);
- isc_socket_t *fd;
-- isc_boolean_t closed; /* ISC_TRUE = closed, do not use */
-+ bool closed; /* ISC_TRUE = closed, do not use */
- } omapi_io_object_t;
-
- typedef struct __omapi_generic_object {
-Index: dhcp-4.4.1/includes/tree.h
-===================================================================
---- dhcp-4.4.1.orig/includes/tree.h
-+++ dhcp-4.4.1/includes/tree.h
-@@ -304,7 +304,7 @@ struct universe {
- struct option_state *,
- unsigned);
- void (*save_func) (struct universe *, struct option_state *,
-- struct option_cache *, isc_boolean_t);
-+ struct option_cache *, bool );
- void (*foreach) (struct packet *,
- struct lease *, struct client_state *,
- struct option_state *, struct option_state *,
-Index: dhcp-4.4.1/common/conflex.c
-===================================================================
---- dhcp-4.4.1.orig/common/conflex.c
-+++ dhcp-4.4.1/common/conflex.c
-@@ -322,7 +322,7 @@ get_raw_token(struct parse *cfile) {
-
- static enum dhcp_token
- get_next_token(const char **rval, unsigned *rlen,
-- struct parse *cfile, isc_boolean_t raw) {
-+ struct parse *cfile, bool raw) {
- int rv;
-
- if (cfile -> token) {
-@@ -367,7 +367,7 @@ get_next_token(const char **rval, unsign
-
- enum dhcp_token
- next_token(const char **rval, unsigned *rlen, struct parse *cfile) {
-- return get_next_token(rval, rlen, cfile, ISC_FALSE);
-+ return get_next_token(rval, rlen, cfile, false);
- }
-
-
-@@ -378,7 +378,7 @@ next_token(const char **rval, unsigned *
-
- enum dhcp_token
- next_raw_token(const char **rval, unsigned *rlen, struct parse *cfile) {
-- return get_next_token(rval, rlen, cfile, ISC_TRUE);
-+ return get_next_token(rval, rlen, cfile, true);
- }
-
-
-@@ -393,7 +393,7 @@ next_raw_token(const char **rval, unsign
-
- enum dhcp_token
- do_peek_token(const char **rval, unsigned int *rlen,
-- struct parse *cfile, isc_boolean_t raw) {
-+ struct parse *cfile, bool raw) {
- int x;
-
- if (!cfile->token || (!raw && (cfile->token == WHITESPACE))) {
-@@ -441,7 +441,7 @@ do_peek_token(const char **rval, unsigne
-
- enum dhcp_token
- peek_token(const char **rval, unsigned *rlen, struct parse *cfile) {
-- return do_peek_token(rval, rlen, cfile, ISC_FALSE);
-+ return do_peek_token(rval, rlen, cfile, false);
- }
-
-
-@@ -452,7 +452,7 @@ peek_token(const char **rval, unsigned *
-
- enum dhcp_token
- peek_raw_token(const char **rval, unsigned *rlen, struct parse *cfile) {
-- return do_peek_token(rval, rlen, cfile, ISC_TRUE);
-+ return do_peek_token(rval, rlen, cfile, true);
- }
-
- static void skip_to_eol (cfile)
-Index: dhcp-4.4.1/common/discover.c
-===================================================================
---- dhcp-4.4.1.orig/common/discover.c
-+++ dhcp-4.4.1/common/discover.c
-@@ -73,7 +73,7 @@ void (*bootp_packet_handler) (struct int
- void (*dhcpv6_packet_handler)(struct interface_info *,
- const char *, int,
- int, const struct iaddr *,
-- isc_boolean_t);
-+ bool);
- #endif /* DHCPv6 */
-
-
-@@ -236,7 +236,7 @@ struct iface_conf_list {
- struct iface_info {
- char name[IF_NAMESIZE+1]; /* name of the interface, e.g. "bge0" */
- struct sockaddr_storage addr; /* address information */
-- isc_uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */
-+ uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */
- };
-
- /*
-@@ -312,14 +312,14 @@ int
- next_iface(struct iface_info *info, int *err, struct iface_conf_list *ifaces) {
- struct LIFREQ *p;
- struct LIFREQ tmp;
-- isc_boolean_t foundif;
-+ bool foundif;
- #if defined(sun) || defined(__linux)
- /* Pointer used to remove interface aliases. */
- char *s;
- #endif
-
- do {
-- foundif = ISC_FALSE;
-+ foundif = false;
-
- if (ifaces->next >= ifaces->num) {
- *err = 0;
-@@ -353,8 +353,8 @@ next_iface(struct iface_info *info, int
- }
- #endif /* defined(sun) || defined(__linux) */
-
-- foundif = ISC_TRUE;
-- } while ((foundif == ISC_FALSE) ||
-+ foundif = true;
-+ } while ((foundif == false) ||
- (strncmp(info->name, "dummy", 5) == 0));
-
- memset(&tmp, 0, sizeof(tmp));
-@@ -410,7 +410,7 @@ struct iface_conf_list {
- struct iface_info {
- char name[IFNAMSIZ]; /* name of the interface, e.g. "bge0" */
- struct sockaddr_storage addr; /* address information */
-- isc_uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */
-+ uint64_t flags; /* interface flags, e.g. IFF_LOOPBACK */
- };
-
- /*
-@@ -1190,9 +1190,9 @@ got_one_v6(omapi_object_t *h) {
- * If a packet is not multicast, we assume it is unicast.
- */
- if (IN6_IS_ADDR_MULTICAST(&to)) {
-- is_unicast = ISC_FALSE;
-+ is_unicast = false;
- } else {
-- is_unicast = ISC_TRUE;
-+ is_unicast = true;
- }
-
- ifrom.len = 16;
-Index: dhcp-4.4.1/omapip/iscprint.c
-===================================================================
---- dhcp-4.4.1.orig/omapip/iscprint.c
-+++ dhcp-4.4.1/omapip/iscprint.c
-@@ -59,8 +59,8 @@ isc_print_vsnprintf(char *str, size_t si
- int plus;
- int space;
- int neg;
-- isc_int64_t tmpi;
-- isc_uint64_t tmpui;
-+ int64_t tmpi;
-+ uint64_t tmpui;
- unsigned long width;
- unsigned long precision;
- unsigned int length;
-@@ -234,7 +234,7 @@ isc_print_vsnprintf(char *str, size_t si
- goto printint;
- case 'o':
- if (q)
-- tmpui = va_arg(ap, isc_uint64_t);
-+ tmpui = va_arg(ap, uint64_t);
- else if (l)
- tmpui = va_arg(ap, long int);
- else
-@@ -244,7 +244,7 @@ isc_print_vsnprintf(char *str, size_t si
- goto printint;
- case 'u':
- if (q)
-- tmpui = va_arg(ap, isc_uint64_t);
-+ tmpui = va_arg(ap, uint64_t);
- else if (l)
- tmpui = va_arg(ap, unsigned long int);
- else
-@@ -253,7 +253,7 @@ isc_print_vsnprintf(char *str, size_t si
- goto printint;
- case 'x':
- if (q)
-- tmpui = va_arg(ap, isc_uint64_t);
-+ tmpui = va_arg(ap, uint64_t);
- else if (l)
- tmpui = va_arg(ap, unsigned long int);
- else
-@@ -267,7 +267,7 @@ isc_print_vsnprintf(char *str, size_t si
- goto printint;
- case 'X':
- if (q)
-- tmpui = va_arg(ap, isc_uint64_t);
-+ tmpui = va_arg(ap, uint64_t);
- else if (l)
- tmpui = va_arg(ap, unsigned long int);
- else
-Index: dhcp-4.4.1/server/confpars.c
-===================================================================
---- dhcp-4.4.1.orig/server/confpars.c
-+++ dhcp-4.4.1/server/confpars.c
-@@ -4005,15 +4005,15 @@ add_ipv6_pool_to_subnet(struct subnet *s
-
- /* Only bother if we aren't already flagged as jumbo */
- if (pond->jumbo_range == 0) {
-- if ((units - bits) > (sizeof(isc_uint64_t) * 8)) {
-+ if ((units - bits) > (sizeof(uint64_t) * 8)) {
- pond->jumbo_range = 1;
- pond->num_total = POND_TRACK_MAX;
- }
- else {
-- isc_uint64_t space_left
-+ uint64_t space_left
- = POND_TRACK_MAX - pond->num_total;
-- isc_uint64_t addon
-- = (isc_uint64_t)(1) << (units - bits);
-+ uint64_t addon
-+ = (uint64_t)(1) << (units - bits);
-
- if (addon > space_left) {
- pond->jumbo_range = 1;
-@@ -4739,7 +4739,7 @@ parse_ia_na_declaration(struct parse *cf
- struct iasubopt *iaaddr;
- struct ipv6_pool *pool;
- char addr_buf[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
-- isc_boolean_t newbinding;
-+ bool newbinding;
- struct binding_scope *scope = NULL;
- struct binding *bnd;
- struct binding_value *nv = NULL;
-@@ -4959,9 +4959,9 @@ parse_ia_na_declaration(struct parse *cf
- }
- strcpy(bnd->name, val);
-
-- newbinding = ISC_TRUE;
-+ newbinding = true;
- } else {
-- newbinding = ISC_FALSE;
-+ newbinding = false;
- }
-
- if (!binding_value_allocate(&nv, MDL)) {
-@@ -5186,7 +5186,7 @@ parse_ia_ta_declaration(struct parse *cf
- struct iasubopt *iaaddr;
- struct ipv6_pool *pool;
- char addr_buf[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
-- isc_boolean_t newbinding;
-+ bool newbinding;
- struct binding_scope *scope = NULL;
- struct binding *bnd;
- struct binding_value *nv = NULL;
-@@ -5406,9 +5406,9 @@ parse_ia_ta_declaration(struct parse *cf
- }
- strcpy(bnd->name, val);
-
-- newbinding = ISC_TRUE;
-+ newbinding = true;
- } else {
-- newbinding = ISC_FALSE;
-+ newbinding = false;
- }
-
- if (!binding_value_allocate(&nv, MDL)) {
-@@ -5623,7 +5623,7 @@ parse_ia_pd_declaration(struct parse *cf
- struct iasubopt *iapref;
- struct ipv6_pool *pool;
- char addr_buf[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
-- isc_boolean_t newbinding;
-+ bool newbinding;
- struct binding_scope *scope = NULL;
- struct binding *bnd;
- struct binding_value *nv = NULL;
-@@ -5843,9 +5843,9 @@ parse_ia_pd_declaration(struct parse *cf
- }
- strcpy(bnd->name, val);
-
-- newbinding = ISC_TRUE;
-+ newbinding = true;
- } else {
-- newbinding = ISC_FALSE;
-+ newbinding = false;
- }
-
- if (!binding_value_allocate(&nv, MDL)) {
-Index: dhcp-4.4.1/server/dhcpv6.c
-===================================================================
---- dhcp-4.4.1.orig/server/dhcpv6.c
-+++ dhcp-4.4.1/server/dhcpv6.c
-@@ -71,8 +71,8 @@ struct reply_state {
- unsigned ia_count;
- unsigned pd_count;
- unsigned client_resources;
-- isc_boolean_t resources_included;
-- isc_boolean_t static_lease;
-+ bool resources_included;
-+ bool static_lease;
- unsigned static_prefixes;
- struct ia_xx *ia;
- struct ia_xx *old_ia;
-@@ -123,7 +123,7 @@ static isc_result_t shared_network_from_
- struct packet *packet);
- static void seek_shared_host(struct host_decl **hp,
- struct shared_network *shared);
--static isc_boolean_t fixed_matches_shared(struct host_decl *host,
-+static bool fixed_matches_shared(struct host_decl *host,
- struct shared_network *shared);
- static isc_result_t reply_process_ia_na(struct reply_state *reply,
- struct option_cache *ia);
-@@ -131,9 +131,9 @@ static isc_result_t reply_process_ia_ta(
- struct option_cache *ia);
- static isc_result_t reply_process_addr(struct reply_state *reply,
- struct option_cache *addr);
--static isc_boolean_t address_is_owned(struct reply_state *reply,
-+static bool address_is_owned(struct reply_state *reply,
- struct iaddr *addr);
--static isc_boolean_t temporary_is_available(struct reply_state *reply,
-+static bool temporary_is_available(struct reply_state *reply,
- struct iaddr *addr);
- static isc_result_t find_client_temporaries(struct reply_state *reply);
- static isc_result_t reply_process_try_addr(struct reply_state *reply,
-@@ -151,7 +151,7 @@ static isc_result_t reply_process_ia_pd(
- static struct group *find_group_by_prefix(struct reply_state *reply);
- static isc_result_t reply_process_prefix(struct reply_state *reply,
- struct option_cache *pref);
--static isc_boolean_t prefix_is_owned(struct reply_state *reply,
-+static bool prefix_is_owned(struct reply_state *reply,
- struct iaddrcidrnet *pref);
- static isc_result_t find_client_prefix(struct reply_state *reply);
- static isc_result_t reply_process_try_prefix(struct reply_state *reply,
-@@ -174,7 +174,7 @@ static void unicast_reject(struct data_s
- const struct data_string *client_id,
- const struct data_string *server_id);
-
--static isc_boolean_t is_unicast_option_defined(struct packet *packet);
-+static bool is_unicast_option_defined(struct packet *packet);
- static isc_result_t shared_network_from_requested_addr (struct shared_network
- **shared,
- struct packet* packet);
-@@ -363,7 +363,7 @@ static struct data_string server_duid;
- /*
- * Check if the server_duid has been set.
- */
--isc_boolean_t
-+bool
- server_duid_isset(void) {
- return (server_duid.data != NULL);
- }
-@@ -992,7 +992,7 @@ void check_pool6_threshold(struct reply_
- struct iasubopt *lease)
- {
- struct ipv6_pond *pond;
-- isc_uint64_t used, count, high_threshold;
-+ uint64_t used, count, high_threshold;
- int poolhigh = 0, poollow = 0;
- char *shared_name = "no name";
- char tmp_addr[INET6_ADDRSTRLEN];
-@@ -1310,9 +1310,9 @@ pick_v6_address(struct reply_state *repl
- unsigned int attempts;
- char tmp_buf[INET6_ADDRSTRLEN];
- struct iasubopt **addr = &reply->lease;
-- isc_uint64_t total = 0;
-- isc_uint64_t active = 0;
-- isc_uint64_t abandoned = 0;
-+ uint64_t total = 0;
-+ uint64_t active = 0;
-+ uint64_t abandoned = 0;
- int jumbo_range = 0;
- char *shared_name = (reply->shared->name ?
- reply->shared->name : "(no name)");
-@@ -1825,7 +1825,7 @@ lease_to_client(struct data_string *repl
-
- /* Start counting resources (addresses) offered. */
- reply.client_resources = 0;
-- reply.resources_included = ISC_FALSE;
-+ reply.resources_included = false;
-
- status = reply_process_ia_na(&reply, oc);
-
-@@ -1843,7 +1843,7 @@ lease_to_client(struct data_string *repl
-
- /* Start counting resources (addresses) offered. */
- reply.client_resources = 0;
-- reply.resources_included = ISC_FALSE;
-+ reply.resources_included = false;
-
- status = reply_process_ia_ta(&reply, oc);
-
-@@ -1864,7 +1864,7 @@ lease_to_client(struct data_string *repl
-
- /* Start counting resources (prefixes) offered. */
- reply.client_resources = 0;
-- reply.resources_included = ISC_FALSE;
-+ reply.resources_included = false;
-
- status = reply_process_ia_pd(&reply, oc);
-
-@@ -2077,9 +2077,9 @@ reply_process_ia_na(struct reply_state *
- tmp_addr, MDL) == 0)
- log_fatal("Impossible condition at %s:%d.", MDL);
-
-- reply->static_lease = ISC_TRUE;
-+ reply->static_lease = true;
- } else
-- reply->static_lease = ISC_FALSE;
-+ reply->static_lease = false;
-
- /*
- * Save the cursor position at the start of the IA, so we can
-@@ -2778,7 +2778,7 @@ reply_process_addr(struct reply_state *r
- * (fault out all else). Otherwise it's a dynamic address, so lookup
- * that address and make sure it belongs to this DUID:IAID pair.
- */
--static isc_boolean_t
-+static bool
- address_is_owned(struct reply_state *reply, struct iaddr *addr) {
- int i;
- struct ipv6_pond *pond;
-@@ -2791,13 +2791,13 @@ address_is_owned(struct reply_state *rep
- log_fatal("Impossible condition at %s:%d.", MDL);
-
- if (memcmp(addr->iabuf, reply->fixed.data, 16) == 0)
-- return (ISC_TRUE);
-+ return (true);
-
-- return (ISC_FALSE);
-+ return (false);
- }
-
- if ((reply->old_ia == NULL) || (reply->old_ia->num_iasubopt == 0))
-- return (ISC_FALSE);
-+ return (false);
-
- for (i = 0 ; i < reply->old_ia->num_iasubopt ; i++) {
- struct iasubopt *tmp;
-@@ -2805,8 +2805,8 @@ address_is_owned(struct reply_state *rep
- tmp = reply->old_ia->iasubopt[i];
-
- if (memcmp(addr->iabuf, &tmp->addr, 16) == 0) {
-- if (lease6_usable(tmp) == ISC_FALSE) {
-- return (ISC_FALSE);
-+ if (lease6_usable(tmp) == false) {
-+ return (false);
- }
-
- pond = tmp->ipv6_pool->ipv6_pond;
-@@ -2814,15 +2814,15 @@ address_is_owned(struct reply_state *rep
- (permitted(reply->packet, pond->prohibit_list))) ||
- ((pond->permit_list != NULL) &&
- (!permitted(reply->packet, pond->permit_list))))
-- return (ISC_FALSE);
-+ return (false);
-
- iasubopt_reference(&reply->lease, tmp, MDL);
-
-- return (ISC_TRUE);
-+ return (true);
- }
- }
-
-- return (ISC_FALSE);
-+ return (false);
- }
-
- /* Process a client-supplied IA_TA. This may append options to the tail of
-@@ -2890,7 +2890,7 @@ reply_process_ia_ta(struct reply_state *
- /*
- * Temporary leases are dynamic by definition.
- */
-- reply->static_lease = ISC_FALSE;
-+ reply->static_lease = false;
-
- /*
- * Save the cursor position at the start of the IA, so we can
-@@ -2972,7 +2972,7 @@ reply_process_ia_ta(struct reply_state *
- }
- status = ISC_R_CANCELED;
- reply->client_resources = 0;
-- reply->resources_included = ISC_FALSE;
-+ reply->resources_included = false;
- if (reply->lease != NULL)
- iasubopt_dereference(&reply->lease, MDL);
- }
-@@ -3364,7 +3364,7 @@ void shorten_lifetimes(struct reply_stat
- /*
- * Verify the temporary address is available.
- */
--static isc_boolean_t
-+static bool
- temporary_is_available(struct reply_state *reply, struct iaddr *addr) {
- struct in6_addr tmp_addr;
- struct subnet *subnet;
-@@ -3379,7 +3379,7 @@ temporary_is_available(struct reply_stat
- * So this is not a request for this address.
- */
- if (IN6_IS_ADDR_UNSPECIFIED(&tmp_addr))
-- return ISC_FALSE;
-+ return false;
-
- /*
- * Verify that this address is on the client's network.
-@@ -3393,13 +3393,13 @@ temporary_is_available(struct reply_stat
-
- /* Address not found on shared network. */
- if (subnet == NULL)
-- return ISC_FALSE;
-+ return false;
-
- /*
- * Check if this address is owned (must be before next step).
- */
- if (address_is_owned(reply, addr))
-- return ISC_TRUE;
-+ return true;
-
- /*
- * Verify that this address is in a temporary pool and try to get it.
-@@ -3424,18 +3424,18 @@ temporary_is_available(struct reply_stat
- }
-
- if (pool == NULL)
-- return ISC_FALSE;
-+ return false;
- if (lease6_exists(pool, &tmp_addr))
-- return ISC_FALSE;
-+ return false;
- if (iasubopt_allocate(&reply->lease, MDL) != ISC_R_SUCCESS)
-- return ISC_FALSE;
-+ return false;
- reply->lease->addr = tmp_addr;
- reply->lease->plen = 0;
- /* Default is soft binding for 2 minutes. */
- if (add_lease6(pool, reply->lease, cur_time + 120) != ISC_R_SUCCESS)
-- return ISC_FALSE;
-+ return false;
-
-- return ISC_TRUE;
-+ return true;
- }
-
- /*
-@@ -3652,7 +3652,7 @@ find_client_address(struct reply_state *
- */
-
- if ((candidate_shared != reply->shared) ||
-- (lease6_usable(lease) != ISC_TRUE))
-+ (lease6_usable(lease) != true))
- continue;
-
- if (((pond->prohibit_list != NULL) &&
-@@ -3971,7 +3971,7 @@ reply_process_send_addr(struct reply_sta
- goto cleanup;
- }
-
-- reply->resources_included = ISC_TRUE;
-+ reply->resources_included = true;
-
- cleanup:
- if (data.data != NULL)
-@@ -4722,7 +4722,7 @@ reply_process_prefix(struct reply_state
- * (fault out all else). Otherwise it's a dynamic prefix, so lookup
- * that prefix and make sure it belongs to this DUID:IAID pair.
- */
--static isc_boolean_t
-+static bool
- prefix_is_owned(struct reply_state *reply, struct iaddrcidrnet *pref) {
- struct iaddrcidrnetlist *l;
- int i;
-@@ -4736,14 +4736,14 @@ prefix_is_owned(struct reply_state *repl
- if ((pref->bits == l->cidrnet.bits) &&
- (memcmp(pref->lo_addr.iabuf,
- l->cidrnet.lo_addr.iabuf, 16) == 0))
-- return (ISC_TRUE);
-+ return (true);
- }
-- return (ISC_FALSE);
-+ return (false);
- }
-
- if ((reply->old_ia == NULL) ||
- (reply->old_ia->num_iasubopt == 0))
-- return (ISC_FALSE);
-+ return (false);
-
- for (i = 0 ; i < reply->old_ia->num_iasubopt ; i++) {
- struct iasubopt *tmp;
-@@ -4752,8 +4752,8 @@ prefix_is_owned(struct reply_state *repl
-
- if ((pref->bits == (int) tmp->plen) &&
- (memcmp(pref->lo_addr.iabuf, &tmp->addr, 16) == 0)) {
-- if (lease6_usable(tmp) == ISC_FALSE) {
-- return (ISC_FALSE);
-+ if (lease6_usable(tmp) == false) {
-+ return (false);
- }
-
- pond = tmp->ipv6_pool->ipv6_pond;
-@@ -4761,14 +4761,14 @@ prefix_is_owned(struct reply_state *repl
- (permitted(reply->packet, pond->prohibit_list))) ||
- ((pond->permit_list != NULL) &&
- (!permitted(reply->packet, pond->permit_list))))
-- return (ISC_FALSE);
-+ return (false);
-
- iasubopt_reference(&reply->lease, tmp, MDL);
-- return (ISC_TRUE);
-+ return (true);
- }
- }
-
-- return (ISC_FALSE);
-+ return (false);
- }
-
- /*
-@@ -4914,7 +4914,7 @@ find_client_prefix(struct reply_state *r
- */
- if (((candidate_shared != NULL) &&
- (candidate_shared != reply->shared)) ||
-- (lease6_usable(prefix) != ISC_TRUE))
-+ (lease6_usable(prefix) != true))
- continue;
-
- /*
-@@ -5233,7 +5233,7 @@ reply_process_send_prefix(struct reply_s
- goto cleanup;
- }
-
-- reply->resources_included = ISC_TRUE;
-+ reply->resources_included = true;
-
- cleanup:
- if (data.data != NULL)
-@@ -5383,8 +5383,8 @@ dhcpv6_request(struct data_string *reply
-
- /* If the REQUEST arrived via unicast and unicast option isn't set,
- * reject it per RFC 3315, Sec 18.2.1 */
-- if (packet->unicast == ISC_TRUE &&
-- is_unicast_option_defined(packet) == ISC_FALSE) {
-+ if (packet->unicast == true &&
-+ is_unicast_option_defined(packet) == false) {
- unicast_reject(reply_ret, packet, &client_id, &server_id);
- } else {
- /*
-@@ -5505,7 +5505,7 @@ dhcpv6_confirm(struct data_string *reply
- struct option_state *cli_enc_opt_state, *opt_state;
- struct iaddr cli_addr;
- int pass;
-- isc_boolean_t inappropriate, has_addrs;
-+ bool inappropriate, has_addrs;
- char reply_data[65536];
- struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
- int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
-@@ -5556,7 +5556,7 @@ dhcpv6_confirm(struct data_string *reply
- goto exit;
-
- /* Are the addresses in all the IA's appropriate for that link? */
-- has_addrs = inappropriate = ISC_FALSE;
-+ has_addrs = inappropriate = false;
- pass = D6O_IA_NA;
- while(!inappropriate) {
- /* If we've reached the end of the IA_NA pass, move to the
-@@ -5602,7 +5602,7 @@ dhcpv6_confirm(struct data_string *reply
- data_string_forget(&iaaddr, MDL);
-
- /* Record that we've processed at least one address. */
-- has_addrs = ISC_TRUE;
-+ has_addrs = true;
-
- /* Find out if any subnets cover this address. */
- for (subnet = shared->subnets ; subnet != NULL ;
-@@ -5621,7 +5621,7 @@ dhcpv6_confirm(struct data_string *reply
- * continue searching.
- */
- if (subnet == NULL) {
-- inappropriate = ISC_TRUE;
-+ inappropriate = true;
- break;
- }
- }
-@@ -5719,8 +5719,8 @@ dhcpv6_renew(struct data_string *reply,
-
- /* If the RENEW arrived via unicast and unicast option isn't set,
- * reject it per RFC 3315, Sec 18.2.3 */
-- if (packet->unicast == ISC_TRUE &&
-- is_unicast_option_defined(packet) == ISC_FALSE) {
-+ if (packet->unicast == true &&
-+ is_unicast_option_defined(packet) == false) {
- unicast_reject(reply, packet, &client_id, &server_id);
- } else {
- /*
-@@ -6142,8 +6142,8 @@ dhcpv6_decline(struct data_string *reply
-
- /* If the DECLINE arrived via unicast and unicast option isn't set,
- * reject it per RFC 3315, Sec 18.2.7 */
-- if (packet->unicast == ISC_TRUE &&
-- is_unicast_option_defined(packet) == ISC_FALSE) {
-+ if (packet->unicast == true &&
-+ is_unicast_option_defined(packet) == false) {
- unicast_reject(reply, packet, &client_id, &server_id);
- } else {
- /*
-@@ -6597,8 +6597,8 @@ dhcpv6_release(struct data_string *reply
-
- /* If the RELEASE arrived via unicast and unicast option isn't set,
- * reject it per RFC 3315, Sec 18.2.6 */
-- if (packet->unicast == ISC_TRUE &&
-- is_unicast_option_defined(packet) == ISC_FALSE) {
-+ if (packet->unicast == true &&
-+ is_unicast_option_defined(packet) == false) {
- unicast_reject(reply, packet, &client_id, &server_id);
- } else {
- /*
-@@ -6897,7 +6897,7 @@ dhcpv6_relay_forw(struct data_string *re
- }
- data_string_forget(&a_opt, MDL);
-
-- packet->relay_source_port = ISC_TRUE;
-+ packet->relay_source_port = true;
- }
- #endif
-
-@@ -7219,7 +7219,7 @@ dhcp4o6_relay_forw(struct data_string *r
- }
- data_string_forget(&a_opt, MDL);
-
-- packet->relay_source_port = ISC_TRUE;
-+ packet->relay_source_port = true;
- }
- #endif
-
-@@ -8036,35 +8036,35 @@ seek_shared_host(struct host_decl **hp,
- host_reference(hp, seek, MDL);
- }
-
--static isc_boolean_t
-+static bool
- fixed_matches_shared(struct host_decl *host, struct shared_network *shared) {
- struct subnet *subnet;
- struct data_string addr;
-- isc_boolean_t matched;
-+ bool matched;
- struct iaddr fixed;
-
- if (host->fixed_addr == NULL)
-- return ISC_FALSE;
-+ return false;
-
- memset(&addr, 0, sizeof(addr));
- if (!evaluate_option_cache(&addr, NULL, NULL, NULL, NULL, NULL,
- &global_scope, host->fixed_addr, MDL))
-- return ISC_FALSE;
-+ return false;
-
- if (addr.len < 16) {
- data_string_forget(&addr, MDL);
-- return ISC_FALSE;
-+ return false;
- }
-
- fixed.len = 16;
- memcpy(fixed.iabuf, addr.data, 16);
-
-- matched = ISC_FALSE;
-+ matched = false;
- for (subnet = shared->subnets ; subnet != NULL ;
- subnet = subnet->next_sibling) {
- if (addr_eq(subnet_number(fixed, subnet->netmask),
- subnet->net)) {
-- matched = ISC_TRUE;
-+ matched = true;
- break;
- }
- }
-@@ -8167,15 +8167,15 @@ unicast_reject(struct data_string *reply
- * statements from the network's group outward into a local option cache.
- * The option cache is then scanned for the presence of unicast option. If
- * the packet cannot be mapped to a shared network, the function returns
-- * ISC_FALSE.
-+ * false.
- * \param packet inbound packet from the client
- *
-- * \return ISC_TRUE if the dhcp6.unicast option is defined, false otherwise.
-+ * \return true if the dhcp6.unicast option is defined, false otherwise.
- *
- */
--isc_boolean_t
-+bool
- is_unicast_option_defined(struct packet *packet) {
-- isc_boolean_t is_defined = ISC_FALSE;
-+ bool is_defined = false;
- struct option_state *opt_state = NULL;
- struct option_cache *oc = NULL;
- struct shared_network *shared = NULL;
-@@ -8195,7 +8195,7 @@ is_unicast_option_defined(struct packet
- * logic will catch it */
- log_error("is_unicast_option_defined:"
- "cannot attribute packet to a network.");
-- return (ISC_FALSE);
-+ return (false);
- }
-
- /* Now that we've mapped it to a network, execute statments to that
-@@ -8205,7 +8205,7 @@ is_unicast_option_defined(struct packet
- &global_scope, shared->group, NULL, NULL);
-
- oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
-- is_defined = (oc != NULL ? ISC_TRUE : ISC_FALSE);
-+ is_defined = (oc != NULL ? true : false);
- log_debug("is_unicast_option_defined: option found : %d", is_defined);
-
- if (shared != NULL) {
-Index: dhcp-4.4.1/client/clparse.c
-===================================================================
---- dhcp-4.4.1.orig/client/clparse.c
-+++ dhcp-4.4.1/client/clparse.c
-@@ -1527,7 +1527,7 @@ parse_client6_lease_statement(struct par
-
- case TOKEN_RELEASED:
- case TOKEN_ABANDONED:
-- lease->released = ISC_TRUE;
-+ lease->released = true;
- break;
-
- default:
-Index: dhcp-4.4.1/client/dhc6.c
-===================================================================
---- dhcp-4.4.1.orig/client/dhc6.c
-+++ dhcp-4.4.1/client/dhc6.c
-@@ -109,7 +109,7 @@ static isc_result_t dhc6_add_ia_pd(struc
- u_int8_t message,
- int wanted,
- int *added);
--static isc_boolean_t stopping_finished(void);
-+static bool stopping_finished(void);
- static void dhc6_merge_lease(struct dhc6_lease *src, struct dhc6_lease *dst);
- void do_select6(void *input);
- void do_refresh6(void *input);
-@@ -131,7 +131,7 @@ static void script_write_params6(struct
- const char *prefix,
- struct option_state *options);
- static void script_write_requested6(struct client_state *client);
--static isc_boolean_t active_prefix(struct client_state *client);
-+static bool active_prefix(struct client_state *client);
-
- static int check_timing6(struct client_state *client, u_int8_t msg_type,
- char *msg_str, struct dhc6_lease *lease,
-@@ -149,7 +149,7 @@ static isc_result_t dhc6_add_ia_na_decli
- struct data_string *packet,
- struct dhc6_lease *lease);
- static int drop_declined_addrs(struct dhc6_lease *lease);
--static isc_boolean_t unexpired_address_in_lease(struct dhc6_lease *lease);
-+static bool unexpired_address_in_lease(struct dhc6_lease *lease);
-
- extern int onetry;
- extern int stateless;
-@@ -418,14 +418,14 @@ valid_reply(struct packet *packet, struc
- {
- struct data_string sid, cid;
- struct option_cache *oc;
-- int rval = ISC_TRUE;
-+ int rval = true;
-
- memset(&sid, 0, sizeof(sid));
- memset(&cid, 0, sizeof(cid));
-
- if (!lookup_option(&dhcpv6_universe, packet->options, D6O_SERVERID)) {
- log_error("Response without a server identifier received.");
-- rval = ISC_FALSE;
-+ rval = false;
- }
-
- oc = lookup_option(&dhcpv6_universe, packet->options, D6O_CLIENTID);
-@@ -434,7 +434,7 @@ valid_reply(struct packet *packet, struc
- client->sent_options, &global_scope, oc,
- MDL)) {
- log_error("Response without a client identifier.");
-- rval = ISC_FALSE;
-+ rval = false;
- }
-
- oc = lookup_option(&dhcpv6_universe, client->sent_options,
-@@ -444,7 +444,7 @@ valid_reply(struct packet *packet, struc
- client->sent_options, NULL, &global_scope,
- oc, MDL)) {
- log_error("Local client identifier is missing!");
-- rval = ISC_FALSE;
-+ rval = false;
- }
-
- if (sid.len == 0 ||
-@@ -452,7 +452,7 @@ valid_reply(struct packet *packet, struc
- memcmp(sid.data, cid.data, sid.len)) {
- log_error("Advertise with matching transaction ID, but "
- "mismatching client id.");
-- rval = ISC_FALSE;
-+ rval = false;
- }
-
- /* clean up pointers to the strings */
-@@ -2375,7 +2375,7 @@ start_release6(struct client_state *clie
- /* Note this in the lease file. */
- if (client->active_lease == NULL)
- return;
-- client->active_lease->released = ISC_TRUE;
-+ client->active_lease->released = true;
- write_client6_lease(client, client->active_lease, 0, 1);
-
- /* Set timers per RFC3315 section 18.1.6. */
-@@ -2612,7 +2612,7 @@ dhc6_check_advertise(struct dhc6_lease *
- {
- struct dhc6_ia *ia;
- isc_result_t rval = ISC_R_SUCCESS;
-- int have_addrs = ISC_FALSE;
-+ int have_addrs = false;
- unsigned code;
- const char *scope;
- int got_na = 0, got_ta = 0, got_pd = 0;
-@@ -2650,14 +2650,14 @@ dhc6_check_advertise(struct dhc6_lease *
- * Should we check the addr itself for usability?
- */
- if (ia->addrs != NULL) {
-- have_addrs = ISC_TRUE;
-+ have_addrs = true;
- }
- }
-
- /* If we didn't get some addrs or the user required us to
- * get all of the requested IAs and we didn't return an error
- */
-- if ((have_addrs != ISC_TRUE) ||
-+ if ((have_addrs != true) ||
- ((require_all_ias != 0) &&
- ((got_na < wanted_ia_na) ||
- (got_ta < wanted_ia_ta) ||
-@@ -2670,7 +2670,7 @@ dhc6_check_advertise(struct dhc6_lease *
- /* status code <-> action matrix for the client in INIT state
- * (rapid/commit). Returns always false as no action is defined.
- */
--static isc_boolean_t
-+static bool
- dhc6_init_action(struct client_state *client, isc_result_t *rvalp,
- unsigned code)
- {
-@@ -2679,21 +2679,21 @@ dhc6_init_action(struct client_state *cl
-
- if (client == NULL) {
- *rvalp = DHCP_R_INVALIDARG;
-- return ISC_FALSE;
-+ return false;
- }
-
- if (*rvalp == ISC_R_SUCCESS)
-- return ISC_FALSE;
-+ return false;
-
- /* No possible action in any case... */
-- return ISC_FALSE;
-+ return false;
- }
-
- /* status code <-> action matrix for the client in SELECT state
- * (request/reply). Returns true if action was taken (and the
- * packet should be ignored), or false if no action was taken.
- */
--static isc_boolean_t
-+static bool
- dhc6_select_action(struct client_state *client, isc_result_t *rvalp,
- unsigned code)
- {
-@@ -2705,12 +2705,12 @@ dhc6_select_action(struct client_state *
-
- if (client == NULL) {
- *rvalp = DHCP_R_INVALIDARG;
-- return ISC_FALSE;
-+ return false;
- }
- rval = *rvalp;
-
- if (rval == ISC_R_SUCCESS)
-- return ISC_FALSE;
-+ return false;
-
- switch (code) {
- /* We may have an earlier failure status code (so no
-@@ -2723,7 +2723,7 @@ dhc6_select_action(struct client_state *
- case STATUS_NoBinding:
- case STATUS_UseMulticast:
- /* Take no action. */
-- return ISC_FALSE;
-+ return false;
-
- /* If the server can't deal with us, either try the
- * next advertised server, or continue retrying if there
-@@ -2739,7 +2739,7 @@ dhc6_select_action(struct client_state *
-
- break;
- } else /* Take no action - continue to retry. */
-- return ISC_FALSE;
-+ return false;
-
- /* If the server has no addresses, try other servers if
- * we got some, otherwise go to INIT to hope for more
-@@ -2748,7 +2748,7 @@ dhc6_select_action(struct client_state *
- case STATUS_NoAddrsAvail:
- case STATUS_NoPrefixAvail:
- if (client->state == S_REBOOTING)
-- return ISC_FALSE;
-+ return false;
-
- if (client->selected_lease == NULL)
- log_fatal("Impossible case at %s:%d.", MDL);
-@@ -2794,7 +2794,7 @@ dhc6_select_action(struct client_state *
- break;
- }
-
-- return ISC_TRUE;
-+ return true;
- }
-
- static void
-@@ -2821,7 +2821,7 @@ dhc6_withdraw_lease(struct client_state
- * (request/reply). Returns true if action was taken (and the
- * packet should be ignored), or false if no action was taken.
- */
--static isc_boolean_t
-+static bool
- dhc6_reply_action(struct client_state *client, isc_result_t *rvalp,
- unsigned code)
- {
-@@ -2832,12 +2832,12 @@ dhc6_reply_action(struct client_state *c
-
- if (client == NULL) {
- *rvalp = DHCP_R_INVALIDARG;
-- return ISC_FALSE;
-+ return false;
- }
- rval = *rvalp;
-
- if (rval == ISC_R_SUCCESS)
-- return ISC_FALSE;
-+ return false;
-
- switch (code) {
- /* It's possible an earlier status code set rval to a failure
-@@ -2852,7 +2852,7 @@ dhc6_reply_action(struct client_state *c
- case STATUS_UnspecFail:
- /* For unknown codes...it's a soft (retryable) error. */
- default:
-- return ISC_FALSE;
-+ return false;
-
- /* The server is telling us to use a multicast address, so
- * we have to delete the unicast option from the active
-@@ -2865,7 +2865,7 @@ dhc6_reply_action(struct client_state *c
- delete_option(&dhcp_universe,
- client->active_lease->options,
- D6O_UNICAST);
-- return ISC_FALSE;
-+ return false;
-
- /* "When the client receives a NotOnLink status from the
- * server in response to a Request, the client can either
-@@ -2914,7 +2914,7 @@ dhc6_reply_action(struct client_state *c
- break;
- }
-
-- return ISC_TRUE;
-+ return true;
- }
-
- /* status code <-> action matrix for the client in STOPPED state
-@@ -2922,7 +2922,7 @@ dhc6_reply_action(struct client_state *c
- * packet should be ignored), or false if no action was taken.
- * NoBinding is translated into Success.
- */
--static isc_boolean_t
-+static bool
- dhc6_stop_action(struct client_state *client, isc_result_t *rvalp,
- unsigned code)
- {
-@@ -2933,12 +2933,12 @@ dhc6_stop_action(struct client_state *cl
-
- if (client == NULL) {
- *rvalp = DHCP_R_INVALIDARG;
-- return ISC_FALSE;
-+ return false;
- }
- rval = *rvalp;
-
- if (rval == ISC_R_SUCCESS)
-- return ISC_FALSE;
-+ return false;
-
- switch (code) {
- /* It's possible an earlier status code set rval to a failure
-@@ -2948,13 +2948,13 @@ dhc6_stop_action(struct client_state *cl
- /* For unknown codes...it's a soft (retryable) error. */
- case STATUS_UnspecFail:
- default:
-- return ISC_FALSE;
-+ return false;
-
- /* NoBinding is not an error */
- case STATUS_NoBinding:
- if (rval == ISC_R_FAILURE)
- *rvalp = ISC_R_SUCCESS;
-- return ISC_FALSE;
-+ return false;
-
- /* Should not happen */
- case STATUS_NoAddrsAvail:
-@@ -2976,13 +2976,13 @@ dhc6_stop_action(struct client_state *cl
- delete_option(&dhcp_universe,
- client->active_lease->options,
- D6O_UNICAST);
-- return ISC_FALSE;
-+ return false;
- }
-
-- return ISC_TRUE;
-+ return true;
- }
-
--static isc_boolean_t
-+static bool
- dhc6_decline_action(struct client_state *client, isc_result_t *rvalp,
- unsigned code)
- {
-@@ -2993,12 +2993,12 @@ dhc6_decline_action(struct client_state
-
- if (client == NULL) {
- *rvalp = DHCP_R_INVALIDARG;
-- return ISC_FALSE;
-+ return false;
- }
- rval = *rvalp;
-
- if (rval == ISC_R_SUCCESS) {
-- return ISC_FALSE;
-+ return false;
- }
-
- switch (code) {
-@@ -3013,13 +3013,13 @@ dhc6_decline_action(struct client_state
- delete_option(&dhcp_universe,
- client->active_lease->options,
- D6O_UNICAST);
-- return ISC_FALSE;
-+ return false;
- default:
- /* Anything else is basically meaningless */
- break;
- }
-
-- return ISC_TRUE;
-+ return true;
- }
-
-
-@@ -3029,14 +3029,14 @@ dhc6_decline_action(struct client_state
- static isc_result_t
- dhc6_check_reply(struct client_state *client, struct dhc6_lease *new)
- {
-- isc_boolean_t (*action)(struct client_state *,
-+ bool (*action)(struct client_state *,
- isc_result_t *, unsigned);
- struct dhc6_ia *ia;
- isc_result_t rval = ISC_R_SUCCESS;
- unsigned code;
- const char *scope;
- int nscore, sscore;
-- int have_addrs = ISC_FALSE;
-+ int have_addrs = false;
- int got_na = 0, got_ta = 0, got_pd = 0;
-
- if ((client == NULL) || (new == NULL))
-@@ -3102,7 +3102,7 @@ dhc6_check_reply(struct client_state *cl
- return ISC_R_CANCELED;
-
- if (ia->addrs != NULL) {
-- have_addrs = ISC_TRUE;
-+ have_addrs = true;
- }
- }
-
-@@ -3119,13 +3119,13 @@ dhc6_check_reply(struct client_state *cl
- * check in and commented it as I eventually do want
- * us to check for TAs as well. SAR
- */
-- if ((have_addrs != ISC_TRUE) ||
-+ if ((have_addrs != true) ||
- ((require_all_ias != 0) &&
- ((got_na < wanted_ia_na) ||
- /*(got_ta < wanted_ia_ta) ||*/
- (got_pd < wanted_ia_pd)))) {
- rval = ISC_R_FAILURE;
-- if (action(client, &rval, STATUS_NoAddrsAvail) == ISC_TRUE) {
-+ if (action(client, &rval, STATUS_NoAddrsAvail) == true) {
- return ISC_R_CANCELED;
- }
- }
-@@ -4256,7 +4256,7 @@ dhc6_add_ia_pd(struct client_state *clie
-
- /* stopping_finished() checks if there is a remaining work to do.
- */
--static isc_boolean_t
-+static bool
- stopping_finished(void)
- {
- struct interface_info *ip;
-@@ -4265,12 +4265,12 @@ stopping_finished(void)
- for (ip = interfaces; ip; ip = ip -> next) {
- for (client = ip -> client; client; client = client -> next) {
- if (client->state != S_STOPPED)
-- return ISC_FALSE;
-+ return false;
- if (client->active_lease != NULL)
-- return ISC_FALSE;
-+ return false;
- }
- }
-- return ISC_TRUE;
-+ return true;
- }
-
- /* reply_handler() accepts a Reply while we're attempting Select or Renew or
-@@ -4474,8 +4474,8 @@ dhc6_check_times(struct client_state *cl
- struct dhc6_addr *addr;
- TIME renew=MAX_TIME, rebind=MAX_TIME, depref=MAX_TIME,
- lo_expire=MAX_TIME, hi_expire=0, max_ia_starts = 0, tmp;
-- int has_addrs = ISC_FALSE;
-- int has_preferred_addrs = ISC_FALSE;
-+ int has_addrs = false;
-+ int has_preferred_addrs = false;
- struct timeval tv;
-
- lease = client->active_lease;
-@@ -4506,7 +4506,7 @@ dhc6_check_times(struct client_state *cl
- depref = tmp;
-
- if (!(addr->flags & DHC6_ADDR_EXPIRED)) {
-- has_preferred_addrs = ISC_TRUE;
-+ has_preferred_addrs = true;
- }
- }
-
-@@ -4525,7 +4525,7 @@ dhc6_check_times(struct client_state *cl
- if (tmp < this_ia_lo_expire)
- this_ia_lo_expire = tmp;
-
-- has_addrs = ISC_TRUE;
-+ has_addrs = true;
- }
- }
-
-@@ -4603,7 +4603,7 @@ dhc6_check_times(struct client_state *cl
- * In the future, we may decide that we're done here, or to
- * schedule a future request (using 4-pkt info-request model).
- */
-- if (has_addrs == ISC_FALSE) {
-+ if (has_addrs == false) {
- dhc6_lease_destroy(&client->active_lease, MDL);
- client->active_lease = NULL;
-
-@@ -4855,7 +4855,7 @@ start_bound(struct client_state *client)
- "is selected.");
- return;
- }
-- lease->released = ISC_FALSE;
-+ lease->released = false;
- old = client->old_lease;
-
- client->v6_handler = bound_handler;
-@@ -5448,8 +5448,8 @@ do_expire(void *input)
- struct dhc6_lease *lease;
- struct dhc6_ia *ia, **tia;
- struct dhc6_addr *addr;
-- int has_addrs = ISC_FALSE;
-- int ia_has_addrs = ISC_FALSE;
-+ int has_addrs = false;
-+ int ia_has_addrs = false;
-
- client = (struct client_state *)input;
-
-@@ -5458,7 +5458,7 @@ do_expire(void *input)
- return;
-
- for (ia = lease->bindings, tia = &lease->bindings; ia != NULL ; ) {
-- ia_has_addrs = ISC_FALSE;
-+ ia_has_addrs = false;
- for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
- if (addr->flags & DHC6_ADDR_EXPIRED)
- continue;
-@@ -5495,14 +5495,14 @@ do_expire(void *input)
- continue;
- }
-
-- ia_has_addrs = ISC_TRUE;
-- has_addrs = ISC_TRUE;
-+ ia_has_addrs = true;
-+ has_addrs = true;
- }
-
- /* Update to the next ia and git rid of this ia
- * if it doesn't have any leases.
- */
-- if (ia_has_addrs == ISC_TRUE) {
-+ if (ia_has_addrs == true) {
- /* leases, just advance the list pointer */
- tia = &(*tia)->next;
- } else {
-@@ -5517,7 +5517,7 @@ do_expire(void *input)
- }
-
- /* Clean up empty leases. */
-- if (has_addrs == ISC_FALSE) {
-+ if (has_addrs == false) {
- log_info("PRC: Bound lease is devoid of active addresses."
- " Re-initializing.");
-
-@@ -5596,14 +5596,14 @@ dhc6_check_irt(struct client_state *clie
- TIME expire = MAX_TIME;
- struct timeval tv;
- int i;
-- isc_boolean_t found = ISC_FALSE;
-+ bool found = false;
-
- cancel_timeout(refresh_info_request6, client);
-
- req = client->config->requested_options;
- for (i = 0; req[i] != NULL; i++) {
- if (req[i] == irt_option) {
-- found = ISC_TRUE;
-+ found = true;
- break;
- }
- }
-@@ -5924,7 +5924,7 @@ static void script_write_requested6(clie
- /*
- * Check if there is something not fully defined in the active lease.
- */
--static isc_boolean_t
-+static bool
- active_prefix(struct client_state *client)
- {
- struct dhc6_lease *lease;
-@@ -5934,21 +5934,21 @@ active_prefix(struct client_state *clien
-
- lease = client->active_lease;
- if (lease == NULL)
-- return ISC_FALSE;
-+ return false;
- memset(zeros, 0, 16);
- for (ia = lease->bindings; ia != NULL; ia = ia->next) {
- if (ia->ia_type != D6O_IA_PD)
- continue;
- for (pref = ia->addrs; pref != NULL; pref = pref->next) {
- if (pref->plen == 0)
-- return ISC_FALSE;
-+ return false;
- if (pref->address.len != 16)
-- return ISC_FALSE;
-+ return false;
- if (memcmp(pref->address.iabuf, zeros, 16) == 0)
-- return ISC_FALSE;
-+ return false;
- }
- }
-- return ISC_TRUE;
-+ return true;
- }
-
- /* Adds a leases's declined addreses to the outbound packet
-@@ -6111,26 +6111,26 @@ int drop_declined_addrs(struct dhc6_leas
- /* Run through the addresses in lease and return true if there's any unexpired.
- * Return false otherwise.
- */
--static isc_boolean_t
-+static bool
- unexpired_address_in_lease(struct dhc6_lease *lease)
- {
- struct dhc6_ia *ia;
- struct dhc6_addr *addr;
-
- if (lease == NULL) {
-- return ISC_FALSE;
-+ return false;
- }
-
- for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
- for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
- if (!(addr->flags & DHC6_ADDR_EXPIRED) &&
- (addr->starts + addr->max_life > cur_time)) {
-- return ISC_TRUE;
-+ return true;
- }
- }
- }
-
- log_debug("PRC: Previous lease is devoid of active addresses.");
-- return ISC_FALSE;
-+ return false;
- }
- #endif /* DHCPv6 */
-Index: dhcp-4.4.1/client/dhclient.c
-===================================================================
---- dhcp-4.4.1.orig/client/dhclient.c
-+++ dhcp-4.4.1/client/dhclient.c
-@@ -52,7 +52,7 @@ char *path_dhclient_script = path_dhclie
- const char *path_dhclient_duid = NULL;
-
- /* False (default) => we write and use a pid file */
--isc_boolean_t no_pid_file = ISC_FALSE;
-+bool no_pid_file = false;
-
- int dhcp_max_agent_option_packet_length = 0;
-
-@@ -397,7 +397,7 @@ main(int argc, char **argv) {
- path_dhclient_pid = argv[i];
- no_dhclient_pid = 1;
- } else if (!strcmp(argv[i], "--no-pid")) {
-- no_pid_file = ISC_TRUE;
-+ no_pid_file = true;
- } else if (!strcmp(argv[i], "-cf")) {
- if (++i == argc)
- usage(use_noarg, argv[i-1]);
-@@ -652,7 +652,7 @@ main(int argc, char **argv) {
- * to write a pid file - we assume they are controlling
- * the process in some other fashion.
- */
-- if ((release_mode || exit_mode) && (no_pid_file == ISC_FALSE)) {
-+ if ((release_mode || exit_mode) && (no_pid_file == false)) {
- FILE *pidfd;
- pid_t oldpid;
- long temp;
-@@ -4469,7 +4469,7 @@ void write_client_pid_file ()
- int pfdesc;
-
- /* nothing to do if the user doesn't want a pid file */
-- if (no_pid_file == ISC_TRUE) {
-+ if (no_pid_file == true) {
- return;
- }
-
-@@ -4727,7 +4727,7 @@ unsigned cons_agent_information_options
- static void shutdown_exit (void *foo)
- {
- /* get rid of the pid if we can */
-- if (no_pid_file == ISC_FALSE)
-+ if (no_pid_file == false)
- (void) unlink(path_dhclient_pid);
- finish(0);
- }
-Index: dhcp-4.4.1/common/inet.c
-===================================================================
---- dhcp-4.4.1.orig/common/inet.c
-+++ dhcp-4.4.1/common/inet.c
-@@ -299,7 +299,7 @@ addr_and(struct iaddr *result, const str
- *
- * Because the final ".1" would get masked out by the /8.
- */
--isc_boolean_t
-+bool
- is_cidr_mask_valid(const struct iaddr *addr, int bits) {
- int zero_bits;
- int zero_bytes;
-@@ -311,10 +311,10 @@ is_cidr_mask_valid(const struct iaddr *a
- * Check our bit boundaries.
- */
- if (bits < 0) {
-- return ISC_FALSE;
-+ return false;
- }
- if (bits > (addr->len * 8)) {
-- return ISC_FALSE;
-+ return false;
- }
-
- /*
-@@ -328,7 +328,7 @@ is_cidr_mask_valid(const struct iaddr *a
- */
- for (i=1; i<=zero_bytes; i++) {
- if (addr->iabuf[addr->len-i] != 0) {
-- return ISC_FALSE;
-+ return false;
- }
- }
-
-@@ -340,7 +340,7 @@ is_cidr_mask_valid(const struct iaddr *a
- * happy.
- */
- shift_bits = zero_bits % 8;
-- if (shift_bits == 0) return ISC_TRUE;
-+ if (shift_bits == 0) return true;
- byte = addr->iabuf[addr->len-zero_bytes-1];
- return (((byte >> shift_bits) << shift_bits) == byte);
- }
-Index: dhcp-4.4.1/common/options.c
-===================================================================
---- dhcp-4.4.1.orig/common/options.c
-+++ dhcp-4.4.1/common/options.c
-@@ -676,7 +676,7 @@ cons_options(struct packet *inpacket, st
- * the priority_list. This way we'll send it whether or not it
- * is in the PRL. */
- if ((inpacket != NULL) && (priority_len < PRIORITY_COUNT) &&
-- (inpacket->sv_echo_client_id == ISC_TRUE)) {
-+ (inpacket->sv_echo_client_id == true)) {
- priority_list[priority_len++] =
- DHO_DHCP_CLIENT_IDENTIFIER;
- }
-@@ -1802,7 +1802,7 @@ const char *pretty_print_option (option,
- const unsigned char *dp = data;
- char comma;
- unsigned long tval;
-- isc_boolean_t a_array = ISC_FALSE;
-+ bool a_array = false;
- int len_used;
-
- if (emit_commas)
-@@ -1828,7 +1828,7 @@ const char *pretty_print_option (option,
- fmtbuf [l] = option -> format [i];
- switch (option -> format [i]) {
- case 'a':
-- a_array = ISC_TRUE;
-+ a_array = true;
- /* Fall through */
- case 'A':
- --numelem;
-@@ -1858,7 +1858,7 @@ const char *pretty_print_option (option,
- hunksize++;
- comma = ':';
- numhunk = 0;
-- a_array = ISC_TRUE;
-+ a_array = true;
- hunkinc = 1;
- }
- fmtbuf [l + 1] = 0;
-@@ -1954,7 +1954,7 @@ const char *pretty_print_option (option,
-
- /* If this is an array, compute its size. */
- if (numhunk == 0) {
-- if (a_array == ISC_TRUE) {
-+ if (a_array == true) {
- /*
- * It is an 'a' type array - we repeat the
- * last format type. A binary string for 'X'
-@@ -2006,7 +2006,7 @@ const char *pretty_print_option (option,
-
- /* Cycle through the array (or hunk) printing the data. */
- for (i = 0; i < numhunk; i++) {
-- if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
-+ if ((a_array == true) && (i != 0) && (numelem > 0)) {
- /*
- * For 'a' type of arrays we repeat
- * only the last format character
-@@ -2734,7 +2734,7 @@ save_option(struct universe *universe, s
- struct option_cache *oc)
- {
- if (universe->save_func)
-- (*universe->save_func)(universe, options, oc, ISC_FALSE);
-+ (*universe->save_func)(universe, options, oc, true);
- else
- log_error("can't store options in %s space.", universe->name);
- }
-@@ -2745,14 +2745,14 @@ also_save_option(struct universe *univer
- struct option_cache *oc)
- {
- if (universe->save_func)
-- (*universe->save_func)(universe, options, oc, ISC_TRUE);
-+ (*universe->save_func)(universe, options, oc, true);
- else
- log_error("can't store options in %s space.", universe->name);
- }
-
- void
- save_hashed_option(struct universe *universe, struct option_state *options,
-- struct option_cache *oc, isc_boolean_t appendp)
-+ struct option_cache *oc, bool appendp)
- {
- int hashix;
- pair bptr;
-@@ -3062,7 +3062,7 @@ store_option(struct data_string *result,
- cfg_options, scope, subu);
- subu = NULL;
- }
-- } while (ISC_FALSE);
-+ } while (false);
-
- status = append_option(result, universe, oc->option, &tmp);
- data_string_forget(&tmp, MDL);
-@@ -3459,7 +3459,7 @@ lookup_fqdn6_option(struct universe *uni
- */
- void
- save_fqdn6_option(struct universe *universe, struct option_state *options,
-- struct option_cache *oc, isc_boolean_t appendp)
-+ struct option_cache *oc, bool appendp)
- {
- log_fatal("Impossible condition at %s:%d.", MDL);
- }
-@@ -3784,7 +3784,7 @@ void hashed_option_space_foreach (struct
-
- void
- save_linked_option(struct universe *universe, struct option_state *options,
-- struct option_cache *oc, isc_boolean_t appendp)
-+ struct option_cache *oc, bool appendp)
- {
- pair *tail;
- struct option_chain_head *head;
-@@ -4073,7 +4073,7 @@ packet6_len_okay(const char *packet, int
- void
- do_packet6(struct interface_info *interface, const char *packet,
- int len, int from_port, const struct iaddr *from,
-- isc_boolean_t was_unicast) {
-+ bool was_unicast) {
- unsigned char msg_type;
- const struct dhcpv6_packet *msg;
- const struct dhcpv6_relay_packet *relay;
-Index: dhcp-4.4.1/common/parse.c
-===================================================================
---- dhcp-4.4.1.orig/common/parse.c
-+++ dhcp-4.4.1/common/parse.c
-@@ -4952,7 +4952,7 @@ int parse_option_token (rv, cfile, fmt,
- unsigned len;
- struct iaddr addr;
- int compress;
-- isc_boolean_t freeval = ISC_FALSE;
-+ bool freeval = false;
- const char *f, *g;
- struct enumeration_value *e;
-
-@@ -5038,7 +5038,7 @@ int parse_option_token (rv, cfile, fmt,
- return 0;
- }
- len = strlen (val);
-- freeval = ISC_TRUE;
-+ freeval = true;
- goto make_string;
-
- case 't': /* Text string... */
-@@ -5055,9 +5055,9 @@ int parse_option_token (rv, cfile, fmt,
- if (!make_const_data (&t, (const unsigned char *)val,
- len, 1, 1, MDL))
- log_fatal ("No memory for concatenation");
-- if (freeval == ISC_TRUE) {
-+ if (freeval == true) {
- dfree((char *)val, MDL);
-- freeval = ISC_FALSE;
-+ freeval = false;
- POST(freeval);
- }
- break;
-Index: dhcp-4.4.1/omapip/dispatch.c
-===================================================================
---- dhcp-4.4.1.orig/omapip/dispatch.c
-+++ dhcp-4.4.1/omapip/dispatch.c
-@@ -156,7 +156,7 @@ omapi_iscsock_cb(isc_task_t *task,
- * This should be a temporary fix until we arrange to properly
- * close the socket.
- */
-- if (obj->closed == ISC_TRUE) {
-+ if (obj->closed == true) {
- return(0);
- }
- #endif
-@@ -223,7 +223,7 @@ isc_result_t omapi_register_io_object (o
- status = omapi_io_allocate (&obj, MDL);
- if (status != ISC_R_SUCCESS)
- return status;
-- obj->closed = ISC_FALSE; /* mark as open */
-+ obj->closed = false; /* mark as open */
-
- status = omapi_object_reference (&obj -> inner, h, MDL);
- if (status != ISC_R_SUCCESS) {
-@@ -404,7 +404,7 @@ isc_result_t omapi_unregister_io_object
- isc_socket_detach(&obj->fd);
- }
- #else
-- obj->closed = ISC_TRUE;
-+ obj->closed = true;
- #endif
-
- omapi_io_dereference (&ph, MDL);
-Index: dhcp-4.4.1/omapip/isclib.c
-===================================================================
---- dhcp-4.4.1.orig/omapip/isclib.c
-+++ dhcp-4.4.1/omapip/isclib.c
-@@ -106,9 +106,9 @@ isclib_cleanup(void)
- if (dhcp_gbl_ctx.taskmgr != NULL)
- isc_taskmgr_destroy(&dhcp_gbl_ctx.taskmgr);
-
-- if (dhcp_gbl_ctx.actx_started != ISC_FALSE) {
-+ if (dhcp_gbl_ctx.actx_started != false) {
- isc_app_ctxfinish(dhcp_gbl_ctx.actx);
-- dhcp_gbl_ctx.actx_started = ISC_FALSE;
-+ dhcp_gbl_ctx.actx_started = false;
- }
-
- if (dhcp_gbl_ctx.actx != NULL)
-@@ -211,7 +211,7 @@ dhcp_context_create(int flags,
- result = isc_app_ctxstart(dhcp_gbl_ctx.actx);
- if (result != ISC_R_SUCCESS)
- return (result);
-- dhcp_gbl_ctx.actx_started = ISC_TRUE;
-+ dhcp_gbl_ctx.actx_started = true;
-
- /* Not all OSs support suppressing SIGPIPE through socket
- * options, so set the sigal action to be ignore. This allows
-Index: dhcp-4.4.1/omapip/protocol.c
-===================================================================
---- dhcp-4.4.1.orig/omapip/protocol.c
-+++ dhcp-4.4.1/omapip/protocol.c
-@@ -950,14 +950,14 @@ isc_result_t omapi_protocol_stuff_values
- /* Returns a boolean indicating whether this protocol requires that
- messages be authenticated or not. */
-
--isc_boolean_t omapi_protocol_authenticated (omapi_object_t *h)
-+bool omapi_protocol_authenticated (omapi_object_t *h)
- {
- if (h -> type != omapi_type_protocol)
-- return isc_boolean_false;
-+ return false;
- if (((omapi_protocol_object_t *)h) -> insecure)
-- return isc_boolean_false;
-+ return false;
- else
-- return isc_boolean_true;
-+ return true;
- }
-
- /* Sets the address and authenticator verification callbacks. The handle
-Index: dhcp-4.4.1/relay/dhcrelay.c
-===================================================================
---- dhcp-4.4.1.orig/relay/dhcrelay.c
-+++ dhcp-4.4.1/relay/dhcrelay.c
-@@ -45,9 +45,9 @@ char *token_line;
- char *tlname;
-
- const char *path_dhcrelay_pid = _PATH_DHCRELAY_PID;
--isc_boolean_t no_dhcrelay_pid = ISC_FALSE;
-+bool no_dhcrelay_pid = false;
- /* False (default) => we write and use a pid file */
--isc_boolean_t no_pid_file = ISC_FALSE;
-+bool no_pid_file = false;
-
- int bogus_agent_drops = 0; /* Packets dropped because agent option
- field was specified and we're not relaying
-@@ -82,7 +82,7 @@ int dfd[2] = { -1, -1 };
-
- #ifdef DHCPv6
- /* Force use of DHCPv6 interface-id option. */
--isc_boolean_t use_if_id = ISC_FALSE;
-+bool use_if_id = false;
- #endif
-
- /* Maximum size of a packet with agent options added. */
-@@ -556,7 +556,7 @@ main(int argc, char **argv) {
- }
- local_family_set = 1;
- local_family = AF_INET6;
-- use_if_id = ISC_TRUE;
-+ use_if_id = true;
- } else if (!strcmp(argv[i], "-l")) {
- if (local_family_set && (local_family == AF_INET)) {
- usage(use_v6command, argv[i]);
-@@ -564,7 +564,7 @@ main(int argc, char **argv) {
- local_family_set = 1;
- local_family = AF_INET6;
- if (downstreams != NULL)
-- use_if_id = ISC_TRUE;
-+ use_if_id = true;
- if (++i == argc)
- usage(use_noarg, argv[i-1]);
- sl = parse_downstream(argv[i]);
-@@ -595,9 +595,9 @@ main(int argc, char **argv) {
- if (++i == argc)
- usage(use_noarg, argv[i-1]);
- path_dhcrelay_pid = argv[i];
-- no_dhcrelay_pid = ISC_TRUE;
-+ no_dhcrelay_pid = true;
- } else if (!strcmp(argv[i], "--no-pid")) {
-- no_pid_file = ISC_TRUE;
-+ no_pid_file = true;
- } else if (argv[i][0] == '-') {
- usage("Unknown command: %s", argv[i]);
- } else {
-@@ -645,7 +645,7 @@ main(int argc, char **argv) {
- * If the user didn't specify a pid file directly
- * find one from environment variables or defaults
- */
-- if (no_dhcrelay_pid == ISC_FALSE) {
-+ if (no_dhcrelay_pid == false) {
- if (local_family == AF_INET) {
- path_dhcrelay_pid = getenv("PATH_DHCRELAY_PID");
- if (path_dhcrelay_pid == NULL)
-@@ -774,7 +774,7 @@ main(int argc, char **argv) {
- }
-
- /* Create the pid file. */
-- if (no_pid_file == ISC_FALSE) {
-+ if (no_pid_file == false) {
- pfdesc = open(path_dhcrelay_pid,
- O_CREAT | O_TRUNC | O_WRONLY, 0644);
-
-@@ -1569,7 +1569,7 @@ static void
- setup_streams(void) {
- struct stream_list *dp, *up;
- int i;
-- isc_boolean_t link_is_set;
-+ bool link_is_set;
-
- for (dp = downstreams; dp; dp = dp->next) {
- /* Check interface */
-@@ -1579,9 +1579,9 @@ setup_streams(void) {
-
- /* Check/set link. */
- if (IN6_IS_ADDR_UNSPECIFIED(&dp->link.sin6_addr))
-- link_is_set = ISC_FALSE;
-+ link_is_set = false;
- else
-- link_is_set = ISC_TRUE;
-+ link_is_set = true;
- for (i = 0; i < dp->ifp->v6address_count; i++) {
- if (IN6_IS_ADDR_LINKLOCAL(&dp->ifp->v6addresses[i]))
- continue;
-@@ -2076,7 +2076,7 @@ dhcp_set_control_state(control_object_st
- if (newstate != server_shutdown)
- return ISC_R_SUCCESS;
-
-- if (no_pid_file == ISC_FALSE)
-+ if (no_pid_file == false)
- (void) unlink(path_dhcrelay_pid);
-
- if (!no_daemon && dfd[0] != -1 && dfd[1] != -1) {
-Index: dhcp-4.4.1/server/dhcp.c
-===================================================================
---- dhcp-4.4.1.orig/server/dhcp.c
-+++ dhcp-4.4.1/server/dhcp.c
-@@ -225,7 +225,7 @@ dhcp (struct packet *packet) {
- packet->options->universe_count =
- agent_universe.index + 1;
-
-- packet->agent_options_stashed = ISC_TRUE;
-+ packet->agent_options_stashed = true;
- }
- nolease:
-
-@@ -1094,7 +1094,7 @@ void dhcpinform (packet, ms_nulltp)
- int nulltp;
- struct sockaddr_in to;
- struct in_addr from;
-- isc_boolean_t zeroed_ciaddr;
-+ bool zeroed_ciaddr;
- struct interface_info *interface;
- int result, h_m_client_ip = 0;
- struct host_decl *host = NULL, *hp = NULL, *h;
-@@ -1109,7 +1109,7 @@ void dhcpinform (packet, ms_nulltp)
- it's common for clients not to do this, so we'll use their IP
- source address if they didn't set ciaddr. */
- if (!packet->raw->ciaddr.s_addr) {
-- zeroed_ciaddr = ISC_TRUE;
-+ zeroed_ciaddr = true;
- /* With DHCPv4-over-DHCPv6 it can be an IPv6 address
- so we check its length. */
- if (packet->client_addr.len == 4) {
-@@ -1122,7 +1122,7 @@ void dhcpinform (packet, ms_nulltp)
- addr_type = "v4o6";
- }
- } else {
-- zeroed_ciaddr = ISC_FALSE;
-+ zeroed_ciaddr = false;
- cip.len = 4;
- memcpy(cip.iabuf, &packet->raw->ciaddr, 4);
- addr_type = "client";
-@@ -1133,7 +1133,7 @@ void dhcpinform (packet, ms_nulltp)
- if (packet->raw->giaddr.s_addr) {
- gip.len = 4;
- memcpy(gip.iabuf, &packet->raw->giaddr, 4);
-- if (zeroed_ciaddr == ISC_TRUE) {
-+ if (zeroed_ciaddr == true) {
- addr_type = "relay";
- memcpy(sip.iabuf, gip.iabuf, 4);
- }
-@@ -1207,7 +1207,7 @@ void dhcpinform (packet, ms_nulltp)
- save_option(&dhcp_universe, options, noc);
- option_cache_dereference(&noc, MDL);
-
-- if ((zeroed_ciaddr == ISC_TRUE) && (gip.len != 0))
-+ if ((zeroed_ciaddr == true) && (gip.len != 0))
- addr_type = "relay link select";
- else
- addr_type = "selected";
-@@ -1261,7 +1261,7 @@ void dhcpinform (packet, ms_nulltp)
- NULL, NULL);
-
- /* If we have ciaddr, find its lease so we can find its pool. */
-- if (zeroed_ciaddr == ISC_FALSE) {
-+ if (zeroed_ciaddr == false) {
- struct lease* cip_lease = NULL;
-
- find_lease_by_ip_addr (&cip_lease, cip, MDL);
-@@ -2036,7 +2036,7 @@ void echo_client_id(packet, lease, in_op
- unsigned int opcode = DHO_DHCP_CLIENT_IDENTIFIER;
-
- /* Save knowledge that echo is enabled to the packet */
-- packet->sv_echo_client_id = ISC_TRUE;
-+ packet->sv_echo_client_id = true;
-
- /* Now see if inbound packet contains client-id */
- oc = lookup_option(&dhcp_universe, packet->options, opcode);
-@@ -2187,7 +2187,7 @@ void ack_lease (packet, lease, offer, wh
- struct iaddr cip;
- #if defined(DELAYED_ACK)
- /* By default we don't do the enqueue */
-- isc_boolean_t enqueue = ISC_FALSE;
-+ bool enqueue = false;
- #endif
- int use_old_lease = 0;
-
-@@ -3217,7 +3217,7 @@ void ack_lease (packet, lease, offer, wh
- * can just answer right away, set a flag to indicate this.
- */
- if (commit)
-- enqueue = ISC_TRUE;
-+ enqueue = true;
-
- /* Install the new information on 'lt' onto the lease at
- * 'lease'. We will not 'commit' this information to disk
-@@ -4234,7 +4234,7 @@ int find_lease (struct lease **lp,
- * preference, so the first one is the best one.
- */
- while (uid_lease) {
-- isc_boolean_t do_release = !packet->raw->ciaddr.s_addr;
-+ bool do_release = !packet->raw->ciaddr.s_addr;
- #if defined (DEBUG_FIND_LEASE)
- log_info ("trying next lease matching client id: %s",
- piaddr (uid_lease -> ip_addr));
-@@ -4267,7 +4267,7 @@ int find_lease (struct lease **lp,
- #endif
- /* Allow multiple leases using the same UID
- on different subnetworks. */
-- do_release = ISC_FALSE;
-+ do_release = false;
- goto n_uid;
- }
-
-@@ -5331,7 +5331,7 @@ get_server_source_address(struct in_addr
- struct option_cache *oc = NULL;
- struct data_string d;
- struct in_addr *a = NULL;
-- isc_boolean_t found = ISC_FALSE;
-+ bool found = false;
- int allocate = 0;
-
- memset(&d, 0, sizeof(d));
-@@ -5344,7 +5344,7 @@ get_server_source_address(struct in_addr
- packet->options, options,
- &global_scope, oc, MDL)) {
- if (d.len == sizeof(*from)) {
-- found = ISC_TRUE;
-+ found = true;
- memcpy(from, d.data, sizeof(*from));
-
- /*
-@@ -5362,7 +5362,7 @@ get_server_source_address(struct in_addr
- oc = NULL;
- }
-
-- if ((found == ISC_FALSE) &&
-+ if ((found == false) &&
- (packet->interface->address_count > 0)) {
- *from = packet->interface->addresses[0];
-
-Index: dhcp-4.4.1/server/failover.c
-===================================================================
---- dhcp-4.4.1.orig/server/failover.c
-+++ dhcp-4.4.1/server/failover.c
-@@ -45,7 +45,7 @@ static isc_result_t failover_message_der
- static void dhcp_failover_pool_balance(dhcp_failover_state_t *state);
- static void dhcp_failover_pool_reqbalance(dhcp_failover_state_t *state);
- static int dhcp_failover_pool_dobalance(dhcp_failover_state_t *state,
-- isc_boolean_t *sendreq);
-+ bool *sendreq);
- static inline int secondary_not_hoarding(dhcp_failover_state_t *state,
- struct pool *p);
- static void scrub_lease(struct lease* lease, const char *file, int line);
-@@ -2464,7 +2464,7 @@ void
- dhcp_failover_pool_rebalance(void *failover_state)
- {
- dhcp_failover_state_t *state;
-- isc_boolean_t sendreq = ISC_FALSE;
-+ bool sendreq = false;
-
- state = (dhcp_failover_state_t *)failover_state;
-
-@@ -2512,7 +2512,7 @@ dhcp_failover_pool_reqbalance(dhcp_failo
- */
- static int
- dhcp_failover_pool_dobalance(dhcp_failover_state_t *state,
-- isc_boolean_t *sendreq)
-+ bool *sendreq)
- {
- int lts, total, thresh, hold, panic, pass;
- int leases_queued = 0;
-@@ -2581,7 +2581,7 @@ dhcp_failover_pool_dobalance(dhcp_failov
-
- if ((sendreq != NULL) && (lts < panic)) {
- reqlog = " (requesting peer rebalance!)";
-- *sendreq = ISC_TRUE;
-+ *sendreq = true;
- } else
- reqlog = "";
-
-@@ -5111,7 +5111,7 @@ isc_result_t dhcp_failover_send_update_d
- * a more detailed system of preferences is required, so this is something we
- * should monitor as we gain experience with these dueling events.
- */
--static isc_boolean_t
-+static bool
- failover_lease_is_better(dhcp_failover_state_t *state, struct lease *lease,
- failover_message_t *msg)
- {
-@@ -5132,15 +5132,15 @@ failover_lease_is_better(dhcp_failover_s
- case FTS_ACTIVE:
- if (msg->binding_status == FTS_ACTIVE) {
- if (msg_cltt < lease->cltt)
-- return ISC_TRUE;
-+ return true;
- else if (msg_cltt > lease->cltt)
-- return ISC_FALSE;
-+ return false;
- else if (state->i_am == primary)
-- return ISC_TRUE;
-+ return true;
- else
-- return ISC_FALSE;
-+ return false;
- } else if (msg->binding_status == FTS_EXPIRED) {
-- return ISC_FALSE;
-+ return false;
- }
- /* FALL THROUGH */
-
-@@ -5151,11 +5151,11 @@ failover_lease_is_better(dhcp_failover_s
- case FTS_ABANDONED:
- case FTS_RESET:
- if (msg->binding_status == FTS_ACTIVE)
-- return ISC_FALSE;
-+ return false;
- else if (state->i_am == primary)
-- return ISC_TRUE;
-+ return true;
- else
-- return ISC_FALSE;
-+ return false;
- /* FALL THROUGH to impossible condition */
-
- default:
-@@ -5164,7 +5164,7 @@ failover_lease_is_better(dhcp_failover_s
-
- log_fatal("Impossible condition at %s:%d.", MDL);
- /* Silence compiler warning. */
-- return ISC_FALSE;
-+ return false;
- }
-
- isc_result_t dhcp_failover_process_bind_update (dhcp_failover_state_t *state,
-@@ -5177,8 +5177,8 @@ isc_result_t dhcp_failover_process_bind_
- int new_binding_state;
- int send_to_backup = 0;
- int required_options;
-- isc_boolean_t chaddr_changed = ISC_FALSE;
-- isc_boolean_t ident_changed = ISC_FALSE;
-+ bool chaddr_changed = false;
-+ bool ident_changed = false;
-
- /* Validate the binding update. */
- required_options = FTB_ASSIGNED_IP_ADDRESS | FTB_BINDING_STATUS;
-@@ -5250,7 +5250,7 @@ isc_result_t dhcp_failover_process_bind_
- if ((lt->hardware_addr.hlen != msg->chaddr.count) ||
- (memcmp(lt->hardware_addr.hbuf, msg->chaddr.data,
- msg->chaddr.count) != 0))
-- chaddr_changed = ISC_TRUE;
-+ chaddr_changed = true;
-
- lt -> hardware_addr.hlen = msg -> chaddr.count;
- memcpy (lt -> hardware_addr.hbuf, msg -> chaddr.data,
-@@ -5262,7 +5262,7 @@ isc_result_t dhcp_failover_process_bind_
- reason = FTR_MISSING_BINDINFO;
- goto bad;
- } else if (msg->binding_status == FTS_ABANDONED) {
-- chaddr_changed = ISC_TRUE;
-+ chaddr_changed = true;
- lt->hardware_addr.hlen = 0;
- if (lt->scope)
- binding_scope_dereference(<->scope, MDL);
-@@ -5282,7 +5282,7 @@ isc_result_t dhcp_failover_process_bind_
- (lt->uid == NULL) || /* Sanity; should never happen. */
- (memcmp(lt->uid, msg->client_identifier.data,
- lt->uid_len) != 0))
-- ident_changed = ISC_TRUE;
-+ ident_changed = true;
-
- lt->uid_len = msg->client_identifier.count;
-
-@@ -5312,7 +5312,7 @@ isc_result_t dhcp_failover_process_bind_
- } else if (lt->uid && msg->binding_status != FTS_RESET &&
- msg->binding_status != FTS_FREE &&
- msg->binding_status != FTS_BACKUP) {
-- ident_changed = ISC_TRUE;
-+ ident_changed = true;
- if (lt->uid != lt->uid_buf)
- dfree (lt->uid, MDL);
- lt->uid = NULL;
-@@ -5347,7 +5347,7 @@ isc_result_t dhcp_failover_process_bind_
- if (msg->binding_status == FTS_ACTIVE &&
- (chaddr_changed || ident_changed)) {
- #if defined (NSUPDATE)
-- (void) ddns_removals(lease, NULL, NULL, ISC_FALSE);
-+ (void) ddns_removals(lease, NULL, NULL, false);
- #endif /* NSUPDATE */
-
- if (lease->scope != NULL)
-@@ -5534,7 +5534,7 @@ isc_result_t dhcp_failover_process_bind_
- struct iaddr ia;
- const char *message = "no memory";
- u_int32_t pot_expire;
-- int send_to_backup = ISC_FALSE;
-+ int send_to_backup = false;
- struct timeval tv;
-
- ia.len = sizeof msg -> assigned_addr;
-@@ -5621,7 +5621,7 @@ isc_result_t dhcp_failover_process_bind_
- if (state->i_am == primary &&
- !(lease->flags & (RESERVED_LEASE | BOOTP_LEASE)) &&
- peer_wants_lease(lease))
-- send_to_backup = ISC_TRUE;
-+ send_to_backup = true;
-
- if (!send_to_backup && state->me.state == normal)
- commit_leases();
-Index: dhcp-4.4.1/server/dhcpd.c
-===================================================================
---- dhcp-4.4.1.orig/server/dhcpd.c
-+++ dhcp-4.4.1/server/dhcpd.c
-@@ -98,7 +98,7 @@ const char *path_dhcpd_conf = _PATH_DHCP
- const char *path_dhcpd_db = _PATH_DHCPD_DB;
- const char *path_dhcpd_pid = _PATH_DHCPD_PID;
- /* False (default) => we write and use a pid file */
--isc_boolean_t no_pid_file = ISC_FALSE;
-+bool no_pid_file = false;
-
- int dhcp_max_agent_option_packet_length = DHCP_MTU_MAX;
-
-@@ -476,7 +476,7 @@ main(int argc, char **argv) {
- path_dhcpd_pid = argv [i];
- have_dhcpd_pid = 1;
- } else if (!strcmp(argv[i], "--no-pid")) {
-- no_pid_file = ISC_TRUE;
-+ no_pid_file = true;
- } else if (!strcmp (argv [i], "-t")) {
- /* test configurations only */
- #ifndef DEBUG
-@@ -863,7 +863,7 @@ main(int argc, char **argv) {
- * - we don't have a pid file to check
- * - there is no other process running
- */
-- if ((lftest == 0) && (no_pid_file == ISC_FALSE)) {
-+ if ((lftest == 0) && (no_pid_file == false)) {
- /*Read previous pid file. */
- if ((i = open(path_dhcpd_pid, O_RDONLY)) >= 0) {
- status = read(i, pbuf, (sizeof pbuf) - 1);
-@@ -974,7 +974,7 @@ main(int argc, char **argv) {
- * that we have forked we can write our pid if
- * appropriate.
- */
-- if (no_pid_file == ISC_FALSE) {
-+ if (no_pid_file == false) {
- i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644);
- if (i >= 0) {
- sprintf(pbuf, "%d\n", (int) getpid());
-@@ -1730,7 +1730,7 @@ static isc_result_t dhcp_io_shutdown_cou
- free_everything ();
- omapi_print_dmalloc_usage_by_caller ();
- #endif
-- if (no_pid_file == ISC_FALSE)
-+ if (no_pid_file == false)
- (void) unlink(path_dhcpd_pid);
- exit (0);
- }
-@@ -1741,7 +1741,7 @@ static isc_result_t dhcp_io_shutdown_cou
- free_everything ();
- omapi_print_dmalloc_usage_by_caller ();
- #endif
-- if (no_pid_file == ISC_FALSE)
-+ if (no_pid_file == false)
- (void) unlink(path_dhcpd_pid);
- exit (0);
- }
-@@ -1750,7 +1750,7 @@ static isc_result_t dhcp_io_shutdown_cou
- #if defined(FAILOVER_PROTOCOL)
- !failover_connection_count &&
- #endif
-- ISC_TRUE) {
-+ true) {
- shutdown_state = shutdown_done;
- shutdown_time = cur_time;
- goto oncemore;
-Index: dhcp-4.4.1/server/mdb6.c
-===================================================================
---- dhcp-4.4.1.orig/server/mdb6.c
-+++ dhcp-4.4.1/server/mdb6.c
-@@ -514,10 +514,10 @@ ia_remove_all_lease(struct ia_xx *ia, co
- /*
- * Compare two IA.
- */
--isc_boolean_t
-+bool
- ia_equal(const struct ia_xx *a, const struct ia_xx *b)
- {
-- isc_boolean_t found;
-+ bool found;
- int i, j;
-
- /*
-@@ -525,9 +525,9 @@ ia_equal(const struct ia_xx *a, const st
- */
- if (a == NULL) {
- if (b == NULL) {
-- return ISC_TRUE;
-+ return true;
- } else {
-- return ISC_FALSE;
-+ return false;
- }
- }
-
-@@ -535,58 +535,58 @@ ia_equal(const struct ia_xx *a, const st
- * Check the type is the same.
- */
- if (a->ia_type != b->ia_type) {
-- return ISC_FALSE;
-+ return false;
- }
-
- /*
- * Check the DUID is the same.
- */
- if (a->iaid_duid.len != b->iaid_duid.len) {
-- return ISC_FALSE;
-+ return false;
- }
- if (memcmp(a->iaid_duid.data,
- b->iaid_duid.data, a->iaid_duid.len) != 0) {
-- return ISC_FALSE;
-+ return false;
- }
-
- /*
- * Make sure we have the same number of addresses/prefixes in each.
- */
- if (a->num_iasubopt != b->num_iasubopt) {
-- return ISC_FALSE;
-+ return false;
- }
-
- /*
- * Check that each address/prefix is present in both.
- */
- for (i=0; i<a->num_iasubopt; i++) {
-- found = ISC_FALSE;
-+ found = false;
- for (j=0; j<a->num_iasubopt; j++) {
- if (a->iasubopt[i]->plen != b->iasubopt[i]->plen)
- continue;
- if (memcmp(&(a->iasubopt[i]->addr),
- &(b->iasubopt[j]->addr),
- sizeof(struct in6_addr)) == 0) {
-- found = ISC_TRUE;
-+ found = true;
- break;
- }
- }
- if (!found) {
-- return ISC_FALSE;
-+ return false;
- }
- }
-
- /*
- * These are the same in every way we care about.
- */
-- return ISC_TRUE;
-+ return true;
- }
-
- /*
- * Helper function for lease heaps.
- * Makes the top of the heap the oldest lease.
- */
--static isc_boolean_t
-+static bool
- lease_older(void *a, void *b) {
- struct iasubopt *la = (struct iasubopt *)a;
- struct iasubopt *lb = (struct iasubopt *)b;
-@@ -1038,8 +1038,8 @@ create_lease6(struct ipv6_pool *pool, st
- struct data_string new_ds;
- struct iasubopt *iaaddr;
- isc_result_t result;
-- isc_boolean_t reserved_iid;
-- static isc_boolean_t init_resiid = ISC_FALSE;
-+ bool reserved_iid;
-+ static bool init_resiid = false;
-
- /*
- * Fill the reserved IIDs.
-@@ -1049,7 +1049,7 @@ create_lease6(struct ipv6_pool *pool, st
- memset(&resany, 0, 8);
- resany.s6_addr[8] = 0xfd;
- memset(&resany.s6_addr[9], 0xff, 6);
-- init_resiid = ISC_TRUE;
-+ init_resiid = true;
- }
-
- /*
-@@ -1094,14 +1094,14 @@ create_lease6(struct ipv6_pool *pool, st
- /*
- * Avoid reserved interface IDs. (cf. RFC 5453)
- */
-- reserved_iid = ISC_FALSE;
-+ reserved_iid = false;
- if (memcmp(&tmp.s6_addr[8], &rtany.s6_addr[8], 8) == 0) {
-- reserved_iid = ISC_TRUE;
-+ reserved_iid = true;
- }
- if (!reserved_iid &&
- (memcmp(&tmp.s6_addr[8], &resany.s6_addr[8], 7) == 0) &&
- ((tmp.s6_addr[15] & 0x80) == 0x80)) {
-- reserved_iid = ISC_TRUE;
-+ reserved_iid = true;
- }
-
- /*
-@@ -1177,7 +1177,7 @@ create_lease6_eui_64(struct ipv6_pool *p
- struct iasubopt *test_iaaddr;
- struct iasubopt *iaaddr;
- isc_result_t result;
-- static isc_boolean_t init_resiid = ISC_FALSE;
-+ static bool init_resiid = false;
-
- /* Fill the reserved IIDs. */
- if (!init_resiid) {
-@@ -1185,7 +1185,7 @@ create_lease6_eui_64(struct ipv6_pool *p
- memset(&resany, 0, 8);
- resany.s6_addr[8] = 0xfd;
- memset(&resany.s6_addr[9], 0xff, 6);
-- init_resiid = ISC_TRUE;
-+ init_resiid = true;
- }
-
- /* Pool must be IA_NA */
-@@ -1520,7 +1520,7 @@ add_lease6(struct ipv6_pool *pool, struc
- /*
- * Determine if an address is present in a pool or not.
- */
--isc_boolean_t
-+bool
- lease6_exists(const struct ipv6_pool *pool, const struct in6_addr *addr) {
- struct iasubopt *test_iaaddr;
-
-@@ -1528,9 +1528,9 @@ lease6_exists(const struct ipv6_pool *po
- if (iasubopt_hash_lookup(&test_iaaddr, pool->leases,
- (void *)addr, sizeof(*addr), MDL)) {
- iasubopt_dereference(&test_iaaddr, MDL);
-- return ISC_TRUE;
-+ return true;
- } else {
-- return ISC_FALSE;
-+ return false;
- }
- }
-
-@@ -1545,20 +1545,20 @@ lease6_exists(const struct ipv6_pool *po
- * \param[in] lease = lease to check
- *
- * \return
-- * ISC_TRUE = The lease is allowed to use that address
-- * ISC_FALSE = The lease isn't allowed to use that address
-+ * true = The lease is allowed to use that address
-+ * false = The lease isn't allowed to use that address
- */
--isc_boolean_t
-+bool
- lease6_usable(struct iasubopt *lease) {
- struct iasubopt *test_iaaddr;
-- isc_boolean_t status = ISC_TRUE;
-+ bool status = true;
-
- test_iaaddr = NULL;
- if (iasubopt_hash_lookup(&test_iaaddr, lease->ipv6_pool->leases,
- (void *)&lease->addr,
- sizeof(lease->addr), MDL)) {
- if (test_iaaddr != lease) {
-- status = ISC_FALSE;
-+ status = false;
- }
- iasubopt_dereference(&test_iaaddr, MDL);
- }
-@@ -1697,7 +1697,7 @@ move_lease_to_inactive(struct ipv6_pool
- #if defined (NSUPDATE)
- /* Process events upon expiration. */
- if (pool->pool_type != D6O_IA_PD) {
-- (void) ddns_removals(NULL, lease, NULL, ISC_FALSE);
-+ (void) ddns_removals(NULL, lease, NULL, false);
- }
- #endif
-
-@@ -1977,21 +1977,21 @@ create_prefix6(struct ipv6_pool *pool, s
- /*
- * Determine if a prefix is present in a pool or not.
- */
--isc_boolean_t
-+bool
- prefix6_exists(const struct ipv6_pool *pool,
- const struct in6_addr *pref, u_int8_t plen) {
- struct iasubopt *test_iapref;
-
- if ((int)plen != pool->units)
-- return ISC_FALSE;
-+ return false;
-
- test_iapref = NULL;
- if (iasubopt_hash_lookup(&test_iapref, pool->leases,
- (void *)pref, sizeof(*pref), MDL)) {
- iasubopt_dereference(&test_iapref, MDL);
-- return ISC_TRUE;
-+ return true;
- } else {
-- return ISC_FALSE;
-+ return false;
- }
- }
-
-@@ -2267,15 +2267,15 @@ ipv6_network_portion(struct in6_addr *re
- /*
- * Determine if the given address/prefix is in the pool.
- */
--isc_boolean_t
-+bool
- ipv6_in_pool(const struct in6_addr *addr, const struct ipv6_pool *pool) {
- struct in6_addr tmp;
-
- ipv6_network_portion(&tmp, addr, pool->bits);
- if (memcmp(&tmp, &pool->start_addr, sizeof(tmp)) == 0) {
-- return ISC_TRUE;
-+ return true;
- } else {
-- return ISC_FALSE;
-+ return false;
- }
- }
-
-Index: dhcp-4.4.1/server/ddns.c
-===================================================================
---- dhcp-4.4.1.orig/server/ddns.c
-+++ dhcp-4.4.1/server/ddns.c
-@@ -373,7 +373,7 @@ ddns_updates(struct packet *packet, stru
-
- /* If desired do the removals */
- if (do_remove != 0) {
-- (void) ddns_removals(lease, lease6, NULL, ISC_TRUE);
-+ (void) ddns_removals(lease, lease6, NULL, true);
- }
- goto out;
- }
-@@ -618,7 +618,7 @@ ddns_updates(struct packet *packet, stru
- * We should log a more specific error closer to the actual
- * error if we want one. ddns_removal failure not logged here.
- */
-- (void) ddns_removals(lease, lease6, ddns_cb, ISC_TRUE);
-+ (void) ddns_removals(lease, lease6, ddns_cb, true);
- }
- else {
- ddns_fwd_srv_connector(lease, lease6, scope, ddns_cb,
-@@ -1907,7 +1907,7 @@ ddns_fwd_srv_rem1(dhcp_ddns_cb_t *ddns_c
- * the current entry.
- *
- * \li active - indication about the status of the lease. It is
-- * ISC_TRUE if the lease is still active, and FALSE if the lease
-+ * true if the lease is still active, and FALSE if the lease
- * is inactive. This is used to indicate if the lease is inactive or going
- * to inactive so we can avoid trying to update the lease with cb pointers
- * and text information if it isn't useful.
-@@ -1923,7 +1923,7 @@ isc_result_t
- ddns_removals(struct lease *lease,
- struct iasubopt *lease6,
- dhcp_ddns_cb_t *add_ddns_cb,
-- isc_boolean_t active)
-+ bool active)
- {
- isc_result_t rcode, execute_add = ISC_R_FAILURE;
- struct binding_scope **scope = NULL;
-@@ -1970,7 +1970,7 @@ ddns_removals(struct lease *lease,
- if (((ddns_cb->state == DDNS_STATE_ADD_PTR) ||
- (ddns_cb->state == DDNS_STATE_ADD_FW_NXDOMAIN) ||
- (ddns_cb->state == DDNS_STATE_ADD_FW_YXDHCID)) ||
-- ((active == ISC_FALSE) &&
-+ ((active == false) &&
- ((ddns_cb->flags & DDNS_ACTIVE_LEASE) != 0))) {
- /* Cancel the current request */
- ddns_cancel(lease->ddns_cb, MDL);
-@@ -1998,7 +1998,7 @@ ddns_removals(struct lease *lease,
- if (((ddns_cb->state == DDNS_STATE_ADD_PTR) ||
- (ddns_cb->state == DDNS_STATE_ADD_FW_NXDOMAIN) ||
- (ddns_cb->state == DDNS_STATE_ADD_FW_YXDHCID)) ||
-- ((active == ISC_FALSE) &&
-+ ((active == false) &&
- ((ddns_cb->flags & DDNS_ACTIVE_LEASE) != 0))) {
- /* Cancel the current request */
- ddns_cancel(lease6->ddns_cb, MDL);
-@@ -2053,7 +2053,7 @@ ddns_removals(struct lease *lease,
- * the lease information for v6 when the response
- * from the DNS code is processed.
- */
-- if (active == ISC_TRUE) {
-+ if (active == true) {
- ddns_cb->flags |= DDNS_ACTIVE_LEASE;
- }
-
-Index: dhcp-4.4.1/server/mdb.c
-===================================================================
---- dhcp-4.4.1.orig/server/mdb.c
-+++ dhcp-4.4.1/server/mdb.c
-@@ -1504,7 +1504,7 @@ void make_binding_state_transition (stru
- lease -> binding_state == FTS_ACTIVE &&
- lease -> next_binding_state != FTS_RELEASED))) {
- #if defined (NSUPDATE)
-- (void) ddns_removals(lease, NULL, NULL, ISC_TRUE);
-+ (void) ddns_removals(lease, NULL, NULL, true);
- #endif
- if (lease->on_star.on_expiry) {
- execute_statements(NULL, NULL, lease,
-@@ -1568,7 +1568,7 @@ void make_binding_state_transition (stru
- * release message. This is not true of expiry, where the
- * peer may have extended the lease.
- */
-- (void) ddns_removals(lease, NULL, NULL, ISC_TRUE);
-+ (void) ddns_removals(lease, NULL, NULL, true);
- #endif
- if (lease->on_star.on_release) {
- execute_statements(NULL, NULL, lease,
-@@ -1736,7 +1736,7 @@ void release_lease (lease, packet)
- /* If there are statements to execute when the lease is
- released, execute them. */
- #if defined (NSUPDATE)
-- (void) ddns_removals(lease, NULL, NULL, ISC_FALSE);
-+ (void) ddns_removals(lease, NULL, NULL, false);
- #endif
- if (lease->on_star.on_release) {
- execute_statements (NULL, packet, lease,
-@@ -1810,7 +1810,7 @@ void abandon_lease (lease, message)
- {
- struct lease *lt = NULL;
- #if defined (NSUPDATE)
-- (void) ddns_removals(lease, NULL, NULL, ISC_FALSE);
-+ (void) ddns_removals(lease, NULL, NULL, false);
- #endif
-
- if (!lease_copy(<, lease, MDL)) {
-@@ -1860,7 +1860,7 @@ void dissociate_lease (lease)
- {
- struct lease *lt = (struct lease *)0;
- #if defined (NSUPDATE)
-- (void) ddns_removals(lease, NULL, NULL, ISC_FALSE);
-+ (void) ddns_removals(lease, NULL, NULL, false);
- #endif
-
- if (!lease_copy (<, lease, MDL))
-@@ -2072,38 +2072,38 @@ int find_lease_by_hw_addr (struct lease
- * should never see reset leases for this.
- * 4) Abandoned leases are always dead last.
- */
--static isc_boolean_t
-+static bool
- client_lease_preferred(struct lease *cand, struct lease *lease)
- {
- if (cand->binding_state == FTS_ACTIVE) {
- if (lease->binding_state == FTS_ACTIVE &&
- lease->ends >= cand->ends)
-- return ISC_TRUE;
-+ return true;
- } else if (cand->binding_state == FTS_EXPIRED ||
- cand->binding_state == FTS_RELEASED) {
- if (lease->binding_state == FTS_ACTIVE)
-- return ISC_TRUE;
-+ return true;
-
- if ((lease->binding_state == FTS_EXPIRED ||
- lease->binding_state == FTS_RELEASED) &&
- lease->cltt >= cand->cltt)
-- return ISC_TRUE;
-+ return true;
- } else if (cand->binding_state != FTS_ABANDONED) {
- if (lease->binding_state == FTS_ACTIVE ||
- lease->binding_state == FTS_EXPIRED ||
- lease->binding_state == FTS_RELEASED)
-- return ISC_TRUE;
-+ return true;
-
- if (lease->binding_state != FTS_ABANDONED &&
- lease->cltt >= cand->cltt)
-- return ISC_TRUE;
-+ return true;
- } else /* (cand->binding_state == FTS_ABANDONED) */ {
- if (lease->binding_state != FTS_ABANDONED ||
- lease->cltt >= cand->cltt)
-- return ISC_TRUE;
-+ return true;
- }
-
-- return ISC_FALSE;
-+ return false;
- }
-
- /* Add the specified lease to the uid hash. */
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
new file mode 100644
index 0000000..1bc1422
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
@@ -0,0 +1,79 @@
+From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001
+From: Thomas Markwalder <tmark@isc.org>
+Date: Fri, 14 Sep 2018 13:41:41 -0400
+Subject: [master] Added includes of new BIND9 compatibility headers
+
+ Merges in rt48072.
+
+Upstream-Status: Backport
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+
+diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
+index 75a87ff6..538b927f 100644
+--- a/includes/omapip/isclib.h
++++ b/includes/omapip/isclib.h
+@@ -48,6 +48,9 @@
+ #include <string.h>
+ #include <netdb.h>
+
++#include <isc/boolean.h>
++#include <isc/int.h>
++
+ #include <isc/buffer.h>
+ #include <isc/lex.h>
+ #include <isc/lib.h>
+diff --git a/includes/omapip/result.h b/includes/omapip/result.h
+index 91243e1b..860298f6 100644
+--- a/includes/omapip/result.h
++++ b/includes/omapip/result.h
+@@ -26,6 +26,7 @@
+ #ifndef DHCP_RESULT_H
+ #define DHCP_RESULT_H 1
+
++#include <isc/boolean.h>
+ #include <isc/lang.h>
+ #include <isc/resultclass.h>
+ #include <isc/types.h>
+diff --git a/server/dhcpv6.c b/server/dhcpv6.c
+index a7110f98..cde4f617 100644
+--- a/server/dhcpv6.c
++++ b/server/dhcpv6.c
+@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
+ shared_name,
+ inet_ntop(AF_INET6, &lease->addr,
+ tmp_addr, sizeof(tmp_addr)),
+- used, count);
++ (long long unsigned)(used),
++ (long long unsigned)(count));
+ }
+ return;
+ }
+@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
+ "address: %s; high threshold %d%% %llu/%llu.",
+ shared_name,
+ inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
+- poolhigh, used, count);
++ poolhigh, (long long unsigned)(used),
++ (long long unsigned)(count));
+
+ /* handle the low threshold now, if we don't
+ * have one we default to 0. */
+@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
+ log_debug("Unable to pick client address: "
+ "no addresses available - shared network %s: "
+ " 2^64-1 < total, %llu active, %llu abandoned",
+- shared_name, active - abandoned, abandoned);
++ shared_name, (long long unsigned)(active - abandoned),
++ (long long unsigned)(abandoned));
+ } else {
+ log_debug("Unable to pick client address: "
+ "no addresses available - shared network %s: "
+ "%llu total, %llu active, %llu abandoned",
+- shared_name, total, active - abandoned, abandoned);
++ shared_name, (long long unsigned)(total),
++ (long long unsigned)(active - abandoned),
++ (long long unsigned)(abandoned));
+ }
+
+ return ISC_R_NORESOURCES;
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
index ca0daa1..e8cc731 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
@@ -10,7 +10,7 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
file://0009-remove-dhclient-script-bash-dependency.patch \
file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
file://0013-fixup_use_libbind.patch \
- file://0001-dhcpd-fix-Replace-custom-isc_boolean_t-with-C-standa.patch \
+ file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \
"
SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 04/43] ptest.bbclass: Use d.getVar instead of os.environ
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (2 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 03/43] dhcp: Replace OE specific patch for compatibility with latest bind with upstream patch Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 05/43] linux-yocto/5.0: update to v5.0.5 Armin Kuster
` (38 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Mariano Lopez <just.another.mariano@gmail.com>
[YOCTO #12597]
[YOCTO #13238]
Signed-off-by: Mariano Lopez <just.another.mariano@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/classes/ptest.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index e87a965..936bf82 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -84,8 +84,8 @@ python ptest_update_alternatives() {
return
bb.note("Generating symlinks for ptest")
- bin_paths = { os.environ["bindir"], os.environ["base_bindir"],
- os.environ["sbindir"], os.environ["base_sbindir"] }
+ bin_paths = { d.getVar("bindir"), d.getVar("base_bindir"),
+ d.getVar("sbindir"), d.getVar("base_sbindir") }
ptest_bindir = d.getVar("PTEST_BINDIR_PKGD_PATH")
os.mkdir(ptest_bindir)
for pkg in (d.getVar('PACKAGES') or "").split():
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 05/43] linux-yocto/5.0: update to v5.0.5
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (3 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 04/43] ptest.bbclass: Use d.getVar instead of os.environ Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 06/43] linux-yocto-rt: update to 5.0.5-rt3 Armin Kuster
` (37 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the latest korg -stable releases which comprise the
following commits:
1f6f316a537d Linux 5.0.5
a57af6d07512 ALSA: hda - Enforces runtime_resume after S3 and S4 for each codec
6c77789fb46e ALSA: hda - Record the current power state before suspend/resume calls
8bc3816d6566 locking/lockdep: Add debug_locks check in __lock_downgrade()
0830cf62f529 x86/unwind: Add hardcoded ORC entry for NULL
0312f3032e35 x86/unwind: Handle NULL pointer calls better in frame unwinder
1e641e63fe0c loop: access lo_backing_file only when the loop device is Lo_bound
da75d3775401 netfilter: ebtables: remove BUGPRINT messages
a179695eddd9 aio: simplify - and fix - fget/fput for io_submit()
1c0fc5e9cb40 f2fs: fix to avoid deadlock of atomic file operations
648562c0a958 RDMA/cma: Rollback source IP address if failing to acquire device
244594c5f5c8 drm/vkms: Fix flush_work() without INIT_WORK().
35228ce61a81 Bluetooth: hci_ldisc: Postpone HCI_UART_PROTO_READY bit set in hci_uart_set_proto()
c8d311117c3e Bluetooth: hci_ldisc: Initialize hci_dev before open()
4d18023ade55 Bluetooth: Fix decrementing reference count twice in releasing socket
572ae5c7646b Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf()
c35a32eb2339 media: v4l2-ctrls.c/uvc: zero v4l2_event
c29313c07f2d ext4: brelse all indirect buffer in ext4_ind_remove_space()
f1902fd02d56 ext4: fix data corruption caused by unaligned direct AIO
635218fee409 ext4: fix NULL pointer dereference while journal is aborted
5b099547f29d ALSA: ac97: Fix of-node refcount unbalance
1fa1bfef5f4c ALSA: hda - Don't trigger jackpoll_work in azx_resume
2b1cf1a17a41 SMB3: Fix SMB3.1.1 guest mounts to Samba
809ecabb6d41 clocksource/drivers/riscv: Fix clocksource mask
70c1b15faf8b irqchip/gic-v3-its: Fix comparison logic in lpi_range_cmp
dfa011546d27 objtool: Move objtool_file struct off the stack
198092b82db3 perf probe: Fix getting the kernel map
3bff3aabd586 cifs: allow guest mounts to work for smb3.11
8dfb1e702caa futex: Ensure that futex address is aligned in handle_futex_death()
72b8c5492f48 scsi: ibmvscsi: Fix empty event pool access during host removal
bc1bf16d7def scsi: ibmvscsi: Protect ibmvscsi_head from concurrent modificaiton
e109bf21f4c6 scsi: qla2xxx: Fix FC-AL connection target discovery
abe481cfe983 scsi: core: Avoid that a kernel warning appears during system resume
e846d79bc1ba net/mlx5: Fix DCT creation bad flow
62362ccdd45c powerpc/security: Fix spectre_v2 reporting
7f5ffb4c7a71 powerpc/vdso64: Fix CLOCK_MONOTONIC inconsistencies across Y2038
9e063d979422 MIPS: Fix kernel crash for R6 in jump label branch function
de21552cc848 MIPS: Ensure ELF appended dtb is relocated
63703e8fd2af mips: loongson64: lemote-2f: Add IRQF_NO_SUSPEND to "cascade" irqaction.
e88f693e6e8d udf: Fix crash on IO error during truncate
48cce130d485 libceph: wait for latest osdmap in ceph_monc_blacklist_add()
027584c8ef01 iommu/iova: Fix tracking of recently failed iova address
98e2c51c1ac3 iommu/amd: fix sg->dma_address for sg->offset bigger than PAGE_SIZE
0c113ec08d71 drm/vmwgfx: Return 0 when gmrid::get_node runs out of ID's
5618b16763ce drm/vmwgfx: Don't double-free the mode stored in par->set_mode
109f5f9dff14 drm/amdgpu: fix invalid use of change_bit
cdb57f82a4bc mmc: renesas_sdhi: limit block count to 16 bit for old revisions
1494408bf863 mmc: mxcmmc: "Revert mmc: mxcmmc: handle highmem pages"
7e682a01b111 mmc: alcor: fix DMA reads
cc8cd197411b mmc: pxamci: fix enum type confusion
ae833c3eefaf ALSA: firewire-motu: use 'version' field of unit directory to identify model
3c09233b5dee ALSA: hda - add Lenovo IdeaCentre B550 to the power_save_blacklist
239cc2c5a3c8 Linux 5.0.4
87e728e85559 SUNRPC: Respect RPC call timeouts when retrying transmission
f6716abfd12b SUNRPC: Fix up RPC back channel transmission
aed54941cf9e SUNRPC: Prevent thundering herd when the socket is not connected
1b2f5d715bbc s390/setup: fix boot crash for machine without EDAT-1
09bfb45ed842 net: dsa: lantiq_gswip: fix OF child-node lookups
8d244127d25f net: dsa: lantiq_gswip: fix use-after-free on failed probe
4e126cbd4f06 KVM: nVMX: Check a single byte for VMCS "launched" in nested early checks
5de7f6cd6aeb KVM: nVMX: Ignore limit checks on VMX instructions using flat segments
f88f29f81d59 KVM: nVMX: Apply addr size mask to effective address for VMX instructions
64d259a70642 KVM: nVMX: Sign extend displacements of VMX instr's mem operands
1e42327adb8d KVM: x86/mmu: Do not cache MMIO accesses while memslots are in flux
c173d5417a11 KVM: x86/mmu: Detect MMIO generation wrap in any address space
5221117cd414 KVM: VMX: Zero out *all* general purpose registers after VM-Exit
cf8d03a4fe59 KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run
e1bdcf061b48 KVM: Call kvm_arch_memslots_updated() before updating memslots
c61d88f39491 drm/amd/display: don't call dm_pp_ function from an fpu block
ea7da9ef23a0 drm/amd/powerplay: correct power reading on fiji
3bc65d729765 drm/radeon/evergreen_cs: fix missing break in switch statement
b78ee0965f86 drm/fb-helper: generic: Fix drm_fbdev_client_restore()
c7a35a9877b8 media: imx: csi: Stop upstream before disabling IDMA channel
145cab144d75 media: imx: csi: Disable CSI immediately after last EOF
e7a06193c52c media: imx-csi: Input connections to CSI should be optional
e7ae48ae4722 media: vimc: Add vimc-streamer for stream control
6932b9b4e677 media: uvcvideo: Avoid NULL pointer dereference at the end of streaming
202ed62dea70 media: sun6i: Fix CSI regmap's max_register
1d433d48516e media: lgdt330x: fix lock status reporting
f55d0cb10f5b media: imx: prpencvf: Stop upstream before disabling IDMA channel
9d032911a36c rcu: Do RCU GP kthread self-wakeup from softirq and interrupt
5d6f031fa782 tpm: Unify the send callback behaviour
65a2af7599c6 tpm/tpm_crb: Avoid unaligned reads in crb_recv()
f484e220df15 x86/ftrace: Fix warning and considate ftrace_jmp_replace() and ftrace_call_replace()
384dada74d37 x86/kvmclock: set offset for kvm unstable clock
9b236e3f79d9 md: Fix failed allocation of md_register_thread
99e5abb7b895 perf intel-pt: Fix divide by zero when TSC is not available
85c9f1fb8a81 perf/x86/intel/uncore: Fix client IMC events return huge result
6228a6e3516f perf intel-pt: Fix overlap calculation for padding
2354deae355b perf auxtrace: Define auxtrace record alignment
0f43fd4bdb74 perf tools: Fix split_kallsyms_for_kcore() for trampoline symbols
99c7a8ec4387 perf intel-pt: Fix CYC timestamp calculation after OVF
a0203d4e717e x86/unwind/orc: Fix ORC unwind table alignment
194f1ecd4906 vt: perform safe console erase in the right order
c8d3a581742f stable-kernel-rules.rst: add link to networking patch queue
0b60b354b33a bcache: use (REQ_META|REQ_PRIO) to indicate bio for metadata
dddd539dc325 bcache: treat stale && dirty keys as bad keys
97cf758e172c bcache: never writeback a discard operation
a8ce88427a9b PM / OPP: Update performance state when freq == old_freq
c9c0e5f01245 PM / wakeup: Rework wakeup source timer cancellation
f03f5295caf0 svcrpc: fix UDP on servers with lots of threads
1363f37fbd24 NFSv4.1: Reinitialise sequence results before retransmitting a request
867ae74fb190 nfsd: fix wrong check in write_v4_end_grace()
f5bed084b482 nfsd: fix memory corruption caused by readdir
2ececa64d67a nfsd: fix performance-limiting session calculation
88f786a8e78a NFS: Don't recoalesce on error in nfs_pageio_complete_mirror()
4fe2a7fda78a NFS: Fix an I/O request leakage in nfs_do_recoalesce
e83b6ac7deed NFS: Fix I/O request leakages
b41991d86722 cpuidle: governor: Add new governors to cpuidle_governors again
6eea03f8c368 cpcap-charger: generate events for userspace
9cc42d068f57 mfd: sm501: Fix potential NULL pointer dereference
83df21c731e6 media: cx25840: mark pad sig_types to fix cx231xx init
b6246ffae5a0 dm integrity: limit the rate of error messages
dca22c59e47e dm: fix to_sector() for 32bit
a8964a63780c ipmi_si: fix use-after-free of resource->name
d3432e5d0831 ipmi_si: Fix crash when using hard-coded device
98ab3b877400 Revert "KVM/MMU: Flush tlb directly in the kvm_zap_gfn_range()"
bf5615991a91 arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2
4b6d75b38664 arm64: debug: Ensure debug handlers check triggering exception level
4f771d8acc74 arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals
9afab3b6b9c5 arm64: Fix HCR.TGE status for NMI contexts
8f67dd8570ac ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify
6a4c3ab2d53e powerpc/traps: Fix the message printed when stack overflows
24bf608e7438 powerpc/traps: fix recoverability of machine check handling on book3s/32
71bb4d024416 powerpc/smp: Fix NMI IPI xmon timeout
850a95bf2a46 powerpc/smp: Fix NMI IPI timeout
fcf1ca937f59 powerpc/hugetlb: Don't do runtime allocation of 16G pages in LPAR configuration
4ca936a49360 powerpc/ptrace: Simplify vr_get/set() to avoid GCC warning
55b852a06fe1 powerpc: Fix 32-bit KVM-PR lockup and host crash with MacOS guest
651db1461793 powerpc/64s/hash: Fix assert_slb_presence() use of the slbfee. instruction
702c1ab420ab powerpc/powernv: Don't reprogram SLW image on every KVM guest entry/exit
f7d68a102ad4 powerpc/kvm: Save and restore host AMR/IAMR/UAMOR
3b218d244482 powerpc/83xx: Also save/restore SPRG4-7 during suspend
16ee62368aaa powerpc/powernv: Make opal log only readable by root
8d2cc8c1c4fe powerpc/wii: properly disable use of BATs when requested.
d0d33e87d143 powerpc/32: Clear on-stack exception marker upon exception return
232aa30f16b9 security/selinux: fix SECURITY_LSM_NATIVE_LABELS on reused superblock
7e30471146d2 selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
f9897a30deb7 jbd2: fix compile warning when using JBUFFER_TRACE
8c343062c8fa jbd2: clear dirty flag when revoking a buffer from an older transaction
bb47633ab15e serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()
7271438208b6 serial: 8250_pci: Fix number of ports for ACCES serial cards
c7388ba10902 serial: 8250_of: assume reg-shift of 2 for mrvl,mmp-uart
fa4d0361304f serial: uartps: Fix stuck ISR if RX disabled with non-empty FIFO
37fe1d56aa2c dmaengine: usb-dmac: Make DMAC system sleep callbacks explicit
39367147f046 usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
07e326fd07d7 usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
f11fa22a7a5f clk: ingenic: Fix doc of ingenic_cgu_div_info
7d4966247a99 clk: ingenic: Fix round_rate misbehaving with non-integer dividers
1a29715073a1 clk: samsung: exynos5: Fix kfree() of const memory on setting driver_override
7da58ad824b1 clk: samsung: exynos5: Fix possible NULL pointer exception on platform_device_alloc() failure
d9d7760c1e45 clk: clk-twl6040: Fix imprecise external abort for pdmclk
a712a38100b5 clk: uniphier: Fix update register for CPU-gear
e1ac00773456 ext2: Fix underflow in ext2_max_size()
96728f35572e cxl: Wrap iterations over afu slices inside 'afu_list_lock'
25636de95557 IB/rdmavt: Fix concurrency panics in QP post_send and modify to error
ada60723d7cd IB/rdmavt: Fix loopback send with invalidate ordering
c8a23dfeb2d6 IB/hfi1: Close race condition on user context disable and close
2b9ef0bedaac PCI: pci-bridge-emul: Extend pci_bridge_emul_init() with flags
d011c7871d16 PCI: pci-bridge-emul: Create per-bridge copy of register behavior
ee0bf8d6e7fc PCI: pciehp: Disable Data Link Layer State Changed event on suspend
0d5bc50f524a PCI: dwc: skip MSI init if MSIs have been explicitly disabled
63a9e7ce6624 PCI: qcom: Don't deassert reset GPIO during probe
eafa704de27b PCI/DPC: Fix print AER status in DPC event handling
bae1cf68370d PCI/ASPM: Use LTR if already enabled by platform
4e9f8e86d6c7 swiotlb: Add is_swiotlb_active() function
a4eeaa9cc9da swiotlb: Introduce swiotlb_max_mapping_size()
38c3a86a8226 dma: Introduce dma_max_mapping_size()
db8913b46d74 ext4: fix crash during online resizing
edc0bf6532ba ext4: add mask of ext4 flags to swap
7c2cfdf99ae9 ext4: update quota information while swapping boot loader inode
ef2dfe6f8c82 gpio: pca953x: Fix dereference of irq data in shutdown
13cef9edc45b media: i2c: ov5640: Fix post-reset delay
8b82d499df87 i2c: tegra: update maximum transfer size
986d964baaaa i2c: tegra: fix maximum transfer size
775bd984147e parport_pc: fix find_superio io compare code, should use equal test.
d91315e99c55 intel_th: Don't reference unassigned outputs
1a1d6860c539 device property: Fix the length used in PROPERTY_ENTRY_STRING()
9a638bb82ff5 nvmem: core: don't check the return value of notifier chain call
d09e7041330b kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
9a842b43e4b8 mm/memory.c: do_fault: avoid usage of stale vm_area_struct
8df6ab770e20 mm/vmalloc: fix size check for remap_vmalloc_range_partial()
84fe80428739 mm: hwpoison: fix thp split handing in soft_offline_in_use_page()
7a34997043f1 ext4: cleanup pagecache before swap i_data
a0f6f657ac44 ext4: fix check of inode in swap_inode_boot_loader
f9308e46e02b cpufreq: pxa2xx: remove incorrect __init annotation
272b28097c30 cpufreq: tegra124: add missing of_node_put()
144c3557b1e1 cpufreq: kryo: Release OPP tables on module removal
737f4ead9606 x86/kprobes: Prohibit probing on optprobe template code
dbbb26db8938 irqchip/brcmstb-l2: Use _irqsave locking variants in non-interrupt code
830d66c95e02 irqchip/gic-v3-its: Avoid parsing _indirect_ twice for Device table
bd05a30753eb libertas_tf: don't set URB_ZERO_PACKET on IN USB transfer
028cbca07ab5 soc: qcom: rpmh: Avoid accessing freed memory from batch API
1098803b8cb7 Btrfs: fix deadlock between clone/dedupe and rename
3486142a68e3 Btrfs: fix corruption reading shared and compressed extents after hole punching
ebbb48419e8a btrfs: init csum_list before possible free
88e610ae4c3a btrfs: ensure that a DUP or RAID1 block group has exactly two stripes
9c58f2ada4fa btrfs: drop the lock on error in btrfs_dev_replace_cancel
fb9c36acfab1 btrfs: scrub: fix circular locking dependency warning
9d7b327affb8 Btrfs: setup a nofs context for memory allocation at __btrfs_set_acl
80dcd07c27df Btrfs: setup a nofs context for memory allocation at btrfs_create_tree()
98bb142aaff2 m68k: Add -ffreestanding to CFLAGS
3381b362f74c ovl: Do not lose security.capability xattr over metadata file copy-up
0fa6688a2882 ovl: During copy up, first copy up data and then xattrs
ef02f9fe5148 splice: don't merge into linked buffers
61d06e123502 fs/devpts: always delete dcache dentry-s in dput()
a15cf4d9a622 scsi: qla2xxx: Use complete switch scan for RSCN events
f54e2394acf7 scsi: qla2xxx: Avoid PCI IRQ affinity mapping when multiqueue is not supported
54e834ee7a6e scsi: qla2xxx: Fix LUN discovery if loop id is not assigned yet by firmware
7d6d14a119c8 scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock
6c922faf889a scsi: sd: Optimal I/O size should be a multiple of physical block size
1ba35e5a3c5c scsi: aacraid: Fix performance issue on logical drives
bd1558978695 scsi: virtio_scsi: don't send sc payload with tmfs
ffd4a428a54e s390/virtio: handle find on invalid queue gracefully
39fdc16138b7 s390/setup: fix early warning messages
2aa8ab08c82c s390: vfio_ap: link the vfio_ap devices to the vfio_ap bus subsystem
4b280a0bfc6d clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability
773b445425d6 clocksource/drivers/exynos_mct: Clear timer interrupt when shutdown
de90b88a20de clocksource/drivers/exynos_mct: Move one-shot check from tick clear to ISR
9d67c5e995da mt76: fix corrupted software generated tx CCMP PN
6b65a01d2dcc regulator: s2mpa01: Fix step values for some LDOs
60cb8b444fbf regulator: max77620: Initialize values for DT properties
4527a24a8f51 regulator: s2mps11: Fix steps for buck7, buck8 and LDO35
a34758ac6ad4 spi: spi-gpio: fix SPI_CS_HIGH capability
618491014846 spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch
7406a055c507 spi: pxa2xx: Setup maximum supported DMA transfer length
5d919139baf9 spi: ti-qspi: Fix mmap read when more than one CS in use
4a9932c94626 mmc:fix a bug when max_discard is 0
aaf1e755f8f9 mmc: renesas_sdhi: Fix card initialization failure in high speed mode
351062f08fc1 mmc: sdhci-esdhc-imx: fix HS400 timing issue
cb1c7a9d2897 ACPI / device_sysfs: Avoid OF modalias creation for removed device
050b87cb66c6 xen: fix dom0 boot on huge systems
c0b8e1d95cbf vmw_balloon: release lock on error in vmballoon_reset()
020c90c694dc tracing/perf: Use strndup_user() instead of buggy open-coded version
aca126f4a451 tracing: Do not free iter->trace in fail path of tracing_open_pipe()
e5cde571ee5f tracing: Use strncpy instead of memcpy for string keys in hist triggers
c892f4ee3db2 smb3: make default i/o size for smb3 mounts larger
3eb2412dd9da CIFS: Fix read after write for files with read caching
c73a769b63fb CIFS: Do not skip SMB2 message IDs on send failures
a992916a9c89 CIFS: Do not reset lease state to NONE on lease break
75bbb83e80c7 CIFS: Fix leaking locked VFS cache pages in writeback retry
afaf9d664b0f crypto: arm64/aes-ccm - fix bugs in non-NEON fallback routine
741ae3caa62f crypto: arm64/aes-ccm - fix logical bug in AAD MAC handling
d78c34dfc288 crypto: x86/morus - fix handling chunked inputs and MAY_SLEEP
814ec1461901 crypto: x86/aesni-gcm - fix crash on empty plaintext
2e0e52c3d618 crypto: x86/aegis - fix handling chunked inputs and MAY_SLEEP
c9e34c3c34b9 crypto: testmgr - skip crc32c context test for ahash algorithms
c58580801420 crypto: skcipher - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
0173f7ca0e22 crypto: pcbc - remove bogus memcpy()s with src == dest
9cbfb0a8d1af crypto: morus - fix handling chunked inputs
c850ff289c4e crypto: hash - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
7007b2645f6e crypto: arm64/crct10dif - revert to C code for short inputs
d78abd635e6c crypto: arm64/aes-neonbs - fix returning final keystream block
844351fc03b0 crypto: arm/crct10dif - revert to C code for short inputs
e414d9bc86a7 crypto: aegis - fix handling chunked inputs
650b7246d460 crypto: aead - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
781bcac5b199 fix cgroup_do_mount() handling of failure exits
2ac714d69197 libnvdimm: Fix altmap reservation size calculation
fefd9f16efc3 libnvdimm/pmem: Honor force_raw for legacy pmem regions
4b9d1f8b61e8 libnvdimm, pfn: Fix over-trim in trim_pfn_device()
dd40489f6751 libnvdimm/label: Clear 'updating' flag after label-set update
5fa9cb709adc nfit/ars: Attempt short-ARS even in the no_init_ars case
b3971c932d0d nfit/ars: Attempt a short-ARS whenever the ARS state is idle at boot
0c7979447489 acpi/nfit: Fix bus command validation
a2690301c976 nfit: acpi_nfit_ctl(): Check out_obj->type in the right place
59a0e57f0cd3 nfit: Fix nfit_intel_shutdown_status() command submission
9cd805133b84 dax: Flush partial PMDs correctly
c2ca8161971a crypto: rockchip - update new iv to device in multiple operations
e400988e1dae crypto: rockchip - fix scatterlist nents error
20af3634022b crypto: ahash - fix another early termination in hash walk
b03aa2833d56 crypto: ofb - fix handling partial blocks and make thread-safe
5d894501d423 crypto: cfb - remove bogus memcpy() with src == dest
64ae3c3d0c16 crypto: cfb - add missing 'chunksize' property
ded8d6308ffd crypto: ccree - don't copy zero size ciphertext
4fc9f0e1c9ff crypto: ccree - unmap buffer before copying IV
37ff06fd9cb5 crypto: ccree - fix free of unallocated mlli buffer
6e905e258c50 crypto: caam - fix DMA mapping of stack memory
e86dc780320e crypto: caam - fixed handling of sg list
4a18213573b8 crypto: ccree - fix missing break in switch statement
fce3d391401a crypto: caam - fix hash context DMA unmap size
9b2fdbdce1fb stm class: Fix an endless loop in channel allocation
2adb36ff325d stm class: Prevent division by zero
1cfec5613090 mei: bus: move hw module get/put to probe/release
55ced4559dbf mei: hbm: clean the feature flags on link reset
f644d56fe1d7 iio: adc: exynos-adc: Use proper number of channels for Exynos4x12
a52251155bab iio: adc: exynos-adc: Fix NULL pointer exception on unbind
61328520e0b6 ASoC: codecs: pcm186x: Fix energysense SLEEP bit
5bd4f972e594 ASoC: codecs: pcm186x: fix wrong usage of DECLARE_TLV_DB_SCALE()
a7abca8506b5 ASoC: fsl_esai: fix register setting issue in RIGHT_J mode
5ababa4e34db 9p/net: fix memory leak in p9_client_create
3cccba9a38d5 9p: use inode->i_lock to protect i_size_write() under 32-bit
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 8 ++++----
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index 49c69c4..6b07401 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.0.3"
+LINUX_VERSION ?= "5.0.5"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "b0477279877bb2b5cca6ec49c64e931901ff2022"
-SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-SRCREV_meta ?= "f0b575cda6d03540ff8da2f70421f13a08f34a5e"
+SRCREV_machine_qemuarm ?= "42d601740a3ab5d777a1709bf39500a8a4af4afe"
+SRCREV_machine ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
+SRCREV_meta ?= "2070c41a1d0542e41cac5f0ea04a108e46cac427"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index 82bbbd6..f53089a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base"
KBRANCH_qemux86-64 ?= "v5.0/standard/base"
KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "18a5ffa0e90184c8503ff1df45e4e5e501b1bab3"
-SRCREV_machine_qemuarm64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-SRCREV_machine_qemumips ?= "c4d3cd6437329407e2cc7e3e4615769452d426b1"
-SRCREV_machine_qemuppc ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-SRCREV_machine_qemux86 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-SRCREV_machine_qemux86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-SRCREV_machine_qemumips64 ?= "2468c20c15477ebe5ecd73c0e0162d7432149318"
-SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
-SRCREV_meta ?= "f0b575cda6d03540ff8da2f70421f13a08f34a5e"
+SRCREV_machine_qemuarm ?= "a27450baa8f52faaf82535411bb4e32b0c16199d"
+SRCREV_machine_qemuarm64 ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
+SRCREV_machine_qemumips ?= "ea747ff485eca3175472c474184fe49a9200e36f"
+SRCREV_machine_qemuppc ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
+SRCREV_machine_qemux86 ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
+SRCREV_machine_qemux86-64 ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
+SRCREV_machine_qemumips64 ?= "e1112ce34e86354c4d9ac713ebdfbfc4b950a547"
+SRCREV_machine ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
+SRCREV_meta ?= "2070c41a1d0542e41cac5f0ea04a108e46cac427"
# remap qemuarm to qemuarma15 for the 5.0 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -28,7 +28,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.0.3"
+LINUX_VERSION ?= "5.0.5"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 06/43] linux-yocto-rt: update to 5.0.5-rt3
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (4 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 05/43] linux-yocto/5.0: update to v5.0.5 Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 07/43] linux-yocto/5.0: update to v5.0.7 Armin Kuster
` (36 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the -r3 release, which has the following rt specific
fixes:
printk: An all-in-one commit to fix build failures
powerpc/stackprotector: work around stack-guard init from atomic
powerpc/pseries/iommu: Use a locallock instead local_irq_save()
powerpc: reshuffle TIF bits
tty/sysrq: Convert show_lock to raw_spinlock_t
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index adffe4e..24c4816 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "06e1ff79ea9efef052404ee1989cae038b28e954"
-SRCREV_meta ?= "f0b575cda6d03540ff8da2f70421f13a08f34a5e"
+SRCREV_machine ?= "4767ff117d75b2cd54d2c0f77dc1c3e6fdd6c520"
+SRCREV_meta ?= "2070c41a1d0542e41cac5f0ea04a108e46cac427"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.0.3"
+LINUX_VERSION ?= "5.0.5"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 07/43] linux-yocto/5.0: update to v5.0.7
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (5 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 06/43] linux-yocto-rt: update to 5.0.5-rt3 Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 08/43] linux-yocto/4.19: update to v4.19.34 Armin Kuster
` (35 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the korg -stable releases which comprise the following
commits:
8b298d3a0bd5 Linux 5.0.7
e73f145543fa kbuild: skip sub-make for in-tree build with GNU Make 4.x
d972d1c0d76d kbuild: add workaround for Debian make-kpkg
38d2286e52ea bcache: fix potential div-zero error of writeback_rate_p_term_inverse
ae050638bc97 ACPI / video: Extend chassis-type detection with a "Lunch Box" check
3e033b1b435a gpio: of: Restrict enable-gpio quirk to regulator-gpio
ae42fc868cd5 appletalk: Fix compile regression
a84b7c68966a net: stmmac: Avoid one more sometimes uninitialized Clang warning
36b39631cc85 drm/dp/mst: Configure no_stop_bit correctly for remote i2c xfers
8826838f43fe drm: Reorder set_property_atomic to avoid returning with an active ww_ctx
0a2e1a5b583b ASoC: simple-card-utils: check "reg" property on asoc_simple_card_get_dai_id()
45040e92500c Input: soc_button_array - fix mapping of the 5th GPIO in a PNP0C40 device
1ad62489b25a staging: iio: adt7316: fix dac_bits assignment
2bece1d313aa dmaengine: tegra: avoid overflow of byte tracking
e84e0a8c3f22 clk: rockchip: fix frac settings of GPLL clock for rk3328
25fb6c323b55 ARM: shmobile: Fix R-Car Gen2 regulator quirk
9b0f430450cf clk: meson: clean-up clock registration
a644d2d28baf drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup
c8a8dd1d85ca x86/build: Mark per-CPU symbols as absolute explicitly for LLD
38af5462fa51 wlcore: Fix memory leak in case wl12xx_fetch_firmware failure
ab79dc3ef024 brcmfmac: Use firmware_request_nowarn for the clm_blob
f836093a2eeb selinux: do not override context on context mounts
993f96415a72 x86/build: Specify elf_i386 linker emulation explicitly for i386 objects
16d4d75d8b6e drm/nouveau: Stop using drm_crtc_force_disable
bfb59eabe2c9 drm: Auto-set allow_fb_modifiers when given modifiers at plane init
778c82db727a pinctrl: meson: meson8b: add the eth_rxd2 and eth_rxd3 pins
1048bfd8bf67 regulator: act8865: Fix act8600_sudcdc_voltage_ranges setting
e78d5e16f1d6 audit: hand taken context to audit_kill_trees for syscall logging
a43ea8ca1865 PCI: pciehp: Assign ctrl->slot_ctrl before writing it to hardware
e5d1f1c0148d media: s5p-jpeg: Check for fmt_ver_flag when doing fmt enumeration
68ec6a13ef0d media: rcar-vin: Allow independent VIN link enablement
ebd0f3066c35 netfilter: physdev: relax br_netfilter dependency
d7e6e93b95f2 dmaengine: qcom_hidma: initialize tx flags in hidma_prep_dma_*
1bac8b82d95c dmaengine: qcom_hidma: assign channel cookie correctly
56d276b53614 dmaengine: imx-dma: fix warning comparison of distinct pointer types
964065d234c7 cpu/hotplug: Mute hotplug lockdep during init
8376acca6f18 pinctrl: sh-pfc: r8a77995: Fix MOD_SEL bit numbering
e848354f28b7 pinctrl: sh-pfc: r8a77990: Fix MOD_SEL bit numbering
9d7ff2ae8fd6 pinctrl: meson: fix G12A ao pull registers base address
e17a340f9598 hpet: Fix missing '=' character in the __setup() code of hpet_mmap_enable
283a29de66c3 f2fs: fix to initialize variable to avoid UBSAN/smatch warning
3d1a731bcec7 f2fs: UBSAN: set boolean value iostat_enable correctly
d9f59ff251b4 HID: intel-ish: ipc: handle PIMR before ish_wakeup also clear PISR busy_clear bit
931480457bb3 selftests/bpf: suppress readelf stderr when probing for BTF support
e01bc8baa867 soc/tegra: fuse: Fix illegal free of IO base address
bf381e06af42 hwrng: virtio - Avoid repeated init of completion
64ef5941a6f8 media: mt9m111: set initial frame size other than 0x0
9acd16abab23 perf script python: Add trace_context extension module to sys.modules
8febc5d31032 perf script python: Use PyBytes for attr in trace-event-python
8f4264f58eb8 perf trace: Fixup etcsnoop example
631e6859c9ac platform/x86: intel-hid: Missing power button release on some Dell models
3ea0a48aa080 usb: dwc3: gadget: Fix OTG events when gadget driver isn't loaded
bce56838a25d regulator: mcp16502: Include linux/gpio/consumer.h to fix build error
f8d78138dd55 ALSA: dice: add support for Solid State Logic Duende Classic/Mini
504dfdea9c39 drm/amd/display: Enable vblank interrupt during CRC capture
b32cff3dd086 powerpc/pseries: Perform full re-add of CPU for topology update post-migration
9ee0088f920b tty: increase the default flip buffer limit to 2*640K
d9c61474aa77 backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state
b8498a26ffdb cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting
07232db69580 powerpc/64s: Clear on-stack exception marker upon exception return
cf651d7007c1 selftests/bpf: skip verifier tests for unsupported program types
08619450dbfe bpf: fix missing prototype warnings
8b3b22aa7c55 block, bfq: fix queue removal from weights tree
c581587af717 block, bfq: fix in-service-queue check for queue merging
721360c972a3 ARM: avoid Cortex-A9 livelock on tight dmb loops
34164dfc56a4 ARM: 8830/1: NOMMU: Toggle only bits in EXC_RETURN we are really care of
f7a2659378e7 mt7601u: bump supported EEPROM version
a1fc32156354 drm/msm/dpu: Convert to a chained irq chip
e0442dc492e5 soc: qcom: gsbi: Fix error handling in gsbi_probe()
65ae5c0808c7 efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted
6416e05b8190 ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation
897a3b9ef31d drm/vkms: Bugfix extra vblank frame
1c76c3cf3060 drm/vkms: Bugfix racing hrtimer vblank handle
5ca05ecd2954 sched/core: Use READ_ONCE()/WRITE_ONCE() in move_queued_task()/task_rq_lock()
4e634952fe74 efi/memattr: Don't bail on zero VA if it equals the region's PA
dd288d329d17 sched/debug: Initialize sd_sysctl_cpus if !CONFIG_CPUMASK_OFFSTACK
0da521452109 ASoC: fsl-asoc-card: fix object reference leaks in fsl_asoc_card_probe
8a838b44f70f iwlwifi: mvm: fix RFH config command with >=10 CPUs
9bd4debdd544 staging: spi: mt7621: Add return code check on device_reset()
3aa0518aacaa i2c: of: Try to find an I2C adapter matching the parent
c1ac30ee10cf platform/x86: intel_pmc_core: Fix PCH IP sts reading
b503ea08fe0d e1000e: Exclude device from suspend direct complete optimization
7f0a3a436e88 e1000e: fix cyclic resets at link up with active tx
4e4fba6d30f8 perf/aux: Make perf_event accessible to setup_aux()
81ee4eab3117 drm/amd/display: Disconnect mpcc when changing tg
c730d6c156c6 powerpc/ptrace: Mitigate potential Spectre v1
8e74000fd656 x86/kexec: Fill in acpi_rsdp_addr from the first kernel
90c93fbede11 bpf: test_maps: fix possible out of bound access warning
c60bf6e7594c drm/amd/display: Don't re-program planes for DPMS changes
ada81ebc5f35 drm: rcar-du: add missing of_node_put
7208136a41f9 cdrom: Fix race condition in cdrom_sysctl_register
e00ff3abfaaf fbdev: fbmem: fix memory access if logo is bigger than the screen
8e48664da19f net: phy: consider latched link-down status in polling mode
c230484a3767 iw_cxgb4: fix srqidx leak during connection abort
3e45ebf5a16c net: marvell: mvpp2: fix stuck in-band SGMII negotiation
c0ed04868506 genirq: Avoid summation loops for /proc/stat
c984b1e68b0c bcache: improve sysfs_strtoul_clamp()
5db086d7c05f bcache: fix potential div-zero error of writeback_rate_i_term_inverse
d4db0c5ee0b4 bcache: fix input overflow to sequential_cutoff
f48bb10d7615 bcache: fix input overflow to cache set sysfs file io_error_halflife
83a6f919bbb7 sched/topology: Fix percpu data types in struct sd_data & struct s_data
9738742e4e38 usb: f_fs: Avoid crash due to out-of-scope stack ptr access
db5177729062 ath10k: fix shadow register implementation for WCN3990
31f3d84c6d9f ALSA: PCM: check if ops are defined before suspending PCM
6c896df369d1 ARM: dts: meson8b: fix the Ethernet data line signals in eth_rgmii_pins
c716b08e06ca ARM: 8833/1: Ensure that NEON code always compiles with Clang
f74b0a4bf14c netfilter: conntrack: fix cloned unconfirmed skb->_nfct race in __nf_conntrack_confirm
c4ea4a79f8b2 kprobes: Prohibit probing on RCU debug routine
170d42947604 kprobes: Prohibit probing on bsearch()
34968a446c4e selftests: skip seccomp get_metadata test if not real root
7981a5b4df77 selftests: ir: fix warning: "%s" directive output may be truncated ’ directive output may be truncated
7b27cb19942e ACPI / video: Refactor and fix dmi_is_desktop()
4f9f04ca4f83 iwlwifi: pcie: fix emergency path
2392dcb54ad2 perf coresight: Do not test for libopencsd by default
528033f554c8 perf report: Add s390 diagnosic sampling descriptor size
59c09689808e perf trace: Check if the 'fd' is negative when mapping it to pathname
8b4fdbce8ca4 perf beauty waitid options: Fix up prefix showing logic
336eb093ba16 tools build: Add test-reallocarray.c to test-all.c to fix the build
17e987679232 tools build: Add -lrt to FEATURE_CHECK_LDFLAGS-libaio
1cbdd2401798 leds: lp55xx: fix null deref on firmware load failure
34cbc429c56d jbd2: fix race when writing superblock
9489ac42680c regulator: core: Take lock before applying system load
7440c206c38f drm/sched: Fix entities with 0 rqs.
aa6c9fcac011 efi: Fix build error due to enum collision between efi.h and ima.h
55d7152d37dc cgroup, rstat: Don't flush subtree root unless necessary
2fe8be270932 HID: intel-ish-hid: avoid binding wrong ishtp_cl_device
e6eef5240054 vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
a8254b01ca21 xen/gntdev: Do not destroy context while dma-bufs are in use
d6318df6b0cc gpio: of: Apply regulator-gpio quirk only to enable-gpios
7d361b8dbafe mt76: usb: do not run mt76u_queues_deinit twice
af1ef012b95f media: rockchip/vpu: Correct return type for mem2mem buffer helpers
d544b0856f3f media: mtk-jpeg: Correct return type for mem2mem buffer helpers
569ce17b4cd9 media: mx2_emmaprp: Correct return type for mem2mem buffer helpers
76499752191f media: s5p-g2d: Correct return type for mem2mem buffer helpers
8852dab94f04 media: rockchip/rga: Correct return type for mem2mem buffer helpers
9f31e32fd5a5 media: s5p-jpeg: Correct return type for mem2mem buffer helpers
21ad47c39835 media: sh_veu: Correct return type for mem2mem buffer helpers
a6d9661c5d16 media: ov7740: fix runtime pm initialization
ed83655ce8c2 SoC: imx-sgtl5000: add missing put_device()
a75ad663203b perf report: Don't shadow inlined symbol with different addr range
c3a8705881cc mwifiex: don't advertise IBSS features without FW support
aa8c73c8682f perf test: Fix failure of 'evsel-tp-sched' test on s390
16a94480fb03 drm/amd/display: Clear stream->mode_changed after commit
456736ab1b78 scsi: fcoe: make use of fip_mode enum complete
952613125def scsi: megaraid_sas: return error when create DMA pool failed
a3c1a668a014 s390/ism: ignore some errors during deregistration
5d1db4825e3c efi: cper: Fix possible out-of-bounds access
99bb2d19853a cpufreq: acpi-cpufreq: Report if CPU doesn't support boost technologies
4e7b5f9dc7a7 ASoC: qcom: Fix of-node refcount unbalance in qcom_snd_parse_of()
a332ad5f006f powerpc/44x: Force PCI on for CURRITUCK
4974ca47f15c perf annotate: Fix getting source line failure
1a4faefc4680 clk: fractional-divider: check parent rate only if flag is set
869a72e08b86 IB/mlx4: Increase the timeout for CM cache
55bbe8fa7bfd i2c: designware: Do not allow i2c_dw_xfer() calls while suspended
600c30ca6124 loop: set GENHD_FL_NO_PART_SCAN after blkdev_reread_part()
540f120998df platform/mellanox: mlxreg-hotplug: Fix KASAN warning
a21f5c44cb8e platform/x86: ideapad-laptop: Fix no_hw_rfkill_list for Lenovo RESCUER R720-15IKBN
e2427570b374 i2c: Allow recovery of the initial IRQ by an I2C client device.
6f93033d93d1 mlxsw: spectrum: Avoid -Wformat-truncation warnings
a782956c2a30 e1000e: Fix -Wformat-truncation warnings
cae3c93ad96b veth: Fix -Wformat-truncation
dd8ab7cdbcda net: hns3: fix setting of the hns reset_type for rdma hw errors
660b8b783aed net: dsa: mv88e6xxx: Add lockdep classes to fix false positive splat
f9cf94eca1be mmc: omap: fix the maximum timeout setting
895927dc1c6a btrfs: don't enospc all tickets on flush failure
8f6019b404c8 btrfs: qgroup: Make qgroup async transaction commit more aggressive
9a27e9ef2338 perf script: Handle missing fields with -F +..
565e4ecefeae ice: fix ice_remove_rule_internal vsi_list handling
b3425e19f614 net: dsa: mv88e6xxx: Default CMODE to 1000BaseX only on 6390X
13fe58e28c21 powerpc/hugetlb: Handle mmap_min_addr correctly in get_unmapped_area callback
957b2d2317e9 iommu/io-pgtable-arm-v7s: Only kmemleak_ignore L2 tables
af6366bb82e6 ARM: 8845/1: use unified assembler in c files
dbda5b6625bd ARM: 8840/1: use a raw_spinlock_t in unwind
8cada074059f serial: 8250_pxa: honor the port number from devicetree
1e084b9e2037 coresight: etm4x: Add support to enable ETMv4.2
8e28ed0b7b8d powerpc/xmon: Fix opcode being uninitialized in print_insn_powerpc
5e91baea2c1f ath10k: don't report unset rssi values to mac80211
33cb50fa0930 drm/amd/display: Fix reference counting for struct dc_sink.
29b55af8a429 btrfs: save drop_progress if we drop refs at all
e3e9d97396cd kbuild: make -r/-R effective in top Makefile for old Make versions
366a5ee958d0 kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing
22efb9f2aeff scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c
b17b4bd79afc powerpc/powernv/ioda: Fix locked_vm counting for memory used by IOMMU tables
7fe45a018fb3 usb: chipidea: Grab the (legacy) USB PHY by phandle first
a133f9f7f96a tools/bpf: selftests: add map lookup to test_map_in_map bpf prog
547272b44afa crypto: cavium/zip - fix collision with generic cra_driver_name
1ee9d34d6861 crypto: crypto4xx - add missing of_node_put after of_device_is_available
2b52034346cd lockdep/lib/tests: Fix run_tests.sh
a73713e53323 ath10k: Fix the wrong updation of BW in tx_stats debugfs entry
e486c95f5d50 mt76: fix a leaked reference by adding a missing of_node_put
96e2fec0fd8c wil6210: check null pointer in _wil_cfg80211_merge_extra_ies
d8f775092499 PCI/PME: Fix hotplug/sysfs remove deadlock in pcie_pme_remove()
88f0ced0d75f mm/resource: Return real error codes from walk failures
6e33632946e4 tools lib traceevent: Fix buffer overflow in arg_eval
a1d9d2145c50 fs: fix guard_bio_eod to check for real EOD errors
dee200aba7dc ext4: fix bigalloc cluster freeing when hole punching under load
1d62e75a00bb jbd2: fix invalid descriptor block checksum
87f8ad583c79 iommu/vt-d: Disable ATS support on untrusted devices
b39898beee9d netfilter: conntrack: tcp: only close if RST matches exact sequence
8a0f1351bac1 PCI: mediatek: Fix memory mapped IO range size computation
fdb08cf7dbee netfilter: nf_tables: check the result of dereferencing base_chain->stats
dc8d8f83ea52 perf beauty msg_flags: Add missing %s lost when adding prefix suppression logic
d6dd80425f5d cifs: Fix NULL pointer dereference of devname
bcb99efab248 cifs: Accept validate negotiate if server return NT_STATUS_NOT_SUPPORTED
88596e78dae4 f2fs: fix to check inline_xattr_size boundary correctly
e3eea74f61a8 dm thin: add sanity checks to thin-pool and external snapshot creation
f2e34b4ff47e cifs: use correct format characters
64f336255228 kasan: fix kasan_check_read/write definitions
326ce03840eb page_poison: play nicely with KASAN
0326696a6769 fs/file.c: initialize init_files.resize_wait
902507dada43 f2fs: fix to data block override node segment by mistake
3667215198eb f2fs: do not use mutex lock in atomic context
e92a6db09700 ocfs2: fix a panic problem caused by o2cb_ctl
8783c35917b6 mm/slab.c: kmemleak no scan alien caches
f67cd526ce1d mm/vmalloc.c: fix kernel BUG at mm/vmalloc.c:512!
03bccbc025ed mm, mempolicy: fix uninit memory access
c59c60824a9a memcg: killed threads should not invoke memcg OOM killer
db5d8675b14a mm,oom: don't kill global init via memory.oom.group
66a4d4d03b7e docs/core-api/mm: fix user memory accessors formatting
34fa723765cf mm, swap: bounds check swap_info array accesses to avoid NULL derefs
57f5b77e9f46 mm/page_ext.c: fix an imbalance with kmemleak
93b7ebef7ee3 mm/cma.c: cma_declare_contiguous: correct err handling
90a70109697c mm/sparse: fix a bad comparison
60c86431ca4c perf c2c: Fix c2c report for empty numa node
11304c4b4ee4 x86/hyperv: Fix kernel panic when kexec on HyperV
34555ccacf94 iio: adc: fix warning in Qualcomm PM8xxx HK/XOADC driver
86aad65625cf scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO
776de12b9f8f scsi: hisi_sas: Set PHY linkrate when disconnected
c5021aa17b05 libbpf: force fixdep compilation at the start of the build
267f65c94fb7 enic: fix build warning without CONFIG_CPUMASK_OFFSTACK
aaad69802e17 net: stmmac: Avoid sometimes uninitialized Clang warnings
4e4d49798d86 sysctl: handle overflow for file-max
fd9317a3e2a0 include/linux/relay.h: fix percpu annotation in struct rchan
c7c82cea6985 gpio: gpio-omap: fix level interrupt idling
90833d08ffa5 clk: ti: clkctrl: Fix clkdm_name regression for TI_CLK_CLKCTRL_COMPAT
b48475a66ef5 xsk: fix to reject invalid flags in xsk_bind
3cac5ce088c2 net/mlx5: Avoid panic when setting vport mac, getting vport config
a1126c2008a3 net/mlx5: Avoid panic when setting vport rate
d1e83bda0c30 net/mlx5e: Fix access to non-existing receive queue
043a440018e3 tracing: kdb: Fix ftdump to not sleep
4c6df358aa87 apparmor: fix double free when unpack of secmark rules fails
a98984da006b f2fs: fix to avoid deadlock in f2fs_read_inline_dir()
8d661a663048 f2fs: fix to adapt small inline xattr space in __find_inline_xattr()
e56d6fa7acf3 h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux-
1eaf6713c5b3 nvme-loop: init nvmet_ctrl fatal_err_work when allocate
32b73dc525a1 nvme-fc: fix numa_node when dev is null
fae38f280334 CIFS: fix POSIX lock leak and invalid ptr deref
dc2b4d4ab0ae ext4: cleanup bh release code in ext4_ind_remove_space()
820c1fa51501 Linux 5.0.6
debaa517c16c mt76x02u: use usb_bulk_msg to upload firmware
046098f056e2 bpf: do not restore dst_reg when cur_state is freed
b54f0c4976e7 KVM: x86: update %rip after emulating IO
cc3f680dd076 KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts
d50d46e303d4 KVM: Reject device ioctls from processes other than the VM's creator
8c0823aa123b x86/smp: Enforce CONFIG_HOTPLUG_CPU when SMP=y
c3bcf0314665 cpu/hotplug: Prevent crash when CPU bringup fails on CONFIG_HOTPLUG_CPU=n
53464ca9130b watchdog: Respect watchdog cpumask on CPU hotplug
1a0ecfd4e633 powerpc/pseries/mce: Fix misleading print for TLB mutlihit
4a2b2d5dc8fa powerpc/64: Fix memcmp reading past the end of src/dest
e92932ef2862 powerpc/pseries/energy: Use OF accessor functions to read ibm,drc-indexes
8f84f7daabb2 objtool: Query pkg-config for libelf location
a0de19f1c307 perf intel-pt: Fix TSC slip
c9418d0addb0 perf pmu: Fix parser error for uncore event alias
8ad454a831e0 mm/migrate.c: add missing flush_dcache_page for non-mapped page migrate
8a86a416c948 mm/page_isolation.c: fix a wrong flag in set_migratetype_isolate()
77a5258a57e7 mm/memory_hotplug.c: fix notification in offline error path
2b57282beb60 mm/debug.c: fix __dump_page when mapping->host is not set
8b2f31de5d15 mm: mempolicy: make mbind() return -EIO when MPOL_MF_STRICT is specified
467c01f2deea iommu/io-pgtable-arm-v7s: request DMA32 memory, and improve debugging
ed3886c7d9f2 mm: add support for kmem caches in DMA32 zone
eef9dbbad03f mm/hotplug: fix offline undo_isolate_page_range()
d26254c4e7ca usb: typec: Fix unchecked return value
a3bed8b549ec usb: typec: tcpm: Try PD-2.0 if sink does not respond to 3.0 source-caps
402f57808b9a usb: cdc-acm: fix race during wakeup blocking TX traffic
c7a5ef0d64f4 xhci: Don't let USB3 ports stuck in polling state prevent suspend
448c39c360ef usb: xhci: dbc: Don't free all memory with spinlock held
c08a998dec55 xhci: Fix port resume done detection for SS ports with LPM enabled
8e70eae1816b usb: host: xhci-rcar: Add XHCI_TRUST_TX_LENGTH quirk
40b8282f9009 mm/memory.c: fix modifying of page protection by insert_pfn()
08213ad7465f usb: common: Consider only available nodes for dr_mode
80ff12631ba5 USB: gadget: f_hid: fix deadlock in f_hidg_write()
8f00b32d3991 usb: mtu3: fix EXTCON dependency
dbc206874d67 phy: sun4i-usb: Support set_mode to USB_HOST for non-OTG PHYs
494d26aa3915 gpio: adnp: Fix testing wrong value in adnp_gpio_direction_input
aa2250dec6ee gpio: exar: add a check for the return value of ida_simple_get fails
673bc99a6708 drm/i915/icl: Fix the TRANS_DDI_FUNC_CTL2 bitfield macro
25c939a9a594 drm/i915/gvt: Fix MI_FLUSH_DW parsing with correct index check
9241bd9b6401 drm/i915: Mark AML 0x87CA as ULX
0baddc2099dd drm/vkms: fix use-after-free when drm_gem_handle_create() fails
18e8f0f379a5 drm/vgem: fix use-after-free when drm_gem_handle_create() fails
5f0bf5cd357d cpufreq: scpi: Fix use after free
7466a2abe757 cpufreq: intel_pstate: Also use CPPC nominal_perf for base_frequency
0dcb45879a5f blk-mq: fix sbitmap ws_active for shared tags
50076360f4a0 drivers/block/zram/zram_drv.c: fix idle/writeback string compare
79d8bdf334d6 fs/proc/proc_sysctl.c: fix NULL pointer dereference in put_links
e44461a50380 Disable kgdboc failed by echo space to /sys/module/kgdboc/parameters/kgdboc
c6ed8bf0ad03 ACPI / CPPC: Fix guaranteed performance handling
72c1487ea0a4 USB: serial: option: add Olicard 600
623533deabb1 USB: serial: option: add support for Quectel EM12
b7a0e2163e0d USB: serial: option: set driver_info for SIM5218 and compatibles
4503b17ed496 USB: serial: mos7720: fix mos_parport refcount imbalance on error path
639f52d29012 USB: serial: ftdi_sio: add additional NovaTech products
7790bb1039fb USB: serial: cp210x: add new device id
4fc867dd92cb serial: sh-sci: Fix setting SCSCR_TIE while transferring data
e39ecf48678e serial: mvebu-uart: Fix to avoid a potential NULL pointer dereference
763eafe0dbf5 serial: max310x: Fix to avoid potential NULL pointer dereference
198b7b7fb6b6 staging: erofs: keep corrupted fs from crashing kernel in erofs_readdir()
22a76cf6a5eb staging: erofs: fix error handling when failed to read compresssed data
a0fdd9036176 staging: erofs: fix to handle error path of erofs_vmap()
be3d49395af0 staging: vt6655: Fix interrupt race condition on device start up.
37fc532d4d58 staging: vt6655: Remove vif check from vnt_interrupt
7d9cd1961a50 staging: speakup_soft: Fix alternate speech with other synths
de6283bc5caf staging: olpc_dcon_xo_1: add missing 'const' qualifier
da418a0b0963 staging: comedi: ni_mio_common: Fix divide-by-zero for DIO cmdtest
5bff7cb2bc89 tty: serial: qcom_geni_serial: Initialize baud in qcom_geni_console_setup
36e47853d0e9 tty: atmel_serial: fix a potential NULL pointer dereference
ade797815046 tty: mxs-auart: fix a potential NULL pointer dereference
35070431105f tty/serial: atmel: RS485 HD w/DMA: enable RX after TX is stopped
70691073d296 tty/serial: atmel: Add is_half_duplex helper
d5845d77e9e1 drm/rockchip: vop: reset scale mode when win is disabled
631d09fd0856 scsi: zfcp: fix scsi_eh host reset with port_forced ERP for non-NPIV FCP devices
e188df764406 scsi: zfcp: fix rport unblock if deleted SCSI devices on Scsi_Host
143982417ad3 scsi: sd: Quiesce warning if device does not report optimal I/O size
98163d192bc5 scsi: sd: Fix a race between closing an sd device and sd I/O
310891a84396 ocfs2: fix inode bh swapping mixup in ocfs2_reflink_inodes_lock
f2391e6767a6 fs/open.c: allow opening only regular files during execve()
95d78fc93943 kbuild: modversions: Fix relative CRC byte order interpretation
a6c74dcb5909 ALSA: hda/realtek - Fix speakers on Acer Predator Helios 500 Ryzen laptops
f2b1bfbc173a ALSA: hda/realtek: Enable headset MIC of ASUS X430UN and X512DK with ALC256
c03c547b07d9 ALSA: hda/realtek: Enable headset mic of ASUS P5440FF with ALC256
dd1774f3d0cd ALSA: hda/realtek: Enable ASUS X441MB and X705FD headset MIC with ALC256
c672af11fbb0 ALSA: hda/realtek - Add support for Acer Aspire E5-523G/ES1-432 headset mic
12af8b3d94eb ALSA: hda/realtek: Enable headset MIC of Acer Aspire Z24-890 with ALC286
9635b3bf1a5f ALSA: hda/realtek: Enable headset MIC of Acer AIO with ALC286
b6de98dcc02e ALSA: hda/realtek - Add support headset mode for New DELL WYSE NB
8da540f343aa ALSA: hda/realtek - Add support headset mode for DELL WYSE AIO
545d1fe70648 ALSA: hda/realtek: merge alc_fixup_headset_jack to alc295_fixup_chromebook
c87a0bb99b83 ALSA: hda/realtek - Fixed Headset Mic JD not stable
56e3785b579b ALSA: pcm: Don't suspend stream in unrecoverable PCM state
94176d2a1d2b ALSA: pcm: Fix possible OOB access in PCM oss plugins
a30c0ff829c6 ALSA: seq: oss: Fix Spectre v1 vulnerability
abe5b0a76de9 ALSA: rawmidi: Fix potential Spectre v1 vulnerability
ce1ae80cacf7 net: dsa: qca8k: remove leftover phy accessors
0110524398bb NFSv4.1 don't free interrupted slot on open
e37c15d77d68 NFS: fix mount/umount race in nlmclnt.
7a4cdaf977c2 NFS: Fix nfs4_lock_state refcounting in nfs4_alloc_{lock,unlock}data()
bd01ab90e8a5 vfio: ccw: only free cp on final interrupt
73d6cb884532 powerpc: bpf: Fix generation of load/store DW instructions
a2216e2d0751 ARM: imx6q: cpuidle: fix bug that CPU might not wake up at expected time
8bf47766a9f9 tracing: initialize variable in create_dyn_event()
7bcb002431ba locks: wake any locks blocked on request before deadlock check
3ba84d2d7581 Btrfs: fix assertion failure on fsync with NO_HOLES enabled
84104398e6f3 btrfs: Avoid possible qgroup_rsv_size overflow in btrfs_calculate_inode_block_rsv_size
e3a605636a80 btrfs: Fix bound checking in qgroup_trace_new_subtree_blocks
4a0584a21542 btrfs: raid56: properly unmap parity page in finish_parity_scrub()
da2dea634c22 btrfs: don't report readahead errors and don't update statistics
70c88bf99441 btrfs: remove WARN_ON in log_dir_items
ab0600d45dd9 Btrfs: fix incorrect file size after shrinking truncate and fsync
0253563b8be5 powerpc/fsl: Fix the flush of branch predictor.
bb06073a9cad tun: add a missing rcu_read_unlock() in error path
d01bf3762e29 ila: Fix rhashtable walker list corruption
4951fc65d915 r8169: fix cable re-plugging issue
fc8f36de7711 net: phy: don't clear BMCR in genphy_soft_reset
aa3f1b029e4b net: mii: Fix PAUSE cap advertisement from linkmode_adv_to_lcl_adv_t() helper
d9c13ecbf7c5 net: dsa: mv88e6xxx: fix few issues in mv88e6390x_port_set_cmode
98bfc778c5d9 thunderx: eliminate extra calls to put_page() for pages held for recycling
10792c33d060 thunderx: enable page recycling for non-XDP case
0c421524c1f1 vxlan: Don't call gro_cells_destroy() before device is unregistered
1a44391e1d03 vrf: prevent adding upper devices
e269f5f55c06 tun: properly test for IFF_UP
9868ffd44b25 tipc: fix cancellation of topology subscriptions
e13fbdf6e872 tipc: change to check tipc_own_id to return in tipc_net_stop
30e2a9a38d0c tipc: allow service ranges to be connect()'ed on RDM/DGRAM
632f3ed848bc tcp: do not use ipv6 header for ipv4 flow
118ad2c7de1d sctp: use memdup_user instead of vmemdup_user
d2af0ce54b1c sctp: get sctphdr by offset in sctp_compute_cksum
5a336f69cfa0 rhashtable: Still do rehash when we get EEXIST
278c7d7e4ecb packets: Always register packet sk in the same order
970d4fb2a231 net: usb: aqc111: Extend HWID table by QNAP device
566e793d051f net-sysfs: call dev_hold if kobject_init_and_add success
1b925f484028 net: stmmac: fix memory corruption with large MTUs
8cf288b55da9 net: rose: fix a possible stack overflow
baa14468e57d net: phy: meson-gxl: fix interrupt support
3ca86ad4e57a net/packet: Set __GFP_NOWARN upon allocation in alloc_pg_vec
475af63497f8 net: datagram: fix unbounded loop in __skb_try_recv_datagram()
017c90da5d8f net: aquantia: fix rx checksum offload for UDP/TCP over IPv6
3e5c1acf0637 mISDN: hfcpci: Test both vendor & device ID for Digium HFC4S
780e62a6a021 mac8390: Fix mmio access size probe
282c70c23454 ipv6: make ip6_create_rt_rcu return ip6_null_entry instead of NULL
8122233e877a gtp: change NET_UDP_TUNNEL dependency to select
bd60a788b10b genetlink: Fix a memory leak on error path
3b58f24bdfec dccp: do not use ipv6 header for ipv4 flow
400dded59397 netfilter: nf_tables: fix set double-free in abort path
a556547bae00 Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer
8dac9b8d27b5 Bluetooth: Check L2CAP option sizes returned from l2cap_get_conf_opt
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 8 ++++----
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 20 ++++++++++----------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index 24c4816..842aa5b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "4767ff117d75b2cd54d2c0f77dc1c3e6fdd6c520"
-SRCREV_meta ?= "2070c41a1d0542e41cac5f0ea04a108e46cac427"
+SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a"
+SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.0.5"
+LINUX_VERSION ?= "5.0.7"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index 6b07401..eba6cc6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.0.5"
+LINUX_VERSION ?= "5.0.7"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "42d601740a3ab5d777a1709bf39500a8a4af4afe"
-SRCREV_machine ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
-SRCREV_meta ?= "2070c41a1d0542e41cac5f0ea04a108e46cac427"
+SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9"
+SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
+SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index f53089a..fe773be 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base"
KBRANCH_qemux86-64 ?= "v5.0/standard/base"
KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "a27450baa8f52faaf82535411bb4e32b0c16199d"
-SRCREV_machine_qemuarm64 ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
-SRCREV_machine_qemumips ?= "ea747ff485eca3175472c474184fe49a9200e36f"
-SRCREV_machine_qemuppc ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
-SRCREV_machine_qemux86 ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
-SRCREV_machine_qemux86-64 ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
-SRCREV_machine_qemumips64 ?= "e1112ce34e86354c4d9ac713ebdfbfc4b950a547"
-SRCREV_machine ?= "8d265b9329ff84b3bfd70813ba18168016302d4f"
-SRCREV_meta ?= "2070c41a1d0542e41cac5f0ea04a108e46cac427"
+SRCREV_machine_qemuarm ?= "ed9d11e2c8ebbfe056420cb89c2e5d02836496ce"
+SRCREV_machine_qemuarm64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
+SRCREV_machine_qemumips ?= "40a729c3b0683d0875f8d6ad7353e6e429c7afc2"
+SRCREV_machine_qemuppc ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
+SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
+SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
+SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87"
+SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
+SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6"
# remap qemuarm to qemuarma15 for the 5.0 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -28,7 +28,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.0.5"
+LINUX_VERSION ?= "5.0.7"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 08/43] linux-yocto/4.19: update to v4.19.34
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (6 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 07/43] linux-yocto/5.0: update to v5.0.7 Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 09/43] core-image-sato-sdk-ptest: Try and keep image below 4GB limit Armin Kuster
` (34 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the korg -stable releases that comprise the following
commits:
4d552acf3370 Linux 4.19.34
d5813e77363c kprobes/x86: Blacklist non-attachable interrupt functions
e7d26616c92b bcache: fix potential div-zero error of writeback_rate_p_term_inverse
09abe130820b ACPI / video: Extend chassis-type detection with a "Lunch Box" check
d1d2ca98b78f net: stmmac: Avoid one more sometimes uninitialized Clang warning
972e31ba4bc2 drm/dp/mst: Configure no_stop_bit correctly for remote i2c xfers
986a2bb54a31 Input: soc_button_array - fix mapping of the 5th GPIO in a PNP0C40 device
6d2817e2ab8c dmaengine: tegra: avoid overflow of byte tracking
7386f095b709 clk: rockchip: fix frac settings of GPLL clock for rk3328
c8e4f8406842 clk: meson: clean-up clock registration
6251c1db04f2 drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup
648b949b7870 x86/build: Mark per-CPU symbols as absolute explicitly for LLD
52cd9e0e43c7 wlcore: Fix memory leak in case wl12xx_fetch_firmware failure
05b23c66bb6e brcmfmac: Use firmware_request_nowarn for the clm_blob
e30e0b0915b6 selinux: do not override context on context mounts
d2053718e087 x86/build: Specify elf_i386 linker emulation explicitly for i386 objects
e0662d00c98a drm/nouveau: Stop using drm_crtc_force_disable
1d377200482b drm: Auto-set allow_fb_modifiers when given modifiers at plane init
27d6de370cdc pinctrl: meson: meson8b: add the eth_rxd2 and eth_rxd3 pins
61174e34611f regulator: act8865: Fix act8600_sudcdc_voltage_ranges setting
bcdd4a5ee1c5 media: s5p-jpeg: Check for fmt_ver_flag when doing fmt enumeration
9bfd4ab5e8e4 media: rcar-vin: Allow independent VIN link enablement
2e6bcc327b0b netfilter: physdev: relax br_netfilter dependency
24296fbc5445 dmaengine: qcom_hidma: initialize tx flags in hidma_prep_dma_*
c55f4a6e798d dmaengine: qcom_hidma: assign channel cookie correctly
afacaf85543b dmaengine: imx-dma: fix warning comparison of distinct pointer types
fba4c61e9888 cpu/hotplug: Mute hotplug lockdep during init
a6c671e23168 hpet: Fix missing '=' character in the __setup() code of hpet_mmap_enable
dbeca415575f f2fs: UBSAN: set boolean value iostat_enable correctly
16b06b15dd53 HID: intel-ish: ipc: handle PIMR before ish_wakeup also clear PISR busy_clear bit
67c2be160519 soc/tegra: fuse: Fix illegal free of IO base address
a3aa9d93b9ab hwrng: virtio - Avoid repeated init of completion
7aaa76e8a6ab media: mt9m111: set initial frame size other than 0x0
fd400e96c599 perf script python: Add trace_context extension module to sys.modules
d90a375b786c perf script python: Use PyBytes for attr in trace-event-python
f94e369fe7a8 platform/x86: intel-hid: Missing power button release on some Dell models
1e55e3f6c735 usb: dwc3: gadget: Fix OTG events when gadget driver isn't loaded
2b20c29bcdf6 ALSA: dice: add support for Solid State Logic Duende Classic/Mini
3abb3d0418e1 drm/amd/display: Enable vblank interrupt during CRC capture
06af7dda05b3 powerpc/pseries: Perform full re-add of CPU for topology update post-migration
57f03bbd4236 tty: increase the default flip buffer limit to 2*640K
2142eba848a1 backlight: pwm_bl: Use gpiod_get_value_cansleep() to get initial state
d0bc74c5632f cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting
b52681e6e623 powerpc/64s: Clear on-stack exception marker upon exception return
118d38a3577f selftests/bpf: skip verifier tests for unsupported program types
ae92cf4760f8 bpf: fix missing prototype warnings
06666a19d5a5 block, bfq: fix in-service-queue check for queue merging
30d503bae967 ARM: avoid Cortex-A9 livelock on tight dmb loops
d8945878ded6 ARM: 8830/1: NOMMU: Toggle only bits in EXC_RETURN we are really care of
668713493a19 mt7601u: bump supported EEPROM version
a2479c401054 soc: qcom: gsbi: Fix error handling in gsbi_probe()
ce80ebf7a04e efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted
240a9050a3d8 ARM: dts: lpc32xx: Remove leading 0x and 0s from bindings notation
b5c1dc9d8fa4 drm/vkms: Bugfix extra vblank frame
e8e0bd4915ec sched/core: Use READ_ONCE()/WRITE_ONCE() in move_queued_task()/task_rq_lock()
b12a060a0bd2 efi/memattr: Don't bail on zero VA if it equals the region's PA
f056c90f079a sched/debug: Initialize sd_sysctl_cpus if !CONFIG_CPUMASK_OFFSTACK
442caac9fce9 ASoC: fsl-asoc-card: fix object reference leaks in fsl_asoc_card_probe
b4410c7d731d iwlwifi: mvm: fix RFH config command with >=10 CPUs
080e00c8f6f9 staging: spi: mt7621: Add return code check on device_reset()
f0eb935c50b9 i2c: of: Try to find an I2C adapter matching the parent
7c114e8605a9 platform/x86: intel_pmc_core: Fix PCH IP sts reading
b9f257e27890 e1000e: Exclude device from suspend direct complete optimization
c23242c36bdd e1000e: fix cyclic resets at link up with active tx
efd85d83ac0f perf/aux: Make perf_event accessible to setup_aux()
355ffe6cc2a1 drm/amd/display: Disconnect mpcc when changing tg
6c68d1654c27 drm/amd/display: Don't re-program planes for DPMS changes
322a55a56a2a drm: rcar-du: add missing of_node_put
924af49998c2 cdrom: Fix race condition in cdrom_sysctl_register
6d293647f8d9 fbdev: fbmem: fix memory access if logo is bigger than the screen
2dd699432958 net: phy: consider latched link-down status in polling mode
5203cf8e29e5 iw_cxgb4: fix srqidx leak during connection abort
a78aae93ba9c net: marvell: mvpp2: fix stuck in-band SGMII negotiation
1f3694865d56 genirq: Avoid summation loops for /proc/stat
98eddc19f9e9 bcache: improve sysfs_strtoul_clamp()
b468e0007435 bcache: fix potential div-zero error of writeback_rate_i_term_inverse
c7b687ebe0fb bcache: fix input overflow to sequential_cutoff
16975f04f2ca bcache: fix input overflow to cache set sysfs file io_error_halflife
845d4849b60c sched/topology: Fix percpu data types in struct sd_data & struct s_data
ad02fb6a6cc8 usb: f_fs: Avoid crash due to out-of-scope stack ptr access
126f2f6af291 ath10k: fix shadow register implementation for WCN3990
ccce764322d8 ALSA: PCM: check if ops are defined before suspending PCM
d21a63fc1e53 ARM: dts: meson8b: fix the Ethernet data line signals in eth_rgmii_pins
d93fe5e6c9d9 ARM: 8833/1: Ensure that NEON code always compiles with Clang
3a1ce9793855 netfilter: conntrack: fix cloned unconfirmed skb->_nfct race in __nf_conntrack_confirm
d53b295f7805 kprobes: Prohibit probing on RCU debug routine
bc9d714395e2 kprobes: Prohibit probing on bsearch()
c63cc8d1487c selftests: skip seccomp get_metadata test if not real root
2df541d0a665 ACPI / video: Refactor and fix dmi_is_desktop()
d63105845ac5 iwlwifi: pcie: fix emergency path
5cdd025907b8 perf report: Add s390 diagnosic sampling descriptor size
5658279f50ea leds: lp55xx: fix null deref on firmware load failure
9154420173d5 jbd2: fix race when writing superblock
a74ebf047e4f cgroup, rstat: Don't flush subtree root unless necessary
b13eb5245f9f HID: intel-ish-hid: avoid binding wrong ishtp_cl_device
c26d61ea90db vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
7273c2b1e79c xen/gntdev: Do not destroy context while dma-bufs are in use
e9cd7f543764 mt76: usb: do not run mt76u_queues_deinit twice
5cde7721dd05 media: mtk-jpeg: Correct return type for mem2mem buffer helpers
745cdc344f97 media: mx2_emmaprp: Correct return type for mem2mem buffer helpers
73a4cc59054e media: s5p-g2d: Correct return type for mem2mem buffer helpers
3c6cd079058e media: rockchip/rga: Correct return type for mem2mem buffer helpers
55919fc28419 media: s5p-jpeg: Correct return type for mem2mem buffer helpers
a23fd268fdbb media: sh_veu: Correct return type for mem2mem buffer helpers
635fabdd8202 media: ov7740: fix runtime pm initialization
1d836ce73a10 SoC: imx-sgtl5000: add missing put_device()
d41687c82a70 perf report: Don't shadow inlined symbol with different addr range
801b8d8c7729 mwifiex: don't advertise IBSS features without FW support
d323e59f58bb perf test: Fix failure of 'evsel-tp-sched' test on s390
345c7757fd54 drm/amd/display: Clear stream->mode_changed after commit
1ef1b20f8711 scsi: fcoe: make use of fip_mode enum complete
8032fc9120c2 scsi: megaraid_sas: return error when create DMA pool failed
2c6e3ec8a906 s390/ism: ignore some errors during deregistration
d60f458e4c4d efi: cper: Fix possible out-of-bounds access
e57f4676b92f cpufreq: acpi-cpufreq: Report if CPU doesn't support boost technologies
eb70531a95c8 ASoC: qcom: Fix of-node refcount unbalance in qcom_snd_parse_of()
e6786f8686ef perf annotate: Fix getting source line failure
763a895aa49c clk: fractional-divider: check parent rate only if flag is set
d3ec442d609b IB/mlx4: Increase the timeout for CM cache
61584032c4d6 loop: set GENHD_FL_NO_PART_SCAN after blkdev_reread_part()
07a31820b241 platform/mellanox: mlxreg-hotplug: Fix KASAN warning
0bacfb4adc1b platform/x86: ideapad-laptop: Fix no_hw_rfkill_list for Lenovo RESCUER R720-15IKBN
a64ffbaf7056 mlxsw: spectrum: Avoid -Wformat-truncation warnings
49dd86f0f5ec e1000e: Fix -Wformat-truncation warnings
c6fb45d895e0 net: dsa: mv88e6xxx: Add lockdep classes to fix false positive splat
194b888af85e mmc: omap: fix the maximum timeout setting
dcedd37957de btrfs: qgroup: Make qgroup async transaction commit more aggressive
6cf5f631bad0 powerpc/hugetlb: Handle mmap_min_addr correctly in get_unmapped_area callback
fc96b44c05c2 iommu/io-pgtable-arm-v7s: Only kmemleak_ignore L2 tables
d81bdb3c17f1 ARM: 8840/1: use a raw_spinlock_t in unwind
951307172652 serial: 8250_pxa: honor the port number from devicetree
2636ccec991e coresight: etm4x: Add support to enable ETMv4.2
c70214d519ed powerpc/xmon: Fix opcode being uninitialized in print_insn_powerpc
638ecaf58369 kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing
5db107484403 scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c
4acf797458ce powerpc/powernv/ioda: Fix locked_vm counting for memory used by IOMMU tables
6030bcc04735 usb: chipidea: Grab the (legacy) USB PHY by phandle first
b142c7973338 crypto: cavium/zip - fix collision with generic cra_driver_name
d401d121113e crypto: crypto4xx - add missing of_node_put after of_device_is_available
241ebd2ea44b mt76: fix a leaked reference by adding a missing of_node_put
6115055b4efe wil6210: check null pointer in _wil_cfg80211_merge_extra_ies
9546c3662dc5 PCI/PME: Fix hotplug/sysfs remove deadlock in pcie_pme_remove()
224c996e48be tools lib traceevent: Fix buffer overflow in arg_eval
83c395332fdf fs: fix guard_bio_eod to check for real EOD errors
6a817a7aed1c jbd2: fix invalid descriptor block checksum
ca66f667189c netfilter: conntrack: tcp: only close if RST matches exact sequence
709aaa09b200 netfilter: nf_tables: check the result of dereferencing base_chain->stats
36a3219e617a cifs: Fix NULL pointer dereference of devname
d579b4eae836 cifs: Accept validate negotiate if server return NT_STATUS_NOT_SUPPORTED
4ab78f4d75c6 f2fs: fix to check inline_xattr_size boundary correctly
8c81fcd3d5c1 dm thin: add sanity checks to thin-pool and external snapshot creation
626d98bbdb30 cifs: use correct format characters
a6c56bf63e87 page_poison: play nicely with KASAN
d609ecd887f8 fs/file.c: initialize init_files.resize_wait
9b4f27667402 f2fs: do not use mutex lock in atomic context
20141feb9bde ocfs2: fix a panic problem caused by o2cb_ctl
f09c424cea9f mm/slab.c: kmemleak no scan alien caches
8a0fc62e331e mm/vmalloc.c: fix kernel BUG at mm/vmalloc.c:512!
67abbb9c5422 mm, mempolicy: fix uninit memory access
9d785b92cf0d memcg: killed threads should not invoke memcg OOM killer
eed3ca0a66cf mm,oom: don't kill global init via memory.oom.group
ed3345a6607b mm, swap: bounds check swap_info array accesses to avoid NULL derefs
4c6d7dc741cb mm/page_ext.c: fix an imbalance with kmemleak
f555b008c576 mm/cma.c: cma_declare_contiguous: correct err handling
7b287c47e452 mm/sparse: fix a bad comparison
aea8c971b9c5 perf c2c: Fix c2c report for empty numa node
c3f28d59c1a5 x86/hyperv: Fix kernel panic when kexec on HyperV
3e8d62218aa4 iio: adc: fix warning in Qualcomm PM8xxx HK/XOADC driver
e27cced35a4b scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO
fce6aeaf913e scsi: hisi_sas: Set PHY linkrate when disconnected
e21f655c60fa libbpf: force fixdep compilation at the start of the build
6048330675cc enic: fix build warning without CONFIG_CPUMASK_OFFSTACK
9ec4860de95a net: stmmac: Avoid sometimes uninitialized Clang warnings
b227f1571269 sysctl: handle overflow for file-max
d6ad08aa3467 include/linux/relay.h: fix percpu annotation in struct rchan
4c96500e3658 gpio: gpio-omap: fix level interrupt idling
8c50ab86e288 net/mlx5: Avoid panic when setting vport mac, getting vport config
3bddc6149f02 net/mlx5: Avoid panic when setting vport rate
b73c7d020452 tracing: kdb: Fix ftdump to not sleep
d7391962d723 f2fs: fix to avoid deadlock in f2fs_read_inline_dir()
198c99857b30 f2fs: fix to adapt small inline xattr space in __find_inline_xattr()
56bb66c50296 h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux-
2938651d36ca CIFS: fix POSIX lock leak and invalid ptr deref
442d5d171cd8 tty/serial: atmel: RS485 HD w/DMA: enable RX after TX is stopped
b6b4bcb40be0 tty/serial: atmel: Add is_half_duplex helper
2dbc7c66d6da ext4: cleanup bh release code in ext4_ind_remove_space()
bd62f1fe736e arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals
4b3a3ab00fa7 Linux 4.19.33
11008a9b0fc7 platform: x86: intel_cht_int33fe: Remove the old connections for the muxes
056cda45cfed usb: typec: class: Don't use port parent for getting mux handles
6875404a12f8 platform: x86: intel_cht_int33fe: Add connections for the USB Type-C port
681a9fc184b3 platform: x86: intel_cht_int33fe: Add connection for the DP alt mode
3bb446a3fe87 platform: x86: intel_cht_int33fe: Register all connections at once
e99d90ce7750 drivers: base: Helpers for adding device connection descriptions
f5959dec081a bpf: do not restore dst_reg when cur_state is freed
738dda85d181 staging: erofs: keep corrupted fs from crashing kernel in erofs_readdir()
83bbd66b3753 staging: erofs: fix error handling when failed to read compresssed data
3a18eabaa712 KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts
b9733a74350d KVM: x86: update %rip after emulating IO
7ceedcefc2d2 KVM: Reject device ioctls from processes other than the VM's creator
a0713e8103d1 x86/smp: Enforce CONFIG_HOTPLUG_CPU when SMP=y
a56aa02e6f15 cpu/hotplug: Prevent crash when CPU bringup fails on CONFIG_HOTPLUG_CPU=n
336f6b23b5b8 watchdog: Respect watchdog cpumask on CPU hotplug
c91d07ad34d7 powerpc/64: Fix memcmp reading past the end of src/dest
d7c00bbbfac4 powerpc/pseries/energy: Use OF accessor functions to read ibm,drc-indexes
0603e3a9281d objtool: Query pkg-config for libelf location
a436cf6479c0 perf intel-pt: Fix TSC slip
5f9366330950 perf pmu: Fix parser error for uncore event alias
f70ddae24bdf mm/migrate.c: add missing flush_dcache_page for non-mapped page migrate
5966777dd807 mm: mempolicy: make mbind() return -EIO when MPOL_MF_STRICT is specified
c9874d397807 iommu/io-pgtable-arm-v7s: request DMA32 memory, and improve debugging
62d342d67060 mm: add support for kmem caches in DMA32 zone
2392ffab085a usb: cdc-acm: fix race during wakeup blocking TX traffic
82a5090aad84 xhci: Don't let USB3 ports stuck in polling state prevent suspend
20a09a2e8703 usb: xhci: dbc: Don't free all memory with spinlock held
c81b872281a1 xhci: Fix port resume done detection for SS ports with LPM enabled
093ccda1a041 usb: host: xhci-rcar: Add XHCI_TRUST_TX_LENGTH quirk
015e5c17617a usb: common: Consider only available nodes for dr_mode
ef4df134e77e USB: gadget: f_hid: fix deadlock in f_hidg_write()
614ac345bfec usb: mtu3: fix EXTCON dependency
66e44981de0e phy: sun4i-usb: Support set_mode to USB_HOST for non-OTG PHYs
6ebe03734361 gpio: adnp: Fix testing wrong value in adnp_gpio_direction_input
b26f7e86d3cc gpio: exar: add a check for the return value of ida_simple_get fails
df74e70ffec6 drm/i915/gvt: Fix MI_FLUSH_DW parsing with correct index check
75f9e994b9fd drm/vkms: fix use-after-free when drm_gem_handle_create() fails
eb1e552524b4 drm/vgem: fix use-after-free when drm_gem_handle_create() fails
07d0d2bd957a fs/proc/proc_sysctl.c: fix NULL pointer dereference in put_links
c956914f1efa Disable kgdboc failed by echo space to /sys/module/kgdboc/parameters/kgdboc
1c992ea006ce USB: serial: option: add Olicard 600
19151c645d0c USB: serial: option: add support for Quectel EM12
002795b0d9b3 USB: serial: option: set driver_info for SIM5218 and compatibles
d7dfccfd3c4b USB: serial: mos7720: fix mos_parport refcount imbalance on error path
1f46db3cc133 USB: serial: ftdi_sio: add additional NovaTech products
2a63003545d0 USB: serial: cp210x: add new device id
59203f078cc6 serial: sh-sci: Fix setting SCSCR_TIE while transferring data
b1e660c6f802 serial: mvebu-uart: Fix to avoid a potential NULL pointer dereference
f34ec64b3f6c serial: max310x: Fix to avoid potential NULL pointer dereference
a090ed15420a staging: erofs: fix to handle error path of erofs_vmap()
3b6b76644ba5 staging: vt6655: Fix interrupt race condition on device start up.
b9ddff2a41cd staging: vt6655: Remove vif check from vnt_interrupt
86092f2d5ccb staging: speakup_soft: Fix alternate speech with other synths
d0360bf48143 staging: comedi: ni_mio_common: Fix divide-by-zero for DIO cmdtest
668ba38d8950 tty: serial: qcom_geni_serial: Initialize baud in qcom_geni_console_setup
b9bbd1edddf7 tty: atmel_serial: fix a potential NULL pointer dereference
124e42064c0d tty: mxs-auart: fix a potential NULL pointer dereference
7fb7414da97e drm/rockchip: vop: reset scale mode when win is disabled
a93cd9137fea scsi: zfcp: fix scsi_eh host reset with port_forced ERP for non-NPIV FCP devices
983a543de13a scsi: zfcp: fix rport unblock if deleted SCSI devices on Scsi_Host
a52eb223a6ee scsi: sd: Quiesce warning if device does not report optimal I/O size
d72658775c4b scsi: sd: Fix a race between closing an sd device and sd I/O
3b3fcc3d4ffd ocfs2: fix inode bh swapping mixup in ocfs2_reflink_inodes_lock
72b790c417b9 fs/open.c: allow opening only regular files during execve()
aa7f29f87027 kbuild: modversions: Fix relative CRC byte order interpretation
4dfae837ceaf ALSA: hda/realtek - Fix speakers on Acer Predator Helios 500 Ryzen laptops
6f3dbb71085c ALSA: hda/realtek: Enable headset MIC of ASUS X430UN and X512DK with ALC256
633d5db40280 ALSA: hda/realtek: Enable headset mic of ASUS P5440FF with ALC256
fd4000c77a5a ALSA: hda/realtek: Enable ASUS X441MB and X705FD headset MIC with ALC256
48e8e6a736b6 ALSA: hda/realtek - Add support for Acer Aspire E5-523G/ES1-432 headset mic
5fa5a8679b92 ALSA: hda/realtek: Enable headset MIC of Acer Aspire Z24-890 with ALC286
5ec67684be9e ALSA: hda/realtek: Enable headset MIC of Acer AIO with ALC286
89ec6d400b5d ALSA: hda/realtek - Add support headset mode for New DELL WYSE NB
522f06c9c00d ALSA: hda/realtek - Add support headset mode for DELL WYSE AIO
5b93302bbc4e ALSA: pcm: Don't suspend stream in unrecoverable PCM state
7fc6064dc3b2 ALSA: pcm: Fix possible OOB access in PCM oss plugins
b425f45295dd ALSA: seq: oss: Fix Spectre v1 vulnerability
bd55e6727a33 ALSA: rawmidi: Fix potential Spectre v1 vulnerability
a485919fe4cc net: dsa: qca8k: remove leftover phy accessors
64751542d3f3 NFSv4.1 don't free interrupted slot on open
da57cba4f3f1 NFS: fix mount/umount race in nlmclnt.
0f273f0c3064 vfio: ccw: only free cp on final interrupt
92d4ee2e8276 powerpc: bpf: Fix generation of load/store DW instructions
9397f0d9948c ARM: imx6q: cpuidle: fix bug that CPU might not wake up at expected time
fd1b25364fef Btrfs: fix assertion failure on fsync with NO_HOLES enabled
0ae3b84b3fa6 btrfs: Avoid possible qgroup_rsv_size overflow in btrfs_calculate_inode_block_rsv_size
1cf4ab01eb5a btrfs: raid56: properly unmap parity page in finish_parity_scrub()
d952c337b25d btrfs: don't report readahead errors and don't update statistics
b57220cc9820 btrfs: remove WARN_ON in log_dir_items
22dcb30fb9d8 Btrfs: fix incorrect file size after shrinking truncate and fsync
a1df5db3a9f1 powerpc/security: Fix spectre_v2 reporting
986f0c656749 powerpc/fsl: Fix the flush of branch predictor.
b848d19c483a powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'
632d839296bd powerpc/fsl: Update Spectre v2 reporting
43f40620d7a5 powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used
a46a50382639 powerpc/fsl: Flush branch predictor when entering KVM
3cb931c709d0 powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit)
cf72dad924cb powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)
020e5f13805b powerpc/fsl: Add nospectre_v2 command line argument
4a6a2287e0e6 powerpc/fsl: Emulate SPRN_BUCSR register
4944f1d48d71 powerpc/fsl: Add macro to flush the branch predictor
d67ab3d9a1b7 powerpc/fsl: Add infrastructure to fixup branch predictor flush
e044d21c2999 tun: add a missing rcu_read_unlock() in error path
6bdb5fdc4787 thunderx: eliminate extra calls to put_page() for pages held for recycling
ac8411d75962 thunderx: enable page recycling for non-XDP case
a491de9041b4 net: sched: fix cleanup NULL pointer exception in act_mirr
7254ad094f4a ila: Fix rhashtable walker list corruption
979f8a675d3b vxlan: Don't call gro_cells_destroy() before device is unregistered
3b1386beeef4 vrf: prevent adding upper devices
8ea78da1aa3e tun: properly test for IFF_UP
52a7505c91a1 tipc: fix cancellation of topology subscriptions
1be6c0c737e4 tipc: change to check tipc_own_id to return in tipc_net_stop
24d1a6259706 tipc: allow service ranges to be connect()'ed on RDM/DGRAM
7115df614b09 tcp: do not use ipv6 header for ipv4 flow
cab576f1b00f sctp: use memdup_user instead of vmemdup_user
97265479d7ca sctp: get sctphdr by offset in sctp_compute_cksum
cf86f7a97561 rhashtable: Still do rehash when we get EEXIST
69cea7cf3170 packets: Always register packet sk in the same order
d9d215be3a3a net-sysfs: call dev_hold if kobject_init_and_add success
8dcf078d92ae net: stmmac: fix memory corruption with large MTUs
7eeb12edf637 net: rose: fix a possible stack overflow
a6f0168e6681 net: phy: meson-gxl: fix interrupt support
85ef72d829eb net/packet: Set __GFP_NOWARN upon allocation in alloc_pg_vec
88c64f9c7d3f net: datagram: fix unbounded loop in __skb_try_recv_datagram()
e4ff39e1ba80 net: aquantia: fix rx checksum offload for UDP/TCP over IPv6
c408426292ee mISDN: hfcpci: Test both vendor & device ID for Digium HFC4S
e0f8c06f45c3 mac8390: Fix mmio access size probe
be09211384c2 ipv6: make ip6_create_rt_rcu return ip6_null_entry instead of NULL
53adaacbbadb gtp: change NET_UDP_TUNNEL dependency to select
9b8ef421b481 genetlink: Fix a memory leak on error path
321461f2497f dccp: do not use ipv6 header for ipv4 flow
6bba17f6bce3 ipmi_si: Fix crash when using hard-coded device
15d6538a0d6e Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer
2318c0e4b87e Bluetooth: Check L2CAP option sizes returned from l2cap_get_conf_opt
3a2156c839c7 Linux 4.19.32
33bd347fee01 power: supply: charger-manager: Fix incorrect return value
19184190b029 ALSA: hda - Enforces runtime_resume after S3 and S4 for each codec
156ba57f4ba6 ALSA: hda - Record the current power state before suspend/resume calls
0e0f7b307212 locking/lockdep: Add debug_locks check in __lock_downgrade()
206a76a684a7 x86/unwind: Add hardcoded ORC entry for NULL
367ccafbcbfe x86/unwind: Handle NULL pointer calls better in frame unwinder
3254dd301f80 loop: access lo_backing_file only when the loop device is Lo_bound
35cdcdc5c49d netfilter: ebtables: remove BUGPRINT messages
1fd916e879a9 f2fs: fix to avoid deadlock of atomic file operations
9dd5053c8cd5 RDMA/cma: Rollback source IP address if failing to acquire device
015b828bd66d drm: Reorder set_property_atomic to avoid returning with an active ww_ctx
e365b94086f9 Bluetooth: hci_ldisc: Postpone HCI_UART_PROTO_READY bit set in hci_uart_set_proto()
f67202f78fe3 Bluetooth: hci_ldisc: Initialize hci_dev before open()
4b39051363a0 Bluetooth: Fix decrementing reference count twice in releasing socket
4e0ca4bfa2bc Bluetooth: hci_uart: Check if socket buffer is ERR_PTR in h4_recv_buf()
6bef442eea18 media: v4l2-ctrls.c/uvc: zero v4l2_event
d12d86411c03 ext4: brelse all indirect buffer in ext4_ind_remove_space()
76c9ee6bd5d2 ext4: fix data corruption caused by unaligned direct AIO
558331d0205b ext4: fix NULL pointer dereference while journal is aborted
ff7a1f81c20e ALSA: ac97: Fix of-node refcount unbalance
c8e91d756703 ALSA: hda/ca0132 - make pci_iounmap() call conditional
4a767459389a ALSA: x86: Fix runtime PM for hdmi-lpe-audio
38bd575b9aef SMB3: Fix SMB3.1.1 guest mounts to Samba
aacf2cc814c2 irqchip/gic-v3-its: Fix comparison logic in lpi_range_cmp
daaeeca918e7 objtool: Move objtool_file struct off the stack
37c6f8089806 perf probe: Fix getting the kernel map
14c52acaac86 cifs: allow guest mounts to work for smb3.11
36d52f5bcd57 futex: Ensure that futex address is aligned in handle_futex_death()
837becb30c3b scsi: ibmvscsi: Fix empty event pool access during host removal
04809b226e79 scsi: ibmvscsi: Protect ibmvscsi_head from concurrent modificaiton
b8ea151a7ab5 powerpc/vdso64: Fix CLOCK_MONOTONIC inconsistencies across Y2038
9d91069f48cc MIPS: Fix kernel crash for R6 in jump label branch function
6e74961bd67d MIPS: Ensure ELF appended dtb is relocated
56bcf3df2552 mips: loongson64: lemote-2f: Add IRQF_NO_SUSPEND to "cascade" irqaction.
c72e90d94a14 udf: Fix crash on IO error during truncate
9cae232a8706 libceph: wait for latest osdmap in ceph_monc_blacklist_add()
869157135003 iommu/amd: fix sg->dma_address for sg->offset bigger than PAGE_SIZE
69e26237ed1e drm/vmwgfx: Return 0 when gmrid::get_node runs out of ID's
ab483d1ca7ae drm/vmwgfx: Don't double-free the mode stored in par->set_mode
42f358b2d48c mmc: renesas_sdhi: limit block count to 16 bit for old revisions
65a5c93687b7 mmc: mxcmmc: "Revert mmc: mxcmmc: handle highmem pages"
3b6870159e2e mmc: pxamci: fix enum type confusion
6339cc5181c0 ALSA: firewire-motu: use 'version' field of unit directory to identify model
023a1b28cf72 ALSA: hda - add Lenovo IdeaCentre B550 to the power_save_blacklist
a2cddfe2ce6e Linux 4.19.31
3053cb9701cd s390/setup: fix boot crash for machine without EDAT-1
e578f90d8a9c bcache: use (REQ_META|REQ_PRIO) to indicate bio for metadata
5ffb710b03d5 KVM: nVMX: Ignore limit checks on VMX instructions using flat segments
29b515c27c0a KVM: nVMX: Apply addr size mask to effective address for VMX instructions
9ce0ffeb68b6 KVM: nVMX: Sign extend displacements of VMX instr's mem operands
c235af5a10f2 KVM: x86/mmu: Do not cache MMIO accesses while memslots are in flux
656e9e5d5529 KVM: x86/mmu: Detect MMIO generation wrap in any address space
23ad135ae66f KVM: Call kvm_arch_memslots_updated() before updating memslots
585715ef18bf drm/amd/display: don't call dm_pp_ function from an fpu block
17982c6a649b drm/amd/powerplay: correct power reading on fiji
808b1c1e28e8 drm/radeon/evergreen_cs: fix missing break in switch statement
9bc6e5673949 drm/fb-helper: generic: Fix drm_fbdev_client_restore()
87bfc7b695bd media: imx: csi: Stop upstream before disabling IDMA channel
54b941202391 media: imx: csi: Disable CSI immediately after last EOF
73236bf581e9 media: vimc: Add vimc-streamer for stream control
29e8c9ae99c7 media: uvcvideo: Avoid NULL pointer dereference at the end of streaming
77b4e7454bbd media: lgdt330x: fix lock status reporting
6039128dc6bf media: imx: prpencvf: Stop upstream before disabling IDMA channel
e97a32a5a3bc rcu: Do RCU GP kthread self-wakeup from softirq and interrupt
bce45a547546 tpm: Unify the send callback behaviour
af0c1bd0c5e9 tpm/tpm_crb: Avoid unaligned reads in crb_recv()
cc3b79d487e8 md: Fix failed allocation of md_register_thread
01088750f25e perf intel-pt: Fix divide by zero when TSC is not available
30cedf18d1e2 perf/x86/intel/uncore: Fix client IMC events return huge result
a46a8cdfea3c perf intel-pt: Fix overlap calculation for padding
fa592fc0bde5 perf auxtrace: Define auxtrace record alignment
d8f691f29d91 perf tools: Fix split_kallsyms_for_kcore() for trampoline symbols
e25353a0ac44 perf intel-pt: Fix CYC timestamp calculation after OVF
3e5a054b0f70 x86/unwind/orc: Fix ORC unwind table alignment
b05581b8ba9c vt: perform safe console erase in the right order
2ca85aac1213 stable-kernel-rules.rst: add link to networking patch queue
622afe5c7449 bcache: never writeback a discard operation
cd73824636cb PM / wakeup: Rework wakeup source timer cancellation
43bceddcd7e2 svcrpc: fix UDP on servers with lots of threads
4af185feb9df NFSv4.1: Reinitialise sequence results before retransmitting a request
ecab6ab1c227 nfsd: fix wrong check in write_v4_end_grace()
8056912c1c75 nfsd: fix memory corruption caused by readdir
10a68cdf1035 nfsd: fix performance-limiting session calculation
2c648caf630d NFS: Don't recoalesce on error in nfs_pageio_complete_mirror()
63b0ee126f7e NFS: Fix an I/O request leakage in nfs_do_recoalesce
be74fddc976e NFS: Fix I/O request leakages
4ea4f347662c cpcap-charger: generate events for userspace
ce02d82c4e1a mfd: sm501: Fix potential NULL pointer dereference
5579d97e92f7 dm integrity: limit the rate of error messages
7668d6e45f3a dm: fix to_sector() for 32bit
a441fdaf8c30 ipmi_si: fix use-after-free of resource->name
3cbae9fa85ce arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2
c113a7fb017b arm64: debug: Ensure debug handlers check triggering exception level
85c8ea220f89 arm64: Fix HCR.TGE status for NMI contexts
58691e6a93d8 ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify
d6d004b3dd70 powerpc/traps: Fix the message printed when stack overflows
461a52a44893 powerpc/traps: fix recoverability of machine check handling on book3s/32
baed68a953ac powerpc/hugetlb: Don't do runtime allocation of 16G pages in LPAR configuration
9d2e929c3bae powerpc/ptrace: Simplify vr_get/set() to avoid GCC warning
344996a835d4 powerpc: Fix 32-bit KVM-PR lockup and host crash with MacOS guest
3bf8ff7bc667 powerpc/powernv: Don't reprogram SLW image on every KVM guest entry/exit
f6f03d6078b1 powerpc/83xx: Also save/restore SPRG4-7 during suspend
b0934990125a powerpc/powernv: Make opal log only readable by root
9b5305504709 powerpc/wii: properly disable use of BATs when requested.
40b97853c200 powerpc/32: Clear on-stack exception marker upon exception return
c7dad095f35a security/selinux: fix SECURITY_LSM_NATIVE_LABELS on reused superblock
e4f6f82c9edc selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
584f390d1039 jbd2: fix compile warning when using JBUFFER_TRACE
dbe4bc993836 jbd2: clear dirty flag when revoking a buffer from an older transaction
3545324fba52 serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()
8225bb965f29 serial: 8250_pci: Fix number of ports for ACCES serial cards
9d0b55bb2aec serial: 8250_of: assume reg-shift of 2 for mrvl,mmp-uart
a4b021ec4b5a serial: uartps: Fix stuck ISR if RX disabled with non-empty FIFO
9920eb4003c5 bpf: only test gso type on gso packets
206fa92c9d52 drm/i915: Relax mmap VMA check
116a9e31237c can: flexcan: FLEXCAN_IFLAG_MB: add () around macro argument
6f29e4c2dbb1 gpio: pca953x: Fix dereference of irq data in shutdown
e86a57ecdfac media: i2c: ov5640: Fix post-reset delay
5f9614d0540b i2c: tegra: fix maximum transfer size
25970b517db1 parport_pc: fix find_superio io compare code, should use equal test.
57c29a08c4cf intel_th: Don't reference unassigned outputs
c835b4417c18 device property: Fix the length used in PROPERTY_ENTRY_STRING()
93c8a44a8297 kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
09417dd35e37 mm/memory.c: do_fault: avoid usage of stale vm_area_struct
c1ddc7b785b4 mm/vmalloc: fix size check for remap_vmalloc_range_partial()
234c0cc98221 mm: hwpoison: fix thp split handing in soft_offline_in_use_page()
c7fd1a968c5d dmaengine: usb-dmac: Make DMAC system sleep callbacks explicit
822e21853439 usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
8415e718a06b usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
b1c1ef7b4d63 clk: ingenic: Fix doc of ingenic_cgu_div_info
4a04611fc266 clk: ingenic: Fix round_rate misbehaving with non-integer dividers
33e7604ac8fd clk: samsung: exynos5: Fix kfree() of const memory on setting driver_override
4d1de1e6d266 clk: samsung: exynos5: Fix possible NULL pointer exception on platform_device_alloc() failure
9aba7a8fd163 clk: clk-twl6040: Fix imprecise external abort for pdmclk
6e02a5f5aba3 clk: uniphier: Fix update register for CPU-gear
62600af3a7cb ext2: Fix underflow in ext2_max_size()
c335b49379b5 cxl: Wrap iterations over afu slices inside 'afu_list_lock'
54674984d478 IB/hfi1: Close race condition on user context disable and close
09bc2f5a16a9 PCI: dwc: skip MSI init if MSIs have been explicitly disabled
13a9d14fbf1b PCI/DPC: Fix print AER status in DPC event handling
c733cf4abfba PCI/ASPM: Use LTR if already enabled by platform
8a4fdc649ca9 ext4: fix crash during online resizing
a0d876c77705 ext4: add mask of ext4 flags to swap
048bfb5bc05f ext4: update quota information while swapping boot loader inode
071f68163cc0 ext4: cleanup pagecache before swap i_data
cdf9941b7707 ext4: fix check of inode in swap_inode_boot_loader
ae228aca576d cpufreq: pxa2xx: remove incorrect __init annotation
f65b34d0f979 cpufreq: tegra124: add missing of_node_put()
33565a76a7b2 cpufreq: kryo: Release OPP tables on module removal
ee7d297fba24 x86/kprobes: Prohibit probing on optprobe template code
a477075ebab3 irqchip/brcmstb-l2: Use _irqsave locking variants in non-interrupt code
c8666ede18ec irqchip/gic-v3-its: Avoid parsing _indirect_ twice for Device table
b92fad6995c3 libertas_tf: don't set URB_ZERO_PACKET on IN USB transfer
02c55be588b1 soc: qcom: rpmh: Avoid accessing freed memory from batch API
898488e2988c Btrfs: fix corruption reading shared and compressed extents after hole punching
1a00f7fd0fbf btrfs: ensure that a DUP or RAID1 block group has exactly two stripes
6e24f5a1ebb1 Btrfs: setup a nofs context for memory allocation at __btrfs_set_acl
61f9209676e8 Btrfs: setup a nofs context for memory allocation at btrfs_create_tree()
fcbf12e23d99 m68k: Add -ffreestanding to CFLAGS
205f149f1a35 ovl: Do not lose security.capability xattr over metadata file copy-up
6f048ae2d25f ovl: During copy up, first copy up data and then xattrs
2af926fd52fc splice: don't merge into linked buffers
1c2123ff4312 fs/devpts: always delete dcache dentry-s in dput()
d8ae662b400f scsi: qla2xxx: Fix LUN discovery if loop id is not assigned yet by firmware
f4a9fd5652d5 scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock
852a4ab292bb scsi: sd: Optimal I/O size should be a multiple of physical block size
e6e738e2b5ff scsi: aacraid: Fix performance issue on logical drives
bd8a0e656935 scsi: virtio_scsi: don't send sc payload with tmfs
1653307cf0e7 s390/virtio: handle find on invalid queue gracefully
b52bdf53130a s390/setup: fix early warning messages
e19ca3fe6cf2 clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability
ef8062e20614 clocksource/drivers/exynos_mct: Clear timer interrupt when shutdown
c1f45c10df2e clocksource/drivers/exynos_mct: Move one-shot check from tick clear to ISR
06607b1b6cc9 regulator: s2mpa01: Fix step values for some LDOs
c288e34df128 regulator: max77620: Initialize values for DT properties
462aee48a8a2 regulator: s2mps11: Fix steps for buck7, buck8 and LDO35
15ead7e2a11e spi: pxa2xx: Setup maximum supported DMA transfer length
e51c5ec99597 spi: ti-qspi: Fix mmap read when more than one CS in use
0d98ecb141a6 netfilter: ipt_CLUSTERIP: fix warning unused variable cn
6bd9959aa110 mmc:fix a bug when max_discard is 0
2946910ed837 mmc: sdhci-esdhc-imx: fix HS400 timing issue
c19b9673487e ACPI / device_sysfs: Avoid OF modalias creation for removed device
468ff43f6274 xen: fix dom0 boot on huge systems
24d5097655eb tracing/perf: Use strndup_user() instead of buggy open-coded version
f27077e5f5c5 tracing: Do not free iter->trace in fail path of tracing_open_pipe()
ebca08d7e862 tracing: Use strncpy instead of memcpy for string keys in hist triggers
43eaa6cc1775 CIFS: Fix read after write for files with read caching
dc8e8ad962a8 CIFS: Do not skip SMB2 message IDs on send failures
3ed9f22e28dd CIFS: Do not reset lease state to NONE on lease break
41e2d1c43c87 crypto: arm64/aes-ccm - fix bugs in non-NEON fallback routine
d5a5bded80a6 crypto: arm64/aes-ccm - fix logical bug in AAD MAC handling
66700c89f0ab crypto: x86/morus - fix handling chunked inputs and MAY_SLEEP
8a9fcf4a9f1f crypto: x86/aesni-gcm - fix crash on empty plaintext
5d2a5172caa4 crypto: x86/aegis - fix handling chunked inputs and MAY_SLEEP
574c19d97e6b crypto: testmgr - skip crc32c context test for ahash algorithms
e6c703f15872 crypto: skcipher - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
bb1ae0aadbf1 crypto: pcbc - remove bogus memcpy()s with src == dest
c0bfdac6a471 crypto: morus - fix handling chunked inputs
dc410d2d8405 crypto: hash - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
76f21678d64f crypto: arm64/crct10dif - revert to C code for short inputs
4bca5a9a5dcd crypto: arm64/aes-neonbs - fix returning final keystream block
0beb34b865e3 crypto: arm/crct10dif - revert to C code for short inputs
4c152af938ce crypto: aegis - fix handling chunked inputs
736807d69157 crypto: aead - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
7a8b048430c1 fix cgroup_do_mount() handling of failure exits
3b8da135a4cc libnvdimm: Fix altmap reservation size calculation
696c37524beb libnvdimm/pmem: Honor force_raw for legacy pmem regions
6a89ed7aa140 libnvdimm, pfn: Fix over-trim in trim_pfn_device()
2b88d92ea9d2 libnvdimm/label: Clear 'updating' flag after label-set update
f4dfb94a0754 nfit/ars: Attempt short-ARS even in the no_init_ars case
e6defe76600b nfit/ars: Attempt a short-ARS whenever the ARS state is idle at boot
f5878c4f084d acpi/nfit: Fix bus command validation
8df25eb903c5 nfit: acpi_nfit_ctl(): Check out_obj->type in the right place
eabd7d248e21 stm class: Prevent division by zero
b3139fbb3b00 tmpfs: fix uninitialized return value in shmem_link
d3f62d3eab0b selftests: fib_tests: sleep after changing carrier. again.
8cd89bf632b2 net: set static variable an initial value in atl2_probe()
29e4bfbc79b4 bnxt_en: Wait longer for the firmware message response to complete.
b4baeab7e084 bnxt_en: Fix typo in firmware message timeout logic.
a40fa9498707 nfp: bpf: fix ALU32 high bits clearance bug
7ca1faa52be7 nfp: bpf: fix code-gen bug on BPF_ALU | BPF_XOR | BPF_K
4523507c52b8 net: thunderx: add nicvf_send_msg_to_pf result check for set_rx_mode_task
17bc53e73d0c net: thunderx: make CFG_DONE message to run through generic send-ack sequence
02f8211b75c9 bpf, lpm: fix lookup bug in map_delete_elem
c5f37906ecb7 mac80211_hwsim: propagate genlmsg_reply return code
ee01ac61d1d4 phonet: fix building with clang
8b9187e7df64 ARCv2: don't assume core 0x54 has dual issue
3220aa9b0065 ARCv2: support manual regfile save on interrupts
74b4dcea6756 ARC: uacces: remove lp_start, lp_end from clobber list
2fc69e55f370 ARCv2: lib: memcpy: fix doing prefetchw outside of buffer
2c049f195787 ixgbe: fix older devices that do not support IXGBE_MRQC_L3L4TXSWEN
064a61d3e7b5 tmpfs: fix link accounting when a tmpfile is linked in
e6e9d6e29002 mm: handle lru_add_drain_all for UP properly
f3a9c9be0eb4 net: marvell: mvneta: fix DMA debug warning
e52578889c8e ARM: tegra: Restore DT ABI on Tegra124 Chromebooks
f715466a3f23 arm64: Relax GIC version check during early boot
2f97f7125237 ARM: dts: armada-xp: fix Armada XP boards NAND description
e4d14f616050 qed: Fix iWARP syn packet mac address validation.
821c67748623 qed: Fix iWARP buffer size provided for syn packet processing.
90fc2f95c418 ASoC: topology: free created components in tplg load error
edd7b6b9be97 mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue
6ac400b7c5e8 xfrm: Fix inbound traffic via XFRM interfaces across network namespaces
3a5321342361 net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe()
a139d6a318de qmi_wwan: apply SET_DTR quirk to Sierra WP7607
13cb60c3c915 pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins
90a86d00af1a net: dsa: bcm_sf2: Do not assume DSA master supports WoL
d33f5a0febfa net: systemport: Fix reception of BPDUs
3491857f4292 scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task
726832821903 keys: Fix dependency loop between construction record and auth key
fac71ac37634 assoc_array: Fix shortcut creation
84657a1ba9bd ARM: 8835/1: dma-mapping: Clear DMA ops on teardown
978e0388c22b af_key: unconditionally clone on broadcast
c7c68a1b9a16 bpf: fix lockdep false positive in stackmap
413e39852082 bpf: only adjust gso_size on bytestream protocols
da3495301cda ARM: 8824/1: fix a migrating irq bug when hotplug cpu
b92eaed36c4b esp: Skip TX bytes accounting when sending from a request socket
2f3b4f968619 clk: sunxi: A31: Fix wrong AHB gate number
cacf3c0d8288 kallsyms: Handle too long symbols in kallsyms.c
980f44f8dd8a clk: sunxi-ng: v3s: Fix TCON reset de-assert bit
5050f03ff0b1 Input: st-keyscan - fix potential zalloc NULL dereference
bf26feccf99c auxdisplay: ht16k33: fix potential user-after-free on module unload
8e770d996ea4 i2c: bcm2835: Clear current buffer pointers and counts after a transfer
d9ce9aea3f63 i2c: cadence: Fix the hold bit setting
8f622a7d512c net: hns: Fix object reference leaks in hns_dsaf_roce_reset()
33e83ea302c0 mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs
a9503ade1bf7 x86/CPU: Add Icelake model number
388f3adb2729 net: dsa: bcm_sf2: potential array overflow in bcm_sf2_sw_suspend()
8ab49fd5b072 scsi: qla2xxx: Fix panic from use after free in qla2x00_async_tm_cmd
53dcaeeff145 Revert "mm: use early_pfn_to_nid in page_ext_init"
8b1a7762e0da mm/gup: fix gup_pmd_range() for dax
6c023d86b364 NFS: Don't use page_file_mapping after removing the page
d84bc704b91e xprtrdma: Make sure Send CQ is allocated on an existing compvec
e01f2b0821ea floppy: check_events callback should not return a negative number
5ca2ef674d74 ipvs: fix dependency on nf_defrag_ipv6
29452f665c2f blk-mq: insert rq with DONTPREP to hctx dispatch list when requeue
e0e6b0d7e09c netfilter: compat: initialize all fields in xt_init
a5a244451145 mac80211: Fix Tx aggregation session tear down with ITXQs
bff33ba4f9ca mac80211: call drv_ibss_join() on restart
134891e124da Input: matrix_keypad - use flush_delayed_work()
e91dc2092f7f Input: ps2-gpio - flush TX work when closing port
4fe714b750cb Input: cap11xx - switch to using set_brightness_blocking()
f49f7007de59 ARM: OMAP2+: fix lack of timer interrupts on CPU1 after hotplug
8f07d76481d5 ASoC: samsung: Prevent clk_get_rate() calls in atomic context
459058f0e329 KVM: arm64: Forbid kprobing of the VHE world-switch code
04131dfcb910 KVM: arm/arm64: vgic: Always initialize the group of private IRQs
c831293622b2 arm/arm64: KVM: Don't panic on failure to properly reset system registers
b78379c33723 arm/arm64: KVM: Allow a VCPU to fully reset itself
dfe9b4d992ca KVM: arm/arm64: Reset the VCPU without preemption and vcpu state loaded
20604435e2f4 ASoC: rsnd: fixup rsnd_ssi_master_clk_start() user count check
e07aaaa7013e ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables
f3f7a8b6faf8 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized
ad4507bd2bf1 ARM: dts: Configure clock parent for pwm vibra
bac70a89419a Input: pwm-vibra - stop regulator after disabling pwm, not before
0ed72d3f6f1d Input: pwm-vibra - prevent unbalanced regulator
98a137cd0484 s390/dasd: fix using offset into zero size array error
cdaf89ab8f77 arm64: dts: rockchip: fix graph_port warning on rk3399 bob kevin and excavator
5f4a64b040c9 KVM: arm/arm64: vgic: Make vgic_dist->lpi_list_lock a raw_spinlock
ac696b0176b4 clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
b2c642a1a618 ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter
35ad2e6d7e46 gpu: ipu-v3: Fix CSI offsets for imx53
04c5c4c47c31 drm/imx: imx-ldb: add missing of_node_puts
1640b5288615 gpu: ipu-v3: Fix i.MX51 CSI control registers offset
a308622febe1 drm/imx: ignore plane updates on disabled crtcs
2e0e1f9a1e41 crypto: rockchip - update new iv to device in multiple operations
5aabf06712c2 crypto: rockchip - fix scatterlist nents error
3c5d7703bbd0 crypto: ahash - fix another early termination in hash walk
1a10e6b5bb34 crypto: cfb - remove bogus memcpy() with src == dest
0b1871d041d3 crypto: cfb - add missing 'chunksize' property
6ed42ccca59d crypto: ccree - don't copy zero size ciphertext
0bdd345a3848 crypto: ccree - unmap buffer before copying IV
009eeb9878b4 crypto: ccree - fix free of unallocated mlli buffer
6f4c11b09770 crypto: caam - fix DMA mapping of stack memory
74fd74e1fc8d crypto: caam - fixed handling of sg list
ce36d9fafb43 crypto: ccree - fix missing break in switch statement
32eeecf7ac87 crypto: caam - fix hash context DMA unmap size
dd6ce0316e70 stm class: Fix an endless loop in channel allocation
a253d1f3e490 mei: bus: move hw module get/put to probe/release
02c0c70fb36e mei: hbm: clean the feature flags on link reset
dbcb0a590ecb iio: adc: exynos-adc: Fix NULL pointer exception on unbind
3f44122e065c ASoC: codecs: pcm186x: Fix energysense SLEEP bit
7d9e07582a7f ASoC: codecs: pcm186x: fix wrong usage of DECLARE_TLV_DB_SCALE()
098e0f89a341 ASoC: fsl_esai: fix register setting issue in RIGHT_J mode
85bdc9daff40 9p/net: fix memory leak in p9_client_create
e08ba890dc29 9p: use inode->i_lock to protect i_size_write() under 32-bit
573d423a9bd7 media: videobuf2-v4l2: drop WARN_ON in vb2_warn_zero_bytesused()
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 8 ++++----
meta/recipes-kernel/linux/linux-yocto_4.19.bb | 20 ++++++++++----------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index 7a0b723..cdba9d2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "eac4b8fe170fc8745377cb37c5433db69356d6d8"
-SRCREV_meta ?= "55b740965496961a660674aa4e5b8568b1b9fb7e"
+SRCREV_machine ?= "b0ea9ef736c8ab8695bdfba61cd121ce5aa47e49"
+SRCREV_meta ?= "9bda6190bfc9e7858c2f7588109a0ec966f37a09"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
-LINUX_VERSION ?= "4.19.30"
+LINUX_VERSION ?= "4.19.34"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index 84a02af..dea7f2b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "4.19.30"
+LINUX_VERSION ?= "4.19.34"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "03eb6106990498e86298646c682fce9fc61f2131"
-SRCREV_machine ?= "253c39a252f25843111b7be0c8247eb4bd6c328d"
-SRCREV_meta ?= "55b740965496961a660674aa4e5b8568b1b9fb7e"
+SRCREV_machine_qemuarm ?= "6fbb768bd43d85b2cfd905e431101e214c580634"
+SRCREV_machine ?= "1afd139db231e38e8e0f5ea03dcb77f9537ba2e0"
+SRCREV_meta ?= "9bda6190bfc9e7858c2f7588109a0ec966f37a09"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index f83a6d6..de4ae92 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base"
KBRANCH_qemux86-64 ?= "v4.19/standard/base"
KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "3df49db2ea9b8e800cb30d5d695d4d2a2f8c1bed"
-SRCREV_machine_qemuarm64 ?= "253c39a252f25843111b7be0c8247eb4bd6c328d"
-SRCREV_machine_qemumips ?= "5dc975d0e586edd5d33bce62560f998f9a246be6"
-SRCREV_machine_qemuppc ?= "253c39a252f25843111b7be0c8247eb4bd6c328d"
-SRCREV_machine_qemux86 ?= "253c39a252f25843111b7be0c8247eb4bd6c328d"
-SRCREV_machine_qemux86-64 ?= "253c39a252f25843111b7be0c8247eb4bd6c328d"
-SRCREV_machine_qemumips64 ?= "bb7ae8a8cbe76c9ce2804f651936f059f9f621a2"
-SRCREV_machine ?= "253c39a252f25843111b7be0c8247eb4bd6c328d"
-SRCREV_meta ?= "55b740965496961a660674aa4e5b8568b1b9fb7e"
+SRCREV_machine_qemuarm ?= "b266576aa10e76afeded8e13ffce93c4638b8ddb"
+SRCREV_machine_qemuarm64 ?= "1afd139db231e38e8e0f5ea03dcb77f9537ba2e0"
+SRCREV_machine_qemumips ?= "f6ef1a5233db0a1f569d7d6638fa803ebe5c867b"
+SRCREV_machine_qemuppc ?= "1afd139db231e38e8e0f5ea03dcb77f9537ba2e0"
+SRCREV_machine_qemux86 ?= "1afd139db231e38e8e0f5ea03dcb77f9537ba2e0"
+SRCREV_machine_qemux86-64 ?= "1afd139db231e38e8e0f5ea03dcb77f9537ba2e0"
+SRCREV_machine_qemumips64 ?= "f5b26e4d7a0eee36298d970590c50c26a800b84d"
+SRCREV_machine ?= "1afd139db231e38e8e0f5ea03dcb77f9537ba2e0"
+SRCREV_meta ?= "9bda6190bfc9e7858c2f7588109a0ec966f37a09"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "4.19.30"
+LINUX_VERSION ?= "4.19.34"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 09/43] core-image-sato-sdk-ptest: Try and keep image below 4GB limit
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (7 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 08/43] linux-yocto/4.19: update to v4.19.34 Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 10/43] kernel.bbclass: convert base_do_unpack_append() to a task Armin Kuster
` (33 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
index 1027ec0..5739599 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
@@ -6,10 +6,10 @@ IMAGE_FEATURES += "ptest-pkgs"
# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live
# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
-# box) and explicitly add just 1500MB.
+# box) and explicitly add just 1300MB.
# strace-ptest in particular needs more than 500MB
IMAGE_OVERHEAD_FACTOR = "1.0"
-IMAGE_ROOTFS_EXTRA_SPACE = "1524288"
+IMAGE_ROOTFS_EXTRA_SPACE = "1324288"
# ptests need more memory than standard to avoid the OOM killer
QB_MEM = "-m 1024"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 10/43] kernel.bbclass: convert base_do_unpack_append() to a task
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (8 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 09/43] core-image-sato-sdk-ptest: Try and keep image below 4GB limit Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 11/43] ltp: Fix setrlimit03 call succeeded unexpectedly Armin Kuster
` (32 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Steven Hung (洪于玉) <Steven.Hung@mediatek.com>
<pre>
when externalsrc is enabled and the 'do_unpack' task is deleted,
building kernel module fail
Signed-off-by: Steven Hung (洪于玉) <Steven.Hung@mediatek.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/classes/kernel.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 9da9818..b346a60 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -130,7 +130,7 @@ inherit ${KERNEL_CLASSES}
# the symlink.
do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
-base_do_unpack_append () {
+python do_symlink_kernsrc () {
s = d.getVar("S")
if s[-1] == '/':
# drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as directory name and fail
@@ -147,6 +147,7 @@ base_do_unpack_append () {
shutil.move(s, kernsrc)
os.symlink(kernsrc, s)
}
+addtask symlink_kernsrc before do_configure after do_unpack
inherit kernel-arch deploy
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 11/43] ltp: Fix setrlimit03 call succeeded unexpectedly
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (9 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 10/43] kernel.bbclass: convert base_do_unpack_append() to a task Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 12/43] python3: add another multilib fix Armin Kuster
` (31 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: He Zhe <zhe.he@windriver.com>
Backport a patch from upstream to fix the following error.
"setrlimit03.c:54: FAIL: call succeeded unexpectedly"
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...trlimit03.c-read-proc-sys-fs-nr_open-for-.patch | 70 ++++++++++++++++++++++
meta/recipes-extended/ltp/ltp_20190115.bb | 1 +
2 files changed, 71 insertions(+)
create mode 100644 meta/recipes-extended/ltp/ltp/0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch
diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch
new file mode 100644
index 0000000..39623c3
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch
@@ -0,0 +1,70 @@
+From db57ddc1497e72947da2b14f471ab521478ef99d Mon Sep 17 00:00:00 2001
+From: Tommi Rantala <tommi.t.rantala@nokia.com>
+Date: Thu, 31 Jan 2019 19:49:00 +0200
+Subject: [PATCH] syscalls/setrlimit03.c: read /proc/sys/fs/nr_open for
+ RLIMIT_NOFILE limit
+
+Since kernel v2.6.25 RLIMIT_NOFILE limit is no longer hardcoded to
+NR_OPEN, but can be set via /proc/sys/fs/nr_open, see kernel commit
+9cfe015aa424b3c003baba3841a60dd9b5ad319b ("get rid of NR_OPEN and
+introduce a sysctl_nr_open").
+
+nr_open default value is 1024*1024, so setrlimit03 has been passing fine
+on new kernels, only "unexpectedly succeeding" if nr_open is set to some
+larger value.
+
+Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
+Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
+
+Upstream-Status: Backport [db57ddc1497e ("syscalls/setrlimit03.c: read /proc/sys/fs/nr_open for RLIMIT_NOFILE limit")]
+
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+---
+ testcases/kernel/syscalls/setrlimit/setrlimit03.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit03.c b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
+index 29b52aa..12455fe 100644
+--- a/testcases/kernel/syscalls/setrlimit/setrlimit03.c
++++ b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
+@@ -35,7 +35,10 @@
+ # define NR_OPEN (1024*1024)
+ #endif
+
++#define NR_OPEN_PATH "/proc/sys/fs/nr_open"
++
+ static struct rlimit rlim1, rlim2;
++static unsigned int nr_open = NR_OPEN;
+
+ static struct tcase {
+ struct rlimit *rlimt;
+@@ -51,7 +54,10 @@ static void verify_setrlimit(unsigned int n)
+
+ TEST(setrlimit(RLIMIT_NOFILE, tc->rlimt));
+ if (TST_RET != -1) {
+- tst_res(TFAIL, "call succeeded unexpectedly");
++ tst_res(TFAIL, "call succeeded unexpectedly "
++ "(nr_open=%u rlim_cur=%lu rlim_max=%lu)", nr_open,
++ (unsigned long)(tc->rlimt->rlim_cur),
++ (unsigned long)(tc->rlimt->rlim_max));
+ return;
+ }
+
+@@ -65,10 +71,13 @@ static void verify_setrlimit(unsigned int n)
+
+ static void setup(void)
+ {
++ if (!access(NR_OPEN_PATH, F_OK))
++ SAFE_FILE_SCANF(NR_OPEN_PATH, "%u", &nr_open);
++
+ SAFE_GETRLIMIT(RLIMIT_NOFILE, &rlim1);
+ rlim2.rlim_max = rlim1.rlim_cur;
+ rlim2.rlim_cur = rlim1.rlim_max + 1;
+- rlim1.rlim_max = NR_OPEN + 1;
++ rlim1.rlim_max = nr_open + 1;
+ }
+
+ static struct tst_test test = {
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20190115.bb b/meta/recipes-extended/ltp/ltp_20190115.bb
index ddf97e2..1d0c00b 100644
--- a/meta/recipes-extended/ltp/ltp_20190115.bb
+++ b/meta/recipes-extended/ltp/ltp_20190115.bb
@@ -49,6 +49,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://define-sigrtmin-and-sigrtmax-for-musl.patch \
file://setregid01-security-string-formatting.patch \
+ file://0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch \
"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 12/43] python3: add another multilib fix
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (10 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 11/43] ltp: Fix setrlimit03 call succeeded unexpectedly Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 13/43] busybox: fix ptest failure about 'dc' Armin Kuster
` (30 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ig.py-fix-another-place-where-lib-is-hard.patch | 31 ++++++++++++++++++++++
meta/recipes-devtools/python/python3_3.7.2.bb | 1 +
2 files changed, 32 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
new file mode 100644
index 0000000..b975836
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch
@@ -0,0 +1,31 @@
+From a21f4f8fa5e5c0601898740b4ac08ec84f41e190 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 18 Apr 2019 17:11:06 +0200
+Subject: [PATCH] Lib/sysconfig.py: fix another place where 'lib' is hardcoded
+ as the library path
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ Lib/sysconfig.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index d15cec8..87fa5e6 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -20,10 +20,10 @@ __all__ = [
+
+ _INSTALL_SCHEMES = {
+ 'posix_prefix': {
+- 'stdlib': '{installed_base}/lib/python{py_version_short}',
+- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
+- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
++ 'stdlib': '{LIBDEST}',
++ 'platstdlib': '{LIBDEST}',
++ 'purelib': '{LIBDEST}/site-packages',
++ 'platlib': '{LIBDEST}/site-packages',
+ 'include':
+ '{installed_base}/include/python{py_version_short}{abiflags}',
+ 'platinclude':
diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb b/meta/recipes-devtools/python/python3_3.7.2.bb
index 6464aaf..a1d7ace 100644
--- a/meta/recipes-devtools/python/python3_3.7.2.bb
+++ b/meta/recipes-devtools/python/python3_3.7.2.bb
@@ -22,6 +22,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
file://ptesthack.patch \
+ file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
"
SRC_URI_append_class-native = " \
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 13/43] busybox: fix ptest failure about 'dc'
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (11 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 12/43] python3: add another multilib fix Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 14/43] base-files: move hostname operations out of issue file settings Armin Kuster
` (29 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Fix the following two failure of busybox ptest:
FAIL: dc read
FAIL: dc read string
These two test cases relies on the functionalities enabled by
CONFIG_FEATURE_DC_BIG.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ix-two-test-case-to-also-depend-on-DC_BIG.patch | 39 ++++++++++++++++++++++
meta/recipes-core/busybox/busybox_1.30.1.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644 meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch
diff --git a/meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch b/meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch
new file mode 100644
index 0000000..d22db4a
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch
@@ -0,0 +1,39 @@
+From a4e03fbb4d82f91069d96005405f89c45b8fd157 Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Wed, 17 Apr 2019 09:24:37 +0800
+Subject: [PATCH] dc.tests: fix two test case to also depend on DC_BIG
+
+Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2019-April/087205.html]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ testsuite/dc.tests | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testsuite/dc.tests b/testsuite/dc.tests
+index 1708a48..8c3af41 100755
+--- a/testsuite/dc.tests
++++ b/testsuite/dc.tests
+@@ -41,6 +41,9 @@ testing "dc complex without spaces (multiple args)" \
+ "16\n" \
+ "" ""
+
++optional FEATURE_DC_BIG
++# All tests below depend on FEATURE_DC_BIG
++
+ testing "dc read" \
+ "dc -finput" \
+ "2\n9\n1\n" \
+@@ -51,9 +54,6 @@ testing "dc read string" \
+ "2\nstr\n1\n" \
+ "1?2\nf" "[str]\n"
+
+-optional FEATURE_DC_BIG
+-# All tests below depend on FEATURE_DC_BIG
+-
+ testing "dc '>a' (conditional execute string) 1" \
+ "dc" \
+ "1\n9\n" \
+--
+2.7.4
+
diff --git a/meta/recipes-core/busybox/busybox_1.30.1.bb b/meta/recipes-core/busybox/busybox_1.30.1.bb
index 164f3ab..ba76755 100644
--- a/meta/recipes-core/busybox/busybox_1.30.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.30.1.bb
@@ -44,6 +44,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-testsuite-check-uudecode-before-using-it.patch \
file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \
file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \
+ file://0001-dc.tests-fix-two-test-case-to-also-depend-on-DC_BIG.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 14/43] base-files: move hostname operations out of issue file settings
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (12 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 13/43] busybox: fix ptest failure about 'dc' Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 15/43] resulttool: Load results from URL Armin Kuster
` (28 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
The function do_install_basefilesissue is meant to deal with
/etc/issue* files and the following setting could actually be
overridden.
BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"
So move the hostname operations out of this function.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
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 a1639db..4b4027f 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
@@ -134,15 +134,16 @@ do_install () {
install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
ln -sf /proc/mounts ${D}${sysconfdir}/mtab
-}
-DISTRO_VERSION[vardepsexclude] += "DATE"
-do_install_basefilesissue () {
+ # deal with hostname
if [ "${hostname}" ]; then
echo ${hostname} > ${D}${sysconfdir}/hostname
echo "127.0.1.1 ${hostname}" >> ${D}${sysconfdir}/hosts
fi
+}
+DISTRO_VERSION[vardepsexclude] += "DATE"
+do_install_basefilesissue () {
install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir}
if [ -n "${DISTRO_NAME}" ]; then
printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 15/43] resulttool: Load results from URL
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (13 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 14/43] base-files: move hostname operations out of issue file settings Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 16/43] resulttool: Add log subcommand Armin Kuster
` (27 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Joshua Watt <jpewhacker@gmail.com>
Adds support for resulttool to load JSON files directly from a http://
or https:// URL
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
scripts/lib/resulttool/merge.py | 8 ++++----
scripts/lib/resulttool/regression.py | 4 ++--
scripts/lib/resulttool/report.py | 2 +-
scripts/lib/resulttool/resultutils.py | 23 +++++++++++++++++++----
scripts/lib/resulttool/store.py | 4 ++--
5 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/scripts/lib/resulttool/merge.py b/scripts/lib/resulttool/merge.py
index 3e4b7a3..7159463 100644
--- a/scripts/lib/resulttool/merge.py
+++ b/scripts/lib/resulttool/merge.py
@@ -17,7 +17,7 @@ import json
import resulttool.resultutils as resultutils
def merge(args, logger):
- if os.path.isdir(args.target_results):
+ if resultutils.is_url(args.target_results) or os.path.isdir(args.target_results):
results = resultutils.load_resultsdata(args.target_results, configmap=resultutils.store_map)
resultutils.append_resultsdata(results, args.base_results, configmap=resultutils.store_map)
resultutils.save_resultsdata(results, args.target_results)
@@ -31,12 +31,12 @@ def merge(args, logger):
def register_commands(subparsers):
"""Register subcommands from this plugin"""
- parser_build = subparsers.add_parser('merge', help='merge test result files/directories',
- description='merge the results from multiple files/directories into the target file or directory',
+ parser_build = subparsers.add_parser('merge', help='merge test result files/directories/URLs',
+ description='merge the results from multiple files/directories/URLs into the target file or directory',
group='setup')
parser_build.set_defaults(func=merge)
parser_build.add_argument('base_results',
- help='the results file/directory to import')
+ help='the results file/directory/URL to import')
parser_build.add_argument('target_results',
help='the target file or directory to merge the base_results with')
diff --git a/scripts/lib/resulttool/regression.py b/scripts/lib/resulttool/regression.py
index bdf531d..aecb9da 100644
--- a/scripts/lib/resulttool/regression.py
+++ b/scripts/lib/resulttool/regression.py
@@ -161,9 +161,9 @@ def register_commands(subparsers):
group='analysis')
parser_build.set_defaults(func=regression)
parser_build.add_argument('base_result',
- help='base result file/directory for the comparison')
+ help='base result file/directory/URL for the comparison')
parser_build.add_argument('target_result',
- help='target result file/directory to compare with')
+ help='target result file/directory/URL to compare with')
parser_build.add_argument('-b', '--base-result-id', default='',
help='(optional) filter the base results to this result ID')
parser_build.add_argument('-t', '--target-result-id', default='',
diff --git a/scripts/lib/resulttool/report.py b/scripts/lib/resulttool/report.py
index 9008620..8ae4272 100644
--- a/scripts/lib/resulttool/report.py
+++ b/scripts/lib/resulttool/report.py
@@ -143,7 +143,7 @@ def register_commands(subparsers):
group='analysis')
parser_build.set_defaults(func=report)
parser_build.add_argument('source_dir',
- help='source file/directory that contain the test result files to summarise')
+ help='source file/directory/URL that contain the test result files to summarise')
parser_build.add_argument('--branch', '-B', default='master', help="Branch to find commit in")
parser_build.add_argument('--commit', help="Revision to report")
parser_build.add_argument('-t', '--tag', default='',
diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py
index ad40ac8..aab312d 100644
--- a/scripts/lib/resulttool/resultutils.py
+++ b/scripts/lib/resulttool/resultutils.py
@@ -16,6 +16,8 @@ import os
import json
import scriptpath
import copy
+import urllib
+import posixpath
scriptpath.add_oe_lib_path()
flatten_map = {
@@ -40,20 +42,33 @@ store_map = {
"manual": ['TEST_TYPE', 'TEST_MODULE', 'MACHINE', 'IMAGE_BASENAME']
}
+def is_url(p):
+ """
+ Helper for determining if the given path is a URL
+ """
+ return p.startswith('http://') or p.startswith('https://')
+
#
# Load the json file and append the results data into the provided results dict
#
def append_resultsdata(results, f, configmap=store_map):
if type(f) is str:
- with open(f, "r") as filedata:
- data = json.load(filedata)
+ if is_url(f):
+ with urllib.request.urlopen(f) as response:
+ data = json.loads(response.read().decode('utf-8'))
+ url = urllib.parse.urlparse(f)
+ testseries = posixpath.basename(posixpath.dirname(url.path))
+ else:
+ with open(f, "r") as filedata:
+ data = json.load(filedata)
+ testseries = os.path.basename(os.path.dirname(f))
else:
data = f
for res in data:
if "configuration" not in data[res] or "result" not in data[res]:
raise ValueError("Test results data without configuration or result section?")
if "TESTSERIES" not in data[res]["configuration"]:
- data[res]["configuration"]["TESTSERIES"] = os.path.basename(os.path.dirname(f))
+ data[res]["configuration"]["TESTSERIES"] = testseries
testtype = data[res]["configuration"].get("TEST_TYPE")
if testtype not in configmap:
raise ValueError("Unknown test type %s" % testtype)
@@ -69,7 +84,7 @@ def append_resultsdata(results, f, configmap=store_map):
#
def load_resultsdata(source, configmap=store_map):
results = {}
- if os.path.isfile(source):
+ if is_url(source) or os.path.isfile(source):
append_resultsdata(results, source, configmap)
return results
for root, dirs, files in os.walk(source):
diff --git a/scripts/lib/resulttool/store.py b/scripts/lib/resulttool/store.py
index e4a0807..acdfbd9 100644
--- a/scripts/lib/resulttool/store.py
+++ b/scripts/lib/resulttool/store.py
@@ -29,7 +29,7 @@ def store(args, logger):
try:
results = {}
logger.info('Reading files from %s' % args.source)
- if os.path.isfile(args.source):
+ if resultutils.is_url(args.source) or os.path.isfile(args.source):
resultutils.append_resultsdata(results, args.source)
else:
for root, dirs, files in os.walk(args.source):
@@ -92,7 +92,7 @@ def register_commands(subparsers):
group='setup')
parser_build.set_defaults(func=store)
parser_build.add_argument('source',
- help='source file or directory that contain the test result files to be stored')
+ help='source file/directory/URL that contain the test result files to be stored')
parser_build.add_argument('git_dir',
help='the location of the git repository to store the results in')
parser_build.add_argument('-a', '--all', action='store_true',
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 16/43] resulttool: Add log subcommand
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (14 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 15/43] resulttool: Load results from URL Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 17/43] buildhistory: call a dependency parser only on actual dependency lists Armin Kuster
` (26 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Joshua Watt <jpewhacker@gmail.com>
Adds a subcommand for dumping various logs from test results
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
scripts/lib/resulttool/log.py | 56 ++++++++++++++++++++++++++++++++++++
scripts/lib/resulttool/regression.py | 2 +-
scripts/resulttool | 2 ++
3 files changed, 59 insertions(+), 1 deletion(-)
create mode 100644 scripts/lib/resulttool/log.py
diff --git a/scripts/lib/resulttool/log.py b/scripts/lib/resulttool/log.py
new file mode 100644
index 0000000..5584f2d
--- /dev/null
+++ b/scripts/lib/resulttool/log.py
@@ -0,0 +1,56 @@
+# resulttool - Show logs
+#
+# Copyright (c) 2019 Garmin International
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope 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.
+#
+import resulttool.resultutils as resultutils
+
+def show_ptest(result, ptest, logger):
+ if 'ptestresult.sections' in result:
+ if ptest in result['ptestresult.sections'] and 'log' in result['ptestresult.sections'][ptest]:
+ print(result['ptestresult.sections'][ptest]['log'])
+ return 0
+
+ print("ptest '%s' not found" % ptest)
+ return 1
+
+def log(args, logger):
+ results = resultutils.load_resultsdata(args.source)
+ for path in results:
+ for res in results[path]:
+ if 'result' not in results[path][res]:
+ continue
+ r = results[path][res]['result']
+
+ if args.raw:
+ if 'ptestresult.rawlogs' in r:
+ print(r['ptestresult.rawlogs']['log'])
+ else:
+ print('Raw logs not found')
+ return 1
+
+ for ptest in args.ptest:
+ if not show_ptest(r, ptest, logger):
+ return 1
+
+def register_commands(subparsers):
+ """Register subcommands from this plugin"""
+ parser = subparsers.add_parser('log', help='show logs',
+ description='show the logs from test results',
+ group='analysis')
+ parser.set_defaults(func=log)
+ parser.add_argument('source',
+ help='the results file/directory/URL to import')
+ parser.add_argument('--ptest', action='append', default=[],
+ help='show logs for a ptest')
+ parser.add_argument('--raw', action='store_true',
+ help='show raw logs')
+
diff --git a/scripts/lib/resulttool/regression.py b/scripts/lib/resulttool/regression.py
index aecb9da..fa90ab1 100644
--- a/scripts/lib/resulttool/regression.py
+++ b/scripts/lib/resulttool/regression.py
@@ -64,7 +64,7 @@ def regression_common(args, logger, base_results, target_results):
if a in target_results:
base = list(base_results[a].keys())
target = list(target_results[a].keys())
- # We may have multiple base/targets which are for different configurations. Start by
+ # We may have multiple base/targets which are for different configurations. Start by
# removing any pairs which match
for c in base.copy():
for b in target.copy():
diff --git a/scripts/resulttool b/scripts/resulttool
index 18ac101..9477667 100755
--- a/scripts/resulttool
+++ b/scripts/resulttool
@@ -49,6 +49,7 @@ import resulttool.store
import resulttool.regression
import resulttool.report
import resulttool.manualexecution
+import resulttool.log
logger = scriptutils.logger_create('resulttool')
def main():
@@ -66,6 +67,7 @@ def main():
subparsers.add_subparser_group('analysis', 'analysis', 100)
resulttool.regression.register_commands(subparsers)
resulttool.report.register_commands(subparsers)
+ resulttool.log.register_commands(subparsers)
args = parser.parse_args()
if args.debug:
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 17/43] buildhistory: call a dependency parser only on actual dependency lists
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (15 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 16/43] resulttool: Add log subcommand Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 18/43] icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH Armin Kuster
` (25 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Previously it was also called on filelists and possibly other items which
broke the parser.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/lib/oe/buildhistory_analysis.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
index ad7fceb..d3cde4f 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -127,7 +127,7 @@ class ChangeRecord:
removed = list(set(aitems) - set(bitems))
added = list(set(bitems) - set(aitems))
- if not removed and not added:
+ if not removed and not added and self.fieldname in ['RPROVIDES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RREPLACES', 'RCONFLICTS']:
depvera = bb.utils.explode_dep_versions2(self.oldvalue, sort=False)
depverb = bb.utils.explode_dep_versions2(self.newvalue, sort=False)
for i, j in zip(depvera.items(), depverb.items()):
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 18/43] icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (16 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 17/43] buildhistory: call a dependency parser only on actual dependency lists Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 19/43] resultool/resultutils: Fix module import error Armin Kuster
` (24 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* since this change:
commit d2fcaeb153fdc3f8d7143ea823139f1537055ff1
Author: Douglas Royds <douglas.royds@taitradio.com>
Date: Thu Dec 20 11:59:47 2018 +1300
icecc: Don't generate recipe-sysroot symlinks at recipe-parsing time
the set_icecc_env function depends on KERNEL_CC variable even for recipes
like linux-libc-headers
* KERNEL_CC variable depends on STAGING_KERNEL_DIR:
Variable KERNEL_CC value is ${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH}
List of dependencies for variable KERNEL_CC is {'STAGING_KERNEL_DIR', 'HOST_PREFIX', 'DEBUG_PREFIX_MAP', 'HOST_CC_KERNEL_ARCH', 'KERNEL_SRC_PATH'}
which depends on MACHINE:
Variable STAGING_KERNEL_DIR value is ${TMPDIR}/work-shared/${MACHINE}/kernel-source
List of dependencies for variable STAGING_KERNEL_DIR is {'MACHINE'}
* as detected with:
openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc --machines="qemux86 qemux86copy qemuarm" --targets=glibc --analyze
ERROR: linux-libc-headers different signature for task do_configure.sigdata between qemux86 and qemux86copy
NOTE: Starting bitbake server...
basehash changed from 3146f4ffeb002bd69fed7656a4b896365b2e2a00071c69e1afbb672889e754ee to f1a5160e39912e61389b6f9fe68d61146a2be91716ac37e4a32ecf4c09b2b5fa
Variable MACHINE value changed from 'qemux86' to 'qemux86copy'
$ bitbake-diffsigs /OE/build/oe-core/tmp-glibc/sstate-diff/1556122458/qemux86*/*/linux-libc-headers/*do_configure.sigdata*
NOTE: Starting bitbake server...
basehash changed from f1a5160e39912e61389b6f9fe68d61146a2be91716ac37e4a32ecf4c09b2b5fa to 3146f4ffeb002bd69fed7656a4b896365b2e2a00071c69e1afbb672889e754ee
Variable MACHINE value changed from 'qemux86copy' to 'qemux86'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[commit in warrior]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/classes/icecc.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 6d003dc..edb0e10 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -312,6 +312,7 @@ def set_icecc_env():
# dummy python version of set_icecc_env
return
+set_icecc_env[vardepsexclude] += "KERNEL_CC"
set_icecc_env() {
if [ "${@use_icecc(bb, d)}" = "no" ]
then
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 19/43] resultool/resultutils: Fix module import error
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (17 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 18/43] icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 20/43] cryptodev: fix module loading error Armin Kuster
` (23 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix AttributeError: module 'urllib' has no attribute 'request' when
using remote http urls.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
scripts/lib/resulttool/resultutils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py
index aab312d..8d17c7c 100644
--- a/scripts/lib/resulttool/resultutils.py
+++ b/scripts/lib/resulttool/resultutils.py
@@ -16,7 +16,7 @@ import os
import json
import scriptpath
import copy
-import urllib
+import urllib.request
import posixpath
scriptpath.add_oe_lib_path()
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 20/43] cryptodev: fix module loading error
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (18 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 19/43] resultool/resultutils: Fix module import error Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 21/43] oeqa/core/runner: dump stdout and stderr of each test case Armin Kuster
` (22 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Backport patch from upstream to fix module cryptodev loading error.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/cryptodev/cryptodev.inc | 4 +-
...01-Fix-module-loading-with-Linux-v5.0-rc5.patch | 59 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index 252d39d..9d8ba44 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -3,7 +3,9 @@ HOMEPAGE = "http://cryptodev-linux.org/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux"
+SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
+ file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \
+ "
SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
new file mode 100644
index 0000000..34ec872
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
@@ -0,0 +1,59 @@
+Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c]
+
+Backport patch from upstream to fix module cryptodev loading error.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001
+From: "Derald D. Woods" <woods.technical@gmail.com>
+Date: Sun, 10 Feb 2019 13:22:19 -0600
+Subject: [PATCH] Fix module loading with Linux v5.0-rc5
+
+This commit fixes this module load error:
+[...]
+[ 29.112091] cryptodev: loading out-of-tree module taints kernel.
+[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
+[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2)
+modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter
+[...]
+
+Upstream Linux support for unused GIVCIPHER, and others, was dropped here:
+
+c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators)
+
+Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
+---
+ cryptlib.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/cryptlib.c b/cryptlib.c
+index 6e66698..4a87037 100644
+--- a/cryptlib.c
++++ b/cryptlib.c
+@@ -38,7 +38,9 @@
+ #include "cryptodev_int.h"
+ #include "cipherapi.h"
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
+ extern const struct crypto_type crypto_givcipher_type;
++#endif
+
+ static void cryptodev_complete(struct crypto_async_request *req, int err)
+ {
+@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name,
+
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0))
+ tfm = crypto_skcipher_tfm(out->async.s);
+- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) ||
+- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) {
++ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0))
++ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type)
++#endif
++ ) {
+ struct ablkcipher_alg *alg;
+
+ alg = &tfm->__crt_alg->cra_ablkcipher;
+--
+2.20.0
+
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 21/43] oeqa/core/runner: dump stdout and stderr of each test case
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (19 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 20/43] cryptodev: fix module loading error Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 22/43] core-image-rt: make sure that we append to DEPENDS Armin Kuster
` (21 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: "Mardegan, Alberto" <AMardegan@luxoft.com>
Some CI pipelines might perform further processing of the test output
(for instance, to plot some metrics into a chart). However, Since `thud`
we switched away from the XML-based jUnit reporting, and at the same
time we lost the ability of collecting the stdout and stderr of the
various tests.
We now restore this functionality by adding `stdout` and `stderr` keys
to the JSON reports. This behavior is off by default; in order to enable
it, one must set the `TESTREPORT_FULLLOGS` variable in the bitbake
configuration.
Signed-off-by: Alberto Mardegan <amardegan@luxoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/classes/testimage.bbclass | 3 ++-
meta/lib/oeqa/core/runner.py | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index ff1c53b..9bb5a5c 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -316,7 +316,8 @@ def testimage_main(d):
configuration = get_testimage_configuration(d, 'runtime', machine)
results.logDetails(get_testimage_json_result_dir(d),
configuration,
- get_testimage_result_id(configuration))
+ get_testimage_result_id(configuration),
+ dump_streams=d.getVar('TESTREPORT_FULLLOGS'))
results.logSummary(pn)
if not results.wasSuccessful():
bb.fatal('%s - FAILED - check the task log and the ssh log' % pn, forcelog=True)
diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py
index df88b85..478b7b6 100644
--- a/meta/lib/oeqa/core/runner.py
+++ b/meta/lib/oeqa/core/runner.py
@@ -7,6 +7,7 @@ import unittest
import logging
import re
import json
+import sys
from unittest import TextTestResult as _TestResult
from unittest import TextTestRunner as _TestRunner
@@ -45,6 +46,9 @@ class OETestResult(_TestResult):
self.tc = tc
+ # stdout and stderr for each test case
+ self.logged_output = {}
+
def startTest(self, test):
# May have been set by concurrencytest
if test.id() not in self.starttime:
@@ -53,6 +57,9 @@ class OETestResult(_TestResult):
def stopTest(self, test):
self.endtime[test.id()] = time.time()
+ if self.buffer:
+ self.logged_output[test.id()] = (
+ sys.stdout.getvalue(), sys.stderr.getvalue())
super(OETestResult, self).stopTest(test)
if test.id() in self.progressinfo:
self.tc.logger.info(self.progressinfo[test.id()])
@@ -118,7 +125,8 @@ class OETestResult(_TestResult):
self.successes.append((test, None))
super(OETestResult, self).addSuccess(test)
- def logDetails(self, json_file_dir=None, configuration=None, result_id=None):
+ def logDetails(self, json_file_dir=None, configuration=None, result_id=None,
+ dump_streams=False):
self.tc.logger.info("RESULTS:")
result = {}
@@ -144,10 +152,14 @@ class OETestResult(_TestResult):
if status not in logs:
logs[status] = []
logs[status].append("RESULTS - %s - Testcase %s: %s%s" % (case.id(), oeid, status, t))
+ report = {'status': status}
if log:
- result[case.id()] = {'status': status, 'log': log}
- else:
- result[case.id()] = {'status': status}
+ report['log'] = log
+ if dump_streams and case.id() in self.logged_output:
+ (stdout, stderr) = self.logged_output[case.id()]
+ report['stdout'] = stdout
+ report['stderr'] = stderr
+ result[case.id()] = report
for i in ['PASSED', 'SKIPPED', 'EXPECTEDFAIL', 'ERROR', 'FAILED', 'UNKNOWN']:
if i not in logs:
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 22/43] core-image-rt: make sure that we append to DEPENDS
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (20 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 21/43] oeqa/core/runner: dump stdout and stderr of each test case Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:26 ` [PATCH 23/43] core-image-rt-sdk: " Armin Kuster
` (20 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Naveen Saini <naveen.kumar.saini@intel.com>
This also fix postinst intercept hook 'update_gio_module_cache' failed warnings
that are now flagged as errors after the recent chagnes at lib/oe/package_manager.py
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-rt/images/core-image-rt.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb
index 9cb93b3..053d232 100644
--- a/meta/recipes-rt/images/core-image-rt.bb
+++ b/meta/recipes-rt/images/core-image-rt.bb
@@ -10,7 +10,7 @@ python () {
DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
real-time test suite and tools appropriate for real-time use."
-DEPENDS = "linux-yocto-rt"
+DEPENDS += "linux-yocto-rt"
IMAGE_INSTALL += "rt-tests hwlatdetect"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 23/43] core-image-rt-sdk: make sure that we append to DEPENDS
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (21 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 22/43] core-image-rt: make sure that we append to DEPENDS Armin Kuster
@ 2019-05-04 15:26 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 24/43] resulttool/manualexecution: Enable test case configuration option Armin Kuster
` (19 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:26 UTC (permalink / raw)
To: openembedded-core
From: Naveen Saini <naveen.kumar.saini@intel.com>
This also fix postinst intercept hook 'update_gio_module_cache' failed warnings
that are now flagged as errors after the recent chagnes at lib/oe/package_manager.py
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-rt/images/core-image-rt-sdk.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb
index 0f7f091..624b7d9 100644
--- a/meta/recipes-rt/images/core-image-rt-sdk.bb
+++ b/meta/recipes-rt/images/core-image-rt-sdk.bb
@@ -11,7 +11,7 @@ python () {
DESCRIPTION = "Small image capable of booting a device with a test suite and \
tools for real-time use. It includes the full meta-toolchain, development \
headers and libraries to form a standalone SDK."
-DEPENDS = "linux-yocto-rt"
+DEPENDS += "linux-yocto-rt"
IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 24/43] resulttool/manualexecution: Enable test case configuration option
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (22 preceding siblings ...)
2019-05-04 15:26 ` [PATCH 23/43] core-image-rt-sdk: " Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 25/43] glibc: always use bfd linker Armin Kuster
` (18 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: sangeeta jain <sangeeta.jain@intel.com>
Current manualexecution required user to exceute all test cases defined inside a "modulename.json" file in oeqa/manual
There are cases when all test cases all not required to run for a module on specific DUT.
Enable manualexecution to have the optional feature where it will use pre-defined json format test case configuration file
where user will be able to select test cases from the "modulename.json" instead of running all of them. This will help
in reducing testing time and reporting unneccesary skip or failures.
Example pre-defined json format test case configuration file (for build-applince):
{
"testcases" : [
"build-appliance.build-appliance.Create_core-image-sato-sdk_using_build_appliance",
"build-appliance.build-appliance.Build_a_image_without_error_(added_recipe)"
]
}
Signed-off-by: sangeeta jain <sangeeta.jain@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
scripts/lib/resulttool/manualexecution.py | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/resulttool/manualexecution.py b/scripts/lib/resulttool/manualexecution.py
index ea44219..dc368f3 100755
--- a/scripts/lib/resulttool/manualexecution.py
+++ b/scripts/lib/resulttool/manualexecution.py
@@ -17,6 +17,7 @@ import os
import sys
import datetime
import re
+import copy
from oeqa.core.runner import OETestResultJSONHelper
@@ -123,7 +124,7 @@ class ManualTestRunner(object):
def _get_write_dir(self):
return os.environ['BUILDDIR'] + '/tmp/log/manual/'
- def run_test(self, case_file, config_options_file):
+ def run_test(self, case_file, config_options_file, testcase_config_file):
test_module = self._get_test_module(case_file)
cases = load_json_file(case_file)
config_options = {}
@@ -132,6 +133,13 @@ class ManualTestRunner(object):
configurations = self._get_config(config_options, test_module)
result_id = 'manual_%s_%s' % (test_module, configurations['STARTTIME'])
test_results = {}
+ if testcase_config_file:
+ test_case_config = load_json_file(testcase_config_file)
+ test_case_to_execute = test_case_config['testcases']
+ for case in copy.deepcopy(cases) :
+ if case['test']['@alias'] not in test_case_to_execute:
+ cases.remove(case)
+
print('\nTotal number of test cases in this test suite: %s\n' % len(cases))
for c in cases:
test_result = self._execute_test_steps(c)
@@ -184,7 +192,7 @@ def manualexecution(args, logger):
if args.make_config_options_file:
testrunner.make_config_option_file(logger, args.file, args.config_options_file)
return 0
- configurations, result_id, write_dir, test_results = testrunner.run_test(args.file, args.config_options_file)
+ configurations, result_id, write_dir, test_results = testrunner.run_test(args.file, args.config_options_file, args.testcase_config_file)
resultjsonhelper = OETestResultJSONHelper()
resultjsonhelper.dump_testresult_file(write_dir, configurations, result_id, test_results)
return 0
@@ -200,3 +208,5 @@ def register_commands(subparsers):
help='the config options file to import and used as available configuration option selection or make config option file')
parser_build.add_argument('-m', '--make-config-options-file', action='store_true',
help='make the configuration options file based on provided inputs')
+ parser_build.add_argument('-t', '--testcase-config-file', default='',
+ help='the testcase configuration file to enable user to run a selected set of test case')
\ No newline at end of file
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 25/43] glibc: always use bfd linker
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (23 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 24/43] resulttool/manualexecution: Enable test case configuration option Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 26/43] kernel-module-split.bbclass: support CONFIG_MODULE_COMPRESS=y Armin Kuster
` (17 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* Work around broken ld-2.29.so when gold is used
causing qemu-arm to segfault during e.g. gobject-introspection
or postinst at do_rootfs time, more details in:
http://lists.openembedded.org/pipermail/openembedded-devel/2019-March/198937.html
https://sourceware.org/bugzilla/show_bug.cgi?id=24148
https://sourceware.org/bugzilla/show_bug.cgi?id=10937
https://sourceware.org/bugzilla/show_bug.cgi?id=18103
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-core/glibc/glibc_2.29.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc_2.29.bb b/meta/recipes-core/glibc/glibc_2.29.bb
index 9184c59..073d153 100644
--- a/meta/recipes-core/glibc/glibc_2.29.bb
+++ b/meta/recipes-core/glibc/glibc_2.29.bb
@@ -110,7 +110,7 @@ do_configure () {
do_compile () {
# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
- unset LDFLAGS
+ LDFLAGS="-fuse-ld=bfd"
base_do_compile
echo "Adjust ldd script"
if [ -n "${RTLDLIST}" ]
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 26/43] kernel-module-split.bbclass: support CONFIG_MODULE_COMPRESS=y
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (24 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 25/43] glibc: always use bfd linker Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 27/43] utils/multiprocess_launch: Improve failing subprocess output Armin Kuster
` (16 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Jens Rehsack <sno@netbsd.org>
In case, kernel config enables compressed modules, support of
splitting via split_kernel_module_packages won't find any module.
So, first expand module pattern regex to recognize compressed
modules and then objcopy on temporary extacted to extract module
information.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/classes/kernel-module-split.bbclass | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index e8d3eb5..221022b 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -44,9 +44,23 @@ python split_kernel_module_packages () {
def extract_modinfo(file):
import tempfile, subprocess
tempfile.tempdir = d.getVar("WORKDIR")
+ compressed = re.match( r'.*\.([xg])z$', file)
tf = tempfile.mkstemp()
tmpfile = tf[1]
- cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile)
+ if compressed:
+ tmpkofile = tmpfile + ".ko"
+ if compressed.group(1) == 'g':
+ cmd = "gunzip -dc %s > %s" % (file, tmpkofile)
+ subprocess.check_call(cmd, shell=True)
+ elif compressed.group(1) == 'x':
+ cmd = "xz -dc %s > %s" % (file, tmpkofile)
+ subprocess.check_call(cmd, shell=True)
+ else:
+ msg = "Cannot decompress '%s'" % file
+ raise msg
+ cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", tmpkofile, tmpfile)
+ else:
+ cmd = "%sobjcopy -j .modinfo -O binary %s %s" % (d.getVar("HOST_PREFIX") or "", file, tmpfile)
subprocess.check_call(cmd, shell=True)
# errors='replace': Some old kernel versions contain invalid utf-8 characters in mod descriptions (like 0xf6, 'ö')
f = open(tmpfile, errors='replace')
@@ -54,6 +68,8 @@ python split_kernel_module_packages () {
f.close()
os.close(tf[0])
os.unlink(tmpfile)
+ if compressed:
+ os.unlink(tmpkofile)
vals = {}
for i in l:
m = modinfoexp.match(i)
@@ -133,7 +149,7 @@ python split_kernel_module_packages () {
kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME") or "kernel"
kernel_version = d.getVar("KERNEL_VERSION")
- module_regex = r'^(.*)\.k?o$'
+ module_regex = r'^(.*)\.k?o(?:\.[xg]z)?$'
module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX')
module_pattern_suffix = d.getVar('KERNEL_MODULE_PACKAGE_SUFFIX')
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 27/43] utils/multiprocess_launch: Improve failing subprocess output
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (25 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 26/43] kernel-module-split.bbclass: support CONFIG_MODULE_COMPRESS=y Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 28/43] Adding back wrapper and using OEPYTHON3HOME variable for python3 Armin Kuster
` (15 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Output before this patch:
ERROR: bash-4.4.18-r0 do_package_write_ipk: Fatal errors occurred in subprocesses:
Command 'PATH="X" opkg-build -Z xz -a "--memlimit=50% --threads=88" Foobar /media/build1/poky/build/nodistro-glibc/work/core2-64-oe-linux/bash/4.4.18-r0/deploy-ipks/core2-64' returned non-zero exit status 1.: Traceback (most recent call last):
File "/media/build1/poky/meta/lib/oe/utils.py", line 272, in run
ret = self._target(*self._args, **self._kwargs)
File "/media/build1/poky/meta/classes/package_ipk.bbclass", line 230, in ipk_write_pkg
shell=True)
File "/usr/lib/python3.6/subprocess.py", line 336, in check_output
**kwargs).stdout
File "/usr/lib/python3.6/subprocess.py", line 418, in run
output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command 'PATH="X" opkg-build -Z xz -a "--memlimit=50% --threads=88" Foobar /media/build1/poky/build/nodistro-glibc/work/core2-64-oe-linux/bash/4.4.18-r0/deploy-ipks/core2-64' returned non-zero exit status 1.
Note how stdout/stderr from the failing command isn't shown.
After this patch:
ERROR: bash-4.4.18-r0 do_package_write_ipk: Fatal errors occurred in subprocesses:
Command 'PATH="X" opkg-build -Z xz -a "--memlimit=50% --threads=88" Foobar /media/build1/poky/build/nodistro-glibc/work/core2-64-oe-linux/bash/4.4.18-r0/deploy-ipks/core2-64' returned non-zero exit status 1.
Subprocess output:Foobar
*** Error: Package name Foobar contains illegal characters, (other than [a-z0-9.+-])
opkg-build: Please fix the above errors and try again.
We suddenly get a much more usable error message. The traceback is supressed
as its distracting from the real problem in this case.
Ideally python itself would handle this but it doesn't so we have to
wrap the exception. We already do this in bitbake itself for the same reason.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/lib/oe/utils.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index a4fd79c..5925181 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -324,7 +324,12 @@ def multiprocess_launch(target, items, d, extraargs=None):
if errors:
msg = ""
for (e, tb) in errors:
- msg = msg + str(e) + ": " + str(tb) + "\n"
+ if isinstance(e, subprocess.CalledProcessError) and e.output:
+ msg = msg + str(e) + "\n"
+ msg = msg + "Subprocess output:"
+ msg = msg + e.output.decode("utf-8", errors="ignore")
+ else:
+ msg = msg + str(e) + ": " + str(tb) + "\n"
bb.fatal("Fatal errors occurred in subprocesses:\n%s" % msg)
return results
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 28/43] Adding back wrapper and using OEPYTHON3HOME variable for python3
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (26 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 27/43] utils/multiprocess_launch: Improve failing subprocess output Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 29/43] linux-yocto-rt/4.19: fix merge conflict in lru_drain Armin Kuster
` (14 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Jaewon Lee <jaewon.lee@xilinx.com>
Adding back the python wrapper and adding a patch to use OEPYTHON3HOME
instead of PYTHONHOME if set, for python3.
If we add back the wrapper as is, we would see the following error that
we also see in Thud:
ImportError: No module named site
OpenEmbedded requires 'python' to be python v2 (>= 2.7.3), not python
v3.
Please upgrade your python v2
This is because python3 would've set PYTHONHOME to use nativesdk
python3 libraries but when the oe-buildenv-internal script tries to call
python2 for the py_v27_check, there will be no python2 libraries in the
PYTHONHOME directory.
In other words, bitbake needs host python2 and the env variable set from
the wrapper contaminates the env and host python2 won't be able to find
its libraries
Creating another variable OEPYTHON3HOME and using this in the python3
wrapper to allow for a way to set a different paths for python3 and
python2
[YOCTO #13208]
Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...EPYTHON3HOME-is-set-use-instead-of-PYTHON.patch | 47 ++++++++++++++++++++++
meta/recipes-devtools/python/python3_3.7.2.bb | 7 ++++
2 files changed, 54 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
diff --git a/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch b/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
new file mode 100644
index 0000000..06eb2bd
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
@@ -0,0 +1,47 @@
+From ffe7797637f08cd6ee4c82e2d67462c5e194d30a Mon Sep 17 00:00:00 2001
+From: Jaewon Lee <jaewon.lee@xilinx.com>
+Date: Thu, 25 Apr 2019 15:34:26 -0700
+Subject: [PATCH] main.c: if OEPYTHON3HOME is set use instead of PYTHONHOME
+
+There is one variable PYTHONHOME to determine where libraries are coming
+from for both python2 and python3. This becomes an issue if only one has
+libraries in the specified PYTHONHOME path, but they are using the same
+PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way
+to set a different path for python3
+
+Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
+---
+ Modules/main.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/Modules/main.c b/Modules/main.c
+index a745381..b553e30 100644
+--- a/Modules/main.c
++++ b/Modules/main.c
+@@ -1855,10 +1855,19 @@ config_init_home(_PyCoreConfig *config)
+ }
+ return _Py_INIT_OK();
+ }
+-
+- int res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME");
+- if (res < 0) {
+- return DECODE_LOCALE_ERR("PYTHONHOME", res);
++ int res;
++ const char *oepython3home = config_get_env_var("OEPYTHON3HOME");
++ if (oepython3home) {
++ res = config_get_env_var_dup(&home, L"OEPYTHON3HOME", "OEPYTHON3HOME");
++ if (res < 0) {
++ return DECODE_LOCALE_ERR("OEPYTHON3HOME", res);
++ }
++ }
++ else {
++ res = config_get_env_var_dup(&home, L"PYTHONHOME", "PYTHONHOME");
++ if (res < 0) {
++ return DECODE_LOCALE_ERR("PYTHONHOME", res);
++ }
+ }
+ config->home = home;
+ return _Py_INIT_OK();
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb b/meta/recipes-devtools/python/python3_3.7.2.bb
index a1d7ace..579febc 100644
--- a/meta/recipes-devtools/python/python3_3.7.2.bb
+++ b/meta/recipes-devtools/python/python3_3.7.2.bb
@@ -29,6 +29,9 @@ SRC_URI_append_class-native = " \
file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \
file://12-distutils-prefix-is-inside-staging-area.patch \
"
+SRC_URI_append_class-nativesdk = " \
+ file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \
+ "
SRC_URI[md5sum] = "df6ec36011808205beda239c72f947cb"
SRC_URI[sha256sum] = "d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb"
@@ -132,6 +135,10 @@ do_install_append() {
${D}${libdir}/python-sysconfigdata/_sysconfigdata.py
}
+do_install_append_class-nativesdk () {
+ create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} OEPYTHON3HOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1'
+}
+
SSTATE_SCAN_FILES += "Makefile _sysconfigdata.py"
PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 29/43] linux-yocto-rt/4.19: fix merge conflict in lru_drain
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (27 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 28/43] Adding back wrapper and using OEPYTHON3HOME variable for python3 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 30/43] linux-yocto/5.0: port RAID configuration tweaks from master Armin Kuster
` (13 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Paul Gortmaker sent along the following fixup for 4.19-rt:
[
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon Apr 15 12:01:31 2019 -0400
Revert "mm: handle lru_add_drain_all for UP properly"
This reverts commit e6e9d6e290028b0a6b83b563fad9fafa7f1d515e.
It was a 4.19.31 backport of commit 6ea183d60c46 ("mm: handle
lru_add_drain_all for UP properly"). In summary, what that did
was to fix a possible harmless WARN_ON on non-SMP, introduced at
commit 4d43d395fed1 ("workqueue: Try to catch flush_work() without
INIT_WORK().") by adding non-SMP variants of lru functions.
The combination of that, with the -rt commit 473f14a9f234 ("mm:
perform lru_add_drain_all() remotely") at the merge of the two
results in the following build failure:
mm/swap.c:736:2: error: #endif without #if
since the -rt change wants RT specific lru and the stable backport
wants non-SMP specific lru, and a chunk of the backport with
an #ifdef CONFIG_SMP is missing.
However, before we add a four way cluster of ifdeffery to handle all
cases, we note 4d43d395fed1 was added to the v5.1 release, and it
was not (currently) backported to any 4.19.x stable release - so it is
unclear to me why this commit was ever backported to 4.19.31 at all.
Further, we note this change was to mm/swap.c -- and by definition,
any preempt-rt deployment that uses swap for anything other than a
failure contingency mitigation is broken by design.
Given all that, I decided that the best path forward was to revert
the two of the three chunks of the backport that remain in the -rt
branch, and return us to the pre-4.19.31 merge behaviour for -rt.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index cdba9d2..834b8fc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -11,7 +11,7 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "b0ea9ef736c8ab8695bdfba61cd121ce5aa47e49"
+SRCREV_machine ?= "c279a81f1e654023c4cc78afa9f14350ee5f836f"
SRCREV_meta ?= "9bda6190bfc9e7858c2f7588109a0ec966f37a09"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 30/43] linux-yocto/5.0: port RAID configuration tweaks from master
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (28 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 29/43] linux-yocto-rt/4.19: fix merge conflict in lru_drain Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 31/43] linux-yocto/5.0: integrate TCP timeout / hang fix Armin Kuster
` (12 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Porting the following three RAID config changes from master to
the 5.0 branch:
ffd8cf5baf8 intel-x86: add Intel VMD support
8edf951a15c cfg/efi.cfg: built-in CONFIG_EFIVAR_FS to support Intel VROC
041a6c04244 intel-x86: built-in nvme driver to support boot from nvme disk
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index 842aa5b..07fa910 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a"
-SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6"
+SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index eba6cc6..c1084f2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9"
SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6"
+SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index fe773be..01269dd 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87"
SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6"
+SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
# remap qemuarm to qemuarma15 for the 5.0 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 31/43] linux-yocto/5.0: integrate TCP timeout / hang fix
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (29 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 30/43] linux-yocto/5.0: port RAID configuration tweaks from master Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 32/43] linux-yocto_5.0: set devicetree for armv5 Armin Kuster
` (11 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the following fix:
[
tcp: fix issues relaed to implement coalescing on backlog queue
As was discussed on -netdev, there's an issue with TCP timeouts and
hangs due to new features introduced in the 5.0 kernel:
https://www.spinics.net/lists/netdev/msg562928.html
This is a temporary commit to widely test the proposed solution. It
will be dropped when an official patch makes mainline.
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index 07fa910..ef3f0a0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a"
-SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
+SRCREV_machine ?= "a3309af7ab77156bd8d731df3a97126d3d897916"
+SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index c1084f2..206e6c3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9"
-SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
+SRCREV_machine_qemuarm ?= "d905ae925fc4a60d63f45e1922163da683d8a3bc"
+SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
+SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index 01269dd..f34cc7b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base"
KBRANCH_qemux86-64 ?= "v5.0/standard/base"
KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "ed9d11e2c8ebbfe056420cb89c2e5d02836496ce"
-SRCREV_machine_qemuarm64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_machine_qemumips ?= "40a729c3b0683d0875f8d6ad7353e6e429c7afc2"
-SRCREV_machine_qemuppc ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87"
-SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
-SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
+SRCREV_machine_qemuarm ?= "17c4b7e9db4d17aa713c85d0c3d2d84af962864a"
+SRCREV_machine_qemuarm64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
+SRCREV_machine_qemumips ?= "e5c23fb31438dab373a50afc40f6e4ab0c568485"
+SRCREV_machine_qemuppc ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
+SRCREV_machine_qemux86 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
+SRCREV_machine_qemux86-64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
+SRCREV_machine_qemumips64 ?= "743d799797ad6828472087e1da8c67fdab87bf75"
+SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
+SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3"
# remap qemuarm to qemuarma15 for the 5.0 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 32/43] linux-yocto_5.0: set devicetree for armv5
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (30 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 31/43] linux-yocto/5.0: integrate TCP timeout / hang fix Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 33/43] gnome-doc-utils: Remove stale patch Armin Kuster
` (10 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index f34cc7b..4ccf907 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -39,6 +39,7 @@ KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 33/43] gnome-doc-utils: Remove stale patch
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (31 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 32/43] linux-yocto_5.0: set devicetree for armv5 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 16:04 ` Adrian Bunk
2019-05-04 15:27 ` [PATCH 34/43] python3: Drop ptest hack Armin Kuster
` (9 subsequent siblings)
42 siblings, 1 reply; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Adrian Bunk <bunk@stusta.de>
The recipe was removed 3 years ago.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...t.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch | 40 ----------------------
1 file changed, 40 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
deleted file mode 100644
index 4cfcabd..0000000
--- a/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 426e38468463a4abb495cf6a269b9635b2107519 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Tue, 17 May 2016 13:51:24 +0300
-Subject: [PATCH] glib-gettext.m4: Update AM_GLIB_GNU_GETTEXT to match glib
-
-This avoids
- error: m4_copy: won't overwrite defined macro: glib_DEFUN
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Inappropriate [No upstream]
----
- m4/glib-gettext.m4 | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4
-index 81f8fd2..e2b142b 100644
---- a/m4/glib-gettext.m4
-+++ b/m4/glib-gettext.m4
-@@ -310,7 +310,7 @@ msgstr ""
- # on various variables needed by the Makefile.in.in installed by
- # glib-gettextize.
- dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-+AU_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
-@@ -381,7 +381,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
-+ ]
-+ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
-
- # AX_GLIB_DEFINE_LOCALEDIR(VARIABLE)
- # -------------------------------
---
-2.1.4
-
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 34/43] python3: Drop ptest hack
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (32 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 33/43] gnome-doc-utils: Remove stale patch Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 35/43] gcc: fix CVE-2018-18484 Armin Kuster
` (8 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
With the kernel TCP backlog queue coalescing bug fixed in the 5.0 kernels
we don't need this patch anymore and can run the tests.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../python/python3/ptesthack.patch | 60 ----------------------
meta/recipes-devtools/python/python3_3.7.2.bb | 1 -
2 files changed, 61 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/ptesthack.patch
diff --git a/meta/recipes-devtools/python/python3/ptesthack.patch b/meta/recipes-devtools/python/python3/ptesthack.patch
deleted file mode 100644
index 8cfa92f..0000000
--- a/meta/recipes-devtools/python/python3/ptesthack.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-This test hangs under 5.0 kernels onwards. It appears to be caused by the commit in the kernel:
-
-commit 4f693b55c3d2d2239b8a0094b518a1e533cf75d5 (HEAD, refs/bisect/bad)
-Author: Eric Dumazet <edumazet@google.com>
-Date: Tue Nov 27 14:42:03 2018 -0800
-
- tcp: implement coalescing on backlog queue
-
- In case GRO is not as efficient as it should be or disabled,
- we might have a user thread trapped in __release_sock() while
- softirq handler flood packets up to the point we have to drop.
-
- This patch balances work done from user thread and softirq,
- to give more chances to __release_sock() to complete its work
- before new packets are added the the backlog.
-
- This also helps if we receive many ACK packets, since GRO
- does not aggregate them.
-
- This patch brings ~60% throughput increase on a receiver
- without GRO, but the spectacular gain is really on
- 1000x release_sock() latency reduction I have measured.
-
- Signed-off-by: Eric Dumazet <edumazet@google.com>
- Cc: Neal Cardwell <ncardwell@google.com>
- Cc: Yuchung Cheng <ycheng@google.com>
- Acked-by: Neal Cardwell <ncardwell@google.com>
- Signed-off-by: David S. Miller <davem@davemloft.net>
-
-
-Reported to upstream kernel for advice: https://lore.kernel.org/netdev/85aabf9d4f41b6c57629e736993233f80a037e59.camel@linuxfoundation.org/T/#u
-
-Disable the test for now to stop ptests hanging
-
-Upstream-Status: Inappropriate [real cause of issue still TBD]
-
-Index: Python-3.7.2/Lib/test/test_httplib.py
-===================================================================
---- Python-3.7.2.orig/Lib/test/test_httplib.py
-+++ Python-3.7.2/Lib/test/test_httplib.py
-@@ -1114,6 +1114,7 @@ class BasicTest(TestCase):
- self.assertEqual(sock.file.read(), extradata) #we read to the end
- resp.close()
-
-+ @unittest.skip("broken on newer kernels")
- def test_response_fileno(self):
- # Make sure fd returned by fileno is valid.
- serv = socket.socket(
-Index: Python-3.7.2/Lib/test/test_ssl.py
-===================================================================
---- Python-3.7.2.orig/Lib/test/test_ssl.py
-+++ Python-3.7.2/Lib/test/test_ssl.py
-@@ -4146,6 +4146,7 @@ class ThreadedTests(unittest.TestCase):
- self.assertEqual(sess_stat['accept'], 4)
- self.assertEqual(sess_stat['hits'], 2)
-
-+ @unittest.skip("broken on newer kernels")
- def test_session_handling(self):
- client_context, server_context, hostname = testing_context()
- client_context2, _, _ = testing_context()
diff --git a/meta/recipes-devtools/python/python3_3.7.2.bb b/meta/recipes-devtools/python/python3_3.7.2.bb
index 579febc..7ef7cb5 100644
--- a/meta/recipes-devtools/python/python3_3.7.2.bb
+++ b/meta/recipes-devtools/python/python3_3.7.2.bb
@@ -21,7 +21,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \
file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \
file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
- file://ptesthack.patch \
file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 35/43] gcc: fix CVE-2018-18484
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (33 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 34/43] python3: Drop ptest hack Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 36/43] gdb: fix CVE-2017-9778 Armin Kuster
` (7 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-devtools/gcc/gcc-8.3.inc | 1 +
...sion-limit-to-libiberty-s-demangling-code.patch | 325 +++++++++++++++++++++
2 files changed, 326 insertions(+)
create mode 100644 meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch
diff --git a/meta/recipes-devtools/gcc/gcc-8.3.inc b/meta/recipes-devtools/gcc/gcc-8.3.inc
index f7bf257..a64f48a 100644
--- a/meta/recipes-devtools/gcc/gcc-8.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-8.3.inc
@@ -71,6 +71,7 @@ SRC_URI = "\
file://0038-Re-introduce-spe-commandline-options.patch \
file://0039-riscv-Disable-multilib-for-OE.patch \
file://0040-powerpc-powerpc64-Add-support-for-musl-ldso.patch \
+ file://0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch \
"
SRC_URI[md5sum] = "65b210b4bfe7e060051f799e0f994896"
SRC_URI[sha256sum] = "64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c"
diff --git a/meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch b/meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch
new file mode 100644
index 0000000..f3303b6
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-8.3/0041-Add-a-recursion-limit-to-libiberty-s-demangling-code.patch
@@ -0,0 +1,325 @@
+From e1744e11b1c2b36f91a8847b61bafb8c5e7407ae Mon Sep 17 00:00:00 2001
+From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 7 Dec 2018 10:33:30 +0000
+Subject: [PATCH] Add a recursion limit to libiberty's demangling code. The
+ limit is enabled by default, but can be disabled via a new demangling option.
+
+include * demangle.h (DMGL_NO_RECURSE_LIMIT): Define.
+ (DEMANGLE_RECURSION_LIMIT): Define
+
+ PR 87681
+ PR 87675
+ PR 87636
+ PR 87350
+ PR 87335
+libiberty * cp-demangle.h (struct d_info): Add recursion_level field.
+ * cp-demangle.c (d_function_type): Add recursion counter.
+ If the recursion limit is reached and the check is not disabled,
+ then return with a failure result.
+ (cplus_demangle_init_info): Initialise the recursion_level field.
+ (d_demangle_callback): If the recursion limit is enabled, check
+ for a mangled string that is so long that there is not enough
+ stack space for the local arrays.
+ * cplus-dem.c (struct work): Add recursion_level field.
+ (squangle_mop_up): Set the numb and numk fields to zero.
+ (work_stuff_copy_to_from): Handle the case where a btypevec or
+ ktypevec field is NULL.
+ (demangle_nested_args): Add recursion counter. If
+ the recursion limit is not disabled and reached, return with a
+ failure result.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266886 138bc75d-0d04-0410-961f-82ee72b054a4
+
+CVE: CVE-2018-18484
+Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/03e51746ed98d9106803f6009ebd71ea670ad3b9]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ include/ChangeLog | 5 +++++
+ include/demangle.h | 11 +++++++++++
+ libiberty/ChangeLog | 23 ++++++++++++++++++++++
+ libiberty/cp-demangle.c | 51 ++++++++++++++++++++++++++++++++++++++-----------
+ libiberty/cp-demangle.h | 3 +++
+ libiberty/cplus-dem.c | 37 +++++++++++++++++++++++++++++++++--
+ 6 files changed, 117 insertions(+), 13 deletions(-)
+
+diff --git a/include/ChangeLog b/include/ChangeLog
+index 02ab336..88b0648 100644
+--- a/include/ChangeLog
++++ b/include/ChangeLog
+@@ -2,6 +2,11 @@
+
+ * GCC 8.3.0 released.
+
++2018-12-07 Nick Clifton <nickc@redhat.com>
++
++ * demangle.h (DMGL_NO_RECURSE_LIMIT): Define.
++ (DEMANGLE_RECURSION_LIMIT): Define
++
+ 2018-07-26 Release Manager
+
+ * GCC 8.2.0 released.
+diff --git a/include/demangle.h b/include/demangle.h
+index b8d57cf..9bb8a19 100644
+--- a/include/demangle.h
++++ b/include/demangle.h
+@@ -68,6 +68,17 @@ extern "C" {
+ /* If none of these are set, use 'current_demangling_style' as the default. */
+ #define DMGL_STYLE_MASK (DMGL_AUTO|DMGL_GNU|DMGL_LUCID|DMGL_ARM|DMGL_HP|DMGL_EDG|DMGL_GNU_V3|DMGL_JAVA|DMGL_GNAT|DMGL_DLANG|DMGL_RUST)
+
++/* Disable a limit on the depth of recursion in mangled strings.
++ Note if this limit is disabled then stack exhaustion is possible when
++ demangling pathologically complicated strings. Bug reports about stack
++ exhaustion when the option is enabled will be rejected. */
++#define DMGL_NO_RECURSE_LIMIT (1 << 18)
++
++/* If DMGL_NO_RECURSE_LIMIT is not enabled, then this is the value used as
++ the maximum depth of recursion allowed. It should be enough for any
++ real-world mangled name. */
++#define DEMANGLE_RECURSION_LIMIT 1024
++
+ /* Enumeration of possible demangling styles.
+
+ Lucid and ARM styles are still kept logically distinct, even though
+diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
+index 1dd05da..2f77038 100644
+--- a/libiberty/ChangeLog
++++ b/libiberty/ChangeLog
+@@ -9,6 +9,29 @@
+ (simple_object_copy_lto_debug_sections): Create file in binary
+ mode.
+
++2018-12-07 Nick Clifton <nickc@redhat.com>
++
++ PR 87681
++ PR 87675
++ PR 87636
++ PR 87350
++ PR 87335
++ * cp-demangle.h (struct d_info): Add recursion_level field.
++ * cp-demangle.c (d_function_type): Add recursion counter.
++ If the recursion limit is reached and the check is not disabled,
++ then return with a failure result.
++ (cplus_demangle_init_info): Initialise the recursion_level field.
++ (d_demangle_callback): If the recursion limit is enabled, check
++ for a mangled string that is so long that there is not enough
++ stack space for the local arrays.
++ * cplus-dem.c (struct work): Add recursion_level field.
++ (squangle_mop_up): Set the numb and numk fields to zero.
++ (work_stuff_copy_to_from): Handle the case where a btypevec or
++ ktypevec field is NULL.
++ (demangle_nested_args): Add recursion counter. If
++ the recursion limit is not disabled and reached, return with a
++ failure result.
++
+ 2018-07-26 Release Manager
+
+ * GCC 8.2.0 released.
+diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
+index 3f2a097..c374e46 100644
+--- a/libiberty/cp-demangle.c
++++ b/libiberty/cp-demangle.c
+@@ -2843,21 +2843,35 @@ d_ref_qualifier (struct d_info *di, struct demangle_component *sub)
+ static struct demangle_component *
+ d_function_type (struct d_info *di)
+ {
+- struct demangle_component *ret;
++ struct demangle_component *ret = NULL;
+
+- if (! d_check_char (di, 'F'))
+- return NULL;
+- if (d_peek_char (di) == 'Y')
++ if ((di->options & DMGL_NO_RECURSE_LIMIT) == 0)
+ {
+- /* Function has C linkage. We don't print this information.
+- FIXME: We should print it in verbose mode. */
+- d_advance (di, 1);
++ if (di->recursion_level > DEMANGLE_RECURSION_LIMIT)
++ /* FIXME: There ought to be a way to report
++ that the recursion limit has been reached. */
++ return NULL;
++
++ di->recursion_level ++;
+ }
+- ret = d_bare_function_type (di, 1);
+- ret = d_ref_qualifier (di, ret);
+
+- if (! d_check_char (di, 'E'))
+- return NULL;
++ if (d_check_char (di, 'F'))
++ {
++ if (d_peek_char (di) == 'Y')
++ {
++ /* Function has C linkage. We don't print this information.
++ FIXME: We should print it in verbose mode. */
++ d_advance (di, 1);
++ }
++ ret = d_bare_function_type (di, 1);
++ ret = d_ref_qualifier (di, ret);
++
++ if (! d_check_char (di, 'E'))
++ ret = NULL;
++ }
++
++ if ((di->options & DMGL_NO_RECURSE_LIMIT) == 0)
++ di->recursion_level --;
+ return ret;
+ }
+
+@@ -6188,6 +6202,7 @@ cplus_demangle_init_info (const char *mangled, int options, size_t len,
+ di->expansion = 0;
+ di->is_expression = 0;
+ di->is_conversion = 0;
++ di->recursion_level = 0;
+ }
+
+ /* Internal implementation for the demangler. If MANGLED is a g++ v3 ABI
+@@ -6227,6 +6242,20 @@ d_demangle_callback (const char *mangled, int options,
+
+ cplus_demangle_init_info (mangled, options, strlen (mangled), &di);
+
++ /* PR 87675 - Check for a mangled string that is so long
++ that we do not have enough stack space to demangle it. */
++ if (((options & DMGL_NO_RECURSE_LIMIT) == 0)
++ /* This check is a bit arbitrary, since what we really want to do is to
++ compare the sizes of the di.comps and di.subs arrays against the
++ amount of stack space remaining. But there is no portable way to do
++ this, so instead we use the recursion limit as a guide to the maximum
++ size of the arrays. */
++ && (unsigned long) di.num_comps > DEMANGLE_RECURSION_LIMIT)
++ {
++ /* FIXME: We need a way to indicate that a stack limit has been reached. */
++ return 0;
++ }
++
+ {
+ #ifdef CP_DYNAMIC_ARRAYS
+ __extension__ struct demangle_component comps[di.num_comps];
+diff --git a/libiberty/cp-demangle.h b/libiberty/cp-demangle.h
+index 51b8a24..d87a830 100644
+--- a/libiberty/cp-demangle.h
++++ b/libiberty/cp-demangle.h
+@@ -122,6 +122,9 @@ struct d_info
+ /* Non-zero if we are parsing the type operand of a conversion
+ operator, but not when in an expression. */
+ int is_conversion;
++ /* If DMGL_NO_RECURSE_LIMIT is not active then this is set to
++ the current recursion level. */
++ unsigned int recursion_level;
+ };
+
+ /* To avoid running past the ending '\0', don't:
+diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
+index 6d58bd8..8b9646f 100644
+--- a/libiberty/cplus-dem.c
++++ b/libiberty/cplus-dem.c
+@@ -146,6 +146,7 @@ struct work_stuff
+ int *proctypevec; /* Indices of currently processed remembered typevecs. */
+ int proctypevec_size;
+ int nproctypes;
++ unsigned int recursion_level;
+ };
+
+ #define PRINT_ANSI_QUALIFIERS (work -> options & DMGL_ANSI)
+@@ -1292,12 +1293,14 @@ squangle_mop_up (struct work_stuff *work)
+ free ((char *) work -> btypevec);
+ work->btypevec = NULL;
+ work->bsize = 0;
++ work->numb = 0;
+ }
+ if (work -> ktypevec != NULL)
+ {
+ free ((char *) work -> ktypevec);
+ work->ktypevec = NULL;
+ work->ksize = 0;
++ work->numk = 0;
+ }
+ }
+
+@@ -1331,8 +1334,15 @@ work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from)
+
+ for (i = 0; i < from->numk; i++)
+ {
+- int len = strlen (from->ktypevec[i]) + 1;
++ int len;
++
++ if (from->ktypevec[i] == NULL)
++ {
++ to->ktypevec[i] = NULL;
++ continue;
++ }
+
++ len = strlen (from->ktypevec[i]) + 1;
+ to->ktypevec[i] = XNEWVEC (char, len);
+ memcpy (to->ktypevec[i], from->ktypevec[i], len);
+ }
+@@ -1342,8 +1352,15 @@ work_stuff_copy_to_from (struct work_stuff *to, struct work_stuff *from)
+
+ for (i = 0; i < from->numb; i++)
+ {
+- int len = strlen (from->btypevec[i]) + 1;
++ int len;
++
++ if (from->btypevec[i] == NULL)
++ {
++ to->btypevec[i] = NULL;
++ continue;
++ }
+
++ len = strlen (from->btypevec[i]) + 1;
+ to->btypevec[i] = XNEWVEC (char , len);
+ memcpy (to->btypevec[i], from->btypevec[i], len);
+ }
+@@ -1401,6 +1418,7 @@ delete_non_B_K_work_stuff (struct work_stuff *work)
+
+ free ((char*) work->tmpl_argvec);
+ work->tmpl_argvec = NULL;
++ work->ntmpl_args = 0;
+ }
+ if (work->previous_argument)
+ {
+@@ -4477,6 +4495,7 @@ remember_Btype (struct work_stuff *work, const char *start,
+ }
+
+ /* Lose all the info related to B and K type codes. */
++
+ static void
+ forget_B_and_K_types (struct work_stuff *work)
+ {
+@@ -4502,6 +4521,7 @@ forget_B_and_K_types (struct work_stuff *work)
+ }
+ }
+ }
++
+ /* Forget the remembered types, but not the type vector itself. */
+
+ static void
+@@ -4696,6 +4716,16 @@ demangle_nested_args (struct work_stuff *work, const char **mangled,
+ int result;
+ int saved_nrepeats;
+
++ if ((work->options & DMGL_NO_RECURSE_LIMIT) == 0)
++ {
++ if (work->recursion_level > DEMANGLE_RECURSION_LIMIT)
++ /* FIXME: There ought to be a way to report
++ that the recursion limit has been reached. */
++ return 0;
++
++ work->recursion_level ++;
++ }
++
+ /* The G++ name-mangling algorithm does not remember types on nested
+ argument lists, unless -fsquangling is used, and in that case the
+ type vector updated by remember_type is not used. So, we turn
+@@ -4722,6 +4752,9 @@ demangle_nested_args (struct work_stuff *work, const char **mangled,
+ --work->forgetting_types;
+ work->nrepeats = saved_nrepeats;
+
++ if ((work->options & DMGL_NO_RECURSE_LIMIT) == 0)
++ --work->recursion_level;
++
+ return result;
+ }
+
+--
+2.7.4
+
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 36/43] gdb: fix CVE-2017-9778
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (34 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 35/43] gcc: fix CVE-2018-18484 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 37/43] binutils: fix CVE-2019-9074 CVE-2019-9075 CVE-2019-9076 CVE-2019-9077 Armin Kuster
` (6 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-devtools/gdb/gdb-8.2.1.inc | 1 +
meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch | 99 +++++++++++++++++++++++
2 files changed, 100 insertions(+)
create mode 100644 meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch
diff --git a/meta/recipes-devtools/gdb/gdb-8.2.1.inc b/meta/recipes-devtools/gdb/gdb-8.2.1.inc
index 1fc1ec0..cb8d189 100644
--- a/meta/recipes-devtools/gdb/gdb-8.2.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-8.2.1.inc
@@ -17,6 +17,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
file://0011-Fix-invalid-sigprocmask-call.patch \
file://gdbserver-ctrl-c-handling.patch \
file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \
+ file://CVE-2017-9778.patch \
"
SRC_URI[md5sum] = "f8b2562e830a4098dd5b5ea9e9296c70"
SRC_URI[sha256sum] = "0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202"
diff --git a/meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch b/meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch
new file mode 100644
index 0000000..935f266
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/CVE-2017-9778.patch
@@ -0,0 +1,99 @@
+From a608b79f30ab3f670095e14ba3d3b5b24a19fe68 Mon Sep 17 00:00:00 2001
+From: Sandra Loosemore <sandra@codesourcery.com>
+Date: Thu, 25 Apr 2019 07:27:02 -0700
+Subject: [PATCH] Detect invalid length field in debug frame FDE header.
+
+GDB was failing to catch cases where a corrupt ELF or core file
+contained an invalid length value in a Dwarf debug frame FDE header.
+It was checking for buffer overflow but not cases where the length was
+negative or caused pointer wrap-around.
+
+In addition to the additional validity check, this patch cleans up the
+multiple signed/unsigned conversions on the length field so that an
+unsigned representation is used consistently throughout.
+
+This patch fixes CVE-2017-9778 and PR gdb/21600.
+
+2019-04-25 Sandra Loosemore <sandra@codesourcery.com>
+ Kang Li <kanglictf@gmail.com>
+
+ PR gdb/21600
+
+ * dwarf2-frame.c (read_initial_length): Be consistent about using
+ unsigned representation of length.
+ (decode_frame_entry_1): Likewise. Check for wraparound of
+ end pointer as well as buffer overflow.
+
+Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=723adb650a31859d7cc45832cb8adca0206455ed]
+CVE: CVE-2017-9778
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ gdb/ChangeLog | 11 +++++++++++
+ gdb/dwarf2-frame.c | 14 +++++++-------
+ 2 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/gdb/ChangeLog b/gdb/ChangeLog
+index 3711dc7..0a9720b 100644
+--- a/gdb/ChangeLog
++++ b/gdb/ChangeLog
+@@ -1,3 +1,14 @@
++2019-04-25 Sandra Loosemore <sandra@codesourcery.com>
++ Kang Li <kanglictf@gmail.com>
++
++ PR gdb/21600
++
++ * dwarf2-frame.c (read_initial_length): Be consistent about using
++ unsigned representation of length.
++ (decode_frame_entry_1): Likewise. Check for wraparound of
++ end pointer as well as buffer overflow.
++
++
+ 2018-12-23 Joel Brobecker <brobecker@adacore.com>
+
+ * version.in: Set GDB version number to 8.2.1.
+diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
+index 91e16cf..a7b99fd 100644
+--- a/gdb/dwarf2-frame.c
++++ b/gdb/dwarf2-frame.c
+@@ -1477,7 +1477,7 @@ static ULONGEST
+ read_initial_length (bfd *abfd, const gdb_byte *buf,
+ unsigned int *bytes_read_ptr)
+ {
+- LONGEST result;
++ ULONGEST result;
+
+ result = bfd_get_32 (abfd, buf);
+ if (result == 0xffffffff)
+@@ -1780,7 +1780,7 @@ decode_frame_entry_1 (struct comp_unit *unit, const gdb_byte *start,
+ {
+ struct gdbarch *gdbarch = get_objfile_arch (unit->objfile);
+ const gdb_byte *buf, *end;
+- LONGEST length;
++ ULONGEST length;
+ unsigned int bytes_read;
+ int dwarf64_p;
+ ULONGEST cie_id;
+@@ -1791,15 +1791,15 @@ decode_frame_entry_1 (struct comp_unit *unit, const gdb_byte *start,
+ buf = start;
+ length = read_initial_length (unit->abfd, buf, &bytes_read);
+ buf += bytes_read;
+- end = buf + length;
+-
+- /* Are we still within the section? */
+- if (end > unit->dwarf_frame_buffer + unit->dwarf_frame_size)
+- return NULL;
++ end = buf + (size_t) length;
+
+ if (length == 0)
+ return end;
+
++ /* Are we still within the section? */
++ if (end <= buf || end > unit->dwarf_frame_buffer + unit->dwarf_frame_size)
++ return NULL;
++
+ /* Distinguish between 32 and 64-bit encoded frame info. */
+ dwarf64_p = (bytes_read == 12);
+
+--
+2.7.4
+
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 37/43] binutils: fix CVE-2019-9074 CVE-2019-9075 CVE-2019-9076 CVE-2019-9077
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (35 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 36/43] gdb: fix CVE-2017-9778 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 38/43] openssh: fix CVE-2018-20685, CVE-2019-6109, CVE-2019-6111 Armin Kuster
` (5 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-devtools/binutils/binutils-2.32.inc | 4 +
.../binutils/binutils/CVE-2019-9074.patch | 68 ++++++++++++
.../binutils/binutils/CVE-2019-9075.patch | 119 +++++++++++++++++++++
.../binutils/binutils/CVE-2019-9076.patch | 49 +++++++++
.../binutils/binutils/CVE-2019-9077.patch | 37 +++++++
5 files changed, 277 insertions(+)
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc b/meta/recipes-devtools/binutils/binutils-2.32.inc
index 5d0c16b..49e6827 100644
--- a/meta/recipes-devtools/binutils/binutils-2.32.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
@@ -44,6 +44,10 @@ SRC_URI = "\
file://0013-Detect-64-bit-MIPS-targets.patch \
file://0014-sync-with-OE-libtool-changes.patch \
file://0015-binutils-enable-x86_64-pep-for-producing-EFI-binarie.patch \
+ file://CVE-2019-9074.patch \
+ file://CVE-2019-9075.patch \
+ file://CVE-2019-9076.patch \
+ file://CVE-2019-9077.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
new file mode 100644
index 0000000..a11a512
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-9074.patch
@@ -0,0 +1,68 @@
+From e2ebb3906432dcca2727186ad79415f920730fb2 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Tue, 19 Feb 2019 22:48:44 +1030
+Subject: [PATCH] PR24235, Read memory violation in pei-x86_64.c
+
+ PR 24235
+ * pei-x86_64.c (pex64_bfd_print_pdata_section): Correct checks
+ attempting to prevent read past end of section.
+
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/179f2db0d9c397d7dd8a59907b84208b79f7f48c]
+CVE: CVE-2019-9074
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ bfd/ChangeLog | 6 ++++++
+ bfd/pei-x86_64.c | 9 ++++-----
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index dd2c741..cbf30de 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,9 @@
++2019-02-19 Alan Modra <amodra@gmail.com>
++
++ PR 24235
++ * pei-x86_64.c (pex64_bfd_print_pdata_section): Correct checks
++ attempting to prevent read past end of section.
++
+ 2019-02-04 Nick Clifton <nickc@redhat.com>
+
+ * development.sh (experimental) Set to false.
+diff --git a/bfd/pei-x86_64.c b/bfd/pei-x86_64.c
+index ff1093c..7e75104 100644
+--- a/bfd/pei-x86_64.c
++++ b/bfd/pei-x86_64.c
+@@ -541,7 +541,7 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section)
+ /* virt_size might be zero for objects. */
+ if (stop == 0 && strcmp (abfd->xvec->name, "pe-x86-64") == 0)
+ {
+- stop = (datasize / onaline) * onaline;
++ stop = datasize;
+ virt_size_is_zero = TRUE;
+ }
+ else if (datasize < stop)
+@@ -551,8 +551,8 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section)
+ _("Warning: %s section size (%ld) is smaller than virtual size (%ld)\n"),
+ pdata_section->name, (unsigned long) datasize,
+ (unsigned long) stop);
+- /* Be sure not to read passed datasize. */
+- stop = datasize / onaline;
++ /* Be sure not to read past datasize. */
++ stop = datasize;
+ }
+
+ /* Display functions table. */
+@@ -724,8 +724,7 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section)
+ altent += imagebase;
+
+ if (altent >= pdata_vma
+- && (altent + PDATA_ROW_SIZE <= pdata_vma
+- + pei_section_data (abfd, pdata_section)->virt_size))
++ && altent - pdata_vma + PDATA_ROW_SIZE <= stop)
+ {
+ pex64_get_runtime_function
+ (abfd, &arf, &pdata[altent - pdata_vma]);
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
new file mode 100644
index 0000000..bcb1310
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-9075.patch
@@ -0,0 +1,119 @@
+From 8abac8031ed369a2734b1cdb7df28a39a54b4b49 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Wed, 20 Feb 2019 08:21:24 +1030
+Subject: [PATCH] PR24236, Heap buffer overflow in
+ _bfd_archive_64_bit_slurp_armap
+
+ PR 24236
+ * archive64.c (_bfd_archive_64_bit_slurp_armap): Move code adding
+ sentinel NUL to string buffer nearer to loop where it is used.
+ Don't go past sentinel when scanning strings, and don't write
+ NUL again.
+ * archive.c (do_slurp_coff_armap): Simplify string handling to
+ archive64.c style.
+
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/8abac8031ed369a2734b1cdb7df28a39a54b4b49]
+CVE: CVE-2019-9075
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ bfd/ChangeLog | 10 ++++++++++
+ bfd/archive.c | 17 +++++++----------
+ bfd/archive64.c | 10 +++++-----
+ 3 files changed, 22 insertions(+), 15 deletions(-)
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 72c87c7..e39bb12 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,13 @@
++2019-02-20 Alan Modra <amodra@gmail.com>
++
++ PR 24236
++ * archive64.c (_bfd_archive_64_bit_slurp_armap): Move code adding
++ sentinel NUL to string buffer nearer to loop where it is used.
++ Don't go past sentinel when scanning strings, and don't write
++ NUL again.
++ * archive.c (do_slurp_coff_armap): Simplify string handling to
++ archive64.c style.
++
+ 2019-02-19 Alan Modra <amodra@gmail.com>
+
+ PR 24235
+diff --git a/bfd/archive.c b/bfd/archive.c
+index d2d9b72..68a92a3 100644
+--- a/bfd/archive.c
++++ b/bfd/archive.c
+@@ -1012,6 +1012,7 @@ do_slurp_coff_armap (bfd *abfd)
+ int *raw_armap, *rawptr;
+ struct artdata *ardata = bfd_ardata (abfd);
+ char *stringbase;
++ char *stringend;
+ bfd_size_type stringsize;
+ bfd_size_type parsed_size;
+ carsym *carsyms;
+@@ -1071,22 +1072,18 @@ do_slurp_coff_armap (bfd *abfd)
+ }
+
+ /* OK, build the carsyms. */
+- for (i = 0; i < nsymz && stringsize > 0; i++)
++ stringend = stringbase + stringsize;
++ *stringend = 0;
++ for (i = 0; i < nsymz; i++)
+ {
+- bfd_size_type len;
+-
+ rawptr = raw_armap + i;
+ carsyms->file_offset = swap ((bfd_byte *) rawptr);
+ carsyms->name = stringbase;
+- /* PR 17512: file: 4a1d50c1. */
+- len = strnlen (stringbase, stringsize);
+- if (len < stringsize)
+- len ++;
+- stringbase += len;
+- stringsize -= len;
++ stringbase += strlen (stringbase);
++ if (stringbase != stringend)
++ ++stringbase;
+ carsyms++;
+ }
+- *stringbase = 0;
+
+ ardata->symdef_count = nsymz;
+ ardata->first_file_filepos = bfd_tell (abfd);
+diff --git a/bfd/archive64.c b/bfd/archive64.c
+index 312bf82..42f6ed9 100644
+--- a/bfd/archive64.c
++++ b/bfd/archive64.c
+@@ -100,8 +100,6 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
+ return FALSE;
+ carsyms = ardata->symdefs;
+ stringbase = ((char *) ardata->symdefs) + carsym_size;
+- stringbase[stringsize] = 0;
+- stringend = stringbase + stringsize;
+
+ raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize);
+ if (raw_armap == NULL)
+@@ -115,15 +113,17 @@ _bfd_archive_64_bit_slurp_armap (bfd *abfd)
+ goto release_raw_armap;
+ }
+
++ stringend = stringbase + stringsize;
++ *stringend = 0;
+ for (i = 0; i < nsymz; i++)
+ {
+ carsyms->file_offset = bfd_getb64 (raw_armap + i * 8);
+ carsyms->name = stringbase;
+- if (stringbase < stringend)
+- stringbase += strlen (stringbase) + 1;
++ stringbase += strlen (stringbase);
++ if (stringbase != stringend)
++ ++stringbase;
+ ++carsyms;
+ }
+- *stringbase = '\0';
+
+ ardata->symdef_count = nsymz;
+ ardata->first_file_filepos = bfd_tell (abfd);
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
new file mode 100644
index 0000000..ec8cde2
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-9076.patch
@@ -0,0 +1,49 @@
+From 9f841c583880eb6d0194455c1583a766f853e628 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Wed, 20 Feb 2019 12:06:31 +1030
+Subject: [PATCH] PR24233, Out of memory
+
+ PR 24233
+ * objdump.c (dump_bfd_private_header): Print warning if
+ bfd_print_private_bfd_data returns false.
+
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/7d272a55caebfc26ab2e15d1e9439bac978b9bb7]
+CVE: CVE-2019-9076
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ binutils/ChangeLog | 6 ++++++
+ binutils/objdump.c | 4 +++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/binutils/ChangeLog b/binutils/ChangeLog
+index f837c37..d5dd7cb 100644
+--- a/binutils/ChangeLog
++++ b/binutils/ChangeLog
+@@ -1,3 +1,9 @@
++2019-02-20 Alan Modra <amodra@gmail.com>
++
++ PR 24233
++ * objdump.c (dump_bfd_private_header): Print warning if
++ bfd_print_private_bfd_data returns false.
++
+ 2019-02-02 Nick Clifton <nickc@redhat.com>
+
+ * configure: Regenerate.
+diff --git a/binutils/objdump.c b/binutils/objdump.c
+index 8725390..7d0c6a4 100644
+--- a/binutils/objdump.c
++++ b/binutils/objdump.c
+@@ -3178,7 +3178,9 @@ dump_bfd_header (bfd *abfd)
+ static void
+ dump_bfd_private_header (bfd *abfd)
+ {
+- bfd_print_private_bfd_data (abfd, stdout);
++ if (!bfd_print_private_bfd_data (abfd, stdout))
++ non_fatal (_("warning: private headers incomplete: %s"),
++ bfd_errmsg (bfd_get_error ()));
+ }
+
+ static void
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch b/meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
new file mode 100644
index 0000000..11ecb71
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2019-9077.patch
@@ -0,0 +1,37 @@
+From f7bbc8890de45df6eda0ddef5dd04f835f54eecf Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Wed, 20 Feb 2019 17:03:47 +0000
+Subject: [PATCH] Fix a illegal memory access fault when parsing a corrupt MIPS
+ option section using readelf.
+
+ PR 24243
+ * readelf.c (process_mips_specific): Check for an options section
+ that is too small to even contain a single option.
+
+Upstream-Status: Backport [https://github.com/bminor/binutils-gdb/commit/7fc0c668f2aceb8582d74db1ad2528e2bba8a921]
+CVE: CVE-2019-9077
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ binutils/readelf.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/binutils/readelf.c b/binutils/readelf.c
+index 9df3742..18ab806 100644
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -16179,6 +16179,12 @@ process_mips_specific (Filedata * filedata)
+ error (_("No MIPS_OPTIONS header found\n"));
+ return FALSE;
+ }
++ /* PR 24243 */
++ if (sect->sh_size < sizeof (* eopt))
++ {
++ error (_("The MIPS options section is too small.\n"));
++ return FALSE;
++ }
+
+ eopt = (Elf_External_Options *) get_data (NULL, filedata, options_offset, 1,
+ sect->sh_size, _("options"));
+--
+2.7.4
+
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 38/43] openssh: fix CVE-2018-20685, CVE-2019-6109, CVE-2019-6111
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (36 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 37/43] binutils: fix CVE-2019-9074 CVE-2019-9075 CVE-2019-9076 CVE-2019-9077 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 39/43] dropbear: set CVE_PRODUCT Armin Kuster
` (4 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Anuj Mittal <anuj.mittal@intel.com>
Also backport a patch to fix issues introduced by fix for CVE-2019-6109.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
...ve-progressmeter-force-an-update-at-the-b.patch | 121 +++++++++
.../openssh/openssh/CVE-2018-20685.patch | 40 +++
.../openssh/openssh/CVE-2019-6109.patch | 275 +++++++++++++++++++++
.../openssh/openssh/CVE-2019-6111.patch | 187 ++++++++++++++
meta/recipes-connectivity/openssh/openssh_7.9p1.bb | 4 +
5 files changed, 627 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2019-6109.patch
create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
new file mode 100644
index 0000000..2fb57da
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
@@ -0,0 +1,121 @@
+From 5df934e2279e8ed1f07b990f4b2b3baf6470f7e5 Mon Sep 17 00:00:00 2001
+From: "dtucker@openbsd.org" <dtucker@openbsd.org>
+Date: Thu, 24 Jan 2019 16:52:17 +0000
+Subject: [PATCH] upstream: Have progressmeter force an update at the beginning
+ and
+
+end of each transfer. Fixes the problem recently introduces where very quick
+transfers do not display the progressmeter at all. Spotted by naddy@
+
+OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a
+Ustream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ progressmeter.c | 13 +++++--------
+ progressmeter.h | 4 ++--
+ scp.c | 2 +-
+ sftp-client.c | 2 +-
+ 4 files changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/progressmeter.c b/progressmeter.c
+index add462d..e385c12 100644
+--- a/progressmeter.c
++++ b/progressmeter.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */
++/* $OpenBSD: progressmeter.c,v 1.47 2019/01/24 16:52:17 dtucker Exp $ */
+ /*
+ * Copyright (c) 2003 Nils Nordman. All rights reserved.
+ *
+@@ -59,9 +59,6 @@ static void format_rate(char *, int, off_t);
+ static void sig_winch(int);
+ static void setscreensize(void);
+
+-/* updates the progressmeter to reflect the current state of the transfer */
+-void refresh_progress_meter(void);
+-
+ /* signal handler for updating the progress meter */
+ static void sig_alarm(int);
+
+@@ -120,7 +117,7 @@ format_size(char *buf, int size, off_t bytes)
+ }
+
+ void
+-refresh_progress_meter(void)
++refresh_progress_meter(int force_update)
+ {
+ char buf[MAX_WINSIZE + 1];
+ off_t transferred;
+@@ -131,7 +128,7 @@ refresh_progress_meter(void)
+ int hours, minutes, seconds;
+ int file_len;
+
+- if ((!alarm_fired && !win_resized) || !can_output())
++ if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+ return;
+ alarm_fired = 0;
+
+@@ -254,7 +251,7 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
+ bytes_per_second = 0;
+
+ setscreensize();
+- refresh_progress_meter();
++ refresh_progress_meter(1);
+
+ signal(SIGALRM, sig_alarm);
+ signal(SIGWINCH, sig_winch);
+@@ -271,7 +268,7 @@ stop_progress_meter(void)
+
+ /* Ensure we complete the progress */
+ if (cur_pos != end_pos)
+- refresh_progress_meter();
++ refresh_progress_meter(1);
+
+ atomicio(vwrite, STDOUT_FILENO, "\n", 1);
+ }
+diff --git a/progressmeter.h b/progressmeter.h
+index 8f66780..1703ea7 100644
+--- a/progressmeter.h
++++ b/progressmeter.h
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */
++/* $OpenBSD: progressmeter.h,v 1.5 2019/01/24 16:52:17 dtucker Exp $ */
+ /*
+ * Copyright (c) 2002 Nils Nordman. All rights reserved.
+ *
+@@ -24,5 +24,5 @@
+ */
+
+ void start_progress_meter(const char *, off_t, off_t *);
+-void refresh_progress_meter(void);
++void refresh_progress_meter(int);
+ void stop_progress_meter(void);
+diff --git a/scp.c b/scp.c
+index 4a342a6..0587cec 100644
+--- a/scp.c
++++ b/scp.c
+@@ -585,7 +585,7 @@ scpio(void *_cnt, size_t s)
+ off_t *cnt = (off_t *)_cnt;
+
+ *cnt += s;
+- refresh_progress_meter();
++ refresh_progress_meter(0);
+ if (limit_kbps > 0)
+ bandwidth_limit(&bwlimit, s);
+ return 0;
+diff --git a/sftp-client.c b/sftp-client.c
+index 2bc698f..cf2887a 100644
+--- a/sftp-client.c
++++ b/sftp-client.c
+@@ -101,7 +101,7 @@ sftpio(void *_bwlimit, size_t amount)
+ {
+ struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
+
+- refresh_progress_meter();
++ refresh_progress_meter(0);
+ if (bwlimit != NULL)
+ bandwidth_limit(bwlimit, amount);
+ return 0;
+--
+2.7.4
+
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
new file mode 100644
index 0000000..e2fc607
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
@@ -0,0 +1,40 @@
+From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Fri, 16 Nov 2018 03:03:10 +0000
+Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
+ to the
+
+current directory; based on report/patch from Harry Sintonen
+
+OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
+
+CVE: CVE-2018-20685
+Ustream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ scp.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/scp.c b/scp.c
+index 60682c6..4f3fdcd 100644
+--- a/scp.c
++++ b/scp.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
++/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
+ /*
+ * scp - secure remote copy. This is basically patched BSD rcp which
+ * uses ssh to do the data transfer (instead of using rcmd).
+@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
+ SCREWUP("size out of range");
+ size = (off_t)ull;
+
+- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
++ if (*cp == '\0' || strchr(cp, '/') != NULL ||
++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
+ run_err("error: unexpected filename: %s", cp);
+ exit(1);
+ }
+--
+2.7.4
+
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2019-6109.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2019-6109.patch
new file mode 100644
index 0000000..dabe4a6
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2019-6109.patch
@@ -0,0 +1,275 @@
+From 15d47c3bd8551521240bc459fc004c280daef817 Mon Sep 17 00:00:00 2001
+From: "dtucker@openbsd.org" <dtucker@openbsd.org>
+Date: Wed, 23 Jan 2019 08:01:46 +0000
+Subject: [PATCH] upstream: Sanitize scp filenames via snmprintf. To do this we
+ move
+
+the progressmeter formatting outside of signal handler context and have the
+atomicio callback called for EINTR too. bz#2434 with contributions from djm
+and jjelen at redhat.com, ok djm@
+
+OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8
+CVE: CVE-2019-6109
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ atomicio.c | 20 +++++++++++++++-----
+ progressmeter.c | 53 ++++++++++++++++++++++++-----------------------------
+ progressmeter.h | 3 ++-
+ scp.c | 1 +
+ sftp-client.c | 16 +++++++++-------
+ 5 files changed, 51 insertions(+), 42 deletions(-)
+
+diff --git a/atomicio.c b/atomicio.c
+index f854a06..d91bd76 100644
+--- a/atomicio.c
++++ b/atomicio.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */
++/* $OpenBSD: atomicio.c,v 1.29 2019/01/23 08:01:46 dtucker Exp $ */
+ /*
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
+ * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
+@@ -65,9 +65,14 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
+ res = (f) (fd, s + pos, n - pos);
+ switch (res) {
+ case -1:
+- if (errno == EINTR)
++ if (errno == EINTR) {
++ /* possible SIGALARM, update callback */
++ if (cb != NULL && cb(cb_arg, 0) == -1) {
++ errno = EINTR;
++ return pos;
++ }
+ continue;
+- if (errno == EAGAIN || errno == EWOULDBLOCK) {
++ } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ #ifndef BROKEN_READ_COMPARISON
+ (void)poll(&pfd, 1, -1);
+ #endif
+@@ -122,9 +127,14 @@ atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd,
+ res = (f) (fd, iov, iovcnt);
+ switch (res) {
+ case -1:
+- if (errno == EINTR)
++ if (errno == EINTR) {
++ /* possible SIGALARM, update callback */
++ if (cb != NULL && cb(cb_arg, 0) == -1) {
++ errno = EINTR;
++ return pos;
++ }
+ continue;
+- if (errno == EAGAIN || errno == EWOULDBLOCK) {
++ } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ #ifndef BROKEN_READV_COMPARISON
+ (void)poll(&pfd, 1, -1);
+ #endif
+diff --git a/progressmeter.c b/progressmeter.c
+index fe9bf52..add462d 100644
+--- a/progressmeter.c
++++ b/progressmeter.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: progressmeter.c,v 1.45 2016/06/30 05:17:05 dtucker Exp $ */
++/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */
+ /*
+ * Copyright (c) 2003 Nils Nordman. All rights reserved.
+ *
+@@ -31,6 +31,7 @@
+
+ #include <errno.h>
+ #include <signal.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+@@ -39,6 +40,7 @@
+ #include "progressmeter.h"
+ #include "atomicio.h"
+ #include "misc.h"
++#include "utf8.h"
+
+ #define DEFAULT_WINSIZE 80
+ #define MAX_WINSIZE 512
+@@ -61,7 +63,7 @@ static void setscreensize(void);
+ void refresh_progress_meter(void);
+
+ /* signal handler for updating the progress meter */
+-static void update_progress_meter(int);
++static void sig_alarm(int);
+
+ static double start; /* start progress */
+ static double last_update; /* last progress update */
+@@ -74,6 +76,7 @@ static long stalled; /* how long we have been stalled */
+ static int bytes_per_second; /* current speed in bytes per second */
+ static int win_size; /* terminal window size */
+ static volatile sig_atomic_t win_resized; /* for window resizing */
++static volatile sig_atomic_t alarm_fired;
+
+ /* units for format_size */
+ static const char unit[] = " KMGT";
+@@ -126,9 +129,17 @@ refresh_progress_meter(void)
+ off_t bytes_left;
+ int cur_speed;
+ int hours, minutes, seconds;
+- int i, len;
+ int file_len;
+
++ if ((!alarm_fired && !win_resized) || !can_output())
++ return;
++ alarm_fired = 0;
++
++ if (win_resized) {
++ setscreensize();
++ win_resized = 0;
++ }
++
+ transferred = *counter - (cur_pos ? cur_pos : start_pos);
+ cur_pos = *counter;
+ now = monotime_double();
+@@ -158,16 +169,11 @@ refresh_progress_meter(void)
+
+ /* filename */
+ buf[0] = '\0';
+- file_len = win_size - 35;
++ file_len = win_size - 36;
+ if (file_len > 0) {
+- len = snprintf(buf, file_len + 1, "\r%s", file);
+- if (len < 0)
+- len = 0;
+- if (len >= file_len + 1)
+- len = file_len;
+- for (i = len; i < file_len; i++)
+- buf[i] = ' ';
+- buf[file_len] = '\0';
++ buf[0] = '\r';
++ snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s",
++ file_len * -1, file);
+ }
+
+ /* percent of transfer done */
+@@ -228,22 +234,11 @@ refresh_progress_meter(void)
+
+ /*ARGSUSED*/
+ static void
+-update_progress_meter(int ignore)
++sig_alarm(int ignore)
+ {
+- int save_errno;
+-
+- save_errno = errno;
+-
+- if (win_resized) {
+- setscreensize();
+- win_resized = 0;
+- }
+- if (can_output())
+- refresh_progress_meter();
+-
+- signal(SIGALRM, update_progress_meter);
++ signal(SIGALRM, sig_alarm);
++ alarm_fired = 1;
+ alarm(UPDATE_INTERVAL);
+- errno = save_errno;
+ }
+
+ void
+@@ -259,10 +254,9 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
+ bytes_per_second = 0;
+
+ setscreensize();
+- if (can_output())
+- refresh_progress_meter();
++ refresh_progress_meter();
+
+- signal(SIGALRM, update_progress_meter);
++ signal(SIGALRM, sig_alarm);
+ signal(SIGWINCH, sig_winch);
+ alarm(UPDATE_INTERVAL);
+ }
+@@ -286,6 +280,7 @@ stop_progress_meter(void)
+ static void
+ sig_winch(int sig)
+ {
++ signal(SIGWINCH, sig_winch);
+ win_resized = 1;
+ }
+
+diff --git a/progressmeter.h b/progressmeter.h
+index bf179dc..8f66780 100644
+--- a/progressmeter.h
++++ b/progressmeter.h
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: progressmeter.h,v 1.3 2015/01/14 13:54:13 djm Exp $ */
++/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */
+ /*
+ * Copyright (c) 2002 Nils Nordman. All rights reserved.
+ *
+@@ -24,4 +24,5 @@
+ */
+
+ void start_progress_meter(const char *, off_t, off_t *);
++void refresh_progress_meter(void);
+ void stop_progress_meter(void);
+diff --git a/scp.c b/scp.c
+index 4f3fdcd..4a342a6 100644
+--- a/scp.c
++++ b/scp.c
+@@ -585,6 +585,7 @@ scpio(void *_cnt, size_t s)
+ off_t *cnt = (off_t *)_cnt;
+
+ *cnt += s;
++ refresh_progress_meter();
+ if (limit_kbps > 0)
+ bandwidth_limit(&bwlimit, s);
+ return 0;
+diff --git a/sftp-client.c b/sftp-client.c
+index 4986d6d..2bc698f 100644
+--- a/sftp-client.c
++++ b/sftp-client.c
+@@ -101,7 +101,9 @@ sftpio(void *_bwlimit, size_t amount)
+ {
+ struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
+
+- bandwidth_limit(bwlimit, amount);
++ refresh_progress_meter();
++ if (bwlimit != NULL)
++ bandwidth_limit(bwlimit, amount);
+ return 0;
+ }
+
+@@ -121,8 +123,8 @@ send_msg(struct sftp_conn *conn, struct sshbuf *m)
+ iov[1].iov_base = (u_char *)sshbuf_ptr(m);
+ iov[1].iov_len = sshbuf_len(m);
+
+- if (atomiciov6(writev, conn->fd_out, iov, 2,
+- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) !=
++ if (atomiciov6(writev, conn->fd_out, iov, 2, sftpio,
++ conn->limit_kbps > 0 ? &conn->bwlimit_out : NULL) !=
+ sshbuf_len(m) + sizeof(mlen))
+ fatal("Couldn't send packet: %s", strerror(errno));
+
+@@ -138,8 +140,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
+
+ if ((r = sshbuf_reserve(m, 4, &p)) != 0)
+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
+- if (atomicio6(read, conn->fd_in, p, 4,
+- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
++ if (atomicio6(read, conn->fd_in, p, 4, sftpio,
++ conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) != 4) {
+ if (errno == EPIPE || errno == ECONNRESET)
+ fatal("Connection closed");
+ else
+@@ -157,8 +159,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
+
+ if ((r = sshbuf_reserve(m, msg_len, &p)) != 0)
+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
+- if (atomicio6(read, conn->fd_in, p, msg_len,
+- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in)
++ if (atomicio6(read, conn->fd_in, p, msg_len, sftpio,
++ conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL)
+ != msg_len) {
+ if (errno == EPIPE)
+ fatal("Connection closed");
+--
+2.7.4
+
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
new file mode 100644
index 0000000..80cf39b
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
@@ -0,0 +1,187 @@
+From 15cc3497367d2e9729353b3df75518548e845c82 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Sat, 26 Jan 2019 22:41:28 +0000
+Subject: [PATCH] upstream: check in scp client that filenames sent during
+
+remote->local directory copies satisfy the wildcard specified by the user.
+
+This checking provides some protection against a malicious server
+sending unexpected filenames, but it comes at a risk of rejecting wanted
+files due to differences between client and server wildcard expansion rules.
+
+For this reason, this also adds a new -T flag to disable the check.
+
+reported by Harry Sintonen
+fix approach suggested by markus@;
+has been in snaps for ~1wk courtesy deraadt@
+
+OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
+
+CVE: CVE-2019-6111
+Ustream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ scp.1 | 12 +++++++++++-
+ scp.c | 37 +++++++++++++++++++++++++++++--------
+ 2 files changed, 40 insertions(+), 9 deletions(-)
+
+diff --git a/scp.1 b/scp.1
+index 0e5cc1b..397e770 100644
+--- a/scp.1
++++ b/scp.1
+@@ -18,7 +18,7 @@
+ .Nd secure copy (remote file copy program)
+ .Sh SYNOPSIS
+ .Nm scp
+-.Op Fl 346BCpqrv
++.Op Fl 346BCpqrTv
+ .Op Fl c Ar cipher
+ .Op Fl F Ar ssh_config
+ .Op Fl i Ar identity_file
+@@ -208,6 +208,16 @@ to use for the encrypted connection.
+ The program must understand
+ .Xr ssh 1
+ options.
++.It Fl T
++Disable strict filename checking.
++By default when copying files from a remote host to a local directory
++.Nm
++checks that the received filenames match those requested on the command-line
++to prevent the remote end from sending unexpected or unwanted files.
++Because of differences in how various operating systems and shells interpret
++filename wildcards, these checks may cause wanted files to be rejected.
++This option disables these checks at the expense of fully trusting that
++the server will not send unexpected filenames.
+ .It Fl v
+ Verbose mode.
+ Causes
+diff --git a/scp.c b/scp.c
+index 0587cec..b2d331e 100644
+--- a/scp.c
++++ b/scp.c
+@@ -94,6 +94,7 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <fnmatch.h>
+ #include <limits.h>
+ #include <locale.h>
+ #include <pwd.h>
+@@ -375,14 +376,14 @@ void verifydir(char *);
+ struct passwd *pwd;
+ uid_t userid;
+ int errs, remin, remout;
+-int pflag, iamremote, iamrecursive, targetshouldbedirectory;
++int Tflag, pflag, iamremote, iamrecursive, targetshouldbedirectory;
+
+ #define CMDNEEDS 64
+ char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */
+
+ int response(void);
+ void rsource(char *, struct stat *);
+-void sink(int, char *[]);
++void sink(int, char *[], const char *);
+ void source(int, char *[]);
+ void tolocal(int, char *[]);
+ void toremote(int, char *[]);
+@@ -421,8 +422,9 @@ main(int argc, char **argv)
+ addargs(&args, "-oRemoteCommand=none");
+ addargs(&args, "-oRequestTTY=no");
+
+- fflag = tflag = 0;
+- while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q12346S:o:F:")) != -1)
++ fflag = Tflag = tflag = 0;
++ while ((ch = getopt(argc, argv,
++ "dfl:prtTvBCc:i:P:q12346S:o:F:")) != -1) {
+ switch (ch) {
+ /* User-visible flags. */
+ case '1':
+@@ -501,9 +503,13 @@ main(int argc, char **argv)
+ setmode(0, O_BINARY);
+ #endif
+ break;
++ case 'T':
++ Tflag = 1;
++ break;
+ default:
+ usage();
+ }
++ }
+ argc -= optind;
+ argv += optind;
+
+@@ -534,7 +540,7 @@ main(int argc, char **argv)
+ }
+ if (tflag) {
+ /* Receive data. */
+- sink(argc, argv);
++ sink(argc, argv, NULL);
+ exit(errs != 0);
+ }
+ if (argc < 2)
+@@ -792,7 +798,7 @@ tolocal(int argc, char **argv)
+ continue;
+ }
+ free(bp);
+- sink(1, argv + argc - 1);
++ sink(1, argv + argc - 1, src);
+ (void) close(remin);
+ remin = remout = -1;
+ }
+@@ -968,7 +974,7 @@ rsource(char *name, struct stat *statp)
+ (sizeof(type) != 4 && sizeof(type) != 8))
+
+ void
+-sink(int argc, char **argv)
++sink(int argc, char **argv, const char *src)
+ {
+ static BUF buffer;
+ struct stat stb;
+@@ -984,6 +990,7 @@ sink(int argc, char **argv)
+ unsigned long long ull;
+ int setimes, targisdir, wrerrno = 0;
+ char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
++ char *src_copy = NULL, *restrict_pattern = NULL;
+ struct timeval tv[2];
+
+ #define atime tv[0]
+@@ -1008,6 +1015,17 @@ sink(int argc, char **argv)
+ (void) atomicio(vwrite, remout, "", 1);
+ if (stat(targ, &stb) == 0 && S_ISDIR(stb.st_mode))
+ targisdir = 1;
++ if (src != NULL && !iamrecursive && !Tflag) {
++ /*
++ * Prepare to try to restrict incoming filenames to match
++ * the requested destination file glob.
++ */
++ if ((src_copy = strdup(src)) == NULL)
++ fatal("strdup failed");
++ if ((restrict_pattern = strrchr(src_copy, '/')) != NULL) {
++ *restrict_pattern++ = '\0';
++ }
++ }
+ for (first = 1;; first = 0) {
+ cp = buf;
+ if (atomicio(read, remin, cp, 1) != 1)
+@@ -1112,6 +1130,9 @@ sink(int argc, char **argv)
+ run_err("error: unexpected filename: %s", cp);
+ exit(1);
+ }
++ if (restrict_pattern != NULL &&
++ fnmatch(restrict_pattern, cp, 0) != 0)
++ SCREWUP("filename does not match request");
+ if (targisdir) {
+ static char *namebuf;
+ static size_t cursize;
+@@ -1149,7 +1170,7 @@ sink(int argc, char **argv)
+ goto bad;
+ }
+ vect[0] = xstrdup(np);
+- sink(1, vect);
++ sink(1, vect, src);
+ if (setimes) {
+ setimes = 0;
+ if (utimes(vect[0], tv) < 0)
+--
+2.7.4
+
diff --git a/meta/recipes-connectivity/openssh/openssh_7.9p1.bb b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb
index 6260135..b971b2b 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb
@@ -24,6 +24,10 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
file://sshd_check_keys \
file://add-test-support-for-busybox.patch \
+ file://CVE-2018-20685.patch \
+ file://CVE-2019-6109.patch \
+ file://0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch \
+ file://CVE-2019-6111.patch \
"
SRC_URI[md5sum] = "c6af50b7a474d04726a5aa747a5dce8f"
SRC_URI[sha256sum] = "6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 39/43] dropbear: set CVE_PRODUCT
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (37 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 38/43] openssh: fix CVE-2018-20685, CVE-2019-6109, CVE-2019-6111 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 40/43] waffle: supprt build waffle without x11 Armin Kuster
` (3 subsequent siblings)
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-core/dropbear/dropbear.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 3fbdb5e..2537603 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -34,6 +34,8 @@ RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS
inherit autotools update-rc.d systemd
+CVE_PRODUCT = "dropbear_ssh"
+
INITSCRIPT_NAME = "dropbear"
INITSCRIPT_PARAMS = "defaults 10"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 40/43] waffle: supprt build waffle without x11
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (38 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 39/43] dropbear: set CVE_PRODUCT Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 16:09 ` Adrian Bunk
2019-05-04 15:27 ` [PATCH 41/43] piglit: support build piglit " Armin Kuster
` (2 subsequent siblings)
42 siblings, 1 reply; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
respect DISTRO_FEATURES to make waffle support different platform,
gbm platform is supported by default.
[YOCTO #6077]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
index 43c3edc..31572f2 100644
--- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
@@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package
# This should be overridden per-machine to reflect the capabilities of the GL
# stack.
-PACKAGECONFIG ??= "glx"
-
-# libx11 requires x11 in DISTRO_FEATURES.
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
+ gbm"
# virtual/libgl requires opengl in DISTRO_FEATURES.
REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 41/43] piglit: support build piglit without x11
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (39 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 40/43] waffle: supprt build waffle without x11 Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 42/43] libsdl: set CVE_PRODUCT Armin Kuster
2019-05-04 15:27 ` [PATCH 43/43] linux-yocto/5.0: update TCP patch to mainline version Armin Kuster
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
* test PIGLIT_BUILD_GL_TESTS depend on glx library, so depend
on x11, so respect the DISTRO_FEATURES, only enable it when
x11 is enabled.
* mesa-demos depend on libGL.so which is provide by recipe
mesa, but when x11 is disabled, libGL.so is not generated.
so we can only rdepend on this when x11 is enabled
* add x11 PACKAGECONFIG to add correct config/depend/rdepend
[YOCTO #6077]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-graphics/piglit/piglit_git.bb | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 59d1348..b6542a1 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -17,11 +17,12 @@ PV = "1.0+gitr${SRCPV}"
S = "${WORKDIR}/git"
-DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native virtual/egl"
+X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
+X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
+
+DEPENDS = "libpng waffle libxkbcommon virtual/libgl python3-mako-native python3-numpy-native python3-six-native virtual/egl"
inherit cmake pkgconfig python3native distro_features_check bash-completion
-# depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
# depends on virtual/libgl
REQUIRED_DISTRO_FEATURES += "opengl"
@@ -32,8 +33,10 @@ REQUIRED_DISTRO_FEATURES += "opengl"
export TEMP = "${B}/temp/"
do_compile[dirs] =+ "${B}/temp/"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
+PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}"
+
do_configure_prepend() {
if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then
@@ -48,7 +51,7 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \
python3-misc \
python3-unixadmin python3-xml python3-multiprocessing \
python3-six python3-shell python3-io \
- python3-netserver mesa-demos bash \
+ python3-netserver bash \
"
INSANE_SKIP_${PN} += "dev-so already-stripped"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 42/43] libsdl: set CVE_PRODUCT
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (40 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 41/43] piglit: support build piglit " Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
2019-05-04 15:27 ` [PATCH 43/43] linux-yocto/5.0: update TCP patch to mainline version Armin Kuster
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 ++
meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb | 2 ++
2 files changed, 4 insertions(+)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 3680ea9..7718d11 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -31,6 +31,8 @@ BINCONFIG = "${bindir}/sdl-config"
inherit autotools lib_package binconfig-disabled pkgconfig
+CVE_PRODUCT = "simple_directmedia_layer sdl"
+
EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
--enable-file --disable-oss --disable-esd --disable-arts \
--disable-diskaudio --disable-nas \
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
index c741cfb..bac91d3 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
@@ -23,6 +23,8 @@ SRC_URI[sha256sum] = "255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54
inherit autotools lib_package binconfig pkgconfig
+CVE_PRODUCT = "simple_directmedia_layer sdl"
+
EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-video-dummy \
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* [PATCH 43/43] linux-yocto/5.0: update TCP patch to mainline version
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
` (41 preceding siblings ...)
2019-05-04 15:27 ` [PATCH 42/43] libsdl: set CVE_PRODUCT Armin Kuster
@ 2019-05-04 15:27 ` Armin Kuster
42 siblings, 0 replies; 51+ messages in thread
From: Armin Kuster @ 2019-05-04 15:27 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating the SRCREVs to drop our temporary workaround for TCP
timeout issues and switch to the mainline version:
tcp: add sanity tests in tcp_add_backlog()
Revert "tcp: fix issues relaed to implement coalescing on backlog queue"
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index ef3f0a0..54f86da 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -11,8 +11,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "a3309af7ab77156bd8d731df3a97126d3d897916"
-SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3"
+SRCREV_machine ?= "494384666b623a23e19cbbc54574d08e31496a03"
+SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index 206e6c3..7201921 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "d905ae925fc4a60d63f45e1922163da683d8a3bc"
-SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
-SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3"
+SRCREV_machine_qemuarm ?= "f07da0a13d6f503b72594776b5e8a9795da6d6a0"
+SRCREV_machine ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382"
+SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index 4ccf907..ae8f643 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base"
KBRANCH_qemux86-64 ?= "v5.0/standard/base"
KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "17c4b7e9db4d17aa713c85d0c3d2d84af962864a"
-SRCREV_machine_qemuarm64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
-SRCREV_machine_qemumips ?= "e5c23fb31438dab373a50afc40f6e4ab0c568485"
-SRCREV_machine_qemuppc ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
-SRCREV_machine_qemux86 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
-SRCREV_machine_qemux86-64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
-SRCREV_machine_qemumips64 ?= "743d799797ad6828472087e1da8c67fdab87bf75"
-SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30"
-SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3"
+SRCREV_machine_qemuarm ?= "99f3821bdc8718af3ef6e96d594b593d644ab2e4"
+SRCREV_machine_qemuarm64 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382"
+SRCREV_machine_qemumips ?= "1128cfe6c7915535c4066b75342c952640e65d72"
+SRCREV_machine_qemuppc ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382"
+SRCREV_machine_qemux86 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382"
+SRCREV_machine_qemux86-64 ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382"
+SRCREV_machine_qemumips64 ?= "55e385d52db438df1ff7ad3845c9076b2bb221eb"
+SRCREV_machine ?= "891531d68e5101bf64be1cc1cb31e3d1255cf382"
+SRCREV_meta ?= "d26eec23cf1057a715c05777a18f395678fcbf38"
# remap qemuarm to qemuarma15 for the 5.0 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.7.4
^ permalink raw reply related [flat|nested] 51+ messages in thread
* Re: [PATCH 33/43] gnome-doc-utils: Remove stale patch
2019-05-04 15:27 ` [PATCH 33/43] gnome-doc-utils: Remove stale patch Armin Kuster
@ 2019-05-04 16:04 ` Adrian Bunk
2019-05-04 16:58 ` akuster808
0 siblings, 1 reply; 51+ messages in thread
From: Adrian Bunk @ 2019-05-04 16:04 UTC (permalink / raw)
To: Armin Kuster; +Cc: openembedded-core
On Sat, May 04, 2019 at 08:27:09AM -0700, Armin Kuster wrote:
> From: Adrian Bunk <bunk@stusta.de>
>
> The recipe was removed 3 years ago.
>...
This is a pure cleanup change, not something that would be worth
backporting to stable branches.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 40/43] waffle: supprt build waffle without x11
2019-05-04 15:27 ` [PATCH 40/43] waffle: supprt build waffle without x11 Armin Kuster
@ 2019-05-04 16:09 ` Adrian Bunk
2019-05-04 17:05 ` akuster808
0 siblings, 1 reply; 51+ messages in thread
From: Adrian Bunk @ 2019-05-04 16:09 UTC (permalink / raw)
To: Armin Kuster; +Cc: openembedded-core
On Sat, May 04, 2019 at 08:27:16AM -0700, Armin Kuster wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> respect DISTRO_FEATURES to make waffle support different platform,
> gbm platform is supported by default.
>
> [YOCTO #6077]
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> ---
> meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
> index 43c3edc..31572f2 100644
> --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
> +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
> @@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package
>
> # This should be overridden per-machine to reflect the capabilities of the GL
> # stack.
> -PACKAGECONFIG ??= "glx"
> -
> -# libx11 requires x11 in DISTRO_FEATURES.
> -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
> + gbm"
>...
Changing the default PACKAGECONFIG does not look appropriate for
a stable branch.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 33/43] gnome-doc-utils: Remove stale patch
2019-05-04 16:04 ` Adrian Bunk
@ 2019-05-04 16:58 ` akuster808
2019-05-04 17:04 ` Adrian Bunk
0 siblings, 1 reply; 51+ messages in thread
From: akuster808 @ 2019-05-04 16:58 UTC (permalink / raw)
To: Adrian Bunk; +Cc: openembedded-core
On 5/4/19 9:04 AM, Adrian Bunk wrote:
> On Sat, May 04, 2019 at 08:27:09AM -0700, Armin Kuster wrote:
>> From: Adrian Bunk <bunk@stusta.de>
>>
>> The recipe was removed 3 years ago.
>> ...
> This is a pure cleanup change, not something that would be worth
> backporting to stable branches.
Its fine IMHO and if here is another gnome-doc-utils patch, it has a
higher chance of applying.
- armin
>
> cu
> Adrian
>
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 33/43] gnome-doc-utils: Remove stale patch
2019-05-04 16:58 ` akuster808
@ 2019-05-04 17:04 ` Adrian Bunk
0 siblings, 0 replies; 51+ messages in thread
From: Adrian Bunk @ 2019-05-04 17:04 UTC (permalink / raw)
To: akuster808; +Cc: openembedded-core
On Sat, May 04, 2019 at 09:58:47AM -0700, akuster808 wrote:
>
>
> On 5/4/19 9:04 AM, Adrian Bunk wrote:
> > On Sat, May 04, 2019 at 08:27:09AM -0700, Armin Kuster wrote:
> >> From: Adrian Bunk <bunk@stusta.de>
> >>
> >> The recipe was removed 3 years ago.
> >> ...
> > This is a pure cleanup change, not something that would be worth
> > backporting to stable branches.
> Its fine IMHO and if here is another gnome-doc-utils patch, it has a
> higher chance of applying.
"The recipe was removed 3 years ago."
> - armin
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 40/43] waffle: supprt build waffle without x11
2019-05-04 16:09 ` Adrian Bunk
@ 2019-05-04 17:05 ` akuster808
2019-05-04 17:40 ` Adrian Bunk
0 siblings, 1 reply; 51+ messages in thread
From: akuster808 @ 2019-05-04 17:05 UTC (permalink / raw)
To: Adrian Bunk; +Cc: openembedded-core
On 5/4/19 9:09 AM, Adrian Bunk wrote:
> On Sat, May 04, 2019 at 08:27:16AM -0700, Armin Kuster wrote:
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> respect DISTRO_FEATURES to make waffle support different platform,
>> gbm platform is supported by default.
>>
>> [YOCTO #6077]
>>
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>> ---
>> meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +++----
>> 1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
>> index 43c3edc..31572f2 100644
>> --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
>> +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
>> @@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package
>>
>> # This should be overridden per-machine to reflect the capabilities of the GL
>> # stack.
>> -PACKAGECONFIG ??= "glx"
>> -
>> -# libx11 requires x11 in DISTRO_FEATURES.
>> -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
>> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
>> + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
>> + gbm"
>> ...
> Changing the default PACKAGECONFIG does not look appropriate for
> a stable branch.
Go look at the bug for more details.
- armin
>
> cu
> Adrian
>
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 40/43] waffle: supprt build waffle without x11
2019-05-04 17:05 ` akuster808
@ 2019-05-04 17:40 ` Adrian Bunk
2019-05-04 20:33 ` akuster808
0 siblings, 1 reply; 51+ messages in thread
From: Adrian Bunk @ 2019-05-04 17:40 UTC (permalink / raw)
To: akuster808; +Cc: openembedded-core
On Sat, May 04, 2019 at 10:05:11AM -0700, akuster808 wrote:
>
>
> On 5/4/19 9:09 AM, Adrian Bunk wrote:
> > On Sat, May 04, 2019 at 08:27:16AM -0700, Armin Kuster wrote:
> >> From: Changqing Li <changqing.li@windriver.com>
> >>
> >> respect DISTRO_FEATURES to make waffle support different platform,
> >> gbm platform is supported by default.
> >>
> >> [YOCTO #6077]
> >>
> >> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> >> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >> Signed-off-by: Armin Kuster <akuster808@gmail.com>
> >> ---
> >> meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +++----
> >> 1 file changed, 3 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
> >> index 43c3edc..31572f2 100644
> >> --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
> >> +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
> >> @@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package
> >>
> >> # This should be overridden per-machine to reflect the capabilities of the GL
> >> # stack.
> >> -PACKAGECONFIG ??= "glx"
> >> -
> >> -# libx11 requires x11 in DISTRO_FEATURES.
> >> -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
> >> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
> >> + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
> >> + gbm"
> >> ...
> > Changing the default PACKAGECONFIG does not look appropriate for
> > a stable branch.
>
> Go look at the bug for more details.
It raises the additional question why the new feature of building piglit
without x11 is considered appropriate for a stable branch.
You said before that adding new recipes to stable branches is not
appropriate. Changing the behaviour of existing recipes is a lot worse
than that, since it changes what gets built in existing distibutions
using the stable branch.
And a 5 year old bug asking for an enhancement of an existing recipe
does not sound like an appropriate justification for changing the
default PACKAGECONFIG of a recipe in a stable branch to me.
> - armin
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 51+ messages in thread
* Re: [PATCH 40/43] waffle: supprt build waffle without x11
2019-05-04 17:40 ` Adrian Bunk
@ 2019-05-04 20:33 ` akuster808
0 siblings, 0 replies; 51+ messages in thread
From: akuster808 @ 2019-05-04 20:33 UTC (permalink / raw)
To: Adrian Bunk; +Cc: openembedded-core
On 5/4/19 10:40 AM, Adrian Bunk wrote:
> On Sat, May 04, 2019 at 10:05:11AM -0700, akuster808 wrote:
>>
>> On 5/4/19 9:09 AM, Adrian Bunk wrote:
>>> On Sat, May 04, 2019 at 08:27:16AM -0700, Armin Kuster wrote:
>>>> From: Changqing Li <changqing.li@windriver.com>
>>>>
>>>> respect DISTRO_FEATURES to make waffle support different platform,
>>>> gbm platform is supported by default.
>>>>
>>>> [YOCTO #6077]
>>>>
>>>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>> Signed-off-by: Armin Kuster <akuster808@gmail.com>
>>>> ---
>>>> meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +++----
>>>> 1 file changed, 3 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
>>>> index 43c3edc..31572f2 100644
>>>> --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
>>>> +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb
>>>> @@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package
>>>>
>>>> # This should be overridden per-machine to reflect the capabilities of the GL
>>>> # stack.
>>>> -PACKAGECONFIG ??= "glx"
>>>> -
>>>> -# libx11 requires x11 in DISTRO_FEATURES.
>>>> -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
>>>> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
>>>> + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
>>>> + gbm"
>>>> ...
>>> Changing the default PACKAGECONFIG does not look appropriate for
>>> a stable branch.
>> Go look at the bug for more details.
> It raises the additional question why the new feature of building piglit
> without x11 is considered appropriate for a stable branch.
>
> You said before that adding new recipes to stable branches is not
> appropriate. Changing the behaviour of existing recipes is a lot worse
> than that, since it changes what gets built in existing distibutions
> using the stable branch.
>
> And a 5 year old bug asking for an enhancement of an existing recipe
> does not sound like an appropriate justification for changing the
> default PACKAGECONFIG of a recipe in a stable branch to me.
Seems like a good argument.
will drop patch
thanks
- armin
>
>> - armin
> cu
> Adrian
>
^ permalink raw reply [flat|nested] 51+ messages in thread
end of thread, other threads:[~2019-05-04 20:33 UTC | newest]
Thread overview: 51+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-04 15:26 [PATCH 00/43] Warrior patch review Armin Kuster
2019-05-04 15:26 ` [PATCH 01/43] curl: update to 7.64.1 Armin Kuster
2019-05-04 15:26 ` [PATCH 02/43] gnutls: upgrade 3.6.5 -> 3.6.7 Armin Kuster
2019-05-04 15:26 ` [PATCH 03/43] dhcp: Replace OE specific patch for compatibility with latest bind with upstream patch Armin Kuster
2019-05-04 15:26 ` [PATCH 04/43] ptest.bbclass: Use d.getVar instead of os.environ Armin Kuster
2019-05-04 15:26 ` [PATCH 05/43] linux-yocto/5.0: update to v5.0.5 Armin Kuster
2019-05-04 15:26 ` [PATCH 06/43] linux-yocto-rt: update to 5.0.5-rt3 Armin Kuster
2019-05-04 15:26 ` [PATCH 07/43] linux-yocto/5.0: update to v5.0.7 Armin Kuster
2019-05-04 15:26 ` [PATCH 08/43] linux-yocto/4.19: update to v4.19.34 Armin Kuster
2019-05-04 15:26 ` [PATCH 09/43] core-image-sato-sdk-ptest: Try and keep image below 4GB limit Armin Kuster
2019-05-04 15:26 ` [PATCH 10/43] kernel.bbclass: convert base_do_unpack_append() to a task Armin Kuster
2019-05-04 15:26 ` [PATCH 11/43] ltp: Fix setrlimit03 call succeeded unexpectedly Armin Kuster
2019-05-04 15:26 ` [PATCH 12/43] python3: add another multilib fix Armin Kuster
2019-05-04 15:26 ` [PATCH 13/43] busybox: fix ptest failure about 'dc' Armin Kuster
2019-05-04 15:26 ` [PATCH 14/43] base-files: move hostname operations out of issue file settings Armin Kuster
2019-05-04 15:26 ` [PATCH 15/43] resulttool: Load results from URL Armin Kuster
2019-05-04 15:26 ` [PATCH 16/43] resulttool: Add log subcommand Armin Kuster
2019-05-04 15:26 ` [PATCH 17/43] buildhistory: call a dependency parser only on actual dependency lists Armin Kuster
2019-05-04 15:26 ` [PATCH 18/43] icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH Armin Kuster
2019-05-04 15:26 ` [PATCH 19/43] resultool/resultutils: Fix module import error Armin Kuster
2019-05-04 15:26 ` [PATCH 20/43] cryptodev: fix module loading error Armin Kuster
2019-05-04 15:26 ` [PATCH 21/43] oeqa/core/runner: dump stdout and stderr of each test case Armin Kuster
2019-05-04 15:26 ` [PATCH 22/43] core-image-rt: make sure that we append to DEPENDS Armin Kuster
2019-05-04 15:26 ` [PATCH 23/43] core-image-rt-sdk: " Armin Kuster
2019-05-04 15:27 ` [PATCH 24/43] resulttool/manualexecution: Enable test case configuration option Armin Kuster
2019-05-04 15:27 ` [PATCH 25/43] glibc: always use bfd linker Armin Kuster
2019-05-04 15:27 ` [PATCH 26/43] kernel-module-split.bbclass: support CONFIG_MODULE_COMPRESS=y Armin Kuster
2019-05-04 15:27 ` [PATCH 27/43] utils/multiprocess_launch: Improve failing subprocess output Armin Kuster
2019-05-04 15:27 ` [PATCH 28/43] Adding back wrapper and using OEPYTHON3HOME variable for python3 Armin Kuster
2019-05-04 15:27 ` [PATCH 29/43] linux-yocto-rt/4.19: fix merge conflict in lru_drain Armin Kuster
2019-05-04 15:27 ` [PATCH 30/43] linux-yocto/5.0: port RAID configuration tweaks from master Armin Kuster
2019-05-04 15:27 ` [PATCH 31/43] linux-yocto/5.0: integrate TCP timeout / hang fix Armin Kuster
2019-05-04 15:27 ` [PATCH 32/43] linux-yocto_5.0: set devicetree for armv5 Armin Kuster
2019-05-04 15:27 ` [PATCH 33/43] gnome-doc-utils: Remove stale patch Armin Kuster
2019-05-04 16:04 ` Adrian Bunk
2019-05-04 16:58 ` akuster808
2019-05-04 17:04 ` Adrian Bunk
2019-05-04 15:27 ` [PATCH 34/43] python3: Drop ptest hack Armin Kuster
2019-05-04 15:27 ` [PATCH 35/43] gcc: fix CVE-2018-18484 Armin Kuster
2019-05-04 15:27 ` [PATCH 36/43] gdb: fix CVE-2017-9778 Armin Kuster
2019-05-04 15:27 ` [PATCH 37/43] binutils: fix CVE-2019-9074 CVE-2019-9075 CVE-2019-9076 CVE-2019-9077 Armin Kuster
2019-05-04 15:27 ` [PATCH 38/43] openssh: fix CVE-2018-20685, CVE-2019-6109, CVE-2019-6111 Armin Kuster
2019-05-04 15:27 ` [PATCH 39/43] dropbear: set CVE_PRODUCT Armin Kuster
2019-05-04 15:27 ` [PATCH 40/43] waffle: supprt build waffle without x11 Armin Kuster
2019-05-04 16:09 ` Adrian Bunk
2019-05-04 17:05 ` akuster808
2019-05-04 17:40 ` Adrian Bunk
2019-05-04 20:33 ` akuster808
2019-05-04 15:27 ` [PATCH 41/43] piglit: support build piglit " Armin Kuster
2019-05-04 15:27 ` [PATCH 42/43] libsdl: set CVE_PRODUCT Armin Kuster
2019-05-04 15:27 ` [PATCH 43/43] linux-yocto/5.0: update TCP patch to mainline version Armin Kuster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox