Integrating the korg -stable release with the following changes:
75353ac8ff43 Linux 4.9.4
6fea974494af rtlwifi: rtl_usb: Fix missing entry in USB driver's private data
7dae85b5c355 rtlwifi: Fix enter/exit power_save
3f41ee3a45cb drm/i915/gen9: Fix PCODE polling during CDCLK change notification
93f2976eb027 ALSA: usb-audio: Add a quirk for Plantronics BT600
f52e670a5b29 spi: mvebu: fix baudrate calculation for armada variant
05b7bdf1c3d8 ARM: omap2+: am437x: rollback to use omap3_gptimer_timer_init()
b8ba5faa7a6b ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() for mass registration
87dbf3dc1652 ARM: OMAP4+: Fix bad fallthrough for cpuidle
b336dc57bc92 ARM: OMAP5: Fix build for PM code
0f665deba9bc ARM: OMAP5: Fix mpuss_early_init
aa1c7b01c9c7 bus: arm-ccn: Prevent hotplug callback leak
bd99e7a6036e svcrdma: Clear xpt_bc_xps in xprt_setup_rdma_bc() error exit arm
c2ce1c4133b3 ARM: qcom_defconfig: Fix MDM9515 LCC and GCC config
e925eb342659 ARM: zynq: Reserve correct amount of non-DMA RAM
78e2d9405e2d ARM: pxa: fix pxa25x interrupt init
596ff0afbe8e ARM64: dts: bcm2835: Fix bcm2837 compatible string
e3937bc1cc0b ARM64: dts: bcm2837-rpi-3-b: remove incorrect pwr LED
d40152d5ac67 arm64: dts: mt8173: Fix auxadc node
08aed6e8883d tools/virtio: fix READ_ONCE()
e7d05ec1923e powerpc: Fix build warning on 32-bit PPC
2fc33ff4ba81 ALSA: firewire-tascam: Fix to handle error from initialization of stream data
2c867216c555 HID: hid-cypress: validate length of report
e425ed1d3c75 net: vrf: do not allow table id 0
7b7a5a85b1d9 net: ipv4: Fix multipath selection with vrf
7cc73483a4c7 net/mlx5e: Remove WARN_ONCE from adaptive moderation code
17a561b19a27 gro: Disable frag0 optimization on IPv6 ext headers
934ca017c850 gro: use min_t() in skb_gro_reset_offset()
ec0fdcb88c6f gro: Enter slow-path if there is no tailroom
33364eee1fe4 net: add the AF_QIPCRTR entries to family name tables
2ff4a0243c9e net: dsa: Ensure validity of dst->ds[0]
66f24d624baa r8152: fix rx issue for runtime suspend
c8a89b4f5248 r8152: split rtl8152_suspend function
294f2c889637 net: dsa: bcm_sf2: Utilize nested MDIO read/write
ac77aab46168 net: dsa: bcm_sf2: Do not clobber b53_switch_ops
b55f6ca7380d bpf: change back to orig prog on too many passes
a4d205a59521 net: vrf: Add missing Rx counters
efc455f08ea8 ipv4: Do not allow MAIN to be alias for new LOCAL w/ custom rules
fe1e13cfe2c4 igmp: Make igmp group member RFC 3376 compliant
7826d11cf44c flow_dissector: Update pptp handling to avoid null pointer deref.
9f65f5d4746b drop_monitor: consider inserted data in genlmsg_end
9f7551e05b0f drop_monitor: add missing call to genlmsg_end
a8a213f296ae net: ipv4: dst for local input routes should use l3mdev if relevant
e7422080e35d net: fix incorrect original ingress device index in PKTINFO
2ffc694b5727 rtnl: stats - add missing netlink message size checks
8cb7d6277f01 net/mlx5e: Disable netdev after close
ee9f2fd3f6b6 net/mlx5e: Don't sync netdev state when not registered
33c782dd1514 net/mlx5: Prevent setting multicast macs for VFs
b22c86ff8e78 net/mlx5: Mask destination mac value in ethtool steering rules
efbbc75c00fc net/mlx5: Avoid shadowing numa_node
ca8a64467f2a net/mlx5: Cancel recovery work in remove flow
7bf1de7f2749 net/mlx5: Check FW limitations on log_max_qp before setting it
9b4a34ff8987 net/sched: cls_flower: Fix missing addr_type in classify
99f40c6bf565 net: stmmac: Fix race between stmmac_drv_probe and stmmac_open
09babe4ce12e net, sched: fix soft lockup in tc_classify
ee99e2bc5e8a ipv6: handle -EFAULT from skb_copy_bits
d36a1cb1e328 inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets
ed3cc329c7bc sctp: sctp_transport_lookup_process should rcu_read_unlock when transport is null
8b8fbe5c25ab net: vrf: Drop conntrack data after pass through VRF device on Tx
d4a0b2e40c46 net: vrf: Fix NAT within a VRF
(From OE-Core rev: 9b4c9986ebed75ee71a8179e04a4384624c0e7e0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bug fixes release.
This is really needed for Qualcomm based h/w since freedreno
driver had a regression in 13.0.x branch which is fixed in 13.0.4.
(From OE-Core rev: bc4804dccb268831e2fdffb21c15d6d78a2a06d3)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Removed the following Backported patches:
1. 0001-configure-don-t-add-Werror-to-build-flags.patch
2. 0002-ASN.y-corrected-compiler-warning.patch
3. 0003-parser_aux-corrected-potential-null-pointer-derefere.patch
4. 0004-tools-eliminated-compiler-warnings.patch
fixed the following build error with musl
...
| from ../../libtasn1-4.10/gl/getopt.c:28:
| ./stdint.h:89:5: error: #if with no expression
| #if
| ^
(From OE-Core rev: 70138279e4f4da74cd63402d7201c74ab2528fa8)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows us to use typing.py without having to add the whole
python3-misc package.
(From OE-Core rev: 66c282541a13f2d1224d3ba933a953c0f613fb2a)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows us to use ipaddress without requiring the add the whole
python3-misc.
(From OE-Core rev: d0e9013f6c68104369de940f5dd8a6ef76cd0210)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows us to depend on _compat_pickle.* wihtout having to add the whole
python3-misc.
(From OE-Core rev: 6c435672b27d1c97ce3776c98d073a92fde887cd)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit: 512334f102a33833d39af53467894315f0715d07
"python-3.5-manifest: Add imp to importlib"
added imp to importlib in the generated manifest, but not in the generator script.
(From OE-Core rev: bfe1d948ab034017622110c8365be7026e139fbf)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
pkg-config currently only handles -I and -L correctly, but misses
-isystem, so we need to do this workaround to fix this issue.
There's a open bug in:
https://bugzilla.freedesktop.org/show_bug.cgi?id=99516
This appears when building lldpd and shows error:
ERROR: lldpd-0.9.6-r0 do_configure: This autoconf log indicates
errors, it looked at host include and/or library paths while
determining system capabilities.
Rerun configure task after fixing this.
ERROR: lldpd-0.9.6-r0 do_configure: Function failed: do_qa_configure
Change-Id: I83255b5952e19bb2f516b1186276cd03eb67eed3
(From OE-Core rev: 5bd23c01fd800c43ba3979b23585fe8ac30d7ec8)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise the common name udev-hwdb is only provided by systemd, meaning that
other recipes can't depend on a single name.
(From OE-Core rev: dea267d576695e23223a2f402f6c9c126b0413dc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When we switched to recipe specific sysroots (rss), performance took a nose dive. Its
easy to blame rss but it turns out not to be entirely at fault.
Three configurations are compared here:
a) Pre-RSS (revision 45df694a9f)
b) Post-RSS (revision 226a508da9)
c) as b) with this change
Overall build times:
a) 22794.25user 2687.88system 30:32.84elapsed 1390%CPU (0avgtext+0avgdata 919056maxresident)k
b) 22677.25user 3238.79system 36:16.68elapsed 1190%CPU (0avgtext+0avgdata 918896maxresident)k
c) 23571.84user 3383.65system 31:36.83elapsed 1421%CPU (0avgtext+0avgdata 919068maxresident)k
For the overall build and sstate directories, du -s shows:
a)
3992588 build-pre-rss/sstate-cache
30804484 build-pre-rss/tmp
b)
4013272 build-with-rss/sstate-cache
36519084 build-with-rss/tmp
c)
4014744 build-with-rss2/sstate-cache
35336960 build-with-rss2/tmp
However more worryingly:
$ du -s build-pre-rss/tmp/sysroots/
2506092 build-pre-rss/tmp/sysroots/
$ du -s build-with-rss/tmp/sysroots-components/
3790712 build-with-rss/tmp/sysroots-components/
$ du -s build-with-rss2/tmp/sysroots-components/
2467544 build-with-rss2/tmp/sysroots-components/
These numbers *should* be equivalent but as you can see, b) is ~1.2GB larger. The reason turned out
to be patchelf. Taking a specific binary from a specific recipe, bc from bc-native, in a) its 82kb
(stripped) yet in b) its 2.17MB.
$ ./patchelf --set-interpreter /bin/rp bc
warning: working around a Linux kernel bug by creating a hole of 2084864 bytes in ‘bc’
https://github.com/NixOS/patchelf/blob/master/src/patchelf.cc#L710 shows that this "hole" is just
padded zeros using memset, its not a proper sparse hole.
This patch copies files with cp --sparse=always after modifying them with patchelf, then replacing
the original file. The better fix will be to fix this in patchself itself and seek() there
when writing the new file but that means new uninative tarballs and will take a bit of work
so I'm proposing this workaround in the meantime.
Also, this patch drops error handling since subprocess check_output() tracebacks will print this
information if the command fails so we can simplify the code.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Used options.outdir instead of image_output_dir.
There is no sense to use extra variable for this.
(From OE-Core rev: c6013dcb158a84d48cc2677f1509681cf9e0a3cb)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It was a typo in current code: mktemp was used instead of
mkdtemp to create work directory. This is fixed by using
mkdtemp.
Create work directory as a subdirectory of output directory
to make sure both are on the same partition to make moving
of result image faster.
This also fixes possible disk space issues as mkdtemp uses
TMPDIR, TEMP or TMP environment variables to get default value
of its 'dir' parameter. Those variables are usually pointing
to /tmp, which is not the best location to create huge images.
(From OE-Core rev: e6579b4e007ce89000c46c09917fbd3c72f18a73)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make sure output directory exists before creating an image.
Create it if it doesn't exist.
(From OE-Core rev: e52bfb0e81d3fb2a474f08b2e2b8b89aadc61d14)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libudev will be autodetected by the linkage, the intention here was to depend on
udev-hwdb to ensure that the USB ID lists are installed.
(From OE-Core rev: 04624464690da71b3ec904a48d5caa8087ca6381)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently test_postinst_roofs_and_boot is building a full-cmdline image
this is taking a lot of time to execute the test, so a minimal image
will be build instead.
(From OE-Core rev: 3a6b0b9f94b7097a825edf3fe258a2f86b73edd6)
Signed-off-by: Jose Perez Carranza <jose.perez.carranza@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This module contains singe function serial_console_form_kargs, which
is used only by rootfs_pcbios_ext plugin. Moved it there and removed
syslinux module to make it easy to find and mainain plugin code.
[YOCTO #10619]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Replaced parse_sourceparams function with list comprehension.
Used local variables instead of attributes.
Moved global variable to the local scope.
[YOCTO #10619]
(From OE-Core rev: 4adbac84046ff744f1452b5ff4d017d17d2d45e2)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As this files is located in plugins/imager subdirectory it's
obvious that it's an imager plugin. Renamed to direct.py to
be consistent with plugin naming scheme.
[YOCTO #10619]
(From OE-Core rev: d5db8c2ee91bdd51bfbb2ebf61aea8ff0378d512)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed wrong continued indentation, unused import and
trailing new line pyling warnings.
[YOCTO #10619]
(From OE-Core rev: e78762a4b52c31357ef29a5b93c53db7190fa4f2)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Synchronized attribure names in DirectImageCreator and
DirectPlugin for better readability. Simplified code,
removed unneeded global variable disk_methods.
(From OE-Core rev: b87b9ef84791615636424a224f74386a4aa0c2fa)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Replaced class method __rootfs_dir_to_dict with a list
comprehension.
[YOCTO #10619]
(From OE-Core rev: 266fd31410771db4c06539f7368c196a6d03000a)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This move simplifies directory structure and makes
further refactoring easier. The code from direct.py was used
only in direct_plugin, so it's safe to move it there.
[YOCTO #10619]
(From OE-Core rev: a8f5ebb26183faa9af6eb72f4dabfcf83aa1e8d4)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a preparation to removing conf.py and config/wic.conf
from the codebase.
Got rid of using configmgr global object in direct_plugin and direct
modules. It was used to implicitly parse kickstart file and set
couple of variables.
Replaced usage of configmgr by passing parameters directly to the
DirectImageCreator.
[YOCTO #10619]
(From OE-Core rev: 79191119de010acb107f9392a991108728858441)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a preparation to removing conf.py and config/wic.conf
from the codebase.
confmgr object is complicated for no reason and almost
useless as all configuration info comes from command line and
bitbake variables. It's used it creator.py to store information
about output directory, logs and some never used functionality
like tmpfs for future use, which doesn't actually happen.
[YOCTO #10619]
(From OE-Core rev: 702ee7a1fe30d87d55ba9528ae89abff4e294fd9)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The sysroot of wic-tools is needed for wic, but if rm_work is enabled,
it will be removed before wic has a chance to use it, hence this fix.
(From OE-Core rev: fc59d35a8ceae6302e0a161bab04829fdfd157cd)
Signed-off-by: Kristian Amlie <kristian.amlie@mender.io>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building for the target, pkg-config uses the target glib-2.0 instead of
it's own minimal fork. To find this it needs to use pkg-config so ensure this
dependency exists in case it doesn't exist on the host already.
(From OE-Core rev: 2e55ecb93ecbbd8bfe626c07d3a032c2fe98efca)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
