yocto-bsps: update to v5.10.113

Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: 54af9dd2b958 Linux 5.10.113 7992fdb045fb Revert "net: micrel: fix KS8851_MLL Kconfig" 8bedbc8f7f35 block/compat_ioctl: fix range check in BLKGETSIZE fea24b07edfc staging: ion: Prevent incorrect reference counting behavour dccee748af17 spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller 572761645b88 jbd2: fix a potential race while discarding reserved buffers after an abort 50aac4427360 can: isotp: stop timeout monitoring when no first frame was sent e1e96e372721 ext4: force overhead calculation if the s_overhead_cluster makes no sense 4789149b9ea2 ext4: fix overhead calculation to account for the reserved gdt blocks 0c54b093766b ext4, doc: fix incorrect h_reserved size 22c450d39f89 ext4: limit length to bitmap_maxbytes - blocksize in punch_hole 75ac724684b7 ext4: fix use-after-free in ext4_search_dir a46b3d849864 ext4: fix symlink file size not match to file content f6038d43b25b ext4: fix fallocate to use file_modified to update permissions consistently 19590bbc691d perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event e012f9d1af54 powerpc/perf: Fix power9 event alternatives 0a2cef65b329 drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage f8f8b3124b89 KVM: PPC: Fix TCE handling for VFIO 405d98427416 drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare 231381f52116 drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised 51d9cbbb0f5a perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled 88fcfd6ee6c5 sched/pelt: Fix attach_entity_load_avg() corner case c55327bc3712 arm_pmu: Validate single/group leader events 5580b974a84b ARC: entry: fix syscall_trace_exit argument 7082650eb826 e1000e: Fix possible overflow in LTR decoding 43a2a3734aa3 ASoC: soc-dapm: fix two incorrect uses of list iterator 54e6180c8c2d gpio: Request interrupts after IRQ is initialized 0837ff17d052 openvswitch: fix OOB access in reserve_sfa_size() 19f6dcb1f0f0 xtensa: fix a7 clobbering in coprocessor context load/store f399ab11dd6c xtensa: patch_text: Fixup last cpu should be master ba2716da2336 net: atlantic: invert deep par in pm functions, preventing null derefs 358a3846f6a9 dma: at_xdmac: fix a missing check on list iterator cf23a960c5c6 ata: pata_marvell: Check the 'bmdma_addr' beforing reading 9ca66d791439 mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove() ed5d4efb4df1 oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup 6b932920b96f mm, hugetlb: allow for "high" userspace addresses 50cbc583fa83 EDAC/synopsys: Read the error count from the correct register 7ec6e06ee405 nvme-pci: disable namespace identifiers for Qemu controllers 316bd86c2261 nvme: add a quirk to disable namespace identifiers 76101c8e0c31 stat: fix inconsistency between struct stat and struct compat_stat bf28bba30410 scsi: qedi: Fix failed disconnect handling a284cca3d81a net: macb: Restart tx only if queue pointer is lagging 9581e07b549b drm/msm/mdp5: check the return of kzalloc() 8d71edabb0ab dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info() b3afe5a7fd75 brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant 202748f44148 mt76: Fix undefined behavior due to shift overflowing the constant 0de9c104d04a net: atlantic: Avoid out-of-bounds indexing 5bef9fc38ffa cifs: Check the IOCB_DIRECT flag, not O_DIRECT e129c55153c8 vxlan: fix error return code in vxlan_fdb_append 8e7ea1136475 arm64: dts: imx: Fix imx8*-var-som touchscreen property sizes cd227ac03f2a ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant 490815f0b50e platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative cb17b56a9b4d reset: tegra-bpmp: Restore Handle errors in BPMP response d513ea9b7ef8 ARM: vexpress/spc: Avoid negative array index when !SMP 052e4a661f90 arm64: mm: fix p?d_leaf() 18ff7a2efa4e arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad() 3bf8ca350170 selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets 520aab8b723c dmaengine: idxd: add RO check for wq max_transfer_size write 9a3c026dc3a5 dmaengine: idxd: add RO check for wq max_batch_size write f593f49fcd17 net: stmmac: Use readl_poll_timeout_atomic() in atomic state 3d55b195747c netlink: reset network and mac headers in netlink_dump() 49516e6ed914 ipv6: make ip6_rt_gc_expire an atomic_t 078d839f11ac l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu 0ac8f83d8f64 net/sched: cls_u32: fix possible leak in u32_init_knode() 93366275be72 ip6_gre: Fix skb_under_panic in __gre6_xmit() 200f96ebb389 ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit() 8fb76adb89f0 net/packet: fix packet_sock xmit return value checking a499cb5f3ef9 net/smc: Fix sock leak when release after smc_shutdown() 60592f16a456 rxrpc: Restore removed timer deletion fc7116a79a86 igc: Fix BUG: scheduling while atomic 46b0e4f998ce igc: Fix infinite loop in release_swfw_sync c075c3ea0317 esp: limit skb_page_frag_refill use to a single page 3f7914dbeacd spi: spi-mtk-nor: initialize spi controller after resume f714abf28f81 dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources 9bc949a181ba dmaengine: imx-sdma: Fix error checking in sdma_event_remap 12aa8021c7a7 ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use b6f474cd3097 ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component 608fc58858bf ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek d29c78d3f9c5 dm: fix mempool NULL pointer race when completing IO cf9b19546494 ALSA: hda/realtek: Add quirk for Clevo NP70PNP 8ce3820fc9d4 ALSA: usb-audio: Clear MIDI port active flag after draining 43ce33a68e2b net/sched: cls_u32: fix netns refcount changes in u32_change() 04dd45d9776e gfs2: assign rgrp glock before compute_bitstructs 378061c9b886 perf tools: Fix segfault accessing sample_id xyarray 5e8446e3820c tracing: Dump stacktrace trigger to the corresponding instance 69848f9488bc mm: page_alloc: fix building error on -Werror=array-compare 08ad7a770efa etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead 1052f9bce629 Linux 5.10.112 5c62d3bf1410 ax25: Fix UAF bugs in ax25 timers f934fa478dd1 ax25: Fix NULL pointer dereferences in ax25 timers 145ea8d213e8 ax25: fix NPD bug in ax25_disconnect a4942c6fea87 ax25: fix UAF bug in ax25_send_control() b20a5ab0f5fb ax25: Fix refcount leaks caused by ax25_cb_del() 57cc15f5fd55 ax25: fix UAF bugs of net_device caused by rebinding operation 5ddae8d06441 ax25: fix reference count leaks of ax25_dev 5ea00fc60676 ax25: add refcount in ax25_dev to avoid UAF bugs 361288633bfa scsi: iscsi: Fix unbound endpoint error handling 129db30599bc scsi: iscsi: Fix endpoint reuse regression 26f827e095ab dma-direct: avoid redundant memory sync for swiotlb 9a5a4d23e24d timers: Fix warning condition in __run_timers() 84837f43e56f i2c: pasemi: Wait for write xfers to finish 89496d80bf84 smp: Fix offline cpu check in flush_smp_call_function_queue() cd02b2687d66 dm integrity: fix memory corruption when tag_size is less than digest size 0a312ec66a03 ARM: davinci: da850-evm: Avoid NULL pointer dereference 0806f1930562 tick/nohz: Use WARN_ON_ONCE() to prevent console saturation 0275c75955d1 genirq/affinity: Consider that CPUs on nodes can be unbalanced 1fcfe37d170a drm/amdgpu: Enable gfxoff quirk on MacBook Pro 68ae52efa132 drm/amd/display: don't ignore alpha property on pre-multiplied mode a263712ba8c9 ipv6: fix panic when forwarding a pkt with no in6 dev 659214603bf2 nl80211: correctly check NL80211_ATTR_REG_ALPHA2 size 912797e54c99 ALSA: pcm: Test for "silence" field in struct "pcm_format_data" 48d070ca5e7e ALSA: hda/realtek: add quirk for Lenovo Thinkpad X12 speakers 163e16247130 ALSA: hda/realtek: Add quirk for Clevo PD50PNT 5e4dd1799883 btrfs: mark resumed async balance as writing 1d2eda18f6ff btrfs: fix root ref counts in error handling in btrfs_get_root_ref 9b7ec35253c9 ath9k: Fix usage of driver-private space in tx_info 0f65cedae500 ath9k: Properly clear TX status area before reporting to mac80211 cc21ae932656 gcc-plugins: latent_entropy: use /dev/urandom c089ffc846c8 memory: renesas-rpc-if: fix platform-device leak in error path 342454231ee5 KVM: x86/mmu: Resolve nx_huge_pages when kvm.ko is loaded 06c348fde545 mm: kmemleak: take a full lowmem check in kmemleak_*_phys() 20ed94f8181a mm: fix unexpected zeroed page mapping with zram swap 192e507ef894 mm, page_alloc: fix build_zonerefs_node() 000b3921b4d5 perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant ca24c5e8f0ac drivers: net: slip: fix NPD bug in sl_tx_timeout() e8cf1e4d953d scsi: megaraid_sas: Target with invalid LUN ID is deleted during scan 5b7ce74b6bc8 scsi: mvsas: Add PCI ID of RocketRaid 2640 4b44cd584057 drm/amd/display: Fix allocate_mst_payload assert on resume 34ea097fb63d drm/amd/display: Revert FEC check in validation fa5ee7c4232c myri10ge: fix an incorrect free for skb in myri10ge_sw_tso d90df6da50c5 net: usb: aqc111: Fix out-of-bounds accesses in RX fixup 9c12fcf1d864 net: axienet: setup mdio unconditionally b643807a735e tlb: hugetlb: Add more sizes to tlb_remove_huge_tlb_entry 98973d2bdd4a arm64: alternatives: mark patch_alternative() as `noinstr` 2462faffbfa5 regulator: wm8994: Add an off-on delay for WM8994 variant aa8cdedaf760 gpu: ipu-v3: Fix dev_dbg frequency output 150fe861c57c ata: libata-core: Disable READ LOG DMA EXT for Samsung 840 EVOs 1ff5359afa5e net: micrel: fix KS8851_MLL Kconfig d3478709edf2 scsi: ibmvscsis: Increase INITIAL_SRP_LIMIT to 1024 b9a110fa755b scsi: lpfc: Fix queue failures when recovering from PCI parity error aec36b98a1bb scsi: target: tcmu: Fix possible page UAF 43666798059c Drivers: hv: vmbus: Prevent load re-ordering when reading ring buffer 1d7a5aae884c drm/amdkfd: Check for potential null return of kmalloc_array() e5afacc826a8 drm/amdgpu/vcn: improve vcn dpg stop procedure d2e0931e6d84 drm/amdkfd: Fix Incorrect VMIDs passed to HWS 7fc0610ad818 drm/amd/display: Update VTEM Infopacket definition 6906e05cf3ad drm/amd/display: FEC check in timing validation 756c61c1680f drm/amd/display: fix audio format not updated after edid updated 76e086ce7b2d btrfs: do not warn for free space inode in cow_file_range 217190dc66ef btrfs: fix fallocate to use file_modified to update permissions consistently 9b5d1b3413d7 drm/amd: Add USBC connector ID 6f9c06501d28 net: bcmgenet: Revert "Use stronger register read/writes to assure ordering" 504c15f07f54 dm mpath: only use ktime_get_ns() in historical selector 4e166a41180b cifs: potential buffer overflow in handling symlinks 67677050cecb nfc: nci: add flush_workqueue to prevent uaf bfba9722cf2e perf tools: Fix misleading add event PMU debug message 280f721edc54 testing/selftests/mqueue: Fix mq_perf_tests to free the allocated cpu set eb8873b324d9 sctp: Initialize daddr on peeled off socket 45226fac4d31 scsi: iscsi: Fix conn cleanup and stop race during iscsid restart 73805795c99f scsi: iscsi: Fix offload conn cleanup when iscsid restarts 699bd835c36e scsi: iscsi: Move iscsi_ep_disconnect() 46f37a34a53d scsi: iscsi: Fix in-kernel conn failure handling 812573896711 scsi: iscsi: Rel ref after iscsi_lookup_endpoint() 22608545b834 scsi: iscsi: Use system_unbound_wq for destroy_work 4029a1e992fc scsi: iscsi: Force immediate failure during shutdown 17d14456f626 scsi: iscsi: Stop queueing during ep_disconnect da9cf24aa739 scsi: pm80xx: Enable upper inbound, outbound queues e08d26971237 scsi: pm80xx: Mask and unmask upper interrupt vectors 32-63 35b91e49bc80 net/smc: Fix NULL pointer dereference in smc_pnet_find_ib() 98a7f6c4ada4 drm/msm/dsi: Use connector directly in msm_dsi_manager_connector_init() 5f78ad93837c drm/msm: Fix range size vs end confusion 5513f9a0b068 cfg80211: hold bss_lock while updating nontrans_list a44938950e5e net/sched: taprio: Check if socket flags are valid 08d5e3e95453 net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link 2ad9d890d850 net: dsa: felix: suppress -EPROBE_DEFER errors f2cc341fcc42 net/sched: fix initialization order when updating chain 0 head 7a7cf8414841 mlxsw: i2c: Fix initialization error flow 43e58e119a2b net: mdio: Alphabetically sort header inclusion 9709c8b5cdc8 gpiolib: acpi: use correct format characters d67c900f1947 veth: Ensure eth header is in skb's linear part 845f44ce3d9f net/sched: flower: fix parsing of ethertype following VLAN header 85ee17ca21cf SUNRPC: Fix the svc_deferred_event trace class af12dd71235c media: rockchip/rga: do proper error checking in probe 563712971202 firmware: arm_scmi: Fix sorting of retrieved clock rates 16c628b0c6fa memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe cb66641f8106 drm/msm: Add missing put_task_struct() in debugfs path 921fdc45a084 btrfs: remove unused variable in btrfs_{start,write}_dirty_block_groups() 5d131318bb87 ACPI: processor idle: Check for architectural support for LPI 503934df3108 cpuidle: PSCI: Move the `has_lpi` check to the beginning of the function cfa98ffc42f1 hamradio: remove needs_free_netdev to avoid UAF 80a4df14643f hamradio: defer 6pack kfree after unregister_netdev f0c31f192f38 drm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu 6c8e5cb264df Linux 5.10.111 d36febbcd537 powerpc: Fix virt_addr_valid() for 64-bit Book3E & 32-bit 5c672073bcca mm/sparsemem: fix 'mem_section' will never be NULL gcc 12 warning 5973f7507a73 irqchip/gic, gic-v3: Prevent GSI to SGI translations 000e09462f85 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb() e1f540b752cb arm64: module: remove (NOLOAD) from linker script 919823bd6738 selftests: cgroup: Test open-time cgroup namespace usage for migration checks 637eca44b8f7 selftests: cgroup: Test open-time credential usage for migration checks 9dd39d2c6572 selftests: cgroup: Make cg_create() use 0755 for permission instead of 0644 e74da71e6614 selftests/cgroup: Fix build on older distros 4665722d36ad cgroup: Use open-time credentials for process migraton perm checks f089471d1b75 mm: don't skip swap entry even if zap_details specified 58823a9b097c ubsan: remove CONFIG_UBSAN_OBJECT_SIZE 03b39bbbec8b dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error" 40e00885a61f tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts 75c8558d410f tools build: Filter out options and warnings not supported by clang 6374faf49e89 perf python: Fix probing for some clang command line options 79abc219bafd perf build: Don't use -ffat-lto-objects in the python feature test when building with clang-13 82e43950143c drm/amdkfd: Create file descriptor after client is added to smi_clients list 326b408e7ec7 drm/nouveau/pmu: Add missing callbacks for Tegra devices 786ae8de3a5e drm/amdgpu/smu10: fix SoC/fclk units in auto mode ff24114bb08d irqchip/gic-v3: Fix GICR_CTLR.RWP polling 451214b266e9 perf: qcom_l2_pmu: fix an incorrect NULL check on list iterator fc629224aa62 ata: sata_dwc_460ex: Fix crash due to OOB write 7e88a50704b0 gpio: Restrict usage of GPIO chip irq members before initialization 5f54364ff6cf RDMA/hfi1: Fix use-after-free bug for mm struct 8bb41682911f arm64: patch_text: Fixup last cpu should be master a044bca8ef31 btrfs: prevent subvol with swapfile from being deleted 82ae73ac963c btrfs: fix qgroup reserve overflow the qgroup limit fc4bdaed4d4e x86/speculation: Restore speculation related MSRs during S3 resume 8c9e26c890ba x86/pm: Save the MSR validity status at context setup 2827328e646d io_uring: fix race between timeout flush and removal f7e183b0a713 mm/mempolicy: fix mpol_new leak in shared_policy_replace 7d659cb1763f mmmremap.c: avoid pointless invalidate_range_start/end on mremap(old_size=0) 6adc01a7aa37 lz4: fix LZ4_decompress_safe_partial read out of bound 8b6f04b4c9d9 mmc: renesas_sdhi: don't overwrite TAP settings when HS400 tuning is complete 029b4170737f mmc: mmci: stm32: correctly check all elements of sg list 41a519c05bee Revert "mmc: sdhci-xenon: fix annoying 1.8V regulator warning" 9de98470db6e arm64: Add part number for Arm Cortex-A78AE 4604b5738d5b perf session: Remap buf if there is no space for event 362ced37690d perf tools: Fix perf's libperf_print callback 65210fac639e perf: arm-spe: Fix perf report --mem-mode bd905fed87ce iommu/omap: Fix regression in probe for NULL pointer dereference b3c00be2ff8b SUNRPC: svc_tcp_sendmsg() should handle errors from xdr_alloc_bvec() 9a45e08636bb SUNRPC: Handle low memory situations in call_status() 132cbe2f182a SUNRPC: Handle ENOMEM in call_transmit_status() aed30a205406 io_uring: don't touch scm_fp_list after queueing skb 594205b49367 drbd: Fix five use after free bugs in get_initial_state 970a6bb72912 bpf: Support dual-stack sockets in bpf_tcp_check_syncookie 6c17f4ef3c4f spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op() 8928239e5e2e qede: confirm skb is allocated before using b7893388bb88 net: phy: mscc-miim: reject clause 45 register accesses 08ff0e74fab5 rxrpc: fix a race in rxrpc_exit_net() 5ae05b5eb587 net: openvswitch: fix leak of nested actions 42ab401d22de net: openvswitch: don't send internal clone attribute to the userspace. e54ea8fc51ca ice: synchronize_rcu() when terminating rings e3dd1202ab2e ipv6: Fix stats accounting in ip6_pkt_drop ffce126c952e ice: Do not skip not enabled queues in ice_vc_dis_qs_msg b003fc4913ea ice: Set txq_teid to ICE_INVAL_TEID on ring creation ebd1e3458dbf dpaa2-ptp: Fix refcount leak in dpaa2_ptp_probe 43c2d7890eca IB/rdmavt: add lock to call to rvt_error_qp to prevent a race condition 3a57babfb6e9 RDMA/mlx5: Don't remove cache MRs when a delay is needed d8992b393f97 sfc: Do not free an empty page_ring 0ac74169ebc3 bnxt_en: reserve space inside receive page for skb_shared_info f8b0ef0a5889 drm/imx: Fix memory leak in imx_pd_connector_get_modes 25bc9fd4c8d1 drm/imx: imx-ldb: Check for null pointer after calling kmemdup 02ab4abe5bbf net: stmmac: Fix unset max_speed difference between DT and non-DT platforms 63ea57478aaa net: ipv4: fix route with nexthop object delete warning 4be6ed03107b ice: Clear default forwarding VSI during VSI release 589154d0f189 net/tls: fix slab-out-of-bounds bug in decrypt_internal c5f77b595379 scsi: zorro7xx: Fix a resource leak in zorro7xx_remove_one() 45b9932b4daa NFSv4: fix open failure with O_ACCMODE flag c688705a3978 Revert "NFSv4: Handle the special Linux file open access mode" cf580d2e3884 Drivers: hv: vmbus: Fix potential crash on module unload 0c122eb3a109 drm/amdgpu: fix off by one in amdgpu_gfx_kiq_acquire() 84e5dfc05f37 Revert "hv: utils: add PTP_1588_CLOCK to Kconfig to fix build" 3c3fbfa6dddb mm: fix race between MADV_FREE reclaim and blkdev direct IO read 1753a49e266d parisc: Fix patch code locking and flushing f7c35220305f parisc: Fix CPU affinity for Lasi, WAX and Dino chips c74e2f6ecc51 NFS: Avoid writeback threads getting stuck in mempool_alloc() 34681aeddcfc NFS: nfsiod should not block forever in mempool_alloc() 7a506fabcfe1 SUNRPC: Fix socket waits for write buffer space b9c5ac0a15f2 jfs: prevent NULL deref in diFree c69b442125bf virtio_console: eliminate anonymous module_init & module_exit 3309b3221711 serial: samsung_tty: do not unlock port->lock for uart_write_wakeup() 9cb90f9ad597 x86/Kconfig: Do not allow CONFIG_X86_X32_ABI=y with llvm-objcopy b3882e78aa0a NFS: swap-out must always use STABLE writes. d4170a28217a NFS: swap IO handling is slightly different for O_DIRECT IO 4b6f122bdfdc SUNRPC: remove scheduling boost for "SWAPPER" tasks. f4fc47e71e32 SUNRPC/xprt: async tasks mustn't block waiting for memory f9244d31e05a SUNRPC/call_alloc: async tasks mustn't block waiting for memory e2b2542f7452 clk: Enforce that disjoints limits are invalid 1e9b5538cf16 clk: ti: Preserve node in ti_dt_clocks_register() a2a0e04f6478 xen: delay xen_hvm_init_time_ops() if kdump is boot on vcpu>=32 4a2544ce244b NFSv4: Protect the state recovery thread against direct reclaim 9b9feec97c1f NFSv4.2: fix reference count leaks in _nfs42_proc_copy_notify() 2e16895d06e6 w1: w1_therm: fixes w1_seq for ds28ea00 sensors 93498c6e775a staging: wfx: fix an error handling in wfx_init_common() 8f1d24f85ffd phy: amlogic: meson8b-usb2: Use dev_err_probe() aa0b72967853 staging: vchiq_core: handle NULL result of find_service_by_handle be4ecca95819 clk: si5341: fix reported clk_rate when output divider is 2 c9cf6baabf78 minix: fix bug when opening a file with O_DIRECT 8d9efd4434e3 init/main.c: return 1 from handled __setup() functions f44297861296 ceph: fix memory leak in ceph_readdir when note_last_dentry returns error d745512d54fd netlabel: fix out-of-bounds memory accesses 2cc803804ec9 Bluetooth: Fix use after free in hci_send_acl 789621df1963 MIPS: ingenic: correct unit node address 61e25021e67a xtensa: fix DTC warning unit_address_format f6b9550f5367 usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm a4dd3e9e5ae8 net: sfp: add 2500base-X quirk for Lantech SFP module 278b652f0ad9 net: limit altnames to 64k total 423e7107f61f net: account alternate interface name memory 74c4d5025551 can: isotp: set default value for N_As to 50 micro seconds 1d7effe5fff9 scsi: libfc: Fix use after free in fc_exch_abts_resp() 02222bf4f0a2 powerpc/secvar: fix refcount leak in format_show() fd416c3f5a4c MIPS: fix fortify panic when copying asm exception handlers 7c657c0694ff PCI: endpoint: Fix misused goto label 79cfc0052f39 bnxt_en: Eliminate unintended link toggle during FW reset 9567d54e70ff Bluetooth: use memset avoid memory leaks f9b183f1332a Bluetooth: Fix not checking for valid hdev on bt_dev_{info,warn,err,dbg} 647b35aaf454 tuntap: add sanity checks about msg_controllen in sendmsg 797b4ea9515e macvtap: advertise link netns via netlink 142ae7d4f215 mips: ralink: fix a refcount leak in ill_acc_of_setup() f2565cb40e9b net/smc: correct settings of RMB window update limit 224903cc60d0 scsi: hisi_sas: Free irq vectors in order for v3 HW f49ffaa85d2c scsi: aha152x: Fix aha152x_setup() __setup handler return value 91ee8a14efb6 mt76: mt7615: Fix assigning negative values to unsigned variable d83574666bac scsi: pm8001: Fix memory leak in pm8001_chip_fw_flash_update_req() a0bb65eadbf9 scsi: pm8001: Fix tag leaks on error 2051044d7901 scsi: pm8001: Fix task leak in pm8001_send_abort_all() 3bd9a28798ca scsi: pm8001: Fix pm8001_mpi_task_abort_resp() ef969095c442 scsi: pm8001: Fix pm80xx_pci_mem_copy() interface fe4b6d5a0dd7 drm/amdkfd: make CRAT table missing message informational only 2f2f017ea873 dm: requeue IO if mapping table not yet available 71c8df33fd77 dm ioctl: prevent potential spectre v1 gadget f655b724b440 ipv4: Invalidate neighbour for broadcast address upon address addition bae03957e8ca iwlwifi: mvm: Correctly set fragmented EBS 9538563d31a2 power: supply: axp288-charger: Set Vhold to 4.4V c66cc0404367 PCI: pciehp: Add Qualcomm quirk for Command Completed erratum b1b27b0e8d48 tcp: Don't acquire inet_listen_hashbucket::lock with disabled BH. b02a1a65023f PCI: endpoint: Fix alignment fault error in copy tests 4820847e8bc2 usb: ehci: add pci device support for Aspeed platforms 0b9cf0b59925 iommu/arm-smmu-v3: fix event handling soft lockup e07e420a0056 PCI: aardvark: Fix support for MSI interrupts 6694b8643bde drm/amdgpu: Fix recursive locking warning ea21eaea7f5f powerpc: Set crashkernel offset to mid of RMA region fb5ac62fbe16 ipv6: make mc_forwarding atomic 5baf92a2c46c libbpf: Fix build issue with llvm-readelf 26a1e4739e44 cfg80211: don't add non transmitted BSS to 6GHz scanned channels 9a56e2b271bc mt76: dma: initialize skip_unmap in mt76_dma_rx_fill b42b6d0ec358 power: supply: axp20x_battery: properly report current when discharging de9505936c47 scsi: bfa: Replace snprintf() with sysfs_emit() ed7db959203e scsi: mvsas: Replace snprintf() with sysfs_emit() 995f51788868 bpf: Make dst_port field in struct bpf_sock 16-bit wide 339bd0b55ecd ath11k: mhi: use mhi_sync_power_up() c6a815f5abdf ath11k: fix kernel panic during unload/load ath11k modules e4d2d7201356 powerpc: dts: t104xrdb: fix phy type for FMAN 4/5 02e2ee861984 ptp: replace snprintf with sysfs_emit 9ea17b9f1dd0 usb: gadget: tegra-xudc: Fix control endpoint's definitions 07971b818e18 usb: gadget: tegra-xudc: Do not program SPARAM 927beb05aaa4 drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj 85313d9bc7bd drm/amd/display: Add signal type check when verify stream backends same 9d7d83d0399e ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111 850c4351e895 drm: Add orientation quirk for GPD Win Max a24479c5e9f4 KVM: x86/emulator: Emulate RDPID only if it is enabled in guest 66b0fa6b2218 KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs 2e52a294700b rtc: wm8350: Handle error for wm8350_register_irq 0777fe98a44c gfs2: gfs2_setattr_size error path fix f349d7f9ee6d gfs2: Fix gfs2_release for non-writers regression 3f53715fd55c gfs2: Check for active reservation in gfs2_release 2dc49f58a29c ubifs: Rectify space amount budget for mkdir/tmpfile operations (From meta-yocto rev: 3739e5aba6eaebd8d1cc7c256721bb79f4d855d0) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 184595145167adebf167368639d0258c13c064cc) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
linux-yocto/5.10: update to v5.10.113
2026-09-13 00:49:33 +02:00 · 2022-06-01 11:20:25 +01:00 · 2022-06-01 11:20:25 +01:00 · 2022-06-01 11:20:25 +01:00 · 2022-06-01 11:20:25 +01:00 · 2022-06-01 11:20:25 +01:00
3520 changed files with 108504 additions and 219357 deletions
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,24 +0,0 @@
 How to Report a Potential Vulnerability?
 ========================================
 If you would like to report a public issue (for example, one with a released
 CVE number), please report it using the
 [https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Security Security Bugzilla].
 If you have a patch ready, submit it following the same procedure as any other
 patch as described in README.md.
 If you are dealing with a not-yet released or urgent issue, please send a
 message to security AT yoctoproject DOT org, including as many details as
 possible: the layer or software module affected, the recipe and its version,
 and any example code, if available.
 Branches maintained with security fixes
 ---------------------------------------
 See [https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS Stable release and LTS]
 for detailed info regarding the policies and maintenance of Stable branches.
 The [https://wiki.yoctoproject.org/wiki/Releases Release page] contains a list of all
 releases of the Yocto Project. Versions in grey are no longer actively maintained with
 security patches, but well-tested patches may still be accepted for them for
 significant issues.
--- a/bitbake/SECURITY.md
+++ b/bitbake/SECURITY.md
@@ -1,24 +0,0 @@
 How to Report a Potential Vulnerability?
 ========================================
 If you would like to report a public issue (for example, one with a released
 CVE number), please report it using the
 [https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Security Security Bugzilla].
 If you have a patch ready, submit it following the same procedure as any other
 patch as described in README.md.
 If you are dealing with a not-yet released or urgent issue, please send a
 message to security AT yoctoproject DOT org, including as many details as
 possible: the layer or software module affected, the recipe and its version,
 and any example code, if available.
 Branches maintained with security fixes
 ---------------------------------------
 See [https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS Stable release and LTS]
 for detailed info regarding the policies and maintenance of Stable branches.
 The [https://wiki.yoctoproject.org/wiki/Releases Release page] contains a list of all
 releases of the Yocto Project. Versions in grey are no longer actively maintained with
 security patches, but well-tested patches may still be accepted for them for
 significant issues.
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -25,9 +25,10 @@ except RuntimeError as exc:
 from bb import cookerdata
 from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException
-bb.utils.check_system_locale()
+if sys.getfilesystemencoding() != "utf-8":
    sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")
-__version__ = "2.0.0"
+__version__ = "1.52.0"
 if __name__ == "__main__":
    if __version__ != bb.__version__:
--- a/bitbake/bin/bitbake-diffsigs
+++ b/bitbake/bin/bitbake-diffsigs
@@ -11,7 +11,6 @@
 import os
 import sys
 import warnings
 warnings.simplefilter("default")
 import argparse
 import logging
@@ -28,7 +27,6 @@ logger = bb.msg.logger_create(myname)
 is_dump = myname == 'bitbake-dumpsig'
 def find_siginfo(tinfoil, pn, taskname, sigs=None):
    result = None
    tinfoil.set_event_mask(['bb.event.FindSigInfoResult',
@@ -54,7 +52,6 @@ def find_siginfo(tinfoil, pn, taskname, sigs=None):
        sys.exit(2)
    return result
 def find_siginfo_task(bbhandler, pn, taskname, sig1=None, sig2=None):
    """ Find the most recent signature files for the specified PN/task """
@@ -63,13 +60,13 @@ def find_siginfo_task(bbhandler, pn, taskname, sig1=None, sig2=None):
    if sig1 and sig2:
        sigfiles = find_siginfo(bbhandler, pn, taskname, [sig1, sig2])
-        if not sigfiles:
+        if len(sigfiles) == 0:
            logger.error('No sigdata files found matching %s %s matching either %s or %s' % (pn, taskname, sig1, sig2))
            sys.exit(1)
-        elif sig1 not in sigfiles:
+        elif not sig1 in sigfiles:
            logger.error('No sigdata files found matching %s %s with signature %s' % (pn, taskname, sig1))
            sys.exit(1)
-        elif sig2 not in sigfiles:
+        elif not sig2 in sigfiles:
            logger.error('No sigdata files found matching %s %s with signature %s' % (pn, taskname, sig2))
            sys.exit(1)
        latestfiles = [sigfiles[sig1], sigfiles[sig2]]
@@ -89,11 +86,11 @@ def recursecb(key, hash1, hash2):
    hashfiles = find_siginfo(tinfoil, key, None, hashes)
    recout = []
-    if not hashfiles:
+    if len(hashfiles) == 0:
        recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2))
-    elif hash1 not in hashfiles:
+    elif not hash1 in hashfiles:
        recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1))
-    elif hash2 not in hashfiles:
+    elif not hash2 in hashfiles:
        recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2))
    else:
        out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, color=color)
@@ -113,36 +110,36 @@ parser.add_argument('-D', '--debug',
 if is_dump:
    parser.add_argument("-t", "--task",
-                        help="find the signature data file for the last run of the specified task",
+            help="find the signature data file for the last run of the specified task",
-                        action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname'))
+            action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname'))
    parser.add_argument("sigdatafile1",
-                        help="Signature file to dump. Not used when using -t/--task.",
+            help="Signature file to dump. Not used when using -t/--task.",
-                        action="store", nargs='?', metavar="sigdatafile")
+            action="store", nargs='?', metavar="sigdatafile")
 else:
    parser.add_argument('-c', '--color',
-                        help='Colorize the output (where %(metavar)s is %(choices)s)',
+            help='Colorize the output (where %(metavar)s is %(choices)s)',
-                        choices=['auto', 'always', 'never'], default='auto', metavar='color')
+            choices=['auto', 'always', 'never'], default='auto', metavar='color')
    parser.add_argument('-d', '--dump',
-                        help='Dump the last signature data instead of comparing (equivalent to using bitbake-dumpsig)',
+            help='Dump the last signature data instead of comparing (equivalent to using bitbake-dumpsig)',
-                        action='store_true')
+            action='store_true')
    parser.add_argument("-t", "--task",
-                        help="find the signature data files for the last two runs of the specified task and compare them",
+            help="find the signature data files for the last two runs of the specified task and compare them",
-                        action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname'))
+            action="store", dest="taskargs", nargs=2, metavar=('recipename', 'taskname'))
    parser.add_argument("-s", "--signature",
-                        help="With -t/--task, specify the signatures to look for instead of taking the last two",
+            help="With -t/--task, specify the signatures to look for instead of taking the last two",
-                        action="store", dest="sigargs", nargs=2, metavar=('fromsig', 'tosig'))
+            action="store", dest="sigargs", nargs=2, metavar=('fromsig', 'tosig'))
    parser.add_argument("sigdatafile1",
-                        help="First signature file to compare (or signature file to dump, if second not specified). Not used when using -t/--task.",
+            help="First signature file to compare (or signature file to dump, if second not specified). Not used when using -t/--task.",
-                        action="store", nargs='?')
+            action="store", nargs='?')
    parser.add_argument("sigdatafile2",
-                        help="Second signature file to compare",
+            help="Second signature file to compare",
-                        action="store", nargs='?')
+            action="store", nargs='?')
 options = parser.parse_args()
 if is_dump:
@@ -160,8 +157,7 @@ if options.taskargs:
    with bb.tinfoil.Tinfoil() as tinfoil:
        tinfoil.prepare(config_only=True)
        if not options.dump and options.sigargs:
-            files = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0],
+            files = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1], options.sigargs[0], options.sigargs[1])
                                      options.sigargs[1])
        else:
            files = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1])
@@ -170,8 +166,7 @@ if options.taskargs:
            output = bb.siggen.dump_sigfile(files[-1])
        else:
            if len(files) < 2:
-                logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (
+                logger.error('Only one matching sigdata file found for the specified task (%s %s)' % (options.taskargs[0], options.taskargs[1]))
                    options.taskargs[0], options.taskargs[1]))
                sys.exit(1)
            # Recurse into signature comparison
--- a/bitbake/bin/bitbake-getvar
+++ b/bitbake/bin/bitbake-getvar
@@ -25,7 +25,6 @@ if __name__ == "__main__":
    parser.add_argument('-u', '--unexpand', help='Do not expand the value (with --value)', action="store_true")
    parser.add_argument('-f', '--flag', help='Specify a variable flag to query (with --value)', default=None)
    parser.add_argument('--value', help='Only report the value, no history and no variable name', action="store_true")
    parser.add_argument('-q', '--quiet', help='Silence bitbake server logging', action="store_true")
    args = parser.parse_args()
    if args.unexpand and not args.value:
@@ -36,10 +35,9 @@ if __name__ == "__main__":
        print("--flag only makes sense with --value")
        sys.exit(1)
-    quiet = args.quiet
+    with bb.tinfoil.Tinfoil(tracking=True) as tinfoil:
    with bb.tinfoil.Tinfoil(tracking=True, setup_logging=not quiet) as tinfoil:
        if args.recipe:
-            tinfoil.prepare(quiet=3 if quiet else 2)
+            tinfoil.prepare(quiet=2)
            d = tinfoil.parse_recipe(args.recipe)
        else:
            tinfoil.prepare(quiet=2, config_only=True)
--- a/bitbake/bin/bitbake-hashclient
+++ b/bitbake/bin/bitbake-hashclient
@@ -56,24 +56,25 @@ def main():
            nonlocal missed_hashes
            nonlocal max_time
-            with hashserv.create_client(args.address) as client:
+            client = hashserv.create_client(args.address)
                for i in range(args.requests):
                    taskhash = hashlib.sha256()
                    taskhash.update(args.taskhash_seed.encode('utf-8'))
                    taskhash.update(str(i).encode('utf-8'))
-                    start_time = time.perf_counter()
+            for i in range(args.requests):
-                    l = client.get_unihash(METHOD, taskhash.hexdigest())
+                taskhash = hashlib.sha256()
-                    elapsed = time.perf_counter() - start_time
+                taskhash.update(args.taskhash_seed.encode('utf-8'))
                taskhash.update(str(i).encode('utf-8'))
-                    with lock:
+                start_time = time.perf_counter()
-                        if l:
+                l = client.get_unihash(METHOD, taskhash.hexdigest())
-                            found_hashes += 1
+                elapsed = time.perf_counter() - start_time
                        else:
                            missed_hashes += 1
-                        max_time = max(elapsed, max_time)
+                with lock:
-                        pbar.update()
+                    if l:
                        found_hashes += 1
                    else:
                        missed_hashes += 1
                    max_time = max(elapsed, max_time)
                    pbar.update()
        max_time = 0
        found_hashes = 0
@@ -151,8 +152,9 @@ def main():
    func = getattr(args, 'func', None)
    if func:
-        with hashserv.create_client(args.address) as client:
+        client = hashserv.create_client(args.address)
-            return func(args, client)
+
        return func(args, client)
    return 0
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -68,11 +68,11 @@ def main():
        registered = False
        for plugin in plugins:
            if hasattr(plugin, 'tinfoil_init'):
                plugin.tinfoil_init(tinfoil)
            if hasattr(plugin, 'register_commands'):
                registered = True
                plugin.register_commands(subparsers)
            if hasattr(plugin, 'tinfoil_init'):
                plugin.tinfoil_init(tinfoil)
        if not registered:
            logger.error("No commands registered - missing plugins?")
--- a/bitbake/bin/bitbake-prserv
+++ b/bitbake/bin/bitbake-prserv
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/bin/bitbake-server
+++ b/bitbake/bin/bitbake-server
@@ -12,9 +12,8 @@ warnings.simplefilter("default")
 import logging
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
-import bb
+if sys.getfilesystemencoding() != "utf-8":
-
+    sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")
 bb.utils.check_system_locale()
 # Users shouldn't be running this code directly
 if len(sys.argv) != 10 or not sys.argv[1].startswith("decafbad"):
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -24,7 +22,8 @@ import subprocess
 from multiprocessing import Lock
 from threading import Thread
-bb.utils.check_system_locale()
+if sys.getfilesystemencoding() != "utf-8":
    sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\nPython can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")
 # Users shouldn't be running this code directly
 if len(sys.argv) != 2 or not sys.argv[1].startswith("decafbad"):
@@ -91,19 +90,19 @@ def worker_fire_prepickled(event):
 worker_thread_exit = False
 def worker_flush(worker_queue):
-    worker_queue_int = bytearray()
+    worker_queue_int = b""
    global worker_pipe, worker_thread_exit
    while True:
        try:
-            worker_queue_int.extend(worker_queue.get(True, 1))
+            worker_queue_int = worker_queue_int + worker_queue.get(True, 1)
        except queue.Empty:
            pass
        while (worker_queue_int or not worker_queue.empty()):
            try:
                (_, ready, _) = select.select([], [worker_pipe], [], 1)
                if not worker_queue.empty():
-                    worker_queue_int.extend(worker_queue.get())
+                    worker_queue_int = worker_queue_int + worker_queue.get()
                written = os.write(worker_pipe, worker_queue_int)
                worker_queue_int = worker_queue_int[written:]
            except (IOError, OSError) as e:
@@ -153,10 +152,6 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha
    fakeenv = {}
    umask = None
    uid = os.getuid()
    gid = os.getgid()
    taskdep = workerdata["taskdeps"][fn]
    if 'umask' in taskdep and taskname in taskdep['umask']:
        umask = taskdep['umask'][taskname]
@@ -242,7 +237,6 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha
                the_data = databuilder.mcdata[mc]
                the_data.setVar("BB_WORKERCONTEXT", "1")
                the_data.setVar("BB_TASKDEPDATA", taskdepdata)
                the_data.setVar('BB_CURRENTTASK', taskname.replace("do_", ""))
                if cfg.limited_deps:
                    the_data.setVar("BB_LIMITEDDEPS", "1")
                the_data.setVar("BUILDNAME", workerdata["buildname"])
@@ -262,13 +256,6 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, taskha
                bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN"), taskname.replace("do_", "")))
                if not the_data.getVarFlag(taskname, 'network', False):
                    if bb.utils.is_local_uid(uid):
                        logger.debug("Attempting to disable network for %s" % taskname)
                        bb.utils.disable_network(uid, gid)
                    else:
                        logger.debug("Skipping disable network for %s since %s is not a local uid." % (taskname, uid))
                # exported_vars() returns a generator which *cannot* be passed to os.environ.update() 
                # successfully. We also need to unset anything from the environment which shouldn't be there 
                exports = bb.data.exported_vars(the_data)
@@ -338,12 +325,12 @@ class runQueueWorkerPipe():
        if pipeout:
            pipeout.close()
        bb.utils.nonblockingfd(self.input)
-        self.queue = bytearray()
+        self.queue = b""
    def read(self):
        start = len(self.queue)
        try:
-            self.queue.extend(self.input.read(102400) or b"")
+            self.queue = self.queue + (self.input.read(102400) or b"")
        except (OSError, IOError) as e:
            if e.errno != errno.EAGAIN:
                raise
@@ -371,7 +358,7 @@ class BitbakeWorker(object):
    def __init__(self, din):
        self.input = din
        bb.utils.nonblockingfd(self.input)
-        self.queue = bytearray()
+        self.queue = b""
        self.cookercfg = None
        self.databuilder = None
        self.data = None
@@ -405,7 +392,7 @@ class BitbakeWorker(object):
                    if len(r) == 0:
                        # EOF on pipe, server must have terminated
                        self.sigterm_exception(signal.SIGTERM, None)
-                    self.queue.extend(r)
+                    self.queue = self.queue + r
                except (OSError, IOError):
                    pass
            if len(self.queue):
@@ -441,7 +428,7 @@ class BitbakeWorker(object):
    def handle_cookercfg(self, data):
        self.cookercfg = pickle.loads(data)
        self.databuilder = bb.cookerdata.CookerDataBuilder(self.cookercfg, worker=True)
-        self.databuilder.parseBaseConfiguration(worker=True)
+        self.databuilder.parseBaseConfiguration()
        self.data = self.databuilder.data
    def handle_extraconfigdata(self, data):
--- a/bitbake/bin/git-make-shallow
+++ b/bitbake/bin/git-make-shallow
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -33,7 +33,7 @@ databaseCheck()
    $MANAGE migrate --noinput || retval=1
    if [ $retval -eq 1 ]; then
-        echo "Failed migrations, halting system start" 1>&2
+        echo "Failed migrations, aborting system start" 1>&2
        return $retval
    fi
    # Make sure that checksettings can pick up any value for TEMPLATECONF
@@ -41,7 +41,7 @@ databaseCheck()
    $MANAGE checksettings --traceback || retval=1
    if [ $retval -eq 1 ]; then
-        printf "\nError while checking settings; exiting\n"
+        printf "\nError while checking settings; aborting\n"
        return $retval
    fi
@@ -248,7 +248,7 @@ fi
 # 3) the sqlite db if that is being used.
 # 4) pid's we need to clean up on exit/shutdown
 export TOASTER_DIR=$TOASTERDIR
-export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS TOASTER_DIR"
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR"
 # Determine the action. If specified by arguments, fine, if not, toggle it
 if [ "$CMD" = "start" ] ; then
--- a/bitbake/contrib/prserv/Dockerfile
+++ b/bitbake/contrib/prserv/Dockerfile
@@ -1,62 +0,0 @@
 # SPDX-License-Identifier: MIT
 #
 # Copyright (c) 2022 Daniel Gomez <daniel@qtec.com>
 #
 # Dockerfile to build a bitbake PR service container
 #
 # From the root of the bitbake repository, run:
 #
 #   docker build -f contrib/prserv/Dockerfile . -t prserv
 #
 # Running examples:
 #
 # 1. PR Service in RW mode, port 18585:
 #
 # docker run --detach --tty \
 # --env PORT=18585 \
 # --publish 18585:18585 \
 # --volume $PWD:/var/lib/bbprserv \
 # prserv
 #
 # 2. PR Service in RO mode, default port (8585) and custom LOGFILE:
 #
 # docker run --detach --tty \
 # --env DBMODE="--read-only" \
 # --env LOGFILE=/var/lib/bbprserv/prservro.log \
 # --publish 8585:8585 \
 # --volume $PWD:/var/lib/bbprserv \
 # prserv
 #
 FROM alpine:3.14.4
 RUN apk add --no-cache python3
 COPY bin/bitbake-prserv /opt/bbprserv/bin/
 COPY lib/prserv /opt/bbprserv/lib/prserv/
 COPY lib/bb /opt/bbprserv/lib/bb/
 COPY lib/codegen.py /opt/bbprserv/lib/codegen.py
 COPY lib/ply /opt/bbprserv/lib/ply/
 COPY lib/bs4 /opt/bbprserv/lib/bs4/
 ENV PATH=$PATH:/opt/bbprserv/bin
 RUN mkdir -p /var/lib/bbprserv
 ENV DBFILE=/var/lib/bbprserv/prserv.sqlite3 \
    LOGFILE=/var/lib/bbprserv/prserv.log \
    LOGLEVEL=debug \
    HOST=0.0.0.0 \
    PORT=8585 \
    DBMODE=""
 ENTRYPOINT [ "/bin/sh", "-c", \
 "bitbake-prserv \
 --file=$DBFILE \
 --log=$LOGFILE \
 --loglevel=$LOGLEVEL \
 --start \
 --host=$HOST \
 --port=$PORT \
 $DBMODE \
 && tail -f $LOGFILE"]
--- a/bitbake/doc/README
+++ b/bitbake/doc/README
@@ -8,7 +8,7 @@ Manual Organization
 Folders exist for individual manuals as follows:
-* bitbake-user-manual      --- The BitBake User Manual 
+* bitbake-user-manual      - The BitBake User Manual 
 Each folder is self-contained regarding content and figures.
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst
@@ -79,8 +79,8 @@ directives.
 Prior to parsing configuration files, BitBake looks at certain
 variables, including:
-  :term:`BB_ENV_PASSTHROUGH`
+-  :term:`BB_ENV_WHITELIST`
-  :term:`BB_ENV_PASSTHROUGH_ADDITIONS`
+-  :term:`BB_ENV_EXTRAWHITE`
 -  :term:`BB_PRESERVE_ENV`
 -  :term:`BB_ORIGENV`
 -  :term:`BITBAKE_UI`
@@ -228,7 +228,7 @@ and then reload it.
 Where possible, subsequent BitBake commands reuse this cache of recipe
 information. The validity of this cache is determined by first computing
 a checksum of the base configuration data (see
-:term:`BB_HASHCONFIG_IGNORE_VARS`) and
+:term:`BB_HASHCONFIG_WHITELIST`) and
 then checking if the checksum matches. If that checksum matches what is
 in the cache and the recipe and class files have not changed, BitBake is
 able to use the cache. BitBake then reloads the cached information about
@@ -435,7 +435,7 @@ BitBake writes a shell script to
 executes the script. The generated shell script contains all the
 exported variables, and the shell functions with all variables expanded.
 Output from the shell script goes to the file
-``${``\ :term:`T`\ ``}/log.do_taskname.pid``. Looking at the expanded shell functions in
+``${T}/log.do_taskname.pid``. Looking at the expanded shell functions in
 the run file and the output in the log files is a useful debugging
 technique.
@@ -477,7 +477,7 @@ changes because it should not affect the output for target packages. The
 simplistic approach for excluding the working directory is to set it to
 some fixed value and create the checksum for the "run" script. BitBake
 goes one step better and uses the
-:term:`BB_BASEHASH_IGNORE_VARS` variable
+:term:`BB_HASHBASE_WHITELIST` variable
 to define a list of variables that should never be included when
 generating the signatures.
@@ -523,7 +523,7 @@ it cannot figure out dependencies.
 Thus far, this section has limited discussion to the direct inputs into
 a task. Information based on direct inputs is referred to as the
 "basehash" in the code. However, there is still the question of a task's
-indirect inputs --- the things that were already built and present in the
+indirect inputs - the things that were already built and present in the
 build directory. The checksum (or signature) for a particular task needs
 to add the hashes of all the tasks on which the particular task depends.
 Choosing which dependencies to add is a policy decision. However, the
@@ -534,11 +534,11 @@ At the code level, there are a variety of ways both the basehash and the
 dependent task hashes can be influenced. Within the BitBake
 configuration file, we can give BitBake some extra information to help
 it construct the basehash. The following statement effectively results
-in a list of global variable dependency excludes --- variables never
+in a list of global variable dependency excludes - variables never
 included in any checksum. This example uses variables from OpenEmbedded
 to help illustrate the concept::
-   BB_BASEHASH_IGNORE_VARS ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
+   BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
       SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL \
       USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \
       PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst
@@ -84,18 +84,18 @@ fetcher does know how to use HTTP as a transport.
 Here are some examples that show commonly used mirror definitions::
   PREMIRRORS ?= "\
-      bzr://.*/.\*  http://somemirror.org/sources/ \
+      bzr://.*/.\*  http://somemirror.org/sources/ \\n \
-      cvs://.*/.\*  http://somemirror.org/sources/ \
+      cvs://.*/.\*  http://somemirror.org/sources/ \\n \
-      git://.*/.\*  http://somemirror.org/sources/ \
+      git://.*/.\*  http://somemirror.org/sources/ \\n \
-      hg://.*/.\*   http://somemirror.org/sources/ \
+      hg://.*/.\*   http://somemirror.org/sources/ \\n \
-      osc://.*/.\*  http://somemirror.org/sources/ \
+      osc://.*/.\*  http://somemirror.org/sources/ \\n \
-      p4://.*/.\*   http://somemirror.org/sources/ \
+      p4://.*/.\*   http://somemirror.org/sources/ \\n \
-     svn://.*/.\*   http://somemirror.org/sources/"
+     svn://.*/.\*   http://somemirror.org/sources/ \\n"
   MIRRORS =+ "\
-      ftp://.*/.\*   http://somemirror.org/sources/ \
+      ftp://.*/.\*   http://somemirror.org/sources/ \\n \
-      http://.*/.\*  http://somemirror.org/sources/ \
+      http://.*/.\*  http://somemirror.org/sources/ \\n \
-      https://.*/.\* http://somemirror.org/sources/"
+      https://.*/.\* http://somemirror.org/sources/ \\n"
 It is useful to note that BitBake
 supports cross-URLs. It is possible to mirror a Git repository on an
@@ -167,9 +167,6 @@ govern the behavior of the unpack stage:
 -  *dos:* Applies to ``.zip`` and ``.jar`` files and specifies whether
   to use DOS line ending conversion on text files.
 -  *striplevel:* Strip specified number of leading components (levels)
   from file names on extraction
 -  *subdir:* Unpacks the specific URL to the specified subdirectory
   within the root directory.
@@ -229,11 +226,6 @@ downloaded file is useful for avoiding collisions in
 :term:`DL_DIR` when dealing with multiple files that
 have the same name.
 If a username and password are specified in the ``SRC_URI``, a Basic
 Authorization header will be added to each request, including across redirects.
 To instead limit the Authorization header to the first request, add
 "redirectauth=0" to the list of parameters.
 Some example URLs are as follows::
   SRC_URI = "http://oe.handhelds.org/not_there.aac"
@@ -396,19 +388,6 @@ This fetcher supports the following parameters:
   protocol is "file". You can also use "http", "https", "ssh" and
   "rsync".
   .. note::
     When ``protocol`` is "ssh", the URL expected in :term:`SRC_URI` differs
     from the one that is typically passed to ``git clone`` command and provided
     by the Git server to fetch from. For example, the URL returned by GitLab
     server for ``mesa`` when cloning over SSH is
     ``git@gitlab.freedesktop.org:mesa/mesa.git``, however the expected URL in
     :term:`SRC_URI` is the following::
       SRC_URI = "git://git@gitlab.freedesktop.org/mesa/mesa.git;branch=main;protocol=ssh;..."
     Note the ``:`` character changed for a ``/`` before the path to the project.
 -  *"nocheckout":* Tells the fetcher to not checkout source code when
   unpacking when set to "1". Set this option for the URL where there is
   a custom routine to checkout code. The default is "0".
@@ -424,17 +403,17 @@ This fetcher supports the following parameters:
 -  *"nobranch":* Tells the fetcher to not check the SHA validation for
   the branch when set to "1". The default is "0". Set this option for
-   the recipe that refers to the commit that is valid for any namespace
+   the recipe that refers to the commit that is valid for a tag instead
-   (branch, tag, ...) instead of the branch.
+   of the branch.
 -  *"bareclone":* Tells the fetcher to clone a bare clone into the
   destination directory without checking out a working tree. Only the
   raw Git metadata is provided. This parameter implies the "nocheckout"
   parameter as well.
-  *"branch":* The branch(es) of the Git tree to clone. Unless
+-  *"branch":* The branch(es) of the Git tree to clone. If unset, this
-   "nobranch" is set to "1", this is a mandatory parameter. The number of
+   is assumed to be "master". The number of branch parameters much match
-   branch parameters must match the number of name parameters.
+   the number of name parameters.
 -  *"rev":* The revision to use for the checkout. The default is
   "master".
@@ -457,9 +436,8 @@ This fetcher supports the following parameters:
 Here are some example URLs::
-   SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV};tag=${PV}"
+   SRC_URI = "git://git.oe.handhelds.org/git/vip.git;tag=version-1"
-   SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main"
+   SRC_URI = "git://git.oe.handhelds.org/git/vip.git;protocol=http"
   SRC_URI = "git://git@gitlab.freedesktop.org/mesa/mesa.git;branch=main;protocol=ssh;..."
 .. note::
@@ -688,98 +666,6 @@ Here is an example URL::
 It can also be used when setting mirrors definitions using the :term:`PREMIRRORS` variable.
 .. _crate-fetcher:
 Crate Fetcher (``crate://``)
 ----------------------------
 This submodule fetches code for
 `Rust language "crates" <https://doc.rust-lang.org/reference/glossary.html?highlight=crate#crate>`__
 corresponding to Rust libraries and programs to compile. Such crates are typically shared
 on https://crates.io/ but this fetcher supports other crate registries too.
 The format for the :term:`SRC_URI` setting must be::
   SRC_URI = "crate://REGISTRY/NAME/VERSION"
 Here is an example URL::
   SRC_URI = "crate://crates.io/glob/0.2.11"
 .. _npm-fetcher:
 NPM Fetcher (``npm://``)
 ------------------------
 This submodule fetches source code from an
 `NPM <https://en.wikipedia.org/wiki/Npm_(software)>`__
 Javascript package registry.
 The format for the :term:`SRC_URI` setting must be::
   SRC_URI = "npm://some.registry.url;ParameterA=xxx;ParameterB=xxx;..."
 This fetcher supports the following parameters:
 -  *"package":* The NPM package name. This is a mandatory parameter.
 -  *"version":* The NPM package version. This is a mandatory parameter.
 -  *"downloadfilename":* Specifies the filename used when storing the downloaded file.
 -  *"destsuffix":* Specifies the directory to use to unpack the package (default: ``npm``).
 Note that NPM fetcher only fetches the package source itself. The dependencies
 can be fetched through the `npmsw-fetcher`_.
 Here is an example URL with both fetchers::
   SRC_URI = " \
       npm://registry.npmjs.org/;package=cute-files;version=${PV} \
       npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \
       "
 See :yocto_docs:`Creating Node Package Manager (NPM) Packages
 </dev-manual/common-tasks.html#creating-node-package-manager-npm-packages>`
 in the Yocto Project manual for details about using
 :yocto_docs:`devtool <https://docs.yoctoproject.org/ref-manual/devtool-reference.html>`
 to automatically create a recipe from an NPM URL.
 .. _npmsw-fetcher:
 NPM shrinkwrap Fetcher (``npmsw://``)
 -------------------------------------
 This submodule fetches source code from an
 `NPM shrinkwrap <https://docs.npmjs.com/cli/v8/commands/npm-shrinkwrap>`__
 description file, which lists the dependencies
 of an NPM package while locking their versions.
 The format for the :term:`SRC_URI` setting must be::
   SRC_URI = "npmsw://some.registry.url;ParameterA=xxx;ParameterB=xxx;..."
 This fetcher supports the following parameters:
 -  *"dev":* Set this parameter to ``1`` to install "devDependencies".
 -  *"destsuffix":* Specifies the directory to use to unpack the dependencies
   (``${S}`` by default).
 Note that the shrinkwrap file can also be provided by the recipe for
 the package which has such dependencies, for example::
   SRC_URI = " \
       npm://registry.npmjs.org/;package=cute-files;version=${PV} \
       npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \
       "
 Such a file can automatically be generated using
 :yocto_docs:`devtool <https://docs.yoctoproject.org/ref-manual/devtool-reference.html>`
 as described in the :yocto_docs:`Creating Node Package Manager (NPM) Packages
 </dev-manual/common-tasks.html#creating-node-package-manager-npm-packages>`
 section of the Yocto Project.
 Other Fetchers
 --------------
@@ -789,6 +675,8 @@ Fetch submodules also exist for the following:
 -  Mercurial (``hg://``)
 -  npm (``npm://``)
 -  OSC (``osc://``)
 -  Secure FTP (``sftp://``)
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.rst
@@ -61,9 +61,10 @@ member Chris Larson split the project into two distinct pieces:
 Today, BitBake is the primary basis of the
 `OpenEmbedded <https://www.openembedded.org/>`__ project, which is being
-used to build and maintain Linux distributions such as the `Poky
+used to build and maintain Linux distributions such as the `Angstrom
-Reference Distribution <https://www.yoctoproject.org/software-item/poky/>`__,
+Distribution <http://www.angstrom-distribution.org/>`__, and which is
-developed under the umbrella of the `Yocto Project <https://www.yoctoproject.org>`__.
+also being used as the build tool for Linux projects such as the `Yocto
 Project <https://www.yoctoproject.org>`__.
 Prior to BitBake, no other build tool adequately met the needs of an
 aspiring embedded Linux distribution. All of the build systems used by
@@ -536,7 +537,7 @@ current working directory:
 -  ``pn-buildlist``: Shows a simple list of targets that are to be
   built.
-To stop depending on common depends, use the ``-I`` depend option and
+To stop depending on common depends, use the "-I" depend option and
 BitBake omits them from the graph. Leaving this information out can
 produce more readable graphs. This way, you can remove from the graph
 :term:`DEPENDS` from inherited classes such as ``base.bbclass``.
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst
@@ -104,15 +104,15 @@ Line Joining
 Outside of :ref:`functions <bitbake-user-manual/bitbake-user-manual-metadata:functions>`,
 BitBake joins any line ending in
-a backslash character ("\\") with the following line before parsing
+a backslash character ("\") with the following line before parsing
-statements. The most common use for the "\\" character is to split
+statements. The most common use for the "\" character is to split
 variable assignments over multiple lines, as in the following example::
   FOO = "bar \
          baz \
          qaz"
-Both the "\\" character and the newline
+Both the "\" character and the newline
 character that follow it are removed when joining lines. Thus, no
 newline characters end up in the value of ``FOO``.
@@ -125,7 +125,7 @@ Consider this additional example where the two assignments both assign
 .. note::
-   BitBake does not interpret escape sequences like "\\n" in variable
+   BitBake does not interpret escape sequences like "\n" in variable
   values. For these to have an effect, the value must be passed to some
   utility that interprets escape sequences, such as
   ``printf`` or ``echo -n``.
@@ -159,7 +159,7 @@ behavior::
   C = "qux"
   *At this point, ${A} equals "qux bar baz"*
   B = "norf"
-   *At this point, ${A} equals "norf baz"*
+   *At this point, ${A} equals "norf baz"\*
 Contrast this behavior with the
 :ref:`bitbake-user-manual/bitbake-user-manual-metadata:immediate variable
@@ -195,45 +195,22 @@ value. However, if ``A`` is not set, the variable is set to "aval".
 Setting a weak default value (??=)
 ----------------------------------
-The weak default value of a variable is the value which that variable
+It is possible to use a "weaker" assignment than in the previous section
-will expand to if no value has been assigned to it via any of the other
+by using the "??=" operator. This assignment behaves identical to "?="
-assignment operators. The "??=" operator takes effect immediately, replacing
+except that the assignment is made at the end of the parsing process
-any previously defined weak default value. Here is an example::
+rather than immediately. Consequently, when multiple "??=" assignments
 exist, the last one is used. Also, any "=" or "?=" assignment will
 override the value set with "??=". Here is an example::
-   W ??= "x"
+   A ??= "somevalue"
-   A := "${W}" # Immediate variable expansion
+   A ??= "someothervalue"
   W ??= "y"
   B := "${W}" # Immediate variable expansion
   W ??= "z"
   C = "${W}"
   W ?= "i"
-After parsing we will have::
+If ``A`` is set before the above statements are
 parsed, the variable retains its value. If ``A`` is not set, the
 variable is set to "someothervalue".
-   A = "x"
+Again, this assignment is a "lazy" or "weak" assignment because it does
-   B = "y"
+not occur until the end of the parsing process.
   C = "i"
   W = "i"
 Appending and prepending non-override style will not substitute the weak
 default value, which means that after parsing::
   W ??= "x"
   W += "y"
 we will have::
   W = " y"
 On the other hand, override-style appends/prepends/removes are applied after
 any active weak default value has been substituted::
   W ??= "x"
   W:append = "y"
 After parsing we will have::
   W = "xy"
 Immediate variable expansion (:=)
 ---------------------------------
@@ -533,8 +510,8 @@ variable.
 .. note::
-   Overrides can only use lower-case characters, digits and dashes.
+   Overrides can only use lower-case characters. Additionally,
-   In particular, colons are not permitted in override names as they are used to
+   underscores are not permitted in override names as they are used to
   separate overrides from each other and from the variable name.
 -  *Selecting a Variable:* The :term:`OVERRIDES` variable is a
@@ -546,14 +523,14 @@ variable.
      OVERRIDES = "architecture:os:machine"
      TEST = "default"
-      TEST:os = "osspecific"
+      TEST_os = "osspecific"
-      TEST:nooverride = "othercondvalue"
+      TEST_nooverride = "othercondvalue"
   In this example, the :term:`OVERRIDES`
   variable lists three overrides: "architecture", "os", and "machine".
   The variable ``TEST`` by itself has a default value of "default". You
   select the os-specific version of the ``TEST`` variable by appending
-   the "os" override to the variable (i.e. ``TEST:os``).
+   the "os" override to the variable (i.e. ``TEST_os``).
   To better understand this, consider a practical example that assumes
   an OpenEmbedded metadata-based Linux kernel recipe file. The
@@ -590,7 +567,7 @@ variable.
 -  *Setting a Variable for a Single Task:* BitBake supports setting a
   variable just for the duration of a single task. Here is an example::
-      FOO:task-configure = "val 1"
+      FOO_task-configure = "val 1"
      FOO:task-compile = "val 2"
   In the
@@ -608,16 +585,6 @@ variable.
      EXTRA_OEMAKE:prepend:task-compile = "${PARALLEL_MAKE} "
 .. note::
   Before BitBake 1.52 (Honister 3.4), the syntax for :term:`OVERRIDES`
   used ``_`` instead of ``:``, so you will still find a lot of documentation
   using ``_append``, ``_prepend``, and ``_remove``, for example.
   For details, see the
   :yocto_docs:`Overrides Syntax Changes </migration-guides/migration-3.4.html#override-syntax-changes>`
   section in the Yocto Project manual migration notes.
 Key Expansion
 -------------
@@ -927,7 +894,7 @@ Regardless of the type of function, you can only define them in class
 Shell Functions
 ---------------
-Functions written in shell script are executed either directly as
+Functions written in shell script and executed either directly as
 functions, tasks, or both. They can also be called by other shell
 functions. Here is an example shell function definition::
@@ -977,7 +944,7 @@ Running ``do_foo`` prints the following::
   Overrides and override-style operators can be applied to any shell
   function, not just :ref:`tasks <bitbake-user-manual/bitbake-user-manual-metadata:tasks>`.
-You can use the ``bitbake -e recipename`` command to view the final
+You can use the ``bitbake -e`` recipename command to view the final
 assembled function after all overrides have been applied.
 BitBake-Style Python Functions
@@ -1029,7 +996,7 @@ Running ``do_foo`` prints the following::
   recipename do_foo: second
   recipename do_foo: third
-You can use the ``bitbake -e recipename`` command to view
+You can use the ``bitbake -e`` recipename command to view
 the final assembled function after all overrides have been applied.
 Python Functions
@@ -1376,8 +1343,8 @@ the build machine cannot influence the build.
 .. note::
   By default, BitBake cleans the environment to include only those
-   things exported or listed in its passthrough list to ensure that the
+   things exported or listed in its whitelist to ensure that the build
-   build environment is reproducible and consistent. You can prevent this
+   environment is reproducible and consistent. You can prevent this
   "cleaning" by setting the :term:`BB_PRESERVE_ENV` variable.
 Consequently, if you do want something to get passed into the build task
@@ -1385,14 +1352,14 @@ environment, you must take these two steps:
 #. Tell BitBake to load what you want from the environment into the
   datastore. You can do so through the
-   :term:`BB_ENV_PASSTHROUGH` and
+   :term:`BB_ENV_WHITELIST` and
-   :term:`BB_ENV_PASSTHROUGH_ADDITIONS` variables. For
+   :term:`BB_ENV_EXTRAWHITE` variables. For
   example, assume you want to prevent the build system from accessing
-   your ``$HOME/.ccache`` directory. The following command adds the
+   your ``$HOME/.ccache`` directory. The following command "whitelists"
-   the environment variable ``CCACHE_DIR`` to BitBake's passthrough
+   the environment variable ``CCACHE_DIR`` causing BitBake to allow that
-   list to allow that variable into the datastore::
+   variable into the datastore::
-      export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS CCACHE_DIR"
+      export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE CCACHE_DIR"
 #. Tell BitBake to export what you have loaded into the datastore to the
   task environment of every running task. Loading something from the
@@ -1409,7 +1376,7 @@ environment, you must take these two steps:
      A side effect of the previous steps is that BitBake records the
      variable as a dependency of the build process in things like the
      setscene checksums. If doing so results in unnecessary rebuilds of
-      tasks, you can also flag the variable so that the setscene code
+      tasks, you can whitelist the variable so that the setscene code
      ignores the dependency when it creates checksums.
 Sometimes, it is useful to be able to obtain information from the
@@ -1681,8 +1648,8 @@ user interfaces:
 .. _variants-class-extension-mechanism:
-Variants --- Class Extension Mechanism
+Variants - Class Extension Mechanism
-======================================
+====================================
 BitBake supports multiple incarnations of a recipe file via the
 :term:`BBCLASSEXTEND` variable.
@@ -1954,6 +1921,12 @@ The following list describes related variables:
   Specifies a function BitBake calls that determines whether BitBake
   requires a setscene dependency to be met.
 -  :term:`BB_STAMP_POLICY`: Defines the mode
   for comparing timestamps of stamp files.
 -  :term:`BB_STAMP_WHITELIST`: Lists stamp
   files that are looked at when the stamp policy is "whitelist".
 -  :term:`BB_TASKHASH`: Within an executing task,
   this variable holds the hash of the task as returned by the currently
   enabled signature generator.
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst
@@ -93,13 +93,6 @@ overview of their function and contents.
      fetcher does not attempt to use the host listed in :term:`SRC_URI` after
      a successful fetch from the :term:`PREMIRRORS` occurs.
   :term:`BB_BASEHASH_IGNORE_VARS`
      Lists variables that are excluded from checksum and dependency data.
      Variables that are excluded can therefore change without affecting
      the checksum mechanism. A common example would be the variable for
      the path of the build. BitBake's output should not (and usually does
      not) depend on the directory in which it was built.
   :term:`BB_CHECK_SSL_CERTS`
      Specifies if SSL certificates should be checked when fetching. The default
      value is ``1`` and certificates are not checked if the value is set to ``0``.
@@ -145,7 +138,7 @@ overview of their function and contents.
         where:
            <action> is:
-               HALT:      Immediately halt the build when
+               ABORT:     Immediately abort the build when
                          a threshold is broken.
               STOPTASKS: Stop the build after the currently
                          executing tasks have finished when
@@ -176,13 +169,13 @@ overview of their function and contents.
      Here are some examples::
-         BB_DISKMON_DIRS = "HALT,${TMPDIR},1G,100K WARN,${SSTATE_DIR},1G,100K"
+         BB_DISKMON_DIRS = "ABORT,${TMPDIR},1G,100K WARN,${SSTATE_DIR},1G,100K"
         BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},1G"
-         BB_DISKMON_DIRS = "HALT,${TMPDIR},,100K"
+         BB_DISKMON_DIRS = "ABORT,${TMPDIR},,100K"
      The first example works only if you also set the
      :term:`BB_DISKMON_WARNINTERVAL`
-      variable. This example causes the build system to immediately halt
+      variable. This example causes the build system to immediately abort
      when either the disk space in ``${TMPDIR}`` drops below 1 Gbyte or
      the available free inodes drops below 100 Kbytes. Because two
      directories are provided with the variable, the build system also
@@ -196,7 +189,7 @@ overview of their function and contents.
      directory drops below 1 Gbyte. No disk monitoring occurs for the free
      inodes in this case.
-      The final example immediately halts the build when the number of
+      The final example immediately aborts the build when the number of
      free inodes in the ``${TMPDIR}`` directory drops below 100 Kbytes. No
      disk space monitoring for the directory itself occurs in this case.
@@ -243,23 +236,23 @@ overview of their function and contents.
      based on the interval occur each time a respective interval is
      reached beyond the initial warning (i.e. 1 Gbytes and 100 Kbytes).
-   :term:`BB_ENV_PASSTHROUGH`
+   :term:`BB_ENV_EXTRAWHITE`
-      Specifies the internal list of variables to allow through from
+      Specifies an additional set of variables to allow through (whitelist)
-      the external environment into BitBake's datastore. If the value of
+      from the external environment into BitBake's datastore. This list of
-      this variable is not specified (which is the default), the following
+      variables are on top of the internal list set in
-      list is used: :term:`BBPATH`, :term:`BB_PRESERVE_ENV`,
+      :term:`BB_ENV_WHITELIST`.
      :term:`BB_ENV_PASSTHROUGH`, and :term:`BB_ENV_PASSTHROUGH_ADDITIONS`.
      .. note::
         You must set this variable in the external environment in order
         for it to work.
-   :term:`BB_ENV_PASSTHROUGH_ADDITIONS`
+   :term:`BB_ENV_WHITELIST`
-      Specifies an additional set of variables to allow through from the
+      Specifies the internal whitelist of variables to allow through from
-      external environment into BitBake's datastore. This list of variables
+      the external environment into BitBake's datastore. If the value of
-      are on top of the internal list set in
+      this variable is not specified (which is the default), the following
-      :term:`BB_ENV_PASSTHROUGH`.
+      list is used: :term:`BBPATH`, :term:`BB_PRESERVE_ENV`,
      :term:`BB_ENV_WHITELIST`, and :term:`BB_ENV_EXTRAWHITE`.
      .. note::
@@ -288,61 +281,12 @@ overview of their function and contents.
         BB_GENERATE_MIRROR_TARBALLS = "1"
-   :term:`BB_GENERATE_SHALLOW_TARBALLS`
+   :term:`BB_HASHBASE_WHITELIST`
-      Setting this variable to "1" when :term:`BB_GIT_SHALLOW` is also set to
+      Lists variables that are excluded from checksum and dependency data.
-      "1" causes bitbake to generate shallow mirror tarballs when fetching git
+      Variables that are excluded can therefore change without affecting
-      repositories. The number of commits included in the shallow mirror
+      the checksum mechanism. A common example would be the variable for
-      tarballs is controlled by :term:`BB_GIT_SHALLOW_DEPTH`.
+      the path of the build. BitBake's output should not (and usually does
-
+      not) depend on the directory in which it was built.
      If both :term:`BB_GIT_SHALLOW` and :term:`BB_GENERATE_MIRROR_TARBALLS` are
      enabled, bitbake will generate shallow mirror tarballs by default for git
      repositories. This separate variable exists so that shallow tarball
      generation can be enabled without needing to also enable normal mirror
      generation if it is not desired.
      For example usage, see :term:`BB_GIT_SHALLOW`.
   :term:`BB_GIT_SHALLOW`
      Setting this variable to "1" enables the support for fetching, using and
      generating mirror tarballs of `shallow git repositories <https://riptutorial.com/git/example/4584/shallow-clone>`_.
      The external `git-make-shallow <https://git.openembedded.org/bitbake/tree/bin/git-make-shallow>`_
      script is used for shallow mirror tarball creation.
      When :term:`BB_GIT_SHALLOW` is enabled, bitbake will attempt to fetch a shallow
      mirror tarball. If the shallow mirror tarball cannot be fetched, it will
      try to fetch the full mirror tarball and use that.
      When a mirror tarball is not available, a full git clone will be performed
      regardless of whether this variable is set or not. Support for shallow
      clones is not currently implemented as git does not directly support
      shallow cloning a particular git commit hash (it only supports cloning
      from a tag or branch reference).
      See also :term:`BB_GIT_SHALLOW_DEPTH` and
      :term:`BB_GENERATE_SHALLOW_TARBALLS`.
      Example usage::
         BB_GIT_SHALLOW ?= "1"
         # Keep only the top commit
         BB_GIT_SHALLOW_DEPTH ?= "1"
         # This defaults to enabled if both BB_GIT_SHALLOW and
         # BB_GENERATE_MIRROR_TARBALLS are enabled
         BB_GENERATE_SHALLOW_TARBALLS ?= "1"
   :term:`BB_GIT_SHALLOW_DEPTH`
      When used with :term:`BB_GENERATE_SHALLOW_TARBALLS`, this variable sets
      the number of commits to include in generated shallow mirror tarballs.
      With a depth of 1, only the commit referenced in :term:`SRCREV` is
      included in the shallow mirror tarball. Increasing the depth includes
      additional parent commits, working back through the commit history.
      If this variable is unset, bitbake will default to a depth of 1 when
      generating shallow mirror tarballs.
      For example usage, see :term:`BB_GIT_SHALLOW`.
   :term:`BB_HASHCHECK_FUNCTION`
      Specifies the name of the function to call during the "setscene" part
@@ -358,7 +302,7 @@ overview of their function and contents.
      However, the more accurate the data returned, the more efficient the
      build will be.
-   :term:`BB_HASHCONFIG_IGNORE_VARS`
+   :term:`BB_HASHCONFIG_WHITELIST`
      Lists variables that are excluded from base configuration checksum,
      which is used to determine if the cache can be reused.
@@ -374,35 +318,12 @@ overview of their function and contents.
      Specifies the Hash Equivalence server to use.
      If set to ``auto``, BitBake automatically starts its own server
-      over a UNIX domain socket. An option is to connect this server
+      over a UNIX domain socket.
      to an upstream one, by setting :term:`BB_HASHSERVE_UPSTREAM`.
-      If set to ``unix://path``, BitBake will connect to an existing
+      If set to ``host:port``, BitBake will use a remote server on the
      hash server available over a UNIX domain socket.
      If set to ``host:port``, BitBake will connect to a remote server on the
      specified host. This allows multiple clients to share the same
      hash equivalence data.
      The remote server can be started manually through
      the ``bin/bitbake-hashserv`` script provided by BitBake,
      which supports UNIX domain sockets too. This script also allows
      to start the server in read-only mode, to avoid accepting
      equivalences that correspond to Share State caches that are
      only available on specific clients.
   :term:`BB_HASHSERVE_UPSTREAM`
      Specifies an upstream Hash Equivalence server.
      This optional setting is only useful when a local Hash Equivalence
      server is started (setting :term:`BB_HASHSERVE` to ``auto``),
      and you wish the local server to query an upstream server for
      Hash Equivalence data.
      Example usage::
         BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687"
   :term:`BB_INVALIDCONF`
      Used in combination with the ``ConfigParsed`` event to trigger
      re-parsing the base metadata (i.e. all the recipes). The
@@ -426,19 +347,6 @@ overview of their function and contents.
      If you want to force log files to take a specific name, you can set this
      variable in a configuration file.
   :term:`BB_MULTI_PROVIDER_ALLOWED`
      Allows you to suppress BitBake warnings caused when building two
      separate recipes that provide the same output.
      BitBake normally issues a warning when building two different recipes
      where each provides the same output. This scenario is usually
      something the user does not want. However, cases do exist where it
      makes sense, particularly in the ``virtual/*`` namespace. You can use
      this variable to suppress BitBake's warnings.
      To use the variable, list provider names (e.g. recipe names,
      ``virtual/kernel``, and so forth).
   :term:`BB_NICE_LEVEL`
      Allows BitBake to run at a specific priority (i.e. nice level).
      System permissions usually mean that BitBake can reduce its priority
@@ -465,9 +373,8 @@ overview of their function and contents.
   :term:`BB_ORIGENV`
      Contains a copy of the original external environment in which BitBake
-      was run. The copy is taken before any variable values configured to
+      was run. The copy is taken before any whitelisted variable values are
-      pass through from the external environment are filtered into BitBake's
+      filtered into BitBake's datastore.
      datastore.
      .. note::
@@ -475,8 +382,8 @@ overview of their function and contents.
         queried using the normal datastore operations.
   :term:`BB_PRESERVE_ENV`
-      Disables environment filtering and instead allows all variables through
+      Disables whitelisting and instead allows all variables through from
-      from the external environment into BitBake's datastore.
+      the external environment into BitBake's datastore.
      .. note::
@@ -503,14 +410,14 @@ overview of their function and contents.
      Selects the name of the scheduler to use for the scheduling of
      BitBake tasks. Three options exist:
-      -  *basic* --- the basic framework from which everything derives. Using
+      -  *basic* - The basic framework from which everything derives. Using
         this option causes tasks to be ordered numerically as they are
         parsed.
-      -  *speed* --- executes tasks first that have more tasks depending on
+      -  *speed* - Executes tasks first that have more tasks depending on
         them. The "speed" option is the default.
-      -  *completion* --- causes the scheduler to try to complete a given
+      -  *completion* - Causes the scheduler to try to complete a given
         recipe once its build has started.
   :term:`BB_SCHEDULERS`
@@ -557,12 +464,35 @@ overview of their function and contents.
      The variable can be set using one of two policies:
-      -  *cache* --- retains the value the system obtained previously rather
+      -  *cache* - Retains the value the system obtained previously rather
         than querying the source control system each time.
-      -  *clear* --- queries the source controls system every time. With this
+      -  *clear* - Queries the source controls system every time. With this
         policy, there is no cache. The "clear" policy is the default.
   :term:`BB_STAMP_POLICY`
      Defines the mode used for how timestamps of stamp files are compared.
      You can set the variable to one of the following modes:
      -  *perfile* - Timestamp comparisons are only made between timestamps
         of a specific recipe. This is the default mode.
      -  *full* - Timestamp comparisons are made for all dependencies.
      -  *whitelist* - Identical to "full" mode except timestamp
         comparisons are made for recipes listed in the
         :term:`BB_STAMP_WHITELIST` variable.
      .. note::
         Stamp policies are largely obsolete with the introduction of
         setscene tasks.
   :term:`BB_STAMP_WHITELIST`
      Lists files whose stamp file timestamps are compared when the stamp
      policy mode is set to "whitelist". For information on stamp policies,
      see the :term:`BB_STAMP_POLICY` variable.
   :term:`BB_STRICT_CHECKSUM`
      Sets a more strict checksum mechanism for non-local URLs. Setting
      this variable to a value causes BitBake to report an error if it
@@ -686,7 +616,7 @@ overview of their function and contents.
      This variable is useful in situations where the same recipe appears
      in more than one layer. Setting this variable allows you to
      prioritize a layer against other layers that contain the same recipe
-      --- effectively letting you control the precedence for the multiple
+      - effectively letting you control the precedence for the multiple
      layers. The precedence established through this variable stands
      regardless of a recipe's version (:term:`PV` variable).
      For example, a layer that has a recipe with a higher :term:`PV` value but
@@ -748,7 +678,7 @@ overview of their function and contents.
         "
      This next example shows an error message that occurs because invalid
-      entries are found, which cause parsing to fail::
+      entries are found, which cause parsing to abort::
         ERROR: BBFILES_DYNAMIC entries must be of the form {!}<collection name>:<filename pattern>, not:
         /work/my-layer/bbappends/meta-security-isafw/*/*/*.bbappend
@@ -1067,6 +997,19 @@ overview of their function and contents.
      upstream source, and then locations specified by :term:`MIRRORS` in that
      order.
   :term:`MULTI_PROVIDER_WHITELIST`
      Allows you to suppress BitBake warnings caused when building two
      separate recipes that provide the same output.
      BitBake normally issues a warning when building two different recipes
      where each provides the same output. This scenario is usually
      something the user does not want. However, cases do exist where it
      makes sense, particularly in the ``virtual/*`` namespace. You can use
      this variable to suppress BitBake's warnings.
      To use the variable, list provider names (e.g. recipe names,
      ``virtual/kernel``, and so forth).
   :term:`OVERRIDES`
      BitBake uses :term:`OVERRIDES` to control what variables are overridden
      after BitBake parses recipes and configuration files.
@@ -1180,10 +1123,10 @@ overview of their function and contents.
      your configuration::
         PREMIRRORS:prepend = "\
-         git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
+         git://.*/.* http://www.yoctoproject.org/sources/ \n \
-         ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
+         ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
-         http://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
+         http://.*/.* http://www.yoctoproject.org/sources/ \n \
-         https://.*/.* http://downloads.yoctoproject.org/mirror/sources/"
+         https://.*/.* http://www.yoctoproject.org/sources/ \n"
      These changes cause the build system to intercept Git, FTP, HTTP, and
      HTTPS requests and direct them to the ``http://`` sources mirror. You can
@@ -1331,106 +1274,70 @@ overview of their function and contents.
      The section in which packages should be categorized.
   :term:`SRC_URI`
-      The list of source files --- local or remote. This variable tells
+      The list of source files - local or remote. This variable tells
      BitBake which bits to pull for the build and how to pull them. For
      example, if the recipe or append file needs to fetch a single tarball
-      from the Internet, the recipe or append file uses a :term:`SRC_URI`
+      from the Internet, the recipe or append file uses a :term:`SRC_URI` entry
-      entry that specifies that tarball. On the other hand, if the recipe or
+      that specifies that tarball. On the other hand, if the recipe or
-      append file needs to fetch a tarball, apply two patches, and include
+      append file needs to fetch a tarball and include a custom file, the
-      a custom file, the recipe or append file needs an :term:`SRC_URI`
+      recipe or append file needs an :term:`SRC_URI` variable that specifies
-      variable that specifies all those sources.
+      all those sources.
-      The following list explains the available URI protocols. URI
+      The following list explains the available URI protocols:
      protocols are highly dependent on particular BitBake Fetcher
      submodules. Depending on the fetcher BitBake uses, various URL
      parameters are employed. For specifics on the supported Fetchers, see
      the :ref:`bitbake-user-manual/bitbake-user-manual-fetching:fetchers`
      section.
-      -  ``az://``: Fetches files from an Azure Storage account using HTTPS.
+      -  ``file://`` : Fetches files, which are usually files shipped
         with the metadata, from the local machine. The path is relative to
         the :term:`FILESPATH` variable.
-      -  ``bzr://``: Fetches files from a Bazaar revision control
+      -  ``bzr://`` : Fetches files from a Bazaar revision control
         repository.
-      -  ``ccrc://``: Fetches files from a ClearCase repository.
+      -  ``git://`` : Fetches files from a Git revision control
      -  ``cvs://``: Fetches files from a CVS revision control
         repository.
-      -  ``file://``: Fetches files, which are usually files shipped
+      -  ``osc://`` : Fetches files from an OSC (OpenSUSE Build service)
         with the Metadata, from the local machine.
         The path is relative to the :term:`FILESPATH`
         variable. Thus, the build system searches, in order, from the
         following directories, which are assumed to be a subdirectories of
         the directory in which the recipe file (``.bb``) or append file
         (``.bbappend``) resides:
         -  ``${BPN}``: the base recipe name without any special suffix
            or version numbers.
         -  ``${BP}`` - ``${BPN}-${PV}``: the base recipe name and
            version but without any special package name suffix.
         -  ``files``: files within a directory, which is named ``files``
            and is also alongside the recipe or append file.
      -  ``ftp://``: Fetches files from the Internet using FTP.
      -  ``git://``: Fetches files from a Git revision control
         repository.
      -  ``gitsm://``: Fetches submodules from a Git revision control
         repository.
      -  ``hg://``: Fetches files from a Mercurial (``hg``) revision
         control repository.
      -  ``http://``: Fetches files from the Internet using HTTP.
      -  ``https://``: Fetches files from the Internet using HTTPS.
      -  ``npm://``: Fetches JavaScript modules from a registry.
      -  ``osc://``: Fetches files from an OSC (OpenSUSE Build service)
         revision control repository.
-      -  ``p4://``: Fetches files from a Perforce (``p4``) revision
+      -  ``repo://`` : Fetches files from a repo (Git) repository.
      -  ``http://`` : Fetches files from the Internet using HTTP.
      -  ``https://`` : Fetches files from the Internet using HTTPS.
      -  ``ftp://`` : Fetches files from the Internet using FTP.
      -  ``cvs://`` : Fetches files from a CVS revision control
         repository.
      -  ``hg://`` : Fetches files from a Mercurial (``hg``) revision
         control repository.
-      -  ``repo://``: Fetches files from a repo (Git) repository.
+      -  ``p4://`` : Fetches files from a Perforce (``p4``) revision
      -  ``ssh://``: Fetches files from a secure shell.
      -  ``svn://``: Fetches files from a Subversion (``svn``) revision
         control repository.
      -  ``ssh://`` : Fetches files from a secure shell.
      -  ``svn://`` : Fetches files from a Subversion (``svn``) revision
         control repository.
      -  ``az://`` : Fetches files from an Azure Storage account using HTTPS.
      Here are some additional options worth mentioning:
-      -  ``downloadfilename``: Specifies the filename used when storing
+      -  ``unpack`` : Controls whether or not to unpack the file if it is
-         the downloaded file.
+         an archive. The default action is to unpack the file.
-      -  ``name``: Specifies a name to be used for association with
+      -  ``subdir`` : Places the file (or extracts its contents) into the
         :term:`SRC_URI` checksums or :term:`SRCREV` when you have more than one
         file or git repository specified in :term:`SRC_URI`. For example::
            SRC_URI = "git://example.com/foo.git;branch=main;name=first \
                       git://example.com/bar.git;branch=main;name=second \
                       http://example.com/file.tar.gz;name=third"
            SRCREV_first = "f1d2d2f924e986ac86fdf7b36c94bcdf32beec15"
            SRCREV_second = "e242ed3bffccdf271b7fbaf34ed72d089537b42f"
            SRC_URI[third.sha256sum] = "13550350a8681c84c861aac2e5b440161c2b33a3e4f302ac680ca5b686de48de"
      -  ``subdir``: Places the file (or extracts its contents) into the
         specified subdirectory. This option is useful for unusual tarballs
         or other archives that do not have their files already in a
         subdirectory within the archive.
-      -  ``subpath``: Limits the checkout to a specific subpath of the
+      -  ``name`` : Specifies a name to be used for association with
-         tree when using the Git fetcher is used.
+         :term:`SRC_URI` checksums when you have more than one file specified
         in :term:`SRC_URI`.
-      -  ``unpack``: Controls whether or not to unpack the file if it is
+      -  ``downloadfilename`` : Specifies the filename used when storing
-         an archive. The default action is to unpack the file.
+         the downloaded file.
   :term:`SRCDATE`
      The date of the source code used to build the package. This variable
--- a/bitbake/doc/releases.rst
+++ b/bitbake/doc/releases.rst
@@ -1,74 +1,32 @@
 .. SPDX-License-Identifier: CC-BY-2.5
-===========================
+=========================
- Supported Release Manuals
+ Current Release Manuals
-===========================
+=========================
 ******************************
 Release Series 3.4 (honister)
 ******************************
 - :yocto_docs:`3.4 BitBake User Manual </3.4/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.4.1 BitBake User Manual </3.4.1/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.4.2 BitBake User Manual </3.4.2/bitbake-user-manual/bitbake-user-manual.html>`
 ******************************
 Release Series 3.3 (hardknott)
 ******************************
 - :yocto_docs:`3.3 BitBake User Manual </3.3/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.3.1 BitBake User Manual </3.3.1/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.3.2 BitBake User Manual </3.3.2/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.3.3 BitBake User Manual </3.3.3/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.3.4 BitBake User Manual </3.3.4/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.3.5 BitBake User Manual </3.3.5/bitbake-user-manual/bitbake-user-manual.html>`
 ****************************
-Release Series 3.1 (dunfell)
+3.1 'dunfell' Release Series
 ****************************
 - :yocto_docs:`3.1 BitBake User Manual </3.1/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.1 BitBake User Manual </3.1.1/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.2 BitBake User Manual </3.1.2/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.3 BitBake User Manual </3.1.3/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.4 BitBake User Manual </3.1.4/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.5 BitBake User Manual </3.1.5/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.6 BitBake User Manual </3.1.6/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.7 BitBake User Manual </3.1.7/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.8 BitBake User Manual </3.1.8/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.9 BitBake User Manual </3.1.9/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.10 BitBake User Manual </3.1.10/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.11 BitBake User Manual </3.1.11/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.12 BitBake User Manual </3.1.12/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.13 BitBake User Manual </3.1.13/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.1.14 BitBake User Manual </3.1.14/bitbake-user-manual/bitbake-user-manual.html>`
 ==========================
- Outdated Release Manuals
+ Previous Release Manuals
 ==========================
 *******************************
 Release Series 3.2 (gatesgarth)
 *******************************
 - :yocto_docs:`3.2 BitBake User Manual </3.2/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.2.1 BitBake User Manual </3.2.1/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.2.2 BitBake User Manual </3.2.2/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.2.3 BitBake User Manual </3.2.3/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.2.4 BitBake User Manual </3.2.4/bitbake-user-manual/bitbake-user-manual.html>`
 *************************
-Release Series 3.0 (zeus)
+3.0 'zeus' Release Series
 *************************
 - :yocto_docs:`3.0 BitBake User Manual </3.0/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.0.1 BitBake User Manual </3.0.1/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.0.2 BitBake User Manual </3.0.2/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.0.3 BitBake User Manual </3.0.3/bitbake-user-manual/bitbake-user-manual.html>`
 - :yocto_docs:`3.0.4 BitBake User Manual </3.0.4/bitbake-user-manual/bitbake-user-manual.html>`
 ****************************
-Release Series 2.7 (warrior)
+2.7 'warrior' Release Series
 ****************************
 - :yocto_docs:`2.7 BitBake User Manual </2.7/bitbake-user-manual/bitbake-user-manual.html>`
@@ -78,7 +36,7 @@ Release Series 2.7 (warrior)
 - :yocto_docs:`2.7.4 BitBake User Manual </2.7.4/bitbake-user-manual/bitbake-user-manual.html>`
 *************************
-Release Series 2.6 (thud)
+2.6 'thud' Release Series
 *************************
 - :yocto_docs:`2.6 BitBake User Manual </2.6/bitbake-user-manual/bitbake-user-manual.html>`
@@ -88,16 +46,16 @@ Release Series 2.6 (thud)
 - :yocto_docs:`2.6.4 BitBake User Manual </2.6.4/bitbake-user-manual/bitbake-user-manual.html>`
 *************************
-Release Series 2.5 (sumo)
+2.5 'sumo' Release Series
 *************************
- :yocto_docs:`2.5 Documentation </2.5>`
+- :yocto_docs:`2.5 BitBake User Manual </2.5/bitbake-user-manual/bitbake-user-manual.html>`
- :yocto_docs:`2.5.1 Documentation </2.5.1>`
+- :yocto_docs:`2.5.1 BitBake User Manual </2.5.1/bitbake-user-manual/bitbake-user-manual.html>`
- :yocto_docs:`2.5.2 Documentation </2.5.2>`
+- :yocto_docs:`2.5.2 BitBake User Manual </2.5.2/bitbake-user-manual/bitbake-user-manual.html>`
- :yocto_docs:`2.5.3 Documentation </2.5.3>`
+- :yocto_docs:`2.5.3 BitBake User Manual </2.5.3/bitbake-user-manual/bitbake-user-manual.html>`
 **************************
-Release Series 2.4 (rocko)
+2.4 'rocko' Release Series
 **************************
 - :yocto_docs:`2.4 BitBake User Manual </2.4/bitbake-user-manual/bitbake-user-manual.html>`
@@ -107,7 +65,7 @@ Release Series 2.4 (rocko)
 - :yocto_docs:`2.4.4 BitBake User Manual </2.4.4/bitbake-user-manual/bitbake-user-manual.html>`
 *************************
-Release Series 2.3 (pyro)
+2.3 'pyro' Release Series
 *************************
 - :yocto_docs:`2.3 BitBake User Manual </2.3/bitbake-user-manual/bitbake-user-manual.html>`
@@ -117,7 +75,7 @@ Release Series 2.3 (pyro)
 - :yocto_docs:`2.3.4 BitBake User Manual </2.3.4/bitbake-user-manual/bitbake-user-manual.html>`
 **************************
-Release Series 2.2 (morty)
+2.2 'morty' Release Series
 **************************
 - :yocto_docs:`2.2 BitBake User Manual </2.2/bitbake-user-manual/bitbake-user-manual.html>`
@@ -126,7 +84,7 @@ Release Series 2.2 (morty)
 - :yocto_docs:`2.2.3 BitBake User Manual </2.2.3/bitbake-user-manual/bitbake-user-manual.html>`
 ****************************
-Release Series 2.1 (krogoth)
+2.1 'krogoth' Release Series
 ****************************
 - :yocto_docs:`2.1 BitBake User Manual </2.1/bitbake-user-manual/bitbake-user-manual.html>`
@@ -135,7 +93,7 @@ Release Series 2.1 (krogoth)
 - :yocto_docs:`2.1.3 BitBake User Manual </2.1.3/bitbake-user-manual/bitbake-user-manual.html>`
 ***************************
-Release Series 2.0 (jethro)
+2.0 'jethro' Release Series
 ***************************
 - :yocto_docs:`1.9 BitBake User Manual </1.9/bitbake-user-manual/bitbake-user-manual.html>`
@@ -145,7 +103,7 @@ Release Series 2.0 (jethro)
 - :yocto_docs:`2.0.3 BitBake User Manual </2.0.3/bitbake-user-manual/bitbake-user-manual.html>`
 *************************
-Release Series 1.8 (fido)
+1.8 'fido' Release Series
 *************************
 - :yocto_docs:`1.8 BitBake User Manual </1.8/bitbake-user-manual/bitbake-user-manual.html>`
@@ -153,7 +111,7 @@ Release Series 1.8 (fido)
 - :yocto_docs:`1.8.2 BitBake User Manual </1.8.2/bitbake-user-manual/bitbake-user-manual.html>`
 **************************
-Release Series 1.7 (dizzy)
+1.7 'dizzy' Release Series
 **************************
 - :yocto_docs:`1.7 BitBake User Manual </1.7/bitbake-user-manual/bitbake-user-manual.html>`
@@ -162,7 +120,7 @@ Release Series 1.7 (dizzy)
 - :yocto_docs:`1.7.3 BitBake User Manual </1.7.3/bitbake-user-manual/bitbake-user-manual.html>`
 **************************
-Release Series 1.6 (daisy)
+1.6 'daisy' Release Series
 **************************
 - :yocto_docs:`1.6 BitBake User Manual </1.6/bitbake-user-manual/bitbake-user-manual.html>`
--- a/bitbake/lib/bb/COW.py
+++ b/bitbake/lib/bb/COW.py
@@ -3,8 +3,6 @@
 #
 # Copyright (C) 2006 Tim Ansell
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # Please Note:
 # Be careful when using mutable types (ie Dict and Lists) - operations involving these are SLOW.
 # Assign a file to __warn__ to get warnings about slow operations.
--- a/bitbake/lib/bb/init.py
+++ b/bitbake/lib/bb/init.py
@@ -9,19 +9,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
-__version__ = "2.0.0"
+__version__ = "1.52.0"
 import sys
 if sys.version_info < (3, 6, 0):
    raise RuntimeError("Sorry, python 3.6.0 or later is required for this version of bitbake")
 if sys.version_info < (3, 10, 0):
    # With python 3.8 and 3.9, we see errors of "libgcc_s.so.1 must be installed for pthread_cancel to work"
    # https://stackoverflow.com/questions/64797838/libgcc-s-so-1-must-be-installed-for-pthread-cancel-to-work
    # https://bugs.ams1.psf.io/issue42888
    # so ensure libgcc_s is loaded early on
    import ctypes
    libgcc_s = ctypes.CDLL('libgcc_s.so.1')
 class BBHandledException(Exception):
    """
@@ -78,13 +71,6 @@ class BBLoggerMixin(object):
    def verbnote(self, msg, *args, **kwargs):
        return self.log(logging.INFO + 2, msg, *args, **kwargs)
    def warnonce(self, msg, *args, **kwargs):
        return self.log(logging.WARNING - 1, msg, *args, **kwargs)
    def erroronce(self, msg, *args, **kwargs):
        return self.log(logging.ERROR - 1, msg, *args, **kwargs)
 Logger = logging.getLoggerClass()
 class BBLogger(Logger, BBLoggerMixin):
    def __init__(self, name, *args, **kwargs):
@@ -171,15 +157,9 @@ def verbnote(*args):
 def warn(*args):
    mainlogger.warning(''.join(args))
 def warnonce(*args):
    mainlogger.warnonce(''.join(args))
 def error(*args, **kwargs):
    mainlogger.error(''.join(args), extra=kwargs)
 def erroronce(*args):
    mainlogger.erroronce(''.join(args))
 def fatal(*args, **kwargs):
    mainlogger.critical(''.join(args), extra=kwargs)
    raise BBHandledException()
--- a/bitbake/lib/bb/asyncrpc/init.py
+++ b/bitbake/lib/bb/asyncrpc/init.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -30,4 +28,4 @@ def chunkify(msg, max_chunk):
 from .client import AsyncClient, Client
-from .serv import AsyncServer, AsyncServerConnection, ClientError, ServerError
+from .serv import AsyncServer, AsyncServerConnection
--- a/bitbake/lib/bb/asyncrpc/client.py
+++ b/bitbake/lib/bb/asyncrpc/client.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -31,17 +29,7 @@ class AsyncClient(object):
    async def connect_unix(self, path):
        async def connect_sock():
-            # AF_UNIX has path length issues so chdir here to workaround
+            return await asyncio.open_unix_connection(path)
            cwd = os.getcwd()
            try:
                os.chdir(os.path.dirname(path))
                # The socket must be opened synchronously so that CWD doesn't get
                # changed out from underneath us so we pass as a sock into asyncio
                sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, 0)
                sock.connect(os.path.basename(path))
            finally:
               os.chdir(cwd)
            return await asyncio.open_unix_connection(sock=sock)
        self._connect_sock = connect_sock
@@ -126,12 +114,6 @@ class AsyncClient(object):
            {'ping': {}}
        )
    async def __aenter__(self):
        return self
    async def __aexit__(self, exc_type, exc_value, traceback):
        await self.close()
 class Client(object):
    def __init__(self):
@@ -166,8 +148,14 @@ class Client(object):
            setattr(self, m, self._get_downcall_wrapper(downcall))
    def connect_unix(self, path):
-        self.loop.run_until_complete(self.client.connect_unix(path))
+        # AF_UNIX has path length issues so chdir here to workaround
-        self.loop.run_until_complete(self.client.connect())
+        cwd = os.getcwd()
        try:
            os.chdir(os.path.dirname(path))
            self.loop.run_until_complete(self.client.connect_unix(os.path.basename(path)))
            self.loop.run_until_complete(self.client.connect())
        finally:
            os.chdir(cwd)
    @property
    def max_chunk(self):
@@ -182,10 +170,3 @@ class Client(object):
        if sys.version_info >= (3, 6):
            self.loop.run_until_complete(self.loop.shutdown_asyncgens())
        self.loop.close()
    def __enter__(self):
        return self
    def __exit__(self, exc_type, exc_value, traceback):
        self.close()
        return False
--- a/bitbake/lib/bb/asyncrpc/serv.py
+++ b/bitbake/lib/bb/asyncrpc/serv.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -569,6 +569,7 @@ exit $ret
 def _task_data(fn, task, d):
    localdata = bb.data.createCopy(d)
    localdata.setVar('BB_FILENAME', fn)
    localdata.setVar('BB_CURRENTTASK', task[3:])
    localdata.setVar('OVERRIDES', 'task-%s:%s' %
                     (task[3:].replace('_', '-'), d.getVar('OVERRIDES', False)))
    localdata.finalize()
@@ -582,7 +583,7 @@ def _exec_task(fn, task, d, quieterr):
    running it with its own local metadata, and with some useful variables set.
    """
    if not d.getVarFlag(task, 'task', False):
-        event.fire(TaskInvalid(task, fn, d), d)
+        event.fire(TaskInvalid(task, d), d)
        logger.error("No such task: %s" % task)
        return 1
@@ -835,7 +836,11 @@ def stamp_cleanmask_internal(taskname, d, file_name):
    return [cleanmask, cleanmask.replace(taskflagname, taskflagname + "_setscene")]
-def clean_stamp(task, d, file_name = None):
+def make_stamp(task, d, file_name = None):
    """
    Creates/updates a stamp for a given task
    (d can be a data dict or dataCache)
    """
    cleanmask = stamp_cleanmask_internal(task, d, file_name)
    for mask in cleanmask:
        for name in glob.glob(mask):
@@ -846,14 +851,6 @@ def clean_stamp(task, d, file_name = None):
            if name.endswith('.taint'):
                continue
            os.unlink(name)
    return
 def make_stamp(task, d, file_name = None):
    """
    Creates/updates a stamp for a given task
    (d can be a data dict or dataCache)
    """
    clean_stamp(task, d, file_name)
    stamp = stamp_internal(task, d, file_name)
    # Remove the file and recreate to force timestamp
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -284,15 +284,36 @@ def parse_recipe(bb_data, bbfile, appends, mc=''):
    Parse a recipe
    """
    chdir_back = False
    bb_data.setVar("__BBMULTICONFIG", mc)
    # expand tmpdir to include this topdir
    bb_data.setVar('TMPDIR', bb_data.getVar('TMPDIR') or "")
    bbfile_loc = os.path.abspath(os.path.dirname(bbfile))
    oldpath = os.path.abspath(os.getcwd())
    bb.parse.cached_mtime_noerror(bbfile_loc)
-    if appends:
+    # The ConfHandler first looks if there is a TOPDIR and if not
-        bb_data.setVar('__BBAPPEND', " ".join(appends))
+    # then it would call getcwd().
-    bb_data = bb.parse.handle(bbfile, bb_data)
+    # Previously, we chdir()ed to bbfile_loc, called the handler
-    return bb_data
+    # and finally chdir()ed back, a couple of thousand times. We now
    # just fill in TOPDIR to point to bbfile_loc if there is no TOPDIR yet.
    if not bb_data.getVar('TOPDIR', False):
        chdir_back = True
        bb_data.setVar('TOPDIR', bbfile_loc)
    try:
        if appends:
            bb_data.setVar('__BBAPPEND', " ".join(appends))
        bb_data = bb.parse.handle(bbfile, bb_data)
        if chdir_back:
            os.chdir(oldpath)
        return bb_data
    except:
        if chdir_back:
            os.chdir(oldpath)
        raise
 class NoCache(object):
@@ -619,7 +640,7 @@ class Cache(NoCache):
                for f in flist:
                    if not f:
                        continue
-                    f, exist = f.rsplit(":", 1)
+                    f, exist = f.split(":")
                    if (exist == "True" and not os.path.exists(f)) or (exist == "False" and os.path.exists(f)):
                        self.logger.debug2("%s's file checksum list file %s changed",
                                             fn, f)
--- a/bitbake/lib/bb/checksum.py
+++ b/bitbake/lib/bb/checksum.py
@@ -11,13 +11,10 @@ import os
 import stat
 import bb.utils
 import logging
 import re
 from bb.cache import MultiProcessCache
 logger = logging.getLogger("BitBake.Cache")
 filelist_regex = re.compile(r'(?:(?<=:True)|(?<=:False))\s+')
 # mtime cache (non-persistent)
 # based upon the assumption that files do not change during bitbake run
 class FileMtimeCache(object):
@@ -53,7 +50,6 @@ class FileChecksumCache(MultiProcessCache):
        MultiProcessCache.__init__(self)
    def get_checksum(self, f):
        f = os.path.normpath(f)
        entry = self.cachedata[0].get(f)
        cmtime = self.mtime_cache.cached_mtime(f)
        if entry:
@@ -88,36 +84,22 @@ class FileChecksumCache(MultiProcessCache):
                return None
            return checksum
        #
        # Changing the format of file-checksums is problematic as both OE and Bitbake have
        # knowledge of them. We need to encode a new piece of data, the portion of the path
        # we care about from a checksum perspective. This means that files that change subdirectory
        # are tracked by the task hashes. To do this, we do something horrible and put a "/./" into
        # the path. The filesystem handles it but it gives us a marker to know which subsection
        # of the path to cache.
        #
        def checksum_dir(pth):
            # Handle directories recursively
            if pth == "/":
                bb.fatal("Refusing to checksum /")
            pth = pth.rstrip("/")
            dirchecksums = []
            for root, dirs, files in os.walk(pth, topdown=True):
                [dirs.remove(d) for d in list(dirs) if d in localdirsexclude]
                for name in files:
-                    fullpth = os.path.join(root, name).replace(pth, os.path.join(pth, "."))
+                    fullpth = os.path.join(root, name)
                    checksum = checksum_file(fullpth)
                    if checksum:
                        dirchecksums.append((fullpth, checksum))
            return dirchecksums
        checksums = []
-        for pth in filelist_regex.split(filelist):
+        for pth in filelist.split():
            if not pth:
                continue
            pth = pth.strip()
            if not pth:
                continue
            exist = pth.split(":")[1]
            if exist == "False":
                continue
--- a/bitbake/lib/bb/codeparser.py
+++ b/bitbake/lib/bb/codeparser.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -197,10 +195,6 @@ class BufferedLogger(Logger):
                self.target.handle(record)
        self.buffer = []
 class DummyLogger():
    def flush(self):
        return
 class PythonParser():
    getvars = (".getVar", ".appendVar", ".prependVar", "oe.utils.conditional")
    getvarflags = (".getVarFlag", ".appendVarFlag", ".prependVarFlag")
@@ -225,19 +219,19 @@ class PythonParser():
    def visit_Call(self, node):
        name = self.called_node_name(node.func)
        if name and (name.endswith(self.getvars) or name.endswith(self.getvarflags) or name in self.containsfuncs or name in self.containsanyfuncs):
-            if isinstance(node.args[0], ast.Constant) and isinstance(node.args[0].value, str):
+            if isinstance(node.args[0], ast.Str):
-                varname = node.args[0].value
+                varname = node.args[0].s
-                if name in self.containsfuncs and isinstance(node.args[1], ast.Constant):
+                if name in self.containsfuncs and isinstance(node.args[1], ast.Str):
                    if varname not in self.contains:
                        self.contains[varname] = set()
-                    self.contains[varname].add(node.args[1].value)
+                    self.contains[varname].add(node.args[1].s)
-                elif name in self.containsanyfuncs and isinstance(node.args[1], ast.Constant):
+                elif name in self.containsanyfuncs and isinstance(node.args[1], ast.Str):
                    if varname not in self.contains:
                        self.contains[varname] = set()
-                    self.contains[varname].update(node.args[1].value.split())
+                    self.contains[varname].update(node.args[1].s.split())
                elif name.endswith(self.getvarflags):
-                    if isinstance(node.args[1], ast.Constant):
+                    if isinstance(node.args[1], ast.Str):
-                        self.references.add('%s[%s]' % (varname, node.args[1].value))
+                        self.references.add('%s[%s]' % (varname, node.args[1].s))
                    else:
                        self.warn(node.func, node.args[1])
                else:
@@ -245,8 +239,8 @@ class PythonParser():
            else:
                self.warn(node.func, node.args[0])
        elif name and name.endswith(".expand"):
-            if isinstance(node.args[0], ast.Constant):
+            if isinstance(node.args[0], ast.Str):
-                value = node.args[0].value
+                value = node.args[0].s
                d = bb.data.init()
                parser = d.expandWithRefs(value, self.name)
                self.references |= parser.references
@@ -256,8 +250,8 @@ class PythonParser():
                        self.contains[varname] = set()
                    self.contains[varname] |= parser.contains[varname]
        elif name in self.execfuncs:
-            if isinstance(node.args[0], ast.Constant):
+            if isinstance(node.args[0], ast.Str):
-                self.var_execs.add(node.args[0].value)
+                self.var_execs.add(node.args[0].s)
            else:
                self.warn(node.func, node.args[0])
        elif name and isinstance(node.func, (ast.Name, ast.Attribute)):
@@ -282,9 +276,7 @@ class PythonParser():
        self.contains = {}
        self.execs = set()
        self.references = set()
-        self._log = log
+        self.log = BufferedLogger('BitBake.Data.PythonParser', logging.DEBUG, log)
        # Defer init as expensive
        self.log = DummyLogger()
        self.unhandled_message = "in call of %s, argument '%s' is not a string literal"
        self.unhandled_message = "while parsing %s, %s" % (name, self.unhandled_message)
@@ -311,9 +303,6 @@ class PythonParser():
                self.contains[i] = set(codeparsercache.pythoncacheextras[h].contains[i])
            return
        # Need to parse so take the hit on the real log buffer
        self.log = BufferedLogger('BitBake.Data.PythonParser', logging.DEBUG, self._log)
        # We can't add to the linenumbers for compile, we can pad to the correct number of blank lines though
        node = "\n" * int(lineno) + node
        code = compile(check_indent(str(node)), filename, "exec",
@@ -332,11 +321,7 @@ class ShellParser():
        self.funcdefs = set()
        self.allexecs = set()
        self.execs = set()
-        self._name = name
+        self.log = BufferedLogger('BitBake.Data.%s' % name, logging.DEBUG, log)
        self._log = log
        # Defer init as expensive
        self.log = DummyLogger()
        self.unhandled_template = "unable to handle non-literal command '%s'"
        self.unhandled_template = "while parsing %s, %s" % (name, self.unhandled_template)
@@ -355,9 +340,6 @@ class ShellParser():
            self.execs = set(codeparsercache.shellcacheextras[h].execs)
            return self.execs
        # Need to parse so take the hit on the real log buffer
        self.log = BufferedLogger('BitBake.Data.%s' % self._name, logging.DEBUG, self._log)
        self._parse_shell(value)
        self.execs = set(cmd for cmd in self.allexecs if cmd not in self.funcdefs)
--- a/bitbake/lib/bb/compress/_pipecompress.py
+++ b/bitbake/lib/bb/compress/_pipecompress.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # Helper library to implement streaming compression and decompression using an
@@ -51,7 +49,7 @@ def open_wrap(
            raise ValueError("Argument 'newline' not supported in binary mode")
    file_mode = mode.replace("t", "")
-    if isinstance(filename, (str, bytes, os.PathLike, int)):
+    if isinstance(filename, (str, bytes, os.PathLike)):
        binary_file = cls(filename, file_mode, **kwargs)
    elif hasattr(filename, "read") or hasattr(filename, "write"):
        binary_file = cls(None, file_mode, fileobj=filename, **kwargs)
--- a/bitbake/lib/bb/compress/lz4.py
+++ b/bitbake/lib/bb/compress/lz4.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bb/compress/zstd.py
+++ b/bitbake/lib/bb/compress/zstd.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -13,6 +13,7 @@ import sys, os, glob, os.path, re, time
 import itertools
 import logging
 import multiprocessing
 import sre_constants
 import threading
 from io import StringIO, UnsupportedOperation
 from contextlib import closing
@@ -158,9 +159,6 @@ class BBCooker:
            for f in featureSet:
                self.featureset.setFeature(f)
        self.orig_syspath = sys.path.copy()
        self.orig_sysmodules = [*sys.modules]
        self.configuration = bb.cookerdata.CookerConfiguration()
        self.idleCallBackRegister = idleCallBackRegister
@@ -168,15 +166,27 @@ class BBCooker:
        bb.debug(1, "BBCooker starting %s" % time.time())
        sys.stdout.flush()
-        self.configwatcher = None
+        self.configwatcher = pyinotify.WatchManager()
-        self.confignotifier = None
+        bb.debug(1, "BBCooker pyinotify1 %s" % time.time())
        sys.stdout.flush()
        self.configwatcher.bbseen = set()
        self.configwatcher.bbwatchedfiles = set()
        self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications)
        bb.debug(1, "BBCooker pyinotify2 %s" % time.time())
        sys.stdout.flush()
        self.watchmask = pyinotify.IN_CLOSE_WRITE | pyinotify.IN_CREATE | pyinotify.IN_DELETE | \
                         pyinotify.IN_DELETE_SELF | pyinotify.IN_MODIFY | pyinotify.IN_MOVE_SELF | \
                         pyinotify.IN_MOVED_FROM | pyinotify.IN_MOVED_TO
        self.watcher = pyinotify.WatchManager()
        bb.debug(1, "BBCooker pyinotify3 %s" % time.time())
        sys.stdout.flush()
        self.watcher.bbseen = set()
        self.watcher.bbwatchedfiles = set()
        self.notifier = pyinotify.Notifier(self.watcher, self.notifications)
-        self.watcher = None
+        bb.debug(1, "BBCooker pyinotify complete %s" % time.time())
-        self.notifier = None
+        sys.stdout.flush()
        # If being called by something like tinfoil, we need to clean cached data
        # which may now be invalid
@@ -189,7 +199,7 @@ class BBCooker:
        self.inotify_modified_files = []
-        def _process_inotify_updates(server, cooker, halt):
+        def _process_inotify_updates(server, cooker, abort):
            cooker.process_inotify_updates()
            return 1.0
@@ -227,29 +237,9 @@ class BBCooker:
            sys.stdout.flush()
            self.handlePRServ()
    def setupConfigWatcher(self):
        if self.configwatcher:
            self.configwatcher.close()
            self.confignotifier = None
            self.configwatcher = None
        self.configwatcher = pyinotify.WatchManager()
        self.configwatcher.bbseen = set()
        self.configwatcher.bbwatchedfiles = set()
        self.confignotifier = pyinotify.Notifier(self.configwatcher, self.config_notifications)
    def setupParserWatcher(self):
        if self.watcher:
            self.watcher.close()
            self.notifier = None
            self.watcher = None
        self.watcher = pyinotify.WatchManager()
        self.watcher.bbseen = set()
        self.watcher.bbwatchedfiles = set()
        self.notifier = pyinotify.Notifier(self.watcher, self.notifications)
    def process_inotify_updates(self):
        for n in [self.confignotifier, self.notifier]:
-            if n and n.check_events(timeout=0):
+            if n.check_events(timeout=0):
                # read notified events and enqeue them
                n.read_events()
                n.process_events()
@@ -263,12 +253,6 @@ class BBCooker:
            return
        if not event.pathname in self.configwatcher.bbwatchedfiles:
            return
        if "IN_ISDIR" in event.maskname:
            if "IN_CREATE" in event.maskname or "IN_DELETE" in event.maskname:
                if event.pathname in self.configwatcher.bbseen:
                    self.configwatcher.bbseen.remove(event.pathname)
                # Could remove all entries starting with the directory but for now...
                bb.parse.clear_cache()
        if not event.pathname in self.inotify_modified_files:
            self.inotify_modified_files.append(event.pathname)
        self.baseconfig_valid = False
@@ -282,12 +266,6 @@ class BBCooker:
        if event.pathname.endswith("bitbake-cookerdaemon.log") \
                or event.pathname.endswith("bitbake.lock"):
            return
        if "IN_ISDIR" in event.maskname:
            if "IN_CREATE" in event.maskname or "IN_DELETE" in event.maskname:
                if event.pathname in self.watcher.bbseen:
                    self.watcher.bbseen.remove(event.pathname)
                # Could remove all entries starting with the directory but for now...
                bb.parse.clear_cache()
        if not event.pathname in self.inotify_modified_files:
            self.inotify_modified_files.append(event.pathname)
        self.parsecache_valid = False
@@ -352,13 +330,6 @@ class BBCooker:
        self.state = state.initial
        self.caches_array = []
        sys.path = self.orig_syspath.copy()
        for mod in [*sys.modules]:
            if mod not in self.orig_sysmodules:
                del sys.modules[mod]
        self.setupConfigWatcher()
        # Need to preserve BB_CONSOLELOG over resets
        consolelog = None
        if hasattr(self, "data"):
@@ -534,7 +505,7 @@ class BBCooker:
            logger.debug("Base environment change, triggering reparse")
            self.reset()
-    def runCommands(self, server, data, halt):
+    def runCommands(self, server, data, abort):
        """
        Run any queued asynchronous command
        This is done by the idle handler so it runs in true context rather than
@@ -584,8 +555,6 @@ class BBCooker:
        if not orig_tracking:
            self.enableDataTracking()
            self.reset()
            # reset() resets to the UI requested value so we have to redo this
            self.enableDataTracking()
        def mc_base(p):
            if p.startswith('mc:'):
@@ -609,7 +578,7 @@ class BBCooker:
                if pkgs_to_build[0] in set(ignore.split()):
                    bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0])
-                taskdata, runlist = self.buildTaskData(pkgs_to_build, None, self.configuration.halt, allowincomplete=True)
+                taskdata, runlist = self.buildTaskData(pkgs_to_build, None, self.configuration.abort, allowincomplete=True)
                mc = runlist[0][0]
                fn = runlist[0][3]
@@ -638,7 +607,7 @@ class BBCooker:
            data.emit_env(env, envdata, True)
            logger.plain(env.getvalue())
-        # emit the metadata which isn't valid shell
+        # emit the metadata which isnt valid shell
        for e in sorted(envdata.keys()):
            if envdata.getVarFlag(e, 'func', False) and envdata.getVarFlag(e, 'python', False):
                logger.plain("\npython %s () {\n%s}\n", e, envdata.getVar(e, False))
@@ -647,7 +616,7 @@ class BBCooker:
            self.disableDataTracking()
            self.reset()
-    def buildTaskData(self, pkgs_to_build, task, halt, allowincomplete=False):
+    def buildTaskData(self, pkgs_to_build, task, abort, allowincomplete=False):
        """
        Prepare a runqueue and taskdata object for iteration over pkgs_to_build
        """
@@ -694,7 +663,7 @@ class BBCooker:
        localdata = {}
        for mc in self.multiconfigs:
-            taskdata[mc] = bb.taskdata.TaskData(halt, skiplist=self.skiplist, allowincomplete=allowincomplete)
+            taskdata[mc] = bb.taskdata.TaskData(abort, skiplist=self.skiplist, allowincomplete=allowincomplete)
            localdata[mc] = data.createCopy(self.databuilder.mcdata[mc])
            bb.data.expandKeys(localdata[mc])
@@ -743,18 +712,19 @@ class BBCooker:
                    taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc])
                    mcdeps |= set(taskdata[mc].get_mcdepends())
                new = False
-                for k in mcdeps:
+                for mc in self.multiconfigs:
-                    if k in seen:
+                    for k in mcdeps:
-                        continue
+                        if k in seen:
-                    l = k.split(':')
+                            continue
-                    depmc = l[2]
+                        l = k.split(':')
-                    if depmc not in self.multiconfigs:
+                        depmc = l[2]
-                        bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc))
+                        if depmc not in self.multiconfigs:
-                    else:
+                            bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc))
-                        logger.debug("Adding providers for multiconfig dependency %s" % l[3])
+                        else:
-                        taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3])
+                            logger.debug("Adding providers for multiconfig dependency %s" % l[3])
-                        seen.add(k)
+                            taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3])
-                        new = True
+                            seen.add(k)
                            new = True
        for mc in self.multiconfigs:
            taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc])
@@ -767,7 +737,7 @@ class BBCooker:
        Prepare a runqueue and taskdata object for iteration over pkgs_to_build
        """
-        # We set halt to False here to prevent unbuildable targets raising
+        # We set abort to False here to prevent unbuildable targets raising
        # an exception when we're just generating data
        taskdata, runlist = self.buildTaskData(pkgs_to_build, task, False, allowincomplete=True)
@@ -1455,7 +1425,7 @@ class BBCooker:
        # Setup taskdata structure
        taskdata = {}
-        taskdata[mc] = bb.taskdata.TaskData(self.configuration.halt)
+        taskdata[mc] = bb.taskdata.TaskData(self.configuration.abort)
        taskdata[mc].add_provider(self.databuilder.mcdata[mc], self.recipecaches[mc], item)
        if quietlog:
@@ -1471,11 +1441,11 @@ class BBCooker:
        rq = bb.runqueue.RunQueue(self, self.data, self.recipecaches, taskdata, runlist)
-        def buildFileIdle(server, rq, halt):
+        def buildFileIdle(server, rq, abort):
            msg = None
            interrupted = 0
-            if halt or self.state == state.forceshutdown:
+            if abort or self.state == state.forceshutdown:
                rq.finish_runqueue(True)
                msg = "Forced shutdown"
                interrupted = 2
@@ -1517,10 +1487,10 @@ class BBCooker:
        Attempt to build the targets specified
        """
-        def buildTargetsIdle(server, rq, halt):
+        def buildTargetsIdle(server, rq, abort):
            msg = None
            interrupted = 0
-            if halt or self.state == state.forceshutdown:
+            if abort or self.state == state.forceshutdown:
                rq.finish_runqueue(True)
                msg = "Forced shutdown"
                interrupted = 2
@@ -1563,7 +1533,7 @@ class BBCooker:
        bb.event.fire(bb.event.BuildInit(packages), self.data)
-        taskdata, runlist = self.buildTaskData(targets, task, self.configuration.halt)
+        taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort)
        buildname = self.data.getVar("BUILDNAME", False)
@@ -1631,7 +1601,7 @@ class BBCooker:
        if self.state in (state.shutdown, state.forceshutdown, state.error):
            if hasattr(self.parser, 'shutdown'):
-                self.parser.shutdown(clean=False)
+                self.parser.shutdown(clean=False, force = True)
                self.parser.final_cleanup()
            raise bb.BBHandledException()
@@ -1639,8 +1609,6 @@ class BBCooker:
            self.updateCacheSync()
        if self.state != state.parsing and not self.parsecache_valid:
            self.setupParserWatcher()
            bb.parse.siggen.reset(self.data)
            self.parseConfiguration ()
            if CookerFeatures.SEND_SANITYEVENTS in self.featureset:
@@ -1700,7 +1668,7 @@ class BBCooker:
        # Return a copy, don't modify the original
        pkgs_to_build = pkgs_to_build[:]
-        if not pkgs_to_build:
+        if len(pkgs_to_build) == 0:
            raise NothingToBuild
        ignore = (self.data.getVar("ASSUME_PROVIDED") or "").split()
@@ -1747,8 +1715,6 @@ class BBCooker:
    def post_serve(self):
        self.shutdown(force=True)
        prserv.serv.auto_shutdown()
        if hasattr(bb.parse, "siggen"):
            bb.parse.siggen.exit()
        if self.hashserv:
            self.hashserv.process.terminate()
            self.hashserv.process.join()
@@ -1762,15 +1728,13 @@ class BBCooker:
            self.state = state.shutdown
        if self.parser:
-            self.parser.shutdown(clean=not force)
+            self.parser.shutdown(clean=not force, force=force)
            self.parser.final_cleanup()
    def finishcommand(self):
        self.state = state.initial
    def reset(self):
        if hasattr(bb.parse, "siggen"):
            bb.parse.siggen.exit()
        self.initConfigurationData()
        self.handlePRServ()
@@ -1799,7 +1763,7 @@ class CookerCollectFiles(object):
    def __init__(self, priorities, mc=''):
        self.mc = mc
        self.bbappends = []
-        # Priorities is a list of tuples, with the second element as the pattern.
+        # Priorities is a list of tupples, with the second element as the pattern.
        # We need to sort the list with the longest pattern first, and so on to
        # the shortest.  This allows nested layers to be properly evaluated.
        self.bbfile_config_priorities = sorted(priorities, key=lambda tup: tup[1], reverse=True)
@@ -1843,10 +1807,10 @@ class CookerCollectFiles(object):
        files.sort( key=lambda fileitem: self.calc_bbfile_priority(fileitem)[0] )
        config.setVar("BBFILES_PRIORITIZED", " ".join(files))
-        if not files:
+        if not len(files):
            files = self.get_bbfiles()
-        if not files:
+        if not len(files):
            collectlog.error("no recipe files to build, check your BBPATH and BBFILES?")
            bb.event.fire(CookerExit(), eventdata)
@@ -1906,7 +1870,7 @@ class CookerCollectFiles(object):
                try:
                    re.compile(mask)
                    bbmasks.append(mask)
-                except re.error:
+                except sre_constants.error:
                    collectlog.critical("BBMASK contains an invalid regular expression, ignoring: %s" % mask)
            # Then validate the combined regular expressions. This should never
@@ -1914,7 +1878,7 @@ class CookerCollectFiles(object):
            bbmask = "|".join(bbmasks)
            try:
                bbmask_compiled = re.compile(bbmask)
-            except re.error:
+            except sre_constants.error:
                collectlog.critical("BBMASK is not a valid regular expression, ignoring: %s" % bbmask)
                bbmask = None
@@ -2032,30 +1996,15 @@ class ParsingFailure(Exception):
        Exception.__init__(self, realexception, recipe)
 class Parser(multiprocessing.Process):
-    def __init__(self, jobs, results, quit, profile):
+    def __init__(self, jobs, results, quit, init, profile):
        self.jobs = jobs
        self.results = results
        self.quit = quit
        self.init = init
        multiprocessing.Process.__init__(self)
        self.context = bb.utils.get_context().copy()
        self.handlers = bb.event.get_class_handlers().copy()
        self.profile = profile
        self.queue_signals = False
        self.signal_received = []
        self.signal_threadlock = threading.Lock()
    def catch_sig(self, signum, frame):
        if self.queue_signals:
            self.signal_received.append(signum)
        else:
            self.handle_sig(signum, frame)
    def handle_sig(self, signum, frame):
        if signum == signal.SIGTERM:
            signal.signal(signal.SIGTERM, signal.SIG_DFL)
            os.kill(os.getpid(), signal.SIGTERM)
        elif signum == signal.SIGINT:
            signal.default_int_handler(signum, frame)
    def run(self):
@@ -2075,48 +2024,36 @@ class Parser(multiprocessing.Process):
            prof.dump_stats(logfile)
    def realrun(self):
-        # Signal handling here is hard. We must not terminate any process or thread holding the write
+        if self.init:
-        # lock for the event stream as it will not be released, ever, and things will hang.
+            self.init()
        # Python handles signals in the main thread/process but they can be raised from any thread and
        # we want to defer processing of any SIGTERM/SIGINT signal until we're outside the critical section
        # and don't hold the lock (see server/process.py). We therefore always catch the signals (so any
        # new thread should also do so) and we defer handling but we handle with the local thread lock
        # held (a threading lock, not a multiprocessing one) so that no other thread in the process
        # can be in the critical section.
        signal.signal(signal.SIGTERM, self.catch_sig)
        signal.signal(signal.SIGHUP, signal.SIG_DFL)
        signal.signal(signal.SIGINT, self.catch_sig)
        bb.utils.set_process_name(multiprocessing.current_process().name)
        multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, exitpriority=1)
        multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, exitpriority=1)
        pending = []
-        try:
+        while True:
-            while True:
+            try:
-                try:
+                self.quit.get_nowait()
-                    self.quit.get_nowait()
+            except queue.Empty:
-                except queue.Empty:
+                pass
-                    pass
+            else:
-                else:
+                self.results.close()
-                    break
+                self.results.join_thread()
                break
-                if pending:
+            if pending:
-                    result = pending.pop()
+                result = pending.pop()
-                else:
+            else:
                    try:
                        job = self.jobs.pop()
                    except IndexError:
                        break
                    result = self.parse(*job)
                    # Clear the siggen cache after parsing to control memory usage, its huge
                    bb.parse.siggen.postparsing_clean_cache()
                try:
-                    self.results.put(result, timeout=0.25)
+                    job = self.jobs.pop()
-                except queue.Full:
+                except IndexError:
-                    pending.append(result)
+                    self.results.close()
-        finally:
+                    self.results.join_thread()
-            self.results.close()
+                    break
-            self.results.join_thread()
+                result = self.parse(*job)
                # Clear the siggen cache after parsing to control memory usage, its huge
                bb.parse.siggen.postparsing_clean_cache()
            try:
                self.results.put(result, timeout=0.25)
            except queue.Full:
                pending.append(result)
    def parse(self, mc, cache, filename, appends):
        try:
@@ -2137,12 +2074,12 @@ class Parser(multiprocessing.Process):
            tb = sys.exc_info()[2]
            exc.recipe = filename
            exc.traceback = list(bb.exceptions.extract_traceback(tb, context=3))
-            return True, None, exc
+            return True, exc
        # Need to turn BaseExceptions into Exceptions here so we gracefully shutdown
        # and for example a worker thread doesn't just exit on its own in response to
        # a SystemExit event for example.
        except BaseException as exc:
-            return True, None, ParsingFailure(exc, filename)
+            return True, ParsingFailure(exc, filename)
        finally:
            bb.event.LogHandler.filter = origfilter
@@ -2193,6 +2130,13 @@ class CookerParser(object):
        self.processes = []
        if self.toparse:
            bb.event.fire(bb.event.ParseStarted(self.toparse), self.cfgdata)
            def init():
                signal.signal(signal.SIGTERM, signal.SIG_DFL)
                signal.signal(signal.SIGHUP, signal.SIG_DFL)
                signal.signal(signal.SIGINT, signal.SIG_IGN)
                bb.utils.set_process_name(multiprocessing.current_process().name)
                multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, exitpriority=1)
                multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, exitpriority=1)
            self.parser_quit = multiprocessing.Queue(maxsize=self.num_processes)
            self.result_queue = multiprocessing.Queue()
@@ -2202,14 +2146,14 @@ class CookerParser(object):
            self.jobs = chunkify(list(self.willparse), self.num_processes)
            for i in range(0, self.num_processes):
-                parser = Parser(self.jobs[i], self.result_queue, self.parser_quit, self.cooker.configuration.profile)
+                parser = Parser(self.jobs[i], self.result_queue, self.parser_quit, init, self.cooker.configuration.profile)
                parser.start()
                self.process_names.append(parser.name)
                self.processes.append(parser)
            self.results = itertools.chain(self.results, self.parse_generator())
-    def shutdown(self, clean=True):
+    def shutdown(self, clean=True, force=False):
        if not self.toparse:
            return
        if self.haveshutdown:
@@ -2224,7 +2168,7 @@ class CookerParser(object):
            bb.event.fire(event, self.cfgdata)
        else:
-            bb.error("Parsing halted due to errors, see error messages above")
+            bb.error("Parsing halted due to errors")
        for process in self.processes:
            self.parser_quit.put(None)
@@ -2238,24 +2182,11 @@ class CookerParser(object):
                break
        for process in self.processes:
-            process.join(0.5)
+            if force:
-
+                process.join(.1)
        for process in self.processes:
            if process.exitcode is None:
                os.kill(process.pid, signal.SIGINT)
        for process in self.processes:
            process.join(0.5)
        for process in self.processes:
            if process.exitcode is None:
                process.terminate()
-
+            else:
-        for process in self.processes:
+                process.join()
            process.join()
            # Added in 3.7, cleans up zombies
            if hasattr(process, "close"):
                process.close()
        self.parser_quit.close()
        # Allow data left in the cancel queue to be discarded
@@ -2305,10 +2236,14 @@ class CookerParser(object):
                result = self.result_queue.get(timeout=0.25)
            except queue.Empty:
                empty = True
-                yield None, None, None
+                pass
            else:
                empty = False
-                yield result
+                value = result[1]
                if isinstance(value, BaseException):
                    raise value
                else:
                    yield result
        if not (self.parsed >= self.toparse):
            raise bb.parse.ParseError("Not all recipes parsed, parser thread killed/died? Exiting.", None)
@@ -2319,31 +2254,24 @@ class CookerParser(object):
        parsed = None
        try:
            parsed, mc, result = next(self.results)
            if isinstance(result, BaseException):
                # Turn exceptions back into exceptions
                raise result
            if parsed is None:
                # Timeout, loop back through the main loop
                return True
        except StopIteration:
            self.shutdown()
            return False
        except bb.BBHandledException as exc:
            self.error += 1
            logger.debug('Failed to parse recipe: %s' % exc.recipe)
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, force=True)
            return False
        except ParsingFailure as exc:
            self.error += 1
            logger.error('Unable to parse %s: %s' %
                     (exc.recipe, bb.exceptions.to_string(exc.realexception)))
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, force=True)
            return False
        except bb.parse.ParseError as exc:
            self.error += 1
            logger.error(str(exc))
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, force=True)
            return False
        except bb.data_smart.ExpansionError as exc:
            self.error += 1
@@ -2352,7 +2280,7 @@ class CookerParser(object):
            tb = list(itertools.dropwhile(lambda e: e.filename.startswith(bbdir), exc.traceback))
            logger.error('ExpansionError during parsing %s', value.recipe,
                         exc_info=(etype, value, tb))
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, force=True)
            return False
        except Exception as exc:
            self.error += 1
@@ -2364,7 +2292,7 @@ class CookerParser(object):
                # Most likely, an exception occurred during raising an exception
                import traceback
                logger.error('Exception during parse: %s' % traceback.format_exc())
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, force=True)
            return False
        self.current += 1
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -57,7 +57,7 @@ class ConfigParameters(object):
    def updateToServer(self, server, environment):
        options = {}
-        for o in ["halt", "force", "invalidate_stamp",
+        for o in ["abort", "force", "invalidate_stamp",
                  "dry_run", "dump_signatures",
                  "extra_assume_provided", "profile",
                  "prefile", "postfile", "server_timeout",
@@ -86,7 +86,7 @@ class ConfigParameters(object):
                action['msg'] = "Only one target can be used with the --environment option."
            elif self.options.buildfile and len(self.options.pkgs_to_build) > 0:
                action['msg'] = "No target should be used with the --environment and --buildfile options."
-            elif self.options.pkgs_to_build:
+            elif len(self.options.pkgs_to_build) > 0:
                action['action'] = ["showEnvironmentTarget", self.options.pkgs_to_build]
            else:
                action['action'] = ["showEnvironment", self.options.buildfile]
@@ -124,7 +124,7 @@ class CookerConfiguration(object):
        self.prefile = []
        self.postfile = []
        self.cmd = None
-        self.halt = True
+        self.abort = True
        self.force = False
        self.profile = False
        self.nosetscene = False
@@ -160,7 +160,12 @@ def catch_parse_error(func):
    def wrapped(fn, *args):
        try:
            return func(fn, *args)
-        except Exception as exc:
+        except IOError as exc:
            import traceback
            parselog.critical(traceback.format_exc())
            parselog.critical("Unable to parse %s: %s" % (fn, exc))
            raise bb.BBHandledException()
        except bb.data_smart.ExpansionError as exc:
            import traceback
            bbdir = os.path.dirname(__file__) + os.sep
@@ -172,6 +177,9 @@ def catch_parse_error(func):
                    break
            parselog.critical("Unable to parse %s" % fn, exc_info=(exc_class, exc, tb))
            raise bb.BBHandledException()
        except bb.parse.ParseError as exc:
            parselog.critical(str(exc))
            raise bb.BBHandledException()
    return wrapped
@catch_parse_error
@@ -202,7 +210,7 @@ def findConfigFile(configfile, data):
 #
 # We search for a conf/bblayers.conf under an entry in BBPATH or in cwd working
-# up to /. If that fails, bitbake would fall back to cwd.
+# up to /. If that fails, we search for a conf/bitbake.conf in BBPATH.
 #
 def findTopdir():
@@ -215,8 +223,11 @@ def findTopdir():
    layerconf = findConfigFile("bblayers.conf", d)
    if layerconf:
        return os.path.dirname(os.path.dirname(layerconf))
-
+    if bbpath:
-    return os.path.abspath(os.getcwd())
+        bitbakeconf = bb.utils.which(bbpath, "conf/bitbake.conf")
        if bitbakeconf:
            return os.path.dirname(os.path.dirname(bitbakeconf))
    return None
 class CookerDataBuilder(object):
@@ -239,9 +250,6 @@ class CookerDataBuilder(object):
        self.savedenv = bb.data.init()
        for k in cookercfg.env:
            self.savedenv.setVar(k, cookercfg.env[k])
            if k in bb.data_smart.bitbake_renamed_vars:
                bb.error('Variable %s from the shell environment has been renamed to %s' % (k, bb.data_smart.bitbake_renamed_vars[k]))
                bb.fatal("Exiting to allow enviroment variables to be corrected")
        filtered_keys = bb.utils.approved_variables()
        bb.data.inheritFromOS(self.basedata, self.savedenv, filtered_keys)
@@ -253,12 +261,12 @@ class CookerDataBuilder(object):
        self.data = self.basedata
        self.mcdata = {}
-    def parseBaseConfiguration(self, worker=False):
+    def parseBaseConfiguration(self):
        data_hash = hashlib.sha256()
        try:
            self.data = self.parseConfigurationFiles(self.prefiles, self.postfiles)
-            if self.data.getVar("BB_WORKERCONTEXT", False) is None and not worker:
+            if self.data.getVar("BB_WORKERCONTEXT", False) is None:
                bb.fetch.fetcher_init(self.data)
            bb.parse.init_parser(self.data)
            bb.codeparser.parser_cache_init(self.data)
@@ -293,28 +301,13 @@ class CookerDataBuilder(object):
                bb.event.fire(bb.event.MultiConfigParsed(self.mcdata), self.data)
            self.data_hash = data_hash.hexdigest()
        except (SyntaxError, bb.BBHandledException):
            raise bb.BBHandledException()
        except bb.data_smart.ExpansionError as e:
            logger.error(str(e))
            raise bb.BBHandledException()
-
+        except Exception:
-
+            logger.exception("Error parsing configuration files")
        # Handle obsolete variable names
        d = self.data
        renamedvars = d.getVarFlags('BB_RENAMED_VARIABLES') or {}
        renamedvars.update(bb.data_smart.bitbake_renamed_vars)
        issues = False
        for v in renamedvars:
            if d.getVar(v) != None or d.hasOverrides(v):
                issues = True
                loginfo = {}
                history = d.varhistory.get_variable_refs(v)
                for h in history:
                    for line in history[h]:
                        loginfo = {'file' : h, 'line' : line}
                        bb.data.data_smart._print_rename_error(v, loginfo, renamedvars)
                if not history:
                    bb.data.data_smart._print_rename_error(v, loginfo, renamedvars)
        if issues:
            raise bb.BBHandledException()
        # Create a copy so we can reset at a later date when UIs disconnect
@@ -422,10 +415,7 @@ class CookerDataBuilder(object):
                msg += (" and bitbake did not find a conf/bblayers.conf file in"
                        " the expected location.\nMaybe you accidentally"
                        " invoked bitbake from the wrong directory?")
-            bb.fatal(msg)
+            raise SystemExit(msg)
        if not data.getVar("TOPDIR"):
            data.setVar("TOPDIR", os.path.abspath(os.getcwd()))
        data = parse_config_file(os.path.join("conf", "bitbake.conf"), data)
@@ -438,7 +428,7 @@ class CookerDataBuilder(object):
        for bbclass in bbclasses:
            data = _inherit(bbclass, data)
-        # Normally we only register event handlers at the end of parsing .bb files
+        # Nomally we only register event handlers at the end of parsing .bb files
        # We register any handlers we've found so far here...
        for var in data.getVar('__BBHANDLERS', False) or []:
            handlerfn = data.getVarFlag(var, "filename", False)
--- a/bitbake/lib/bb/daemonize.py
+++ b/bitbake/lib/bb/daemonize.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -76,26 +74,26 @@ def createDaemon(function, logfile):
    with open('/dev/null', 'r') as si:
        os.dup2(si.fileno(), sys.stdin.fileno())
-    with open(logfile, 'a+') as so:
+    try:
-        try:
+        so = open(logfile, 'a+')
-            os.dup2(so.fileno(), sys.stdout.fileno())
+        os.dup2(so.fileno(), sys.stdout.fileno())
-            os.dup2(so.fileno(), sys.stderr.fileno())
+        os.dup2(so.fileno(), sys.stderr.fileno())
-        except io.UnsupportedOperation:
+    except io.UnsupportedOperation:
-            sys.stdout = so
+        sys.stdout = open(logfile, 'a+')
-        # Have stdout and stderr be the same so log output matches chronologically
+    # Have stdout and stderr be the same so log output matches chronologically
-        # and there aren't two separate buffers
+    # and there aren't two seperate buffers
-        sys.stderr = sys.stdout
+    sys.stderr = sys.stdout
-        try:
+    try:
-            function()
+        function()
-        except Exception as e:
+    except Exception as e:
-            traceback.print_exc()
+        traceback.print_exc()
-        finally:
+    finally:
-            bb.event.print_ui_queue()
+        bb.event.print_ui_queue()
-            # os._exit() doesn't flush open files like os.exit() does. Manually flush
+        # os._exit() doesn't flush open files like os.exit() does. Manually flush
-            # stdout and stderr so that any logging output will be seen, particularly
+        # stdout and stderr so that any logging output will be seen, particularly
-            # exception tracebacks.
+        # exception tracebacks.
-            sys.stdout.flush()
+        sys.stdout.flush()
-            sys.stderr.flush()
+        sys.stderr.flush()
-            os._exit(0)
+        os._exit(0)
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -272,37 +272,34 @@ def update_data(d):
    """Performs final steps upon the datastore, including application of overrides"""
    d.finalize(parent = True)
-def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
+def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
    deps = set()
    try:
        if key[-1] == ']':
            vf = key[:-1].split('[')
            if vf[1] == "vardepvalueexclude":
                return deps, ""
            value, parser = d.getVarFlag(vf[0], vf[1], False, retparser=True)
            deps |= parser.references
            deps = deps | (keys & parser.execs)
            return deps, value
        varflags = d.getVarFlags(key, ["vardeps", "vardepvalue", "vardepsexclude", "exports", "postfuncs", "prefuncs", "lineno", "filename"]) or {}
        vardeps = varflags.get("vardeps")
        exclusions = varflags.get("vardepsexclude", "").split()
-        def handle_contains(value, contains, exclusions, d):
+        def handle_contains(value, contains, d):
-            newvalue = []
+            newvalue = ""
            if value:
                newvalue.append(str(value))
            for k in sorted(contains):
                if k in exclusions or k in ignored_vars:
                    continue
                l = (d.getVar(k) or "").split()
                for item in sorted(contains[k]):
                    for word in item.split():
                        if not word in l:
-                            newvalue.append("\n%s{%s} = Unset" % (k, item))
+                            newvalue += "\n%s{%s} = Unset" % (k, item)
                            break
                    else:
-                        newvalue.append("\n%s{%s} = Set" % (k, item))
+                        newvalue += "\n%s{%s} = Set" % (k, item)
-            return "".join(newvalue)
+            if not newvalue:
                return value
            if not value:
                return newvalue
            return value + newvalue
        def handle_remove(value, deps, removes, d):
            for r in sorted(removes):
@@ -310,7 +307,6 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
                value += "\n_remove of %s" % r
                deps |= r2.references
                deps = deps | (keys & r2.execs)
                value = handle_contains(value, r2.contains, exclusions, d)
            return value
        if "vardepvalue" in varflags:
@@ -322,7 +318,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
                parser.parse_python(value, filename=varflags.get("filename"), lineno=varflags.get("lineno"))
                deps = deps | parser.references
                deps = deps | (keys & parser.execs)
-                value = handle_contains(value, parser.contains, exclusions, d)
+                value = handle_contains(value, parser.contains, d)
            else:
                value, parsedvar = d.getVarFlag(key, "_content", False, retparser=True)
                parser = bb.codeparser.ShellParser(key, logger)
@@ -330,7 +326,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
                deps = deps | shelldeps
                deps = deps | parsedvar.references
                deps = deps | (keys & parser.execs) | (keys & parsedvar.execs)
-                value = handle_contains(value, parsedvar.contains, exclusions, d)
+                value = handle_contains(value, parsedvar.contains, d)
                if hasattr(parsedvar, "removes"):
                    value = handle_remove(value, deps, parsedvar.removes, d)
            if vardeps is None:
@@ -345,7 +341,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
            value, parser = d.getVarFlag(key, "_content", False, retparser=True)
            deps |= parser.references
            deps = deps | (keys & parser.execs)
-            value = handle_contains(value, parser.contains, exclusions, d)
+            value = handle_contains(value, parser.contains, d)
            if hasattr(parser, "removes"):
                value = handle_remove(value, deps, parser.removes, d)
@@ -365,7 +361,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
                deps |= set(varfdeps)
        deps |= set((vardeps or "").split())
-        deps -= set(exclusions)
+        deps -= set(varflags.get("vardepsexclude", "").split())
    except bb.parse.SkipRecipe:
        raise
    except Exception as e:
@@ -375,7 +371,7 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, ignored_vars, d):
    #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
    #d.setVarFlag(key, "vardeps", deps)
-def generate_dependencies(d, ignored_vars):
+def generate_dependencies(d, whitelist):
    keys = set(key for key in d if not key.startswith("__"))
    shelldeps = set(key for key in d.getVar("__exportlist", False) if d.getVarFlag(key, "export", False) and not d.getVarFlag(key, "unexport", False))
@@ -386,22 +382,22 @@ def generate_dependencies(d, ignored_vars):
    tasklist = d.getVar('__BBTASKS', False) or []
    for task in tasklist:
-        deps[task], values[task] = build_dependencies(task, keys, shelldeps, varflagsexcl, ignored_vars, d)
+        deps[task], values[task] = build_dependencies(task, keys, shelldeps, varflagsexcl, d)
        newdeps = deps[task]
        seen = set()
        while newdeps:
-            nextdeps = newdeps - ignored_vars
+            nextdeps = newdeps - whitelist
            seen |= nextdeps
            newdeps = set()
            for dep in nextdeps:
                if dep not in deps:
-                    deps[dep], values[dep] = build_dependencies(dep, keys, shelldeps, varflagsexcl, ignored_vars, d)
+                    deps[dep], values[dep] = build_dependencies(dep, keys, shelldeps, varflagsexcl, d)
                newdeps |=  deps[dep]
            newdeps -= seen
        #print "For %s: %s" % (task, str(deps[task]))
    return tasklist, deps, values
-def generate_dependency_hash(tasklist, gendeps, lookupcache, ignored_vars, fn):
+def generate_dependency_hash(tasklist, gendeps, lookupcache, whitelist, fn):
    taskdeps = {}
    basehash = {}
@@ -410,11 +406,9 @@ def generate_dependency_hash(tasklist, gendeps, lookupcache, ignored_vars, fn):
        if data is None:
            bb.error("Task %s from %s seems to be empty?!" % (task, fn))
-            data = []
+            data = ''
        else:
            data = [data]
-        gendeps[task] -= ignored_vars
+        gendeps[task] -= whitelist
        newdeps = gendeps[task]
        seen = set()
        while newdeps:
@@ -422,20 +416,20 @@ def generate_dependency_hash(tasklist, gendeps, lookupcache, ignored_vars, fn):
            seen |= nextdeps
            newdeps = set()
            for dep in nextdeps:
-                if dep in ignored_vars:
+                if dep in whitelist:
                    continue
-                gendeps[dep] -= ignored_vars
+                gendeps[dep] -= whitelist
                newdeps |= gendeps[dep]
            newdeps -= seen
        alldeps = sorted(seen)
        for dep in alldeps:
-            data.append(dep)
+            data = data + dep
            var = lookupcache[dep]
            if var is not None:
-                data.append(str(var))
+                data = data + str(var)
        k = fn + ":" + task
-        basehash[k] = hashlib.sha256("".join(data).encode("utf-8")).hexdigest()
+        basehash[k] = hashlib.sha256(data.encode("utf-8")).hexdigest()
        taskdeps[task] = alldeps
    return taskdeps, basehash
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -33,18 +33,6 @@ __expand_python_regexp__ = re.compile(r"\${@.+?}")
 __whitespace_split__ = re.compile(r'(\s)')
 __override_regexp__ = re.compile(r'[a-z0-9]+')
 bitbake_renamed_vars = {
    "BB_ENV_WHITELIST": "BB_ENV_PASSTHROUGH",
    "BB_ENV_EXTRAWHITE": "BB_ENV_PASSTHROUGH_ADDITIONS",
    "BB_HASHBASE_WHITELIST": "BB_BASEHASH_IGNORE_VARS",
    "BB_HASHCONFIG_WHITELIST": "BB_HASHCONFIG_IGNORE_VARS",
    "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS",
    "BB_SETSCENE_ENFORCE_WHITELIST": "BB_SETSCENE_ENFORCE_IGNORE_TASKS",
    "MULTI_PROVIDER_WHITELIST": "BB_MULTI_PROVIDER_ALLOWED",
    "BB_STAMP_WHITELIST": "is a deprecated variable and support has been removed",
    "BB_STAMP_POLICY": "is a deprecated variable and support has been removed",
 }
 def infer_caller_details(loginfo, parent = False, varval = True):
    """Save the caller the trouble of specifying everything."""
    # Save effort.
@@ -152,9 +140,6 @@ class DataContext(dict):
        self['d'] = metadata
    def __missing__(self, key):
        # Skip commonly accessed invalid variables
        if key in ['bb', 'oe', 'int', 'bool', 'time', 'str', 'os']:
            raise KeyError(key)
        value = self.metadata.getVar(key)
        if value is None or self.metadata.getVarFlag(key, 'func', False):
            raise KeyError(key)
@@ -351,16 +336,6 @@ class VariableHistory(object):
                lines.append(line)
        return lines
    def get_variable_refs(self, var):
        """Return a dict of file/line references"""
        var_history = self.variable(var)
        refs = {}
        for event in var_history:
            if event['file'] not in refs:
                refs[event['file']] = []
            refs[event['file']].append(event['line'])
        return refs
    def get_variable_items_files(self, var):
        """
        Use variable history to map items added to a list variable and
@@ -395,23 +370,6 @@ class VariableHistory(object):
            else:
                self.variables[var] = []
 def _print_rename_error(var, loginfo, renamedvars, fullvar=None):
    info = ""
    if "file" in loginfo:
        info = " file: %s" % loginfo["file"]
    if "line" in loginfo:
        info += " line: %s" % loginfo["line"]
    if fullvar and fullvar != var:
        info += " referenced as: %s" % fullvar
    if info:
        info = " (%s)" % info.strip()
    renameinfo = renamedvars[var]
    if " " in renameinfo:
        # A space signals a string to display instead of a rename
        bb.erroronce('Variable %s %s%s' % (var, renameinfo, info))
    else:
        bb.erroronce('Variable %s has been renamed to %s%s' % (var, renameinfo, info))
 class DataSmart(MutableMapping):
    def __init__(self):
        self.dict = {}
@@ -419,8 +377,6 @@ class DataSmart(MutableMapping):
        self.inchistory = IncludeHistory()
        self.varhistory = VariableHistory(self)
        self._tracking = False
        self._var_renames = {}
        self._var_renames.update(bitbake_renamed_vars)
        self.expand_cache = {}
@@ -532,8 +488,6 @@ class DataSmart(MutableMapping):
        else:
            self.initVar(var)
    def hasOverrides(self, var):
        return var in self.overridedata
    def setVar(self, var, value, **loginfo):
        #print("var=" + str(var) + "  val=" + str(value))
@@ -546,12 +500,6 @@ class DataSmart(MutableMapping):
                info += " line: %s" % loginfo["line"]
            bb.fatal("Variable %s contains an operation using the old override syntax. Please convert this layer/metadata before attempting to use with a newer bitbake." % info)
        shortvar = var.split(":", 1)[0]
        if shortvar in self._var_renames:
            _print_rename_error(shortvar, loginfo, self._var_renames, fullvar=var)
            # Mark that we have seen a renamed variable
            self.setVar("_FAILPARSINGERRORHANDLED", True)
        self.expand_cache = {}
        parsing=False
        if 'parsing' in loginfo:
@@ -673,11 +621,10 @@ class DataSmart(MutableMapping):
            self.varhistory.record(**loginfo)
            self.setVar(newkey, val, ignore=True, parsing=True)
-        srcflags = self.getVarFlags(key, False, True) or {}
+        for i in (__setvar_keyword__):
-        for i in srcflags:
+            src = self.getVarFlag(key, i, False)
-            if i not in (__setvar_keyword__):
+            if src is None:
                continue
            src = srcflags[i]
            dest = self.getVarFlag(newkey, i, False) or []
            dest.extend(src)
@@ -738,14 +685,6 @@ class DataSmart(MutableMapping):
    def setVarFlag(self, var, flag, value, **loginfo):
        self.expand_cache = {}
        if var == "BB_RENAMED_VARIABLES":
            self._var_renames[flag] = value
        if var in self._var_renames:
            _print_rename_error(var, loginfo, self._var_renames)
            # Mark that we have seen a renamed variable
            self.setVar("_FAILPARSINGERRORHANDLED", True)
        if 'op' not in loginfo:
            loginfo['op'] = "set"
        loginfo['flag'] = flag
@@ -871,7 +810,7 @@ class DataSmart(MutableMapping):
                    expanded_removes[r] = self.expand(r).split()
                parser.removes = set()
-                val = []
+                val = ""
                for v in __whitespace_split__.split(parser.value):
                    skip = False
                    for r in removes:
@@ -880,8 +819,8 @@ class DataSmart(MutableMapping):
                            skip = True
                    if skip:
                        continue
-                    val.append(v)
+                    val = val + v
-                parser.value = "".join(val)
+                parser.value = val
                if expand:
                    value = parser.value
@@ -985,7 +924,6 @@ class DataSmart(MutableMapping):
        data.inchistory = self.inchistory.copy()
        data._tracking = self._tracking
        data._var_renames = self._var_renames
        data.overrides = None
        data.overridevars = copy.copy(self.overridevars)
@@ -1008,7 +946,7 @@ class DataSmart(MutableMapping):
        value = self.getVar(variable, False)
        for key in keys:
            referrervalue = self.getVar(key, False)
-            if referrervalue and isinstance(referrervalue, str) and ref in referrervalue:
+            if referrervalue and ref in referrervalue:
                self.setVar(key, referrervalue.replace(ref, value))
    def localkeys(self):
@@ -1074,10 +1012,10 @@ class DataSmart(MutableMapping):
        d = self.createCopy()
        bb.data.expandKeys(d)
-        config_ignore_vars = set((d.getVar("BB_HASHCONFIG_IGNORE_VARS") or "").split())
+        config_whitelist = set((d.getVar("BB_HASHCONFIG_WHITELIST") or "").split())
        keys = set(key for key in iter(d) if not key.startswith("__"))
        for key in keys:
-            if key in config_ignore_vars:
+            if key in config_whitelist:
                continue
            value = d.getVar(key, False) or ""
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -40,7 +40,7 @@ class HeartbeatEvent(Event):
    """Triggered at regular time intervals of 10 seconds. Other events can fire much more often
       (runQueueTaskStarted when there are many short tasks) or not at all for long periods
       of time (again runQueueTaskStarted, when there is just one long-running task), so this
-       event is more suitable for doing some task-independent work occasionally."""
+       event is more suitable for doing some task-independent work occassionally."""
    def __init__(self, time):
        Event.__init__(self)
        self.time = time
@@ -132,14 +132,8 @@ def print_ui_queue():
    if not _uiready:
        from bb.msg import BBLogFormatter
        # Flush any existing buffered content
-        try:
+        sys.stdout.flush()
-            sys.stdout.flush()
+        sys.stderr.flush()
        except:
            pass
        try:
            sys.stderr.flush()
        except:
            pass
        stdout = logging.StreamHandler(sys.stdout)
        stderr = logging.StreamHandler(sys.stderr)
        formatter = BBLogFormatter("%(levelname)s: %(message)s")
@@ -492,7 +486,7 @@ class BuildCompleted(BuildBase, OperationCompleted):
        BuildBase.__init__(self, n, p, failures)
 class DiskFull(Event):
-    """Disk full case build halted"""
+    """Disk full case build aborted"""
    def __init__(self, dev, type, freespace, mountpoint):
        Event.__init__(self)
        self._dev = dev
@@ -770,7 +764,7 @@ class LogHandler(logging.Handler):
 class MetadataEvent(Event):
    """
    Generic event that target for OE-Core classes
-    to report information during asynchronous execution
+    to report information during asynchrous execution
    """
    def __init__(self, eventtype, eventdata):
        Event.__init__(self)
--- a/bitbake/lib/bb/exceptions.py
+++ b/bitbake/lib/bb/exceptions.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bb/fetch2/README
+++ b/bitbake/lib/bb/fetch2/README
@@ -1,57 +0,0 @@
 There are expectations of users of the fetcher code. This file attempts to document
 some of the constraints that are present. Some are obvious, some are less so. It is
 documented in the context of how OE uses it but the API calls are generic.
 a) network access for sources is only expected to happen in the do_fetch task.
   This is not enforced or tested but is required so that we can:
   i) audit the sources used (i.e. for license/manifest reasons) 
   ii) support offline builds with a suitable cache
   iii) allow work to continue even with downtime upstream
   iv) allow for changes upstream in incompatible ways
   v) allow rebuilding of the software in X years time
 b) network access is not expected in do_unpack task.
 c) you can take DL_DIR and use it as a mirror for offline builds.
 d) access to the network is only made when explicitly configured in recipes
   (e.g. use of AUTOREV, or use of git tags which change revision).
 e) fetcher output is deterministic (i.e. if you fetch configuration XXX now it 
   will match in future exactly in a clean build with a new DL_DIR).
   One specific pain point example are git tags. They can be replaced and change
   so the git fetcher has to resolve them with the network. We use git revisions
   where possible to avoid this and ensure determinism.
 f) network access is expected to work with the standard linux proxy variables
   so that access behind firewalls works (the fetcher sets these in the 
   environment but only in the do_fetch tasks).
 g) access during parsing has to be minimal, a "git ls-remote" for an AUTOREV 
   git recipe might be ok but you can't expect to checkout a git tree.
 h) we need to provide revision information during parsing such that a version
   for the recipe can be constructed.
 i) versions are expected to be able to increase in a way which sorts allowing 
   package feeds to operate (see PR server required for git revisions to sort).
 j) API to query for possible version upgrades of a url is highly desireable to 
   allow our automated upgrage code to function (it is implied this does always 
   have network access).
 k) Where fixes or changes to behaviour in the fetcher are made, we ask that 
   test cases are added (run with "bitbake-selftest bb.tests.fetch"). We do 
   have fairly extensive test coverage of the fetcher as it is the only way
   to track all of its corner cases, it still doesn't give entire coverage 
   though sadly.
 l) If using tools during parse time, they will have to be in ASSUME_PROVIDED
   in OE's context as we can't build git-native, then parse a recipe and use
   git ls-remote.
 Not all fetchers support all features, autorev is optional and doesn't make
 sense for some. Upgrade detection means different things in different contexts
 too.
--- a/bitbake/lib/bb/fetch2/init.py
+++ b/bitbake/lib/bb/fetch2/init.py
@@ -113,7 +113,7 @@ class MissingParameterError(BBFetchException):
        self.args = (missing, url)
 class ParameterError(BBFetchException):
-    """Exception raised when a url cannot be processed due to invalid parameters."""
+    """Exception raised when a url cannot be proccessed due to invalid parameters."""
    def __init__(self, message, url):
        msg = "URL: '%s' has invalid parameters. %s" % (url, message)
        self.url = url
@@ -182,7 +182,7 @@ class URI(object):
    Some notes about relative URIs: while it's specified that
    a URI beginning with <scheme>:// should either be directly
    followed by a hostname or a /, the old URI handling of the
-    fetch2 library did not conform to this. Therefore, this URI
+    fetch2 library did not comform to this. Therefore, this URI
    class has some kludges to make sure that URIs are parsed in
    a way comforming to bitbake's current usage. This URI class
    supports the following:
@@ -199,7 +199,7 @@ class URI(object):
     file://hostname/absolute/path.diff (would be IETF compliant)
    Note that the last case only applies to a list of
-    explicitly allowed schemes (currently only file://), that requires
+    "whitelisted" schemes (currently only file://), that requires
    its URIs to not have a network location.
    """
@@ -402,24 +402,24 @@ def encodeurl(decoded):
    if not type:
        raise MissingParameterError('type', "encoded from the data %s" % str(decoded))
-    url = ['%s://' % type]
+    url = '%s://' % type
    if user and type != "file":
-        url.append("%s" % user)
+        url += "%s" % user
        if pswd:
-            url.append(":%s" % pswd)
+            url += ":%s" % pswd
-        url.append("@")
+        url += "@"
    if host and type != "file":
-        url.append("%s" % host)
+        url += "%s" % host
    if path:
        # Standardise path to ensure comparisons work
        while '//' in path:
            path = path.replace("//", "/")
-        url.append("%s" % urllib.parse.quote(path))
+        url += "%s" % urllib.parse.quote(path)
    if p:
        for parm in p:
-            url.append(";%s=%s" % (parm, p[parm]))
+            url += ";%s=%s" % (parm, p[parm])
-    return "".join(url)
+    return url
 def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
    if not ud.url or not uri_find or not uri_replace:
@@ -473,13 +473,10 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None):
                    basename = os.path.basename(ud.localpath)
                if basename:
                    uri_basename = os.path.basename(uri_decoded[loc])
-                    # Prefix with a slash as a sentinel in case
+                    if uri_basename and basename != uri_basename and result_decoded[loc].endswith(uri_basename):
-                    # result_decoded[loc] does not contain one.
+                        result_decoded[loc] = result_decoded[loc].replace(uri_basename, basename)
-                    path = "/" + result_decoded[loc]
+                    elif not result_decoded[loc].endswith(basename):
-                    if uri_basename and basename != uri_basename and path.endswith("/" + uri_basename):
+                        result_decoded[loc] = os.path.join(result_decoded[loc], basename)
                        result_decoded[loc] = path[1:-len(uri_basename)] + basename
                    elif not path.endswith("/" + basename):
                        result_decoded[loc] = os.path.join(path[1:], basename)
        else:
            return None
    result = encodeurl(result_decoded)
@@ -765,7 +762,6 @@ def get_srcrev(d, method_name='sortable_revision'):
    that fetcher provides a method with the given name and the same signature as sortable_revision.
    """
    d.setVar("__BBSEENSRCREV", "1")
    recursion = d.getVar("__BBINSRCREV")
    if recursion:
        raise FetchError("There are recursive references in fetcher variables, likely through SRC_URI")
@@ -778,7 +774,7 @@ def get_srcrev(d, method_name='sortable_revision'):
        if urldata[u].method.supports_srcrev():
            scms.append(u)
-    if not scms:
+    if len(scms) == 0:
        raise FetchError("SRCREV was used yet no valid SCM was found in SRC_URI")
    if len(scms) == 1 and len(urldata[scms[0]].names) == 1:
@@ -839,7 +835,6 @@ FETCH_EXPORT_VARS = ['HOME', 'PATH',
                     'ALL_PROXY', 'all_proxy',
                     'GIT_PROXY_COMMAND',
                     'GIT_SSH',
                     'GIT_SSH_COMMAND',
                     'GIT_SSL_CAINFO',
                     'GIT_SMART_HTTP',
                     'SSH_AUTH_SOCK', 'SSH_AGENT_PID',
@@ -852,17 +847,6 @@ FETCH_EXPORT_VARS = ['HOME', 'PATH',
                     'AWS_SECRET_ACCESS_KEY',
                     'AWS_DEFAULT_REGION']
 def get_fetcher_environment(d):
    newenv = {}
    origenv = d.getVar("BB_ORIGENV")
    for name in bb.fetch2.FETCH_EXPORT_VARS:
        value = d.getVar(name)
        if not value and origenv:
            value = origenv.getVar(name)
        if value:
            newenv[name] = value
    return newenv
 def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None):
    """
    Run cmd returning the command output
@@ -1097,8 +1081,6 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
 def ensure_symlink(target, link_name):
    if not os.path.exists(link_name):
        dirname = os.path.dirname(link_name)
        bb.utils.mkdirhier(dirname)
        if os.path.islink(link_name):
            # Broken symbolic link
            os.unlink(link_name)
@@ -1476,33 +1458,30 @@ class FetchMethod(object):
        cmd = None
        if unpack:
            tar_cmd = 'tar --extract --no-same-owner'
            if 'striplevel' in urldata.parm:
                tar_cmd += ' --strip-components=%s' %  urldata.parm['striplevel']
            if file.endswith('.tar'):
-                cmd = '%s -f %s' % (tar_cmd, file)
+                cmd = 'tar x --no-same-owner -f %s' % file
            elif file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'):
-                cmd = '%s -z -f %s' % (tar_cmd, file)
+                cmd = 'tar xz --no-same-owner -f %s' % file
            elif file.endswith('.tbz') or file.endswith('.tbz2') or file.endswith('.tar.bz2'):
-                cmd = 'bzip2 -dc %s | %s -f -' % (file, tar_cmd)
+                cmd = 'bzip2 -dc %s | tar x --no-same-owner -f -' % file
            elif file.endswith('.gz') or file.endswith('.Z') or file.endswith('.z'):
                cmd = 'gzip -dc %s > %s' % (file, efile)
            elif file.endswith('.bz2'):
                cmd = 'bzip2 -dc %s > %s' % (file, efile)
            elif file.endswith('.txz') or file.endswith('.tar.xz'):
-                cmd = 'xz -dc %s | %s -f -' % (file, tar_cmd)
+                cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file
            elif file.endswith('.xz'):
                cmd = 'xz -dc %s > %s' % (file, efile)
            elif file.endswith('.tar.lz'):
-                cmd = 'lzip -dc %s | %s -f -' % (file, tar_cmd)
+                cmd = 'lzip -dc %s | tar x --no-same-owner -f -' % file
            elif file.endswith('.lz'):
                cmd = 'lzip -dc %s > %s' % (file, efile)
            elif file.endswith('.tar.7z'):
-                cmd = '7z x -so %s | %s -f -' % (file, tar_cmd)
+                cmd = '7z x -so %s | tar x --no-same-owner -f -' % file
            elif file.endswith('.7z'):
                cmd = '7za x -y %s 1>/dev/null' % file
            elif file.endswith('.tzst') or file.endswith('.tar.zst'):
-                cmd = 'zstd --decompress --stdout %s | %s -f -' % (file, tar_cmd)
+                cmd = 'zstd --decompress --stdout %s | tar x --no-same-owner -f -' % file
            elif file.endswith('.zst'):
                cmd = 'zstd --decompress --stdout %s > %s' % (file, efile)
            elif file.endswith('.zip') or file.endswith('.jar'):
@@ -1535,7 +1514,7 @@ class FetchMethod(object):
                        raise UnpackError("Unable to unpack deb/ipk package - does not contain data.tar.* file", urldata.url)
                else:
                    raise UnpackError("Unable to unpack deb/ipk package - could not list contents", urldata.url)
-                cmd = 'ar x %s %s && %s -p -f %s && rm %s' % (file, datafile, tar_cmd, datafile, datafile)
+                cmd = 'ar x %s %s && tar --no-same-owner -xpf %s && rm %s' % (file, datafile, datafile, datafile)
        # If 'subdir' param exists, create a dir and use it as destination for unpack cmd
        if 'subdir' in urldata.parm:
@@ -1661,7 +1640,7 @@ class Fetch(object):
        if localonly and cache:
            raise Exception("bb.fetch2.Fetch.__init__: cannot set cache and localonly at same time")
-        if not urls:
+        if len(urls) == 0:
            urls = d.getVar("SRC_URI").split()
        self.urls = urls
        self.d = d
@@ -1750,9 +1729,7 @@ class Fetch(object):
                    self.d.setVar("BB_NO_NETWORK", "1")
                firsterr = None
-                verified_stamp = False
+                verified_stamp = m.verify_donestamp(ud, self.d)
                if done:
                    verified_stamp = m.verify_donestamp(ud, self.d)
                if not done and (not verified_stamp or m.need_update(ud, self.d)):
                    try:
                        if not trusted_network(self.d, ud.url):
@@ -1811,11 +1788,7 @@ class Fetch(object):
    def checkstatus(self, urls=None):
        """
-        Check all URLs exist upstream.
+        Check all urls exist upstream
        Returns None if the URLs exist, raises FetchError if the check wasn't
        successful but there wasn't an error (such as file not found), and
        raises other exceptions in error cases.
        """
        if not urls:
@@ -1960,7 +1933,6 @@ from . import clearcase
 from . import npm
 from . import npmsw
 from . import az
 from . import crate
 methods.append(local.Local())
 methods.append(wget.Wget())
@@ -1981,4 +1953,3 @@ methods.append(clearcase.ClearCase())
 methods.append(npm.Npm())
 methods.append(npmsw.NpmShrinkWrap())
 methods.append(az.Az())
 methods.append(crate.Crate())
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -44,8 +44,7 @@ Supported SRC_URI options are:
 - nobranch
   Don't check the SHA validation for branch. set this option for the recipe
-   referring to commit which is valid in any namespace (branch, tag, ...)
+   referring to commit which is valid in tag instead of branch.
   instead of branch.
   The default is "0", set nobranch=1 if needed.
 - usehead
@@ -147,7 +146,6 @@ class Git(FetchMethod):
            # github stopped supporting git protocol
            # https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git
            ud.proto = "https"
            bb.warn("URL: %s uses git protocol which is no longer supported by github. Please change to ;protocol=https in the url." % ud.url)
        if not ud.proto in ('git', 'file', 'ssh', 'http', 'https', 'rsync'):
            raise bb.fetch2.ParameterError("Invalid protocol type", ud.url)
@@ -171,10 +169,7 @@ class Git(FetchMethod):
            ud.nocheckout = 1
        ud.unresolvedrev = {}
-        branches = ud.parm.get("branch", "").split(',')
+        branches = ud.parm.get("branch", "master").split(',')
        if branches == [""] and not ud.nobranch:
            bb.warn("URL: %s does not set any branch parameter. The future default branch used by tools and repositories is uncertain and we will therefore soon require this is set in all git urls." % ud.url)
            branches = ["master"]
        if len(branches) != len(ud.names):
            raise bb.fetch2.ParameterError("The number of name and branch parameters is not balanced", ud.url)
@@ -241,7 +236,7 @@ class Git(FetchMethod):
            for name in ud.names:
                ud.unresolvedrev[name] = 'HEAD'
-        ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false -c core.pager=cat"
+        ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false"
        write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS") or "0"
        ud.write_tarballs = write_tarballs != "0" or ud.rebaseable
@@ -307,10 +302,7 @@ class Git(FetchMethod):
        return ud.clonedir
    def need_update(self, ud, d):
-        return self.clonedir_need_update(ud, d) \
+        return self.clonedir_need_update(ud, d) or self.shallow_tarball_need_update(ud) or self.tarball_need_update(ud)
                or self.shallow_tarball_need_update(ud) \
                or self.tarball_need_update(ud) \
                or self.lfs_need_update(ud, d)
    def clonedir_need_update(self, ud, d):
        if not os.path.exists(ud.clonedir):
@@ -322,15 +314,6 @@ class Git(FetchMethod):
                return True
        return False
    def lfs_need_update(self, ud, d):
        if self.clonedir_need_update(ud, d):
            return True
        for name in ud.names:
            if not self._lfs_objects_downloaded(ud, d, name, ud.clonedir):
                return True
        return False
    def clonedir_need_shallow_revs(self, ud, d):
        for rev in ud.shallow_revs:
            try:
@@ -371,13 +354,9 @@ class Git(FetchMethod):
        # If the repo still doesn't exist, fallback to cloning it
        if not os.path.exists(ud.clonedir):
-            # We do this since git will use a "-l" option automatically for local urls where possible,
+            # We do this since git will use a "-l" option automatically for local urls where possible
            # but it doesn't work when git/objects is a symlink, only works when it is a directory.
            if repourl.startswith("file://"):
-                repourl_path = repourl[7:]
+                repourl = repourl[7:]
                objects = os.path.join(repourl_path, 'objects')
                if os.path.isdir(objects) and not os.path.islink(objects):
                    repourl = repourl_path
            clone_cmd = "LANG=C %s clone --bare --mirror %s %s --progress" % (ud.basecmd, shlex.quote(repourl), ud.clonedir)
            if ud.proto.lower() != 'file':
                bb.fetch2.check_network_access(d, clone_cmd, ud.url)
@@ -391,11 +370,7 @@ class Git(FetchMethod):
              runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
            runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=ud.clonedir)
-
+            fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, shlex.quote(repourl))
            if ud.nobranch:
                fetch_cmd = "LANG=C %s fetch -f --progress %s refs/*:refs/*" % (ud.basecmd, shlex.quote(repourl))
            else:
                fetch_cmd = "LANG=C %s fetch -f --progress %s refs/heads/*:refs/heads/* refs/tags/*:refs/tags/*" % (ud.basecmd, shlex.quote(repourl))
            if ud.proto.lower() != 'file':
                bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
            progresshandler = GitProgressHandler(d)
@@ -418,9 +393,9 @@ class Git(FetchMethod):
            if missing_rev:
                raise bb.fetch2.FetchError("Unable to find revision %s even from upstream" % missing_rev)
-        if self.lfs_need_update(ud, d):
+        if self._contains_lfs(ud, d, ud.clonedir) and self._need_lfs(ud):
            # Unpack temporary working copy, use it to run 'git checkout' to force pre-fetching
-            # of all LFS blobs needed at the srcrev.
+            # of all LFS blobs needed at the the srcrev.
            #
            # It would be nice to just do this inline here by running 'git-lfs fetch'
            # on the bare clonedir, but that operation requires a working copy on some
@@ -483,10 +458,7 @@ class Git(FetchMethod):
            logger.info("Creating tarball of git repository")
            with create_atomic(ud.fullmirror) as tfile:
-                mtime = runfetchcmd("git log --all -1 --format=%cD", d,
+                runfetchcmd("tar -czf %s ." % tfile, d, workdir=ud.clonedir)
                        quiet=True, workdir=ud.clonedir)
                runfetchcmd("tar -czf %s --owner oe:0 --group oe:0 --mtime \"%s\" ."
                        % (tfile, mtime), d, workdir=ud.clonedir)
            runfetchcmd("touch %s.done" % ud.fullmirror, d)
    def clone_shallow_local(self, ud, dest, d):
@@ -548,24 +520,13 @@ class Git(FetchMethod):
    def unpack(self, ud, destdir, d):
        """ unpack the downloaded src to destdir"""
-        subdir = ud.parm.get("subdir")
+        subdir = ud.parm.get("subpath", "")
-        subpath = ud.parm.get("subpath")
+        if subdir != "":
-        readpathspec = ""
+            readpathspec = ":%s" % subdir
-        def_destsuffix = "git/"
+            def_destsuffix = "%s/" % os.path.basename(subdir.rstrip('/'))
-
+        else:
-        if subpath:
+            readpathspec = ""
-            readpathspec = ":%s" % subpath
+            def_destsuffix = "git/"
            def_destsuffix = "%s/" % os.path.basename(subpath.rstrip('/'))
        if subdir:
            # If 'subdir' param exists, create a dir and use it as destination for unpack cmd
            if os.path.isabs(subdir):
                if not os.path.realpath(subdir).startswith(os.path.realpath(destdir)):
                    raise bb.fetch2.UnpackError("subdir argument isn't a subdirectory of unpack root %s" % destdir, ud.url)
                destdir = subdir
            else:
                destdir = os.path.join(destdir, subdir)
            def_destsuffix = ""
        destsuffix = ud.parm.get("destsuffix", def_destsuffix)
        destdir = ud.destdir = os.path.join(destdir, destsuffix)
@@ -612,7 +573,7 @@ class Git(FetchMethod):
                bb.note("Repository %s has LFS content but it is not being fetched" % (repourl))
        if not ud.nocheckout:
-            if subpath:
+            if subdir != "":
                runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.revisions[ud.names[0]], readpathspec), d,
                            workdir=destdir)
                runfetchcmd("%s checkout-index -q -f -a" % ud.basecmd, d, workdir=destdir)
@@ -661,35 +622,6 @@ class Git(FetchMethod):
            raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output))
        return output.split()[0] != "0"
    def _lfs_objects_downloaded(self, ud, d, name, wd):
        """
        Verifies whether the LFS objects for requested revisions have already been downloaded
        """
        # Bail out early if this repository doesn't use LFS
        if not self._need_lfs(ud) or not self._contains_lfs(ud, d, wd):
            return True
        # The Git LFS specification specifies ([1]) the LFS folder layout so it should be safe to check for file
        # existence.
        # [1] https://github.com/git-lfs/git-lfs/blob/main/docs/spec.md#intercepting-git
        cmd = "%s lfs ls-files -l %s" \
                % (ud.basecmd, ud.revisions[name])
        output = runfetchcmd(cmd, d, quiet=True, workdir=wd).rstrip()
        # Do not do any further matching if no objects are managed by LFS
        if not output:
            return True
        # Match all lines beginning with the hexadecimal OID
        oid_regex = re.compile("^(([a-fA-F0-9]{2})([a-fA-F0-9]{2})[A-Fa-f0-9]+)")
        for line in output.split("\n"):
            oid = re.search(oid_regex, line)
            if not oid:
                bb.warn("git lfs ls-files output '%s' did not match expected format." % line)
            if not os.path.exists(os.path.join(wd, "lfs", "objects", oid.group(2), oid.group(3), oid.group(1))):
                return False
        return True
    def _need_lfs(self, ud):
        return ud.parm.get("lfs", "1") == "1"
@@ -780,12 +712,6 @@ class Git(FetchMethod):
        """
        Compute the HEAD revision for the url
        """
        if not d.getVar("__BBSEENSRCREV"):
            raise bb.fetch2.FetchError("Recipe uses a floating tag/branch '%s' for repo '%s' without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev() (use SRCPV in PV for OE)." % (ud.unresolvedrev[name], ud.host+ud.path))
        # Ensure we mark as not cached
        bb.fetch2.get_autorev(d)
        output = self._lsremote(ud, d, "")
        # Tags of the form ^{} may not work, need to fallback to other form
        if ud.unresolvedrev[name][:5] == "refs/" or ud.usehead:
--- a/bitbake/lib/bb/fetch2/gitsm.py
+++ b/bitbake/lib/bb/fetch2/gitsm.py
@@ -88,7 +88,7 @@ class GitSM(Git):
                subrevision[m] = module_hash.split()[2]
                # Convert relative to absolute uri based on parent uri
-                if  uris[m].startswith('..') or uris[m].startswith('./'):
+                if uris[m].startswith('..'):
                    newud = copy.copy(ud)
                    newud.path = os.path.realpath(os.path.join(newud.path, uris[m]))
                    uris[m] = Git._get_repo_url(self, newud)
@@ -115,9 +115,6 @@ class GitSM(Git):
                    # This has to be a file reference
                    proto = "file"
                    url = "gitsm://" + uris[module]
            if url.endswith("{}{}".format(ud.host, ud.path)):
                raise bb.fetch2.FetchError("Submodule refers to the parent repository. This will cause deadlock situation in current version of Bitbake." \
                                           "Consider using git fetcher instead.")
            url += ';protocol=%s' % proto
            url += ";name=%s" % module
@@ -166,7 +163,7 @@ class GitSM(Git):
        else:
            self.process_submodules(ud, ud.clonedir, need_update_submodule, d)
-        if need_update_list:
+        if len(need_update_list) > 0:
            logger.debug('gitsm: Submodules requiring update: %s' % (' '.join(need_update_list)))
            return True
--- a/bitbake/lib/bb/fetch2/npm.py
+++ b/bitbake/lib/bb/fetch2/npm.py
@@ -52,13 +52,9 @@ def npm_filename(package, version):
    """Get the filename of a npm package"""
    return npm_package(package) + "-" + version + ".tgz"
-def npm_localfile(package, version=None):
+def npm_localfile(package, version):
    """Get the local filename of a npm package"""
-    if version is not None:
+    return os.path.join("npm2", npm_filename(package, version))
        filename = npm_filename(package, version)
    else:
        filename = package
    return os.path.join("npm2", filename)
 def npm_integrity(integrity):
    """
@@ -156,12 +152,12 @@ class Npm(FetchMethod):
            raise ParameterError("Invalid 'version' parameter", ud.url)
        # Extract the 'registry' part of the url
-        ud.registry = re.sub(r"^npm://", "https://", ud.url.split(";")[0])
+        ud.registry = re.sub(r"^npm://", "http://", ud.url.split(";")[0])
        # Using the 'downloadfilename' parameter as local filename
        # or the npm package name.
        if "downloadfilename" in ud.parm:
-            ud.localfile = npm_localfile(d.expand(ud.parm["downloadfilename"]))
+            ud.localfile = d.expand(ud.parm["downloadfilename"])
        else:
            ud.localfile = npm_localfile(ud.package, ud.version)
--- a/bitbake/lib/bb/fetch2/npmsw.py
+++ b/bitbake/lib/bb/fetch2/npmsw.py
@@ -30,8 +30,6 @@ from bb.fetch2.npm import npm_integrity
 from bb.fetch2.npm import npm_localfile
 from bb.fetch2.npm import npm_unpack
 from bb.utils import is_semver
 from bb.utils import lockfile
 from bb.utils import unlockfile
 def foreach_dependencies(shrinkwrap, callback=None, dev=False):
    """
@@ -88,11 +86,7 @@ class NpmShrinkWrap(FetchMethod):
            version = params.get("version", None)
            # Handle registry sources
-            if is_semver(version) and integrity:
+            if is_semver(version) and resolved and integrity:
                # Handle duplicate dependencies without url
                if not resolved:
                    return
                localfile = npm_localfile(name, version)
                uri = URI(resolved)
@@ -117,7 +111,7 @@ class NpmShrinkWrap(FetchMethod):
            # Handle http tarball sources
            elif version.startswith("http") and integrity:
-                localfile = npm_localfile(os.path.basename(version))
+                localfile = os.path.join("npm2", os.path.basename(version))
                uri = URI(version)
                uri.params["downloadfilename"] = localfile
@@ -131,8 +125,6 @@ class NpmShrinkWrap(FetchMethod):
            # Handle git sources
            elif version.startswith("git"):
                if version.startswith("github:"):
                    version = "git+https://github.com/" + version[len("github:"):]
                regex = re.compile(r"""
                    ^
                    git\+
@@ -203,9 +195,7 @@ class NpmShrinkWrap(FetchMethod):
            proxy_ud = ud.proxy.ud[proxy_url]
            proxy_d = ud.proxy.d
            proxy_ud.setup_localpath(proxy_d)
            lf = lockfile(proxy_ud.lockfile)
            returns.append(handle(proxy_ud.method, proxy_ud, proxy_d))
            unlockfile(lf)
        return returns
    def verify_donestamp(self, ud, d):
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
 """
@@ -38,7 +36,6 @@ class Osc(FetchMethod):
        # Create paths to osc checkouts
        oscdir = d.getVar("OSCDIR") or (d.getVar("DL_DIR") + "/osc")
        relpath = self._strip_leading_slashes(ud.path)
        ud.oscdir = oscdir
        ud.pkgdir = os.path.join(oscdir, ud.host)
        ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module)
@@ -46,13 +43,13 @@ class Osc(FetchMethod):
            ud.revision = ud.parm['rev']
        else:
            pv = d.getVar("PV", False)
-            rev = bb.fetch2.srcrev_internal_helper(ud, d, '')
+            rev = bb.fetch2.srcrev_internal_helper(ud, d)
            if rev:
                ud.revision = rev
            else:
                ud.revision = ""
-        ud.localfile = d.expand('%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), relpath.replace('/', '.'), ud.revision))
+        ud.localfile = d.expand('%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.path.replace('/', '.'), ud.revision))
    def _buildosccommand(self, ud, d, command):
        """
@@ -89,7 +86,7 @@ class Osc(FetchMethod):
        logger.debug2("Fetch: checking for module directory '" + ud.moddir + "'")
-        if os.access(ud.moddir, os.R_OK):
+        if os.access(os.path.join(d.getVar('OSCDIR'), ud.path, ud.module), os.R_OK):
            oscupdatecmd = self._buildosccommand(ud, d, "update")
            logger.info("Update "+ ud.url)
            # update sources there
@@ -117,23 +114,20 @@ class Osc(FetchMethod):
        Generate a .oscrc to be used for this run.
        """
-        config_path = os.path.join(ud.oscdir, "oscrc")
+        config_path = os.path.join(d.getVar('OSCDIR'), "oscrc")
        if not os.path.exists(ud.oscdir):
            bb.utils.mkdirhier(ud.oscdir)
        if (os.path.exists(config_path)):
            os.remove(config_path)
        f = open(config_path, 'w')
        proto = ud.parm.get('proto', 'https')
        f.write("[general]\n")
-        f.write("apiurl = %s://%s\n" % (proto, ud.host))
+        f.write("apisrv = %s\n" % ud.host)
        f.write("scheme = http\n")
        f.write("su-wrapper = su -c\n")
        f.write("build-root = %s\n" % d.getVar('WORKDIR'))
        f.write("urllist = %s\n" % d.getVar("OSCURLLIST"))
        f.write("extra-pkgs = gzip\n")
        f.write("\n")
-        f.write("[%s://%s]\n" % (proto, ud.host))
+        f.write("[%s]\n" % ud.host)
        f.write("user = %s\n" % ud.parm["user"])
        f.write("pass = %s\n" % ud.parm["pswd"])
        f.close()
--- a/bitbake/lib/bb/fetch2/ssh.py
+++ b/bitbake/lib/bb/fetch2/ssh.py
@@ -32,7 +32,6 @@ IETF secsh internet draft:
 import re, os
 from bb.fetch2 import check_network_access, FetchMethod, ParameterError, runfetchcmd
 import urllib
 __pattern__ = re.compile(r'''
@@ -71,7 +70,6 @@ class SSH(FetchMethod):
                "git:// prefix with protocol=ssh", urldata.url)
        m = __pattern__.match(urldata.url)
        path = m.group('path')
        path = urllib.parse.unquote(path)
        host = m.group('host')
        urldata.localpath = os.path.join(d.getVar('DL_DIR'),
                os.path.basename(os.path.normpath(path)))
@@ -98,11 +96,6 @@ class SSH(FetchMethod):
            fr += '@%s' % host
        else:
            fr = host
        if path[0] != '~':
            path = '/%s' % path
        path = urllib.parse.unquote(path)
        fr += ':%s' % path
        cmd = 'scp -B -r %s %s %s/' % (
@@ -115,43 +108,3 @@ class SSH(FetchMethod):
        runfetchcmd(cmd, d)
    def checkstatus(self, fetch, urldata, d):
        """
        Check the status of the url
        """
        m = __pattern__.match(urldata.url)
        path = m.group('path')
        host = m.group('host')
        port = m.group('port')
        user = m.group('user')
        password = m.group('pass')
        if port:
            portarg = '-P %s' % port
        else:
            portarg = ''
        if user:
            fr = user
            if password:
                fr += ':%s' % password
            fr += '@%s' % host
        else:
            fr = host
        if path[0] != '~':
            path = '/%s' % path
        path = urllib.parse.unquote(path)
        cmd = 'ssh -o BatchMode=true %s %s [ -f %s ]' % (
            portarg,
            fr,
            path
        )
        check_network_access(d, cmd, urldata.url)
        if runfetchcmd(cmd, d):
            return True
        return False
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -112,17 +112,7 @@ class Wget(FetchMethod):
            fetchcmd += " -O %s" % shlex.quote(localpath)
        if ud.user and ud.pswd:
-            fetchcmd += " --auth-no-challenge"
+            fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (ud.user, ud.pswd)
            if ud.parm.get("redirectauth", "1") == "1":
                # An undocumented feature of wget is that if the
                # username/password are specified on the URI, wget will only
                # send the Authorization header to the first host and not to
                # any hosts that it is redirected to.  With the increasing
                # usage of temporary AWS URLs, this difference now matters as
                # AWS will reject any request that has authentication both in
                # the query parameters (from the redirect) and in the
                # Authorization header.
                fetchcmd += " --user=%s --password=%s" % (ud.user, ud.pswd)
        uri = ud.url.split(";")[0]
        if os.path.exists(ud.localpath):
@@ -228,7 +218,7 @@ class Wget(FetchMethod):
                        # We let the request fail and expect it to be
                        # tried once more ("try_again" in check_status()),
                        # with the dead connection removed from the cache.
-                        # If it still fails, we give up, which can happen for bad
+                        # If it still fails, we give up, which can happend for bad
                        # HTTP proxy settings.
                        fetch.connection_cache.remove_connection(h.host, h.port)
                    raise urllib.error.URLError(err)
@@ -315,7 +305,15 @@ class Wget(FetchMethod):
        # Avoid tramping the environment too much by using bb.utils.environment
        # to scope the changes to the build_opener request, which is when the
        # environment lookups happen.
-        newenv = bb.fetch2.get_fetcher_environment(d)
+        newenv = {}
        for name in bb.fetch2.FETCH_EXPORT_VARS:
            value = d.getVar(name)
            if not value:
                origenv = d.getVar("BB_ORIGENV")
                if origenv:
                    value = origenv.getVar(name)
            if value:
                newenv[name] = value
        with bb.utils.environment(**newenv):
            import ssl
@@ -585,7 +583,7 @@ class Wget(FetchMethod):
        # src.rpm extension was added only for rpm package. Can be removed if the rpm
        # packaged will always be considered as having to be manually upgraded
-        psuffix_regex = r"(tar\.\w+|tgz|zip|xz|rpm|bz2|orig\.tar\.\w+|src\.tar\.\w+|src\.tgz|svnr\d+\.tar\.\w+|stable\.tar\.\w+|src\.rpm)"
+        psuffix_regex = r"(tar\.gz|tgz|tar\.bz2|zip|xz|tar\.lz|rpm|bz2|orig\.tar\.gz|tar\.xz|src\.tar\.gz|src\.tgz|svnr\d+\.tar\.bz2|stable\.tar\.gz|src\.rpm)"
        # match name, version and archive type of a package
        package_regex_comp = re.compile(r"(?P<name>%s?\.?v?)(?P<pver>%s)(?P<arch>%s)?[\.-](?P<type>%s$)"
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -127,7 +127,7 @@ def create_bitbake_parser():
                      help="Execute tasks from a specific .bb recipe directly. WARNING: Does "
                           "not handle any dependencies from other recipes.")
-    parser.add_option("-k", "--continue", action="store_false", dest="halt", default=True,
+    parser.add_option("-k", "--continue", action="store_false", dest="abort", default=True,
                      help="Continue as much as possible after an error. While the target that "
                           "failed and anything depending on it cannot be built, as much as "
                           "possible will be built before stopping.")
--- a/bitbake/lib/bb/monitordisk.py
+++ b/bitbake/lib/bb/monitordisk.py
@@ -76,12 +76,7 @@ def getDiskData(BBDirs):
            return None
        action = pathSpaceInodeRe.group(1)
-        if action == "ABORT":
+        if action not in ("ABORT", "STOPTASKS", "WARN"):
            # Emit a deprecation warning
            logger.warnonce("The BB_DISKMON_DIRS \"ABORT\" action has been renamed to \"HALT\", update configuration")
            action = "HALT"
        if action not in ("HALT", "STOPTASKS", "WARN"):
            printErr("Unknown disk space monitor action: %s" % action)
            return None
@@ -182,7 +177,7 @@ class diskMonitor:
                    # use them to avoid printing too many warning messages
                    self.preFreeS = {}
                    self.preFreeI = {}
-                    # This is for STOPTASKS and HALT, to avoid printing the message
+                    # This is for STOPTASKS and ABORT, to avoid printing the message
                    # repeatedly while waiting for the tasks to finish
                    self.checked = {}
                    for k in self.devDict:
@@ -224,8 +219,8 @@ class diskMonitor:
                        self.checked[k] = True
                        rq.finish_runqueue(False)
                        bb.event.fire(bb.event.DiskFull(dev, 'disk', freeSpace, path), self.configuration)
-                    elif action == "HALT" and not self.checked[k]:
+                    elif action == "ABORT" and not self.checked[k]:
-                        logger.error("Immediately halt since the disk space monitor action is \"HALT\"!")
+                        logger.error("Immediately abort since the disk space monitor action is \"ABORT\"!")
                        self.checked[k] = True
                        rq.finish_runqueue(True)
                        bb.event.fire(bb.event.DiskFull(dev, 'disk', freeSpace, path), self.configuration)
@@ -234,10 +229,9 @@ class diskMonitor:
                freeInode = st.f_favail
                if minInode and freeInode < minInode:
-                    # Some filesystems use dynamic inodes so can't run out.
+                    # Some filesystems use dynamic inodes so can't run out
-                    # This is reported by the inode count being 0 (btrfs) or the free
+                    # (e.g. btrfs). This is reported by the inode count being 0.
-                    # inode count being -1 (cephfs).
+                    if st.f_files == 0:
                    if st.f_files == 0 or st.f_favail == -1:
                        self.devDict[k][2] = None
                        continue
                    # Always show warning, the self.checked would always be False if the action is WARN
@@ -251,8 +245,8 @@ class diskMonitor:
                        self.checked[k] = True
                        rq.finish_runqueue(False)
                        bb.event.fire(bb.event.DiskFull(dev, 'inode', freeInode, path), self.configuration)
-                    elif action  == "HALT" and not self.checked[k]:
+                    elif action  == "ABORT" and not self.checked[k]:
-                        logger.error("Immediately halt since the disk space monitor action is \"HALT\"!")
+                        logger.error("Immediately abort since the disk space monitor action is \"ABORT\"!")
                        self.checked[k] = True
                        rq.finish_runqueue(True)
                        bb.event.fire(bb.event.DiskFull(dev, 'inode', freeInode, path), self.configuration)
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -30,9 +30,7 @@ class BBLogFormatter(logging.Formatter):
    PLAIN = logging.INFO + 1
    VERBNOTE = logging.INFO + 2
    ERROR = logging.ERROR
    ERRORONCE = logging.ERROR - 1
    WARNING = logging.WARNING
    WARNONCE = logging.WARNING - 1
    CRITICAL = logging.CRITICAL
    levelnames = {
@@ -44,9 +42,7 @@ class BBLogFormatter(logging.Formatter):
        PLAIN  : '',
        VERBNOTE: 'NOTE',
        WARNING : 'WARNING',
        WARNONCE : 'WARNING',
        ERROR   : 'ERROR',
        ERRORONCE   : 'ERROR',
        CRITICAL: 'ERROR',
    }
@@ -62,9 +58,7 @@ class BBLogFormatter(logging.Formatter):
        PLAIN   : BASECOLOR,
        VERBNOTE: BASECOLOR,
        WARNING : YELLOW,
        WARNONCE : YELLOW,
        ERROR   : RED,
        ERRORONCE : RED,
        CRITICAL: RED,
    }
@@ -127,22 +121,6 @@ class BBLogFilter(object):
            return True
        return False
 class LogFilterShowOnce(logging.Filter):
    def __init__(self):
        self.seen_warnings = set()
        self.seen_errors = set()
    def filter(self, record):
        if record.levelno == bb.msg.BBLogFormatter.WARNONCE:
            if record.msg in self.seen_warnings:
                return False
            self.seen_warnings.add(record.msg)
        if record.levelno == bb.msg.BBLogFormatter.ERRORONCE:
            if record.msg in self.seen_errors:
                return False
            self.seen_errors.add(record.msg)
        return True
 class LogFilterGEQLevel(logging.Filter):
    def __init__(self, level):
        self.strlevel = str(level)
@@ -228,7 +206,6 @@ def logger_create(name, output=sys.stderr, level=logging.INFO, preserve_handlers
    """Standalone logger creation function"""
    logger = logging.getLogger(name)
    console = logging.StreamHandler(output)
    console.addFilter(bb.msg.LogFilterShowOnce())
    format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
    if color == 'always' or (color == 'auto' and output.isatty()):
        format.enable_color()
@@ -316,17 +293,10 @@ def setLoggingConfig(defaultconfig, userconfigfile=None):
    # Convert all level parameters to integers in case users want to use the
    # bitbake defined level names
-    for name, h in logconfig["handlers"].items():
+    for h in logconfig["handlers"].values():
        if "level" in h:
            h["level"] = bb.msg.stringToLevel(h["level"])
        # Every handler needs its own instance of the once filter.
        once_filter_name = name + ".showonceFilter"
        logconfig.setdefault("filters", {})[once_filter_name] = {
            "()": "bb.msg.LogFilterShowOnce",
        }
        h.setdefault("filters", []).append(once_filter_name)
    for l in logconfig["loggers"].values():
        if "level" in l:
            l["level"] = bb.msg.stringToLevel(l["level"])
--- a/bitbake/lib/bb/parse/init.py
+++ b/bitbake/lib/bb/parse/init.py
@@ -49,23 +49,20 @@ class SkipPackage(SkipRecipe):
 __mtime_cache = {}
 def cached_mtime(f):
    if f not in __mtime_cache:
-        res = os.stat(f)
+        __mtime_cache[f] = os.stat(f)[stat.ST_MTIME]
        __mtime_cache[f] = (res.st_mtime_ns, res.st_size, res.st_ino)
    return __mtime_cache[f]
 def cached_mtime_noerror(f):
    if f not in __mtime_cache:
        try:
-            res = os.stat(f)
+            __mtime_cache[f] = os.stat(f)[stat.ST_MTIME]
            __mtime_cache[f] = (res.st_mtime_ns, res.st_size, res.st_ino)
        except OSError:
            return 0
    return __mtime_cache[f]
 def update_mtime(f):
    try:
-        res = os.stat(f)
+        __mtime_cache[f] = os.stat(f)[stat.ST_MTIME]
        __mtime_cache[f] = (res.st_mtime_ns, res.st_size, res.st_ino)
    except OSError:
        if f in __mtime_cache:
            del __mtime_cache[f]
@@ -116,8 +113,6 @@ def init(fn, data):
            return h['init'](data)
 def init_parser(d):
    if hasattr(bb.parse, "siggen"):
        bb.parse.siggen.exit()
    bb.parse.siggen = bb.siggen.init(d)
 def resolve_file(fn, d):
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -130,10 +130,6 @@ class DataNode(AstNode):
        else:
            val = groupd["value"]
        if ":append" in key or ":remove" in key or ":prepend" in key:
            if op in ["append", "prepend", "postdot", "predot", "ques"]:
                bb.warn(key + " " + groupd[op] + " is not a recommended operator combination, please replace it.")
        flag = None
        if 'flag' in groupd and groupd['flag'] is not None:
            flag = groupd['flag']
@@ -223,7 +219,7 @@ class ExportFuncsNode(AstNode):
            for flag in [ "func", "python" ]:
                if data.getVarFlag(calledfunc, flag, False):
                    data.setVarFlag(func, flag, data.getVarFlag(calledfunc, flag, False))
-            for flag in ["dirs", "cleandirs", "fakeroot"]:
+            for flag in [ "dirs" ]:
                if data.getVarFlag(func, flag, False):
                    data.setVarFlag(calledfunc, flag, data.getVarFlag(func, flag, False))
            data.setVarFlag(func, "filename", "autogenerated")
@@ -333,10 +329,6 @@ def runAnonFuncs(d):
 def finalize(fn, d, variant = None):
    saved_handlers = bb.event.get_handlers().copy()
    try:
        # Found renamed variables. Exit immediately
        if d.getVar("_FAILPARSINGERRORHANDLED", False) == True:
            raise bb.BBHandledException()
        for var in d.getVar('__BBHANDLERS', False) or []:
            # try to add the handler
            handlerfn = d.getVarFlag(var, "filename", False)
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -178,10 +178,10 @@ def feeder(lineno, s, fn, root, statements, eof=False):
    if s and s[0] == '#':
        if len(__residue__) != 0 and __residue__[0][0] != "#":
-            bb.fatal("There is a comment on line %s of file %s:\n'''\n%s\n'''\nwhich is in the middle of a multiline expression. This syntax is invalid, please correct it." % (lineno, fn, s))
+            bb.fatal("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s))
    if len(__residue__) != 0 and __residue__[0][0] == "#" and (not s or s[0] != "#"):
-        bb.fatal("There is a confusing multiline partially commented expression on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (lineno - len(__residue__), fn, "\n".join(__residue__)))
+        bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s))
    if s and s[-1] == '\\':
        __residue__.append(s[:-1])
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -48,7 +48,10 @@ __unset_regexp__ = re.compile( r"unset\s+([a-zA-Z0-9\-_+.${}/~]+)$" )
 __unset_flag_regexp__ = re.compile( r"unset\s+([a-zA-Z0-9\-_+.${}/~]+)\[([a-zA-Z0-9\-_+.]+)\]$" )
 def init(data):
-    return
+    topdir = data.getVar('TOPDIR', False)
    if not topdir:
        data.setVar('TOPDIR', os.getcwd())
 def supports(fn, d):
    return fn[-5:] == ".conf"
@@ -125,21 +128,16 @@ def handle(fn, data, include):
            s = f.readline()
            if not s:
                break
            origlineno = lineno
            origline = s
            w = s.strip()
            # skip empty lines
            if not w:
                continue
            s = s.rstrip()
            while s[-1] == '\\':
-                line = f.readline()
+                s2 = f.readline().rstrip()
                origline += line
                s2 = line.rstrip()
                lineno = lineno + 1
                if (not s2 or s2 and s2[0] != "#") and s[0] == "#" :
-                    bb.fatal("There is a confusing multiline, partially commented expression starting on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (origlineno, fn, origline))
+                    bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s))
                s = s[:-1] + s2
            # skip comments
            if s[0] == '#':
@@ -152,6 +150,8 @@ def handle(fn, data, include):
    if oldfile:
        data.setVar('FILE', oldfile)
    f.close()
    for f in confFilters:
        f(fn, data)
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -63,7 +63,7 @@ class SQLTable(collections.abc.MutableMapping):
            """
            Decorator that starts a database transaction and creates a database
            cursor for performing queries. If no exception is thrown, the
-            database results are committed. If an exception occurs, the database
+            database results are commited. If an exception occurs, the database
            is rolled back. In all cases, the cursor is closed after the
            function ends.
@@ -208,7 +208,7 @@ class SQLTable(collections.abc.MutableMapping):
    def __lt__(self, other):
        if not isinstance(other, Mapping):
-            raise NotImplementedError()
+            raise NotImplemented
        return len(self) < len(other)
--- a/bitbake/lib/bb/process.py
+++ b/bitbake/lib/bb/process.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -144,7 +142,7 @@ def _logged_communicate(pipe, log, input, extrafiles):
        while pipe.poll() is None:
            read_all_pipes(log, rin, outdata, errdata)
-        # Process closed, drain all pipes...
+        # Pocess closed, drain all pipes...
        read_all_pipes(log, rin, outdata, errdata)
    finally:
        log.flush()
--- a/bitbake/lib/bb/progress.py
+++ b/bitbake/lib/bb/progress.py
@@ -148,7 +148,7 @@ class MultiStageProgressReporter:
    for tasks made up of python code spread across multiple
    classes / functions - the progress reporter object can
    be passed around or stored at the object level and calls
-    to next_stage() and update() made wherever needed.
+    to next_stage() and update() made whereever needed.
    """
    def __init__(self, d, stage_weights, debug=False):
        """
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -396,8 +396,8 @@ def getRuntimeProviders(dataCache, rdepend):
        return rproviders
    # Only search dynamic packages if we can't find anything in other variables
-    for pat_key in dataCache.packages_dynamic:
+    for pattern in dataCache.packages_dynamic:
-        pattern = pat_key.replace(r'+', r"\+")
+        pattern = pattern.replace(r'+', r"\+")
        if pattern in regexp_cache:
            regexp = regexp_cache[pattern]
        else:
@@ -408,7 +408,7 @@ def getRuntimeProviders(dataCache, rdepend):
                raise
            regexp_cache[pattern] = regexp
        if regexp.match(rdepend):
-            rproviders += dataCache.packages_dynamic[pat_key]
+            rproviders += dataCache.packages_dynamic[pattern]
            logger.debug("Assuming %s is a dynamic package, but it may not exist" % rdepend)
    return rproviders
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -24,7 +24,6 @@ import pickle
 from multiprocessing import Process
 import shlex
 import pprint
 import time
 bblogger = logging.getLogger("BitBake")
 logger = logging.getLogger("BitBake.RunQueue")
@@ -160,67 +159,6 @@ class RunQueueScheduler(object):
                self.buildable.append(tid)
        self.rev_prio_map = None
        self.is_pressure_usable()
    def is_pressure_usable(self):
        """
        If monitoring pressure, return True if pressure files can be open and read. For example
        openSUSE /proc/pressure/* files have readable file permissions but when read the error EOPNOTSUPP (Operation not supported)
        is returned.
        """
        if self.rq.max_cpu_pressure or self.rq.max_io_pressure or self.rq.max_memory_pressure:
            try:
                with open("/proc/pressure/cpu") as cpu_pressure_fds, \
                    open("/proc/pressure/io") as io_pressure_fds, \
                    open("/proc/pressure/memory") as memory_pressure_fds:
                    self.prev_cpu_pressure = cpu_pressure_fds.readline().split()[4].split("=")[1]
                    self.prev_io_pressure = io_pressure_fds.readline().split()[4].split("=")[1]
                    self.prev_memory_pressure = memory_pressure_fds.readline().split()[4].split("=")[1]
                    self.prev_pressure_time = time.time()
                self.check_pressure = True
            except:
                bb.note("The /proc/pressure files can't be read. Continuing build without monitoring pressure")
                self.check_pressure = False
        else:
            self.check_pressure = False
    def exceeds_max_pressure(self):
        """
        Monitor the difference in total pressure at least once per second, if
        BB_PRESSURE_MAX_{CPU|IO|MEMORY} are set, return True if above threshold.
        """
        if self.check_pressure:
            with open("/proc/pressure/cpu") as cpu_pressure_fds, \
                open("/proc/pressure/io") as io_pressure_fds, \
                open("/proc/pressure/memory") as memory_pressure_fds:
                # extract "total" from /proc/pressure/{cpu|io}
                curr_cpu_pressure = cpu_pressure_fds.readline().split()[4].split("=")[1]
                curr_io_pressure = io_pressure_fds.readline().split()[4].split("=")[1]
                curr_memory_pressure = memory_pressure_fds.readline().split()[4].split("=")[1]
                now = time.time()
                tdiff = now - self.prev_pressure_time
                psi_accumulation_interval = 1.0
                cpu_pressure = (float(curr_cpu_pressure) - float(self.prev_cpu_pressure)) / tdiff
                io_pressure = (float(curr_io_pressure) - float(self.prev_io_pressure)) / tdiff
                memory_pressure = (float(curr_memory_pressure) - float(self.prev_memory_pressure)) / tdiff
                exceeds_cpu_pressure =  self.rq.max_cpu_pressure and cpu_pressure > self.rq.max_cpu_pressure
                exceeds_io_pressure =  self.rq.max_io_pressure and io_pressure > self.rq.max_io_pressure
                exceeds_memory_pressure =  self.rq.max_memory_pressure and memory_pressure > self.rq.max_memory_pressure
                if tdiff > psi_accumulation_interval:
                    self.prev_cpu_pressure = curr_cpu_pressure
                    self.prev_io_pressure = curr_io_pressure
                    self.prev_memory_pressure = curr_memory_pressure
                    self.prev_pressure_time = now
            pressure_state = (exceeds_cpu_pressure, exceeds_io_pressure, exceeds_memory_pressure)
            pressure_values = (round(cpu_pressure,1), self.rq.max_cpu_pressure, round(io_pressure,1), self.rq.max_io_pressure, round(memory_pressure,1), self.rq.max_memory_pressure)
            if hasattr(self, "pressure_state") and pressure_state != self.pressure_state:
                bb.note("Pressure status changed to CPU: %s, IO: %s, Mem: %s (CPU: %s/%s, IO: %s/%s, Mem: %s/%s) - using %s/%s bitbake threads" % (pressure_state + pressure_values + (len(self.rq.runq_running.difference(self.rq.runq_complete)), self.rq.number_tasks)))
            self.pressure_state = pressure_state
            return (exceeds_cpu_pressure or exceeds_io_pressure or exceeds_memory_pressure)
        return False
    def next_buildable_task(self):
        """
@@ -234,12 +172,6 @@ class RunQueueScheduler(object):
        if not buildable:
            return None
        # Bitbake requires that at least one task be active. Only check for pressure if
        # this is the case, otherwise the pressure limitation could result in no tasks
        # being active and no new tasks started thereby, at times, breaking the scheduler.
        if self.rq.stats.active and self.exceeds_max_pressure():
            return None
        # Filter out tasks that have a max number of threads that have been exceeded
        skip_buildable = {}
        for running in self.rq.runq_running.difference(self.rq.runq_complete):
@@ -453,9 +385,10 @@ class RunQueueData:
        self.rq = rq
        self.warn_multi_bb = False
-        self.multi_provider_allowed = (cfgData.getVar("BB_MULTI_PROVIDER_ALLOWED") or "").split()
+        self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST") or ""
-        self.setscene_ignore_tasks = get_setscene_enforce_ignore_tasks(cfgData, targets)
+        self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split()
-        self.setscene_ignore_tasks_checked = False
+        self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData, targets)
        self.setscenewhitelist_checked = False
        self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1")
        self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter()
@@ -553,7 +486,7 @@ class RunQueueData:
                            msgs.append("  Task %s (dependent Tasks %s)\n" % (dep, self.runq_depends_names(self.runtaskentries[dep].depends)))
                        msgs.append("\n")
                    if len(valid_chains) > 10:
-                        msgs.append("Halted dependency loops search after 10 matches.\n")
+                        msgs.append("Aborted dependency loops search after 10 matches.\n")
                        raise TooManyLoops
                    continue
                scan = False
@@ -614,7 +547,7 @@ class RunQueueData:
                        next_points.append(revdep)
                        task_done[revdep] = True
            endpoints = next_points
-            if not next_points:
+            if len(next_points) == 0:
                break
        # Circular dependency sanity check
@@ -656,7 +589,7 @@ class RunQueueData:
        found = False
        for mc in self.taskData:
-            if taskData[mc].taskentries:
+            if len(taskData[mc].taskentries) > 0:
                found = True
                break
        if not found:
@@ -840,7 +773,7 @@ class RunQueueData:
        # Find the dependency chain endpoints
        endpoints = set()
        for tid in self.runtaskentries:
-            if not deps[tid]:
+            if len(deps[tid]) == 0:
                endpoints.add(tid)
        # Iterate the chains collating dependencies
        while endpoints:
@@ -851,11 +784,11 @@ class RunQueueData:
                    cumulativedeps[dep].update(cumulativedeps[tid])
                    if tid in deps[dep]:
                        deps[dep].remove(tid)
-                    if not deps[dep]:
+                    if len(deps[dep]) == 0:
                        next.add(dep)
            endpoints = next
        #for tid in deps:
-        #    if deps[tid]:
+        #    if len(deps[tid]) != 0:
        #        bb.warn("Sanity test failure, dependencies left for %s (%s)" % (tid, deps[tid]))
        # Loop here since recrdeptasks can depend upon other recrdeptasks and we have to
@@ -1023,7 +956,7 @@ class RunQueueData:
                del self.runtaskentries[tid]
        if self.cooker.configuration.runall:
-            if not self.runtaskentries:
+            if len(self.runtaskentries) == 0:
                bb.msg.fatal("RunQueue", "Could not find any tasks with the tasknames %s to run within the recipes of the taskgraphs of the targets %s" % (str(self.cooker.configuration.runall), str(self.targets)))
        self.init_progress_reporter.next_stage()
@@ -1048,7 +981,7 @@ class RunQueueData:
                    delcount.add(tid)
                    del self.runtaskentries[tid]
-            if not self.runtaskentries:
+            if len(self.runtaskentries) == 0:
                bb.msg.fatal("RunQueue", "Could not find any tasks with the tasknames %s to run within the taskgraphs of the targets %s" % (str(self.cooker.configuration.runonly), str(self.targets)))
        #
@@ -1056,8 +989,8 @@ class RunQueueData:
        #
        # Check to make sure we still have tasks to run
-        if not self.runtaskentries:
+        if len(self.runtaskentries) == 0:
-            if not taskData[''].halt:
+            if not taskData[''].abort:
                bb.msg.fatal("RunQueue", "All buildable tasks have been run but the build is incomplete (--continue mode). Errors for the tasks that failed will have been printed above.")
            else:
                bb.msg.fatal("RunQueue", "No active tasks and not in --continue mode?! Please report this bug.")
@@ -1080,7 +1013,7 @@ class RunQueueData:
        endpoints = []
        for tid in self.runtaskentries:
            revdeps = self.runtaskentries[tid].revdeps
-            if not revdeps:
+            if len(revdeps) == 0:
                endpoints.append(tid)
            for dep in revdeps:
                if dep in self.runtaskentries[tid].depends:
@@ -1116,7 +1049,7 @@ class RunQueueData:
            for prov in prov_list:
                if len(prov_list[prov]) < 2:
                    continue
-                if prov in self.multi_provider_allowed:
+                if prov in self.multi_provider_whitelist:
                    continue
                seen_pn = []
                # If two versions of the same PN are being built its fatal, we don't support it.
@@ -1126,12 +1059,12 @@ class RunQueueData:
                        seen_pn.append(pn)
                    else:
                        bb.fatal("Multiple versions of %s are due to be built (%s). Only one version of a given PN should be built in any given build. You likely need to set PREFERRED_VERSION_%s to select the correct version or don't depend on multiple versions." % (pn, " ".join(prov_list[prov]), pn))
-                msgs = ["Multiple .bb files are due to be built which each provide %s:\n  %s" % (prov, "\n  ".join(prov_list[prov]))]
+                msg = "Multiple .bb files are due to be built which each provide %s:\n  %s" % (prov, "\n  ".join(prov_list[prov]))
                #
                # Construct a list of things which uniquely depend on each provider
                # since this may help the user figure out which dependency is triggering this warning
                #
-                msgs.append("\nA list of tasks depending on these providers is shown and may help explain where the dependency comes from.")
+                msg += "\nA list of tasks depending on these providers is shown and may help explain where the dependency comes from."
                deplist = {}
                commondeps = None
                for provfn in prov_list[prov]:
@@ -1151,12 +1084,12 @@ class RunQueueData:
                        commondeps &= deps
                    deplist[provfn] = deps
                for provfn in deplist:
-                    msgs.append("\n%s has unique dependees:\n  %s" % (provfn, "\n  ".join(deplist[provfn] - commondeps)))
+                    msg += "\n%s has unique dependees:\n  %s" % (provfn, "\n  ".join(deplist[provfn] - commondeps))
                #
                # Construct a list of provides and runtime providers for each recipe
                # (rprovides has to cover RPROVIDES, PACKAGES, PACKAGES_DYNAMIC)
                #
-                msgs.append("\nIt could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful.")
+                msg += "\nIt could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful."
                provide_results = {}
                rprovide_results = {}
                commonprovs = None
@@ -1183,18 +1116,29 @@ class RunQueueData:
                    else:
                        commonrprovs &= rprovides
                    rprovide_results[provfn] = rprovides
-                #msgs.append("\nCommon provides:\n  %s" % ("\n  ".join(commonprovs)))
+                #msg += "\nCommon provides:\n  %s" % ("\n  ".join(commonprovs))
-                #msgs.append("\nCommon rprovides:\n  %s" % ("\n  ".join(commonrprovs)))
+                #msg += "\nCommon rprovides:\n  %s" % ("\n  ".join(commonrprovs))
                for provfn in prov_list[prov]:
-                    msgs.append("\n%s has unique provides:\n  %s" % (provfn, "\n  ".join(provide_results[provfn] - commonprovs)))
+                    msg += "\n%s has unique provides:\n  %s" % (provfn, "\n  ".join(provide_results[provfn] - commonprovs))
-                    msgs.append("\n%s has unique rprovides:\n  %s" % (provfn, "\n  ".join(rprovide_results[provfn] - commonrprovs)))
+                    msg += "\n%s has unique rprovides:\n  %s" % (provfn, "\n  ".join(rprovide_results[provfn] - commonrprovs))
                if self.warn_multi_bb:
-                    logger.verbnote("".join(msgs))
+                    logger.verbnote(msg)
                else:
-                    logger.error("".join(msgs))
+                    logger.error(msg)
        self.init_progress_reporter.next_stage()
        # Create a whitelist usable by the stamp checks
        self.stampfnwhitelist = {}
        for mc in self.taskData:
            self.stampfnwhitelist[mc] = []
            for entry in self.stampwhitelist.split():
                if entry not in self.taskData[mc].build_targets:
                    continue
                fn = self.taskData.build_targets[entry][0]
                self.stampfnwhitelist[mc].append(fn)
        self.init_progress_reporter.next_stage()
        # Iterate over the task list looking for tasks with a 'setscene' function
@@ -1242,9 +1186,9 @@ class RunQueueData:
        # Iterate over the task list and call into the siggen code
        dealtwith = set()
        todeal = set(self.runtaskentries)
-        while todeal:
+        while len(todeal) > 0:
            for tid in todeal.copy():
-                if not (self.runtaskentries[tid].depends - dealtwith):
+                if len(self.runtaskentries[tid].depends - dealtwith) == 0:
                    dealtwith.add(tid)
                    todeal.remove(tid)
                    self.prepare_task_hash(tid)
@@ -1283,6 +1227,7 @@ class RunQueue:
        self.cfgData = cfgData
        self.rqdata = RunQueueData(self, cooker, cfgData, dataCaches, taskData, targets)
        self.stamppolicy = cfgData.getVar("BB_STAMP_POLICY") or "perfile"
        self.hashvalidate = cfgData.getVar("BB_HASHCHECK_FUNCTION") or None
        self.depvalidate = cfgData.getVar("BB_SETSCENE_DEPVALID") or None
@@ -1411,6 +1356,14 @@ class RunQueue:
        if taskname is None:
            taskname = tn
        if self.stamppolicy == "perfile":
            fulldeptree = False
        else:
            fulldeptree = True
            stampwhitelist = []
            if self.stamppolicy == "whitelist":
                stampwhitelist = self.rqdata.stampfnwhitelist[mc]
        stampfile = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn)
        # If the stamp is missing, it's not current
@@ -1442,7 +1395,7 @@ class RunQueue:
                    continue
                if t3 and t3 > t2:
                    continue
-                if fn == fn2:
+                if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist):
                    if not t2:
                        logger.debug2('Stampfile %s does not exist', stampfile2)
                        iscurrent = False
@@ -1492,7 +1445,7 @@ class RunQueue:
        """
        Run the tasks in a queue prepared by rqdata.prepare()
        Upon failure, optionally try to recover the build using any alternate providers
-        (if the halt on failure configuration option isn't set)
+        (if the abort on failure configuration option isn't set)
        """
        retval = True
@@ -1545,10 +1498,10 @@ class RunQueue:
            self.rqexe = RunQueueExecute(self)
            # If we don't have any setscene functions, skip execution
-            if not self.rqdata.runq_setscene_tids:
+            if len(self.rqdata.runq_setscene_tids) == 0:
                logger.info('No setscene tasks')
                for tid in self.rqdata.runtaskentries:
-                    if not self.rqdata.runtaskentries[tid].depends:
+                    if len(self.rqdata.runtaskentries[tid].depends) == 0:
                        self.rqexe.setbuildable(tid)
                    self.rqexe.tasks_notcovered.add(tid)
                self.rqexe.sqdone = True
@@ -1742,7 +1695,7 @@ class RunQueue:
            (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
            pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
            h = self.rqdata.runtaskentries[tid].hash
-            matches = bb.siggen.find_siginfo(pn, taskname, [], self.cooker.databuilder.mcdata[mc])
+            matches = bb.siggen.find_siginfo(pn, taskname, [], self.cfgData)
            match = None
            for m in matches:
                if h in m:
@@ -1767,9 +1720,6 @@ class RunQueueExecute:
        self.number_tasks = int(self.cfgData.getVar("BB_NUMBER_THREADS") or 1)
        self.scheduler = self.cfgData.getVar("BB_SCHEDULER") or "speed"
        self.max_cpu_pressure = self.cfgData.getVar("BB_PRESSURE_MAX_CPU")
        self.max_io_pressure = self.cfgData.getVar("BB_PRESSURE_MAX_IO")
        self.max_memory_pressure = self.cfgData.getVar("BB_PRESSURE_MAX_MEMORY")
        self.sq_buildable = set()
        self.sq_running = set()
@@ -1804,29 +1754,6 @@ class RunQueueExecute:
        if self.number_tasks <= 0:
             bb.fatal("Invalid BB_NUMBER_THREADS %s" % self.number_tasks)
        lower_limit = 1.0
        upper_limit = 1000000.0
        if self.max_cpu_pressure:
            self.max_cpu_pressure = float(self.max_cpu_pressure)
            if self.max_cpu_pressure < lower_limit:
                bb.fatal("Invalid BB_PRESSURE_MAX_CPU %s, minimum value is %s." % (self.max_cpu_pressure, lower_limit))
            if self.max_cpu_pressure > upper_limit:
                bb.warn("Your build will be largely unregulated since BB_PRESSURE_MAX_CPU is set to %s. It is very unlikely that such high pressure will be experienced." % (self.max_cpu_pressure))
        if self.max_io_pressure:
            self.max_io_pressure = float(self.max_io_pressure)
            if self.max_io_pressure < lower_limit:
                bb.fatal("Invalid BB_PRESSURE_MAX_IO %s, minimum value is %s." % (self.max_io_pressure, lower_limit))
            if self.max_io_pressure > upper_limit:
                bb.warn("Your build will be largely unregulated since BB_PRESSURE_MAX_IO is set to %s. It is very unlikely that such high pressure will be experienced." % (self.max_io_pressure))
        if self.max_memory_pressure:
            self.max_memory_pressure = float(self.max_memory_pressure)
            if self.max_memory_pressure < lower_limit:
                bb.fatal("Invalid BB_PRESSURE_MAX_MEMORY %s, minimum value is %s." % (self.max_memory_pressure, lower_limit))
            if self.max_memory_pressure > upper_limit:
                bb.warn("Your build will be largely unregulated since BB_PRESSURE_MAX_MEMORY is set to %s. It is very unlikely that such high pressure will be experienced." % (self.max_io_pressure))
        # List of setscene tasks which we've covered
        self.scenequeue_covered = set()
        # List of tasks which are covered (including setscene ones)
@@ -1851,7 +1778,7 @@ class RunQueueExecute:
            bb.fatal("Invalid scheduler '%s'.  Available schedulers: %s" %
                     (self.scheduler, ", ".join(obj.name for obj in schedulers)))
-        #if self.rqdata.runq_setscene_tids:
+        #if len(self.rqdata.runq_setscene_tids) > 0:
        self.sqdata = SQData()
        build_scenequeue_data(self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self)
@@ -1892,7 +1819,7 @@ class RunQueueExecute:
                # worker must have died?
                pass
-        if self.failed_tids:
+        if len(self.failed_tids) != 0:
            self.rq.state = runQueueFailed
            return
@@ -1908,7 +1835,7 @@ class RunQueueExecute:
            self.rq.read_workers()
            return self.rq.active_fds()
-        if self.failed_tids:
+        if len(self.failed_tids) != 0:
            self.rq.state = runQueueFailed
            return True
@@ -1986,19 +1913,11 @@ class RunQueueExecute:
                self.setbuildable(revdep)
                logger.debug("Marking task %s as buildable", revdep)
-        found = None
+        for t in self.sq_deferred.copy():
        for t in sorted(self.sq_deferred.copy()):
            if self.sq_deferred[t] == task:
-                # Allow the next deferred task to run. Any other deferred tasks should be deferred after that task.
+                logger.debug2("Deferred task %s now buildable" % t)
-                # We shouldn't allow all to run at once as it is prone to races.
+                del self.sq_deferred[t]
-                if not found:
+                update_scenequeue_data([t], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False)
                    bb.debug(1, "Deferred task %s now buildable" % t)
                    del self.sq_deferred[t]
                    update_scenequeue_data([t], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False)
                    found = t
                else:
                    bb.debug(1, "Deferring %s after %s" % (t, found))
                    self.sq_deferred[t] = found
    def task_complete(self, task):
        self.stats.taskCompleted()
@@ -2014,7 +1933,7 @@ class RunQueueExecute:
        self.stats.taskFailed()
        self.failed_tids.append(task)
-        fakeroot_log = []
+        fakeroot_log = ""
        if fakerootlog and os.path.exists(fakerootlog):
            with open(fakerootlog) as fakeroot_log_file:
                fakeroot_failed = False
@@ -2024,14 +1943,14 @@ class RunQueueExecute:
                            fakeroot_failed = True
                    if 'doing new pid setup and server start' in line:
                        break
-                    fakeroot_log.append(line)
+                    fakeroot_log = line + fakeroot_log
            if not fakeroot_failed:
-                fakeroot_log = []
+                fakeroot_log = None
-        bb.event.fire(runQueueTaskFailed(task, self.stats, exitcode, self.rq, fakeroot_log=("".join(fakeroot_log) or None)), self.cfgData)
+        bb.event.fire(runQueueTaskFailed(task, self.stats, exitcode, self.rq, fakeroot_log=fakeroot_log), self.cfgData)
-        if self.rqdata.taskData[''].halt:
+        if self.rqdata.taskData[''].abort:
            self.rq.state = runQueueCleanUp
    def task_skip(self, task, reason):
@@ -2080,7 +1999,7 @@ class RunQueueExecute:
            if x not in self.tasks_scenequeue_done:
                logger.error("Task %s was never processed by the setscene code" % x)
                err = True
-            if not self.rqdata.runtaskentries[x].depends and x not in self.runq_buildable:
+            if len(self.rqdata.runtaskentries[x].depends) == 0 and x not in self.runq_buildable:
                logger.error("Task %s was never marked as buildable by the setscene code" % x)
                err = True
        return err
@@ -2104,7 +2023,7 @@ class RunQueueExecute:
            # Find the next setscene to run
            for nexttask in self.sorted_setscene_tids:
                if nexttask in self.sq_buildable and nexttask not in self.sq_running and self.sqdata.stamps[nexttask] not in self.build_stamps.values():
-                    if nexttask not in self.sqdata.unskippable and self.sqdata.sq_revdeps[nexttask] and self.sqdata.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sqdata.sq_revdeps[nexttask]):
+                    if nexttask not in self.sqdata.unskippable and len(self.sqdata.sq_revdeps[nexttask]) > 0 and self.sqdata.sq_revdeps[nexttask].issubset(self.scenequeue_covered) and self.check_dependencies(nexttask, self.sqdata.sq_revdeps[nexttask]):
                        if nexttask not in self.rqdata.target_tids:
                            logger.debug2("Skipping setscene for task %s" % nexttask)
                            self.sq_task_skip(nexttask)
@@ -2209,9 +2128,9 @@ class RunQueueExecute:
        if task is not None:
            (mc, fn, taskname, taskfn) = split_tid_mcfn(task)
-            if self.rqdata.setscene_ignore_tasks is not None:
+            if self.rqdata.setscenewhitelist is not None:
-                if self.check_setscene_ignore_tasks(task):
+                if self.check_setscenewhitelist(task):
-                    self.task_fail(task, "setscene ignore_tasks")
+                    self.task_fail(task, "setscene whitelist")
                    return True
            if task in self.tasks_covered:
@@ -2268,18 +2187,19 @@ class RunQueueExecute:
            if self.can_start_task():
                return True
-        if self.stats.active > 0 or self.sq_live:
+        if self.stats.active > 0 or len(self.sq_live) > 0:
            self.rq.read_workers()
            return self.rq.active_fds()
        # No more tasks can be run. If we have deferred setscene tasks we should run them.
        if self.sq_deferred:
-            deferred_tid = list(self.sq_deferred.keys())[0]
+            tid = self.sq_deferred.pop(list(self.sq_deferred.keys())[0])
-            blocking_tid = self.sq_deferred.pop(deferred_tid)
+            logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s" % tid)
-            logger.warning("Runqeueue deadlocked on deferred tasks, forcing task %s blocked by %s" % (deferred_tid, blocking_tid))
+            if tid not in self.runq_complete:
                self.sq_task_failoutright(tid)
            return True
-        if self.failed_tids:
+        if len(self.failed_tids) != 0:
            self.rq.state = runQueueFailed
            return True
@@ -2358,7 +2278,7 @@ class RunQueueExecute:
        covered.intersection_update(self.tasks_scenequeue_done)
        for tid in notcovered | covered:
-            if not self.rqdata.runtaskentries[tid].depends:
+            if len(self.rqdata.runtaskentries[tid].depends) == 0:
                self.setbuildable(tid)
            elif self.rqdata.runtaskentries[tid].depends.issubset(self.runq_complete):
                 self.setbuildable(tid)
@@ -2400,9 +2320,6 @@ class RunQueueExecute:
                    self.rqdata.runtaskentries[hashtid].unihash = unihash
                    bb.parse.siggen.set_unihash(hashtid, unihash)
                    toprocess.add(hashtid)
                if torehash:
                    # Need to save after set_unihash above
                    bb.parse.siggen.save_unitaskhashes()
        # Work out all tasks which depend upon these
        total = set()
@@ -2420,7 +2337,7 @@ class RunQueueExecute:
        # Now iterate those tasks in dependency order to regenerate their taskhash/unihash
        next = set()
        for p in total:
-            if not self.rqdata.runtaskentries[p].depends:
+            if len(self.rqdata.runtaskentries[p].depends) == 0:
                next.add(p)
            elif self.rqdata.runtaskentries[p].depends.isdisjoint(total):
                next.add(p)
@@ -2430,7 +2347,7 @@ class RunQueueExecute:
            current = next.copy()
            next = set()
            for tid in current:
-                if self.rqdata.runtaskentries[p].depends and not self.rqdata.runtaskentries[tid].depends.isdisjoint(total):
+                if len(self.rqdata.runtaskentries[p].depends) and not self.rqdata.runtaskentries[tid].depends.isdisjoint(total):
                    continue
                orighash = self.rqdata.runtaskentries[tid].hash
                dc = bb.parse.siggen.get_data_caches(self.rqdata.dataCaches, mc_from_tid(tid))
@@ -2496,7 +2413,7 @@ class RunQueueExecute:
                self.tasks_scenequeue_done.remove(tid)
            for dep in self.sqdata.sq_covered_tasks[tid]:
                if dep in self.runq_complete and dep not in self.runq_tasksrun:
-                    bb.error("Task %s marked as completed but now needing to rerun? Halting build." % dep)
+                    bb.error("Task %s marked as completed but now needing to rerun? Aborting build." % dep)
                    self.failed_tids.append(tid)
                    self.rq.state = runQueueCleanUp
                    return
@@ -2509,6 +2426,17 @@ class RunQueueExecute:
                self.sq_buildable.remove(tid)
            if tid in self.sq_running:
                self.sq_running.remove(tid)
            harddepfail = False
            for t in self.sqdata.sq_harddeps:
                if tid in self.sqdata.sq_harddeps[t] and t in self.scenequeue_notcovered:
                    harddepfail = True
                    break
            if not harddepfail and self.sqdata.sq_revdeps[tid].issubset(self.scenequeue_covered | self.scenequeue_notcovered):
                if tid not in self.sq_buildable:
                    self.sq_buildable.add(tid)
            if len(self.sqdata.sq_revdeps[tid]) == 0:
                self.sq_buildable.add(tid)
            if tid in self.sqdata.outrightfail:
                self.sqdata.outrightfail.remove(tid)
            if tid in self.scenequeue_notcovered:
@@ -2527,36 +2455,18 @@ class RunQueueExecute:
            if tid in self.build_stamps:
                del self.build_stamps[tid]
-            update_tasks.append(tid)
+            update_tasks.append((tid, harddepfail, tid in self.sqdata.valid))
-        update_tasks2 = []
+        if update_tasks:
        for tid in update_tasks:
            harddepfail = False
            for t in self.sqdata.sq_harddeps:
                if tid in self.sqdata.sq_harddeps[t] and t in self.scenequeue_notcovered:
                    harddepfail = True
                    break
            if not harddepfail and self.sqdata.sq_revdeps[tid].issubset(self.scenequeue_covered | self.scenequeue_notcovered):
                if tid not in self.sq_buildable:
                    self.sq_buildable.add(tid)
            if not self.sqdata.sq_revdeps[tid]:
                self.sq_buildable.add(tid)
            update_tasks2.append((tid, harddepfail, tid in self.sqdata.valid))
        if update_tasks2:
            self.sqdone = False
-            for mc in sorted(self.sqdata.multiconfigs):
+            for tid in [t[0] for t in update_tasks]:
-                for tid in sorted([t[0] for t in update_tasks2]):
+                h = pending_hash_index(tid, self.rqdata)
-                    if mc_from_tid(tid) != mc:
+                if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]:
-                        continue
+                    self.sq_deferred[tid] = self.sqdata.hashes[h]
-                    h = pending_hash_index(tid, self.rqdata)
+                    bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h]))
-                    if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]:
+            update_scenequeue_data([t[0] for t in update_tasks], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False)
                        self.sq_deferred[tid] = self.sqdata.hashes[h]
                        bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h]))
            update_scenequeue_data([t[0] for t in update_tasks2], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False)
-        for (tid, harddepfail, origvalid) in update_tasks2:
+        for (tid, harddepfail, origvalid) in update_tasks:
            if tid in self.sqdata.valid and not origvalid:
                hashequiv_logger.verbose("Setscene task %s became valid" % tid)
            if harddepfail:
@@ -2612,11 +2522,11 @@ class RunQueueExecute:
        self.scenequeue_updatecounters(task)
    def sq_check_taskfail(self, task):
-        if self.rqdata.setscene_ignore_tasks is not None:
+        if self.rqdata.setscenewhitelist is not None:
            realtask = task.split('_setscene')[0]
            (mc, fn, taskname, taskfn) = split_tid_mcfn(realtask)
            pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
-            if not check_setscene_enforce_ignore_tasks(pn, taskname, self.rqdata.setscene_ignore_tasks):
+            if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist):
                logger.error('Task %s.%s failed' % (pn, taskname + "_setscene"))
                self.rq.state = runQueueCleanUp
@@ -2679,8 +2589,8 @@ class RunQueueExecute:
        #bb.note("Task %s: " % task + str(taskdepdata).replace("], ", "],\n"))
        return taskdepdata
-    def check_setscene_ignore_tasks(self, tid):
+    def check_setscenewhitelist(self, tid):
-        # Check task that is going to run against the ignore tasks list
+        # Check task that is going to run against the whitelist
        (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
        # Ignore covered tasks
        if tid in self.tasks_covered:
@@ -2694,15 +2604,14 @@ class RunQueueExecute:
            return False
        pn = self.rqdata.dataCaches[mc].pkg_fn[taskfn]
-        if not check_setscene_enforce_ignore_tasks(pn, taskname, self.rqdata.setscene_ignore_tasks):
+        if not check_setscene_enforce_whitelist(pn, taskname, self.rqdata.setscenewhitelist):
            if tid in self.rqdata.runq_setscene_tids:
-                msg = ['Task %s.%s attempted to execute unexpectedly and should have been setscened' % (pn, taskname)]
+                msg = 'Task %s.%s attempted to execute unexpectedly and should have been setscened' % (pn, taskname)
            else:
-                msg = ['Task %s.%s attempted to execute unexpectedly' % (pn, taskname)]
+                msg = 'Task %s.%s attempted to execute unexpectedly' % (pn, taskname)
            for t in self.scenequeue_notcovered:
-                msg.append("\nTask %s, unihash %s, taskhash %s" % (t, self.rqdata.runtaskentries[t].unihash, self.rqdata.runtaskentries[t].hash))
+                msg = msg + "\nTask %s, unihash %s, taskhash %s" % (t, self.rqdata.runtaskentries[t].unihash, self.rqdata.runtaskentries[t].hash)
-            msg.append('\nThis is usually due to missing setscene tasks. Those missing in this build were: %s' % pprint.pformat(self.scenequeue_notcovered))
+            logger.error(msg + '\nThis is usually due to missing setscene tasks. Those missing in this build were: %s' % pprint.pformat(self.scenequeue_notcovered))
            logger.error("".join(msg))
            return True
        return False
@@ -2741,7 +2650,7 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
    for tid in rqdata.runtaskentries:
        sq_revdeps[tid] = copy.copy(rqdata.runtaskentries[tid].revdeps)
        sq_revdeps_squash[tid] = set()
-        if not sq_revdeps[tid] and tid not in rqdata.runq_setscene_tids:
+        if (len(sq_revdeps[tid]) == 0) and tid not in rqdata.runq_setscene_tids:
            #bb.warn("Added endpoint %s" % (tid))
            endpoints[tid] = set()
@@ -2775,15 +2684,16 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
            sq_revdeps_squash[point] = set()
            if point in rqdata.runq_setscene_tids:
                sq_revdeps_squash[point] = tasks
                tasks = set()
                continue
            for dep in rqdata.runtaskentries[point].depends:
                if point in sq_revdeps[dep]:
                    sq_revdeps[dep].remove(point)
                if tasks:
                    sq_revdeps_squash[dep] |= tasks
-                if not sq_revdeps[dep] and dep not in rqdata.runq_setscene_tids:
+                if len(sq_revdeps[dep]) == 0 and dep not in rqdata.runq_setscene_tids:
                    newendpoints[dep] = task
-        if newendpoints:
+        if len(newendpoints) != 0:
            process_endpoints(newendpoints)
    process_endpoints(endpoints)
@@ -2795,7 +2705,7 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
    # Take the build endpoints (no revdeps) and find the sstate tasks they depend upon
    new = True
    for tid in rqdata.runtaskentries:
-        if not rqdata.runtaskentries[tid].revdeps:
+        if len(rqdata.runtaskentries[tid].revdeps) == 0:
            sqdata.unskippable.add(tid)
    sqdata.unskippable |= sqrq.cantskip
    while new:
@@ -2804,7 +2714,7 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
        for tid in sorted(orig, reverse=True):
            if tid in rqdata.runq_setscene_tids:
                continue
-            if not rqdata.runtaskentries[tid].depends:
+            if len(rqdata.runtaskentries[tid].depends) == 0:
                # These are tasks which have no setscene tasks in their chain, need to mark as directly buildable
                sqrq.setbuildable(tid)
            sqdata.unskippable |= rqdata.runtaskentries[tid].depends
@@ -2819,8 +2729,8 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
    for taskcounter, tid in enumerate(rqdata.runtaskentries):
        if tid in rqdata.runq_setscene_tids:
            pass
-        elif sq_revdeps_squash[tid]:
+        elif len(sq_revdeps_squash[tid]) != 0:
-            bb.msg.fatal("RunQueue", "Something went badly wrong during scenequeue generation, halting. Please report this problem.")
+            bb.msg.fatal("RunQueue", "Something went badly wrong during scenequeue generation, aborting. Please report this problem.")
        else:
            del sq_revdeps_squash[tid]
        rqdata.init_progress_reporter.update(taskcounter)
@@ -2884,7 +2794,7 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
    sqdata.multiconfigs = set()
    for tid in sqdata.sq_revdeps:
        sqdata.multiconfigs.add(mc_from_tid(tid))
-        if not sqdata.sq_revdeps[tid]:
+        if len(sqdata.sq_revdeps[tid]) == 0:
            sqrq.sq_buildable.add(tid)
    rqdata.init_progress_reporter.finish()
@@ -2904,7 +2814,7 @@ def build_scenequeue_data(sqdata, rqdata, rq, cooker, stampcache, sqrq):
                sqdata.hashes[h] = tid
            else:
                sqrq.sq_deferred[tid] = sqdata.hashes[h]
-                bb.debug(1, "Deferring %s after %s" % (tid, sqdata.hashes[h]))
+                bb.note("Deferring %s after %s" % (tid, sqdata.hashes[h]))
    update_scenequeue_data(sqdata.sq_revdeps, sqdata, rqdata, rq, cooker, stampcache, sqrq, summary=True)
@@ -3113,7 +3023,7 @@ class runQueuePipe():
        if pipeout:
            pipeout.close()
        bb.utils.nonblockingfd(self.input)
-        self.queue = bytearray()
+        self.queue = b""
        self.d = d
        self.rq = rq
        self.rqexec = rqexec
@@ -3132,13 +3042,13 @@ class runQueuePipe():
        start = len(self.queue)
        try:
-            self.queue.extend(self.input.read(102400) or b"")
+            self.queue = self.queue + (self.input.read(102400) or b"")
        except (OSError, IOError) as e:
            if e.errno != errno.EAGAIN:
                raise
        end = len(self.queue)
        found = True
-        while found and self.queue:
+        while found and len(self.queue):
            found = False
            index = self.queue.find(b"</event>")
            while index != -1 and self.queue.startswith(b"<event>"):
@@ -3176,16 +3086,16 @@ class runQueuePipe():
    def close(self):
        while self.read():
            continue
-        if self.queue:
+        if len(self.queue) > 0:
            print("Warning, worker left partial message: %s" % self.queue)
        self.input.close()
-def get_setscene_enforce_ignore_tasks(d, targets):
+def get_setscene_enforce_whitelist(d, targets):
    if d.getVar('BB_SETSCENE_ENFORCE') != '1':
        return None
-    ignore_tasks = (d.getVar("BB_SETSCENE_ENFORCE_IGNORE_TASKS") or "").split()
+    whitelist = (d.getVar("BB_SETSCENE_ENFORCE_WHITELIST") or "").split()
    outlist = []
-    for item in ignore_tasks[:]:
+    for item in whitelist[:]:
        if item.startswith('%:'):
            for (mc, target, task, fn) in targets:
                outlist.append(target + ':' + item.split(':')[1])
@@ -3193,12 +3103,12 @@ def get_setscene_enforce_ignore_tasks(d, targets):
            outlist.append(item)
    return outlist
-def check_setscene_enforce_ignore_tasks(pn, taskname, ignore_tasks):
+def check_setscene_enforce_whitelist(pn, taskname, whitelist):
    import fnmatch
-    if ignore_tasks is not None:
+    if whitelist is not None:
        item = '%s:%s' % (pn, taskname)
-        for ignore_tasks in ignore_tasks:
+        for whitelist_item in whitelist:
-            if fnmatch.fnmatch(item, ignore_tasks):
+            if fnmatch.fnmatch(item, whitelist_item):
                return True
        return False
    return True
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -244,6 +244,9 @@ class ProcessServer():
            ready = self.idle_commands(.1, fds)
        if len(threading.enumerate()) != 1:
            serverlog("More than one thread left?: " + str(threading.enumerate()))
        serverlog("Exiting")
        # Remove the socket file so we don't get any more connections to avoid races
        try:
@@ -261,9 +264,6 @@ class ProcessServer():
        self.cooker.post_serve()
        if len(threading.enumerate()) != 1:
            serverlog("More than one thread left?: " + str(threading.enumerate()))
        # Flush logs before we release the lock
        sys.stdout.flush()
        sys.stderr.flush()
@@ -327,10 +327,10 @@ class ProcessServer():
                        if e.errno != errno.ENOENT:
                            raise
-                msg = ["Delaying shutdown due to active processes which appear to be holding bitbake.lock"]
+                msg = "Delaying shutdown due to active processes which appear to be holding bitbake.lock"
                if procs:
-                    msg.append(":\n%s" % str(procs.decode("utf-8")))
+                    msg += ":\n%s" % str(procs.decode("utf-8"))
-                serverlog("".join(msg))
+                serverlog(msg)
    def idle_commands(self, delay, fds=None):
        nextsleep = delay
@@ -557,7 +557,7 @@ def execServer(lockfd, readypipeinfd, lockname, sockname, server_timeout, xmlrpc
        server.run()
    finally:
-        # Flush any messages/errors to the logfile before exit
+        # Flush any ,essages/errors to the logfile before exit
        sys.stdout.flush()
        sys.stderr.flush()
@@ -738,33 +738,13 @@ class ConnectionWriter(object):
        # Why bb.event needs this I have no idea
        self.event = self
-    def _send(self, obj):
+    def send(self, obj):
        obj = multiprocessing.reduction.ForkingPickler.dumps(obj)
        gc.disable()
        with self.wlock:
            self.writer.send_bytes(obj)
        gc.enable()
    def send(self, obj):
        obj = multiprocessing.reduction.ForkingPickler.dumps(obj)
        # See notes/code in CookerParser
        # We must not terminate holding this lock else processes will hang.
        # For SIGTERM, raising afterwards avoids this.
        # For SIGINT, we don't want to have written partial data to the pipe.
        # pthread_sigmask block/unblock would be nice but doesn't work, https://bugs.python.org/issue47139
        process = multiprocessing.current_process()
        if process and hasattr(process, "queue_signals"):
            with process.signal_threadlock:
                process.queue_signals = True
                self._send(obj)
                process.queue_signals = False
                try:
                    for sig in process.signal_received.pop():
                        process.handle_sig(sig, None)
                except IndexError:
                    pass
        else:
            self._send(obj)
    def fileno(self):
        return self.writer.fileno()
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -13,8 +11,6 @@ import pickle
 import bb.data
 import difflib
 import simplediff
 import json
 import bb.compress.zstd
 from bb.checksum import FileChecksumCache
 from bb import runqueue
 import hashserv
@@ -23,17 +19,6 @@ import hashserv.client
 logger = logging.getLogger('BitBake.SigGen')
 hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv')
 class SetEncoder(json.JSONEncoder):
    def default(self, obj):
        if isinstance(obj, set):
            return dict(_set_object=list(sorted(obj)))
        return json.JSONEncoder.default(self, obj)
 def SetDecoder(dct):
    if '_set_object' in dct:
        return set(dct['_set_object'])
    return dct
 def init(d):
    siggens = [obj for obj in globals().values()
                      if type(obj) is type and issubclass(obj, SignatureGenerator)]
@@ -42,6 +27,7 @@ def init(d):
    for sg in siggens:
        if desired == sg.name:
            return sg(d)
            break
    else:
        logger.error("Invalid signature generator '%s', using default 'noop'\n"
                     "Available generators: %s", desired,
@@ -157,9 +143,6 @@ class SignatureGenerator(object):
        return DataCacheProxy()
    def exit(self):
        return
 class SignatureGeneratorBasic(SignatureGenerator):
    """
    """
@@ -176,8 +159,8 @@ class SignatureGeneratorBasic(SignatureGenerator):
        self.gendeps = {}
        self.lookupcache = {}
        self.setscenetasks = set()
-        self.basehash_ignore_vars = set((data.getVar("BB_BASEHASH_IGNORE_VARS") or "").split())
+        self.basewhitelist = set((data.getVar("BB_HASHBASE_WHITELIST") or "").split())
-        self.taskhash_ignore_tasks = None
+        self.taskwhitelist = None
        self.init_rundepcheck(data)
        checksum_cache_file = data.getVar("BB_HASH_CHECKSUM_CACHE_FILE")
        if checksum_cache_file:
@@ -192,18 +175,18 @@ class SignatureGeneratorBasic(SignatureGenerator):
        self.tidtopn = {}
    def init_rundepcheck(self, data):
-        self.taskhash_ignore_tasks = data.getVar("BB_TASKHASH_IGNORE_TASKS") or None
+        self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None
-        if self.taskhash_ignore_tasks:
+        if self.taskwhitelist:
-            self.twl = re.compile(self.taskhash_ignore_tasks)
+            self.twl = re.compile(self.taskwhitelist)
        else:
            self.twl = None
    def _build_data(self, fn, d):
        ignore_mismatch = ((d.getVar("BB_HASH_IGNORE_MISMATCH") or '') == '1')
-        tasklist, gendeps, lookupcache = bb.data.generate_dependencies(d, self.basehash_ignore_vars)
+        tasklist, gendeps, lookupcache = bb.data.generate_dependencies(d, self.basewhitelist)
-        taskdeps, basehash = bb.data.generate_dependency_hash(tasklist, gendeps, lookupcache, self.basehash_ignore_vars, fn)
+        taskdeps, basehash = bb.data.generate_dependency_hash(tasklist, gendeps, lookupcache, self.basewhitelist, fn)
        for task in tasklist:
            tid = fn + ":" + task
@@ -257,8 +240,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
    def rundep_check(self, fn, recipename, task, dep, depname, dataCaches):
        # Return True if we should keep the dependency, False to drop it
-        # We only manipulate the dependencies for packages not in the ignore
+        # We only manipulate the dependencies for packages not in the whitelist
        # list
        if self.twl and not self.twl.search(recipename):
            # then process the actual dependencies
            if self.twl.search(depname):
@@ -329,19 +311,17 @@ class SignatureGeneratorBasic(SignatureGenerator):
        data = self.basehash[tid]
        for dep in self.runtaskdeps[tid]:
-            data += self.get_unihash(dep)
+            data = data + self.get_unihash(dep)
        for (f, cs) in self.file_checksum_values[tid]:
            if cs:
-                if "/./" in f:
+                data = data + cs
                    data += "./" + f.split("/./")[1]
                data += cs
        if tid in self.taints:
            if self.taints[tid].startswith("nostamp:"):
-                data += self.taints[tid][8:]
+                data = data + self.taints[tid][8:]
            else:
-                data += self.taints[tid]
+                data = data + self.taints[tid]
        h = hashlib.sha256(data.encode("utf-8")).hexdigest()
        self.taskhash[tid] = h
@@ -377,27 +357,22 @@ class SignatureGeneratorBasic(SignatureGenerator):
        data = {}
        data['task'] = task
-        data['basehash_ignore_vars'] = self.basehash_ignore_vars
+        data['basewhitelist'] = self.basewhitelist
-        data['taskhash_ignore_tasks'] = self.taskhash_ignore_tasks
+        data['taskwhitelist'] = self.taskwhitelist
        data['taskdeps'] = self.taskdeps[fn][task]
        data['basehash'] = self.basehash[tid]
        data['gendeps'] = {}
        data['varvals'] = {}
        data['varvals'][task] = self.lookupcache[fn][task]
        for dep in self.taskdeps[fn][task]:
-            if dep in self.basehash_ignore_vars:
+            if dep in self.basewhitelist:
                continue
            data['gendeps'][dep] = self.gendeps[fn][dep]
            data['varvals'][dep] = self.lookupcache[fn][dep]
        if runtime and tid in self.taskhash:
            data['runtaskdeps'] = self.runtaskdeps[tid]
-            data['file_checksum_values'] = []
+            data['file_checksum_values'] = [(os.path.basename(f), cs) for f,cs in self.file_checksum_values[tid]]
            for f,cs in self.file_checksum_values[tid]:
                if "/./" in f:
                    data['file_checksum_values'].append(("./" + f.split("/./")[1], cs))
                else:
                    data['file_checksum_values'].append((os.path.basename(f), cs))
            data['runtaskhashes'] = {}
            for dep in data['runtaskdeps']:
                data['runtaskhashes'][dep] = self.get_unihash(dep)
@@ -421,11 +396,11 @@ class SignatureGeneratorBasic(SignatureGenerator):
                bb.error("Taskhash mismatch %s versus %s for %s" % (computed_taskhash, self.taskhash[tid], tid))
                sigfile = sigfile.replace(self.taskhash[tid], computed_taskhash)
-        fd, tmpfile = bb.utils.mkstemp(dir=os.path.dirname(sigfile), prefix="sigtask.")
+        fd, tmpfile = tempfile.mkstemp(dir=os.path.dirname(sigfile), prefix="sigtask.")
        try:
-            with bb.compress.zstd.open(fd, "wt", encoding="utf-8", num_threads=1) as f:
+            with os.fdopen(fd, "wb") as stream:
-                json.dump(data, f, sort_keys=True, separators=(",", ":"), cls=SetEncoder)
+                p = pickle.dump(data, stream, -1)
-                f.flush()
+                stream.flush()
            os.chmod(tmpfile, 0o664)
            bb.utils.rename(tmpfile, sigfile)
        except (OSError, IOError) as err:
@@ -493,18 +468,6 @@ class SignatureGeneratorUniHashMixIn(object):
            self._client = hashserv.create_client(self.server)
        return self._client
    def reset(self, data):
        if getattr(self, '_client', None) is not None:
            self._client.close()
            self._client = None 
        return super().reset(data)
    def exit(self):
        if getattr(self, '_client', None) is not None:
            self._client.close()
            self._client = None
        return super().exit()
    def get_stampfile_hash(self, tid):
        if tid in self.taskhash:
            # If a unique hash is reported, use it as the stampfile hash. This
@@ -600,7 +563,7 @@ class SignatureGeneratorUniHashMixIn(object):
        if self.setscenetasks and tid not in self.setscenetasks:
            return
-        # This can happen if locked sigs are in action. Detect and just exit
+        # This can happen if locked sigs are in action. Detect and just abort
        if taskhash != self.taskhash[tid]:
            return
@@ -811,16 +774,6 @@ def clean_basepaths_list(a):
        b.append(clean_basepath(x))
    return b
 # Handled renamed fields
 def handle_renames(data):
    if 'basewhitelist' in data:
        data['basehash_ignore_vars'] = data['basewhitelist']
        del data['basewhitelist']
    if 'taskwhitelist' in data:
        data['taskhash_ignore_tasks'] = data['taskwhitelist']
        del data['taskwhitelist']
 def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
    output = []
@@ -841,21 +794,20 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
        formatparams.update(values)
        return formatstr.format(**formatparams)
-    with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f:
+    with open(a, 'rb') as f:
-        a_data = json.load(f, object_hook=SetDecoder)
+        p1 = pickle.Unpickler(f)
-    with bb.compress.zstd.open(b, "rt", encoding="utf-8", num_threads=1) as f:
+        a_data = p1.load()
-        b_data = json.load(f, object_hook=SetDecoder)
+    with open(b, 'rb') as f:
        p2 = pickle.Unpickler(f)
        b_data = p2.load()
-    for data in [a_data, b_data]:
+    def dict_diff(a, b, whitelist=set()):
        handle_renames(data)
    def dict_diff(a, b, ignored_vars=set()):
        sa = set(a.keys())
        sb = set(b.keys())
        common = sa & sb
        changed = set()
        for i in common:
-            if a[i] != b[i] and i not in ignored_vars:
+            if a[i] != b[i] and i not in whitelist:
                changed.add(i)
        added = sb - sa
        removed = sa - sb
@@ -863,11 +815,11 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
    def file_checksums_diff(a, b):
        from collections import Counter
-
+        # Handle old siginfo format
-        # Convert lists back to tuples
+        if isinstance(a, dict):
-        a = [(f[0], f[1]) for f in a]
+            a = [(os.path.basename(f), cs) for f, cs in a.items()]
-        b = [(f[0], f[1]) for f in b]
+        if isinstance(b, dict):
-
+            b = [(os.path.basename(f), cs) for f, cs in b.items()]
        # Compare lists, ensuring we can handle duplicate filenames if they exist
        removedcount = Counter(a)
        removedcount.subtract(b)
@@ -894,15 +846,15 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
        removed = [x[0] for x in removed]
        return changed, added, removed
-    if 'basehash_ignore_vars' in a_data and a_data['basehash_ignore_vars'] != b_data['basehash_ignore_vars']:
+    if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']:
-        output.append(color_format("{color_title}basehash_ignore_vars changed{color_default} from '%s' to '%s'") % (a_data['basehash_ignore_vars'], b_data['basehash_ignore_vars']))
+        output.append(color_format("{color_title}basewhitelist changed{color_default} from '%s' to '%s'") % (a_data['basewhitelist'], b_data['basewhitelist']))
-        if a_data['basehash_ignore_vars'] and b_data['basehash_ignore_vars']:
+        if a_data['basewhitelist'] and b_data['basewhitelist']:
-            output.append("changed items: %s" % a_data['basehash_ignore_vars'].symmetric_difference(b_data['basehash_ignore_vars']))
+            output.append("changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist']))
-    if 'taskhash_ignore_tasks' in a_data and a_data['taskhash_ignore_tasks'] != b_data['taskhash_ignore_tasks']:
+    if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']:
-        output.append(color_format("{color_title}taskhash_ignore_tasks changed{color_default} from '%s' to '%s'") % (a_data['taskhash_ignore_tasks'], b_data['taskhash_ignore_tasks']))
+        output.append(color_format("{color_title}taskwhitelist changed{color_default} from '%s' to '%s'") % (a_data['taskwhitelist'], b_data['taskwhitelist']))
-        if a_data['taskhash_ignore_tasks'] and b_data['taskhash_ignore_tasks']:
+        if a_data['taskwhitelist'] and b_data['taskwhitelist']:
-            output.append("changed items: %s" % a_data['taskhash_ignore_tasks'].symmetric_difference(b_data['taskhash_ignore_tasks']))
+            output.append("changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist']))
    if a_data['taskdeps'] != b_data['taskdeps']:
        output.append(color_format("{color_title}Task dependencies changed{color_default} from:\n%s\nto:\n%s") % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps'])))
@@ -910,7 +862,7 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
    if a_data['basehash'] != b_data['basehash'] and not collapsed:
        output.append(color_format("{color_title}basehash changed{color_default} from %s to %s") % (a_data['basehash'], b_data['basehash']))
-    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basehash_ignore_vars'] & b_data['basehash_ignore_vars'])
+    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist'])
    if changed:
        for dep in sorted(changed):
            output.append(color_format("{color_title}List of dependencies for variable %s changed from '{color_default}%s{color_title}' to '{color_default}%s{color_title}'") % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep]))
@@ -950,9 +902,9 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
                output.append(color_format("{color_title}Variable {var} value changed from '{color_default}{oldval}{color_title}' to '{color_default}{newval}{color_title}'{color_default}", var=dep, oldval=oldval, newval=newval))
    if not 'file_checksum_values' in a_data:
-         a_data['file_checksum_values'] = []
+         a_data['file_checksum_values'] = {}
    if not 'file_checksum_values' in b_data:
-         b_data['file_checksum_values'] = []
+         b_data['file_checksum_values'] = {}
    changed, added, removed = file_checksums_diff(a_data['file_checksum_values'], b_data['file_checksum_values'])
    if changed:
@@ -992,8 +944,8 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
    if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data:
-        a = clean_basepaths(a_data['runtaskhashes'])
+        a = a_data['runtaskhashes']
-        b = clean_basepaths(b_data['runtaskhashes'])
+        b = b_data['runtaskhashes']
        changed, added, removed = dict_diff(a, b)
        if added:
            for dep in sorted(added):
@@ -1004,7 +956,7 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
                            #output.append("Dependency on task %s was replaced by %s with same hash" % (dep, bdep))
                            bdep_found = True
                if not bdep_found:
-                    output.append(color_format("{color_title}Dependency on task %s was added{color_default} with hash %s") % (dep, b[dep]))
+                    output.append(color_format("{color_title}Dependency on task %s was added{color_default} with hash %s") % (clean_basepath(dep), b[dep]))
        if removed:
            for dep in sorted(removed):
                adep_found = False
@@ -1014,11 +966,11 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
                            #output.append("Dependency on task %s was replaced by %s with same hash" % (adep, dep))
                            adep_found = True
                if not adep_found:
-                    output.append(color_format("{color_title}Dependency on task %s was removed{color_default} with hash %s") % (dep, a[dep]))
+                    output.append(color_format("{color_title}Dependency on task %s was removed{color_default} with hash %s") % (clean_basepath(dep), a[dep]))
        if changed:
            for dep in sorted(changed):
                if not collapsed:
-                    output.append(color_format("{color_title}Hash for task dependency %s changed{color_default} from %s to %s") % (dep, a[dep], b[dep]))
+                    output.append(color_format("{color_title}Hash for dependent task %s changed{color_default} from %s to %s") % (clean_basepath(dep), a[dep], b[dep]))
                if callable(recursecb):
                    recout = recursecb(dep, a[dep], b[dep])
                    if recout:
@@ -1028,7 +980,6 @@ def compare_sigfiles(a, b, recursecb=None, color=False, collapsed=False):
                            # If a dependent hash changed, might as well print the line above and then defer to the changes in
                            # that hash since in all likelyhood, they're the same changes this task also saw.
                            output = [output[-1]] + recout
                            break
    a_taint = a_data.get('taint', None)
    b_taint = b_data.get('taint', None)
@@ -1066,8 +1017,6 @@ def calc_taskhash(sigdata):
    for c in sigdata['file_checksum_values']:
        if c[1]:
            if "./" in c[0]:
                data = data + c[0]
            data = data + c[1]
    if 'taint' in sigdata:
@@ -1082,33 +1031,32 @@ def calc_taskhash(sigdata):
 def dump_sigfile(a):
    output = []
-    with bb.compress.zstd.open(a, "rt", encoding="utf-8", num_threads=1) as f:
+    with open(a, 'rb') as f:
-        a_data = json.load(f, object_hook=SetDecoder)
+        p1 = pickle.Unpickler(f)
        a_data = p1.load()
-    handle_renames(a_data)
+    output.append("basewhitelist: %s" % (a_data['basewhitelist']))
-    output.append("basehash_ignore_vars: %s" % (sorted(a_data['basehash_ignore_vars'])))
+    output.append("taskwhitelist: %s" % (a_data['taskwhitelist']))
    output.append("taskhash_ignore_tasks: %s" % (sorted(a_data['taskhash_ignore_tasks'] or [])))
    output.append("Task dependencies: %s" % (sorted(a_data['taskdeps'])))
    output.append("basehash: %s" % (a_data['basehash']))
-    for dep in sorted(a_data['gendeps']):
+    for dep in a_data['gendeps']:
-        output.append("List of dependencies for variable %s is %s" % (dep, sorted(a_data['gendeps'][dep])))
+        output.append("List of dependencies for variable %s is %s" % (dep, a_data['gendeps'][dep]))
-    for dep in sorted(a_data['varvals']):
+    for dep in a_data['varvals']:
        output.append("Variable %s value is %s" % (dep, a_data['varvals'][dep]))
    if 'runtaskdeps' in a_data:
-        output.append("Tasks this task depends on: %s" % (sorted(a_data['runtaskdeps'])))
+        output.append("Tasks this task depends on: %s" % (a_data['runtaskdeps']))
    if 'file_checksum_values' in a_data:
-        output.append("This task depends on the checksums of files: %s" % (sorted(a_data['file_checksum_values'])))
+        output.append("This task depends on the checksums of files: %s" % (a_data['file_checksum_values']))
    if 'runtaskhashes' in a_data:
-        for dep in sorted(a_data['runtaskhashes']):
+        for dep in a_data['runtaskhashes']:
            output.append("Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep]))
    if 'taint' in a_data:
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -39,7 +39,7 @@ class TaskData:
    """
    BitBake Task Data implementation
    """
-    def __init__(self, halt = True, skiplist = None, allowincomplete = False):
+    def __init__(self, abort = True, skiplist = None, allowincomplete = False):
        self.build_targets = {}
        self.run_targets = {}
@@ -57,7 +57,7 @@ class TaskData:
        self.failed_rdeps = []
        self.failed_fns = []
-        self.halt = halt
+        self.abort = abort
        self.allowincomplete = allowincomplete
        self.skiplist = skiplist
@@ -328,7 +328,7 @@ class TaskData:
        try:
            self.add_provider_internal(cfgData, dataCache, item)
        except bb.providers.NoProvider:
-            if self.halt:
+            if self.abort:
                raise
            self.remove_buildtarget(item)
@@ -451,12 +451,12 @@ class TaskData:
        for target in self.build_targets:
            if fn in self.build_targets[target]:
                self.build_targets[target].remove(fn)
-                if not self.build_targets[target]:
+                if len(self.build_targets[target]) == 0:
                    self.remove_buildtarget(target, missing_list)
        for target in self.run_targets:
            if fn in self.run_targets[target]:
                self.run_targets[target].remove(fn)
-                if not self.run_targets[target]:
+                if len(self.run_targets[target]) == 0:
                    self.remove_runtarget(target, missing_list)
    def remove_buildtarget(self, target, missing_list=None):
@@ -479,7 +479,7 @@ class TaskData:
                    fn = tid.rsplit(":",1)[0]
                    self.fail_fn(fn, missing_list)
-        if self.halt and target in self.external_targets:
+        if self.abort and target in self.external_targets:
            logger.error("Required build target '%s' has no buildable providers.\nMissing or unbuildable dependency chain was: %s", target, missing_list)
            raise bb.providers.NoProvider(target)
@@ -516,7 +516,7 @@ class TaskData:
                    self.add_provider_internal(cfgData, dataCache, target)
                    added = added + 1
                except bb.providers.NoProvider:
-                    if self.halt and target in self.external_targets and not self.allowincomplete:
+                    if self.abort and target in self.external_targets and not self.allowincomplete:
                        raise
                    if not self.allowincomplete:
                        self.remove_buildtarget(target)
--- a/bitbake/lib/bb/tests/codeparser.py
+++ b/bitbake/lib/bb/tests/codeparser.py
@@ -318,7 +318,7 @@ d.getVar(a(), False)
            "filename": "example.bb",
        })
-        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d)
+        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
        self.assertEqual(deps, set(["somevar", "bar", "something", "inexpand", "test", "test2", "a"]))
@@ -365,7 +365,7 @@ esac
        self.d.setVarFlags("FOO", {"func": True})
        self.setEmptyVars(execs)
-        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d)
+        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
        self.assertEqual(deps, set(["somevar", "inverted"] + execs))
@@ -375,7 +375,7 @@ esac
        self.d.setVar("FOO", "foo=oe_libinstall; eval $foo")
        self.d.setVarFlag("FOO", "vardeps", "oe_libinstall")
-        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d)
+        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
        self.assertEqual(deps, set(["oe_libinstall"]))
@@ -384,7 +384,7 @@ esac
        self.d.setVar("FOO", "foo=oe_libinstall; eval $foo")
        self.d.setVarFlag("FOO", "vardeps", "${@'oe_libinstall'}")
-        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), set(), self.d)
+        deps, values = bb.data.build_dependencies("FOO", set(self.d.keys()), set(), set(), self.d)
        self.assertEqual(deps, set(["oe_libinstall"]))
@@ -399,7 +399,7 @@ esac
        # Check dependencies
        self.d.setVar('ANOTHERVAR', expr)
        self.d.setVar('TESTVAR', 'anothervalue testval testval2')
-        deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(), self.d)
+        deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), self.d)
        self.assertEqual(sorted(values.splitlines()),
                         sorted([expr,
                          'TESTVAR{anothervalue} = Set',
@@ -412,50 +412,6 @@ esac
        # Check final value
        self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['anothervalue', 'yetanothervalue', 'lastone'])
    def test_contains_vardeps_excluded(self):
        # Check the ignored_vars option to build_dependencies is handled by contains functionality
        varval = '${TESTVAR2} ${@bb.utils.filter("TESTVAR", "somevalue anothervalue", d)}'
        self.d.setVar('ANOTHERVAR', varval)
        self.d.setVar('TESTVAR', 'anothervalue testval testval2')
        self.d.setVar('TESTVAR2', 'testval3')
        deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(["TESTVAR"]), self.d)
        self.assertEqual(sorted(values.splitlines()), sorted([varval]))
        self.assertEqual(deps, set(["TESTVAR2"]))
        self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['testval3', 'anothervalue'])
        # Check the vardepsexclude flag is handled by contains functionality
        self.d.setVarFlag('ANOTHERVAR', 'vardepsexclude', 'TESTVAR')
        deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(), self.d)
        self.assertEqual(sorted(values.splitlines()), sorted([varval]))
        self.assertEqual(deps, set(["TESTVAR2"]))
        self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['testval3', 'anothervalue'])
    def test_contains_vardeps_override_operators(self):
        # Check override operators handle dependencies correctly with the contains functionality
        expr_plain = 'testval'
        expr_prepend = '${@bb.utils.filter("TESTVAR1", "testval1", d)} '
        expr_append = ' ${@bb.utils.filter("TESTVAR2", "testval2", d)}'
        expr_remove = '${@bb.utils.contains("TESTVAR3", "no-testval", "testval", "", d)}'
        # Check dependencies
        self.d.setVar('ANOTHERVAR', expr_plain)
        self.d.prependVar('ANOTHERVAR', expr_prepend)
        self.d.appendVar('ANOTHERVAR', expr_append)
        self.d.setVar('ANOTHERVAR:remove', expr_remove)
        self.d.setVar('TESTVAR1', 'blah')
        self.d.setVar('TESTVAR2', 'testval2')
        self.d.setVar('TESTVAR3', 'no-testval')
        deps, values = bb.data.build_dependencies("ANOTHERVAR", set(self.d.keys()), set(), set(), set(), self.d)
        self.assertEqual(sorted(values.splitlines()),
                         sorted([
                          expr_prepend + expr_plain + expr_append,
                          '_remove of ' + expr_remove,
                          'TESTVAR1{testval1} = Unset',
                          'TESTVAR2{testval2} = Set',
                          'TESTVAR3{no-testval} = Set',
                          ]))
        # Check final value
        self.assertEqual(self.d.getVar('ANOTHERVAR').split(), ['testval2'])
    #Currently no wildcard support
    #def test_vardeps_wildcards(self):
    #    self.d.setVar("oe_libinstall", "echo test")
--- a/bitbake/lib/bb/tests/compression.py
+++ b/bitbake/lib/bb/tests/compression.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bb/tests/cooker.py
+++ b/bitbake/lib/bb/tests/cooker.py
@@ -1,8 +1,6 @@
 #
 # BitBake Tests for cooker.py
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bb/tests/fetch-testdata/debian/pool/main/m/minicom/index.html
+++ b/bitbake/lib/bb/tests/fetch-testdata/debian/pool/main/m/minicom/index.html
@@ -1,59 +0,0 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
  <title>Index of /debian/pool/main/m/minicom</title>
 </head>
 <body>
 <h1>Index of /debian/pool/main/m/minicom</h1>
  <table>
   <tr><th valign="top"><img src="/icons/blank.gif" alt="[ICO]"></th><th><a href="?C=N;O=D">Name</a></th><th><a href="?C=M;O=A">Last modified</a></th><th><a href="?C=S;O=A">Size</a></th></tr>
   <tr><th colspan="4"><hr></th></tr>
 <tr><td valign="top"><img src="/icons/back.gif" alt="[PARENTDIR]"></td><td><a href="/debian/pool/main/m/">Parent Directory</a></td><td>&nbsp;</td><td align="right">  - </td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1+deb8u1.debian.tar.xz">minicom_2.7-1+deb8u1.debian.tar.xz</a></td><td align="right">2017-04-24 08:22  </td><td align="right"> 14K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1+deb8u1.dsc">minicom_2.7-1+deb8u1.dsc</a></td><td align="right">2017-04-24 08:22  </td><td align="right">1.9K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1+deb8u1_amd64.deb">minicom_2.7-1+deb8u1_amd64.deb</a></td><td align="right">2017-04-25 21:10  </td><td align="right">257K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1+deb8u1_armel.deb">minicom_2.7-1+deb8u1_armel.deb</a></td><td align="right">2017-04-26 00:58  </td><td align="right">246K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1+deb8u1_armhf.deb">minicom_2.7-1+deb8u1_armhf.deb</a></td><td align="right">2017-04-26 00:58  </td><td align="right">245K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1+deb8u1_i386.deb">minicom_2.7-1+deb8u1_i386.deb</a></td><td align="right">2017-04-25 21:41  </td><td align="right">258K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1.debian.tar.xz">minicom_2.7-1.1.debian.tar.xz</a></td><td align="right">2017-04-22 09:34  </td><td align="right"> 14K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1.dsc">minicom_2.7-1.1.dsc</a></td><td align="right">2017-04-22 09:34  </td><td align="right">1.9K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_amd64.deb">minicom_2.7-1.1_amd64.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">261K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_arm64.deb">minicom_2.7-1.1_arm64.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">250K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_armel.deb">minicom_2.7-1.1_armel.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">255K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_armhf.deb">minicom_2.7-1.1_armhf.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">254K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_i386.deb">minicom_2.7-1.1_i386.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">266K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_mips.deb">minicom_2.7-1.1_mips.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">258K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_mips64el.deb">minicom_2.7-1.1_mips64el.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">259K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_mipsel.deb">minicom_2.7-1.1_mipsel.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">259K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_ppc64el.deb">minicom_2.7-1.1_ppc64el.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">253K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7-1.1_s390x.deb">minicom_2.7-1.1_s390x.deb</a></td><td align="right">2017-04-22 15:29  </td><td align="right">261K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_amd64.deb">minicom_2.7.1-1+b1_amd64.deb</a></td><td align="right">2018-05-06 08:14  </td><td align="right">262K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_arm64.deb">minicom_2.7.1-1+b1_arm64.deb</a></td><td align="right">2018-05-06 07:58  </td><td align="right">250K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_armel.deb">minicom_2.7.1-1+b1_armel.deb</a></td><td align="right">2018-05-06 08:45  </td><td align="right">253K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_armhf.deb">minicom_2.7.1-1+b1_armhf.deb</a></td><td align="right">2018-05-06 10:42  </td><td align="right">253K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_i386.deb">minicom_2.7.1-1+b1_i386.deb</a></td><td align="right">2018-05-06 08:55  </td><td align="right">266K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_mips.deb">minicom_2.7.1-1+b1_mips.deb</a></td><td align="right">2018-05-06 08:14  </td><td align="right">258K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_mipsel.deb">minicom_2.7.1-1+b1_mipsel.deb</a></td><td align="right">2018-05-06 12:13  </td><td align="right">259K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_ppc64el.deb">minicom_2.7.1-1+b1_ppc64el.deb</a></td><td align="right">2018-05-06 09:10  </td><td align="right">260K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b1_s390x.deb">minicom_2.7.1-1+b1_s390x.deb</a></td><td align="right">2018-05-06 08:14  </td><td align="right">257K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1+b2_mips64el.deb">minicom_2.7.1-1+b2_mips64el.deb</a></td><td align="right">2018-05-06 09:41  </td><td align="right">260K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1.debian.tar.xz">minicom_2.7.1-1.debian.tar.xz</a></td><td align="right">2017-08-13 15:40  </td><td align="right"> 14K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.7.1-1.dsc">minicom_2.7.1-1.dsc</a></td><td align="right">2017-08-13 15:40  </td><td align="right">1.8K</td></tr>
 <tr><td valign="top"><img src="/icons/compressed.gif" alt="[   ]"></td><td><a href="minicom_2.7.1.orig.tar.gz">minicom_2.7.1.orig.tar.gz</a></td><td align="right">2017-08-13 15:40  </td><td align="right">855K</td></tr>
 <tr><td valign="top"><img src="/icons/compressed.gif" alt="[   ]"></td><td><a href="minicom_2.7.orig.tar.gz">minicom_2.7.orig.tar.gz</a></td><td align="right">2014-01-01 09:36  </td><td align="right">843K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2.debian.tar.xz">minicom_2.8-2.debian.tar.xz</a></td><td align="right">2021-06-15 03:47  </td><td align="right"> 14K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2.dsc">minicom_2.8-2.dsc</a></td><td align="right">2021-06-15 03:47  </td><td align="right">1.8K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_amd64.deb">minicom_2.8-2_amd64.deb</a></td><td align="right">2021-06-15 03:58  </td><td align="right">280K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_arm64.deb">minicom_2.8-2_arm64.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">275K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_armel.deb">minicom_2.8-2_armel.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">271K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_armhf.deb">minicom_2.8-2_armhf.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">272K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_i386.deb">minicom_2.8-2_i386.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">285K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_mips64el.deb">minicom_2.8-2_mips64el.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">277K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_mipsel.deb">minicom_2.8-2_mipsel.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">278K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_ppc64el.deb">minicom_2.8-2_ppc64el.deb</a></td><td align="right">2021-06-15 04:13  </td><td align="right">286K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8-2_s390x.deb">minicom_2.8-2_s390x.deb</a></td><td align="right">2021-06-15 03:58  </td><td align="right">275K</td></tr>
 <tr><td valign="top"><img src="/icons/unknown.gif" alt="[   ]"></td><td><a href="minicom_2.8.orig.tar.bz2">minicom_2.8.orig.tar.bz2</a></td><td align="right">2021-01-03 12:44  </td><td align="right">598K</td></tr>
   <tr><th colspan="4"><hr></th></tr>
 </table>
 <address>Apache Server at ftp.debian.org Port 80</address>
 </body></html>
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -6,13 +6,11 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 import contextlib
 import unittest
 import hashlib
 import tempfile
 import collections
 import os
 import tarfile
 from bb.fetch2 import URI
 from bb.fetch2 import FetchMethod
 import bb
@@ -20,7 +18,7 @@ from bb.tests.support.httpserver import HTTPService
 def skipIfNoNetwork():
    if os.environ.get("BB_SKIP_NETTESTS") == "yes":
-        return unittest.skip("network test")
+        return unittest.skip("Network tests being skipped")
    return lambda f: f
 class URITest(unittest.TestCase):
@@ -395,78 +393,58 @@ class FetcherTest(unittest.TestCase):
            bb.process.run('chmod u+rw -R %s' % self.tempdir)
            bb.utils.prunedir(self.tempdir)
    def git(self, cmd, cwd=None):
        if isinstance(cmd, str):
            cmd = 'git ' + cmd
        else:
            cmd = ['git'] + cmd
        if cwd is None:
            cwd = self.gitdir
        return bb.process.run(cmd, cwd=cwd)[0]
    def git_init(self, cwd=None):
        self.git('init', cwd=cwd)
        if not self.git(['config', 'user.email'], cwd=cwd):
            self.git(['config', 'user.email', 'you@example.com'], cwd=cwd)
        if not self.git(['config', 'user.name'], cwd=cwd):
            self.git(['config', 'user.name', 'Your Name'], cwd=cwd)
 class MirrorUriTest(FetcherTest):
    replaceuris = {
-        ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "http://somewhere.org/somedir/")
+        ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "http://somewhere.org/somedir/") 
            : "http://somewhere.org/somedir/git2_git.invalid.infradead.org.mtd-utils.git.tar.gz",
-        ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/somedir/\\2;protocol=http")
+        ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/somedir/\\2;protocol=http") 
-            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", 
-        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/somedir/\\2;protocol=http")
+        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/somedir/\\2;protocol=http") 
-            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", 
-        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/\\2;protocol=http")
+        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/([^/]+/)*([^/]*)", "git://somewhere.org/\\2;protocol=http") 
-            : "git://somewhere.org/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+            : "git://somewhere.org/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", 
        ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890", "git://someserver.org/bitbake", "git://git.openembedded.org/bitbake")
            : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890",
-        ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache")
+        ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache") 
            : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz",
-        ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/")
+        ("file://sstate-xyz.tgz", "file://.*", "file:///somewhere/1234/sstate-cache/") 
            : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz",
-        ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/somedir3")
+        ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/somedir3") 
            : "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz",
-        ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz")
+        ("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz") 
            : "http://somewhere2.org/somedir3/somefile_1.2.3.tar.gz",
        ("http://www.apache.org/dist/subversion/subversion-1.7.1.tar.bz2", "http://www.apache.org/dist", "http://archive.apache.org/dist")
            : "http://archive.apache.org/dist/subversion/subversion-1.7.1.tar.bz2",
        ("http://www.apache.org/dist/subversion/subversion-1.7.1.tar.bz2", "http://.*/.*", "file:///somepath/downloads/")
            : "file:///somepath/downloads/subversion-1.7.1.tar.bz2",
-        ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/BASENAME;protocol=http")
+        ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/BASENAME;protocol=http") 
-            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", 
-        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/BASENAME;protocol=http")
+        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/BASENAME;protocol=http") 
-            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+            : "git://somewhere.org/somedir/mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", 
-        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/MIRRORNAME;protocol=http")
+        ("git://git.invalid.infradead.org/foo/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "git://somewhere.org/somedir/MIRRORNAME;protocol=http") 
-            : "git://somewhere.org/somedir/git.invalid.infradead.org.foo.mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http",
+            : "git://somewhere.org/somedir/git.invalid.infradead.org.foo.mtd-utils.git;tag=1234567890123456789012345678901234567890;protocol=http", 
        ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org")
            : "http://somewhere2.org/somefile_1.2.3.tar.gz",
        ("http://somewhere.org/somedir1/somedir2/somefile_1.2.3.tar.gz", "http://.*/.*", "http://somewhere2.org/")
            : "http://somewhere2.org/somefile_1.2.3.tar.gz",
        ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://git.openembedded.org/bitbake;protocol=http")
            : "git://git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http",
        ("git://user1@someserver.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master", "git://someserver.org/bitbake;branch=master", "git://user2@git.openembedded.org/bitbake;protocol=http")
            : "git://user2@git.openembedded.org/bitbake;tag=1234567890123456789012345678901234567890;branch=master;protocol=http",
-        ("git://someserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=git;branch=master", "git://someserver.org/bitbake", "git://someotherserver.org/bitbake;protocol=https")
+
            : "git://someotherserver.org/bitbake;tag=1234567890123456789012345678901234567890;protocol=https;branch=master",
        ("gitsm://git.qemu.org/git/seabios.git/;protocol=https;name=roms/seabios;subpath=roms/seabios;bareclone=1;nobranch=1;rev=1234567890123456789012345678901234567890", "gitsm://.*/.*", "http://petalinux.xilinx.com/sswreleases/rel-v${XILINX_VER_MAIN}/downloads") : "http://petalinux.xilinx.com/sswreleases/rel-v%24%7BXILINX_VER_MAIN%7D/downloads/git2_git.qemu.org.git.seabios.git..tar.gz",
        ("https://somewhere.org/example/1.0.0/example;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/PATH")
            : "file:///mirror/example/1.0.0/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz",
        ("https://somewhere.org/example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz", "https://.*/.*", "file:///mirror/some-example-1.0.0.tgz")
            : "file:///mirror/some-example-1.0.0.tgz;downloadfilename=some-example-1.0.0.tgz",
        #Renaming files doesn't work
        #("http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere.org/somedir1/somefile_1.2.3.tar.gz", "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz") : "http://somewhere2.org/somedir3/somefile_2.3.4.tar.gz"
        #("file://sstate-xyz.tgz", "file://.*/.*", "file:///somewhere/1234/sstate-cache") : "file:///somewhere/1234/sstate-cache/sstate-xyz.tgz",
    }
-    mirrorvar = "http://.*/.* file:///somepath/downloads/ " \
+    mirrorvar = "http://.*/.* file:///somepath/downloads/ \n" \
-                "git://someserver.org/bitbake git://git.openembedded.org/bitbake " \
+                "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n" \
-                "https://.*/.* file:///someotherpath/downloads/ " \
+                "https://.*/.* file:///someotherpath/downloads/ \n" \
-                "http://.*/.* file:///someotherpath/downloads/"
+                "http://.*/.* file:///someotherpath/downloads/ \n"
    def test_urireplace(self):
        for k, v in self.replaceuris.items():
@@ -491,8 +469,8 @@ class MirrorUriTest(FetcherTest):
    def test_mirror_of_mirror(self):
        # Test if mirror of a mirror works
-        mirrorvar = self.mirrorvar + " http://.*/.* http://otherdownloads.yoctoproject.org/downloads/"
+        mirrorvar = self.mirrorvar + " http://.*/.* http://otherdownloads.yoctoproject.org/downloads/ \n"
-        mirrorvar = mirrorvar + " http://otherdownloads.yoctoproject.org/.* http://downloads2.yoctoproject.org/downloads/"
+        mirrorvar = mirrorvar + " http://otherdownloads.yoctoproject.org/.* http://downloads2.yoctoproject.org/downloads/ \n"
        fetcher = bb.fetch.FetchData("http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", self.d)
        mirrors = bb.fetch2.mirror_from_string(mirrorvar)
        uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d)
@@ -501,8 +479,8 @@ class MirrorUriTest(FetcherTest):
                                'http://otherdownloads.yoctoproject.org/downloads/bitbake-1.0.tar.gz',
                                'http://downloads2.yoctoproject.org/downloads/bitbake-1.0.tar.gz'])
-    recmirrorvar = "https://.*/[^/]*    http://AAAA/A/A/A/ " \
+    recmirrorvar = "https://.*/[^/]*    http://AAAA/A/A/A/ \n" \
-                   "https://.*/[^/]*    https://BBBB/B/B/B/"
+                   "https://.*/[^/]*    https://BBBB/B/B/B/ \n"
    def test_recursive(self):
        fetcher = bb.fetch.FetchData("https://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", self.d)
@@ -516,15 +494,15 @@ class MirrorUriTest(FetcherTest):
 class GitDownloadDirectoryNamingTest(FetcherTest):
    def setUp(self):
        super(GitDownloadDirectoryNamingTest, self).setUp()
-        self.recipe_url = "git://git.openembedded.org/bitbake;branch=master"
+        self.recipe_url = "git://git.openembedded.org/bitbake"
        self.recipe_dir = "git.openembedded.org.bitbake"
-        self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master"
+        self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
        self.mirror_dir = "github.com.openembedded.bitbake.git"
        self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
    def setup_mirror_rewrite(self):
-        self.d.setVar("PREMIRRORS", self.recipe_url + " " + self.mirror_url)
+        self.d.setVar("PREMIRRORS", self.recipe_url + " " + self.mirror_url + " \n")
    @skipIfNoNetwork()
    def test_that_directory_is_named_after_recipe_url_when_no_mirroring_is_used(self):
@@ -564,16 +542,16 @@ class GitDownloadDirectoryNamingTest(FetcherTest):
 class TarballNamingTest(FetcherTest):
    def setUp(self):
        super(TarballNamingTest, self).setUp()
-        self.recipe_url = "git://git.openembedded.org/bitbake;branch=master"
+        self.recipe_url = "git://git.openembedded.org/bitbake"
        self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz"
-        self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master"
+        self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
        self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz"
        self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1')
        self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
    def setup_mirror_rewrite(self):
-        self.d.setVar("PREMIRRORS", self.recipe_url + " " + self.mirror_url)
+        self.d.setVar("PREMIRRORS", self.recipe_url + " " + self.mirror_url + " \n")
    @skipIfNoNetwork()
    def test_that_the_recipe_tarball_is_created_when_no_mirroring_is_used(self):
@@ -598,9 +576,9 @@ class TarballNamingTest(FetcherTest):
 class GitShallowTarballNamingTest(FetcherTest):
    def setUp(self):
        super(GitShallowTarballNamingTest, self).setUp()
-        self.recipe_url = "git://git.openembedded.org/bitbake;branch=master"
+        self.recipe_url = "git://git.openembedded.org/bitbake"
        self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz"
-        self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master"
+        self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
        self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz"
        self.d.setVar('BB_GIT_SHALLOW', '1')
@@ -608,7 +586,7 @@ class GitShallowTarballNamingTest(FetcherTest):
        self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
    def setup_mirror_rewrite(self):
-        self.d.setVar("PREMIRRORS", self.recipe_url + " " + self.mirror_url)
+        self.d.setVar("PREMIRRORS", self.recipe_url + " " + self.mirror_url + " \n")
    @skipIfNoNetwork()
    def test_that_the_tarball_is_named_after_recipe_url_when_no_mirroring_is_used(self):
@@ -630,37 +608,6 @@ class GitShallowTarballNamingTest(FetcherTest):
        self.assertIn(self.mirror_tarball, dir)
 class CleanTarballTest(FetcherTest):
    def setUp(self):
        super(CleanTarballTest, self).setUp()
        self.recipe_url = "git://git.openembedded.org/bitbake"
        self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz"
        self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1')
        self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
    @skipIfNoNetwork()
    def test_that_the_tarball_contents_does_not_leak_info(self):
        fetcher = bb.fetch.Fetch([self.recipe_url], self.d)
        fetcher.download()
        fetcher.unpack(self.unpackdir)
        mtime = bb.process.run('git log --all -1 --format=%ct',
                cwd=os.path.join(self.unpackdir, 'git'))
        self.assertEqual(len(mtime), 2)
        mtime = int(mtime[0])
        archive = tarfile.open(os.path.join(self.dldir, self.recipe_tarball))
        self.assertNotEqual(len(archive.members), 0)
        for member in archive.members:
            self.assertEqual(member.uname, 'oe')
            self.assertEqual(member.uid, 0)
            self.assertEqual(member.gname, 'oe')
            self.assertEqual(member.gid, 0)
            self.assertEqual(member.mtime, mtime)
 class FetcherLocalTest(FetcherTest):
    def setUp(self):
        def touch(fn):
@@ -678,9 +625,6 @@ class FetcherLocalTest(FetcherTest):
        os.makedirs(os.path.join(self.localsrcdir, 'dir', 'subdir'))
        touch(os.path.join(self.localsrcdir, 'dir', 'subdir', 'e'))
        touch(os.path.join(self.localsrcdir, r'backslash\x2dsystemd-unit.device'))
        bb.process.run('tar cf archive.tar -C dir .', cwd=self.localsrcdir)
        bb.process.run('tar czf archive.tar.gz -C dir .', cwd=self.localsrcdir)
        bb.process.run('tar cjf archive.tar.bz2 -C dir .', cwd=self.localsrcdir)
        self.d.setVar("FILESPATH", self.localsrcdir)
    def fetchUnpack(self, uris):
@@ -735,39 +679,32 @@ class FetcherLocalTest(FetcherTest):
        with self.assertRaises(bb.fetch2.UnpackError):
            self.fetchUnpack(['file://a;subdir=/bin/sh'])
    def test_local_striplevel(self):
        tree = self.fetchUnpack(['file://archive.tar;subdir=bar;striplevel=1'])
        self.assertEqual(tree, ['bar/c', 'bar/d', 'bar/subdir/e'])
    def test_local_striplevel_gzip(self):
        tree = self.fetchUnpack(['file://archive.tar.gz;subdir=bar;striplevel=1'])
        self.assertEqual(tree, ['bar/c', 'bar/d', 'bar/subdir/e'])
    def test_local_striplevel_bzip2(self):
        tree = self.fetchUnpack(['file://archive.tar.bz2;subdir=bar;striplevel=1'])
        self.assertEqual(tree, ['bar/c', 'bar/d', 'bar/subdir/e'])
    def dummyGitTest(self, suffix):
        # Create dummy local Git repo
        src_dir = tempfile.mkdtemp(dir=self.tempdir,
                                   prefix='gitfetch_localusehead_')
-        self.gitdir = os.path.abspath(src_dir)
+        src_dir = os.path.abspath(src_dir)
-        self.git_init()
+        bb.process.run("git init", cwd=src_dir)
-        self.git(['commit', '--allow-empty', '-m', 'Dummy commit'])
+        bb.process.run("git config user.email 'you@example.com'", cwd=src_dir)
        bb.process.run("git config user.name 'Your Name'", cwd=src_dir)
        bb.process.run("git commit --allow-empty -m'Dummy commit'",
                       cwd=src_dir)
        # Use other branch than master
-        self.git(['checkout', '-b', 'my-devel'])
+        bb.process.run("git checkout -b my-devel", cwd=src_dir)
-        self.git(['commit', '--allow-empty', '-m', 'Dummy commit 2'])
+        bb.process.run("git commit --allow-empty -m'Dummy commit 2'",
-        orig_rev = self.git(['rev-parse', 'HEAD']).strip()
+                       cwd=src_dir)
        stdout = bb.process.run("git rev-parse HEAD", cwd=src_dir)
        orig_rev = stdout[0].strip()
        # Fetch and check revision
        self.d.setVar("SRCREV", "AUTOINC")
-        self.d.setVar("__BBSEENSRCREV", "1")
+        url = "git://" + src_dir + ";protocol=file;" + suffix
        url = "git://" + self.gitdir + ";branch=master;protocol=file;" + suffix
        fetcher = bb.fetch.Fetch([url], self.d)
        fetcher.download()
        fetcher.unpack(self.unpackdir)
-        unpack_rev = self.git(['rev-parse', 'HEAD'],
+        stdout = bb.process.run("git rev-parse HEAD",
-                              cwd=os.path.join(self.unpackdir, 'git')).strip()
+                                cwd=os.path.join(self.unpackdir, 'git'))
        unpack_rev = stdout[0].strip()
        self.assertEqual(orig_rev, unpack_rev)
    def test_local_gitfetch_usehead(self):
@@ -914,14 +851,14 @@ class FetcherNetworkTest(FetcherTest):
    @skipIfNoNetwork()
    def test_fetch_mirror_of_mirror(self):
-        self.d.setVar("MIRRORS", "http://.*/.* http://invalid2.yoctoproject.org/ http://invalid2.yoctoproject.org/.* https://downloads.yoctoproject.org/releases/bitbake")
+        self.d.setVar("MIRRORS", "http://.*/.* http://invalid2.yoctoproject.org/ \n http://invalid2.yoctoproject.org/.* https://downloads.yoctoproject.org/releases/bitbake")
        fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
        fetcher.download()
        self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
    @skipIfNoNetwork()
    def test_fetch_file_mirror_of_mirror(self):
-        self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ file:///some1where/.* file://some2where/ file://some2where/.* https://downloads.yoctoproject.org/releases/bitbake")
+        self.d.setVar("MIRRORS", "http://.*/.* file:///some1where/ \n file:///some1where/.* file://some2where/ \n file://some2where/.* https://downloads.yoctoproject.org/releases/bitbake")
        fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
        os.mkdir(self.dldir + "/some2where")
        fetcher.download()
@@ -967,8 +904,7 @@ class FetcherNetworkTest(FetcherTest):
    def gitfetcher(self, url1, url2):
        def checkrevision(self, fetcher):
            fetcher.unpack(self.unpackdir)
-            revision = self.git(['rev-parse', 'HEAD'],
+            revision = bb.process.run("git rev-parse HEAD", shell=True, cwd=self.unpackdir + "/git")[0].strip()
                                cwd=os.path.join(self.unpackdir, 'git')).strip()
            self.assertEqual(revision, "270a05b0b4ba0959fe0624d2a4885d7b70426da5")
        self.d.setVar("BB_GENERATE_MIRROR_TARBALLS", "1")
@@ -986,19 +922,19 @@ class FetcherNetworkTest(FetcherTest):
    @skipIfNoNetwork()
    def test_gitfetch(self):
-        url1 = url2 = "git://git.openembedded.org/bitbake;branch=master"
+        url1 = url2 = "git://git.openembedded.org/bitbake"
        self.gitfetcher(url1, url2)
    @skipIfNoNetwork()
    def test_gitfetch_goodsrcrev(self):
        # SRCREV is set but matches rev= parameter
-        url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master"
+        url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5"
        self.gitfetcher(url1, url2)
    @skipIfNoNetwork()
    def test_gitfetch_badsrcrev(self):
        # SRCREV is set but does not match rev= parameter
-        url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master"
+        url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5"
        self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2)
    @skipIfNoNetwork()
@@ -1013,7 +949,7 @@ class FetcherNetworkTest(FetcherTest):
        # `usehead=1' and instead fetch the specified SRCREV. See
        # test_local_gitfetch_usehead() for a positive use of the usehead
        # feature.
-        url = "git://git.openembedded.org/bitbake;usehead=1;branch=master"
+        url = "git://git.openembedded.org/bitbake;usehead=1"
        self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url)
    @skipIfNoNetwork()
@@ -1022,20 +958,20 @@ class FetcherNetworkTest(FetcherTest):
        # `usehead=1' and instead fetch the specified SRCREV. See
        # test_local_gitfetch_usehead() for a positive use of the usehead
        # feature.
-        url = "git://git.openembedded.org/bitbake;usehead=1;name=newName;branch=master"
+        url = "git://git.openembedded.org/bitbake;usehead=1;name=newName"
        self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url)
    @skipIfNoNetwork()
    def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self):
-        recipeurl = "git://git.openembedded.org/bitbake;branch=master"
+        recipeurl = "git://git.openembedded.org/bitbake"
-        mirrorurl = "git://someserver.org/bitbake;branch=master"
+        mirrorurl = "git://someserver.org/bitbake"
-        self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake")
+        self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n")
        self.gitfetcher(recipeurl, mirrorurl)
    @skipIfNoNetwork()
    def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self):
-        recipeurl = "git://someserver.org/bitbake;branch=master"
+        recipeurl = "git://someserver.org/bitbake"
-        self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake")
+        self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n")
        self.gitfetcher(recipeurl, recipeurl)
    @skipIfNoNetwork()
@@ -1044,16 +980,16 @@ class FetcherNetworkTest(FetcherTest):
        recipeurl = "git://someserver.org/bitbake"
        self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git")
        os.chdir(self.tempdir)
-        self.git(['clone', realurl, self.sourcedir], cwd=self.tempdir)
+        bb.process.run("git clone %s %s 2> /dev/null" % (realurl, self.sourcedir), shell=True)
-        self.d.setVar("PREMIRRORS", "%s git://%s;protocol=file" % (recipeurl, self.sourcedir))
+        self.d.setVar("PREMIRRORS", "%s git://%s;protocol=file \n" % (recipeurl, self.sourcedir))
        self.gitfetcher(recipeurl, recipeurl)
    @skipIfNoNetwork()
    def test_git_submodule(self):
        # URL with ssh submodules
-        url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7;branch=master"
+        url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7"
        # Original URL (comment this if you have ssh access to git.yoctoproject.org)
-        url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee;branch=master"
+        url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee"
        fetcher = bb.fetch.Fetch([url], self.d)
        fetcher.download()
        # Previous cwd has been deleted
@@ -1249,43 +1185,43 @@ class SVNTest(FetcherTest):
 class TrustedNetworksTest(FetcherTest):
    def test_trusted_network(self):
        # Ensure trusted_network returns False when the host IS in the list.
-        url = "git://Someserver.org/foo;rev=1;branch=master"
+        url = "git://Someserver.org/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org someserver.org server2.org server3.org")
        self.assertTrue(bb.fetch.trusted_network(self.d, url))
    def test_wild_trusted_network(self):
        # Ensure trusted_network returns true when the *.host IS in the list.
-        url = "git://Someserver.org/foo;rev=1;branch=master"
+        url = "git://Someserver.org/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org")
        self.assertTrue(bb.fetch.trusted_network(self.d, url))
    def test_prefix_wild_trusted_network(self):
        # Ensure trusted_network returns true when the prefix matches *.host.
-        url = "git://git.Someserver.org/foo;rev=1;branch=master"
+        url = "git://git.Someserver.org/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org")
        self.assertTrue(bb.fetch.trusted_network(self.d, url))
    def test_two_prefix_wild_trusted_network(self):
        # Ensure trusted_network returns true when the prefix matches *.host.
-        url = "git://something.git.Someserver.org/foo;rev=1;branch=master"
+        url = "git://something.git.Someserver.org/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org")
        self.assertTrue(bb.fetch.trusted_network(self.d, url))
    def test_port_trusted_network(self):
        # Ensure trusted_network returns True, even if the url specifies a port.
-        url = "git://someserver.org:8080/foo;rev=1;branch=master"
+        url = "git://someserver.org:8080/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "someserver.org")
        self.assertTrue(bb.fetch.trusted_network(self.d, url))
    def test_untrusted_network(self):
        # Ensure trusted_network returns False when the host is NOT in the list.
-        url = "git://someserver.org/foo;rev=1;branch=master"
+        url = "git://someserver.org/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org server2.org server3.org")
        self.assertFalse(bb.fetch.trusted_network(self.d, url))
    def test_wild_untrusted_network(self):
        # Ensure trusted_network returns False when the host is NOT in the list.
-        url = "git://*.someserver.org/foo;rev=1;branch=master"
+        url = "git://*.someserver.org/foo;rev=1"
        self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org server2.org server3.org")
        self.assertFalse(bb.fetch.trusted_network(self.d, url))
@@ -1323,32 +1259,32 @@ class FetchLatestVersionTest(FetcherTest):
            : "1.99.4",
        # version pattern "vX.Y"
        # mirror of git.infradead.org since network issues interfered with testing
-        ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git;branch=master", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "")
+        ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "")
            : "1.5.0",
        # version pattern "pkg_name-X.Y"
        # mirror of git://anongit.freedesktop.org/git/xorg/proto/presentproto since network issues interfered with testing
-        ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto;branch=master", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "")
+        ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "")
            : "1.0",
        # version pattern "pkg_name-vX.Y.Z"
-        ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "")
+        ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "")
            : "1.4.0",
        # combination version pattern
-        ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "")
+        ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https", "cd44ee6644c3641507fb53b8a2a69137f2971219", "")
            : "1.2.0",
-        ("u-boot-mkimage", "git://source.denx.de/u-boot/u-boot.git;branch=master;protocol=https", "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c", "")
+        ("u-boot-mkimage", "git://git.denx.de/u-boot.git;branch=master;protocol=git", "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c", "")
            : "2014.01",
        # version pattern "yyyymmdd"
-        ("mobile-broadband-provider-info", "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=master", "4ed19e11c2975105b71b956440acdb25d46a347d", "")
+        ("mobile-broadband-provider-info", "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https", "4ed19e11c2975105b71b956440acdb25d46a347d", "")
            : "20120614",
        # packages with a valid UPSTREAM_CHECK_GITTAGREGEX
                # mirror of git://anongit.freedesktop.org/xorg/driver/xf86-video-omap since network issues interfered with testing
-        ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap;branch=master", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))")
+        ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))")
            : "0.4.3",
-        ("build-appliance-image", "git://git.yoctoproject.org/poky;branch=master", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))")
+        ("build-appliance-image", "git://git.yoctoproject.org/poky", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))")
            : "11.0.0",
        ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))")
            : "1.3.59",
-        ("remake", "git://github.com/rocky/remake.git;protocol=https;branch=master", "f05508e521987c8494c92d9c2871aec46307d51d", r"(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))")
+        ("remake", "git://github.com/rocky/remake.git;protocol=https", "f05508e521987c8494c92d9c2871aec46307d51d", r"(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))")
            : "3.82+dbg0.9",
    }
@@ -1394,12 +1330,6 @@ class FetchLatestVersionTest(FetcherTest):
        # http://ftp.debian.org/debian/pool/main/d/db5.3/
        ("db", "/berkeley-db/db-5.3.21.tar.gz", "/debian/pool/main/d/db5.3/", r"(?P<name>db5\.3_)(?P<pver>\d+(\.\d+)+).+\.orig\.tar\.xz")
            : "5.3.10",
        #
        # packages where the tarball compression changed in the new version
        #
        # http://ftp.debian.org/debian/pool/main/m/minicom/minicom_2.7.1.orig.tar.gz
        ("minicom", "/debian/pool/main/m/minicom/minicom_2.7.1.orig.tar.gz", "", "")
            : "2.8",
    }
    @skipIfNoNetwork()
@@ -1485,7 +1415,9 @@ class GitMakeShallowTest(FetcherTest):
        FetcherTest.setUp(self)
        self.gitdir = os.path.join(self.tempdir, 'gitshallow')
        bb.utils.mkdirhier(self.gitdir)
-        self.git_init()
+        bb.process.run('git init', cwd=self.gitdir)
        bb.process.run('git config user.email "you@example.com"', cwd=self.gitdir)
        bb.process.run('git config user.name "Your Name"', cwd=self.gitdir)
    def assertRefs(self, expected_refs):
        actual_refs = self.git(['for-each-ref', '--format=%(refname)']).splitlines()
@@ -1499,6 +1431,13 @@ class GitMakeShallowTest(FetcherTest):
        actual_count = len(revs.splitlines())
        self.assertEqual(expected_count, actual_count, msg='Object count `%d` is not the expected `%d`' % (actual_count, expected_count))
    def git(self, cmd):
        if isinstance(cmd, str):
            cmd = 'git ' + cmd
        else:
            cmd = ['git'] + cmd
        return bb.process.run(cmd, cwd=self.gitdir)[0]
    def make_shallow(self, args=None):
        if args is None:
            args = ['HEAD']
@@ -1601,13 +1540,15 @@ class GitShallowTest(FetcherTest):
        self.srcdir = os.path.join(self.tempdir, 'gitsource')
        bb.utils.mkdirhier(self.srcdir)
-        self.git_init(cwd=self.srcdir)
+        self.git('init', cwd=self.srcdir)
        self.git('config user.email "you@example.com"', cwd=self.srcdir)
        self.git('config user.name "Your Name"', cwd=self.srcdir)
        self.d.setVar('WORKDIR', self.tempdir)
        self.d.setVar('S', self.gitdir)
        self.d.delVar('PREMIRRORS')
        self.d.delVar('MIRRORS')
-        uri = 'git://%s;protocol=file;subdir=${S};branch=master' % self.srcdir
+        uri = 'git://%s;protocol=file;subdir=${S}' % self.srcdir
        self.d.setVar('SRC_URI', uri)
        self.d.setVar('SRCREV', '${AUTOREV}')
        self.d.setVar('AUTOREV', '${@bb.fetch2.get_autorev(d)}')
@@ -1615,7 +1556,6 @@ class GitShallowTest(FetcherTest):
        self.d.setVar('BB_GIT_SHALLOW', '1')
        self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '0')
        self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1')
        self.d.setVar("__BBSEENSRCREV", "1")
    def assertRefs(self, expected_refs, cwd=None):
        if cwd is None:
@@ -1633,6 +1573,15 @@ class GitShallowTest(FetcherTest):
        actual_count = len(revs.splitlines())
        self.assertEqual(expected_count, actual_count, msg='Object count `%d` is not the expected `%d`' % (actual_count, expected_count))
    def git(self, cmd, cwd=None):
        if isinstance(cmd, str):
            cmd = 'git ' + cmd
        else:
            cmd = ['git'] + cmd
        if cwd is None:
            cwd = self.gitdir
        return bb.process.run(cmd, cwd=cwd)[0]
    def add_empty_file(self, path, cwd=None, msg=None):
        if msg is None:
            msg = path
@@ -1827,7 +1776,9 @@ class GitShallowTest(FetcherTest):
        smdir = os.path.join(self.tempdir, 'gitsubmodule')
        bb.utils.mkdirhier(smdir)
-        self.git_init(cwd=smdir)
+        self.git('init', cwd=smdir)
        self.git('config user.email "you@example.com"', cwd=smdir)
        self.git('config user.name "Your Name"', cwd=smdir)
        # Make this look like it was cloned from a remote...
        self.git('config --add remote.origin.url "%s"' % smdir, cwd=smdir)
        self.git('config --add remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"', cwd=smdir)
@@ -1835,11 +1786,11 @@ class GitShallowTest(FetcherTest):
        self.add_empty_file('bsub', cwd=smdir)
        self.git('submodule init', cwd=self.srcdir)
-        self.git('-c protocol.file.allow=always submodule add file://%s' % smdir, cwd=self.srcdir)
+        self.git('submodule add file://%s' % smdir, cwd=self.srcdir)
        self.git('submodule update', cwd=self.srcdir)
        self.git('commit -m submodule -a', cwd=self.srcdir)
-        uri = 'gitsm://%s;protocol=file;subdir=${S};branch=master' % self.srcdir
+        uri = 'gitsm://%s;protocol=file;subdir=${S}' % self.srcdir
        fetcher, ud = self.fetch_shallow(uri)
        # Verify the main repository is shallow
@@ -1857,7 +1808,9 @@ class GitShallowTest(FetcherTest):
        smdir = os.path.join(self.tempdir, 'gitsubmodule')
        bb.utils.mkdirhier(smdir)
-        self.git_init(cwd=smdir)
+        self.git('init', cwd=smdir)
        self.git('config user.email "you@example.com"', cwd=smdir)
        self.git('config user.name "Your Name"', cwd=smdir)
        # Make this look like it was cloned from a remote...
        self.git('config --add remote.origin.url "%s"' % smdir, cwd=smdir)
        self.git('config --add remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"', cwd=smdir)
@@ -1865,7 +1818,7 @@ class GitShallowTest(FetcherTest):
        self.add_empty_file('bsub', cwd=smdir)
        self.git('submodule init', cwd=self.srcdir)
-        self.git('-c protocol.file.allow=always submodule add file://%s' % smdir, cwd=self.srcdir)
+        self.git('submodule add file://%s' % smdir, cwd=self.srcdir)
        self.git('submodule update', cwd=self.srcdir)
        self.git('commit -m submodule -a', cwd=self.srcdir)
@@ -1877,7 +1830,7 @@ class GitShallowTest(FetcherTest):
        # Set up the mirror
        mirrordir = os.path.join(self.tempdir, 'mirror')
        bb.utils.rename(self.dldir, mirrordir)
-        self.d.setVar('PREMIRRORS', 'gitsm://.*/.* file://%s/' % mirrordir)
+        self.d.setVar('PREMIRRORS', 'gitsm://.*/.* file://%s/\n' % mirrordir)
        # Fetch from the mirror
        bb.utils.remove(self.dldir, recurse=True)
@@ -1903,7 +1856,7 @@ class GitShallowTest(FetcherTest):
            self.git('commit --author "Foo Bar <foo@bar>" -m annex-c -a', cwd=self.srcdir)
            bb.process.run('chmod u+w -R %s' % self.srcdir)
-            uri = 'gitannex://%s;protocol=file;subdir=${S};branch=master' % self.srcdir
+            uri = 'gitannex://%s;protocol=file;subdir=${S}' % self.srcdir
            fetcher, ud = self.fetch_shallow(uri)
            self.assertRevCount(1)
@@ -1992,7 +1945,7 @@ class GitShallowTest(FetcherTest):
        # Set up the mirror
        mirrordir = os.path.join(self.tempdir, 'mirror')
        bb.utils.mkdirhier(mirrordir)
-        self.d.setVar('PREMIRRORS', 'git://.*/.* file://%s/' % mirrordir)
+        self.d.setVar('PREMIRRORS', 'git://.*/.* file://%s/\n' % mirrordir)
        bb.utils.rename(os.path.join(self.dldir, mirrortarball),
                  os.path.join(mirrordir, mirrortarball))
@@ -2150,7 +2103,7 @@ class GitShallowTest(FetcherTest):
        self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0')
        self.d.setVar('BB_GIT_SHALLOW', '1')
        self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1')
-        fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests;branch=master"], self.d)
+        fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests"], self.d)
        fetcher.download()
        bb.utils.remove(self.dldir + "/*.tar.gz")
@@ -2160,18 +2113,12 @@ class GitShallowTest(FetcherTest):
        self.assertIn("fstests.doap", dir)
 class GitLfsTest(FetcherTest):
    def skipIfNoGitLFS():
        import shutil
        if not shutil.which('git-lfs'):
            return unittest.skip('git-lfs not installed')
        return lambda f: f
    def setUp(self):
        FetcherTest.setUp(self)
        self.gitdir = os.path.join(self.tempdir, 'git')
        self.srcdir = os.path.join(self.tempdir, 'gitsource')
-
+        
        self.d.setVar('WORKDIR', self.tempdir)
        self.d.setVar('S', self.gitdir)
        self.d.delVar('PREMIRRORS')
@@ -2179,18 +2126,24 @@ class GitLfsTest(FetcherTest):
        self.d.setVar('SRCREV', '${AUTOREV}')
        self.d.setVar('AUTOREV', '${@bb.fetch2.get_autorev(d)}')
        self.d.setVar("__BBSEENSRCREV", "1")
        bb.utils.mkdirhier(self.srcdir)
-        self.git_init(cwd=self.srcdir)
+        self.git('init', cwd=self.srcdir)
-        self.commit_file('.gitattributes', '*.mp3 filter=lfs -text')
+        self.git('config user.email "you@example.com"', cwd=self.srcdir)
        self.git('config user.name "Your Name"', cwd=self.srcdir)
        with open(os.path.join(self.srcdir, '.gitattributes'), 'wt') as attrs:
            attrs.write('*.mp3 filter=lfs -text')
        self.git(['add', '.gitattributes'], cwd=self.srcdir)
        self.git(['commit', '-m', "attributes", '.gitattributes'], cwd=self.srcdir)
-    def commit_file(self, filename, content):
+    def git(self, cmd, cwd=None):
-        with open(os.path.join(self.srcdir, filename), "w") as f:
+        if isinstance(cmd, str):
-            f.write(content)
+            cmd = 'git ' + cmd
-        self.git(["add", filename], cwd=self.srcdir)
+        else:
-        self.git(["commit", "-m", "Change"], cwd=self.srcdir)
+            cmd = ['git'] + cmd
-        return self.git(["rev-parse", "HEAD"], cwd=self.srcdir).strip()
+        if cwd is None:
            cwd = self.gitdir
        return bb.process.run(cmd, cwd=cwd)[0]
    def fetch(self, uri=None, download=True):
        uris = self.d.getVar('SRC_URI').split()
@@ -2203,86 +2156,10 @@ class GitLfsTest(FetcherTest):
        ud = fetcher.ud[uri]
        return fetcher, ud
    def get_real_git_lfs_file(self):
        self.d.setVar('PATH', os.environ.get('PATH'))
        fetcher, ud = self.fetch()
        fetcher.unpack(self.d.getVar('WORKDIR'))
        unpacked_lfs_file = os.path.join(self.d.getVar('WORKDIR'), 'git', "Cat_poster_1.jpg")
        return unpacked_lfs_file
    @skipIfNoGitLFS()
    def test_fetch_lfs_on_srcrev_change(self):
        """Test if fetch downloads missing LFS objects when a different revision within an existing repository is requested"""
        self.git(["lfs", "install", "--local"], cwd=self.srcdir)
        @contextlib.contextmanager
        def hide_upstream_repository():
            """Hide the upstream repository to make sure that git lfs cannot pull from it"""
            temp_name = self.srcdir + ".bak"
            os.rename(self.srcdir, temp_name)
            try:
                yield
            finally:
                os.rename(temp_name, self.srcdir)
        def fetch_and_verify(revision, filename, content):
            self.d.setVar('SRCREV', revision)
            fetcher, ud = self.fetch()
            with hide_upstream_repository():
                workdir = self.d.getVar('WORKDIR')
                fetcher.unpack(workdir)
                with open(os.path.join(workdir, "git", filename)) as f:
                    self.assertEqual(f.read(), content)
        commit_1 = self.commit_file("a.mp3", "version 1")
        commit_2 = self.commit_file("a.mp3", "version 2")
        self.d.setVar('SRC_URI', "git://%s;protocol=file;lfs=1;branch=master" % self.srcdir)
        # Seed the local download folder by fetching the latest commit and verifying that the LFS contents are
        # available even when the upstream repository disappears.
        fetch_and_verify(commit_2, "a.mp3", "version 2")
        # Verify that even when an older revision is fetched, the needed LFS objects are fetched into the download
        # folder.
        fetch_and_verify(commit_1, "a.mp3", "version 1")
    @skipIfNoGitLFS()
    @skipIfNoNetwork()
    def test_real_git_lfs_repo_succeeds_without_lfs_param(self):
        self.d.setVar('SRC_URI', "git://gitlab.com/gitlab-examples/lfs.git;protocol=https;branch=master")
        f = self.get_real_git_lfs_file()
        self.assertTrue(os.path.exists(f))
        self.assertEqual("c0baab607a97839c9a328b4310713307", bb.utils.md5_file(f))
    @skipIfNoGitLFS()
    @skipIfNoNetwork()
    def test_real_git_lfs_repo_succeeds(self):
        self.d.setVar('SRC_URI', "git://gitlab.com/gitlab-examples/lfs.git;protocol=https;branch=master;lfs=1")
        f = self.get_real_git_lfs_file()
        self.assertTrue(os.path.exists(f))
        self.assertEqual("c0baab607a97839c9a328b4310713307", bb.utils.md5_file(f))
    @skipIfNoGitLFS()
    @skipIfNoNetwork()
    def test_real_git_lfs_repo_succeeds(self):
        self.d.setVar('SRC_URI', "git://gitlab.com/gitlab-examples/lfs.git;protocol=https;branch=master;lfs=0")
        f = self.get_real_git_lfs_file()
        # This is the actual non-smudged placeholder file on the repo if git-lfs does not run
        lfs_file = (
                   'version https://git-lfs.github.com/spec/v1\n'
                   'oid sha256:34be66b1a39a1955b46a12588df9d5f6fc1da790e05cf01f3c7422f4bbbdc26b\n'
                   'size 11423554\n'
        )
        with open(f) as fh:
            self.assertEqual(lfs_file, fh.read())
    def test_lfs_enabled(self):
        import shutil
-        uri = 'git://%s;protocol=file;lfs=1;branch=master' % self.srcdir
+        uri = 'git://%s;protocol=file;subdir=${S};lfs=1' % self.srcdir
        self.d.setVar('SRC_URI', uri)
        # Careful: suppress initial attempt at downloading until
@@ -2297,21 +2174,17 @@ class GitLfsTest(FetcherTest):
            shutil.rmtree(self.gitdir, ignore_errors=True)
            fetcher.unpack(self.d.getVar('WORKDIR'))
-        old_find_git_lfs = ud.method._find_git_lfs
+        # If git-lfs cannot be found, the unpack should throw an error
-        try:
+        with self.assertRaises(bb.fetch2.FetchError):
-            # If git-lfs cannot be found, the unpack should throw an error
+            fetcher.download()
-            with self.assertRaises(bb.fetch2.FetchError):
+            ud.method._find_git_lfs = lambda d: False
-                fetcher.download()
+            shutil.rmtree(self.gitdir, ignore_errors=True)
-                ud.method._find_git_lfs = lambda d: False
+            fetcher.unpack(self.d.getVar('WORKDIR'))
                shutil.rmtree(self.gitdir, ignore_errors=True)
                fetcher.unpack(self.d.getVar('WORKDIR'))
        finally:
            ud.method._find_git_lfs = old_find_git_lfs
    def test_lfs_disabled(self):
        import shutil
-        uri = 'git://%s;protocol=file;lfs=0;branch=master' % self.srcdir
+        uri = 'git://%s;protocol=file;subdir=${S};lfs=0' % self.srcdir
        self.d.setVar('SRC_URI', uri)
        # In contrast to test_lfs_enabled(), allow the implicit download
@@ -2321,31 +2194,27 @@ class GitLfsTest(FetcherTest):
        fetcher, ud = self.fetch()
        self.assertIsNotNone(ud.method._find_git_lfs)
-        old_find_git_lfs = ud.method._find_git_lfs
+        # If git-lfs can be found, the unpack should be successful. A
-        try:
+        # live copy of git-lfs is not required for this case, so
-            # If git-lfs can be found, the unpack should be successful. A
+        # unconditionally forge its presence.
-            # live copy of git-lfs is not required for this case, so
+        ud.method._find_git_lfs = lambda d: True
-            # unconditionally forge its presence.
+        shutil.rmtree(self.gitdir, ignore_errors=True)
-            ud.method._find_git_lfs = lambda d: True
+        fetcher.unpack(self.d.getVar('WORKDIR'))
            shutil.rmtree(self.gitdir, ignore_errors=True)
            fetcher.unpack(self.d.getVar('WORKDIR'))
            # If git-lfs cannot be found, the unpack should be successful
-            ud.method._find_git_lfs = lambda d: False
+        # If git-lfs cannot be found, the unpack should be successful
-            shutil.rmtree(self.gitdir, ignore_errors=True)
+        ud.method._find_git_lfs = lambda d: False
-            fetcher.unpack(self.d.getVar('WORKDIR'))
+        shutil.rmtree(self.gitdir, ignore_errors=True)
-        finally:
+        fetcher.unpack(self.d.getVar('WORKDIR'))
            ud.method._find_git_lfs = old_find_git_lfs
 class GitURLWithSpacesTest(FetcherTest):
    test_git_urls = {
-        "git://tfs-example.org:22/tfs/example%20path/example.git;branch=master" : {
+        "git://tfs-example.org:22/tfs/example%20path/example.git" : {
-            'url': 'git://tfs-example.org:22/tfs/example%20path/example.git;branch=master',
+            'url': 'git://tfs-example.org:22/tfs/example%20path/example.git',
            'gitsrcname': 'tfs-example.org.22.tfs.example_path.example.git',
            'path': '/tfs/example path/example.git'
        },
-        "git://tfs-example.org:22/tfs/example%20path/example%20repo.git;branch=master" : {
+        "git://tfs-example.org:22/tfs/example%20path/example%20repo.git" : {
-            'url': 'git://tfs-example.org:22/tfs/example%20path/example%20repo.git;branch=master',
+            'url': 'git://tfs-example.org:22/tfs/example%20path/example%20repo.git',
            'gitsrcname': 'tfs-example.org.22.tfs.example_path.example_repo.git',
            'path': '/tfs/example path/example repo.git'
        }
@@ -2369,48 +2238,11 @@ class GitURLWithSpacesTest(FetcherTest):
            self.assertEqual(ud.clonedir, os.path.join(self.dldir, "git2", ref['gitsrcname']))
            self.assertEqual(ud.fullmirror, os.path.join(self.dldir, "git2_" + ref['gitsrcname'] + '.tar.gz'))
 class CrateTest(FetcherTest):
    @skipIfNoNetwork()
    def test_crate_url(self):
        uri = "crate://crates.io/glob/0.2.11"
        self.d.setVar('SRC_URI', uri)
        uris = self.d.getVar('SRC_URI').split()
        d = self.d
        fetcher = bb.fetch2.Fetch(uris, self.d)
        fetcher.download()
        fetcher.unpack(self.tempdir)
        self.assertEqual(sorted(os.listdir(self.tempdir)), ['cargo_home', 'download' , 'unpacked'])
        self.assertEqual(sorted(os.listdir(self.tempdir + "/download")), ['glob-0.2.11.crate', 'glob-0.2.11.crate.done'])
        self.assertTrue(os.path.exists(self.tempdir + "/cargo_home/bitbake/glob-0.2.11/.cargo-checksum.json"))
        self.assertTrue(os.path.exists(self.tempdir + "/cargo_home/bitbake/glob-0.2.11/src/lib.rs"))
    @skipIfNoNetwork()
    def test_crate_url_multi(self):
        uri = "crate://crates.io/glob/0.2.11 crate://crates.io/time/0.1.35"
        self.d.setVar('SRC_URI', uri)
        uris = self.d.getVar('SRC_URI').split()
        d = self.d
        fetcher = bb.fetch2.Fetch(uris, self.d)
        fetcher.download()
        fetcher.unpack(self.tempdir)
        self.assertEqual(sorted(os.listdir(self.tempdir)), ['cargo_home', 'download' , 'unpacked'])
        self.assertEqual(sorted(os.listdir(self.tempdir + "/download")), ['glob-0.2.11.crate', 'glob-0.2.11.crate.done', 'time-0.1.35.crate', 'time-0.1.35.crate.done'])
        self.assertTrue(os.path.exists(self.tempdir + "/cargo_home/bitbake/glob-0.2.11/.cargo-checksum.json"))
        self.assertTrue(os.path.exists(self.tempdir + "/cargo_home/bitbake/glob-0.2.11/src/lib.rs"))
        self.assertTrue(os.path.exists(self.tempdir + "/cargo_home/bitbake/time-0.1.35/.cargo-checksum.json"))
        self.assertTrue(os.path.exists(self.tempdir + "/cargo_home/bitbake/time-0.1.35/src/lib.rs"))
 class NPMTest(FetcherTest):
    def skipIfNoNpm():
        import shutil
        if not shutil.which('npm'):
-            return unittest.skip('npm not installed')
+            return unittest.skip('npm not installed, tests being skipped')
        return lambda f: f
    @skipIfNoNpm()
@@ -2455,24 +2287,15 @@ class NPMTest(FetcherTest):
        ud = fetcher.ud[fetcher.urls[0]]
        fetcher.download()
        self.assertTrue(os.path.exists(ud.localpath))
-
+        # Setup the mirror
-        # Setup the mirror by renaming the download directory
+        pkgname = os.path.basename(ud.proxy.urls[0].split(';')[0])
        mirrordir = os.path.join(self.tempdir, 'mirror')
-        bb.utils.rename(self.dldir, mirrordir)
+        bb.utils.mkdirhier(mirrordir)
-        os.mkdir(self.dldir)
+        os.replace(ud.localpath, os.path.join(mirrordir, pkgname))
-
+        self.d.setVar('PREMIRRORS', 'https?$://.*/.* file://%s/\n' % mirrordir)
        # Configure the premirror to be used
        self.d.setVar('PREMIRRORS', 'https?$://.*/.* file://%s/npm2' % mirrordir)
        self.d.setVar('BB_FETCH_PREMIRRORONLY', '1')
        # Fetch again
        self.assertFalse(os.path.exists(ud.localpath))
        # The npm fetcher doesn't handle that the .resolved file disappears
        # while the fetcher object exists, which it does when we rename the
        # download directory to "mirror" above. Thus we need a new fetcher to go
        # with the now empty download directory.
        fetcher = bb.fetch.Fetch([url], self.d)
        ud = fetcher.ud[fetcher.urls[0]]
        fetcher.download()
        self.assertTrue(os.path.exists(ud.localpath))
@@ -2490,7 +2313,7 @@ class NPMTest(FetcherTest):
        bb.utils.mkdirhier(mirrordir)
        mirrorfilename = os.path.join(mirrordir, os.path.basename(ud.localpath))
        os.replace(ud.localpath, mirrorfilename)
-        self.d.setVar('PREMIRRORS', 'https?$://.*/.* file://%s' % mirrorfilename)
+        self.d.setVar('PREMIRRORS', 'https?$://.*/.* file://%s\n' % mirrorfilename)
        self.d.setVar('BB_FETCH_PREMIRRORONLY', '1')
        # Fetch again
        self.assertFalse(os.path.exists(ud.localpath))
@@ -2510,7 +2333,7 @@ class NPMTest(FetcherTest):
        mirrordir = os.path.join(self.tempdir, 'mirror')
        bb.utils.mkdirhier(mirrordir)
        os.replace(ud.localpath, os.path.join(mirrordir, os.path.basename(ud.localpath)))
-        self.d.setVar('MIRRORS', 'https?$://.*/.* file://%s/' % mirrordir)
+        self.d.setVar('MIRRORS', 'https?$://.*/.* file://%s/\n' % mirrordir)
        # Update the resolved url to an invalid url
        with open(ud.resolvefile, 'r') as f:
            url = f.read()
@@ -2529,7 +2352,7 @@ class NPMTest(FetcherTest):
        url = 'npm://registry.npmjs.org;package=@savoirfairelinux/node-server-example;version=1.0.0;destsuffix=foo/bar;downloadfilename=foo-bar.tgz'
        fetcher = bb.fetch.Fetch([url], self.d)
        fetcher.download()
-        self.assertTrue(os.path.exists(os.path.join(self.dldir, 'npm2', 'foo-bar.tgz')))
+        self.assertTrue(os.path.exists(os.path.join(self.dldir, 'foo-bar.tgz')))
        fetcher.unpack(self.unpackdir)
        unpackdir = os.path.join(self.unpackdir, 'foo', 'bar')
        self.assertTrue(os.path.exists(os.path.join(unpackdir, 'package.json')))
@@ -2826,7 +2649,7 @@ class NPMTest(FetcherTest):
        mirrordir = os.path.join(self.tempdir, 'mirror')
        bb.utils.mkdirhier(mirrordir)
        os.replace(ud.localpath, os.path.join(mirrordir, os.path.basename(ud.localpath)))
-        self.d.setVar('PREMIRRORS', 'https?$://.*/.* file://%s/' % mirrordir)
+        self.d.setVar('PREMIRRORS', 'https?$://.*/.* file://%s/\n' % mirrordir)
        self.d.setVar('BB_FETCH_PREMIRRORONLY', '1')
        # Fetch again
        self.assertFalse(os.path.exists(ud.localpath))
@@ -2855,7 +2678,7 @@ class NPMTest(FetcherTest):
        mirrordir = os.path.join(self.tempdir, 'mirror')
        bb.utils.mkdirhier(mirrordir)
        os.replace(ud.localpath, os.path.join(mirrordir, os.path.basename(ud.localpath)))
-        self.d.setVar('MIRRORS', 'https?$://.*/.* file://%s/' % mirrordir)
+        self.d.setVar('MIRRORS', 'https?$://.*/.* file://%s/\n' % mirrordir)
        # Fetch again with invalid url
        self.assertFalse(os.path.exists(ud.localpath))
        swfile = self.create_shrinkwrap_file({
@@ -2874,9 +2697,8 @@ class NPMTest(FetcherTest):
 class GitSharedTest(FetcherTest):
    def setUp(self):
        super(GitSharedTest, self).setUp()
-        self.recipe_url = "git://git.openembedded.org/bitbake;branch=master"
+        self.recipe_url = "git://git.openembedded.org/bitbake"
        self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
        self.d.setVar("__BBSEENSRCREV", "1")
    @skipIfNoNetwork()
    def test_shared_unpack(self):
--- a/bitbake/lib/bb/tests/parse.py
+++ b/bitbake/lib/bb/tests/parse.py
@@ -119,7 +119,7 @@ EXTRA_OECONF:class-target = "b"
 EXTRA_OECONF:append = " c"
 """
-    def test_parse_overrides2(self):
+    def test_parse_overrides(self):
        f = self.parsehelper(self.overridetest2)
        d = bb.parse.handle(f.name, self.d)['']
        d.appendVar("EXTRA_OECONF", " d")
@@ -194,26 +194,3 @@ deltask ${EMPTYVAR}
        self.assertTrue('addtask ignored: " do_patch"' in stdout)
        #self.assertTrue('dependent task do_foo for do_patch does not exist' in stdout)
    broken_multiline_comment = """
 # First line of comment \\
 # Second line of comment \\
 """
    def test_parse_broken_multiline_comment(self):
        f = self.parsehelper(self.broken_multiline_comment)
        with self.assertRaises(bb.BBHandledException):
            d = bb.parse.handle(f.name, self.d)['']
    comment_in_var = """
 VAR = " \\
    SOMEVAL \\
 #   some comment \\
    SOMEOTHERVAL \\
 "
 """
    def test_parse_comment_in_var(self):
        f = self.parsehelper(self.comment_in_var)
        with self.assertRaises(bb.BBHandledException):
            d = bb.parse.handle(f.name, self.d)['']
--- a/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf
+++ b/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf
@@ -12,6 +12,6 @@ STAMP = "${TMPDIR}/stamps/${PN}"
 T = "${TMPDIR}/workdir/${PN}/temp"
 BB_NUMBER_THREADS = "4"
-BB_BASEHASH_IGNORE_VARS = "BB_CURRENT_MC BB_HASHSERVE TMPDIR TOPDIR SLOWTASKS SSTATEVALID FILE BB_CURRENTTASK"
+BB_HASHBASE_WHITELIST = "BB_CURRENT_MC BB_HASHSERVE TMPDIR TOPDIR SLOWTASKS SSTATEVALID FILE"
 include conf/multiconfig/${BB_CURRENT_MC}.conf
--- a/bitbake/lib/bb/tests/runqueue.py
+++ b/bitbake/lib/bb/tests/runqueue.py
@@ -29,14 +29,13 @@ class RunQueueTests(unittest.TestCase):
    def run_bitbakecmd(self, cmd, builddir, sstatevalid="", slowtasks="", extraenv=None, cleanup=False):
        env = os.environ.copy()
        env["BBPATH"] = os.path.realpath(os.path.join(os.path.dirname(__file__), "runqueue-tests"))
-        env["BB_ENV_PASSTHROUGH_ADDITIONS"] = "SSTATEVALID SLOWTASKS TOPDIR"
+        env["BB_ENV_EXTRAWHITE"] = "SSTATEVALID SLOWTASKS"
        env["SSTATEVALID"] = sstatevalid
        env["SLOWTASKS"] = slowtasks
        env["TOPDIR"] = builddir
        if extraenv:
            for k in extraenv:
                env[k] = extraenv[k]
-                env["BB_ENV_PASSTHROUGH_ADDITIONS"] = env["BB_ENV_PASSTHROUGH_ADDITIONS"] + " " + k
+                env["BB_ENV_EXTRAWHITE"] = env["BB_ENV_EXTRAWHITE"] + " " + k
        try:
            output = subprocess.check_output(cmd, env=env, stderr=subprocess.STDOUT,universal_newlines=True, cwd=builddir)
            print(output)
@@ -59,8 +58,6 @@ class RunQueueTests(unittest.TestCase):
            expected = ['a1:' + x for x in self.alltasks]
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_single_setscenevalid(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1"]
@@ -71,8 +68,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:populate_sysroot', 'a1:build']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_intermediate_setscenevalid(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1"]
@@ -82,8 +77,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:populate_sysroot_setscene', 'a1:build']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_intermediate_notcovered(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1"]
@@ -93,8 +86,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:package_qa_setscene', 'a1:build', 'a1:populate_sysroot_setscene']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_all_setscenevalid(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1"]
@@ -104,8 +95,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:package_qa_setscene', 'a1:build', 'a1:populate_sysroot_setscene']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_no_settasks(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1", "-c", "patch"]
@@ -114,8 +103,6 @@ class RunQueueTests(unittest.TestCase):
            expected = ['a1:fetch', 'a1:unpack', 'a1:patch']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_mix_covered_notcovered(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1:do_patch", "a1:do_populate_sysroot"]
@@ -124,7 +111,6 @@ class RunQueueTests(unittest.TestCase):
            expected = ['a1:fetch', 'a1:unpack', 'a1:patch', 'a1:populate_sysroot_setscene']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    # Test targets with intermediate setscene tasks alongside a target with no intermediate setscene tasks
    def test_mixed_direct_tasks_setscene_tasks(self):
@@ -136,8 +122,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:package_qa_setscene', 'a1:build', 'a1:populate_sysroot_setscene']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    # This test slows down the execution of do_package_setscene until after other real tasks have
    # started running which tests for a bug where tasks were being lost from the buildable list of real
    # tasks if they weren't in tasks_covered or tasks_notcovered
@@ -152,14 +136,12 @@ class RunQueueTests(unittest.TestCase):
                        'a1:populate_sysroot', 'a1:build']
            self.assertEqual(set(tasks), set(expected))
-            self.shutdown(tempdir)
+    def test_setscenewhitelist(self):
    def test_setscene_ignore_tasks(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "a1"]
            extraenv = {
                "BB_SETSCENE_ENFORCE" : "1",
-                "BB_SETSCENE_ENFORCE_IGNORE_TASKS" : "a1:do_package_write_rpm a1:do_build"
+                "BB_SETSCENE_ENFORCE_WHITELIST" : "a1:do_package_write_rpm a1:do_build"
            }
            sstatevalid = "a1:do_package a1:do_package_qa a1:do_packagedata a1:do_package_write_ipk a1:do_populate_lic a1:do_populate_sysroot"
            tasks = self.run_bitbakecmd(cmd, tempdir, sstatevalid, extraenv=extraenv)
@@ -167,8 +149,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:populate_sysroot_setscene', 'a1:package_setscene']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    # Tests for problems with dependencies between setscene tasks
    def test_no_setscenevalid_harddeps(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
@@ -182,8 +162,6 @@ class RunQueueTests(unittest.TestCase):
                        'd1:populate_sysroot', 'd1:build']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_no_setscenevalid_withdeps(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "b1"]
@@ -194,8 +172,6 @@ class RunQueueTests(unittest.TestCase):
            expected.remove('a1:package_qa')
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_single_a1_setscenevalid_withdeps(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "b1"]
@@ -206,8 +182,6 @@ class RunQueueTests(unittest.TestCase):
                        'a1:populate_sysroot'] + ['b1:' + x for x in self.alltasks]
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_single_b1_setscenevalid_withdeps(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "b1"]
@@ -219,8 +193,6 @@ class RunQueueTests(unittest.TestCase):
            expected.remove('b1:package')
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_intermediate_setscenevalid_withdeps(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "b1"]
@@ -231,8 +203,6 @@ class RunQueueTests(unittest.TestCase):
            expected.remove('b1:package')
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_all_setscenevalid_withdeps(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            cmd = ["bitbake", "b1"]
@@ -243,8 +213,6 @@ class RunQueueTests(unittest.TestCase):
                        'b1:packagedata_setscene', 'b1:package_qa_setscene', 'b1:populate_sysroot_setscene']
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_multiconfig_setscene_optimise(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            extraenv = {
@@ -264,8 +232,6 @@ class RunQueueTests(unittest.TestCase):
                expected.remove(x)
            self.assertEqual(set(tasks), set(expected))
            self.shutdown(tempdir)
    def test_multiconfig_bbmask(self):
        # This test validates that multiconfigs can independently mask off
        # recipes they do not want with BBMASK. It works by having recipes
@@ -282,8 +248,6 @@ class RunQueueTests(unittest.TestCase):
            cmd = ["bitbake", "mc:mc-1:fails-mc2", "mc:mc_2:fails-mc1"]
            self.run_bitbakecmd(cmd, tempdir, "", extraenv=extraenv)
            self.shutdown(tempdir)
    def test_multiconfig_mcdepends(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            extraenv = {
@@ -314,8 +278,7 @@ class RunQueueTests(unittest.TestCase):
                       ["mc_2:a1:%s" % t for t in rerun_tasks]
            self.assertEqual(set(tasks), set(expected))
-            self.shutdown(tempdir)
+    @unittest.skipIf(sys.version_info < (3, 5, 0), 'Python 3.5 or later required')
    def test_hashserv_single(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            extraenv = {
@@ -341,6 +304,7 @@ class RunQueueTests(unittest.TestCase):
            self.shutdown(tempdir)
    @unittest.skipIf(sys.version_info < (3, 5, 0), 'Python 3.5 or later required')
    def test_hashserv_double(self):
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
            extraenv = {
@@ -365,6 +329,7 @@ class RunQueueTests(unittest.TestCase):
            self.shutdown(tempdir)
    @unittest.skipIf(sys.version_info < (3, 5, 0), 'Python 3.5 or later required')
    def test_hashserv_multiple_setscene(self):
        # Runs e1:do_package_setscene twice
        with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir:
@@ -396,6 +361,7 @@ class RunQueueTests(unittest.TestCase):
    def shutdown(self, tempdir):
        # Wait for the hashserve socket to disappear else we'll see races with the tempdir cleanup
-        while (os.path.exists(tempdir + "/hashserve.sock") or os.path.exists(tempdir + "cache/hashserv.db-wal") or os.path.exists(tempdir + "/bitbake.lock")):
+        while (os.path.exists(tempdir + "/hashserve.sock") or os.path.exists(tempdir + "cache/hashserv.db-wal")):
            time.sleep(0.5)
--- a/bitbake/lib/bb/tinfoil.py
+++ b/bitbake/lib/bb/tinfoil.py
@@ -324,11 +324,11 @@ class Tinfoil:
        self.recipes_parsed = False
        self.quiet = 0
        self.oldhandlers = self.logger.handlers[:]
        self.localhandlers = []
        if setup_logging:
            # This is the *client-side* logger, nothing to do with
            # logging messages from the server
            bb.msg.logger_create('BitBake', output)
            self.localhandlers = []
            for handler in self.logger.handlers:
                if handler not in self.oldhandlers:
                    self.localhandlers.append(handler)
@@ -448,7 +448,7 @@ class Tinfoil:
        self.run_actions(config_params)
        self.recipes_parsed = True
-    def run_command(self, command, *params, handle_events=True):
+    def run_command(self, command, *params):
        """
        Run a command on the server (as implemented in bb.command).
        Note that there are two types of command - synchronous and
@@ -468,7 +468,7 @@ class Tinfoil:
        try:
            result = self.server_connection.connection.runCommand(commandline)
        finally:
-            while handle_events:
+            while True:
                event = self.wait_event()
                if not event:
                    break
@@ -493,7 +493,7 @@ class Tinfoil:
        Wait for an event from the server for the specified time.
        A timeout of 0 means don't wait if there are no events in the queue.
        Returns the next event in the queue or None if the timeout was
-        reached. Note that in order to receive any events you will
+        reached. Note that in order to recieve any events you will
        first need to set the internal event mask using set_event_mask()
        (otherwise whatever event mask the UI set up will be in effect).
        """
@@ -761,7 +761,7 @@ class Tinfoil:
                                if parseprogress:
                                    parseprogress.update(event.progress)
                                else:
-                                    bb.warn("Got ProcessProgress event for something that never started?")
+                                    bb.warn("Got ProcessProgress event for someting that never started?")
                                continue
                            if isinstance(event, bb.event.ProcessFinished):
                                if self.quiet > 1:
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -45,7 +45,7 @@ from pprint import pformat
 import logging
 from datetime import datetime, timedelta
-from django.db import transaction
+from django.db import transaction, connection
 # pylint: disable=invalid-name
@@ -227,12 +227,6 @@ class ORMWrapper(object):
        build.completed_on = timezone.now()
        build.outcome = outcome
        build.save()
        # We force a sync point here to force the outcome status commit,
        # which resolves a race condition with the build completion takedown
        transaction.set_autocommit(True)
        transaction.set_autocommit(False)
        signal_runbuilds()
    def update_target_set_license_manifest(self, target, license_manifest_path):
@@ -489,14 +483,14 @@ class ORMWrapper(object):
            # we already created the root directory, so ignore any
            # entry for it
-            if not path:
+            if len(path) == 0:
                continue
            parent_path = "/".join(path.split("/")[:len(path.split("/")) - 1])
-            if not parent_path:
+            if len(parent_path) == 0:
                parent_path = "/"
            parent_obj = self._cached_get(Target_File, target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY)
-            Target_File.objects.create(
+            tf_obj = Target_File.objects.create(
                        target = target_obj,
                        path = path,
                        size = size,
@@ -561,7 +555,7 @@ class ORMWrapper(object):
            parent_obj = Target_File.objects.get(target = target_obj, path = parent_path, inodetype = Target_File.ITYPE_DIRECTORY)
-            Target_File.objects.create(
+            tf_obj = Target_File.objects.create(
                        target = target_obj,
                        path = path,
                        size = size,
@@ -577,7 +571,7 @@ class ORMWrapper(object):
        assert isinstance(build_obj, Build)
        assert isinstance(target_obj, Target)
-        errormsg = []
+        errormsg = ""
        for p in packagedict:
            # Search name swtiches round the installed name vs package name
            # by default installed name == package name
@@ -639,10 +633,10 @@ class ORMWrapper(object):
                        packagefile_objects.append(Package_File( package = packagedict[p]['object'],
                            path = targetpath,
                            size = targetfilesize))
-                    if packagefile_objects:
+                    if len(packagefile_objects):
                        Package_File.objects.bulk_create(packagefile_objects)
                except KeyError as e:
-                    errormsg.append("  stpi: Key error, package %s key %s \n" % (p, e))
+                    errormsg += "  stpi: Key error, package %s key %s \n" % ( p, e )
            # save disk installed size
            packagedict[p]['object'].installed_size = packagedict[p]['size']
@@ -679,13 +673,13 @@ class ORMWrapper(object):
                    logger.warning("Could not add dependency to the package %s "
                                   "because %s is an unknown package", p, px)
-        if packagedeps_objs:
+        if len(packagedeps_objs) > 0:
            Package_Dependency.objects.bulk_create(packagedeps_objs)
        else:
            logger.info("No package dependencies created")
-        if errormsg:
+        if len(errormsg) > 0:
-            logger.warning("buildinfohelper: target_package_info could not identify recipes: \n%s", "".join(errormsg))
+            logger.warning("buildinfohelper: target_package_info could not identify recipes: \n%s", errormsg)
    def save_target_image_file_information(self, target_obj, file_name, file_size):
        Target_Image_File.objects.create(target=target_obj,
@@ -773,7 +767,7 @@ class ORMWrapper(object):
            packagefile_objects.append(Package_File( package = bp_object,
                                        path = path,
                                        size = package_info['FILES_INFO'][path] ))
-        if packagefile_objects:
+        if len(packagefile_objects):
            Package_File.objects.bulk_create(packagefile_objects)
        def _po_byname(p):
@@ -815,7 +809,7 @@ class ORMWrapper(object):
                packagedeps_objs.append(Package_Dependency(  package = bp_object,
                    depends_on = _po_byname(p), dep_type = Package_Dependency.TYPE_RCONFLICTS))
-        if packagedeps_objs:
+        if len(packagedeps_objs) > 0:
            Package_Dependency.objects.bulk_create(packagedeps_objs)
        return bp_object
@@ -832,7 +826,7 @@ class ORMWrapper(object):
                    desc = vardump[root_var]['doc']
            if desc is None:
                desc = ''
-            if desc:
+            if len(desc):
                HelpText.objects.get_or_create(build=build_obj,
                                               area=HelpText.VARIABLE,
                                               key=k, text=desc)
@@ -852,7 +846,7 @@ class ORMWrapper(object):
                                file_name = vh['file'],
                                line_number = vh['line'],
                                operation = vh['op']))
-                if varhist_objects:
+                if len(varhist_objects):
                    VariableHistory.objects.bulk_create(varhist_objects)
@@ -899,6 +893,9 @@ class BuildInfoHelper(object):
        self.task_order = 0
        self.autocommit_step = 1
        self.server = server
        # we use manual transactions if the database doesn't autocommit on us
        if not connection.features.autocommits_when_autocommit_is_off:
            transaction.set_autocommit(False)
        self.orm_wrapper = ORMWrapper()
        self.has_build_history = has_build_history
        self.tmp_dir = self.server.runCommand(["getVariable", "TMPDIR"])[0]
@@ -1062,6 +1059,27 @@ class BuildInfoHelper(object):
        return recipe_info
    def _get_path_information(self, task_object):
        self._ensure_build()
        assert isinstance(task_object, Task)
        build_stats_format = "{tmpdir}/buildstats/{buildname}/{package}/"
        build_stats_path = []
        for t in self.internal_state['targets']:
            buildname = self.internal_state['build'].build_name
            pe, pv = task_object.recipe.version.split(":",1)
            if len(pe) > 0:
                package = task_object.recipe.name + "-" + pe + "_" + pv
            else:
                package = task_object.recipe.name + "-" + pv
            build_stats_path.append(build_stats_format.format(tmpdir=self.tmp_dir,
                                                     buildname=buildname,
                                                     package=package))
        return build_stats_path
    ################################
    ## external available methods to store information
@@ -1295,11 +1313,12 @@ class BuildInfoHelper(object):
                task_information['outcome'] = Task.OUTCOME_FAILED
                del self.internal_state['taskdata'][identifier]
-        # we force a sync point here, to get the progress bar to show
+        if not connection.features.autocommits_when_autocommit_is_off:
-        if self.autocommit_step % 3 == 0:
+            # we force a sync point here, to get the progress bar to show
-            transaction.set_autocommit(True)
+            if self.autocommit_step % 3 == 0:
-            transaction.set_autocommit(False)
+                transaction.set_autocommit(True)
-        self.autocommit_step += 1
+                transaction.set_autocommit(False)
            self.autocommit_step += 1
        self.orm_wrapper.get_update_task_object(task_information, True) # must exist
@@ -1385,7 +1404,7 @@ class BuildInfoHelper(object):
        assert 'pn' in event._depgraph
        assert 'tdepends' in event._depgraph
-        errormsg = []
+        errormsg = ""
        # save layer version priorities
        if 'layer-priorities' in event._depgraph.keys():
@@ -1477,7 +1496,7 @@ class BuildInfoHelper(object):
                elif dep in self.internal_state['recipes']:
                    dependency = self.internal_state['recipes'][dep]
                else:
-                    errormsg.append("  stpd: KeyError saving recipe dependency for %s, %s \n" % (recipe, dep))
+                    errormsg += "  stpd: KeyError saving recipe dependency for %s, %s \n" % (recipe, dep)
                    continue
                recipe_dep = Recipe_Dependency(recipe=target,
                                               depends_on=dependency,
@@ -1518,8 +1537,8 @@ class BuildInfoHelper(object):
                taskdeps_objects.append(Task_Dependency( task = target, depends_on = dep ))
        Task_Dependency.objects.bulk_create(taskdeps_objects)
-        if errormsg:
+        if len(errormsg) > 0:
-            logger.warning("buildinfohelper: dependency info not identify recipes: \n%s", "".join(errormsg))
+            logger.warning("buildinfohelper: dependency info not identify recipes: \n%s", errormsg)
    def store_build_package_information(self, event):
@@ -1599,7 +1618,7 @@ class BuildInfoHelper(object):
        if 'backlog' in self.internal_state:
            # if we have a backlog of events, do our best to save them here
-            if self.internal_state['backlog']:
+            if len(self.internal_state['backlog']):
                tempevent = self.internal_state['backlog'].pop()
                logger.debug("buildinfohelper: Saving stored event %s "
                             % tempevent)
@@ -1971,6 +1990,8 @@ class BuildInfoHelper(object):
            # Do not skip command line build events
            self.store_log_event(tempevent,False)
        if not connection.features.autocommits_when_autocommit_is_off:
            transaction.set_autocommit(True)
        # unset the brbe; this is to prevent subsequent command-line builds
        # being incorrectly attached to the previous Toaster-triggered build;
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -25,7 +25,7 @@ from itertools import groupby
 from bb.ui import uihelper
-featureSet = [bb.cooker.CookerFeatures.SEND_SANITYEVENTS, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING]
+featureSet = [bb.cooker.CookerFeatures.SEND_SANITYEVENTS]
 logger = logging.getLogger("BitBake")
 interactive = sys.stdout.isatty()
@@ -252,68 +252,58 @@ class TerminalFilter(object):
            return
        tasks = []
        for t in runningpids:
            start_time = activetasks[t].get("starttime", None)
            if start_time:
                msg = "%s - %s (pid %s)" % (activetasks[t]["title"], self.elapsed(currenttime - start_time), activetasks[t]["pid"])
            else:
                msg = "%s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"])
            progress = activetasks[t].get("progress", None)
            if progress is not None:
                pbar = activetasks[t].get("progressbar", None)
                rate = activetasks[t].get("rate", None)
                start_time = activetasks[t].get("starttime", None)
                if not pbar or pbar.bouncing != (progress < 0):
                    if progress < 0:
-                        pbar = BBProgress("0: %s" % msg, 100, widgets=[' ', progressbar.BouncingSlider(), ''], extrapos=3, resize_handler=self.sigwinch_handle)
+                        pbar = BBProgress("0: %s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"]), 100, widgets=[' ', progressbar.BouncingSlider(), ''], extrapos=3, resize_handler=self.sigwinch_handle)
                        pbar.bouncing = True
                    else:
-                        pbar = BBProgress("0: %s" % msg, 100, widgets=[' ', progressbar.Percentage(), ' ', progressbar.Bar(), ''], extrapos=5, resize_handler=self.sigwinch_handle)
+                        pbar = BBProgress("0: %s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"]), 100, widgets=[' ', progressbar.Percentage(), ' ', progressbar.Bar(), ''], extrapos=5, resize_handler=self.sigwinch_handle)
                        pbar.bouncing = False
                    activetasks[t]["progressbar"] = pbar
-                tasks.append((pbar, msg, progress, rate, start_time))
+                tasks.append((pbar, progress, rate, start_time))
            else:
-                tasks.append(msg)
+                start_time = activetasks[t].get("starttime", None)
                if start_time:
                    tasks.append("%s - %s (pid %s)" % (activetasks[t]["title"], self.elapsed(currenttime - start_time), activetasks[t]["pid"]))
                else:
                    tasks.append("%s (pid %s)" % (activetasks[t]["title"], activetasks[t]["pid"]))
        if self.main.shutdown:
-            content = pluralise("Waiting for %s running task to finish",
+            content = "Waiting for %s running tasks to finish:" % len(activetasks)
                                "Waiting for %s running tasks to finish", len(activetasks))
            if not self.quiet:
                content += ':'
            print(content)
        else:
            scene_tasks = "%s of %s" % (self.helper.setscene_current, self.helper.setscene_total)
            cur_tasks = "%s of %s" % (self.helper.tasknumber_current, self.helper.tasknumber_total)
            content = ''
            if not self.quiet:
                msg = "Setscene tasks: %s" % scene_tasks
                content += msg + "\n"
                print(msg)
            if self.quiet:
-                msg = "Running tasks (%s, %s)" % (scene_tasks, cur_tasks)
+                content = "Running tasks (%s of %s/%s of %s)" % (self.helper.setscene_current, self.helper.setscene_total, self.helper.tasknumber_current, self.helper.tasknumber_total)
            elif not len(activetasks):
-                msg = "No currently running tasks (%s)" % cur_tasks
+                content = "No currently running tasks (%s of %s/%s of %s)" % (self.helper.setscene_current, self.helper.setscene_total, self.helper.tasknumber_current, self.helper.tasknumber_total)
            else:
-                msg = "Currently %2s running tasks (%s)" % (len(activetasks), cur_tasks)
+                content = "Currently %2s running tasks (%s of %s/%s of %s)" % (len(activetasks), self.helper.setscene_current, self.helper.setscene_total, self.helper.tasknumber_current, self.helper.tasknumber_total)
            maxtask = self.helper.tasknumber_total
            if not self.main_progress or self.main_progress.maxval != maxtask:
                widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()]
                self.main_progress = BBProgress("Running tasks", maxtask, widgets=widgets, resize_handler=self.sigwinch_handle)
                self.main_progress.start(False)
-            self.main_progress.setmessage(msg)
+            self.main_progress.setmessage(content)
-            progress = max(0, self.helper.tasknumber_current - 1)
+            progress = self.helper.tasknumber_current - 1
-            content += self.main_progress.update(progress)
+            if progress < 0:
                progress = 0
            content = self.main_progress.update(progress)
            print('')
-        lines = self.getlines(content)
+        lines = 1 + int(len(content) / (self.columns + 1))
-        if not self.quiet:
+        if self.quiet == 0:
-            for tasknum, task in enumerate(tasks[:(self.rows - 1 - lines)]):
+            for tasknum, task in enumerate(tasks[:(self.rows - 2)]):
                if isinstance(task, tuple):
-                    pbar, msg, progress, rate, start_time = task
+                    pbar, progress, rate, start_time = task
                    if not pbar.start_time:
                        pbar.start(False)
                        if start_time:
                            pbar.start_time = start_time
-                    pbar.setmessage('%s: %s' % (tasknum, msg))
+                    pbar.setmessage('%s:%s' % (tasknum, pbar.msg.split(':', 1)[1]))
                    pbar.setextra(rate)
                    if progress > -1:
                        content = pbar.update(progress)
@@ -323,17 +313,11 @@ class TerminalFilter(object):
                else:
                    content = "%s: %s" % (tasknum, task)
                    print(content)
-                lines = lines + self.getlines(content)
+                lines = lines + 1 + int(len(content) / (self.columns + 1))
        self.footer_present = lines
        self.lastpids = runningpids[:]
        self.lastcount = self.helper.tasknumber_current
    def getlines(self, content):
        lines = 0
        for line in content.split("\n"):
            lines = lines + 1 + int(len(line) / (self.columns + 1))
        return lines
    def finish(self):
        if self.stdinbackup:
            fd = sys.stdin.fileno()
@@ -666,7 +650,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
            if isinstance(event, logging.LogRecord):
                lastprint = time.time()
                printinterval = printintervaldelta
-                if event.levelno >= bb.msg.BBLogFormatter.ERRORONCE:
+                if event.levelno >= bb.msg.BBLogFormatter.ERROR:
                    errors = errors + 1
                    return_value = 1
                elif event.levelno == bb.msg.BBLogFormatter.WARNING:
@@ -680,10 +664,10 @@ def main(server, eventHandler, params, tf = TerminalFilter):
                        continue
                    # Prefix task messages with recipe/task
-                    if event.taskpid in helper.pidmap and event.levelno not in [bb.msg.BBLogFormatter.PLAIN, bb.msg.BBLogFormatter.WARNONCE, bb.msg.BBLogFormatter.ERRORONCE]:
+                    if event.taskpid in helper.pidmap and event.levelno != bb.msg.BBLogFormatter.PLAIN:
                        taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]]
                        event.msg = taskinfo['title'] + ': ' + event.msg
-                if hasattr(event, 'fn') and event.levelno not in [bb.msg.BBLogFormatter.WARNONCE, bb.msg.BBLogFormatter.ERRORONCE]:
+                if hasattr(event, 'fn'):
                    event.msg = event.fn + ': ' + event.msg
                logging.getLogger(event.name).handle(event)
                continue
@@ -877,6 +861,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
                    state_force_shutdown()
            main.shutdown = main.shutdown + 1
            pass
        except Exception as e:
            import traceback
            sys.stderr.write(traceback.format_exc())
@@ -893,11 +878,11 @@ def main(server, eventHandler, params, tf = TerminalFilter):
            for failure in taskfailures:
                summary += "\n  %s" % failure
        if warnings:
-            summary += pluralise("\nSummary: There was %s WARNING message.",
+            summary += pluralise("\nSummary: There was %s WARNING message shown.",
-                                 "\nSummary: There were %s WARNING messages.", warnings)
+                                 "\nSummary: There were %s WARNING messages shown.", warnings)
        if return_value and errors:
-            summary += pluralise("\nSummary: There was %s ERROR message, returning a non-zero exit code.",
+            summary += pluralise("\nSummary: There was %s ERROR message shown, returning a non-zero exit code.",
-                                 "\nSummary: There were %s ERROR messages, returning a non-zero exit code.", errors)
+                                 "\nSummary: There were %s ERROR messages shown, returning a non-zero exit code.", errors)
        if summary and params.options.quiet == 0:
            print(summary)
--- a/bitbake/lib/bb/ui/uievent.py
+++ b/bitbake/lib/bb/ui/uievent.py
@@ -44,7 +44,7 @@ class BBUIEventQueue:
        for count_tries in range(5):
            ret = self.BBServer.registerEventHandler(self.host, self.port)
-            if isinstance(ret, collections.abc.Iterable):
+            if isinstance(ret, collections.Iterable):
                self.EventHandle, error = ret
            else:
                self.EventHandle = ret
@@ -73,13 +73,13 @@ class BBUIEventQueue:
        self.eventQueueLock.acquire()
-        if not self.eventQueue:
+        if len(self.eventQueue) == 0:
            self.eventQueueLock.release()
            return None
        item = self.eventQueue.pop(0)
-        if not self.eventQueue:
+        if len(self.eventQueue) == 0:
            self.eventQueueNotify.clear()
        self.eventQueueLock.release()
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -13,7 +13,6 @@ import errno
 import logging
 import bb
 import bb.msg
 import locale
 import multiprocessing
 import fcntl
 import importlib
@@ -28,9 +27,6 @@ import errno
 import signal
 import collections
 import copy
 import ctypes
 import random
 import tempfile
 from subprocess import getstatusoutput
 from contextlib import contextmanager
 from ctypes import cdll
@@ -256,7 +252,7 @@ def explode_dep_versions(s):
    """
    Take an RDEPENDS style string of format:
    "DEPEND1 (optional version) DEPEND2 (optional version) ..."
-    skip null value and items appeared in dependency string multiple times
+    skip null value and items appeared in dependancy string multiple times
    and return a dictionary of dependencies and versions.
    """
    r = explode_dep_versions2(s)
@@ -384,7 +380,7 @@ def _print_exception(t, value, tb, realfile, text, context):
        error.append("Exception: %s" % ''.join(exception))
-        # If the exception is from spawning a task, let's be helpful and display
+        # If the exception is from spwaning a task, let's be helpful and display
        # the output (which hopefully includes stderr).
        if isinstance(value, subprocess.CalledProcessError) and value.output:
            error.append("Subprocess output:")
@@ -432,14 +428,12 @@ def better_eval(source, locals, extraglobals = None):
    return eval(source, ctx, locals)
@contextmanager
-def fileslocked(files, *args, **kwargs):
+def fileslocked(files):
    """Context manager for locking and unlocking file locks."""
    locks = []
    if files:
        for lockfile in files:
-            l = bb.utils.lockfile(lockfile, *args, **kwargs)
+            locks.append(bb.utils.lockfile(lockfile))
            if l is not None:
                locks.append(l)
    try:
        yield
@@ -458,16 +452,13 @@ def lockfile(name, shared=False, retry=True, block=False):
    consider the possibility of sending a signal to the process to break
    out - at which point you want block=True rather than retry=True.
    """
-    basename = os.path.basename(name)
+    if len(name) > 255:
-    if len(basename) > 255:
+        root, ext = os.path.splitext(name)
-        root, ext = os.path.splitext(basename)
+        name = root[:255 - len(ext)] + ext
        basename = root[:255 - len(ext)] + ext
    dirname = os.path.dirname(name)
    mkdirhier(dirname)
    name = os.path.join(dirname, basename)
    if not os.access(dirname, os.W_OK):
        logger.error("Unable to acquire lock '%s', directory is not writable",
                     name)
@@ -546,12 +537,7 @@ def md5_file(filename):
    Return the hex string representation of the MD5 checksum of filename.
    """
    import hashlib
-    try:
+    return _hasher(hashlib.md5(), filename)
        sig = hashlib.new('MD5', usedforsecurity=False)
    except TypeError:
        # Some configurations don't appear to support two arguments
        sig = hashlib.new('MD5')
    return _hasher(sig, filename)
 def sha256_file(filename):
    """
@@ -602,26 +588,11 @@ def preserved_envvars():
    v = [
        'BBPATH',
        'BB_PRESERVE_ENV',
-        'BB_ENV_PASSTHROUGH',
+        'BB_ENV_WHITELIST',
-        'BB_ENV_PASSTHROUGH_ADDITIONS',
+        'BB_ENV_EXTRAWHITE',
    ]
    return v + preserved_envvars_exported()
 def check_system_locale():
    """Make sure the required system locale are available and configured"""
    default_locale = locale.getlocale(locale.LC_CTYPE)
    try:
        locale.setlocale(locale.LC_CTYPE, ("en_US", "UTF-8"))
    except:
        sys.exit("Please make sure locale 'en_US.UTF-8' is available on your system")
    else:
        locale.setlocale(locale.LC_CTYPE, default_locale)
    if sys.getfilesystemencoding() != "utf-8":
        sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\n"
                 "Python can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.")
 def filter_environment(good_vars):
    """
    Create a pristine environment for bitbake. This will remove variables that
@@ -649,21 +620,21 @@ def filter_environment(good_vars):
 def approved_variables():
    """
-    Determine and return the list of variables which are approved
+    Determine and return the list of whitelisted variables which are approved
    to remain in the environment.
    """
    if 'BB_PRESERVE_ENV' in os.environ:
        return os.environ.keys()
    approved = []
-    if 'BB_ENV_PASSTHROUGH' in os.environ:
+    if 'BB_ENV_WHITELIST' in os.environ:
-        approved = os.environ['BB_ENV_PASSTHROUGH'].split()
+        approved = os.environ['BB_ENV_WHITELIST'].split()
-        approved.extend(['BB_ENV_PASSTHROUGH'])
+        approved.extend(['BB_ENV_WHITELIST'])
    else:
        approved = preserved_envvars()
-    if 'BB_ENV_PASSTHROUGH_ADDITIONS' in os.environ:
+    if 'BB_ENV_EXTRAWHITE' in os.environ:
-        approved.extend(os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'].split())
+        approved.extend(os.environ['BB_ENV_EXTRAWHITE'].split())
-        if 'BB_ENV_PASSTHROUGH_ADDITIONS' not in approved:
+        if 'BB_ENV_EXTRAWHITE' not in approved:
-            approved.extend(['BB_ENV_PASSTHROUGH_ADDITIONS'])
+            approved.extend(['BB_ENV_EXTRAWHITE'])
    return approved
 def clean_environment():
@@ -717,8 +688,8 @@ def remove(path, recurse=False, ionice=False):
        return
    if recurse:
        for name in glob.glob(path):
-            if _check_unsafe_delete_path(name):
+            if _check_unsafe_delete_path(path):
-                raise Exception('bb.utils.remove: called with dangerous path "%s" and recurse=True, refusing to delete!' % name)
+                raise Exception('bb.utils.remove: called with dangerous path "%s" and recurse=True, refusing to delete!' % path)
        # shutil.rmtree(name) would be ideal but its too slow
        cmd = []
        if ionice:
@@ -776,7 +747,7 @@ def movefile(src, dest, newmtime = None, sstat = None):
        if not sstat:
            sstat = os.lstat(src)
    except Exception as e:
-        logger.warning("movefile: Stating source file failed...", e)
+        print("movefile: Stating source file failed...", e)
        return None
    destexists = 1
@@ -804,7 +775,7 @@ def movefile(src, dest, newmtime = None, sstat = None):
            os.unlink(src)
            return os.lstat(dest)
        except Exception as e:
-            logger.warning("movefile: failed to properly create symlink:", dest, "->", target, e)
+            print("movefile: failed to properly create symlink:", dest, "->", target, e)
            return None
    renamefailed = 1
@@ -821,7 +792,7 @@ def movefile(src, dest, newmtime = None, sstat = None):
        except Exception as e:
            if e.errno != errno.EXDEV:
                # Some random error.
-                logger.warning("movefile: Failed to move", src, "to", dest, e)
+                print("movefile: Failed to move", src, "to", dest, e)
                return None
            # Invalid cross-device-link 'bind' mounted or actually Cross-Device
@@ -833,13 +804,13 @@ def movefile(src, dest, newmtime = None, sstat = None):
                bb.utils.rename(destpath + "#new", destpath)
                didcopy = 1
            except Exception as e:
-                logger.warning('movefile: copy', src, '->', dest, 'failed.', e)
+                print('movefile: copy', src, '->', dest, 'failed.', e)
                return None
        else:
            #we don't yet handle special, so we need to fall back to /bin/mv
            a = getstatusoutput("/bin/mv -f " + "'" + src + "' '" + dest + "'")
            if a[0] != 0:
-                logger.warning("movefile: Failed to move special file:" + src + "' to '" + dest + "'", a)
+                print("movefile: Failed to move special file:" + src + "' to '" + dest + "'", a)
                return None # failure
        try:
            if didcopy:
@@ -847,7 +818,7 @@ def movefile(src, dest, newmtime = None, sstat = None):
                os.chmod(destpath, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
                os.unlink(src)
        except Exception as e:
-            logger.warning("movefile: Failed to chown/chmod/unlink", dest, e)
+            print("movefile: Failed to chown/chmod/unlink", dest, e)
            return None
    if newmtime:
@@ -1006,9 +977,6 @@ def to_boolean(string, default=None):
    if not string:
        return default
    if isinstance(string, int):
        return string != 0
    normalized = string.lower()
    if normalized in ("y", "yes", "1", "true"):
        return True
@@ -1627,52 +1595,25 @@ def set_process_name(name):
    except:
        pass
 def disable_network(uid=None, gid=None):
    """
    Disable networking in the current process if the kernel supports it, else
    just return after logging to debug. To do this we need to create a new user
    namespace, then map back to the original uid/gid.
    """
    libc = ctypes.CDLL('libc.so.6')
    # From sched.h
    # New user namespace
    CLONE_NEWUSER = 0x10000000
    # New network namespace
    CLONE_NEWNET = 0x40000000
    if uid is None:
        uid = os.getuid()
    if gid is None:
        gid = os.getgid()
    ret = libc.unshare(CLONE_NEWNET | CLONE_NEWUSER)
    if ret != 0:
        logger.debug("System doesn't suport disabling network without admin privs")
        return
    with open("/proc/self/uid_map", "w") as f:
        f.write("%s %s 1" % (uid, uid))
    with open("/proc/self/setgroups", "w") as f:
        f.write("deny")
    with open("/proc/self/gid_map", "w") as f:
        f.write("%s %s 1" % (gid, gid))
 def export_proxies(d):
    """ export common proxies variables from datastore to environment """
    import os
    variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY',
                    'ftp_proxy', 'FTP_PROXY', 'no_proxy', 'NO_PROXY',
-                    'GIT_PROXY_COMMAND', 'SSL_CERT_FILE', 'SSL_CERT_DIR']
+                    'GIT_PROXY_COMMAND']
    exported = False
-    origenv = d.getVar("BB_ORIGENV")
+    for v in variables:
-
+        if v in os.environ.keys():
-    for name in variables:
+            exported = True
-        value = d.getVar(name)
+        else:
-        if not value and origenv:
+            v_proxy = d.getVar(v)
-            value = origenv.getVar(name)
+            if v_proxy is not None:
-        if value:
+                os.environ[v] = v_proxy
-            os.environ[name] = value
+                exported = True
    return exported
 def load_plugins(logger, plugins, pluginpath):
@@ -1761,40 +1702,5 @@ def environment(**envvars):
        for var in envvars:
            if var in backup:
                os.environ[var] = backup[var]
-            elif var in os.environ:
+            else:
                del os.environ[var]
 def is_local_uid(uid=''):
    """
    Check whether uid is a local one or not.
    Can't use pwd module since it gets all UIDs, not local ones only.
    """
    if not uid:
        uid = os.getuid()
    with open('/etc/passwd', 'r') as f:
        for line in f:
            line_split = line.split(':')
            if len(line_split) < 3:
                continue
            if str(uid) == line_split[2]:
                return True
    return False
 def mkstemp(suffix=None, prefix=None, dir=None, text=False):
    """
    Generates a unique filename, independent of time.
    mkstemp() in glibc (at least) generates unique file names based on the
    current system time. When combined with highly parallel builds, and
    operating over NFS (e.g. shared sstate/downloads) this can result in
    conflicts and race conditions.
    This function adds additional entropy to the file name so that a collision
    is independent of time and thus extremely unlikely.
    """
    entropy = "".join(random.choices("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", k=20))
    if prefix:
        prefix = prefix + entropy
    else:
        prefix = tempfile.gettempprefix() + entropy
    return tempfile.mkstemp(suffix=suffix, prefix=prefix, dir=dir, text=text)
--- a/bitbake/lib/bblayers/init.py
+++ b/bitbake/lib/bblayers/init.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bblayers/action.py
+++ b/bitbake/lib/bblayers/action.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -55,7 +53,7 @@ class ActionPlugin(LayerPlugin):
                except (bb.tinfoil.TinfoilUIException, bb.BBHandledException):
                    # Restore the back up copy of bblayers.conf
                    shutil.copy2(backup, bblayers_conf)
-                    bb.fatal("Parse failure with the specified layer added, exiting.")
+                    bb.fatal("Parse failure with the specified layer added, aborting.")
                else:
                    for item in notadded:
                        sys.stderr.write("Specified layer %s is already in BBLAYERS\n" % item)
--- a/bitbake/lib/bblayers/common.py
+++ b/bitbake/lib/bblayers/common.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bblayers/layerindex.py
+++ b/bitbake/lib/bblayers/layerindex.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bblayers/query.py
+++ b/bitbake/lib/bblayers/query.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/bs4/tests/test_tree.py
+++ b/bitbake/lib/bs4/tests/test_tree.py
@@ -585,7 +585,7 @@ class SiblingTest(TreeTest):
                    </html>'''
        # All that whitespace looks good but makes the tests more
        # difficult. Get rid of it.
-        markup = re.compile(r"\n\s*").sub("", markup)
+        markup = re.compile("\n\s*").sub("", markup)
        self.tree = self.soup(markup)
--- a/bitbake/lib/codegen.py
+++ b/bitbake/lib/codegen.py
@@ -401,12 +401,6 @@ class SourceGenerator(NodeVisitor):
    def visit_Num(self, node):
        self.write(repr(node.n))
    def visit_Constant(self, node):
        # Python 3.8 deprecated visit_Num(), visit_Str(), visit_Bytes(),
        # visit_NameConstant() and visit_Ellipsis(). They can be removed once we
        # require 3.8+.
        self.write(repr(node.value))
    def visit_Tuple(self, node):
        self.write('(')
        idx = -1
--- a/bitbake/lib/layerindexlib/init.py
+++ b/bitbake/lib/layerindexlib/init.py
@@ -1278,7 +1278,7 @@ class Recipe(LayerIndexItemObj_LayerBranch):
                    filename, filepath, pn, pv, layerbranch,
                    summary="", description="", section="", license="",
                    homepage="", bugtracker="", provides="", bbclassextend="",
-                    inherits="", disallowed="", updated=None):
+                    inherits="", blacklisted="", updated=None):
        self.id = id
        self.filename = filename
        self.filepath = filepath
@@ -1294,7 +1294,7 @@ class Recipe(LayerIndexItemObj_LayerBranch):
        self.bbclassextend = bbclassextend
        self.inherits = inherits
        self.updated = updated or datetime.datetime.today().isoformat()
-        self.disallowed = disallowed
+        self.blacklisted = blacklisted
        if isinstance(layerbranch, LayerBranch):
            self.layerbranch = layerbranch
        else:
--- a/bitbake/lib/layerindexlib/cooker.py
+++ b/bitbake/lib/layerindexlib/cooker.py
@@ -279,7 +279,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin):
                                   summary=pn, description=pn, section='?',
                                   license='?', homepage='?', bugtracker='?',
                                   provides='?', bbclassextend='?', inherits='?',
-                                   disallowed='?', layerbranch=depBranchId)
+                                   blacklisted='?', layerbranch=depBranchId)
                    index = addElement("recipes", [recipe], index)
--- a/bitbake/lib/ply/yacc.py
+++ b/bitbake/lib/ply/yacc.py
@@ -2797,15 +2797,11 @@ class ParserReflect(object):
    # Compute a signature over the grammar
    def signature(self):
        try:
-            import hashlib
+            from hashlib import md5
        except ImportError:
-            raise RuntimeError("Unable to import hashlib")
+            from md5 import md5
        try:
            sig = hashlib.new('MD5', usedforsecurity=False)
        except TypeError:
            # Some configurations don't appear to support two arguments
            sig = hashlib.new('MD5')
        try:
            sig = md5()
            if self.start:
                sig.update(self.start.encode('latin-1'))
            if self.prec:
--- a/bitbake/lib/prserv/init.py
+++ b/bitbake/lib/prserv/init.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/prserv/client.py
+++ b/bitbake/lib/prserv/client.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/prserv/db.py
+++ b/bitbake/lib/prserv/db.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/prserv/serv.py
+++ b/bitbake/lib/prserv/serv.py
@@ -1,6 +1,4 @@
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
@@ -344,9 +342,9 @@ def auto_shutdown():
 def ping(host, port):
    from . import client
-    with client.PRClient() as conn:
+    conn = client.PRClient()
-        conn.connect_tcp(host, port)
+    conn.connect_tcp(host, port)
-        return conn.ping()
+    return conn.ping()
 def connect(host, port):
    from . import client
--- a/bitbake/lib/pyinotify.py
+++ b/bitbake/lib/pyinotify.py
@@ -595,24 +595,14 @@ class _ProcessEvent:
        @type event: Event object
        @return: By convention when used from the ProcessEvent class:
                 - Returning False or None (default value) means keep on
-                   executing next chained functors (see chain.py example).
+                 executing next chained functors (see chain.py example).
                 - Returning True instead means do not execute next
                   processing functions.
        @rtype: bool
        @raise ProcessEventError: Event object undispatchable,
                                  unknown event.
        """
-        stripped_mask = event.mask & ~IN_ISDIR
+        stripped_mask = event.mask - (event.mask & IN_ISDIR)
        # Bitbake hack - we see event masks of 0x6, i.e., IN_MODIFY & IN_ATTRIB.
        # The kernel inotify code can set more than one of the bits in the mask,
        # fsnotify_change() in linux/fsnotify.h is quite clear that IN_ATTRIB,
        # IN_MODIFY and IN_ACCESS can arrive together.
        # This breaks the code below which assume only one mask bit is ever
        # set in an event. We don't care about attrib or access in bitbake so
        # drop those.
        if stripped_mask & IN_MODIFY:
            stripped_mask &= ~(IN_ATTRIB | IN_ACCESS)
        maskname = EventsCodes.ALL_VALUES.get(stripped_mask)
        if maskname is None:
            raise ProcessEventError("Unknown mask 0x%08x" % stripped_mask)
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -200,7 +200,7 @@ class LocalhostBEController(BuildEnvironmentController):
                localdirpath = os.path.join(localdirname, dirpath)
                logger.debug("localhostbecontroller: localdirpath expects '%s'" % localdirpath)
                if not os.path.exists(localdirpath):
-                    raise BuildSetupException("Cannot find layer git path '%s' in checked out repository '%s:%s'. Exiting." % (localdirpath, giturl, commit))
+                    raise BuildSetupException("Cannot find layer git path '%s' in checked out repository '%s:%s'. Aborting." % (localdirpath, giturl, commit))
                if name != "bitbake":
                    layerlist.append("%03d:%s" % (index,localdirpath.rstrip("/")))
@@ -467,7 +467,7 @@ class LocalhostBEController(BuildEnvironmentController):
            logger.debug("localhostbecontroller: waiting for bblock content to appear")
            time.sleep(1)
        else:
-            raise BuildSetupException("Cannot find bitbake server lock file '%s'. Exiting." % bblock)
+            raise BuildSetupException("Cannot find bitbake server lock file '%s'. Aborting." % bblock)
        with open(bblock) as fplock:
            for line in fplock:
--- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
@@ -180,77 +180,6 @@ class Command(BaseCommand):
        except Exception as e:
            logger.warning("runbuilds: schedule exception %s" % str(e))
    # Test to see if a build pre-maturely died due to a bitbake crash
    def check_dead_builds(self):
        do_cleanup = False
        try:
            for br in BuildRequest.objects.filter(state=BuildRequest.REQ_INPROGRESS):
                # Get the build directory
                if br.project.builddir:
                    builddir =  br.project.builddir
                else:
                    builddir = '%s-toaster-%d' % (br.environment.builddir,br.project.id)
                # Check log to see if there is a recent traceback
                toaster_ui_log = os.path.join(builddir, 'toaster_ui.log')
                test_file = os.path.join(builddir, '._toaster_check.txt')
                os.system("tail -n 50 %s > %s" % (os.path.join(builddir, 'toaster_ui.log'),test_file))
                traceback_text = ''
                is_traceback = False
                with open(test_file,'r') as test_file_fd:
                    test_file_tail = test_file_fd.readlines()
                    for line in test_file_tail:
                        if line.startswith('Traceback (most recent call last):'):
                            traceback_text = line
                            is_traceback = True
                        elif line.startswith('NOTE: ToasterUI waiting for events'):
                            # Ignore any traceback before new build start
                            traceback_text = ''
                            is_traceback = False
                        elif line.startswith('Note: Toaster traceback auto-stop'):
                            # Ignore any traceback before this previous traceback catch
                            traceback_text = ''
                            is_traceback = False
                        elif is_traceback:
                            traceback_text += line
                # Test the results
                is_stop = False
                if is_traceback:
                    # Found a traceback
                    errtype = 'Bitbake crash'
                    errmsg = 'Bitbake crash\n' + traceback_text
                    state = BuildRequest.REQ_FAILED
                    # Clean up bitbake files
                    bitbake_lock = os.path.join(builddir, 'bitbake.lock')
                    if os.path.isfile(bitbake_lock):
                        os.remove(bitbake_lock)
                    bitbake_sock = os.path.join(builddir, 'bitbake.sock')
                    if os.path.isfile(bitbake_sock):
                        os.remove(bitbake_sock)
                    if os.path.isfile(test_file):
                        os.remove(test_file)
                    # Add note to ignore this traceback on next check
                    os.system('echo "Note: Toaster traceback auto-stop" >> %s' % toaster_ui_log)
                    is_stop = True
                # Add more tests here
                #elif ...
                # Stop the build request?
                if is_stop:
                    brerror = BRError(
                        req = br,
                        errtype = errtype,
                        errmsg = errmsg,
                        traceback = traceback_text,
                        )
                    brerror.save()
                    br.state = state
                    br.save()
                    do_cleanup = True
            # Do cleanup
            if do_cleanup:
                self.cleanup()
        except Exception as e:
            logger.error("runbuilds: Error in check_dead_builds %s" % e)
    def handle(self, **options):
        pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."),
                                    ".runbuilds.pid")
@@ -258,18 +187,10 @@ class Command(BaseCommand):
        with open(pidfile_path, 'w') as pidfile:
            pidfile.write("%s" % os.getpid())
        # Clean up any stale/failed builds from previous Toaster run
        self.runbuild()
        signal.signal(signal.SIGUSR1, lambda sig, frame: None)
        while True:
-            sigset = signal.sigtimedwait([signal.SIGUSR1], 5)
+            signal.pause()
-            if sigset:
+            self.runbuild()
                for sig in sigset:
                    # Consume each captured pending event
                    self.runbuild()
            else:
                # Check for build exceptions
                self.check_dead_builds()
--- a/bitbake/lib/toaster/bldcontrol/migrations/0008_models_bigautofield.py
+++ b/bitbake/lib/toaster/bldcontrol/migrations/0008_models_bigautofield.py
@@ -1,48 +0,0 @@
 # Generated by Django 3.2.12 on 2022-03-06 03:28
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('bldcontrol', '0007_brlayers_optional_gitinfo'),
    ]
    operations = [
        migrations.AlterField(
            model_name='brbitbake',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='brerror',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='brlayer',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='brtarget',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='brvariable',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='buildenvironment',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='buildrequest',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
    ]
--- a/bitbake/lib/toaster/manage.py
+++ b/bitbake/lib/toaster/manage.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 #
 # Copyright BitBake Contributors
 #
 # SPDX-License-Identifier: GPL-2.0-only
 #
--- a/bitbake/lib/toaster/orm/fixtures/gen_fixtures.py
+++ b/bitbake/lib/toaster/orm/fixtures/gen_fixtures.py
@@ -1,445 +0,0 @@
 #!/usr/bin/env python3
 # ex:ts=4:sw=4:sts=4:et
 # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #
 # Generate Toaster Fixtures for 'poky.xml' and 'oe-core.xml'
 #
 # Copyright (C) 2022      Wind River Systems
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # Edit the 'current_releases' table for each new release cycle
 #
 # Usage: ./get_fixtures all
 #
 import os
 import sys
 import argparse
 verbose = False
 ####################################
 # Releases
 #
 # https://wiki.yoctoproject.org/wiki/Releases
 #
 # NOTE: for the current releases table, it helps to keep continuing releases
 # in the same table positions since this minimizes the patch diff for review.
 # The order of the table does not matter since Toaster presents them sorted.
 #
 # Traditionally, the two most current releases are included in addition to the
 # 'master' branch and the local installation's 'HEAD'.
 # It is also policy to include all active LTS releases.
 #
 # [Codename, Yocto Project Version, Release Date, Current Version, Support Level, Poky Version, BitBake branch]
 current_releases = [
    # Release slot #1
    ['Kirkstone','3.5','April 2022','','Future - Long Term Support (until Apr. 2024)','27.0','1.54'],
 #    ['Dunfell','3.1','April 2021','3.1.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','23.0','1.46'],
    # Release slot #2 'local'
    ['HEAD','HEAD','','Local Yocto Project','HEAD','','HEAD'],
    # Release slot #3 'master'
    ['Master','master','','Yocto Project master','master','','master'],
    # Release slot #4
    ['Honister','3.4','October 2021','3.4.2 (February 2022)','Support for 7 months (until May 2022)','26.0','1.52'],
 #    ['Gatesgarth','3.2','Oct 2020','3.2.4 (May 2021)','EOL','24.0','1.48'],
    # Optional Release slot #4
    ['Hardknott','3.3','April 2021','3.3.5 (March 2022)','Stable - Support for 13 months (until Apr. 2022)','25.0','1.50'],
 ]
 default_poky_layers = [
    'openembedded-core',
    'meta-poky',
    'meta-yocto-bsp',
 ]
 default_oe_core_layers = [
    'openembedded-core',
 ]
 ####################################
 # Templates
 prolog_template = '''\
 <?xml version="1.0" encoding="utf-8"?>
 <django-objects version="1.0">
  <!-- Set the project default value for DISTRO -->
  <object model="orm.toastersetting" pk="1">
    <field type="CharField" name="name">DEFCONF_DISTRO</field>
    <field type="CharField" name="value">{{distro}}</field>
  </object>
 '''
 #<!-- Bitbake versions which correspond to the metadata release -->')
 bitbakeversion_poky_template = '''\
  <object model="orm.bitbakeversion" pk="{{bitbake_id}}">
    <field type="CharField" name="name">{{name}}</field>
    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
    <field type="CharField" name="branch">{{branch}}</field>
    <field type="CharField" name="dirpath">bitbake</field>
  </object>
 '''
 bitbakeversion_oecore_template = '''\
  <object model="orm.bitbakeversion" pk="{{bitbake_id}}">
    <field type="CharField" name="name">{{name}}</field>
    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
    <field type="CharField" name="branch">{{bitbakeversion}}</field>
  </object>
 '''
 # <!-- Releases available -->
 releases_available_template = '''\
  <object model="orm.release" pk="{{ra_count}}">
    <field type="CharField" name="name">{{name}}</field>
    <field type="CharField" name="description">{{description}}</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">{{ra_count}}</field>
    <field type="CharField" name="branch_name">{{release}}</field>
    <field type="TextField" name="helptext">Toaster will run your builds {{help_source}}.</field>
  </object>
 '''
 # <!-- Default project layers for each release -->
 default_layers_template = '''\
  <object model="orm.releasedefaultlayer" pk="{{rdl_count}}">
    <field rel="ManyToOneRel" to="orm.release" name="release">{{release_id}}</field>
    <field type="CharField" name="layer_name">{{layer}}</field>
  </object>
 '''
 default_layers_preface = '''\
  <!-- Default layers provided by poky
       openembedded-core
       meta-poky
       meta-yocto-bsp
  -->
 '''
 layer_poky_template = '''\
  <object model="orm.layer" pk="{{layer_id}}">
    <field type="CharField" name="name">{{layer}}</field>
    <field type="CharField" name="layer_index_url"></field>
    <field type="CharField" name="vcs_url">{{vcs_url}}</field>
    <field type="CharField" name="vcs_web_url">{{vcs_web_url}}</field>
    <field type="CharField" name="vcs_web_tree_base_url">{{vcs_web_tree_base_url}}</field>
    <field type="CharField" name="vcs_web_file_base_url">{{vcs_web_file_base_url}}</field>
  </object>
 '''
 layer_oe_core_template = '''\
  <object model="orm.layer" pk="{{layer_id}}">
    <field type="CharField" name="name">{{layer}}</field>
    <field type="CharField" name="vcs_url">{{vcs_url}}</field>
    <field type="CharField" name="vcs_web_url">{{vcs_web_url}}</field>
    <field type="CharField" name="vcs_web_tree_base_url">{{vcs_web_tree_base_url}}</field>
    <field type="CharField" name="vcs_web_file_base_url">{{vcs_web_file_base_url}}</field>
  </object>
 '''
 layer_version_template = '''\
  <object model="orm.layer_version" pk="{{lv_count}}">
    <field rel="ManyToOneRel" to="orm.layer" name="layer">{{layer_id}}</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">{{release_id}}</field>
    <field type="CharField" name="branch">{{branch}}</field>
    <field type="CharField" name="dirpath">{{dirpath}}</field>
  </object>
 '''
 layer_version_HEAD_template = '''\
  <object model="orm.layer_version" pk="{{lv_count}}">
    <field rel="ManyToOneRel" to="orm.layer" name="layer">{{layer_id}}</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">{{release_id}}</field>
    <field type="CharField" name="branch">{{branch}}</field>
    <field type="CharField" name="commit">{{commit}}</field>
    <field type="CharField" name="dirpath">{{dirpath}}</field>
  </object>
 '''
 layer_version_oe_core_template = '''\
  <object model="orm.layer_version" pk="1">
    <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
    <field type="CharField" name="local_path">OE-CORE-LAYER-DIR</field>
    <field type="CharField" name="branch">HEAD</field>
    <field type="CharField" name="dirpath">meta</field>
    <field type="IntegerField" name="layer_source">0</field>
  </object>
 '''
 epilog_template = '''\
 </django-objects>
 '''
 #################################
 # Helper Routines
 #
 def print_str(str,fd):
    # Avoid extra newline at end
    if str and (str[-1] == '\n'):
        str = str[0:-1]
    print(str,file=fd)
 def print_template(template,params,fd):
    for line in template.split('\n'):
        p = line.find('{{')
        while p > 0:
            q = line.find('}}')
            key = line[p+2:q]
            if key in params:
                line = line[0:p] + params[key] + line[q+2:]
            else:
                line = line[0:p] + '?' + key + '?' + line[q+2:]
            p = line.find('{{')
        if line:
            print(line,file=fd)
 #################################
 # Generate poky.xml
 #
 def generate_poky():
    fd = open('poky.xml','w')
    params = {}
    params['distro'] = 'poky'
    print_template(prolog_template,params,fd)
    print_str('',fd)
    print_str('  <!-- Bitbake versions which correspond to the metadata release -->',fd)
    for i,release in enumerate(current_releases):
        params = {}
        params['release'] = release[0]
        params['Release'] = release[0]
        params['release_version'] = release[1]
        if not (params['release'] in ('HEAD')):    # 'master',
            params['release'] = params['release'][0].lower() + params['release'][1:]
        params['name'] = params['release']
        params['bitbake_id'] = str(i+1)
        params['branch'] = params['release']
        print_template(bitbakeversion_poky_template,params,fd)
    print_str('',fd)
    print_str('',fd)
    print_str('  <!-- Releases available -->',fd)
    for i,release in enumerate(current_releases):
        params = {}
        params['release'] = release[0]
        params['Release'] = release[0]
        params['release_version'] = release[1]
        if not (params['release'] in ('HEAD')): #'master',
            params['release'] = params['release'][0].lower() + params['release'][1:]
        params['h_release'] = '?h={{release}}'
        params['name'] = params['release']
        params['ra_count'] = str(i+1)
        params['branch'] = params['release']
        if 'HEAD' == params['release']:
            params['help_source'] = 'with the version of the Yocto Project you have cloned or downloaded to your computer'
            params['description'] = 'Local Yocto Project'
            params['name'] = 'local'
        else:
            params['help_source'] = 'using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/{{h_release}}"&gt;Yocto Project {{Release}} branch&lt;/a&gt;'
            params['description'] = 'Yocto Project {{release_version}} "{{Release}}"'
        if 'master' == params['release']:
            params['h_release'] = ''
            params['description'] = 'Yocto Project master'
        print_template(releases_available_template,params,fd)
    print_str('',fd)
    print_str('  <!-- Default project layers for each release -->',fd)
    rdl_count = 1
    for i,release in enumerate(current_releases):
        for j,layer in enumerate(default_poky_layers):
            params = {}
            params['layer'] = layer
            params['release'] = release[0]
            params['Release'] = release[0]
            params['release_version'] = release[1]
            if not (params['release'] in ('master','HEAD')):
                params['release'] = params['release'][0].lower() + params['release'][1:]
            params['release_id'] = str(i+1)
            params['rdl_count'] = str(rdl_count)
            params['branch'] = params['release']
            print_template(default_layers_template,params,fd)
            rdl_count += 1
    print_str('',fd)
    print_str(default_layers_preface,fd)
    lv_count = 1
    for i,layer in enumerate(default_poky_layers):
        params = {}
        params['layer'] = layer
        params['layer_id'] = str(i+1)
        params['vcs_url'] = 'git://git.yoctoproject.org/poky'
        params['vcs_web_url'] = 'https://git.yoctoproject.org/cgit/cgit.cgi/poky'
        params['vcs_web_tree_base_url'] = 'https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%'
        params['vcs_web_file_base_url'] = 'https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%'
        if i:
            print_str('',fd)
        print_template(layer_poky_template,params,fd)
        for j,release in enumerate(current_releases):
            params['release'] = release[0]
            params['Release'] = release[0]
            params['release_version'] = release[1]
            if not (params['release'] in ('master','HEAD')):
                params['release'] = params['release'][0].lower() + params['release'][1:]
            params['release_id'] = str(j+1)
            params['lv_count'] = str(lv_count)
            params['branch'] = params['release']
            params['commit'] = params['release']
            params['dirpath'] = params['layer']
            if params['layer'] in ('openembedded-core'):   #'openembedded-core',
                params['dirpath'] = 'meta'
            if 'HEAD' == params['release']:
                print_template(layer_version_HEAD_template,params,fd)
            else:
                print_template(layer_version_template,params,fd)
            lv_count += 1
    print_str(epilog_template,fd)
    fd.close()
 #################################
 # Generate oe-core.xml
 #
 def generate_oe_core():
    fd = open('oe-core.xml','w')
    params = {}
    params['distro'] = 'nodistro'
    print_template(prolog_template,params,fd)
    print_str('',fd)
    print_str('  <!-- Bitbake versions which correspond to the metadata release -->',fd)
    for i,release in enumerate(current_releases):
        params = {}
        params['release'] = release[0]
        params['Release'] = release[0]
        params['bitbakeversion'] = release[6]
        params['release_version'] = release[1]
        if not (params['release'] in ('HEAD')):    # 'master',
            params['release'] = params['release'][0].lower() + params['release'][1:]
        params['name'] = params['release']
        params['bitbake_id'] = str(i+1)
        params['branch'] = params['release']
        print_template(bitbakeversion_oecore_template,params,fd)
    print_str('',fd)
    print_str('  <!-- Releases available -->',fd)
    for i,release in enumerate(current_releases):
        params = {}
        params['release'] = release[0]
        params['Release'] = release[0]
        params['release_version'] = release[1]
        if not (params['release'] in ('HEAD')): #'master',
            params['release'] = params['release'][0].lower() + params['release'][1:]
        params['h_release'] = '?h={{release}}'
        params['name'] = params['release']
        params['ra_count'] = str(i+1)
        params['branch'] = params['release']
        if 'HEAD' == params['release']:
            params['help_source'] = 'with the version of OpenEmbedded that you have cloned or downloaded to your computer'
            params['description'] = 'Local Openembedded'
            params['name'] = 'local'
        else:
            params['help_source'] = 'using the tip of the &lt;a href=\\"https://cgit.openembedded.org/openembedded-core/log/{{h_release}}\\"&gt;OpenEmbedded {{Release}}&lt;/a&gt; branch'
            params['description'] = 'Openembedded {{Release}}'
        if 'master' == params['release']:
            params['h_release'] = ''
            params['description'] = 'OpenEmbedded core master'
            params['Release'] = params['release']
        print_template(releases_available_template,params,fd)
    print_str('',fd)
    print_str('  <!-- Default layers for each release -->',fd)
    rdl_count = 1
    for i,release in enumerate(current_releases):
        for j,layer in enumerate(default_oe_core_layers):
            params = {}
            params['layer'] = layer
            params['release'] = release[0]
            params['Release'] = release[0]
            params['release_version'] = release[1]
            if not (params['release'] in ('master','HEAD')):
                params['release'] = params['release'][0].lower() + params['release'][1:]
            params['release_id'] = str(i+1)
            params['rdl_count'] = str(rdl_count)
            params['branch'] = params['release']
            print_template(default_layers_template,params,fd)
            rdl_count += 1
    print_str('',fd)
    print_str('',fd)
    print_str('  <!-- Layer for the Local release -->',fd)
    lv_count = 1
    for i,layer in enumerate(default_oe_core_layers):
        params = {}
        params['layer'] = layer
        params['layer_id'] = str(i+1)
        params['vcs_url'] = 'git://git.openembedded.org/openembedded-core'
        params['vcs_web_url'] = 'https://cgit.openembedded.org/openembedded-core'
        params['vcs_web_tree_base_url'] = 'https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%'
        params['vcs_web_file_base_url'] = 'https://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%'
        if i:
            print_str('',fd)
        print_template(layer_oe_core_template,params,fd)
        print_template(layer_version_oe_core_template,params,fd)
    print_str('',fd)
    print_str(epilog_template,fd)
    fd.close()
 #################################
 # Help
 #
 def list_releases():
    print("Release    ReleaseVer  BitbakeVer Support Level")
    print("========== =========== ========== ==============================================")
    for release in current_releases:
        print("%10s %10s %11s %s" % (release[0],release[1],release[6],release[4]))
 #################################
 # main
 #
 def main(argv):
    global verbose
    parser = argparse.ArgumentParser(description='gen_fixtures.py: table generate the fixture files')
    parser.add_argument('--poky', '-p', action='store_const', const='poky', dest='command', help='Generate the poky.xml file')
    parser.add_argument('--oe-core', '-o', action='store_const', const='oe_core', dest='command', help='Generate the oe-core.xml file')
    parser.add_argument('--all', '-a', action='store_const', const='all', dest='command', help='Generate all fixture files')
    parser.add_argument('--list', '-l', action='store_const', const='list', dest='command', help='List the release table')
    parser.add_argument('--verbose', '-v', action='store_true', dest='verbose', help='Enable verbose debugging output')
    args = parser.parse_args()
    verbose = args.verbose
    if 'poky' == args.command:
        generate_poky()
    elif 'oe_core' == args.command:
        generate_oe_core()
    elif 'all' == args.command:
        generate_poky()
        generate_oe_core()
    elif 'all' == args.command:
        list_releases()
    elif 'list' == args.command:
        list_releases()
    else:
        print("No command for 'gen_fixtures.py' selected")
 if __name__ == '__main__':
    main(sys.argv[1:])
--- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml
+++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
@@ -8,9 +8,9 @@
  <!-- Bitbake versions which correspond to the metadata release -->
  <object model="orm.bitbakeversion" pk="1">
-    <field type="CharField" name="name">kirkstone</field>
+    <field type="CharField" name="name">dunfell</field>
    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
-    <field type="CharField" name="branch">1.54</field>
+    <field type="CharField" name="branch">1.46</field>
  </object>
  <object model="orm.bitbakeversion" pk="2">
    <field type="CharField" name="name">HEAD</field>
@@ -23,23 +23,23 @@
    <field type="CharField" name="branch">master</field>
  </object>
  <object model="orm.bitbakeversion" pk="4">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
    <field type="CharField" name="branch">1.52</field>
  </object>
  <object model="orm.bitbakeversion" pk="5">
    <field type="CharField" name="name">hardknott</field>
    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
    <field type="CharField" name="branch">1.50</field>
  </object>
  <object model="orm.bitbakeversion" pk="5">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
    <field type="CharField" name="branch">1.52</field>
  </object>
  <!-- Releases available -->
  <object model="orm.release" pk="1">
-    <field type="CharField" name="name">kirkstone</field>
+    <field type="CharField" name="name">dunfell</field>
-    <field type="CharField" name="description">Openembedded Kirkstone</field>
+    <field type="CharField" name="description">Openembedded Dunfell</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
-    <field type="CharField" name="branch_name">kirkstone</field>
+    <field type="CharField" name="branch_name">dunfell</field>
-    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=kirkstone\"&gt;OpenEmbedded Kirkstone&lt;/a&gt; branch.</field>
+    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=dunfell\"&gt;OpenEmbedded Dunfell&lt;/a&gt; branch.</field>
  </object>
  <object model="orm.release" pk="2">
    <field type="CharField" name="name">local</field>
@@ -56,19 +56,19 @@
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"https://cgit.openembedded.org/openembedded-core/log/\"&gt;OpenEmbedded master&lt;/a&gt; branch.</field>
  </object>
  <object model="orm.release" pk="4">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="description">Openembedded Honister</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
    <field type="CharField" name="branch_name">honister</field>
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=honister\"&gt;OpenEmbedded Honister&lt;/a&gt; branch.</field>
  </object>
  <object model="orm.release" pk="5">
    <field type="CharField" name="name">hardknott</field>
    <field type="CharField" name="description">Openembedded Hardknott</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
    <field type="CharField" name="branch_name">hardknott</field>
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=hardknott\"&gt;OpenEmbedded Hardknott&lt;/a&gt; branch.</field>
  </object>
  <object model="orm.release" pk="5">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="description">Openembedded Honister</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
    <field type="CharField" name="branch_name">honister</field>
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"https://cgit.openembedded.org/openembedded-core/log/?h=honister\"&gt;OpenEmbedded Honister&lt;/a&gt; branch.</field>
  </object>
  <!-- Default layers for each release -->
  <object model="orm.releasedefaultlayer" pk="1">
--- a/bitbake/lib/toaster/orm/fixtures/poky.xml
+++ b/bitbake/lib/toaster/orm/fixtures/poky.xml
@@ -8,9 +8,9 @@
  <!-- Bitbake versions which correspond to the metadata release -->
  <object model="orm.bitbakeversion" pk="1">
-    <field type="CharField" name="name">kirkstone</field>
+    <field type="CharField" name="name">dunfell</field>
    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
-    <field type="CharField" name="branch">kirkstone</field>
+    <field type="CharField" name="branch">dunfell</field>
    <field type="CharField" name="dirpath">bitbake</field>
  </object>
  <object model="orm.bitbakeversion" pk="2">
@@ -26,26 +26,26 @@
    <field type="CharField" name="dirpath">bitbake</field>
  </object>
  <object model="orm.bitbakeversion" pk="4">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
    <field type="CharField" name="branch">honister</field>
    <field type="CharField" name="dirpath">bitbake</field>
  </object>
  <object model="orm.bitbakeversion" pk="5">
    <field type="CharField" name="name">hardknott</field>
    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
    <field type="CharField" name="branch">hardknott</field>
    <field type="CharField" name="dirpath">bitbake</field>
  </object>
  <object model="orm.bitbakeversion" pk="5">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
    <field type="CharField" name="branch">honister</field>
    <field type="CharField" name="dirpath">bitbake</field>
  </object>
  <!-- Releases available -->
  <object model="orm.release" pk="1">
-    <field type="CharField" name="name">kirkstone</field>
+    <field type="CharField" name="name">dunfell</field>
-    <field type="CharField" name="description">Yocto Project 4.0 "Kirkstone"</field>
+    <field type="CharField" name="description">Yocto Project 3.1 "Dunfell"</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
-    <field type="CharField" name="branch_name">kirkstone</field>
+    <field type="CharField" name="branch_name">dunfell</field>
-    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=kirkstone"&gt;Yocto Project Kirkstone branch&lt;/a&gt;.</field>
+    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dunfell"&gt;Yocto Project Dunfell branch&lt;/a&gt;.</field>
  </object>
  <object model="orm.release" pk="2">
    <field type="CharField" name="name">local</field>
@@ -62,19 +62,19 @@
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/"&gt;Yocto Project Master branch&lt;/a&gt;.</field>
  </object>
  <object model="orm.release" pk="4">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="description">Yocto Project 3.4 "Honister"</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
    <field type="CharField" name="branch_name">honister</field>
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=honister"&gt;Yocto Project Honister branch&lt;/a&gt;.</field>
  </object>
  <object model="orm.release" pk="5">
    <field type="CharField" name="name">hardknott</field>
    <field type="CharField" name="description">Yocto Project 3.3 "Hardknott"</field>
-    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
    <field type="CharField" name="branch_name">hardknott</field>
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=hardknott"&gt;Yocto Project Hardknott branch&lt;/a&gt;.</field>
  </object>
  <object model="orm.release" pk="5">
    <field type="CharField" name="name">honister</field>
    <field type="CharField" name="description">Yocto Project 3.4 "Honister"</field>
    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">5</field>
    <field type="CharField" name="branch_name">honister</field>
    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="https://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=honister"&gt;Yocto Project Honister branch&lt;/a&gt;.</field>
  </object>
  <!-- Default project layers for each release -->
  <object model="orm.releasedefaultlayer" pk="1">
@@ -155,7 +155,7 @@
    <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
-    <field type="CharField" name="branch">kirkstone</field>
+    <field type="CharField" name="branch">dunfell</field>
    <field type="CharField" name="dirpath">meta</field>
  </object>
  <object model="orm.layer_version" pk="2">
@@ -177,14 +177,14 @@
    <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
-    <field type="CharField" name="branch">honister</field>
+    <field type="CharField" name="branch">hardknott</field>
    <field type="CharField" name="dirpath">meta</field>
  </object>
  <object model="orm.layer_version" pk="5">
    <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
-    <field type="CharField" name="branch">hardknott</field>
+    <field type="CharField" name="branch">honister</field>
    <field type="CharField" name="dirpath">meta</field>
  </object>
@@ -200,7 +200,7 @@
    <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
-    <field type="CharField" name="branch">kirkstone</field>
+    <field type="CharField" name="branch">dunfell</field>
    <field type="CharField" name="dirpath">meta-poky</field>
  </object>
  <object model="orm.layer_version" pk="7">
@@ -222,14 +222,14 @@
    <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
-    <field type="CharField" name="branch">honister</field>
+    <field type="CharField" name="branch">hardknott</field>
    <field type="CharField" name="dirpath">meta-poky</field>
  </object>
  <object model="orm.layer_version" pk="10">
    <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
-    <field type="CharField" name="branch">hardknott</field>
+    <field type="CharField" name="branch">honister</field>
    <field type="CharField" name="dirpath">meta-poky</field>
  </object>
@@ -245,7 +245,7 @@
    <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
-    <field type="CharField" name="branch">kirkstone</field>
+    <field type="CharField" name="branch">dunfell</field>
    <field type="CharField" name="dirpath">meta-yocto-bsp</field>
  </object>
  <object model="orm.layer_version" pk="12">
@@ -267,14 +267,14 @@
    <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
-    <field type="CharField" name="branch">honister</field>
+    <field type="CharField" name="branch">hardknott</field>
    <field type="CharField" name="dirpath">meta-yocto-bsp</field>
  </object>
  <object model="orm.layer_version" pk="15">
    <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
    <field type="IntegerField" name="layer_source">0</field>
    <field rel="ManyToOneRel" to="orm.release" name="release">5</field>
-    <field type="CharField" name="branch">hardknott</field>
+    <field type="CharField" name="branch">honister</field>
    <field type="CharField" name="dirpath">meta-yocto-bsp</field>
  </object>
 </django-objects>
--- a/bitbake/lib/toaster/orm/management/commands/lsupdates.py
+++ b/bitbake/lib/toaster/orm/management/commands/lsupdates.py
@@ -87,13 +87,13 @@ class Command(BaseCommand):
        # update branches; only those that we already have names listed in the
        # Releases table
-        allowed_branch_names = [rel.branch_name
+        whitelist_branch_names = [rel.branch_name
-                                for rel in Release.objects.all()]
+                                  for rel in Release.objects.all()]
-        if len(allowed_branch_names) == 0:
+        if len(whitelist_branch_names) == 0:
            raise Exception("Failed to make list of branches to fetch")
        logger.info("Fetching metadata for %s",
-                    " ".join(allowed_branch_names))
+                    " ".join(whitelist_branch_names))
        # We require a non-empty bb.data, but we can fake it with a dictionary
        layerindex = layerindexlib.LayerIndex({"DUMMY" : "VALUE"})
@@ -101,8 +101,8 @@ class Command(BaseCommand):
        http_progress = Spinner()
        http_progress.start()
-        if allowed_branch_names:
+        if whitelist_branch_names:
-            url_branches = ";branch=%s" % ','.join(allowed_branch_names)
+            url_branches = ";branch=%s" % ','.join(whitelist_branch_names)
        else:
            url_branches = ""
        layerindex.load_layerindex("%s%s" % (self.apiurl, url_branches))
--- a/bitbake/lib/toaster/orm/migrations/0020_models_bigautofield.py
+++ b/bitbake/lib/toaster/orm/migrations/0020_models_bigautofield.py
@@ -1,173 +0,0 @@
 # Generated by Django 3.2.12 on 2022-03-06 03:28
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('orm', '0019_django_2_2'),
    ]
    operations = [
        migrations.AlterField(
            model_name='bitbakeversion',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='build',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='distro',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='helptext',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='layer',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='layer_version',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='layerversiondependency',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='logmessage',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='machine',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='package',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='package_dependency',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='package_file',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='project',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='projectlayer',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='projecttarget',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='projectvariable',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='provides',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='recipe',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='recipe_dependency',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='release',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='releasedefaultlayer',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='target',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='target_file',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='target_image_file',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='target_installed_package',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='targetkernelfile',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='targetsdkfile',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='task',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='task_dependency',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='toastersetting',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='variable',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
        migrations.AlterField(
            model_name='variablehistory',
            name='id',
            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
        ),
    ]
--- a/Show More
+++ b/Show More