* [OE-core][dunfell 01/38] ffmpeg: Add fix for CVEs
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 02/38] linux-yocto/5.4: update to v5.4.149 Steve Sakoman
` (36 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Saloni <salonij@kpit.com>
Add fix for below CVE:
CVE-2021-3566
Link: [http://git.videolan.org/?p=ffmpeg.git;a=patch;h=3bce9e9b3ea35c54bacccc793d7da99ea5157532]
CVE-2021-38291
Link: [http://git.videolan.org/?p=ffmpeg.git;a=patch;h=e01d306c647b5827102260b885faa223b646d2d1]
Signed-off-by: Saloni Jain <jainsaloni0918@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../ffmpeg/ffmpeg/CVE-2021-3566.patch | 61 +++++++++++++++++++
.../ffmpeg/ffmpeg/CVE-2021-38291.patch | 53 ++++++++++++++++
.../recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb | 4 +-
3 files changed, 117 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-3566.patch
create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-38291.patch
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-3566.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-3566.patch
new file mode 100644
index 0000000000..abfc024820
--- /dev/null
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-3566.patch
@@ -0,0 +1,61 @@
+From 3bce9e9b3ea35c54bacccc793d7da99ea5157532 Mon Sep 17 00:00:00 2001
+From: Paul B Mahol <onemda@gmail.com>
+Date: Mon, 27 Jan 2020 21:53:08 +0100
+Subject: [PATCH] avformat/tty: add probe function
+
+CVE: CVE-2021-3566
+Signed-off-by: Saloni Jain <salonij@kpit.com>
+
+Upstream-Status: Backport [http://git.videolan.org/?p=ffmpeg.git;a=patch;h=3bce9e9b3ea35c54bacccc793d7da99ea5157532]
+Comment: No changes/refreshing done.
+---
+ libavformat/tty.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/libavformat/tty.c b/libavformat/tty.c
+index 8d48f2c45c12..60f7e9f87ee7 100644
+--- a/libavformat/tty.c
++++ b/libavformat/tty.c
+@@ -34,6 +34,13 @@
+ #include "internal.h"
+ #include "sauce.h"
+
++static int isansicode(int x)
++{
++ return x == 0x1B || x == 0x0A || x == 0x0D || (x >= 0x20 && x < 0x7f);
++}
++
++static const char tty_extensions[31] = "ans,art,asc,diz,ice,nfo,txt,vt";
++
+ typedef struct TtyDemuxContext {
+ AVClass *class;
+ int chars_per_frame;
+@@ -42,6 +49,17 @@ typedef struct TtyDemuxContext {
+ AVRational framerate; /**< Set by a private option. */
+ } TtyDemuxContext;
+
++static int read_probe(const AVProbeData *p)
++{
++ int cnt = 0;
++
++ for (int i = 0; i < p->buf_size; i++)
++ cnt += !!isansicode(p->buf[i]);
++
++ return (cnt * 100LL / p->buf_size) * (cnt > 400) *
++ !!av_match_ext(p->filename, tty_extensions);
++}
++
+ /**
+ * Parse EFI header
+ */
+@@ -153,8 +171,9 @@ AVInputFormat ff_tty_demuxer = {
+ .name = "tty",
+ .long_name = NULL_IF_CONFIG_SMALL("Tele-typewriter"),
+ .priv_data_size = sizeof(TtyDemuxContext),
++ .read_probe = read_probe,
+ .read_header = read_header,
+ .read_packet = read_packet,
+- .extensions = "ans,art,asc,diz,ice,nfo,txt,vt",
++ .extensions = tty_extensions,
+ .priv_class = &tty_demuxer_class,
+ };
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-38291.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-38291.patch
new file mode 100644
index 0000000000..e5be985fc3
--- /dev/null
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2021-38291.patch
@@ -0,0 +1,53 @@
+From e01d306c647b5827102260b885faa223b646d2d1 Mon Sep 17 00:00:00 2001
+From: James Almer <jamrial@gmail.com>
+Date: Wed, 21 Jul 2021 01:02:44 -0300
+Subject: [PATCH] avcodec/utils: don't return negative values in
+ av_get_audio_frame_duration()
+
+In some extrme cases, like with adpcm_ms samples with an extremely high channel
+count, get_audio_frame_duration() may return a negative frame duration value.
+Don't propagate it, and instead return 0, signaling that a duration could not
+be determined.
+
+CVE: CVE-2021-3566
+Fixes ticket #9312
+Signed-off-by: James Almer <jamrial@gmail.com>
+Signed-off-by: Saloni Jain <salonij@kpit.com>
+
+Upstream-Status: Backport [http://git.videolan.org/?p=ffmpeg.git;a=patch;h=e01d306c647b5827102260b885faa223b646d2d1]
+Comment: No changes/refreshing done.
+---
+ libavcodec/utils.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index 5fad782f5a..cfc07cbcb8 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -810,20 +810,22 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba,
+
+ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
+ {
+- return get_audio_frame_duration(avctx->codec_id, avctx->sample_rate,
++ int duration = get_audio_frame_duration(avctx->codec_id, avctx->sample_rate,
+ avctx->channels, avctx->block_align,
+ avctx->codec_tag, avctx->bits_per_coded_sample,
+ avctx->bit_rate, avctx->extradata, avctx->frame_size,
+ frame_bytes);
++ return FFMAX(0, duration);
+ }
+
+ int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes)
+ {
+- return get_audio_frame_duration(par->codec_id, par->sample_rate,
++ int duration = get_audio_frame_duration(par->codec_id, par->sample_rate,
+ par->channels, par->block_align,
+ par->codec_tag, par->bits_per_coded_sample,
+ par->bit_rate, par->extradata, par->frame_size,
+ frame_bytes);
++ return FFMAX(0, duration);
+ }
+
+ #if !HAVE_THREADS
+--
+2.20.1
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb
index 0e359848fa..1d6f2e528b 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.2.2.bb
@@ -27,7 +27,9 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
file://CVE-2020-12284.patch \
file://0001-libavutil-include-assembly-with-full-path-from-sourc.patch \
- "
+ file://CVE-2021-3566.patch \
+ file://CVE-2021-38291.patch \
+ "
SRC_URI[md5sum] = "348956fc2faa57a2f79bbb84ded9fbc3"
SRC_URI[sha256sum] = "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 02/38] linux-yocto/5.4: update to v5.4.149
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 01/38] ffmpeg: Add fix for CVEs Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 03/38] linux-yocto/5.4: update to v5.4.150 Steve Sakoman
` (35 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
e74e2950a0d6 Linux 5.4.149
382526348612 drm/nouveau/nvkm: Replace -ENOSYS with -ENODEV
409cb0b3d45a rtc: rx8010: select REGMAP_I2C
43832bf76363 blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
c37a34d7975f pwm: stm32-lp: Don't modify HW state in .remove() callback
8a29e68ea8e8 pwm: rockchip: Don't modify HW state in .remove() callback
ed60d2db3171 pwm: img: Don't modify HW state in .remove() callback
b16f4acf6b65 nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group
594addd4369e nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
237ca37ca5ac nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group
288c8b5ba52d nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group
dc70f0c8c3de nilfs2: fix NULL pointer in nilfs_##name##_attr_release
9c3ba404881d nilfs2: fix memory leak in nilfs_sysfs_create_device_group
fb4c7d2923de btrfs: fix lockdep warning while mounting sprout fs
3f2d5c11bef8 ceph: lockdep annotations for try_nonblocking_invalidate
3bbb11261a75 ceph: request Fw caps before updating the mtime in ceph_write_iter
2c89a856fa49 dmaengine: xilinx_dma: Set DMA mask for coherent APIs
2f3206199dc9 dmaengine: ioat: depends on !UML
644f1e87fe73 dmaengine: sprd: Add missing MODULE_DEVICE_TABLE
445a3379f6df parisc: Move pci_dev_is_behind_card_dino to where it is used
2f7bfc07e386 drivers: base: cacheinfo: Get rid of DEFINE_SMP_CALL_CACHE_FUNCTION()
a12743d07249 thermal/core: Fix thermal_cooling_device_register() prototype
c7b9a866ee25 Kconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH
3c1d9b650c08 net: stmmac: reset Tx desc base address before restarting Tx
729f9d5ee374 phy: avoid unnecessary link-up delay in polling mode
81e6b51709da pwm: lpc32xx: Don't modify HW state in .probe() after the PWM chip was registered
b94def8a475f profiling: fix shift-out-of-bounds bugs
7e98111cb28e nilfs2: use refcount_dec_and_lock() to fix potential UAF
5607b1bae1c8 prctl: allow to setup brk for et_dyn executables
b40301607ca8 9p/trans_virtio: Remove sysfs file on probe failure
c3b45ea0a3c8 thermal/drivers/exynos: Fix an error code in exynos_tmu_probe()
e1060803039d dmaengine: acpi: Avoid comparison GSI with Linux vIRQ
93f8a98ad89c um: virtio_uml: fix memory leak on init failures
4cd05e390a3b staging: rtl8192u: Fix bitwise vs logical operator in TranslateRxSignalStuff819xUsb()
2f4b67bceb09 sctp: add param size validation for SCTP_PARAM_SET_PRIMARY
cbd10b118902 sctp: validate chunk size in __rcv_asconf_lookup
6a12918e9065 ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE
2f7974cd7b12 ARM: 9079/1: ftrace: Add MODULE_PLTS support
1b27a03d1292 ARM: 9078/1: Add warn suppress parameter to arm_gen_branch_link()
490be340c86c ARM: 9077/1: PLT: Move struct plt_entries definition to header
278df0646003 apparmor: remove duplicate macro list_entry_is_head()
f23763ab464f ARM: Qualify enabling of swiotlb_init()
6bfdc3056ca8 s390/pci_mmio: fully validate the VMA before calling follow_pte()
bd292c687390 console: consume APC, DM, DCS
b0c813fbbf75 KVM: remember position in kvm->vcpus array
5163578e9d0b PCI/ACPI: Add Ampere Altra SOC MCFG quirk
ec29e33e5cba PCI: aardvark: Fix reporting CRS value
3f0e275e43f6 PCI: pci-bridge-emul: Add PCIe Root Capabilities Register
296895c4f0c8 PCI: aardvark: Indicate error in 'val' when config read fails
2fcb7b7a1d20 PCI: pci-bridge-emul: Fix big-endian support
07e5f23d3fa6 Linux 5.4.148
54ac8339ae99 s390/bpf: Fix 64-bit subtraction of the -0x80000000 constant
a5fc48000b0e s390/bpf: Fix optimizing out zero-extensions
f7f1bac8983f net: renesas: sh_eth: Fix freeing wrong tx descriptor
3d32ce5472bb ip_gre: validate csum_start only on pull
f9b308f7302e qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom
93f54354ccc8 fq_codel: reject silly quantum parameters
d448b240b175 netfilter: socket: icmp6: fix use-after-scope
b79204169de5 net: dsa: b53: Fix calculating number of switch ports
d5c0f016ae85 perf unwind: Do not overwrite FEATURE_CHECK_LDFLAGS-libunwind-{x86,aarch64}
114bf5776f56 ARC: export clear_user_page() for modules
9b63c27d6b70 mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'
14e0fdc43ddf PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
810f9b6f0a40 KVM: arm64: Handle PSCI resets before userspace touches vCPU state
5f289dcf0b02 mfd: tqmx86: Clear GPIO IRQ resource when no IRQ is set
e1746c27c373 PCI: Fix pci_dev_str_match_path() alloc while atomic bug
beaf65f0fe0c mfd: axp20x: Update AXP288 volatile ranges
4a6c7c818bcb NTB: perf: Fix an error code in perf_setup_inbuf()
5a1614194963 NTB: Fix an error code in ntb_msit_probe()
098069796940 ethtool: Fix an error code in cxgb2.c
f336aa92b431 PCI: ibmphp: Fix double unmap of io_mem
0f9550c4f40d block, bfq: honor already-setup queue merges
b61a99dda392 net: usb: cdc_mbim: avoid altsetting toggling for Telit LN920
79b584d85912 Set fc_nlinfo in nh_create_ipv4, nh_create_ipv6
cf4168c4e0ec PCI: Add ACS quirks for Cavium multi-function devices
b3435cd96848 tracing/probes: Reject events which have the same name of existing one
32280649f044 mfd: Don't use irq_create_mapping() to resolve a mapping
e904621ae0b7 fuse: fix use after free in fuse_read_interrupt()
a1eaaa6b7d88 PCI: Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms
47c4490617d1 mfd: db8500-prcmu: Adjust map to reality
88834a62539f dt-bindings: mtd: gpmc: Fix the ECC bytes vs. OOB bytes equation
86565668215f mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
d291cca2c4f7 net: hns3: fix the timing issue of VF clearing interrupt sources
65bcb8f73ae3 net: hns3: disable mac in flr process
d8fe64c3511e net: hns3: change affinity_mask to numa node range
dede0381da0b net: hns3: pad the short tunnel frame before sending to hardware
4bf2c9605dff KVM: PPC: Book3S HV: Tolerate treclaim. in fake-suspend mode changing registers
235f782d5e3b ibmvnic: check failover_pending in login response
d3939844ebdc dt-bindings: arm: Fix Toradex compatible typo
c642afd17ab5 qed: Handle management FW error
9ebbb8b964f5 tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()
baf450477143 net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup
498e765b8595 net/af_unix: fix a data-race in unix_dgram_poll
e7332a1ac14e vhost_net: fix OoB on sendmsg() failure.
172749c879f5 events: Reuse value read using READ_ONCE instead of re-reading it
cd78d9c9968f net/mlx5: Fix potential sleeping in atomic context
48e79555c22c net/mlx5: FWTrace, cancel work on alloc pd error flow
4655f8a5afc2 perf machine: Initialize srcline string member in add_location struct
6808e70a77e9 tipc: increase timeout in tipc_sk_enqueue()
678787dcfe92 r6040: Restore MDIO clock frequency after MAC reset
efe35db94897 net/l2tp: Fix reference count leak in l2tp_udp_recv_core
5ab04a4ffed0 dccp: don't duplicate ccid when cloning dccp sock
6c4b7a87ba79 ptp: dp83640: don't define PAGE0
faf9d465425b net-caif: avoid user-triggerable WARN_ON(1)
79ab38864d5e tipc: fix an use-after-free issue in tipc_recvmsg
08f33350ed8a x86/mm: Fix kern_addr_valid() to cope with existing but not present entries
fde4caf6fe4d s390/sclp: fix Secure-IPL facility detection
15b674b1e581 drm/etnaviv: add missing MMU context put when reaping MMU mapping
b2ec1e6f1d6f drm/etnaviv: reference MMU context when setting up hardware state
5827dbac41c7 drm/etnaviv: fix MMU context leak on GPU reset
5e67b3843540 drm/etnaviv: exec and MMU state is lost when resetting the GPU
7068030d5e26 drm/etnaviv: keep MMU context across runtime suspend/resume
a7970d4f0039 drm/etnaviv: stop abusing mmu_context as FE running marker
ee52ccecfe2c drm/etnaviv: put submit prev MMU context when it exists
a9bacefda031 drm/etnaviv: return context from etnaviv_iommu_context_get
b56b6c51a919 drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10
c221eb008a98 PCI: Add AMD GPU multi-function power dependencies
d180a373a014 PM: base: power: don't try to use non-existing RTC for storing data
484fbe9cc0d9 arm64/sve: Use correct size when reinitialising SVE state
2f725420339e bnx2x: Fix enabling network interfaces without VFs
66c88a479357 xen: reset legacy rtc flag for PV domU
c7fab1f53603 btrfs: fix upper limit for max_inline for page size 64K
b9cc70e3dcb4 drm/panfrost: Clamp lock region to Bifrost minimum
9a6c88548935 drm/panfrost: Use u64 for size in lock_region
6c635129bf49 drm/panfrost: Simplify lock_region calculation
825ba38dfd6a drm/amdgpu: Fix BUG_ON assert
d7a936da6389 drm/msi/mdp4: populate priv->kms in mdp4_kms_init
90358cb02a6c net: dsa: lantiq_gswip: fix maximum frame length
c1f12f440c0b lib/test_stackinit: Fix static initializer test
3c232895b835 platform/chrome: cros_ec_proto: Send command again when timeout occurs
0569920e4310 memcg: enable accounting for pids in nested pid namespaces
d0ddb80bbf10 mm,vmscan: fix divide by zero in get_scan_count
22b11dbbf94c mm/hugetlb: initialize hugetlb_usage in mm_init
1dc6df795c9f s390/pv: fix the forcing of the swiotlb
f3b57cf09012 cpufreq: powernv: Fix init_chip_info initialization in numa=off
b5eb54c4a903 scsi: qla2xxx: Sync queue idx with queue_pair_map idx
f499a9e9edde scsi: qla2xxx: Changes to support kdump kernel
cfa459132875 scsi: BusLogic: Fix missing pr_cont() use
a701ae9a0dd6 ovl: fix BUG_ON() in may_delete() when called from ovl_cleanup()
1a2f728b034a parisc: fix crash with signals and alloca
76bebc93e1c9 net: w5100: check return value after calling platform_get_resource()
3179dd79dbcf fix array-index-out-of-bounds in taprio_change
ef9a7867b25f net: fix NULL pointer reference in cipso_v4_doi_free
88a4ed85e80f ath9k: fix sleeping in atomic context
99b950d55e59 ath9k: fix OOB read ar9300_eeprom_restore_internal
5f70ea4a5c84 parport: remove non-zero check on count
c30ea33b03ff net/mlx5: DR, Enable QP retransmission
c9095f788d03 iwlwifi: mvm: fix access to BSS elements
f950996d64df iwlwifi: mvm: avoid static queue number aliasing
2db5ae5b28e7 iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed
3da13a1e2a45 drm/amdkfd: Account for SH/SE count when setting up cu masks.
2af60889c88e ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B
98381f840f22 ASoC: rockchip: i2s: Fix regmap_ops hang
a1c7bc02e192 usbip:vhci_hcd USB port can get stuck in the disabled state
4f6095b0c9d5 usbip: give back URBs for unsent unlink requests during cleanup
9a4a6805294f usb: musb: musb_dsps: request_irq() after initializing musb
d24381e5a73b Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set"
aa40cf19bfa9 cifs: fix wrong release in sess_alloc_buffer() failed path
39111cbb7b7c mmc: core: Return correct emmc response in case of ioctl error
26f55b60f22f selftests/bpf: Enlarge select() timeout for test_maps
48f5a5f0276d mmc: rtsx_pci: Fix long reads when clock is prescaled
4e773c5553b2 mmc: sdhci-of-arasan: Check return value of non-void funtions
a73bbfabfe6f of: Don't allow __of_attached_node_sysfs() without CONFIG_SYSFS
2fdf7d38ee86 ASoC: Intel: Skylake: Fix passing loadable flag for module
f6ff4d5609ca ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER
736f60bd4883 btrfs: tree-log: check btrfs_lookup_data_extent return value
53a72858bcae m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch
3710cff57d3c drm/exynos: Always initialize mapping in exynos_drm_register_dma()
727c973ffe51 lockd: lockd server-side shouldn't set fl_ops
a18cfd715e91 usb: chipidea: host: fix port index underflow and UBSAN complains
8deedce385d2 gfs2: Don't call dlm after protocol is unmounted
50cf8f1b6c39 staging: rts5208: Fix get_ms_information() heap buffer size
8dfd785ae110 rpc: fix gss_svc_init cleanup on failure
0bc818e0231a tcp: enable data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD
2918eca4970a serial: sh-sci: fix break handling for sysrq
d02a1c5fd7d9 opp: Don't print an error if required-opps is missing
d772d993b072 Bluetooth: Fix handling of LE Enhanced Connection Complete
fb8593e8ed36 nvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data
072660f6c688 arm64: dts: ls1046a: fix eeprom entries
08825a784e56 arm64: tegra: Fix compatible string for Tegra132 CPUs
a6b69a76c347 ARM: tegra: tamonten: Fix UART pad setting
a66049c5ff74 mac80211: Fix monitor MTU limit so that A-MSDUs get through
1e2842fb7ed3 drm/display: fix possible null-pointer dereference in dcn10_set_clock()
cf82fe45bef9 gpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port()
bbaa21da550d net/mlx5: Fix variable type to match 64bit
0d563020b8a3 Bluetooth: avoid circular locks in sco_sock_connect
37d7ae2b0578 Bluetooth: schedule SCO timeouts with delayed_work
c408efcb8ae6 selftests/bpf: Fix xdp_tx.c prog section name
350e7501eee8 drm/msm: mdp4: drop vblank get/put from prepare/complete_commit
e5450804778a net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe()
ed3400f22b58 arm64: dts: qcom: sdm660: use reg value for memory node
52f8a30730ee ARM: dts: imx53-ppd: Fix ACHC entry
e15afa6747fa media: tegra-cec: Handle errors of clk_prepare_enable()
53d02b04098b media: TDA1997x: fix tda1997x_query_dv_timings() return value
71de2779e52a media: v4l2-dv-timings.c: fix wrong condition in two for-loops
d785cef384f1 media: imx258: Limit the max analogue gain to 480
33bd83fe3ffd media: imx258: Rectify mismatch of VTS value
8d179746b3f3 ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output
37414bd6ec51 arm64: tegra: Fix Tegra194 PCIe EP compatible string
5a24034ad87f bonding: 3ad: fix the concurrency between __bond_release_one() and bond_3ad_state_machine_handler()
b6cee3583930 workqueue: Fix possible memory leaks in wq_numa_init()
9b4f0170e03d Bluetooth: skip invalid hci_sync_conn_complete_evt
7b1718666fb0 ata: sata_dwc_460ex: No need to call phy_exit() befre phy_init()
76cbc142a546 samples: bpf: Fix tracex7 error raised on the missing argument
917eb0bbb8d3 staging: ks7010: Fix the initialization of the 'sleep_status' structure
44fd61a8bd0d serial: 8250_pci: make setup_port() parameters explicitly unsigned
4beadefea857 hvsi: don't panic on tty_register_driver failure
af0bd97b9d71 xtensa: ISS: don't panic in rs_init
5418023f81cd serial: 8250: Define RX trigger levels for OxSemi 950 devices
b050848bba7d s390: make PCI mio support a machine flag
0dd8da8ad04b s390/jump_label: print real address in a case of a jump label bug
91b4d44c7c4d flow_dissector: Fix out-of-bounds warnings
8076709052e1 ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs()
faf0749c9062 video: fbdev: riva: Error out if 'pixclock' equals zero
ae0d210aa717 video: fbdev: kyro: Error out if 'pixclock' equals zero
98551f0a7b57 video: fbdev: asiliantfb: Error out if 'pixclock' equals zero
9dff06c50572 bpf/tests: Do not PASS tests without actually testing the result
58831317c9b1 bpf/tests: Fix copy-and-paste error in double word test
a23430e79ef7 drm/amd/amdgpu: Update debugfs link_settings output link_rate field in hex
9baa552b2f76 drm/amd/display: Fix timer_per_pixel unit error
6c78ee1aecb9 tty: serial: jsm: hold port lock when reporting modem line changes
7993ee173378 staging: board: Fix uninitialized spinlock when attaching genpd
995567ded019 usb: gadget: composite: Allow bMaxPower=0 if self-powered
44bbd4e6366f USB: EHCI: ehci-mv: improve error handling in mv_ehci_enable()
7b96de5c3042 usb: gadget: u_ether: fix a potential null pointer dereference
e1480bcb407e usb: host: fotg210: fix the actual_length of an iso packet
33109bdf2c41 usb: host: fotg210: fix the endpoint's transactional opportunities calculation
b190fdb93a9f igc: Check if num of q_vectors is smaller than max before array access
f4bf2fdfe37b drm: avoid blocking in drm_clients_info's rcu section
a1d12196c375 Smack: Fix wrong semantics in smk_access_entry()
c454b1a2155c netlink: Deal with ESRCH error in nlmsg_notify()
5adbbb27bb7c video: fbdev: kyro: fix a DoS bug by restricting user input
4ee6cc0f52db ARM: dts: qcom: apq8064: correct clock names
b9707a950492 iavf: fix locking of critical sections
35429d3aa387 iavf: do not override the adapter state in the watchdog task
ab03f15c1db4 iio: dac: ad5624r: Fix incorrect handling of an optional regulator.
0de0c1673927 tipc: keep the skb in rcv queue until the whole data is read
fe14f10c07c8 PCI: Use pci_update_current_state() in pci_enable_device_flags()
7d356909744f crypto: mxs-dcp - Use sg_mapping_iter to copy data
80bec14b4e09 media: dib8000: rewrite the init prbs logic
4cab14bcff25 ASoC: atmel: ATMEL drivers don't need HAS_DMA
4a7c6e9159be drm/amdgpu: Fix amdgpu_ras_eeprom_init()
d766826eeec4 userfaultfd: prevent concurrent API initialization
7bf2913a5bca kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y
0ac2ecb915e8 MIPS: Malta: fix alignment of the devicetree buffer
debdff960034 f2fs: fix to unmap pages from userspace process in punch_hole()
1c28c23dc82e f2fs: fix unexpected ENOENT comes from f2fs_map_blocks()
1ca5b00782df f2fs: fix to account missing .skipped_gc_rwsem
ec5cab379832 KVM: PPC: Fix clearing never mapped TCEs in realmode
e46ce5a8aba5 clk: at91: clk-generated: Limit the requested rate to our range
557f6445e37f clk: at91: clk-generated: pass the id of changeable parent at registration
d93a37889e3a clk: at91: sam9x60: Don't use audio PLL
57188e2cac47 fscache: Fix cookie key hashing
e2e3758a2cf9 platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call
ba5d4dc003b4 KVM: PPC: Book3S HV Nested: Reflect guest PMU in-use to L0 when guest SPRs are live
a02309beb2b8 HID: i2c-hid: Fix Elan touchpad regression
f934961bf4e2 scsi: target: avoid per-loop XCOPY buffer allocations
389946024f0e powerpc/config: Renable MTD_PHYSMAP_OF
db16408d52a8 scsi: qedf: Fix error codes in qedf_alloc_global_queues()
5e56c8d843fa scsi: qedi: Fix error codes in qedi_alloc_global_queues()
a90ef02f012a scsi: smartpqi: Fix an error code in pqi_get_raid_map()
3365d41c0485 pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry()
ef476b8d5a9c scsi: fdomain: Fix error return code in fdomain_probe()
9ee7b45eddc4 SUNRPC: Fix potential memory corruption
be09cbd6a35f dma-debug: fix debugfs initialization order
9315497b1750 openrisc: don't printk() unconditionally
f56ee9af23cc f2fs: reduce the scope of setting fsck tag when de->name_len is zero
2a2afb6d26c6 f2fs: show f2fs instance in printk_ratelimited
25ed0498915a RDMA/efa: Remove double QP type assignment
b8bb4b28394a powerpc/stacktrace: Include linux/delay.h
02889ac588bd vfio: Use config not menuconfig for VFIO_NOIOMMU
b900cc481618 pinctrl: samsung: Fix pinctrl bank pin count
e69c28362116 docs: Fix infiniband uverbs minor number
fb42b9801e0a RDMA/iwcm: Release resources if iw_cm module initialization fails
7930b1f98dd8 IB/hfi1: Adjust pkey entry in index 0
2b1addd585a4 scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMAND
a02982545e61 f2fs: quota: fix potential deadlock
bd74d6de0b9e HID: input: do not report stylus battery state as "full"
0656eb5e7ed8 PCI: aardvark: Fix masking and unmasking legacy INTx interrupts
2b58db229eb6 PCI: aardvark: Increase polling delay to 1.5s while waiting for PIO response
0f39f8429c82 PCI: aardvark: Fix checking for PIO status
d810fa6f5f0f PCI: xilinx-nwl: Enable the clock through CCF
d43ad02ad3a8 PCI: Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure
3aa6d023c6d6 PCI: Restrict ASMedia ASM1062 SATA Max Payload Size Supported
4d2bc69df9fa PCI/portdrv: Enable Bandwidth Notification only if port supports it
0445da50b727 ARM: 9105/1: atags_to_fdt: don't warn about stack size
8ec08f1431ce libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs
7cfbf391e870 dmaengine: imx-sdma: remove duplicated sdma_load_context
788122c99d85 Revert "dmaengine: imx-sdma: refine to load context only once"
86e1abcd143f media: rc-loopback: return number of emitters rather than error
9d91046f6b4e media: uvc: don't do DMA on stack
1ccb1fa41f4c VMCI: fix NULL pointer dereference when unmapping queue pair
80d167590330 dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc()
a6d4ac3f861b power: supply: max17042: handle fails of reading status register
668370dd4c90 block: bfq: fix bfq_set_next_ioprio_data()
cfdd25cd426d crypto: public_key: fix overflow during implicit conversion
3411b481ed24 arm64: head: avoid over-mapping in map_memory
991b64b89b66 soc: aspeed: p2a-ctrl: Fix boundary check for mmap
2712f29c44f1 soc: aspeed: lpc-ctrl: Fix boundary check for mmap
24c245de17ea soc: qcom: aoss: Fix the out of bound usage of cooling_devs
603dbb1fa272 pinctrl: ingenic: Fix incorrect pull up/down info
eda59ca42fde pinctrl: stmfx: Fix hazardous u8[] to unsigned long cast
d4acec5e9454 tools/thermal/tmon: Add cross compiling support
8a964aa6ed43 9p/xen: Fix end of loop tests for list_for_each_entry
7d81fcc20316 include/linux/list.h: add a macro to test if entry is pointing to the head
4bc0d1b535da xen: fix setting of max_pfn in shared_info
27f3b7f5c6e0 powerpc/perf/hv-gpci: Fix counter value parsing
7e9e6d0e07ec PCI/MSI: Skip masking MSI-X on Xen PV
2edc06fa381a blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
8da22cc41ada blk-zoned: allow zone management send operations without CAP_SYS_ADMIN
cd7b39e7c475 btrfs: reset replace target device to allocation state on close
8554095328ac btrfs: wake up async_delalloc_pages waiters after submit
d609c63a7165 rtc: tps65910: Correct driver module alias
48a24510c328 Linux 5.4.147
1f8ee024498d Revert "time: Handle negative seconds correctly in timespec64_to_ns()"
dc15f641c6cc Revert "posix-cpu-timers: Force next expiration recalc after itimer reset"
541e757944aa Revert "block: nbd: add sanity check for first_minor"
5f3ecbf4d586 Revert "Bluetooth: Move shutdown callback before flushing tx and rx queue"
245f15a48cdc Linux 5.4.146
b40facee46db clk: kirkwood: Fix a clocking boot regression
8810c51077b0 backlight: pwm_bl: Improve bootloader/kernel device handover
5de2ee621bc4 fbmem: don't allow too huge resolutions
4a95b04afab5 IMA: remove the dependency on CRYPTO_MD5
c69935f0b0aa IMA: remove -Wmissing-prototypes warning
85b0726d5bd7 fuse: flush extending writes
8a98ced6e1c8 fuse: truncate pagecache on atomic_o_trunc
06dad664d4ea KVM: nVMX: Unconditionally clear nested.pi_pending on nested VM-Enter
1735cec1e83c KVM: x86: Update vCPU's hv_clock before back to guest when tsc_offset is adjusted
20fff3ef33b2 KVM: s390: index kvm->arch.idle_mask by vcpu_idx
0323ab5b254e x86/resctrl: Fix a maybe-uninitialized build warning treated as error
51f4575ca182 perf/x86/amd/ibs: Extend PERF_PMU_CAP_NO_EXCLUDE to IBS Op
03c3e977eeac tty: Fix data race between tiocsti() and flush_to_ldisc()
7a25a0a94c8b time: Handle negative seconds correctly in timespec64_to_ns()
ae968e270f2e bpf: Fix pointer arithmetic mask tightening under state pruning
a0a4778feae1 bpf: verifier: Allocate idmap scratch in verifier env
f5893af2704e bpf: Fix leakage due to insufficient speculative store bypass mitigation
e80c3533c354 bpf: Introduce BPF nospec instruction for mitigating Spectre v4
1c9424a765af ipv4: fix endianness issue in inet_rtm_getroute_build_skb()
b3fe6d192126 octeontx2-af: Fix loop in free and unmap counter
8216d7157bcf net: qualcomm: fix QCA7000 checksum handling
4648917e499c net: sched: Fix qdisc_rate_table refcount leak when get tcf_block failed
e46e23c289f6 ipv4: make exception cache less predictible
f73cbdd1b8e7 ipv6: make exception cache less predictible
aa167dcde4c7 brcmfmac: pcie: fix oops on failure to resume and reprobe
5debec63a28f bcma: Fix memory leak for internally-handled cores
574e563649ec ath6kl: wmi: fix an error code in ath6kl_wmi_sync_point()
d946e685d6b7 ASoC: wcd9335: Disable irq on slave ports in the remove function
f3ec07f832bb ASoC: wcd9335: Fix a memory leak in the error handling path of the probe function
a6088f4ed3fc ASoC: wcd9335: Fix a double irq free in the remove function
7bfa680f3b47 tty: serial: fsl_lpuart: fix the wrong mapbase value
0f1375fa693b usb: bdc: Fix an error handling path in 'bdc_probe()' when no suitable DMA config is available
06203abb7275 usb: ehci-orion: Handle errors of clk_prepare_enable() in probe
a0a9ecca2dc4 i2c: mt65xx: fix IRQ check
b444064a0e0e CIFS: Fix a potencially linear read overflow
e37eeaf9506c bpf: Fix possible out of bound write in narrow load handling
fb8e695e9cfa mmc: moxart: Fix issue with uninitialized dma_slave_config
48b1f117e8d0 mmc: dw_mmc: Fix issue with uninitialized dma_slave_config
57314d8414d1 ASoC: Intel: Skylake: Fix module resource and format selection
92397571c243 ASoC: Intel: Skylake: Leave data as is when invoking TLV IPCs
b58cf18e384d rsi: fix an error code in rsi_probe()
d82fe3dd0b0f rsi: fix error code in rsi_load_9116_firmware()
4be8deab6f0d i2c: s3c2410: fix IRQ check
da3e5f32049a i2c: iop3xx: fix deferred probing
2da3272ae0ea Bluetooth: add timeout sanity check to hci_inquiry
70d71611eb83 mm/swap: consider max pages in iomap_swapfile_add_extent
8f5e26053c46 usb: gadget: mv_u3d: request_irq() after initializing UDC
eb3c6a25012f nfsd4: Fix forced-expiry locking
81e69d3fdd9e lockd: Fix invalid lockowner cast after vfs_test_lock
e1c02e2e6a7a mac80211: Fix insufficient headroom issue for AMSDU
606668e24a0d usb: phy: tahvo: add IRQ check
ecf18ac8ff76 usb: host: ohci-tmio: add IRQ check
abbcd61d091f Bluetooth: Move shutdown callback before flushing tx and rx queue
93ec1fd04f0f usb: gadget: udc: renesas_usb3: Fix soc_device_match() abuse
30d9607bcd73 usb: phy: twl6030: add IRQ checks
e1473ac28563 usb: phy: fsl-usb: add IRQ check
9535f55d0cba usb: gadget: udc: at91: add IRQ check
05e5b16b79dc drm/msm/dsi: Fix some reference counted resource leaks
5ccb04c6e1fb Bluetooth: fix repeated calls to sco_sock_kill
c2451d5439d0 counter: 104-quad-8: Return error when invalid mode during ceiling_write
a1194b805c90 arm64: dts: exynos: correct GIC CPU interfaces address range on Exynos7
1b6fcd10375a drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs
156eaacba3d2 PM: EM: Increase energy calculation precision
5537dc810b2a Bluetooth: increase BTNAMSIZ to 21 chars to fix potential buffer overflow
c0faa638f016 debugfs: Return error during {full/open}_proxy_open() on rmmod
f44714b4eb2a soc: qcom: smsm: Fix missed interrupts if state changes while masked
e7997fe3e9ca PCI: PM: Enable PME if it can be signaled from D3cold
9e570f3d4777 PCI: PM: Avoid forcing PCI_D0 for wakeup reasons inconsistently
f865b316ccc6 media: venus: venc: Fix potential null pointer dereference on pointer fmt
d2ea2f0725cc media: em28xx-input: fix refcount bug in em28xx_usb_disconnect
ebf570042b5f leds: trigger: audio: Add an activate callback to ensure the initial brightness is set
0a01dc77662c leds: lt3593: Put fwnode in any case during ->probe()
e39c73563a38 i2c: highlander: add IRQ check
fba783ddd945 net: cipso: fix warnings in netlbl_cipsov4_add_std
9fdac650c413 cgroup/cpuset: Fix a partition bug with hotplug
ffde05819953 net/mlx5e: Prohibit inner indir TIRs in IPoIB
87f817c560e6 ARM: dts: meson8b: ec100: Fix the pwm regulator supply properties
e55d7cbe1fe2 ARM: dts: meson8b: mxq: Fix the pwm regulator supply properties
4b0bbc412b51 ARM: dts: meson8b: odroidc1: Fix the pwm regulator supply properties
f7058060c01b ARM: dts: meson8: Use a higher default GPU clock frequency
37ed461b52e9 tcp: seq_file: Avoid skipping sk during tcp_seek_last_pos
952136275367 drm/amdgpu/acp: Make PM domain really work
252fad3d0234 netns: protect netns ID lookups with RCU
bd1cd32caa67 6lowpan: iphc: Fix an off-by-one check of array index
c4895cf45fd5 Bluetooth: sco: prevent information leak in sco_conn_defer_accept()
a96eb96ce4c1 media: coda: fix frame_mem_ctrl for YUV420 and YVU420 formats
7163014d7d29 media: go7007: remove redundant initialization
810149287981 media: dvb-usb: Fix error handling in dvb_usb_i2c_init
fa8aaa769092 media: dvb-usb: fix uninit-value in vp702x_read_mac_addr
88933f9c93a0 media: dvb-usb: fix uninit-value in dvb_usb_adapter_dvb_init
f81c89614ee8 soc: qcom: rpmhpd: Use corner in power_off
5b3987f58325 arm64: dts: renesas: r8a77995: draak: Remove bogus adv7511w properties
6c106c73208a ARM: dts: aspeed-g6: Fix HVI3C function-group in pinctrl dtsi
004778bf390a bpf: Fix potential memleak and UAF in the verifier.
fa4802c54e69 bpf: Fix a typo of reuseport map in bpf.h.
9a193caf9d79 media: cxd2880-spi: Fix an error handling path
34106f526015 soc: rockchip: ROCKCHIP_GRF should not default to y, unconditionally
b92893053003 media: TDA1997x: enable EDID support
43282ca83ace drm/panfrost: Fix missing clk_disable_unprepare() on error in panfrost_clk_init()
fc9cf2229087 EDAC/i10nm: Fix NVDIMM detection
32d8a3684bba spi: spi-zynq-qspi: use wait_for_completion_timeout to make zynq_qspi_exec_mem_op not interruptible
4206dbc9857b spi: sprd: Fix the wrong WDG_LOAD_VAL
1f70517eac57 regulator: vctrl: Avoid lockdep warning in enable/disable ops
d255d6a6457f regulator: vctrl: Use locked regulator_get_voltage in probe path
013177ccc4c5 certs: Trigger creation of RSA module signing key if it's not an RSA key
cc74533a47c9 crypto: qat - use proper type for vf_mask
b3fa499d72a0 block: nbd: add sanity check for first_minor
c60a31db3990 clocksource/drivers/sh_cmt: Fix wrong setting if don't request IRQ for clock source channel
6b10d3d3a9ff lib/mpi: use kcalloc in mpi_resize
57c8e2ea47bc genirq/timings: Fix error return code in irq_timings_test_irqs()
2d00b22c8b81 spi: spi-pic32: Fix issue with uninitialized dma_slave_config
b29593d0696d spi: spi-fsl-dspi: Fix issue with uninitialized dma_slave_config
449884aeb358 sched: Fix UCLAMP_FLAG_IDLE setting
67da2d9c9e99 m68k: emu: Fix invalid free in nfeth_cleanup()
c68ba4a708fb s390/debug: fix debug area life cycle
7a67a00ea8a7 s390/kasan: fix large PMD pages address alignment check
98296eb3deca udf_get_extendedattr() had no boundary checks.
ae4240d1f4bf fcntl: fix potential deadlock for &fasync_struct.fa_lock
a6273c8c2aca crypto: qat - do not export adf_iov_putmsg()
7dfa7bb69e13 crypto: qat - fix naming for init/shutdown VF to PF notifications
843b4e713a80 crypto: qat - fix reuse of completion variable
4a988264556c crypto: qat - handle both source of interrupt in VF ISR
c2b3f81125a6 crypto: qat - do not ignore errors from enable_vf2pf_comms()
1c189ccef0cf libata: fix ata_host_start()
e55b627d6e1f s390/cio: add dev_busid sysfs entry for each subchannel
0423517520d3 power: supply: max17042_battery: fix typo in MAx17042_TOFF
eb45ae88bf10 nvmet: pass back cntlid on successful completion
6cb5d6ae687d nvme-rdma: don't update queue count when failing to set io queues
3073ec7f0642 nvme-tcp: don't update queue count when failing to set io queues
93cf19b4d9b3 bcache: add proper error unwinding in bcache_device_init
e55f20798f53 isofs: joliet: Fix iocharset=utf8 mount option
0f5cd92e5eb5 udf: Fix iocharset=utf8 mount option
86987cf0fbd2 udf: Check LVID earlier
cc608af36e00 hrtimer: Ensure timerfd notification for HIGHRES=n
a8457878307f hrtimer: Avoid double reprogramming in __hrtimer_start_range_ns()
c322a963d522 posix-cpu-timers: Force next expiration recalc after itimer reset
28996dbb8a74 rcu/tree: Handle VM stoppage in stall detection
b7c560ae51c6 sched/deadline: Fix missing clock update in migrate_task_rq_dl()
40db13e3efce crypto: omap-sham - clear dma flags only after omap_sham_update_dma_stop()
ebf0f71ae3bd power: supply: axp288_fuel_gauge: Report register-address on readb / writeb errors
bba2b82d1b48 sched/deadline: Fix reset_on_fork reporting of DL tasks
53a6ef40c6bc crypto: mxs-dcp - Check for DMA mapping errors
344a38789ab2 regmap: fix the offset of register error log
a5e42516a61e locking/mutex: Fix HANDOFF condition
a0f68fb55ebc Linux 5.4.145
d83f0b39e72e PCI: Call Max Payload Size-related fixup quirks early
0c8277e334da x86/reboot: Limit Dell Optiplex 990 quirk to early BIOS versions
d31a4c35b925 xhci: fix unsafe memory usage in xhci tracing
e00d39ca92bb usb: mtu3: fix the wrong HS mult value
c3ffd3501470 usb: mtu3: use @mult for HS isoc or intr
00b6325590a4 usb: host: xhci-rcar: Don't reload firmware after the completion
7a74ae301c2c ALSA: usb-audio: Add registration quirk for JBL Quantum 800
c1ea74f64209 Revert "btrfs: compression: don't try to compress if we don't have enough pages"
f05c74e10463 x86/events/amd/iommu: Fix invalid Perf result due to IOMMU PMC power-gating
b1ca1665e674 Revert "r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM"
cf1222b877b0 mm/page_alloc: speed up the iteration of max_order
17d409c83e76 net: ll_temac: Remove left-over debug message
ccadb9143796 powerpc/boot: Delete unneeded .globl _zimage_start
295501c77c4c ipv4/icmp: l3mdev: Perform icmp error route lookup on source device routing table (v2)
6dec8e17b8db USB: serial: mos7720: improve OOM-handling in read_mos_reg()
d84708451d90 igmp: Add ip_mc_list lock in ip_check_mc_rcu
cd8ad6ed9ae5 media: stkwebcam: fix memory leak in stk_camera_probe
9febc9153fdb ARC: wireup clone3 syscall
417b11d3255c ALSA: pcm: fix divide error in snd_pcm_lib_ioctl
cf28619cd9c6 ALSA: hda/realtek: Workaround for conflicting SSID on ASUS ROG Strix G17
a8146f149028 ARM: 8918/2: only build return_address() if needed
ebad44b6432e cryptoloop: add a deprecation warning
d12526ddf5e3 perf/x86/amd/power: Assign pmu.module
be1f76fceec4 perf/x86/amd/ibs: Work around erratum #1197
861118d64e50 perf/x86/intel/pt: Fix mask of num_address_ranges
40d23de514cd qede: Fix memset corruption
468623f69683 net: macb: Add a NULL check on desc_ptp
50f73f31ae63 qed: Fix the VF msix vectors flow
92abb09f7ab7 reset: reset-zynqmp: Fixed the argument data type
b820c4c651ea gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats
48051387fa80 xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG
56c77c1b5229 kthread: Fix PF_KTHREAD vs to_kthread() race
af3cf928b998 ubifs: report correct st_size for encrypted symlinks
aa4e216156e8 f2fs: report correct st_size for encrypted symlinks
52d8e5b0abb9 ext4: report correct st_size for encrypted symlinks
228a4203d8b6 fscrypt: add fscrypt_symlink_getattr() for computing st_size
9b3849ba667a ext4: fix race writing to an inline_data file while its xattrs are changing
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index b6c84d0f1c..0a4392400a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "7f67141bca949eff8953f965c26475286d1a20cf"
-SRCREV_meta ?= "e4ccb53f204f722583178a9249fbf5d745f0d56a"
+SRCREV_machine ?= "4c265e0d0e3551dec36163b4e87fe1ce90bc3a40"
+SRCREV_meta ?= "6da37dca302efa8696e1164f14194af341c2808d"
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.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.144"
+LINUX_VERSION ?= "5.4.149"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 5ee1d359b2..3f8ce21024 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.144"
+LINUX_VERSION ?= "5.4.149"
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 ?= "08336ce8b4ebc2b21c28488c85098c6816f3d99f"
-SRCREV_machine ?= "8220749d3e8643091b118d93a857333e2c91a1eb"
-SRCREV_meta ?= "e4ccb53f204f722583178a9249fbf5d745f0d56a"
+SRCREV_machine_qemuarm ?= "c0e6ebbecc2eba46d3d26b841519e518b93f8081"
+SRCREV_machine ?= "56ff0be143ef1eff47eb90eac6768e452700c070"
+SRCREV_meta ?= "6da37dca302efa8696e1164f14194af341c2808d"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index ac0a72605d..92051b38f6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "78a2f9d323a755a34cdc96af4bcf61ffd32a3db0"
-SRCREV_machine_qemuarm64 ?= "aa6ec6934e35c8b0948f6b7c9bdbdef45d72be35"
-SRCREV_machine_qemumips ?= "a892524441b30e5e8c491e22e36e3473fc6a0fe0"
-SRCREV_machine_qemuppc ?= "784ca7c7837811123b5bd97cde964e45fbf5179b"
-SRCREV_machine_qemuriscv64 ?= "e3134debcf01f0aa20103e22fe2ef5fc7c201120"
-SRCREV_machine_qemux86 ?= "e3134debcf01f0aa20103e22fe2ef5fc7c201120"
-SRCREV_machine_qemux86-64 ?= "e3134debcf01f0aa20103e22fe2ef5fc7c201120"
-SRCREV_machine_qemumips64 ?= "d765ea7455bf978a9a86e8e90e032336b0baf887"
-SRCREV_machine ?= "e3134debcf01f0aa20103e22fe2ef5fc7c201120"
-SRCREV_meta ?= "e4ccb53f204f722583178a9249fbf5d745f0d56a"
+SRCREV_machine_qemuarm ?= "02d9640a2cf032508b87ea5e8b021112e8327352"
+SRCREV_machine_qemuarm64 ?= "fb8d74b308e3ed71ee8a83794dfe13dff0f612bf"
+SRCREV_machine_qemumips ?= "42e53ea6e3bdb0dd3efeca6cb09310bce0d817d0"
+SRCREV_machine_qemuppc ?= "0aa4502926c02102c63f5a425dd31219eecf22b1"
+SRCREV_machine_qemuriscv64 ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
+SRCREV_machine_qemux86 ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
+SRCREV_machine_qemux86-64 ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
+SRCREV_machine_qemumips64 ?= "78bc22d494fdcbb71ecda4cb722a74feea923eb6"
+SRCREV_machine ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
+SRCREV_meta ?= "6da37dca302efa8696e1164f14194af341c2808d"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,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.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.144"
+LINUX_VERSION ?= "5.4.149"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 03/38] linux-yocto/5.4: update to v5.4.150
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 01/38] ffmpeg: Add fix for CVEs Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 02/38] linux-yocto/5.4: update to v5.4.149 Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 04/38] linux-yocto/5.4: update to v5.4.153 Steve Sakoman
` (34 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
3a7dc5b4cfbd Linux 5.4.150
27f8c4402c4a qnx4: work around gcc false positive warning bug
3a0f951e3725 xen/balloon: fix balloon kthread freezing
f80b6793811d arm64: dts: marvell: armada-37xx: Extend PCIe MEM space
04783de9c0f3 thermal/drivers/int340x: Do not set a wrong tcc offset on resume
de1c3506806d EDAC/synopsys: Fix wrong value type assignment for edac_mode
8ede848bc99e spi: Fix tegra20 build with CONFIG_PM=n
d193f7dbf4ec net: 6pack: Fix tx timeout and slot time
fa56f2c987c7 alpha: Declare virt_to_phys and virt_to_bus parameter as pointer to volatile
af4a142ab798 arm64: Mark __stack_chk_guard as __ro_after_init
aeb19da46c7d parisc: Use absolute_pointer() to define PAGE0
8cd34eb616d9 qnx4: avoid stringop-overread errors
1214ace61402 sparc: avoid stringop-overread errors
113a8edfb9c9 net: i825xx: Use absolute_pointer for memcpy from fixed memory location
2397ea2db22b compiler.h: Introduce absolute_pointer macro
d12ddd843f18 blk-cgroup: fix UAF by grabbing blkcg lock before destroying blkg pd
9d7798823264 sparc32: page align size in arch_dma_alloc
ec49f3f7f669 nvme-multipath: fix ANA state updates when a namespace is not present
29917bbb07c3 xen/balloon: use a kernel thread instead a workqueue
93937596e065 bpf: Add oversize check before call kvcalloc()
7273cb182f13 ipv6: delay fib6_sernum increase in fib6_add
7432ecc55fe9 m68k: Double cast io functions to unsigned long
29c70b0d335a net: stmmac: allow CSR clock of 300MHz
1da750d1e214 net: macb: fix use after free on rmmod
ebb8d26d93c3 blktrace: Fix uaf in blk_trace access after removing by sysfs
2b5befcd4045 md: fix a lock order reversal in md_alloc
42d3711c2378 irqchip/gic-v3-its: Fix potential VPE leak on error
71f323f60592 irqchip/goldfish-pic: Select GENERIC_IRQ_CHIP to fix build
1b59625da697 scsi: lpfc: Use correct scnprintf() limit
30d373dc3501 scsi: qla2xxx: Restore initiator in dual mode
d140ccb140c2 cifs: fix a sign extension bug
1c1062c5cf21 thermal/core: Potential buffer overflow in thermal_build_list_of_policies()
b869901caba4 fpga: machxo2-spi: Fix missing error code in machxo2_write_complete()
0ebc3e688f54 fpga: machxo2-spi: Return an error on failure
5bcead7cde68 tty: synclink_gt: rename a conflicting function name
c5f27aedf6bb tty: synclink_gt, drop unneeded forward declarations
1deb94d37a7e scsi: iscsi: Adjust iface sysfs attr detection
d0f4a2eeebbe net/mlx4_en: Don't allow aRFS for encapsulated packets
ae7b957ef003 qed: rdma - don't wait for resources under hw error recovery flow
23716d7153fc gpio: uniphier: Fix void functions to remove return value
f7fb7dbdfb25 net/smc: add missing error check in smc_clc_prfx_set()
363438ed5de0 bnxt_en: Fix TX timeout when TX ring size is set to the smallest
4c4c3052911b enetc: Fix illegal access when reading affinity_hint
cf9138c966dd platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()
a8e8b1481930 afs: Fix incorrect triggering of sillyrename on 3rd-party invalidation
acce91ba0d9f net: hso: fix muxed tty registration
494260e20ac2 serial: mvebu-uart: fix driver's tx_empty callback
2d7c20db7220 xhci: Set HCD flag to defer primary roothub registration
381c8ce0abc0 btrfs: prevent __btrfs_dump_space_info() to underflow its free space
d4ec140e7158 erofs: fix up erofs_lookup tracepoint
7751f609eadf mcb: fix error handling in mcb_alloc_bus()
406ff5bf727d USB: serial: option: add device id for Foxconn T99W265
4b2cf0faffce USB: serial: option: remove duplicate USB device ID
59564b0183cb USB: serial: option: add Telit LN920 compositions
5cc674a3f18e USB: serial: mos7840: remove duplicated 0xac24 device ID
20c9fdde30fb usb: core: hcd: Add support for deferring roothub registration
a6c7d3c2d127 Re-enable UAS for LaCie Rugged USB3-FW with fk quirk
4dc56951a8d9 staging: greybus: uart: fix tty use after free
aa2c274c279f binder: make sure fd closes complete
93fa08e9a32f USB: cdc-acm: fix minor-number release
0dc1cfa7b907 USB: serial: cp210x: add ID for GW Instek GDM-834x Digital Multimeter
85d3493085ab usb-storage: Add quirk for ScanLogic SL11R-IDE older than 2.6c
d4e7647695c9 xen/x86: fix PV trap handling on secondary processors
8b06b0f17f35 cifs: fix incorrect check for null pointer in header_assemble
b1f6efa27b24 usb: musb: tusb6010: uninitialized data in tusb_fifo_write_unaligned()
b8c806065160 usb: dwc2: gadget: Fix ISOC transfer complete handling for DDMA
ff275c870e1b usb: dwc2: gadget: Fix ISOC flow for BDMA and Slave
f013a5001b4a usb: gadget: r8a66597: fix a loop in set_feature()
aa40438c7174 ocfs2: drop acl cache for directories too
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 0a4392400a..506ef6931f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "4c265e0d0e3551dec36163b4e87fe1ce90bc3a40"
-SRCREV_meta ?= "6da37dca302efa8696e1164f14194af341c2808d"
+SRCREV_machine ?= "f3196d5b7c9ed7e02530a1e421520e851753c6b7"
+SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41"
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.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.149"
+LINUX_VERSION ?= "5.4.150"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 3f8ce21024..8165c58266 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.149"
+LINUX_VERSION ?= "5.4.150"
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 ?= "c0e6ebbecc2eba46d3d26b841519e518b93f8081"
-SRCREV_machine ?= "56ff0be143ef1eff47eb90eac6768e452700c070"
-SRCREV_meta ?= "6da37dca302efa8696e1164f14194af341c2808d"
+SRCREV_machine_qemuarm ?= "16773ce7bb039749a7ec8228128e184d9de4ccf6"
+SRCREV_machine ?= "cf292e8551f71965ea892fbb8bf1d1faecfaccb4"
+SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 92051b38f6..fecf7c2b02 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "02d9640a2cf032508b87ea5e8b021112e8327352"
-SRCREV_machine_qemuarm64 ?= "fb8d74b308e3ed71ee8a83794dfe13dff0f612bf"
-SRCREV_machine_qemumips ?= "42e53ea6e3bdb0dd3efeca6cb09310bce0d817d0"
-SRCREV_machine_qemuppc ?= "0aa4502926c02102c63f5a425dd31219eecf22b1"
-SRCREV_machine_qemuriscv64 ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
-SRCREV_machine_qemux86 ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
-SRCREV_machine_qemux86-64 ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
-SRCREV_machine_qemumips64 ?= "78bc22d494fdcbb71ecda4cb722a74feea923eb6"
-SRCREV_machine ?= "328c6fa2267540825e756abd9d7eea8d55d6d3aa"
-SRCREV_meta ?= "6da37dca302efa8696e1164f14194af341c2808d"
+SRCREV_machine_qemuarm ?= "c1b3bf44c81e3c46ad58289bb2448864367163ac"
+SRCREV_machine_qemuarm64 ?= "25136e7cd245182ff8287426c459e5b7b1c0939b"
+SRCREV_machine_qemumips ?= "2d5c012de1588897338ef93e259fe5266876018d"
+SRCREV_machine_qemuppc ?= "9c41d8b3be3976d1b752b29bfdfb01013ef72783"
+SRCREV_machine_qemuriscv64 ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
+SRCREV_machine_qemux86 ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
+SRCREV_machine_qemux86-64 ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
+SRCREV_machine_qemumips64 ?= "18bfd88fbfbc9de8a2ae219fabd724d633459ab8"
+SRCREV_machine ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
+SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,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.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.149"
+LINUX_VERSION ?= "5.4.150"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 04/38] linux-yocto/5.4: update to v5.4.153
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (2 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 03/38] linux-yocto/5.4: update to v5.4.150 Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 05/38] e2fsprogs: update to 1.45.6 Steve Sakoman
` (33 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
940a14a7d844 Linux 5.4.153
6a89b1e0c250 x86/Kconfig: Correct reference to MWINCHIP3D
5b3b400741a5 x86/hpet: Use another crystalball to evaluate HPET usability
367f643191b3 x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
9e2a9da532e0 RISC-V: Include clone3() on rv32
a326f9c01cfb bpf, s390: Fix potential memory leak about jit_data
60bacf259e8c i2c: acpi: fix resource leak in reconfiguration device addition
b723b34a9831 net: prefer socket bound to interface when not in VRF
17063cac4088 i40e: Fix freeing of uninitialized misc IRQ vector
0a1fcc981dec i40e: fix endless loop under rtnl
d6c066811921 gve: fix gve_get_stats()
d83787c26d21 rtnetlink: fix if_nlmsg_stats_size() under estimation
0311d9775390 gve: Correct available tx qpl check
11cd944bb87d drm/nouveau/debugfs: fix file release memory leak
cb7e65187983 video: fbdev: gbefb: Only instantiate device when built for IP32
04f981251e20 bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
809aa82ac64f netlink: annotate data races around nlk->bound
fd73c2e64b43 net: sfp: Fix typo in state machine debug string
c951c08a5996 net/sched: sch_taprio: properly cancel timer from taprio_destroy()
c2c45102ae19 net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()
8af0c7d3fb55 ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
ebe58e1c1a7f arm64: dts: ls1028a: add missing CAN nodes
1b9f0d242ab6 arm64: dts: freescale: Fix SP805 clock-names
27e53e23a3ce ptp_pch: Load module automatically if ID matches
a7b441a2e209 powerpc/fsl/dts: Fix phy-connection-type for fm1mac3
c951a3be5e88 net_sched: fix NULL deref in fifo_set_limit()
414bb4ead136 phy: mdio: fix memory leak
b14f28126c51 bpf: Fix integer overflow in prealloc_elems_and_freelist()
a3d68a42457a bpf, arm: Fix register clobbering in div/mod implementation
e0c6e864d28d xtensa: call irqchip_init only when CONFIG_USE_OF is selected
d10a2a8f8853 xtensa: use CONFIG_USE_OF instead of CONFIG_OF
73711563f5b5 xtensa: move XCHAL_KIO_* definitions to kmem_layout.h
c82cffe17124 arm64: dts: qcom: pm8150: use qcom,pm8998-pon binding
14c9c75d4809 ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo
720a4dceee22 ARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo
6b2855ac7ef7 soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment
1179cd690a76 ARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL reference
bdc189d6b69f soc: qcom: socinfo: Fixed argument passed to platform_set_data()
1a0fe45501a2 bpf, mips: Validate conditional branch offsets
7ed040244595 MIPS: BPF: Restore MIPS32 cBPF JIT
4239cd380afd ARM: dts: qcom: apq8064: use compatible which contains chipid
30d68bf74d52 ARM: dts: omap3430-sdp: Fix NAND device node
2abb4077fa1b xen/balloon: fix cancelled balloon action
42fbcbaa8a99 nfsd4: Handle the NFSv4 READDIR 'dircount' hint being zero
f88420197a04 nfsd: fix error handling of register_pernet_subsys() in init_nfsd()
fab338f33c25 ovl: fix missing negative dentry check in ovl_rename()
4920aae61bd9 mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk
47f7bb3dc2a3 xen/privcmd: fix error handling in mmap-resource processing
9d93cfdaf8d4 usb: typec: tcpm: handle SRC_STARTUP state if cc changes
b53aa224ada2 USB: cdc-acm: fix break reporting
3135935b7f9a USB: cdc-acm: fix racy tty buffer accesses
7c2392f03f3b Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
faaca480fd5c Linux 5.4.152
caff281e2073 libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
fecbe957ef4d silence nfscache allocation warnings with kvzalloc
5546e3987dd1 perf/x86: Reset destroy callback on event init failure
2787cde6cb5b kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]
ba58770c14e0 KVM: do not shrink halt_poll_ns below grow_start
d67e01e5e095 tools/vm/page-types: remove dependency on opt_file for idle page tracking
65c7e3c97378 scsi: ses: Retry failed Send/Receive Diagnostic commands
e4e756054d1a selftests:kvm: fix get_warnings_count() ignoring fscanf() return warn
1f830ab34585 selftests: be sure to make khdr before other targets
8b9c1c33e51d usb: dwc2: check return value after calling platform_get_resource()
5d124ee0d2d6 usb: testusb: Fix for showing the connection speed
350d048cc506 scsi: sd: Free scsi_disk device via put_device()
4f194b57696a ext2: fix sleeping in atomic bugs on error
2d8eb456742e sparc64: fix pci_iounmap() when CONFIG_PCI is not set
61504f62bb04 xen-netback: correct success/error reporting for the SKB-with-fraglist case
2ecca3b282c3 net: mdio: introduce a shutdown method to mdio device drivers
31cdcb6d430f Linux 5.4.151
965147067fa1 HID: usbhid: free raw_report buffers in usbhid_stop
6f2f68640b84 netfilter: ipset: Fix oversized kvmalloc() calls
fe9bb925e709 HID: betop: fix slab-out-of-bounds Write in betop_probe
24f3d2609114 crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd()
62c5cacb0986 usb: hso: remove the bailout parameter
fe57d53dd91d usb: hso: fix error handling code of hso_create_net_device
d29c7a1a322d hso: fix bailout in error case of probe
1f2b324e82c4 libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind
dd336267d848 PCI: Fix pci_host_bridge struct device release/free handling
e81f3b7e7112 net: stmmac: don't attach interface until resume finishes
f8ffde0bb96d net: udp: annotate data race around udp_sk(sk)->corkflag
9dbf7e343b69 HID: u2fzero: ignore incomplete packets without data
d518ea03145c ext4: fix potential infinite loop in ext4_dx_readdir()
59c19fdcde79 ext4: fix reserved space counter leakage
c4b8db2b4755 ext4: fix loff_t overflow in ext4_max_bitmap_size()
3253c87e1e5b ipack: ipoctal: fix module reference leak
9c802a05749a ipack: ipoctal: fix missing allocation-failure check
3fd682d461ab ipack: ipoctal: fix tty-registration error handling
e6a71c173eda ipack: ipoctal: fix tty registration race
8657158a3b68 ipack: ipoctal: fix stack information leak
91d5de0b710b debugfs: debugfs_create_file_size(): use IS_ERR to check for error
98574c91e373 elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings
9356e4dcebd8 perf/x86/intel: Update event constraints for ICX
0fcfaa8ed9d1 af_unix: fix races in sk_peer_pid and sk_peer_cred accesses
694b0cee7f85 net: sched: flower: protect fl_walk() with rcu
5a31d4e73ada net: hns3: do not allow call hns3_nic_net_open repeatedly
87de237b0b5c scsi: csiostor: Add module softdep on cxgb4
1b6ccfcec681 Revert "block, bfq: honor already-setup queue merges"
753096c38aa9 selftests, bpf: test_lwt_ip_encap: Really disable rp_filter
897d1401d1d6 e100: fix buffer overrun in e100_get_regs
93372e02f969 e100: fix length calculation in e100_get_regs_len
a2624e0934f0 net: ipv4: Fix rtnexthop len when RTA_FLOW is present
c37d3287e7a2 hwmon: (tmp421) fix rounding for negative values
8a07d5aba34b hwmon: (tmp421) report /PVLD condition as fault
ec018021cf44 sctp: break out if skb_header_pointer returns NULL in sctp_rcv_ootb
9bee85de2c81 mac80211-hwsim: fix late beacon hrtimer handling
21c3a844939c mac80211: mesh: fix potentially unaligned access
ab85997465b9 mac80211: limit injected vht mcs/nss in ieee80211_parse_tx_radiotap
87e06c44280d mac80211: Fix ieee80211_amsdu_aggregate frag_tail bug
a6c42ae1530f hwmon: (mlxreg-fan) Return non-zero value when fan current state is enforced from sysfs
2c30592255c6 ipvs: check that ip_vs_conn_tab_bits is between 8 and 20
9a571d83acb5 drm/amd/display: Pass PCI deviceid into DC
3443eb443f3a x86/kvmclock: Move this_cpu_pvti into kvmclock.h
50149e0866a8 mac80211: fix use-after-free in CCMP/GCMP RX
956bc3ee3197 scsi: ufs: Fix illegal offset in UPIU event trace
44d3c480e4e2 hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field
200ced5ba724 hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field
6cb01fe630ea hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field
504cf969d585 fs-verity: fix signed integer overflow with i_size near S64_MAX
b2fb6ce06c0f usb: cdns3: fix race condition before setting doorbell
e2370e193519 cpufreq: schedutil: Destroy mutex before kobject_put() frees the memory
67c98e023135 cpufreq: schedutil: Use kobject release() method to free sugov_tunables
883f7897a25e tty: Fix out-of-bound vmalloc access in imageblit
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 506ef6931f..13512ea6a4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "f3196d5b7c9ed7e02530a1e421520e851753c6b7"
-SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41"
+SRCREV_machine ?= "88b78bac3bf83e6b3ef08d77f895bba5128cc1cd"
+SRCREV_meta ?= "9e3ab4e615b651c1b63d4f0cce71da79a3e89763"
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.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.150"
+LINUX_VERSION ?= "5.4.153"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 8165c58266..e6e0ee73b2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.150"
+LINUX_VERSION ?= "5.4.153"
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 ?= "16773ce7bb039749a7ec8228128e184d9de4ccf6"
-SRCREV_machine ?= "cf292e8551f71965ea892fbb8bf1d1faecfaccb4"
-SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41"
+SRCREV_machine_qemuarm ?= "fed16a9b9cb56ce639eeddeedd756ad5207fa89e"
+SRCREV_machine ?= "942b0cc9a1ff13a66016167d4437f7694e96d04e"
+SRCREV_meta ?= "9e3ab4e615b651c1b63d4f0cce71da79a3e89763"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index fecf7c2b02..6c69878d03 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "c1b3bf44c81e3c46ad58289bb2448864367163ac"
-SRCREV_machine_qemuarm64 ?= "25136e7cd245182ff8287426c459e5b7b1c0939b"
-SRCREV_machine_qemumips ?= "2d5c012de1588897338ef93e259fe5266876018d"
-SRCREV_machine_qemuppc ?= "9c41d8b3be3976d1b752b29bfdfb01013ef72783"
-SRCREV_machine_qemuriscv64 ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
-SRCREV_machine_qemux86 ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
-SRCREV_machine_qemux86-64 ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
-SRCREV_machine_qemumips64 ?= "18bfd88fbfbc9de8a2ae219fabd724d633459ab8"
-SRCREV_machine ?= "6e15bad091dbe72ae0ec9cf65a1110afb5e45a5e"
-SRCREV_meta ?= "e14d587eec888fba8693da2a072f729219acfb41"
+SRCREV_machine_qemuarm ?= "7a9ca83b483c096e6bd5e1b99cca7fe2fb79fd1a"
+SRCREV_machine_qemuarm64 ?= "d2ea3664c5872b3046a2aa970035de51e359922f"
+SRCREV_machine_qemumips ?= "118685bb5211a7740de6bd419c68eb34728f8770"
+SRCREV_machine_qemuppc ?= "7e8785640416d3c6382f91a3f88e0eca14f0a8b5"
+SRCREV_machine_qemuriscv64 ?= "d54d61f9e363806a987c9ab01df0e66a31d4ead5"
+SRCREV_machine_qemux86 ?= "d54d61f9e363806a987c9ab01df0e66a31d4ead5"
+SRCREV_machine_qemux86-64 ?= "d54d61f9e363806a987c9ab01df0e66a31d4ead5"
+SRCREV_machine_qemumips64 ?= "bd5e23a14522aa81e0f0ee37f976edd108669eb5"
+SRCREV_machine ?= "d54d61f9e363806a987c9ab01df0e66a31d4ead5"
+SRCREV_meta ?= "9e3ab4e615b651c1b63d4f0cce71da79a3e89763"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,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.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.150"
+LINUX_VERSION ?= "5.4.153"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 05/38] e2fsprogs: update to 1.45.6
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (3 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 04/38] linux-yocto/5.4: update to v5.4.153 Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 06/38] e2fsprogs: upgrade 1.45.6 -> 1.45.7 Steve Sakoman
` (32 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Drop backports, and also 0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
as upstream code has been refactored.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit da9fec8592db913d13af3a936ab518e93496be3e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...-t-try-to-rehash-a-deleted-directory.patch | 49 ------------
...ate_inode.c-set-dir-s-mode-correctly.patch | 41 ----------
.../e2fsprogs/e2fsprogs/CVE-2019-5188.patch | 57 --------------
...fix-use-after-free-in-calculate_tree.patch | 76 -------------------
...-missing-check-for-permission-denied.patch | 2 +-
.../e2fsprogs/e2fsprogs/quiet-debugfs.patch | 2 +-
...2fsprogs_1.45.4.bb => e2fsprogs_1.45.6.bb} | 6 +-
7 files changed, 3 insertions(+), 230 deletions(-)
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch
delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.4.bb => e2fsprogs_1.45.6.bb} (94%)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch
deleted file mode 100644
index ba4e3a3c97..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 71ba13755337e19c9a826dfc874562a36e1b24d3 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Thu, 19 Dec 2019 19:45:06 -0500
-Subject: [PATCH] e2fsck: don't try to rehash a deleted directory
-
-If directory has been deleted in pass1[bcd] processing, then we
-shouldn't try to rehash the directory in pass 3a when we try to
-rehash/reoptimize directories.
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=71ba13755337e19c9a826dfc874562a36e1b24d3]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- e2fsck/pass1b.c | 4 ++++
- e2fsck/rehash.c | 2 ++
- 2 files changed, 6 insertions(+)
-
-diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c
-index 5693b9cf..bca701ca 100644
---- a/e2fsck/pass1b.c
-+++ b/e2fsck/pass1b.c
-@@ -705,6 +705,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino,
- fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx);
- if (ctx->inode_bad_map)
- ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino);
-+ if (ctx->inode_reg_map)
-+ ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino);
-+ ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino);
-+ ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino);
- ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(dp->inode.i_mode));
- quota_data_sub(ctx->qctx, &dp->inode, ino,
- pb.dup_blocks * fs->blocksize);
-diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
-index 3dd1e941..2c908be0 100644
---- a/e2fsck/rehash.c
-+++ b/e2fsck/rehash.c
-@@ -1028,6 +1028,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx)
- if (!ext2fs_u32_list_iterate(iter, &ino))
- break;
- }
-+ if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino))
-+ continue;
-
- pctx.dir = ino;
- if (first) {
---
-2.24.1
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
deleted file mode 100644
index fc4a540986..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f6d188580c2c9599319076fee22f2424652c711c Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Wed, 13 Sep 2017 19:55:35 -0700
-Subject: [PATCH] misc/create_inode.c: set dir's mode correctly
-
-The dir's mode has been set by ext2fs_mkdir() with umask, so
-reset it to the source's mode in set_inode_extra().
-
-Fixed when source dir's mode is 521, but tarball would be 721, this was
-incorrect.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- misc/create_inode.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/misc/create_inode.c b/misc/create_inode.c
-index 8ce3faf..50fbaa8 100644
---- a/misc/create_inode.c
-+++ b/misc/create_inode.c
-@@ -116,7 +116,14 @@ static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t ino,
-
- inode.i_uid = st->st_uid;
- inode.i_gid = st->st_gid;
-- inode.i_mode |= st->st_mode;
-+ /*
-+ * The dir's mode has been set by ext2fs_mkdir() with umask, so
-+ * reset it to the source's mode
-+ */
-+ if S_ISDIR(st->st_mode)
-+ inode.i_mode = LINUX_S_IFDIR | st->st_mode;
-+ else
-+ inode.i_mode |= st->st_mode;
- inode.i_atime = st->st_atime;
- inode.i_mtime = st->st_mtime;
- inode.i_ctime = st->st_ctime;
---
-2.10.2
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch
deleted file mode 100644
index de4bce0037..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8dd73c149f418238f19791f9d666089ef9734dff Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Thu, 19 Dec 2019 19:37:34 -0500
-Subject: [PATCH] e2fsck: abort if there is a corrupted directory block when
- rehashing
-
-In e2fsck pass 3a, when we are rehashing directories, at least in
-theory, all of the directories should have had corruptions with
-respect to directory entry structure fixed. However, it's possible
-(for example, if the user declined a fix) that we can reach this stage
-of processing with a corrupted directory entries.
-
-So check for that case and don't try to process a corrupted directory
-block so we don't run into trouble in mutate_name() if there is a
-zero-length file name.
-
-Addresses: TALOS-2019-0973
-Addresses: CVE-2019-5188
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-
-CVE: CVE-2019-5188
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=8dd73c149f418238f19791f9d666089ef9734dff]
----
- e2fsck/rehash.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
-index a5fc1be1..3dd1e941 100644
---- a/e2fsck/rehash.c
-+++ b/e2fsck/rehash.c
-@@ -160,6 +160,10 @@ static int fill_dir_block(ext2_filsys fs,
- dir_offset += rec_len;
- if (dirent->inode == 0)
- continue;
-+ if ((name_len) == 0) {
-+ fd->err = EXT2_ET_DIR_CORRUPTED;
-+ return BLOCK_ABORT;
-+ }
- if (!fd->compress && (name_len == 1) &&
- (dirent->name[0] == '.'))
- continue;
-@@ -401,6 +405,11 @@ static int duplicate_search_and_fix(e2fsck_t ctx, ext2_filsys fs,
- continue;
- }
- new_len = ext2fs_dirent_name_len(ent->dir);
-+ if (new_len == 0) {
-+ /* should never happen */
-+ ext2fs_unmark_valid(fs);
-+ continue;
-+ }
- memcpy(new_name, ent->dir->name, new_len);
- mutate_name(new_name, &new_len);
- for (j=0; j < fd->num_array; j++) {
---
-2.24.1
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch
deleted file mode 100644
index 342a2b855b..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Wang Shilong <wshilong@ddn.com>
-Date: Mon, 30 Dec 2019 19:52:39 -0500
-Subject: e2fsck: fix use after free in calculate_tree()
-
-The problem is alloc_blocks() will call get_next_block() which might
-reallocate outdir->buf, and memory address could be changed after
-this. To fix this, pointers that point into outdir->buf, such as
-int_limit and root need to be recaulated based on the new starting
-address of outdir->buf.
-
-[ Changed to correctly recalculate int_limit, and to optimize how we
- reallocate outdir->buf. -TYT ]
-
-Addresses-Debian-Bug: 948517
-Signed-off-by: Wang Shilong <wshilong@ddn.com>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-(cherry picked from commit 101e73e99ccafa0403fcb27dd7413033b587ca01)
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=101e73e99ccafa0403fcb27dd7413033b587ca01]
----
- e2fsck/rehash.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
-index 0a5888a9..2574e151 100644
---- a/e2fsck/rehash.c
-+++ b/e2fsck/rehash.c
-@@ -295,7 +295,11 @@ static errcode_t get_next_block(ext2_filsys fs, struct out_dir *outdir,
- errcode_t retval;
-
- if (outdir->num >= outdir->max) {
-- retval = alloc_size_dir(fs, outdir, outdir->max + 50);
-+ int increment = outdir->max / 10;
-+
-+ if (increment < 50)
-+ increment = 50;
-+ retval = alloc_size_dir(fs, outdir, outdir->max + increment);
- if (retval)
- return retval;
- }
-@@ -637,6 +641,9 @@ static int alloc_blocks(ext2_filsys fs,
- if (retval)
- return retval;
-
-+ /* outdir->buf might be reallocated */
-+ *prev_ent = (struct ext2_dx_entry *) (outdir->buf + *prev_offset);
-+
- *next_ent = set_int_node(fs, block_start);
- *limit = (struct ext2_dx_countlimit *)(*next_ent);
- if (next_offset)
-@@ -726,6 +733,9 @@ static errcode_t calculate_tree(ext2_filsys fs,
- return retval;
- }
- if (c3 == 0) {
-+ int delta1 = (char *)int_limit - outdir->buf;
-+ int delta2 = (char *)root - outdir->buf;
-+
- retval = alloc_blocks(fs, &limit, &int_ent,
- &dx_ent, &int_offset,
- NULL, outdir, i, &c2,
-@@ -733,6 +743,11 @@ static errcode_t calculate_tree(ext2_filsys fs,
- if (retval)
- return retval;
-
-+ /* outdir->buf might be reallocated */
-+ int_limit = (struct ext2_dx_countlimit *)
-+ (outdir->buf + delta1);
-+ root = (struct ext2_dx_entry *)
-+ (outdir->buf + delta2);
- }
- dx_ent->block = ext2fs_cpu_to_le32(i);
- if (c3 != limit->limit)
---
-2.24.1
-
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
index 4d335af4cf..284ac90196 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
@@ -1,4 +1,4 @@
-From e8331a76983e839a3d193446ab8ae9c1b09daa07 Mon Sep 17 00:00:00 2001
+From b55dfb4b62e507ae4f0814aec7597b56f9d6292a Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 10 Aug 2016 11:19:44 +0800
Subject: [PATCH] Fix missing check for permission denied.
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
index 95e6a7a2d5..aac88eed98 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
@@ -1,4 +1,4 @@
-From de6d6f0dd010f5b9d917553acb9430278f448f23 Mon Sep 17 00:00:00 2001
+From 9aa68ad81b97847dda3493145f4b0a7cc580c551 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 23 Dec 2013 13:38:34 +0000
Subject: [PATCH] e2fsprogs: silence debugfs
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
similarity index 94%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
index 2eae9cd892..4f5ad78154 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
@@ -4,12 +4,8 @@ SRC_URI += "file://remove.ldconfig.call.patch \
file://run-ptest \
file://ptest.patch \
file://mkdir_p.patch \
- file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \
file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \
- file://CVE-2019-5188.patch \
- file://0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch \
- file://e2fsck-fix-use-after-free-in-calculate_tree.patch \
"
SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
@@ -17,7 +13,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio
file://big-inodes-for-small-fs.patch \
"
-SRCREV = "984ff8d6a0a1d5dc300505f67b38ed5047d51dac"
+SRCREV = "506d96fe640f76ab04276e0a7c578aa108ce19f8"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 06/38] e2fsprogs: upgrade 1.45.6 -> 1.45.7
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (4 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 05/38] e2fsprogs: update to 1.45.6 Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 07/38] weston: Use systemd notify, Steve Sakoman
` (31 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Wang Mingyu <wangmy@cn.fujitsu.com>
0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch
removed since it is included in 1.45.7
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f51835e022731d1c0e8e18209e48f1a718048977)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../e2fsprogs/{e2fsprogs_1.45.6.bb => e2fsprogs_1.45.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.45.6.bb => e2fsprogs_1.45.7.bb} (99%)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb
similarity index 99%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb
index 4f5ad78154..3bc530e02b 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb
@@ -13,7 +13,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio
file://big-inodes-for-small-fs.patch \
"
-SRCREV = "506d96fe640f76ab04276e0a7c578aa108ce19f8"
+SRCREV = "5403970e44241cec26f98aaa0124b9881b4bbf4f"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 07/38] weston: Use systemd notify,
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (5 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 06/38] e2fsprogs: upgrade 1.45.6 -> 1.45.7 Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 08/38] multilib: Avoid sysroot race issues when multilib enabled Steve Sakoman
` (30 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Using systemd notify fixes the problem with dependency chain in case
if other services depend on running weston.
This change required more robust handling of weston modules arguments
due to custom argument parser impmentation in weston (only last
--modules argument is accepted) and fixes the bug in modules handling
in the weston-start script (only last argument is actually parsed by
weston). Master branch implements systemd-notify thus backport but
doesn't utilize modules anymore so this change is mostly dunfell
specific.
Upstream-status: Backport
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../wayland/weston-init/weston-start | 12 ++++++++++++
.../wayland/weston-init/weston@.service | 6 ++++++
.../wayland/weston/systemd-notify.weston-start | 9 +++++++++
.../wayland/weston/xwayland.weston-start | 3 +--
meta/recipes-graphics/wayland/weston_8.0.0.bb | 6 ++++++
5 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index ccc7093425..97471df80d 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -23,6 +23,15 @@ add_openvt_argument() {
openvt_args="$openvt_args $1"
}
+## Add module to --modules argument
+add_weston_module() {
+ if [ -z "${weston_modules}" ]; then
+ weston_modules="--modules "
+ fi;
+ weston_modules="${weston_modules}${1},"
+}
+
+
if [ -n "$WAYLAND_DISPLAY" ]; then
echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet."
exit 1
@@ -65,6 +74,9 @@ if [ -d "$modules_dir" ]; then
# process module
. $m
done
+ if [ -n "${weston_modules}" ]; then
+ add_weston_argument "${weston_modules} "
+ fi;
fi
if test -z "$XDG_RUNTIME_DIR"; then
diff --git a/meta/recipes-graphics/wayland/weston-init/weston@.service b/meta/recipes-graphics/wayland/weston-init/weston@.service
index 39e193014a..70c706d75c 100644
--- a/meta/recipes-graphics/wayland/weston-init/weston@.service
+++ b/meta/recipes-graphics/wayland/weston-init/weston@.service
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
[Unit]
Description=Weston Wayland Compositor
RequiresMountsFor=/run
@@ -5,6 +9,8 @@ Conflicts=plymouth-quit.service
After=systemd-user-sessions.service plymouth-quit-wait.service
[Service]
+Type=notify
+NotifyAccess=all
User=%i
PAMName=login
EnvironmentFile=-/etc/default/weston
diff --git a/meta/recipes-graphics/wayland/weston/systemd-notify.weston-start b/meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
new file mode 100644
index 0000000000..fdb48cb609
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+
+if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then
+ add_weston_module "systemd-notify.so"
+fi
diff --git a/meta/recipes-graphics/wayland/weston/xwayland.weston-start b/meta/recipes-graphics/wayland/weston/xwayland.weston-start
index b483c97cf1..22984f50a4 100644
--- a/meta/recipes-graphics/wayland/weston/xwayland.weston-start
+++ b/meta/recipes-graphics/wayland/weston/xwayland.weston-start
@@ -2,6 +2,5 @@
if type Xwayland >/dev/null 2>/dev/null; then
mkdir -p /tmp/.X11-unix
-
- add_weston_argument "--modules=xwayland.so"
+ add_weston_module "xwayland.so"
fi
diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb
index 0b383f25f3..2b120d7404 100644
--- a/meta/recipes-graphics/wayland/weston_8.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb
@@ -5,9 +5,11 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a"
+
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://weston.png \
file://weston.desktop \
+ file://systemd-notify.weston-start \
file://xwayland.weston-start \
file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
"
@@ -101,6 +103,10 @@ do_install_append() {
install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
fi
+ if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
+ install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+ fi
+
if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
chmod u+s ${D}${bindir}/weston-launch
fi
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 08/38] multilib: Avoid sysroot race issues when multilib enabled
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (6 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 07/38] weston: Use systemd notify, Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 09/38] oeqa/manual: Fix no longer valid URLs Steve Sakoman
` (29 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Multilib changes RECIPE_SYSROOT which can make the value in PSEUDO_IGNORE_PATHS
incorrect. Add the correct value, which fixes races over files in the sysroot.
[YOCTO #14581]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 64003e5e1b51c0cd561681b1ac13293546b8182b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/conf/multilib.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index d231107f8b..e9767c73b6 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -11,6 +11,8 @@ STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot"
+PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot"
+
INHERIT += "multilib_global"
BBCLASSEXTEND_append = " ${MULTILIBS}"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 09/38] oeqa/manual: Fix no longer valid URLs
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (7 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 08/38] multilib: Avoid sysroot race issues when multilib enabled Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 10/38] binutils: Fix a missing break in case statement Steve Sakoman
` (28 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Jon Mason <jdmason@kudzu.us>
autobuilder.yoctoproject.org URLS no longer work. Update them to a
working location.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 56f7bac1f0d1ced41e6908706be27149aa7b87e2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/manual/eclipse-plugin.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json
index d77d0e673b..6c110d0656 100644
--- a/meta/lib/oeqa/manual/eclipse-plugin.json
+++ b/meta/lib/oeqa/manual/eclipse-plugin.json
@@ -44,7 +44,7 @@
"expected_results": ""
},
"2": {
- "action": "wget autobuilder.yoctoproject.org/pub/releases//machines/qemu/qemux86/qemu (ex:core-image-sato-sdk-qemux86-date-rootfs-tar-bz2) \nsource /opt/poky/version/environment-setup-i585-poky-linux \n\nExtract qemu with runqemu-extract-sdk /home/user/file(ex.core-image-sato-sdk-qemux86.bz2) \n/home/user/qemux86-sato-sdk \n\n",
+ "action": "wget https://downloads.yoctoproject.org/releases/yocto/yocto-$VERSION/machines/qemu/qemux86/ (ex:core-image-sato-sdk-qemux86-date-rootfs-tar-bz2) \nsource /opt/poky/version/environment-setup-i585-poky-linux \n\nExtract qemu with runqemu-extract-sdk /home/user/file(ex.core-image-sato-sdk-qemux86.bz2) \n/home/user/qemux86-sato-sdk \n\n",
"expected_results": " Qemu can be lauched normally."
},
"3": {
@@ -60,7 +60,7 @@
"expected_results": ""
},
"6": {
- "action": "(d) QEMU: \nSelect this option if you will be using the QEMU emulator. Specify the Kernel matching the QEMU architecture you are using. \n wget autobuilder.yoctoproject.org/pub/releases//machines/qemu/qemux86/bzImage-qemux86.bin \n e.g: /home/$USER/yocto/adt-installer/download_image/bzImage-qemux86.bin \n\n",
+ "action": "(d) QEMU: \nSelect this option if you will be using the QEMU emulator. Specify the Kernel matching the QEMU architecture you are using. \n wget https://downloads.yoctoproject.org/releases/yocto/yocto-$VERSION/machines/qemu/qemux86/bzImage-qemux86.bin \n e.g: /home/$USER/yocto/adt-installer/download_image/bzImage-qemux86.bin \n\n",
"expected_results": ""
},
"7": {
@@ -247,7 +247,7 @@
"execution": {
"1": {
"action": "Clone eclipse-poky source. \n \n - git clone git://git.yoctoproject.org/eclipse-poky \n\n",
- "expected_results": "Eclipse plugin is successfully installed \n\nDocumentation is there. For example if you have release yocto-2.0.1 you will found on http://autobuilder.yoctoproject.org/pub/releases/yocto-2.0.1/eclipse-plugin/mars/ archive with documentation like org.yocto.doc-development-$date.zip \n \n"
+ "expected_results": "Eclipse plugin is successfully installed \n\nDocumentation is there. For example if you have release yocto-2.0.1 you will found on https://downloads.yoctoproject.org/releases/yocto/yocto-2.0.1/eclipse-plugin/mars/ archive with documentation like org.yocto.doc-development-$date.zip \n \n"
},
"2": {
"action": "Checkout correct tag. \n\n - git checkout <eclipse-version>/<yocto-version> \n\n",
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 10/38] binutils: Fix a missing break in case statement
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (8 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 09/38] oeqa/manual: Fix no longer valid URLs Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 11/38] scriptutils.py: Add check before deleting path Steve Sakoman
` (27 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Christian Eggers <ceggers@arri.de>
This was missed during patch forward porting
its only effective when printing options
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...-system-directories-when-cross-linki.patch | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
index 11a8110d40..88cce49e46 100644
--- a/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
+++ b/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
@@ -1,4 +1,4 @@
-From 7b24f81e04c9d00d96de7dbd250beade6d2c6e44 Mon Sep 17 00:00:00 2001
+From 12b658c0fe5771d16067baef933b7f34ed455def Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 15 Jan 2016 06:31:09 +0000
Subject: [PATCH] warn for uses of system directories when cross linking
@@ -59,8 +59,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
ld/ldfile.c | 17 +++++++++++++++++
ld/ldlex.h | 2 ++
ld/ldmain.c | 2 ++
- ld/lexsup.c | 15 +++++++++++++++
- 9 files changed, 85 insertions(+)
+ ld/lexsup.c | 16 ++++++++++++++++
+ 9 files changed, 86 insertions(+)
diff --git a/ld/config.in b/ld/config.in
index d93c9b0830..5da2742bea 100644
@@ -77,10 +77,10 @@ index d93c9b0830..5da2742bea 100644
#undef EXTRA_SHLIB_EXTENSION
diff --git a/ld/configure b/ld/configure
-index 811134a503..f8c17c19ae 100755
+index f432f4637d..a9da3c115e 100755
--- a/ld/configure
+++ b/ld/configure
-@@ -826,6 +826,7 @@ with_lib_path
+@@ -830,6 +830,7 @@ with_lib_path
enable_targets
enable_64_bit_bfd
with_sysroot
@@ -88,7 +88,7 @@ index 811134a503..f8c17c19ae 100755
enable_gold
enable_got
enable_compressed_debug_sections
-@@ -1491,6 +1492,8 @@ Optional Features:
+@@ -1495,6 +1496,8 @@ Optional Features:
--disable-largefile omit support for large files
--enable-targets alternative target configurations
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
@@ -97,7 +97,7 @@ index 811134a503..f8c17c19ae 100755
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
--enable-got=<type> GOT handling scheme (target, single, negative,
multigot)
-@@ -15788,6 +15791,19 @@ fi
+@@ -16624,6 +16627,19 @@ fi
@@ -222,10 +222,10 @@ index 5287f19a7f..55096e4fc9 100644
/* The initial parser states. */
diff --git a/ld/ldmain.c b/ld/ldmain.c
-index da1ad17763..12d0b07d8a 100644
+index c4af10f4e9..95b56b2d2d 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
-@@ -274,6 +274,8 @@ main (int argc, char **argv)
+@@ -273,6 +273,8 @@ main (int argc, char **argv)
command_line.warn_mismatch = TRUE;
command_line.warn_search_mismatch = TRUE;
command_line.check_section_addresses = -1;
@@ -235,7 +235,7 @@ index da1ad17763..12d0b07d8a 100644
/* We initialize DEMANGLING based on the environment variable
COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 3d15cc491d..0e8b4f2b7a 100644
+index 3d15cc491d..6478821443 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -550,6 +550,14 @@ static const struct ld_option ld_options[] =
@@ -253,10 +253,10 @@ index 3d15cc491d..0e8b4f2b7a 100644
};
#define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -1603,6 +1611,13 @@ parse_args (unsigned argc, char **argv)
-
+@@ -1604,6 +1612,14 @@ parse_args (unsigned argc, char **argv)
case OPTION_PRINT_MAP_DISCARDED:
config.print_map_discarded = TRUE;
+ break;
+
+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
+ command_line.poison_system_directories = FALSE;
@@ -264,6 +264,6 @@ index 3d15cc491d..0e8b4f2b7a 100644
+
+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
+ command_line.error_poison_system_directories = TRUE;
- break;
++ break;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 11/38] scriptutils.py: Add check before deleting path
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (9 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 10/38] binutils: Fix a missing break in case statement Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 12/38] rng-tools: add systemd-udev-settle wants to service Steve Sakoman
` (26 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Chandana kalluri <ckalluri@xilinx.com>
Add a check before deleting path when using recipetool commands to avoid the following type of errors:
Traceback (most recent call last):
File "<workdir>/sources/core/scripts/lib/scriptutils.py", line 218, in fetch_url
shutil.rmtree(path)
File "/usr/local/lib/python3.7/shutil.py", line 476, in rmtree
onerror(os.lstat, path, sys.exc_info())
File "/usr/local/lib/python3.7/shutil.py", line 474, in rmtree
orig_st = os.lstat(path)
FileNotFoundError: [Errno 2] No such file or directory: '<workdir>/build/tmp/work/recipetool-usg7o81n/work/recipe-sysroot'
ERROR: Command 'script -e -q -c "recipetool --color=always create --devtool -o /tmp/devtool5sq_op37 'file:///<SRCTREE>' -x <workdir>/build/workspace/sources/devtoolsrcxc1b9zjq -N test" /dev/null' failed
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b6aa8b47e023004ffd6958d1cec18c2d9c95d77b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
scripts/lib/scriptutils.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index f92255d8dc..3164171eb2 100644
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -215,7 +215,8 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False, mirr
pathvars = ['T', 'RECIPE_SYSROOT', 'RECIPE_SYSROOT_NATIVE']
for pathvar in pathvars:
path = rd.getVar(pathvar)
- shutil.rmtree(path)
+ if os.path.exists(path):
+ shutil.rmtree(path)
finally:
if fetchrecipe:
try:
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 12/38] rng-tools: add systemd-udev-settle wants to service
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (10 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 11/38] scriptutils.py: Add check before deleting path Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 13/38] tar: filter CVEs using vendor name Steve Sakoman
` (25 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Claudius Heine <ch@denx.de>
rngd needs to start after `systemd-udev-settle` in order for the kernel
modules of the random source hardware to be loaded before it is started.
However, since the `rngd.service` does not require or want
`systemd-udev-settle.service` it might not be scheduled for start and
the `After=systemd-udev-settle.service` there has no effect.
Adding `Wants=systemd-udev-settle.service` provides a weak requirement
to it, so that the `rngd` is started after it, if possible.
Signed-off-by: Claudius Heine <ch@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e9715d4234eb7b45dee8b323799014646f0a1b07)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-support/rng-tools/rng-tools/rngd.service | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service b/meta/recipes-support/rng-tools/rng-tools/rngd.service
index aaaaa29074..f296a99e1f 100644
--- a/meta/recipes-support/rng-tools/rng-tools/rngd.service
+++ b/meta/recipes-support/rng-tools/rng-tools/rngd.service
@@ -3,6 +3,7 @@ Description=Hardware RNG Entropy Gatherer Daemon
DefaultDependencies=no
After=systemd-udev-settle.service
Before=sysinit.target shutdown.target
+Wants=systemd-udev-settle.service
Conflicts=shutdown.target
[Service]
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 13/38] tar: filter CVEs using vendor name
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (11 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 12/38] rng-tools: add systemd-udev-settle wants to service Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 14/38] oeqa/selftest/sstatetests: fix typo ware -> were Steve Sakoman
` (24 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Ralph Siemsen <ralph.siemsen@linaro.org>
Recently a number of CVEs have been logged against a nodejs project
called "node-tar". These appear as false positives against the GNU tar
being built by Yocto. Some of these have been manually excluded using
CVE_CHECK_WHITELIST.
To avoid this problem, use the vendor name (in addition to package name)
for filtering CVEs. The syntax for this is:
CVE_PRODUCT = "vendor:package"
When not specified, the vendor defaults to "%" which matches anything.
Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 45d1a0bea0c628f84a00d641a4d323491988106f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-extended/tar/tar_1.32.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb
index 87eb8b4188..db1540dbd6 100644
--- a/meta/recipes-extended/tar/tar_1.32.bb
+++ b/meta/recipes-extended/tar/tar_1.32.bb
@@ -66,6 +66,6 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
BBCLASSEXTEND = "native nativesdk"
-# These are both specific to the NPM package node-tar
-CVE_CHECK_WHITELIST += "CVE-2021-32803 CVE-2021-32804"
-CVE_CHECK_WHITELIST += "CVE-2021-37701 CVE-2021-37712 CVE-2021-37713"
+# Avoid false positives from CVEs in node-tar package
+# For example CVE-2021-{32803,32804,37701,37712,37713}
+CVE_PRODUCT = "gnu:tar"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 14/38] oeqa/selftest/sstatetests: fix typo ware -> were
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (12 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 13/38] tar: filter CVEs using vendor name Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 15/38] patch.bbclass: when the patch fails show more info on the fatal error Steve Sakoman
` (23 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit c94a9ece226b1d2012f5ee966b81bf607d954937)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/sstatetests.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index c46e8ba489..f0c94c8422 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -137,7 +137,7 @@ class SStateTests(SStateBase):
filtered_results.append(r)
self.assertTrue(filtered_results == [], msg="Found distro non-specific sstate for: %s (%s)" % (', '.join(map(str, targets)), str(filtered_results)))
file_tracker_1 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False)
- self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets)))
+ self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files were created for: %s" % ', '.join(map(str, targets)))
self.track_for_cleanup(self.distro_specific_sstate + "_old")
shutil.copytree(self.distro_specific_sstate, self.distro_specific_sstate + "_old")
@@ -146,13 +146,13 @@ class SStateTests(SStateBase):
bitbake(['-cclean'] + targets)
bitbake(targets)
file_tracker_2 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False)
- self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets)))
+ self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files were created for: %s" % ', '.join(map(str, targets)))
not_recreated = [x for x in file_tracker_1 if x not in file_tracker_2]
- self.assertTrue(not_recreated == [], msg="The following sstate files ware not recreated: %s" % ', '.join(map(str, not_recreated)))
+ self.assertTrue(not_recreated == [], msg="The following sstate files were not recreated: %s" % ', '.join(map(str, not_recreated)))
created_once = [x for x in file_tracker_2 if x not in file_tracker_1]
- self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once)))
+ self.assertTrue(created_once == [], msg="The following sstate files were created only in the second run: %s" % ', '.join(map(str, created_once)))
def test_rebuild_distro_specific_sstate_cross_native_targets(self):
self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch, 'binutils-native'], temp_sstate_location=True)
@@ -202,9 +202,9 @@ class SStateTests(SStateBase):
actual_remaining_sstate = [x for x in self.search_sstate(target + r'.*?\.tgz$') if not any(pattern in x for pattern in ignore_patterns)]
actual_not_expected = [x for x in actual_remaining_sstate if x not in expected_remaining_sstate]
- self.assertFalse(actual_not_expected, msg="Files should have been removed but ware not: %s" % ', '.join(map(str, actual_not_expected)))
+ self.assertFalse(actual_not_expected, msg="Files should have been removed but were not: %s" % ', '.join(map(str, actual_not_expected)))
expected_not_actual = [x for x in expected_remaining_sstate if x not in actual_remaining_sstate]
- self.assertFalse(expected_not_actual, msg="Extra files ware removed: %s" ', '.join(map(str, expected_not_actual)))
+ self.assertFalse(expected_not_actual, msg="Extra files were removed: %s" ', '.join(map(str, expected_not_actual)))
def test_sstate_cache_management_script_using_pr_1(self):
global_config = []
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 15/38] patch.bbclass: when the patch fails show more info on the fatal error
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (13 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 14/38] oeqa/selftest/sstatetests: fix typo ware -> were Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 16/38] libpsl: Add config knobs for runtime/builtin conversion choices Steve Sakoman
` (22 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Jose Quaresma <quaresma.jose@gmail.com>
There are situations when the user have the 'patchdir' defined
as a parameter on SRC_URI. However he doesn't know that with this
the patch is applied relatively to the receipe source dir 'S'.
- When user have 'patchdir' defined check if this directory exist.
- If the patch fails show addition info to the user:
- Import: show the striplevel
- Resolver: show the expanded 'patchdir' to the user.
The next example is from opencv in meta-oe layer, here the
patch is applied on the target directory ${WORKDIR}/git/contrib.
S = "${WORKDIR}/git"
SRCREV_FORMAT = "opencv_contrib"
SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \
file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \
"
* When the patch fail there are no message that indicates the real reason.
patchdir=../no-found-on-file-system
ERROR: opencv-4.5.2-r0 do_patch: Command Error: 'quilt --quiltrc /build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
stdout: Applying patch 0001-sfm-link-with-Glog_LIBS.patch
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
* The check of the patchdir will add a new fatal error
when the user specifies a wrong path than don't exist.
patchdir=../no-found-on-file-system
ERROR: opencv-4.5.2-r0 do_patch: Target directory '/build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/git/../no-found-on-file-system' not found, patchdir '../no-found-on-file-system' is incorrect in patch file '0001-sfm-link-with-Glog_LIBS.patch'
* When we can't aplly the patch but the patchdir exist,
show the expanded patchdir on fatal error.
patchdir=../git
ERROR: opencv-4.5.2-r0 do_patch: Applying patch '0001-sfm-link-with-Glog_LIBS.patch' on target directory '/build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/git/../git'
Command Error: 'quilt --quiltrc /build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
stdout: Applying patch 0001-sfm-link-with-Glog_LIBS.patch
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit c44bc7c0fb8b7c2e44dd93607a3bfd9733e1df80)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/patch.bbclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 25ec089ae1..484d27ac76 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -131,6 +131,9 @@ python patch_do_patch() {
patchdir = parm["patchdir"]
if not os.path.isabs(patchdir):
patchdir = os.path.join(s, patchdir)
+ if not os.path.isdir(patchdir):
+ bb.fatal("Target directory '%s' not found, patchdir '%s' is incorrect in patch file '%s'" %
+ (patchdir, parm["patchdir"], parm['patchname']))
else:
patchdir = s
@@ -147,12 +150,12 @@ python patch_do_patch() {
patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
except Exception as exc:
bb.utils.remove(process_tmpdir, True)
- bb.fatal(str(exc))
+ bb.fatal("Importing patch '%s' with striplevel '%s'\n%s" % (parm['patchname'], parm['striplevel'], str(exc)))
try:
resolver.Resolve()
except bb.BBHandledException as e:
bb.utils.remove(process_tmpdir, True)
- bb.fatal(str(e))
+ bb.fatal("Applying patch '%s' on target directory '%s'\n%s" % (parm['patchname'], patchdir, str(e)))
bb.utils.remove(process_tmpdir, True)
del os.environ['TMPDIR']
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 16/38] libpsl: Add config knobs for runtime/builtin conversion choices
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (14 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 15/38] patch.bbclass: when the patch fails show more info on the fatal error Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 17/38] gcc: fix missing dependencies for selftests Steve Sakoman
` (21 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Andrej Valek <andrej.valek@siemens.com>
Based on d22d87b9c4ac85ffb3506e2acaf2a8a627f55e8e, but kept idn2
as default.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-support/libpsl/libpsl_0.21.0.bb | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/libpsl/libpsl_0.21.0.bb b/meta/recipes-support/libpsl/libpsl_0.21.0.bb
index b2dda191ce..66e64f785c 100644
--- a/meta/recipes-support/libpsl/libpsl_0.21.0.bb
+++ b/meta/recipes-support/libpsl/libpsl_0.21.0.bb
@@ -19,11 +19,10 @@ SRC_URI[sha256sum] = "41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd6
UPSTREAM_CHECK_URI = "https://github.com/rockdaboot/libpsl/releases"
-DEPENDS = "libidn2"
-
inherit autotools gettext gtk-doc manpages pkgconfig lib_package
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ?= "idn2"
PACKAGECONFIG[manpages] = "--enable-man,--disable-man,libxslt-native"
-
+PACKAGECONFIG[icu] = "--enable-runtime=libicu --enable-builtin=libicu,,icu"
+PACKAGECONFIG[idn2] = "--enable-runtime=libidn2 --enable-builtin=libidn2,,libidn2 libunistring"
BBCLASSEXTEND = "native nativesdk"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 17/38] gcc: fix missing dependencies for selftests
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (15 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 16/38] libpsl: Add config knobs for runtime/builtin conversion choices Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 18/38] m4: Do not use SIGSTKSZ Steve Sakoman
` (20 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
Building GCC with multiple make jobs appears to trigger a race condition. The build fails with:
/bin/bash: TOPDIR/tmp/work/x86_64-linux/gcc-cross-i686/9.3.0-r0/gcc-9.3.0/build.x86_64-linux.i686-poky-linux/./gcc/xgcc: No such file or directory
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/gcc/gcc-9.3.inc | 1 +
...x-missing-dependencies-for-selftests.patch | 45 +++++++++++++++++++
2 files changed, 46 insertions(+)
create mode 100644 meta/recipes-devtools/gcc/gcc-9.3/0040-fix-missing-dependencies-for-selftests.patch
diff --git a/meta/recipes-devtools/gcc/gcc-9.3.inc b/meta/recipes-devtools/gcc/gcc-9.3.inc
index 1c8e3df51d..235576e627 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-9.3.inc
@@ -69,6 +69,7 @@ SRC_URI = "\
file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \
file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \
+ file://0040-fix-missing-dependencies-for-selftests.patch \
file://0001-aarch64-New-Straight-Line-Speculation-SLS-mitigation.patch \
file://0002-aarch64-Introduce-SLS-mitigation-for-RET-and-BR-inst.patch \
file://0003-aarch64-Mitigate-SLS-for-BLR-instruction.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0040-fix-missing-dependencies-for-selftests.patch b/meta/recipes-devtools/gcc/gcc-9.3/0040-fix-missing-dependencies-for-selftests.patch
new file mode 100644
index 0000000000..c8960c6098
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0040-fix-missing-dependencies-for-selftests.patch
@@ -0,0 +1,45 @@
+From b19d8aac15649f31a7588b2634411a1922906ea8 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Wed, 3 Jun 2020 12:30:57 -0600
+Subject: [PATCH] Fix missing dependencies for selftests which occasionally
+ causes failed builds.
+
+gcc/
+
+ * Makefile.in (SELFTEST_DEPS): Move before including language makefile
+ fragments.
+
+Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b19d8aac15649f31a7588b2634411a1922906ea8]
+Signed-off-by:Steve Sakoman <steve@sakoman.com>
+
+---
+ gcc/Makefile.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index aab1dbba57b..be11311b60d 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -1735,6 +1735,10 @@ $(FULL_DRIVER_NAME): ./xgcc$(exeext)
+ $(LN_S) $< $@
+
+ #\f
++# SELFTEST_DEPS need to be set before including language makefile fragments.
++# Otherwise $(SELFTEST_DEPS) is empty when used from <LANG>/Make-lang.in.
++SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests
++
+ # Language makefile fragments.
+
+ # The following targets define the interface between us and the languages.
+@@ -2010,8 +2014,6 @@ DEVNULL=$(if $(findstring mingw,$(build)),nul,/dev/null)
+ SELFTEST_FLAGS = -nostdinc $(DEVNULL) -S -o $(DEVNULL) \
+ -fself-test=$(srcdir)/testsuite/selftests
+
+-SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests
+-
+ # Run the selftests during the build once we have a driver and the frontend,
+ # so that self-test failures are caught as early as possible.
+ # Use "s-selftest-FE" to ensure that we only run the selftests if the
+--
+2.27.0
+
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 18/38] m4: Do not use SIGSTKSZ
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (16 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 17/38] gcc: fix missing dependencies for selftests Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 19/38] gpgme: Use glibc provided closefrom API when available Steve Sakoman
` (19 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Fixes
../../m4-1.4.18/lib/c-stack.c:55:26: error: missing binary operator before token "("
55 | #elif HAVE_LIBSIGSEGV && SIGSTKSZ < 16384
| ^~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 44ca8edd622782733d507e20a3d5ee9e44eb8be4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/m4/m4-1.4.18.inc | 1 +
.../m4/0001-c-stack-stop-using-SIGSTKSZ.patch | 84 +++++++++++++++++++
2 files changed, 85 insertions(+)
create mode 100644 meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch
diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc
index a9b63c1bf6..6475b02f8b 100644
--- a/meta/recipes-devtools/m4/m4-1.4.18.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.18.inc
@@ -9,6 +9,7 @@ inherit autotools texinfo ptest
SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
file://ac_config_links.patch \
file://m4-1.4.18-glibc-change-work-around.patch \
+ file://0001-c-stack-stop-using-SIGSTKSZ.patch \
"
SRC_URI_append_class-target = " file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://run-ptest \
diff --git a/meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch b/meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch
new file mode 100644
index 0000000000..883b8a2075
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/0001-c-stack-stop-using-SIGSTKSZ.patch
@@ -0,0 +1,84 @@
+From 69238f15129f35eb4756ad8e2004e0d7907cb175 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 30 Apr 2021 17:40:36 -0700
+Subject: [PATCH] c-stack: stop using SIGSTKSZ
+
+This patch is required with glibc 2.34+
+based on gnulib [1]
+
+[1] https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=f9e2b20a12a230efa30f1d479563ae07d276a94b
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/c-stack.c | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/lib/c-stack.c b/lib/c-stack.c
+index 5353c08..863f764 100644
+--- a/lib/c-stack.c
++++ b/lib/c-stack.c
+@@ -51,13 +51,14 @@
+ typedef struct sigaltstack stack_t;
+ #endif
+ #ifndef SIGSTKSZ
+-# define SIGSTKSZ 16384
+-#elif HAVE_LIBSIGSEGV && SIGSTKSZ < 16384
++#define get_sigstksz() (16384)
++#elif HAVE_LIBSIGSEGV
+ /* libsigsegv 2.6 through 2.8 have a bug where some architectures use
+ more than the Linux default of an 8k alternate stack when deciding
+ if a fault was caused by stack overflow. */
+-# undef SIGSTKSZ
+-# define SIGSTKSZ 16384
++#define get_sigstksz() ((SIGSTKSZ) < 16384 ? 16384 : (SIGSTKSZ))
++#else
++#define get_sigstksz() ((SIGSTKSZ))
+ #endif
+
+ #include <stdlib.h>
+@@ -131,7 +132,8 @@ die (int signo)
+ /* Storage for the alternate signal stack. */
+ static union
+ {
+- char buffer[SIGSTKSZ];
++ /* allocate buffer with size from get_sigstksz() */
++ char *buffer;
+
+ /* These other members are for proper alignment. There's no
+ standard way to guarantee stack alignment, but this seems enough
+@@ -203,10 +205,11 @@ c_stack_action (void (*action) (int))
+ program_error_message = _("program error");
+ stack_overflow_message = _("stack overflow");
+
++ alternate_signal_stack.buffer = malloc(get_sigstksz());
+ /* Always install the overflow handler. */
+ if (stackoverflow_install_handler (overflow_handler,
+ alternate_signal_stack.buffer,
+- sizeof alternate_signal_stack.buffer))
++ get_sigstksz()))
+ {
+ errno = ENOTSUP;
+ return -1;
+@@ -279,14 +282,15 @@ c_stack_action (void (*action) (int))
+ stack_t st;
+ struct sigaction act;
+ st.ss_flags = 0;
++ alternate_signal_stack.buffer = malloc(get_sigstksz());
+ # if SIGALTSTACK_SS_REVERSED
+ /* Irix mistakenly treats ss_sp as the upper bound, rather than
+ lower bound, of the alternate stack. */
+- st.ss_sp = alternate_signal_stack.buffer + SIGSTKSZ - sizeof (void *);
+- st.ss_size = sizeof alternate_signal_stack.buffer - sizeof (void *);
++ st.ss_sp = alternate_signal_stack.buffer + get_sigstksz() - sizeof (void *);
++ st.ss_size = get_sigstksz() - sizeof (void *);
+ # else
+ st.ss_sp = alternate_signal_stack.buffer;
+- st.ss_size = sizeof alternate_signal_stack.buffer;
++ st.ss_size = get_sigstksz();
+ # endif
+ r = sigaltstack (&st, NULL);
+ if (r != 0)
+--
+2.31.1
+
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 19/38] gpgme: Use glibc provided closefrom API when available
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (17 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 18/38] m4: Do not use SIGSTKSZ Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 20/38] util-linux: disable raw Steve Sakoman
` (18 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
glibc 2.34+ has added this API new
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a2b2479d20d029f5a11dba8cf7f7ca3e4a5bbbe2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...se-closefrom-on-linux-and-glibc-2.34.patch | 24 +++++++++++++++++++
meta/recipes-support/gpgme/gpgme_1.13.1.bb | 3 ++-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch
diff --git a/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch
new file mode 100644
index 0000000000..1c46684c6d
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch
@@ -0,0 +1,24 @@
+From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 15 Jul 2021 12:33:13 -0700
+Subject: [PATCH] use closefrom() on linux and glibc 2.34+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/posix-io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/posix-io.c b/src/posix-io.c
+index e712ef2..ab8ded9 100644
+--- a/src/posix-io.c
++++ b/src/posix-io.c
+@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+ if (fd_list[i].fd > fd)
+ fd = fd_list[i].fd;
+ fd++;
+-#if defined(__sun) || defined(__FreeBSD__)
++#if defined(__sun) || defined(__FreeBSD__) || (defined(__GLIBC__) && __GNUC_PREREQ(2, 34))
+ closefrom (fd);
+ max_fds = fd;
+ #else /*!__sun */
diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
index 6e945d3165..dacc9896e4 100644
--- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
@@ -20,7 +20,8 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
file://0006-fix-build-path-issue.patch \
file://0007-python-Add-variables-to-tests.patch \
file://0008-do-not-auto-check-var-PYTHON.patch \
- "
+ file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \
+ "
SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645"
SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 20/38] util-linux: disable raw
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (18 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 19/38] gpgme: Use glibc provided closefrom API when available Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 21/38] pseudo: Fix to work with glibc 2.34 systems Steve Sakoman
` (17 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Markus Volk <f_l_k@t-online.de>
raw.h has been dropped in linux-libc-headers-5.14 leading to:
configure: error: raw selected, but required raw.h header file not available
WARNING: exit code 1 from a shell command.
Signed-off-by: MarkusVolk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7f577c10913104860121f682b9b3754870c4db23)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/util-linux/util-linux.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 0e85603d9a..af4c0b9974 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -94,7 +94,7 @@ EXTRA_OECONF = "\
\
--disable-bfs --disable-chfn-chsh --disable-login \
--disable-makeinstall-chown --disable-minix --disable-newgrp \
- --disable-use-tty-group --disable-vipw \
+ --disable-use-tty-group --disable-vipw --disable-raw \
\
--without-udev \
\
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 21/38] pseudo: Fix to work with glibc 2.34 systems
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (19 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 20/38] util-linux: disable raw Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 22/38] pseudo: Update with fcntl and glibc 2.34 fixes Steve Sakoman
` (16 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The merge of libdl into libc in glibc 2.34 causes problems for pseudo. Add a fix
that works around this issue.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit dd3e46a043c81cd4d81731a0f691868d3c059742)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../pseudo/files/build-oldlibc | 20 ++++++++
.../pseudo/files/older-glibc-symbols.patch | 49 +++++++++++++++++++
meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++
3 files changed, 73 insertions(+)
create mode 100755 meta/recipes-devtools/pseudo/files/build-oldlibc
create mode 100644 meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
diff --git a/meta/recipes-devtools/pseudo/files/build-oldlibc b/meta/recipes-devtools/pseudo/files/build-oldlibc
new file mode 100755
index 0000000000..85c438de4e
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/build-oldlibc
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Script to re-generate pseudo-prebuilt-2.33.tar.xz
+#
+# Copyright (C) 2021 Richard Purdie
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+for i in x86_64 aarch64 i686; do
+ if [ ! -e $i-nativesdk-libc.tar.xz ]; then
+ wget http://downloads.yoctoproject.org/releases/uninative/3.2/$i-nativesdk-libc.tar.xz
+ fi
+ tar -xf $i-nativesdk-libc.tar.xz --wildcards \*/lib/libpthread\* \*/lib/libdl\*
+ cd $i-linux/lib
+ ln -s libdl.so.2 libdl.so
+ ln -s libpthread.so.0 libpthread.so
+ cd ../..
+done
+tar -cJf pseudo-prebuilt-2.33.tar.xz *-linux
\ No newline at end of file
diff --git a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
new file mode 100644
index 0000000000..1552c69b52
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
@@ -0,0 +1,49 @@
+If we link against a newer glibc 2.34 and then try and our LD_PRELOAD is run against a
+binary on a host with an older libc, we see symbol errors since in glibc 2.34, pthread
+and dl are merged into libc itself.
+
+We need to use the older form of linking so use glibc binaries from an older release
+to force this. We only use minimal symbols from these anyway.
+
+pthread_atfork is problematic, particularly on arm so use the internal glibc routine
+it maps too. This was always present in the main libc from 2.3.2 onwards.
+
+Yes this is horrible. Better solutions welcome.
+
+There is more info in the bug: [YOCTO #14521]
+
+Upstream-Status: Inappropriate [this patch is native only]
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: git/Makefile.in
+===================================================================
+--- git.orig/Makefile.in
++++ git/Makefile.in
+@@ -122,7 +122,7 @@ libpseudo: $(LIBPSEUDO)
+ $(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB)
+ $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
+ pseudo_client.o pseudo_ipc.o \
+- $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
++ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CLIENT_LDFLAGS)
+
+ # *everything* now relies on stuff that's generated in the
+ # wrapper process.
+Index: git/pseudo_wrappers.c
+===================================================================
+--- git.orig/pseudo_wrappers.c
++++ git/pseudo_wrappers.c
+@@ -100,10 +100,13 @@ static void libpseudo_atfork_child(void)
+ pseudo_mutex_holder = 0;
+ }
+
++extern void *__dso_handle;
++extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *);
++
+ static void
+ _libpseudo_init(void) {
+ if (!_libpseudo_initted)
+- pthread_atfork(NULL, NULL, libpseudo_atfork_child);
++ __register_atfork (NULL, NULL, libpseudo_atfork_child, &__dso_handle == NULL ? NULL : __dso_handle);
+
+ pseudo_getlock();
+ pseudo_antimagic();
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 0ba460f3e6..64cbb40641 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -5,6 +5,10 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \
file://fallback-passwd \
file://fallback-group \
"
+SRC_URI:append:class-native = " \
+ http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
+ file://older-glibc-symbols.patch"
+SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
SRCREV = "b988b0a6b8afd8d459bc9a2528e834f63a3d59b2"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 22/38] pseudo: Update with fcntl and glibc 2.34 fixes
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (20 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 21/38] pseudo: Fix to work with glibc 2.34 systems Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 23/38] nativesdk-pseudo: Fix to work with glibc 2.34 systems Steve Sakoman
` (15 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Pull in the following changes:
* ports/linux/guts: Add closefrom support for glibc 2.34
* pseudo_client: Make msg static in pseudo_op_client
* ports/linux/guts: Add close_range wrapper for glibc 2.34
* pseudo_client: Do not pass null argument to pseudo_diag()
* test-openat: Consider device as well as inode number
* test: Add missing test-statx test case
* fcntl: Add support for fcntl F_GETPIPE_SZ and F_SETPIPE_SZ
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 71b549924a7fa7973a8e03e11f3db45fdc29889d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 64cbb40641..28e8a1c6be 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -10,7 +10,7 @@ SRC_URI:append:class-native = " \
file://older-glibc-symbols.patch"
SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
-SRCREV = "b988b0a6b8afd8d459bc9a2528e834f63a3d59b2"
+SRCREV = "21ff2fb690efbe57e7dd867c39aff36ab72a6ac5"
S = "${WORKDIR}/git"
PV = "1.9.0+git${SRCPV}"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 23/38] nativesdk-pseudo: Fix to work with glibc 2.34 systems
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (21 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 22/38] pseudo: Update with fcntl and glibc 2.34 fixes Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 24/38] uninative: Improve glob to handle glibc 2.34 Steve Sakoman
` (14 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Hongxu Jia <hongxu.jia@windriver.com>
Since commit [df313aa810 pseudo: Fix to work with glibc 2.34
systems] applied, it fixed native only. And nativesdk has
the similar issue
Tweak library search order, make prebuilt lib ahead of recipe lib,
after apply the fix:
...
$ readelf -a lib/pseudo/lib64/libpseudo.so | grep 'Shared library'
0x0000000000000001 (NEEDED) Shared library: [libdl.so.2]
0x0000000000000001 (NEEDED) Shared library:[libpthread.so.0]
0x0000000000000001 (NEEDED) Shared library: [libc.so.6]
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d6d116b5db78645958ea30be3d0572e0f6d7bd92)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../pseudo/files/older-glibc-symbols.patch | 38 +++++++++++--------
meta/recipes-devtools/pseudo/pseudo_git.bb | 3 ++
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
index 1552c69b52..c453b5f735 100644
--- a/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
+++ b/meta/recipes-devtools/pseudo/files/older-glibc-symbols.patch
@@ -12,26 +12,31 @@ Yes this is horrible. Better solutions welcome.
There is more info in the bug: [YOCTO #14521]
-Upstream-Status: Inappropriate [this patch is native only]
+Upstream-Status: Inappropriate [this patch is native and nativesdk]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Index: git/Makefile.in
-===================================================================
---- git.orig/Makefile.in
-+++ git/Makefile.in
-@@ -122,7 +122,7 @@ libpseudo: $(LIBPSEUDO)
+Tweak library search order, make prebuilt lib ahead of recipe lib
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in | 2 +-
+ pseudo_wrappers.c | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -120,7 +120,7 @@ $(PSEUDODB): pseudodb.o $(SHOBJS) $(DBOBJS) pseudo_ipc.o | $(BIN)
+ libpseudo: $(LIBPSEUDO)
+
$(LIBPSEUDO): $(WRAPOBJS) pseudo_client.o pseudo_ipc.o $(SHOBJS) | $(LIB)
- $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
+- $(CC) $(CFLAGS) $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
++ $(CC) $(CFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CFLAGS_PSEUDO) -shared -o $(LIBPSEUDO) \
pseudo_client.o pseudo_ipc.o \
-- $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
-+ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) -Lprebuilt/$(shell uname -m)-linux/lib/ $(CLIENT_LDFLAGS)
+ $(WRAPOBJS) $(SHOBJS) $(LDFLAGS) $(CLIENT_LDFLAGS)
- # *everything* now relies on stuff that's generated in the
- # wrapper process.
-Index: git/pseudo_wrappers.c
-===================================================================
---- git.orig/pseudo_wrappers.c
-+++ git/pseudo_wrappers.c
+diff --git a/pseudo_wrappers.c b/pseudo_wrappers.c
+--- a/pseudo_wrappers.c
++++ b/pseudo_wrappers.c
@@ -100,10 +100,13 @@ static void libpseudo_atfork_child(void)
pseudo_mutex_holder = 0;
}
@@ -47,3 +52,6 @@ Index: git/pseudo_wrappers.c
pseudo_getlock();
pseudo_antimagic();
+--
+2.27.0
+
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 28e8a1c6be..f36dfa589f 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -8,6 +8,9 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \
SRC_URI:append:class-native = " \
http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
file://older-glibc-symbols.patch"
+SRC_URI:append:class-nativesdk = " \
+ http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
+ file://older-glibc-symbols.patch"
SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
SRCREV = "21ff2fb690efbe57e7dd867c39aff36ab72a6ac5"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 24/38] uninative: Improve glob to handle glibc 2.34
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (22 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 23/38] nativesdk-pseudo: Fix to work with glibc 2.34 systems Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 25/38] uninative: Upgrade to 3.3, support " Steve Sakoman
` (13 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
With glibc 2.34, the libraries were renamed. Tweak the glob to support both
as this is needed for newer uninative versions.
[RP: tweak commit message]
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 98248306e4b5f023e96375293b60524574ebb686)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/uninative.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 1e19917a97..3c7ccd66f4 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -100,7 +100,7 @@ ${UNINATIVE_STAGING_DIR}-uninative/relocate_sdk.py \
${UNINATIVE_LOADER} \
${UNINATIVE_LOADER} \
${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/${bindir_native}/patchelf-uninative \
- ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux${base_libdir_native}/libc*.so" % chksum)
+ ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux${base_libdir_native}/libc*.so*" % chksum)
subprocess.check_output(cmd, shell=True)
with open(loaderchksum, "w") as f:
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 25/38] uninative: Upgrade to 3.3, support glibc 2.34
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (23 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 24/38] uninative: Improve glob to handle glibc 2.34 Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 26/38] package: Ensure pclist files are deterministic and don't use full paths Steve Sakoman
` (12 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Michael Halstead <mhalstead@linuxfoundation.org>
Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4aa4dcd5f31657073f2207a9a4a43247322c7eb1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/conf/distro/include/yocto-uninative.inc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc
index 740cca0ecf..76f4cff565 100644
--- a/meta/conf/distro/include/yocto-uninative.inc
+++ b/meta/conf/distro/include/yocto-uninative.inc
@@ -6,9 +6,9 @@
# to the distro running on the build machine.
#
-UNINATIVE_MAXGLIBCVERSION = "2.33"
+UNINATIVE_MAXGLIBCVERSION = "2.34"
-UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/3.2/"
-UNINATIVE_CHECKSUM[aarch64] ?= "4f0872cdca2775b637a8a99815ca5c8dd42146abe903a24a50ee0448358c764b"
-UNINATIVE_CHECKSUM[i686] ?= "e2eeab92e67263db37d9bb6d4c58579abd1f47ff4cded3171bde572fece124b2"
-UNINATIVE_CHECKSUM[x86_64] ?= "3ee8c7d55e2d4c7ae3887cddb97219f97b94efddfeee2e24923c0cb0e8ce84c6"
+UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/3.3/"
+UNINATIVE_CHECKSUM[aarch64] ?= "372d31264ea7ab8e08e0a9662f003b53e99b3813cc2d9f9a4cc5c2949a1de00b"
+UNINATIVE_CHECKSUM[i686] ?= "36436167eba8a5957a0bf9a32402dd1be8b69528c1ff25e711e6895b583b2b42"
+UNINATIVE_CHECKSUM[x86_64] ?= "92b5e465f74d7e195e0b60fe4146f0f1475fff87ab2649bf2d57a1526ef58aec"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 26/38] package: Ensure pclist files are deterministic and don't use full paths
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (24 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 25/38] uninative: Upgrade to 3.3, support " Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 27/38] mesa: Ensure megadrivers runtime mappings are deterministic Steve Sakoman
` (11 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently the pkgconfig pclist files contain full paths which are build
host specific and the order of entries is not deterministic.
Fix both these issues so the files are deterministic.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e422e29bca4af3ab4073e04490f38b05cd7c38c0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/package.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3ff74c9f31..702427fecc 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1989,12 +1989,12 @@ python package_do_pkgconfig () {
for pkg in packages.split():
pkgconfig_provided[pkg] = []
pkgconfig_needed[pkg] = []
- for file in pkgfiles[pkg]:
+ for file in sorted(pkgfiles[pkg]):
m = pc_re.match(file)
if m:
pd = bb.data.init()
name = m.group(1)
- pkgconfig_provided[pkg].append(name)
+ pkgconfig_provided[pkg].append(os.path.basename(name))
if not os.access(file, os.R_OK):
continue
with open(file, 'r') as f:
@@ -2017,7 +2017,7 @@ python package_do_pkgconfig () {
pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist")
if pkgconfig_provided[pkg] != []:
with open(pkgs_file, 'w') as f:
- for p in pkgconfig_provided[pkg]:
+ for p in sorted(pkgconfig_provided[pkg]):
f.write('%s\n' % p)
# Go from least to most specific since the last one found wins
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 27/38] mesa: Ensure megadrivers runtime mappings are deterministic
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (25 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 26/38] package: Ensure pclist files are deterministic and don't use full paths Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 28/38] gnupg: Be deterministic about sendmail Steve Sakoman
` (10 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a sort to ensure the package dependency output is determnistic.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 693e8d0dfe0b475bc233ccc1ad7674d39de346ce)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-graphics/mesa/mesa.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a1bf878b1a..bfab19e773 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -231,7 +231,7 @@ python mesa_populate_packages() {
import re
dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
if os.path.isdir(dri_drivers_root):
- dri_pkgs = os.listdir(dri_drivers_root)
+ dri_pkgs = sorted(os.listdir(dri_drivers_root))
lib_name = d.expand("${MLPREFIX}mesa-megadriver")
for p in dri_pkgs:
m = re.match(r'^(.*)_dri\.so$', p)
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 28/38] gnupg: Be deterministic about sendmail
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (26 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 27/38] mesa: Ensure megadrivers runtime mappings are deterministic Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 29/38] util-linux: Fix reproducibility Steve Sakoman
` (9 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Set a path to where sendmail would exist making the output deterministic
as it no longer depends on the build host and the presense of sendmail
there.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 32e03a430f13960fe07f08c04eaa58017d977f6c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-support/gnupg/gnupg_2.2.27.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.27.bb b/meta/recipes-support/gnupg/gnupg_2.2.27.bb
index 1181c8341b..18bb855769 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.27.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.27.bb
@@ -32,6 +32,7 @@ EXTRA_OECONF = "--disable-ldap \
--with-zlib=${STAGING_LIBDIR}/.. \
--with-bzip2=${STAGING_LIBDIR}/.. \
--with-readline=${STAGING_LIBDIR}/.. \
+ --with-mailprog=${sbindir}/sendmail \
--enable-gpg-is-gpg2 \
"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 29/38] util-linux: Fix reproducibility
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (27 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 28/38] gnupg: Be deterministic about sendmail Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 30/38] libtool: Fix lto option passing for reproducible builds Steve Sakoman
` (8 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
Sort the list of files to ensure the pkgdata output is deterministic.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3a55194f90e11da5671b24391a4aaf2b86a8e1e6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/util-linux/util-linux.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index af4c0b9974..7b780352be 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -59,12 +59,13 @@ python util_linux_binpackages () {
continue
pkg = os.path.basename(os.readlink(file))
- extras[pkg] = extras.get(pkg, '') + ' ' + file.replace(dvar, '', 1)
+ extras.setdefault(pkg, [])
+ extras[pkg].append(file.replace(dvar, '', 1))
pn = d.getVar('PN')
for pkg, links in extras.items():
of = d.getVar('FILES_' + pn + '-' + pkg)
- links = of + links
+ links = of + " " + " ".join(sorted(links))
d.setVar('FILES_' + pn + '-' + pkg, links)
}
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 30/38] libtool: Fix lto option passing for reproducible builds
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (28 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 29/38] util-linux: Fix reproducibility Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 31/38] libtool: Allow libtool-cross to reproduce Steve Sakoman
` (7 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
If lto is enabled, we need the prefix-map variables to be passed to the linker.
Add these to the list of options libtool passes through.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2c26d2c00b47df856fb2d9c35486b135094d46ac)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../libtool/libtool-2.4.6.inc | 1 +
.../libtool/libtool/lto-prefix.patch | 22 +++++++++++++++++++
2 files changed, 23 insertions(+)
create mode 100644 meta/recipes-devtools/libtool/libtool/lto-prefix.patch
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index e9225e140c..1bac81331d 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://0001-libtool-Check-for-static-libs-for-internal-compiler-.patch \
file://0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \
file://0001-Makefile.am-make-sure-autoheader-run-before-automake.patch \
+ file://lto-prefix.patch \
"
SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e"
diff --git a/meta/recipes-devtools/libtool/libtool/lto-prefix.patch b/meta/recipes-devtools/libtool/libtool/lto-prefix.patch
new file mode 100644
index 0000000000..2bd010b8e4
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/lto-prefix.patch
@@ -0,0 +1,22 @@
+If lto is enabled, we need the prefix-map variables to be passed to the linker.
+Add these to the list of options libtool passes through.
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: libtool-2.4.6/build-aux/ltmain.in
+===================================================================
+--- libtool-2.4.6.orig/build-aux/ltmain.in
++++ libtool-2.4.6/build-aux/ltmain.in
+@@ -5424,9 +5424,10 @@ func_mode_link ()
+ # --sysroot=* for sysroot support
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -stdlib=* select c++ std lib with clang
++ # -f*-prefix-map* needed for lto linking
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-f*-prefix-map*)
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ func_append compile_command " $arg"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 31/38] libtool: Allow libtool-cross to reproduce
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (29 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 30/38] libtool: Fix lto option passing for reproducible builds Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 32/38] gobject-introspection: Don't write $HOME into scripts Steve Sakoman
` (6 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The hostname removal from the script is useful to make libtool-cross
reproduce. Apply the patch everywhere as it doesn't cause any issues.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3c61c6f20187154d677085fc9ccdcd762d4cdf3a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/libtool/libtool-2.4.6.inc | 1 +
meta/recipes-devtools/libtool/libtool_2.4.6.bb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index 1bac81331d..c8744e6d5f 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -24,6 +24,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \
file://0001-Makefile.am-make-sure-autoheader-run-before-automake.patch \
file://lto-prefix.patch \
+ file://debian-no_hostname.patch \
"
SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e"
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.4.6.bb
index a5715faaa9..f5fdd00e5e 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.6.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-SRC_URI += "file://multilib.patch file://debian-no_hostname.patch"
+SRC_URI += "file://multilib.patch"
RDEPENDS_${PN} += "bash"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 32/38] gobject-introspection: Don't write $HOME into scripts
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (30 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 31/38] libtool: Allow libtool-cross to reproduce Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 33/38] externalsrc: Work with reproducible_build Steve Sakoman
` (5 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Writing an expanded version of $HOME into the wrapper script breaks
reproducibility. We don't need this here so don't.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5df092524e93cd7d0eaa633ec8a5689d4c0d018d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../gobject-introspection/gobject-introspection_1.62.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
index 92b0d1d52f..0842f10ea9 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
@@ -102,7 +102,7 @@ EOF
# from the target sysroot.
cat > ${B}/g-ir-scanner-wrapper << EOF
#!/bin/sh
-# This prevents g-ir-scanner from writing cache data to $HOME
+# This prevents g-ir-scanner from writing cache data to user's HOME dir
export GI_SCANNER_DISABLE_CACHE=1
g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 --add-include-path=${STAGING_LIBDIR}/gir-1.0 "\$@"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 33/38] externalsrc: Work with reproducible_build
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (31 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 32/38] gobject-introspection: Don't write $HOME into scripts Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 34/38] externalsrc: Fix a source date epoch race in reproducible builds Steve Sakoman
` (4 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@xilinx.com>
Externalsrc removes do_fetch, do_unpack, and do_patch. The system normally
discovers the correct reproducible date as a postfuncs of do_unpack, so this
date is never found, so it falls back to the default epoch.
Instead we can move the discovery function to a prefuncs on the epoch
deploy task. This task will run before do_configure, and since the source
is already available can run safely at anytime.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0b7dd711a54e92ce54abe99f59fc67e683d52dfe)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/externalsrc.bbclass | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index c7fcdca6ef..e94a5cc2af 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -109,6 +109,16 @@ python () {
continue
bb.build.deltask(task, d)
+ if bb.data.inherits_class('reproducible_build', d) and 'do_unpack' in d.getVar("SRCTREECOVEREDTASKS").split():
+ # The reproducible_build's create_source_date_epoch_stamp function must
+ # be run after the source is available and before the
+ # do_deploy_source_date_epoch task. In the normal case, it's attached
+ # to do_unpack as a postfuncs, but since we removed do_unpack (above)
+ # we need to move the function elsewhere. The easiest thing to do is
+ # move it into the prefuncs of the do_deploy_source_date_epoch task.
+ # This is safe, as externalsrc runs with the source already unpacked.
+ d.prependVarFlag('do_deploy_source_date_epoch', 'prefuncs', 'create_source_date_epoch_stamp ')
+
d.prependVarFlag('do_compile', 'prefuncs', "externalsrc_compile_prefunc ")
d.prependVarFlag('do_configure', 'prefuncs', "externalsrc_configure_prefunc ")
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 34/38] externalsrc: Fix a source date epoch race in reproducible builds
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (32 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 33/38] externalsrc: Work with reproducible_build Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 35/38] libxml2: Use python3targetconfig to fix reproducibility issue Steve Sakoman
` (3 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
When reproducible builds are enabled and externalsrc is in use, the
source date epoch function is added. The conditions on the conditional
code removing the unpack task need to match the deltask function, else
the source date epoch function can end up running twice and the functions
can race with each other causing build failures or corruption.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e82095c02881410035ca23dc12692f074d8ed39b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/externalsrc.bbclass | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index e94a5cc2af..0e0a3ae89c 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -108,16 +108,15 @@ python () {
if local_srcuri and task in fetch_tasks:
continue
bb.build.deltask(task, d)
-
- if bb.data.inherits_class('reproducible_build', d) and 'do_unpack' in d.getVar("SRCTREECOVEREDTASKS").split():
- # The reproducible_build's create_source_date_epoch_stamp function must
- # be run after the source is available and before the
- # do_deploy_source_date_epoch task. In the normal case, it's attached
- # to do_unpack as a postfuncs, but since we removed do_unpack (above)
- # we need to move the function elsewhere. The easiest thing to do is
- # move it into the prefuncs of the do_deploy_source_date_epoch task.
- # This is safe, as externalsrc runs with the source already unpacked.
- d.prependVarFlag('do_deploy_source_date_epoch', 'prefuncs', 'create_source_date_epoch_stamp ')
+ if bb.data.inherits_class('reproducible_build', d) and task == 'do_unpack':
+ # The reproducible_build's create_source_date_epoch_stamp function must
+ # be run after the source is available and before the
+ # do_deploy_source_date_epoch task. In the normal case, it's attached
+ # to do_unpack as a postfuncs, but since we removed do_unpack (above)
+ # we need to move the function elsewhere. The easiest thing to do is
+ # move it into the prefuncs of the do_deploy_source_date_epoch task.
+ # This is safe, as externalsrc runs with the source already unpacked.
+ d.prependVarFlag('do_deploy_source_date_epoch', 'prefuncs', 'create_source_date_epoch_stamp ')
d.prependVarFlag('do_compile', 'prefuncs', "externalsrc_compile_prefunc ")
d.prependVarFlag('do_configure', 'prefuncs', "externalsrc_configure_prefunc ")
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 35/38] libxml2: Use python3targetconfig to fix reproducibility issue
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (33 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 34/38] externalsrc: Fix a source date epoch race in reproducible builds Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 36/38] libnewt: " Steve Sakoman
` (2 subsequent siblings)
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
We're seeing pthread being linked sometimes and not others leading to
non-reproducible target binaries. The reason is mixing the native python
config with the target one. We should use the target one.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1bc5378db760963e2ad46542f2907dd6a592eb66)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/libxml/libxml2_2.9.10.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/libxml/libxml2_2.9.10.bb b/meta/recipes-core/libxml/libxml2_2.9.10.bb
index 60dc71f38d..ebb996c8dd 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.10.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.10.bb
@@ -44,7 +44,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
inherit autotools pkgconfig binconfig-disabled ptest features_check
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)}
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)}
RDEPENDS_${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 36/38] libnewt: Use python3targetconfig to fix reproducibility issue
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (34 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 35/38] libxml2: Use python3targetconfig to fix reproducibility issue Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 37/38] python3: Add a fix for a make install race Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 38/38] target/ssh.py: add HostKeyAlgorithms option to test commands Steve Sakoman
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
We're seeing pthread being linked sometimes and not others leading to
non-reproducible target binaries. The reason is mixing the native python
config with the target one. We should use the target one.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3fe5101b335384ef83e96ccc58687fd631164075)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-extended/newt/libnewt_0.52.21.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/newt/libnewt_0.52.21.bb b/meta/recipes-extended/newt/libnewt_0.52.21.bb
index 88b4cf4a03..3d35a17c92 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.21.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.21.bb
@@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac
S = "${WORKDIR}/newt-${PV}"
-inherit autotools-brokensep python3native python3-dir
+inherit autotools-brokensep python3native python3-dir python3targetconfig
EXTRA_OECONF = "--without-tcl --with-python"
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 37/38] python3: Add a fix for a make install race
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (35 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 36/38] libnewt: " Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
2021-10-19 19:53 ` [OE-core][dunfell 38/38] target/ssh.py: add HostKeyAlgorithms option to test commands Steve Sakoman
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a fix for reproducibility issues where pyc files for python-config.py
may not always be generated.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d1c3a87c48b598b6e5624d0affe8bd89320631bf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../python/python3/makerace.patch | 23 +++++++++++++++++++
.../recipes-devtools/python/python3_3.8.11.bb | 1 +
2 files changed, 24 insertions(+)
create mode 100644 meta/recipes-devtools/python/python3/makerace.patch
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch
new file mode 100644
index 0000000000..8971f28b8e
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/makerace.patch
@@ -0,0 +1,23 @@
+libainstall installs python-config.py but the .pyc cache files are generated
+by the libinstall target. This means some builds may not generate the pyc files
+for python-config.py depending on the order things happen in. This means builds
+are not always reproducible.
+
+Add a dependency to avoid the race.
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: Python-3.8.11/Makefile.pre.in
+===================================================================
+--- Python-3.8.11.orig/Makefile.pre.in
++++ Python-3.8.11/Makefile.pre.in
+@@ -1415,7 +1415,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter
+ unittest unittest/test unittest/test/testmock \
+ venv venv/scripts venv/scripts/common venv/scripts/posix \
+ curses pydoc_data
+-libinstall: build_all $(srcdir)/Modules/xxmodule.c
++libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall
+ @for i in $(SCRIPTDIR) $(LIBDEST); \
+ do \
+ if test ! -d $(DESTDIR)$$i; then \
diff --git a/meta/recipes-devtools/python/python3_3.8.11.bb b/meta/recipes-devtools/python/python3_3.8.11.bb
index f549bb2205..2a2472b3d0 100644
--- a/meta/recipes-devtools/python/python3_3.8.11.bb
+++ b/meta/recipes-devtools/python/python3_3.8.11.bb
@@ -33,6 +33,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0001-configure.ac-fix-LIBPL.patch \
file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \
file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \
+ file://makerace.patch \
"
SRC_URI_append_class-native = " \
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread* [OE-core][dunfell 38/38] target/ssh.py: add HostKeyAlgorithms option to test commands
2021-10-19 19:53 [OE-core][dunfell 00/38] Patch review Steve Sakoman
` (36 preceding siblings ...)
2021-10-19 19:53 ` [OE-core][dunfell 37/38] python3: Add a fix for a make install race Steve Sakoman
@ 2021-10-19 19:53 ` Steve Sakoman
37 siblings, 0 replies; 40+ messages in thread
From: Steve Sakoman @ 2021-10-19 19:53 UTC (permalink / raw)
To: openembedded-core
After recent updates to the autobuilder tumbleweed workers there are tests where the client and
server fail to agree on a public key algorithm for host authentication:
DEBUG: [Running]$ ssh -l root -o PubkeyAcceptedKeyTypes=+ssh-rsa -o UserKnownHostsFile=/dev/null
-o StrictHostKeyChecking=no -o LogLevel=VERBOSE 192.168.7.6 export PATH=/usr/sbin:/sbin:/usr/bin:/bin; uname -a
DEBUG: time: 1634578090.4632802, endtime: 1634578390.4592378
DEBUG: Partial data from SSH call: Unable to negotiate with 192.168.7.6 port 22: no matching host key type found. Their offer: ssh-rsa
This appears to be an issue with recent versions of shh. Add -o HostKeyAlgorithms=+ssh-rsa to
command invocation as suggested at:
http://www.openssh.com/legacy.html
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/core/target/ssh.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index aefb576805..af4a67f266 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -34,6 +34,7 @@ class OESSHTarget(OETarget):
self.timeout = timeout
self.user = user
ssh_options = [
+ '-o', 'HostKeyAlgorithms=+ssh-rsa',
'-o', 'UserKnownHostsFile=/dev/null',
'-o', 'StrictHostKeyChecking=no',
'-o', 'LogLevel=ERROR'
--
2.25.1
^ permalink raw reply related [flat|nested] 40+ messages in thread