* [PATCH 00/15] kernel: consolidated pull request
@ 2023-07-10 3:20 bruce.ashfield
2023-07-10 3:20 ` [PATCH 01/15] linux-yocto/6.1: update to v6.1.36 bruce.ashfield
` (15 more replies)
0 siblings, 16 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Richard,
Here's the latest queued kernel changes. There are the expectd -stable updates
6.1, but those of course aren't the most interesting part of this queue.
We have the 6.4 reference kernel initial integration.
I've tested this on all architectures, core-image-sato + core-image-kernel-dev
as well as -rt, standard and -tiny kernels.
We also have the matching libc-headers bumps. I've already send patches
for some applications that had issues with the 6.4 headers, but the issues
were relatively minimal.
I've included the poky and oe-core preferred version bumps in this
series, just to make it a bit easier to test. They can be ignored if there
are issues, and we can just make the 6.4 kernel available in tree, and
fix the remaining issues before making it default.
I ran into perf and localversion issues (which broke the on-target
module builds). The patches to address them are in the series.
qemumips64 is seting a smp preemptible trace on boot, and I haven't
been able to track it down. If that is the only issue, it would be
better to get this into the tree, and try and find a mips expert to
help us out. I'll continue looking into it, but haven't had much luck
yet.
Bruce
The following changes since commit d221e59a5067266c3f620259a1e56a56823df1fb:
bitbake: cooker: Log when parsing starts in server log (2023-06-30 18:05:30 +0100)
are available in the Git repository at:
https://git.yoctoproject.org/poky-contrib zedd/kernel
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (15):
linux-yocto/6.1: update to v6.1.36
linux-yocto/6.1: update to v6.1.37
linux-libc-headers: bump to 6.4
perf: fix buildpaths QA warning in 6.4+
kernel: fix localversion in v6.3+
linux-yocto: introduce 6.4 reference kernel recipes
linux-yocto/6.4: update to latest
linux-yocto/6.4: aufs6 integration
linux-yocto/6.4: refresh configuration
linux-yocto-rt/6.4: integrate -rt6
linux-yocto/6.4: update to v6.4.2
linux-yocto/6.1: update to v6.1.38
conf/machine: set preferred kernel to be 6.4
poky/poky-tiny: set preferred linux-yocto version to 6.4
linux-yocto-tiny/6.4: fix configuration warnings (HID)
meta-poky/conf/distro/poky-tiny.conf | 2 +-
meta-poky/conf/distro/poky.conf | 4 +-
meta/classes-recipe/kernel-arch.bbclass | 7 ++
meta/classes-recipe/kernel.bbclass | 6 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/conf/machine/include/x86/x86-base.inc | 2 +-
meta/conf/machine/qemuarmv5.conf | 2 +-
...linux-stddef.h-in-swab.h-uapi-header.patch | 42 -----------
...aders_6.1.bb => linux-libc-headers_6.4.bb} | 3 +-
.../linux/linux-yocto-rt_6.1.bb | 6 +-
.../linux/linux-yocto-rt_6.4.bb | 48 +++++++++++++
.../linux/linux-yocto-tiny_6.1.bb | 6 +-
.../linux/linux-yocto-tiny_6.4.bb | 33 +++++++++
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 ++++----
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 71 +++++++++++++++++++
meta/recipes-kernel/perf/perf.bb | 2 +-
16 files changed, 191 insertions(+), 73 deletions(-)
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_6.1.bb => linux-libc-headers_6.4.bb} (74%)
create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto_6.4.bb
--
2.34.1
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 01/15] linux-yocto/6.1: update to v6.1.36
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 02/15] linux-yocto/6.1: update to v6.1.37 bruce.ashfield
` (14 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating to the latest korg -stable release that comprises
the following commits:
a1c449d00ff8 Linux 6.1.36
29429a1f5871 smb: move client and server files to common directory fs/smb
9d3e4bca4b92 i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle
81d4078f7a42 x86/apic: Fix kernel panic when booting with intremap=off and x2apic_phys
679354bea008 KVM: arm64: Restore GICv2-on-GICv3 functionality
6ab9468d3eea vhost_net: revert upend_idx only on retriable error
454e4f391a14 vhost_vdpa: tell vqs about the negotiated
1af1cd7be370 drm/radeon: fix race condition UAF in radeon_gem_set_domain_ioctl
022f2306d94f drm/exynos: fix race condition UAF in exynos_g2d_exec_ioctl
aa88042218aa drm/exynos: vidi: fix a wrong error return
711f727f7bab null_blk: Fix: memory release when memory_backed=1
f6076a1386c9 ARM: dts: Fix erroneous ADS touchscreen polarities
1d1baefacdb4 i2c: mchp-pci1xxxx: Avoid cast to incompatible function type
8e3257599409 ALSA: hda/realtek: Add "Intel Reference board" and "NUC 13" SSID in the ALC256
cfa01235b5ed ASoC: fsl_sai: Enable BCI bit if SAI works on synchronous mode with BYP asserted
570583c6251a s390/purgatory: disable branch profiling
c2888c460db2 gfs2: Don't get stuck writing page onto itself under direct I/O
878dad66b9b5 ASoC: amd: yc: Add Thinkpad Neo14 to quirks list for acp6x
1c97025d441f ASoC: nau8824: Add quirk to active-high jack-detect
5cc506e9b3e5 soundwire: qcom: add proper error paths in qcom_swrm_startup()
2839e0b64e65 soundwire: dmi-quirks: add new mapping for HP Spectre x360
ee4d36a14d3f ASoC: simple-card: Add missing of_node_put() in case of error
e701fb0a5d5b ASoC: codecs: wcd938x-sdw: do not set can_multi_write flag
06b9522ca831 spi: lpspi: disable lpspi module irq in DMA mode
39a77f005f8a s390/cio: unregister device when the only path is gone
552a24eb7168 arm64: dts: qcom: sc7280-qcard: drop incorrect dai-cells from WCD938x SDW
4de58b7c14c0 arm64: dts: qcom: sc7280-idp: drop incorrect dai-cells from WCD938x SDW
2e8ebf1a44cb Input: soc_button_array - add invalid acpi_index DMI quirk handling
ba0cc7a2e508 nvme: improve handling of long keep alives
06d9ec407f76 nvme: check IO start time when deciding to defer KA
8a72260619ca nvme: double KA polling frequency to avoid KATO with TBKAS on
c8f988c37a6b usb: gadget: udc: fix NULL dereference in remove()
3f6391062d0b btrfs: fix an uninitialized variable warning in btrfs_log_inode
a2c3e9bfc02c nfcsim.c: Fix error checking for debugfs_create_dir
a05df0643120 media: cec: core: don't set last_initiator if tx in progress
f37956a140d1 media: cec: core: disable adapter in cec_devnode_unregister
9d8ac2726cff smb3: missing null check in SMB2_change_notify
3e8458c5b205 arm64: Add missing Set/Way CMO encodings
8428f4c00d8c HID: wacom: Add error check to wacom_parse_and_register()
aaa50510adb7 scsi: target: iscsi: Prevent login threads from racing between each other
0357259cb103 gpiolib: Fix irq_domain resource tracking for gpiochip_irqchip_add_domain()
8592ada80ea5 gpio: sifive: add missing check for platform_get_irq
cb1108e17493 gpiolib: Fix GPIO chip IRQ initialization restriction
90714f7ed760 arm64: dts: rockchip: fix nEXTRST on SOQuartz
e51abd4808f9 arm64: dts: rockchip: Enable GPU on SOQuartz CM4
ec3d0f12e728 revert "net: align SO_RCVMARK required privileges with SO_MARK"
b2e2f9c0939f sch_netem: acquire qdisc lock in netem_change()
0434277b72a4 platform/x86/amd/pmf: Register notify handler only if SPS is enabled
2d580c73afdc selftests: forwarding: Fix race condition in mirror installation
eff07bf11841 io_uring/net: use the correct msghdr union member in io_sendmsg_copy_hdr
1b7b048c228e bpf: Force kprobe multi expected_attach_type for kprobe_multi link
fc3afb337814 bpf/btf: Accept function names that contain dots
22cc989f2b10 Revert "net: phy: dp83867: perform soft reset and retain established link"
3e04743dbacf netfilter: nfnetlink_osf: fix module autoload
abd3afddbf9e netfilter: nf_tables: disallow updates of anonymous sets
c34b22038543 netfilter: nf_tables: reject unbound chain set before commit phase
46f801ab5fb9 netfilter: nf_tables: reject unbound anonymous set before commit phase
b60c0ce0ff31 netfilter: nf_tables: disallow element updates of bound anonymous sets
0d836f917520 netfilter: nft_set_pipapo: .walk does not deal with generations
d60be2da67d1 netfilter: nf_tables: drop map element references from preparation phase
df27be7c1530 netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
891cd2edddc7 netfilter: nf_tables: fix chain binding transaction logic
f5b6dbec26f1 be2net: Extend xmit workaround to BE3 chip
50f689918db4 net: dsa: mt7530: fix handling of LLDP frames
a50f84af215e net: dsa: mt7530: fix handling of BPDUs on MT7530 switch
a4e4c7190126 net: dsa: mt7530: fix trapping frames on non-MT7621 SoC MT7530 switch
7fd2e9a69e83 ipvs: align inner_mac_header for encapsulation
6d1eec1f2dd7 mmc: usdhi60rol0: fix deferred probing
7e10fff13353 mmc: sh_mmcif: fix deferred probing
565b8bd2905d mmc: sdhci-acpi: fix deferred probing
645f89ee3e3e mmc: owl: fix deferred probing
251101c32a01 mmc: omap_hsmmc: fix deferred probing
0057a905de5c mmc: omap: fix deferred probing
f73b380518b2 mmc: mvsdio: fix deferred probing
4806f6b6b7a3 mmc: mtk-sd: fix deferred probing
d28b7a87332f net: qca_spi: Avoid high load if QCA7000 is not available
1d4dd09f13a9 sfc: use budget for TX completions
0bbb8164ed07 net/mlx5: DR, Fix wrong action data allocation in decap action
b062caf4f73b xfrm: Linearize the skb after offloading if needed.
fff9a18e0128 selftests: net: fcnal-test: check if FIPS mode is enabled
0793ead2ff2c selftests: net: vrf-xfrm-tests: change authentication and encryption algos
6919634176cd selftests: net: tls: check if FIPS mode is enabled
ac5671d10060 bpf: Fix a bpf_jit_dump issue for x86_64 with sysctl bpf_jit_enable.
8bb51cdc4fc2 xfrm: fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets
d9a0b1a53c79 bpf: Fix verifier id tracking of scalars on spill
461fc3391c52 bpf: track immediate values written to stack by BPF_ST instruction
b36ba84f09a1 KVM: arm64: PMU: Restore the host's PMUSERENR_EL0
c803e91600be xfrm: Ensure policies always checked on XFRM-I input path
94e81817f080 xfrm: interface: rename xfrm_interface.c to xfrm_interface_core.c
8ea03341f78a xfrm: Treat already-verified secpath entries as optional
43489b2cba5a ieee802154: hwsim: Fix possible memory leaks
caddcdf2a999 mmc: meson-gx: fix deferred probing
1a2793a25a60 memfd: check for non-NULL file_seals in memfd_create() syscall
364fdcbb035b x86/mm: Avoid using set_pgd() outside of real PGD pages
cbfee3d9d5c0 nilfs2: prevent general protection fault in nilfs_clear_dirty_page()
24f473769e7e io_uring/poll: serialize poll linked timer start with poll removal
2d80c85fa404 arm64: dts: rockchip: Fix rk356x PCIe register and range mappings
277a7c23b590 regmap: spi-avmm: Fix regmap_bus max_raw_write
b385b1d28e4e regulator: pca9450: Fix LDO3OUT and LDO4OUT MASK
ad5daeaa3d57 spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan()
21945b7a868f wifi: iwlwifi: pcie: Handle SO-F device for PCI id 0x7AF0
1dfca388fc7c bpf: ensure main program has an extable
03b2149d5aca mmc: sunxi: fix deferred probing
8b8756324c5b mmc: bcm2835: fix deferred probing
1db5a39a904e mmc: sdhci-spear: fix deferred probing
f1b17198e45b mmc: mmci: stm32: fix max busy timeout calculation
6c2af0fd8301 mmc: meson-gx: remove redundant mmc_request_done() call from irq context
687d34c57807 mmc: sdhci-msm: Disable broken 64-bit DMA on MSM8916
3dd0041c41da mmc: litex_mmc: set PROBE_PREFER_ASYNCHRONOUS
0d7a4e6589a0 cgroup,freezer: hold cpu_hotplug_lock before freezer_mutex in freezer_css_{online,offline}()
7b162a18d332 cgroup: Do not corrupt task iteration when rebinding subsystem
c2c46a70282f mptcp: consolidate fallback and non fallback state machine
1d3127542665 mptcp: fix possible list corruption on passive MPJ
b747e755986a mptcp: fix possible divide by zero in recvmsg()
b7bb71dfb541 mptcp: handle correctly disconnect() failures
1d9dc9bed999 io_uring/net: disable partial retries for recvmsg with cmsg
4d729cc67b05 io_uring/net: clear msg_controllen on partial sendmsg retry
4db49d59a89c PCI: hv: Add a per-bus mutex state_lock
091d03d19859 PCI: hv: Fix a race condition in hv_irq_unmask() that can cause panic
5c09925b1879 PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev
da2fff20d92d Revert "PCI: hv: Fix a timing issue which causes kdump to fail occasionally"
a74a9d9b756a PCI: hv: Fix a race condition bug in hv_pci_query_relations()
ba803d7ac18a Drivers: hv: vmbus: Fix vmbus_wait_for_unload() to scan present CPUs
191cb913293a Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails
4f7e702b74f7 KVM: Avoid illegal stage2 mapping on invalid memory slot
390aeb5ae7c0 ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep()
8e63b1fd24a8 nilfs2: fix buffer corruption due to concurrent device reads
d5d7cde2ad19 scripts: fix the gfp flags header path in gfp-translate
4a89bfb1a142 writeback: fix dereferencing NULL mapping->host on writeback_page_template
1fed1f851346 selftests: mptcp: join: fix "userspace pm add & remove address"
53e096bcaeac selftests: mptcp: join: skip fail tests if not supported
f17459121c37 selftests: mptcp: join: skip userspace PM tests if not supported
f40a7ded34c9 selftests: mptcp: join: skip test if iptables/tc cmds fail
bce23d125434 selftests: mptcp: sockopt: skip TCP_INQ checks if not supported
157dcb20000b selftests: mptcp: diag: skip listen tests if not supported
755c8857abde selftests/mount_setattr: fix redefine struct mount_attr build error
94851666aff4 selftests: mptcp: join: skip MPC backups tests if not supported
fe1f28db73f7 selftests: mptcp: join: skip fullmesh flag tests if not supported
6313c493e3c9 selftests: mptcp: join: skip backup if set flag on ID not supported
efb4f6c2dd4c selftests: mptcp: join: skip implicit tests if not supported
dd6c284a3430 selftests: mptcp: join: support RM_ADDR for used endpoints or not
695cce2f2cf5 selftests: mptcp: join: skip Fastclose tests if not supported
0381f30735e2 selftests: mptcp: join: support local endpoint being tracked or not
1c0d9b4b4745 selftests: mptcp: join: skip check if MIB counter not supported
e35edb09e53e selftests: mptcp: join: helpers to skip tests
4d65ec947d24 selftests: mptcp: join: use 'iptables-legacy' if available
44d3366bf4b9 selftests: mptcp: lib: skip if not below kernel version
c5bdd8eb8e7d selftests: mptcp: userspace pm: skip if not supported
733bf9d80d95 selftests: mptcp: userspace pm: skip if 'ip' tool is unavailable
bfe225dec643 selftests: mptcp: sockopt: skip getsockopt checks if not supported
103b4e62de32 selftests: mptcp: sockopt: relax expected returned size
61c1bf0666a9 selftests: mptcp: pm nl: skip fullmesh flag checks if not supported
41f7f7f6e43e selftests: mptcp: pm nl: remove hardcoded default limits
e79e5e7642ad selftests: mptcp: connect: skip disconnect tests if not supported
cba0db9c1586 selftests: mptcp: connect: skip transp tests if not supported
9ead68270b29 selftests: mptcp: lib: skip if missing symbol
4bed22c6876b selftests: mptcp: join: fix ShellCheck warnings
a032ccca15e1 selftests: mptcp: remove duplicated entries in usage
0c6552f83725 tick/common: Align tick period during sched_timer setup
854156d12caa ksmbd: validate session id and tree id in the compound request
c86211159bc3 ksmbd: fix out-of-bound read in smb2_write
9650cf70ec9d ksmbd: validate command payload size
0fd4ac3773c3 tpm_crb: Add support for CRB devices based on Pluton
a46fa5696613 tpm, tpm_tis: Claim locality in interrupt handler
2e7ad879e1b0 mm: Fix copy_from_user_nofault().
4ed740c6482f ata: libata-scsi: Avoid deadlock on rescan after device resume
c4465bff4d2f tty: serial: fsl_lpuart: reduce RX watermark to 0 on LS1028A
17732fed852a tty: serial: fsl_lpuart: make rx_watermark configurable for different platforms
9bcac453890b drm/amd/display: fix the system hang while disable PSR
e538342002cb drm/amd/display: Add wrapper to call planes and stream update
8d855bc67630 drm/amd/display: Use dc_update_planes_and_stream
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index 54ead24ded..19758206bc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "6f370bf9127713eccdfb3cf009c46ef4852aec28"
-SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e"
+SRCREV_machine ?= "5227a8173cee7256e370750216dbff5eca741134"
+SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.35"
+LINUX_VERSION ?= "6.1.36"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index fd2e2511d5..48cc6b87fb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.35"
+LINUX_VERSION ?= "6.1.36"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e"
+SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index 1838a1e031..5587c0d5b5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "915f4d2237d1c8e23eb67eda0b8e9b24373a80b4"
-SRCREV_machine:qemuarm64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemuloongarch64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemumips ?= "1aad3fa2eba5594fb4e779fc53fef6046d833c91"
-SRCREV_machine:qemuppc ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemuriscv64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemuriscv32 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemux86 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemux86-64 ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_machine:qemumips64 ?= "53e7685d6da27e112397e71c27a0bce0fc9313a9"
-SRCREV_machine ?= "682b17e1d76bc4364fcc9864f39c31c855b5f5df"
-SRCREV_meta ?= "b358c237cf493dcf5af1760fc4632ede32e1ff2e"
+SRCREV_machine:qemuarm ?= "5dd09d311b31db8c7b098e14a7857ef8a6e5353d"
+SRCREV_machine:qemuarm64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemuloongarch64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemumips ?= "1d79865ce12928b85ab2ab1756e7aa7ae5cc4938"
+SRCREV_machine:qemuppc ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemuriscv64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemuriscv32 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemux86 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemux86-64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_machine:qemumips64 ?= "7241bd2e494f07582f736ef1604e81ccd4afc7cf"
+SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
+SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "e84a4e368abe42cf359fe237f0238820859d5044"
+SRCREV_machine:class-devupstream ?= "a1c449d00ff8ce2c5fcea5f755df682d1f6bc2ef"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.35"
+LINUX_VERSION ?= "6.1.36"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 02/15] linux-yocto/6.1: update to v6.1.37
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
2023-07-10 3:20 ` [PATCH 01/15] linux-yocto/6.1: update to v6.1.36 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 03/15] linux-libc-headers: bump to 6.4 bruce.ashfield
` (13 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating to the latest korg -stable release that comprises
the following commits:
0f4ac6b4c5f0 Linux 6.1.37
323846590c55 xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion
c2d89256de75 csky: fix up lock_mm_and_find_vma() conversion
4a1db15878aa parisc: fix expand_stack() conversion
0a1da2dde461 sparc32: fix lock_mm_and_find_vma() conversion
00f04a3385f7 Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"
a536383ef030 HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651.
d89750b19681 HID: wacom: Use ktime_t rather than int when dealing with timestamps
879e79c3aead HID: hidraw: fix data race on device refcount
cae854249578 fbdev: fix potential OOB read in fast_imageblit()
e6bbad75712a mm: always expand the stack with the mmap write lock held
c4b31d1b694e execve: expand new process stack manually ahead of time
6a6b5616c3d0 mm: make find_extend_vma() fail if write lock not held
48c232819e77 powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma()
21ee33d51bf9 mm/fault: convert remaining simple cases to lock_mm_and_find_vma()
1f4197f050de arm/mm: Convert to using lock_mm_and_find_vma()
ac764deea709 riscv/mm: Convert to using lock_mm_and_find_vma()
7227d70acc78 mips/mm: Convert to using lock_mm_and_find_vma()
82972ea17b47 powerpc/mm: Convert to using lock_mm_and_find_vma()
b92cd80e5f0b arm64/mm: Convert to using lock_mm_and_find_vma()
755aa1bc6aaf mm: make the page fault mmap locking killable
d6a5c7a1a6e5 mm: introduce new 'lock_mm_and_find_vma()' page fault helper
4e2ad53ababe maple_tree: fix potential out-of-bounds access in mas_wr_end_piv()
31cde3bdadca can: isotp: isotp_sendmsg(): fix return error fix on TX path
0af4750eaaed x86/smp: Cure kexec() vs. mwait_play_dead() breakage
6d3b2e0aef6c x86/smp: Use dedicated cache-line for mwait_play_dead()
50a1abc67702 x86/smp: Remove pointless wmb()s from native_stop_other_cpus()
e47037d28b73 x86/smp: Dont access non-existing CPUID leaf
edadebb349e8 x86/smp: Make stop_other_cpus() more robust
94a69d699941 x86/microcode/AMD: Load late on both threads too
84f077802e56 mm, hwpoison: when copy-on-write hits poison, take page offline
4af5960d7cd4 mm, hwpoison: try to recover from copy-on write faults
69925a346acb mptcp: ensure listener is unhashed before updating the sk status
42a018a796d1 mm/mmap: Fix error return in do_vmi_align_munmap()
a149174ff8bb mm/mmap: Fix error path in do_vmi_align_munmap()
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index 19758206bc..b01f09b1a7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "5227a8173cee7256e370750216dbff5eca741134"
-SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b"
+SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71"
+SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.36"
+LINUX_VERSION ?= "6.1.37"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index 48cc6b87fb..529f515db1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.36"
+LINUX_VERSION ?= "6.1.37"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b"
+SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index 5587c0d5b5..4eb2fb11bb 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "5dd09d311b31db8c7b098e14a7857ef8a6e5353d"
-SRCREV_machine:qemuarm64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemuloongarch64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemumips ?= "1d79865ce12928b85ab2ab1756e7aa7ae5cc4938"
-SRCREV_machine:qemuppc ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemuriscv64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemuriscv32 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemux86 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemux86-64 ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_machine:qemumips64 ?= "7241bd2e494f07582f736ef1604e81ccd4afc7cf"
-SRCREV_machine ?= "6ba5ae474699ee9e6dd39874dfdb680959f55ffd"
-SRCREV_meta ?= "aba2c2181163cf40e3f8c5618c05e78e931f235b"
+SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617"
+SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd"
+SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f"
+SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "a1c449d00ff8ce2c5fcea5f755df682d1f6bc2ef"
+SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.36"
+LINUX_VERSION ?= "6.1.37"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 03/15] linux-libc-headers: bump to 6.4
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
2023-07-10 3:20 ` [PATCH 01/15] linux-yocto/6.1: update to v6.1.36 bruce.ashfield
2023-07-10 3:20 ` [PATCH 02/15] linux-yocto/6.1: update to v6.1.37 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+ bruce.ashfield
` (12 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
kernel version 6.4 is the reference kernel for the fall
release.
This brings libc-headers up to date with that tested
reference
For musl, we drop one patch that has been merged upstream.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
| 42 -------------------
| 3 +-
3 files changed, 2 insertions(+), 45 deletions(-)
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_6.1.bb => linux-libc-headers_6.4.bb} (74%)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 0b33e61924..18daf446e5 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.40%"
GDBVERSION ?= "13.%"
GLIBCVERSION ?= "2.37"
-LINUXLIBCVERSION ?= "6.1%"
+LINUXLIBCVERSION ?= "6.4%"
QEMUVERSION ?= "8.0%"
GOVERSION ?= "1.20%"
LLVMVERSION ?= "16.%"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
deleted file mode 100644
index 5b7c1b6e21..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From dc221138c809125dc1bbff8506c70cb7bd846368 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 12 Sep 2018 17:08:58 -0700
-Subject: [PATCH] include linux/stddef.h in swab.h uapi header
-
-swab.h uses __always_inline without including the header where it is
-defined, this is exposed by musl based distributions where this macro is
-not defined by system C library headers unlike glibc where it is defined
-in sys/cdefs.h and that header gets pulled in indirectly via
-
-features.h -> sys/cdefs.h
-
-and features.h gets pulled in a lot of headers. Therefore it may work in
-cases where features.h is includes but not otherwise.
-
-Adding linux/stddef.h here ensures that __always_inline is always
-defined independent of which C library is used in userspace
-
-Upstream-Status: Submitted [https://lkml.org/lkml/2018/9/13/78]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Philippe Ombredanne <pombredanne@nexb.com>
-Cc: Kate Stewart <kstewart@linuxfoundation.org>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-
----
- include/uapi/linux/swab.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
-index 7272f85d6..2912fe463 100644
---- a/include/uapi/linux/swab.h
-+++ b/include/uapi/linux/swab.h
-@@ -3,6 +3,7 @@
- #define _UAPI_LINUX_SWAB_H
-
- #include <linux/types.h>
-+#include <linux/stddef.h>
- #include <linux/compiler.h>
- #include <asm/bitsperlong.h>
- #include <asm/swab.h>
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.4.bb
similarity index 74%
rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.1.bb
rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.4.bb
index cbdebdc1e8..c52315499e 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.1.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_6.4.bb
@@ -4,7 +4,6 @@ SRC_URI:append:libc-musl = "\
file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
- file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
"
SRC_URI += "\
@@ -13,6 +12,6 @@ SRC_URI += "\
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRC_URI[sha256sum] = "2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
+SRC_URI[sha256sum] = "8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (2 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 03/15] linux-libc-headers: bump to 6.4 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-10-10 11:44 ` [OE-core] " Rasmus Villemoes
2023-07-10 3:20 ` [PATCH 05/15] kernel: fix localversion in v6.3+ bruce.ashfield
` (11 subsequent siblings)
15 siblings, 1 reply; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
kernel version 6.4 introduces a new file that need to have
absolute paths removed, so we can avoid the buildpaths QA
warning and have relocatable packages.
We add pmu-flex.h to the processing, and the issue is resolved.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/perf/perf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 2d803381bb..7d90ac3612 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -383,7 +383,7 @@ PACKAGESPLITFUNCS =+ "perf_fix_sources"
perf_fix_sources () {
for f in util/parse-events-flex.h util/parse-events-flex.c util/pmu-flex.c \
- util/expr-flex.h util/expr-flex.c; do
+ util/pmu-flex.h util/expr-flex.h util/expr-flex.c; do
f=${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/$f
if [ -e $f ]; then
sed -i -e 's#${S}/##g' $f
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 05/15] kernel: fix localversion in v6.3+
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (3 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+ bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 06/15] linux-yocto: introduce 6.4 reference kernel recipes bruce.ashfield
` (10 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
During testing of the v6.4 reference kernel, it was noticed that
on-target modules no longer matched the magic value of the running
kernel.
This was due to a different localversion in the cross built kernel
and the scripts / resources created on target.
This was due to changes in the setlocalversion script introduced
in the v6.3 series.
The .scmversion file is no longer used (or packaged) to inhibit
the addition of a "+" (through querying of the git status of the
kernel) or the setting of a local version.
We recently introduced the KERNEL_LOCALVERSION variable to allow
recipes to place a value in .scmversion, so we extend the use of
that variable to kernel-arch.bbclass and use it to set the
exported variable LOCALVERSION.
We must do it at the kernel-arch level, as the variable must be
exported in any kernel build to ensure that setlocalversion always
correctly sets the localversion.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes-recipe/kernel-arch.bbclass | 7 +++++++
meta/classes-recipe/kernel.bbclass | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
index 6e19dbbba8..df4884b6c4 100644
--- a/meta/classes-recipe/kernel-arch.bbclass
+++ b/meta/classes-recipe/kernel-arch.bbclass
@@ -80,3 +80,10 @@ KERNEL_OBJCOPY = "${CCACHE}${HOST_PREFIX}objcopy ${HOST_OBJCOPY_KERNEL_ARCH}"
KERNEL_STRIP = "${CCACHE}${HOST_PREFIX}strip ${HOST_STRIP_KERNEL_ARCH}"
TOOLCHAIN ?= "gcc"
+# 6.3+ requires the variable LOCALVERSION to be set to not get a "+" in
+# the local version. Having it empty means nothing will be added, and any
+# value will be appended to the local kernel version. This replaces the
+# use of .scmversion file for setting a localversion without using
+# the CONFIG_LOCALVERSION option.
+KERNEL_LOCALVERSION ??= ""
+export LOCALVERSION ?= "${KERNEL_LOCALVERSION}"
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 855c784149..2aedf3a31b 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -426,7 +426,7 @@ do_compile_kernelmodules() {
if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
oe_runmake -C ${B} ${PARALLEL_MAKE} modules ${KERNEL_EXTRA_ARGS}
- # Module.symvers gets updated during the
+ # Module.symvers gets updated during the
# building of the kernel modules. We need to
# update this in the shared workdir since some
# external kernel modules has a dependency on
@@ -620,7 +620,6 @@ do_shared_workdir () {
# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
SYSROOT_DIRS = ""
-KERNEL_LOCALVERSION ??= ""
KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig"
python check_oldest_kernel() {
@@ -642,6 +641,9 @@ kernel_do_configure() {
# $ scripts/setlocalversion . => +
# $ make kernelversion => 2.6.37
# $ make kernelrelease => 2.6.37+
+ # See kernel-arch.bbclass for post v6.3 removal of the extra
+ # + in localversion. .scmversion is no longer used, and the
+ # variable LOCALVERSION must be used
if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]; then
echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 06/15] linux-yocto: introduce 6.4 reference kernel recipes
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (4 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 05/15] kernel: fix localversion in v6.3+ bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 07/15] linux-yocto/6.4: update to latest bruce.ashfield
` (9 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
kernel v6.4.x will be the next yocto project reference kernel.
This is largely the same as the 6.1 recipes, with only SRCREV and
minor differences.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.4.bb | 48 +++++++++++++
.../linux/linux-yocto-tiny_6.4.bb | 33 +++++++++
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 71 +++++++++++++++++++
3 files changed, 152 insertions(+)
create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto_6.4.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
new file mode 100644
index 0000000000..2558c03a7f
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -0,0 +1,48 @@
+KBRANCH ?= "v6.4/standard/preempt-rt/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# CVE exclusions
+include recipes-kernel/linux/cve-exclusion_6.4.inc
+
+# Skip processing of this recipe if it is not explicitly specified as the
+# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
+# to build multiple virtual/kernel providers, e.g. as dependency of
+# core-image-rt-sdk, core-image-rt.
+python () {
+ if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
+ raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
+}
+
+SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71"
+SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
+
+LINUX_VERSION ?= "6.4"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "1"
+
+LINUX_KERNEL_TYPE = "preempt-rt"
+
+COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)$"
+
+KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
+KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
+KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
new file mode 100644
index 0000000000..5c8008232b
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -0,0 +1,33 @@
+KBRANCH ?= "v6.4/standard/tiny/base"
+
+LINUX_KERNEL_TYPE = "tiny"
+KCONFIG_MODE = "--allnoconfig"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# CVE exclusions
+include recipes-kernel/linux/cve-exclusion_6.4.inc
+
+LINUX_VERSION ?= "6.4"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "2"
+
+SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
+
+COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$"
+
+# Functionality flags
+KERNEL_FEATURES = ""
+
+KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
new file mode 100644
index 0000000000..e3e6e54d64
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -0,0 +1,71 @@
+KBRANCH ?= "v6.4/standard/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# CVE exclusions
+include recipes-kernel/linux/cve-exclusion_6.4.inc
+
+# board specific branches
+KBRANCH:qemuarm ?= "v6.4/standard/arm-versatile-926ejs"
+KBRANCH:qemuarm64 ?= "v6.4/standard/qemuarm64"
+KBRANCH:qemumips ?= "v6.4/standard/mti-malta32"
+KBRANCH:qemuppc ?= "v6.4/standard/qemuppc"
+KBRANCH:qemuriscv64 ?= "v6.4/standard/base"
+KBRANCH:qemuriscv32 ?= "v6.4/standard/base"
+KBRANCH:qemux86 ?= "v6.4/standard/base"
+KBRANCH:qemux86-64 ?= "v6.4/standard/base"
+KBRANCH:qemuloongarch64 ?= "v6.4/standard/base"
+KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64"
+
+SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617"
+SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd"
+SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f"
+SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
+SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+
+# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
+# get the <version>/base branch, which is pure upstream -stable, and the same
+# meta SRCREV as the linux-yocto-standard builds. Select your version using the
+# normal PREFERRED_VERSION settings.
+BBCLASSEXTEND = "devupstream:target"
+SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c"
+PN:class-devupstream = "linux-yocto-upstream"
+KBRANCH:class-devupstream = "v6.4/base"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH};protocol=https \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+LINUX_VERSION ?= "6.4"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "1"
+
+KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
+
+COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32|qemuloongarch64)$"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
+KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc cfg/net/mdio.scc"
+KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
+KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc"
+KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc"
+KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc"
+
+INSANE_SKIP:kernel-vmlinux:qemuppc64 = "textrel"
+
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 07/15] linux-yocto/6.4: update to latest
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (5 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 06/15] linux-yocto: introduce 6.4 reference kernel recipes bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 08/15] linux-yocto/6.4: aufs6 integration bruce.ashfield
` (8 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the following commit(s) to linux-yocto/6.4:
9ede8913ad6c qemux86: add configuration symbol to select values
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.4.bb | 4 +--
.../linux/linux-yocto-tiny_6.4.bb | 4 +--
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 26 +++++++++----------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index 2558c03a7f..524cd95ac3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -14,8 +14,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71"
-SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index 5c8008232b..9e2a3e68f9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index e3e6e54d64..dd68c640d5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.4/standard/base"
KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617"
-SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd"
-SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f"
-SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+SRCREV_machine:qemuarm ?= "402087b6abe0e50ec75d0b71b4c928ee0b858b72"
+SRCREV_machine:qemuarm64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemuloongarch64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemumips ?= "b83174914441d8780f080e73d473133e2c5b797c"
+SRCREV_machine:qemuppc ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemuriscv64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemuriscv32 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemux86 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemux86-64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_machine:qemumips64 ?= "a08de9073de96586993c5d8c1f0ebcdc35874ebf"
+SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
+SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c"
+SRCREV_machine:class-devupstream ?= "6995e2de6891c724bfeb2db33d7b87775f913ad1"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.4/base"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 08/15] linux-yocto/6.4: aufs6 integration
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (6 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 07/15] linux-yocto/6.4: update to latest bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 09/15] linux-yocto/6.4: refresh configuration bruce.ashfield
` (7 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
We still offer aufs support for some container / virtualization
workloads. The project is still up to date with 6.3+, so we grab
the patches and make them available on v6.4/standard/*
As usual, v6.4/base is pure k.org + -stable if you don't want
things such as aufs.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.4.bb | 4 ++--
.../linux/linux-yocto-tiny_6.4.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 24 +++++++++----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index 524cd95ac3..21eae02ae9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -14,8 +14,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
+SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_meta ?= "4541301322a156977eadc19cbbb8f0a57f4dc06a"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index 9e2a3e68f9..e6809a4f28 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
+SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_meta ?= "4541301322a156977eadc19cbbb8f0a57f4dc06a"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index dd68c640d5..8117c4a04e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -17,18 +17,18 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.4/standard/base"
KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "402087b6abe0e50ec75d0b71b4c928ee0b858b72"
-SRCREV_machine:qemuarm64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemuloongarch64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemumips ?= "b83174914441d8780f080e73d473133e2c5b797c"
-SRCREV_machine:qemuppc ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemuriscv64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemuriscv32 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemux86 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemux86-64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_machine:qemumips64 ?= "a08de9073de96586993c5d8c1f0ebcdc35874ebf"
-SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
-SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
+SRCREV_machine:qemuarm ?= "7e1be3b6ae5d05b30112b68fb92cad00b8ffdf49"
+SRCREV_machine:qemuarm64 ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemuloongarch64 ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemumips ?= "de409c37f1d2c5eacea9c33dc42117cb107aa305"
+SRCREV_machine:qemuppc ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemuriscv64 ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemuriscv32 ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemux86 ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemux86-64 ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_machine:qemumips64 ?= "b14484af5492f03c8afc25f3684c8ae86a78295f"
+SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
+SRCREV_meta ?= "4541301322a156977eadc19cbbb8f0a57f4dc06a"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 09/15] linux-yocto/6.4: refresh configuration
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (7 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 08/15] linux-yocto/6.4: aufs6 integration bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 10/15] linux-yocto-rt/6.4: integrate -rt6 bruce.ashfield
` (6 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Bumping SRCREVs to pickup the following confguration tweaks for 6.4:
ebe5a59e59f cfg/fb: update CONFIG_FB_CMDLINE to CONFIG_VIDEO_CMDLINE
ccd8fad4a64 cfg/netfilter: drop CONFIG_IP_NF_TARGET_CLUSTERIP
7a20868156d cfg/net: remove CONFIG_NET_SCH_DSMARK
d3083675d3f net/cfg: remove CONFIG_NET_SCH_CBQ
With these merged, we have no configuration warnings in the 6.4
reference kernel.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index 21eae02ae9..3e1331e52a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -15,7 +15,7 @@ python () {
}
SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "4541301322a156977eadc19cbbb8f0a57f4dc06a"
+SRCREV_meta ?= "ebe5a59e59f8a82b7f7a641fece317a0a3ea05d2"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index e6809a4f28..db729a2e4d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "4541301322a156977eadc19cbbb8f0a57f4dc06a"
+SRCREV_meta ?= "ebe5a59e59f8a82b7f7a641fece317a0a3ea05d2"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index 8117c4a04e..029aaaa004 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "40dfcb393658098382d48669718a1cb16674c833"
SRCREV_machine:qemux86-64 ?= "40dfcb393658098382d48669718a1cb16674c833"
SRCREV_machine:qemumips64 ?= "b14484af5492f03c8afc25f3684c8ae86a78295f"
SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "4541301322a156977eadc19cbbb8f0a57f4dc06a"
+SRCREV_meta ?= "ebe5a59e59f8a82b7f7a641fece317a0a3ea05d2"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 10/15] linux-yocto-rt/6.4: integrate -rt6
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (8 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 09/15] linux-yocto/6.4: refresh configuration bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 11/15] linux-yocto/6.4: update to v6.4.2 bruce.ashfield
` (5 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Integrating the following commit(s) to linux-yocto-rt/6.4:
369f3a1d2f39 Add localversion for -RT release
c26c6f8a7def sysfs: Add /sys/kernel/realtime entry
1026252efc14 POWERPC: Allow to enable RT
2be128571d55 powerpc/stackprotector: work around stack-guard init from atomic
55bea7bc53a3 powerpc/kvm: Disable in-kernel MPIC emulation for PREEMPT_RT
6d7729893293 powerpc/pseries: Select the generic memory allocator.
4f94b99ce5fa powerpc/imc-pmu: Use the correct spinlock initializer.
4842eac5df59 powerpc/pseries/iommu: Use a locallock instead local_irq_save()
20217d6be82e powerpc: traps: Use PREEMPT_RT
caa81a9e214f ARM64: Allow to enable RT
e6d8eecd9250 ARM: Allow to enable RT
ed8eef71c579 tty/serial/pl011: Make the locking work on RT
579a01d01422 tty/serial/omap: Make the locking RT aware
82c5c842e1a3 ARM: enable irq in translation/section permission fault handlers
40b10f168ff6 arm: Disable jump-label on PREEMPT_RT.
a7a1bfa3b88b arch/arm64: Add lazy preempt support
be59db8f177b powerpc: Add support for lazy preemption
0143f7261d2e arm: Add support for lazy preemption
27dd55360d61 entry: Fix the preempt lazy fallout
59012496af29 x86: Support for lazy preemption
d25ecd17ccbe x86/entry: Use should_resched() in idtentry_exit_cond_resched()
beb2483d6b9f sched: Add support for lazy preemption
c78e3d4fd185 Revert "drm/i915: Depend on !PREEMPT_RT."
bdac43aa952c drm/i915: Drop the irqs_disabled() check
954bab1b75e9 drm/i915/gt: Use spin_lock_irq() instead of local_irq_disable() + spin_lock()
afcb80571a37 drm/i915/gt: Queue and wait for the irq_work item.
5f8008dab040 drm/i915: skip DRM_I915_LOW_LEVEL_TRACEPOINTS with NOTRACE
da5622b92296 drm/i915: Disable tracing points on PREEMPT_RT
51532f62a857 drm/i915: Don't check for atomic context on PREEMPT_RT
4b1c4c7b4e6c drm/i915: Don't disable interrupts on PREEMPT_RT during atomic updates
459be7df2c2a drm/i915: Use preempt_disable/enable_rt() where recommended
628d1b08d421 printk: Check only for migration in printk_deferred_*().
dfd2770048a6 serial: 8250: implement non-BKL console
9fc96a5c3a19 printk: replace local_irq_save with local_lock for safe mode
061a418efaef printk: Add threaded printing support for BKL consoles.
36ac8599626a printk: only disable if actually unregistered
71669eb2c2da printk: Perform atomic flush in console_flush_on_panic()
b0634d6c06d9 rcu: Add atomic write enforcement for rcu stalls
95fdf7b134ab kernel/panic: Add atomic write enforcement to warn/panic
c39e30092722 proc: consoles: Add support for non-BKL consoles
70be25f26762 tty: tty_io: Show non-BKL consoles as active
c980fcfd9dcb printk: nobkl: Stop threads on shutdown/reboot
e372fdfa42c3 printk: nobkl: Provide functions for atomic write enforcement
7c779a16b20c printk: nobkl: Add write context storage for atomic writes
042485b8fa7a printk: nobkl: Add printer thread wakeups
a0d1569185ed printk: nobkl: Introduce printer threads
68aa6402e396 printk: nobkl: Add emit function and callback functions for atomic printing
ccf51a3743a4 printk: nobkl: Add print state functions
e33dfd268d79 printk: nobkl: Add sequence handling
2f0f99a7a004 printk: nobkl: Add buffer management
f6cd5cdad5cf printk: nobkl: Add acquire/release logic
6754f4c0d6ee printk: Add non-BKL console basic infrastructure
b4568c7fbbfc printk: Add per-console suspended state
1e952ed4d35b printk: Consolidate console deferred printing
b12fabcfa9be printk: Add NMI check to console_flush_on_panic() and console_unblank()
9c1bfc2a6f3c kdb: do not assume write() callback available
244f2785c026 preempt: Put preempt_enable() within an instrumentation*() section.
1b61e0ba79ae zram: Replace bit spinlocks with spinlock_t for PREEMPT_RT.
62bf62e9fd6c softirq: Wake ktimers thread also in softirq.
a546af0d74af tick: Fix timer storm since introduction of timersd
bfd12d9a9dfc rcutorture: Also force sched priority to timersd on boosting test.
8898939cf3b1 softirq: Use a dedicated thread for timer wakeups.
2c8cccade3f1 x86: Enable RT also on 32bit
75a40b356238 x86: Allow to enable RT
126193d32d0c net: Avoid the IPI to free the
931d538b5c85 mm/page_alloc: Use write_seqlock_irqsave() instead write_seqlock() + local_irq_save().
dd90b50f7be9 seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
0874a8832dc7 ARM: vfp: Use vfp_lock() in vfp_entry().
3c69696bd766 ARM: vfp: Use vfp_lock() in vfp_sync_hwstate().
0fcd7c2cc385 ARM: vfp: Provide vfp_lock() for VFP locking.
67cdd3607ac5 posix-timers: Ensure timer ID search-loop limit is valid
d18adb7ffef3 posix-timers: Prevent RT livelock in itimer_delete()
53c35a763a78 signal: Don't disable preemption in ptrace_stop() on PREEMPT_RT.
0acdc7e2e082 signal: Add proper comment about the preempt-disable in ptrace_stop().
ec0ce135acf0 locking/rtmutex: Add a lockdep assert to catch potential nested blocking
5898c4215b40 locking/rtmutex: Avoid pointless blk_flush_plug() invocations
8fbc724cb1c6 locking/rtmutex: Submit/resume work explicitly before/after blocking
3e1028d6c3cc sched/core: Provide sched_rtmutex() and expose sched work helpers
2c4691baa875 bpf: Remove in_atomic() from bpf_link_put().
eb0a0f759f25 revert: "softirq: Let ksoftirqd do its job"
3c160415c46a tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode().
c4d99ee1238f sched: Consider task_struct::saved_state in wait_task_inactive()
587e9609ccd5 sched: Unconditionally use full-fat wait_task_inactive()
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index 3e1331e52a..d1316e23a1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -14,8 +14,8 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "ebe5a59e59f8a82b7f7a641fece317a0a3ea05d2"
+SRCREV_machine ?= "369f3a1d2f3947bb0587f4ae8b15dd8803125de9"
+SRCREV_meta ?= "0b4a5500b775a9429c933ebb6d54d018ca921106"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index db729a2e4d..6ad96d215c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "ebe5a59e59f8a82b7f7a641fece317a0a3ea05d2"
+SRCREV_meta ?= "0b4a5500b775a9429c933ebb6d54d018ca921106"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index 029aaaa004..85fcb33b3e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "40dfcb393658098382d48669718a1cb16674c833"
SRCREV_machine:qemux86-64 ?= "40dfcb393658098382d48669718a1cb16674c833"
SRCREV_machine:qemumips64 ?= "b14484af5492f03c8afc25f3684c8ae86a78295f"
SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "ebe5a59e59f8a82b7f7a641fece317a0a3ea05d2"
+SRCREV_meta ?= "0b4a5500b775a9429c933ebb6d54d018ca921106"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 11/15] linux-yocto/6.4: update to v6.4.2
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (9 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 10/15] linux-yocto-rt/6.4: integrate -rt6 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 12/15] linux-yocto/6.1: update to v6.1.38 bruce.ashfield
` (4 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating to the latest korg -stable release that comprises
the following commits:
d7defc5b8d42 Linux 6.4.2
ba0f198721f4 arch/arm64/mm/fault: Fix undeclared variable error in do_page_fault()
57db8dc02888 drm/amdgpu: Validate VM ioctl flags.
cc39da6c58c4 dm ioctl: Avoid double-fetch of version
c27c99d4458f docs: Set minimal gtags / GNU GLOBAL version to 6.6.5
16167ccafbb3 scripts/tags.sh: Resolve gtags empty index generation
b1c2d0ded4dc hugetlb: revert use of page_cache_next_miss()
a03f2f4bd490 nubus: Partially revert proc_create_single_data() conversion
1c70f4df65ac Revert "cxl/port: Enable the HDM decoder capability for switch ports"
5dda60d23104 nfs: don't report STATX_BTIME in ->getattr
926eae6ede9b execve: always mark stack as growing down during early stack setup
dfb27a766896 PCI/ACPI: Call _REG when transitioning D-states
f933605c1767 PCI/ACPI: Validate acpi_pci_set_power_state() parameter
f23cf6986b87 tools/nolibc: x86_64: disable stack protector for _start
8911865ae284 xtensa: fix lock_mm_and_find_vma in case VMA not found
593776794734 Linux 6.4.1
2aad4f30f4e4 xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion
87d780e048bd csky: fix up lock_mm_and_find_vma() conversion
0d98e5325f1f parisc: fix expand_stack() conversion
23d1e960cd12 sparc32: fix lock_mm_and_find_vma() conversion
7a11f6e08edf Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"
e6d864166aaf HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651.
05b47034e248 HID: hidraw: fix data race on device refcount
14fdcf965dc5 fbdev: fix potential OOB read in fast_imageblit()
00d5932e09d7 mm/khugepaged: fix regression in collapse_file()
f450d0307644 gup: add warning if some caller would seem to want stack expansion
d0198363f910 HID: wacom: Use ktime_t rather than int when dealing with timestamps
fb32951c8903 mm: always expand the stack with the mmap write lock held
af099fa739b8 execve: expand new process stack manually ahead of time
b2d6752dbfe7 mm: make find_extend_vma() fail if write lock not held
accf6d0c5832 powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma()
203cfe05efc8 mm/fault: convert remaining simple cases to lock_mm_and_find_vma()
4e3fb74f6050 arm/mm: Convert to using lock_mm_and_find_vma()
7e99b9821acc riscv/mm: Convert to using lock_mm_and_find_vma()
929eb6b2a690 mips/mm: Convert to using lock_mm_and_find_vma()
b6f36565369c powerpc/mm: Convert to using lock_mm_and_find_vma()
7a1383601b7c arm64/mm: Convert to using lock_mm_and_find_vma()
d939d8c154f1 mm: make the page fault mmap locking killable
b11fa3d22ac0 mm: introduce new 'lock_mm_and_find_vma()' page fault helper
f5fcf6555a2a maple_tree: fix potential out-of-bounds access in mas_wr_end_piv()
b6e1ef3cd6d8 can: isotp: isotp_sendmsg(): fix return error fix on TX path
3f2719a1c382 cpufreq: amd-pstate: Make amd-pstate EPP driver name hyphenated
9e97e46e3210 x86/smp: Cure kexec() vs. mwait_play_dead() breakage
cc37b1184236 x86/smp: Use dedicated cache-line for mwait_play_dead()
4726d74f697f x86/smp: Remove pointless wmb()s from native_stop_other_cpus()
8b1b43c42100 x86/smp: Dont access non-existing CPUID leaf
f9abe01d5d68 x86/smp: Make stop_other_cpus() more robust
9a500542a1dc x86/microcode/AMD: Load late on both threads too
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.4.bb | 6 ++--
.../linux/linux-yocto-tiny_6.4.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index d1316e23a1..bd340adc15 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "369f3a1d2f3947bb0587f4ae8b15dd8803125de9"
-SRCREV_meta ?= "0b4a5500b775a9429c933ebb6d54d018ca921106"
+SRCREV_machine ?= "0c7d2016a3a548fd8f7caf7b1f46abd71008cd5c"
+SRCREV_meta ?= "8a09ea80e6905baf80940dc8c4fe9326bd8d19e2"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.4"
+LINUX_VERSION ?= "6.4.2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index 6ad96d215c..6490c69b93 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.4.inc
-LINUX_VERSION ?= "6.4"
+LINUX_VERSION ?= "6.4.2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "0b4a5500b775a9429c933ebb6d54d018ca921106"
+SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_meta ?= "8a09ea80e6905baf80940dc8c4fe9326bd8d19e2"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index 85fcb33b3e..e514251673 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.4/standard/base"
KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "7e1be3b6ae5d05b30112b68fb92cad00b8ffdf49"
-SRCREV_machine:qemuarm64 ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemuloongarch64 ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemumips ?= "de409c37f1d2c5eacea9c33dc42117cb107aa305"
-SRCREV_machine:qemuppc ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemuriscv64 ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemuriscv32 ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemux86 ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemux86-64 ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_machine:qemumips64 ?= "b14484af5492f03c8afc25f3684c8ae86a78295f"
-SRCREV_machine ?= "40dfcb393658098382d48669718a1cb16674c833"
-SRCREV_meta ?= "0b4a5500b775a9429c933ebb6d54d018ca921106"
+SRCREV_machine:qemuarm ?= "89ab6408aa244552f100996ac5a2b49379bf9a2b"
+SRCREV_machine:qemuarm64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemuloongarch64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemumips ?= "7abe3962401b09a7768acc879070671308c04163"
+SRCREV_machine:qemuppc ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemuriscv64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemuriscv32 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemux86 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemux86-64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_machine:qemumips64 ?= "4dddf5763b3a26b7892ed75d02bcb9c25a3fe703"
+SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
+SRCREV_meta ?= "8a09ea80e6905baf80940dc8c4fe9326bd8d19e2"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "6995e2de6891c724bfeb2db33d7b87775f913ad1"
+SRCREV_machine:class-devupstream ?= "d7defc5b8d422ba19ab762a96cf1b1eb158aa5a8"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.4/base"
@@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.4"
+LINUX_VERSION ?= "6.4.2"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 12/15] linux-yocto/6.1: update to v6.1.38
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (10 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 11/15] linux-yocto/6.4: update to v6.4.2 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 13/15] conf/machine: set preferred kernel to be 6.4 bruce.ashfield
` (3 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating to the latest korg -stable release that comprises
the following commits:
61fd484b2cf6 Linux 6.1.38
c50065a39279 drm/amd/display: Ensure vmin and vmax adjust for DCE
9d0b2afadfd7 drm/amdgpu: Validate VM ioctl flags.
fe56f507a11a docs: Set minimal gtags / GNU GLOBAL version to 6.6.5
c437b26bc3ae scripts/tags.sh: Resolve gtags empty index generation
50e36c2897ba perf symbols: Symbol lookup with kcore can fail if multiple segments match stext
67e3b5230cef nubus: Partially revert proc_create_single_data() conversion
296927dbae7d execve: always mark stack as growing down during early stack setup
d856e6f8a0b4 PCI/ACPI: Call _REG when transitioning D-states
788c76c33df9 PCI/ACPI: Validate acpi_pci_set_power_state() parameter
a905b0b318ad drm/amd/display: Do not update DRR while BW optimizations pending
dd6d6f9d47ae drm/amd/display: Remove optimization for VRR updates
6b2849b3e05d xtensa: fix lock_mm_and_find_vma in case VMA not found
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_6.1.bb | 6 ++--
.../linux/linux-yocto-tiny_6.1.bb | 6 ++--
meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
index b01f09b1a7..30fcbd8e86 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
@@ -14,13 +14,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71"
-SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+SRCREV_machine ?= "efb2c857761e865cd7947aab42eaa5ba77ef6ee7"
+SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
-LINUX_VERSION ?= "6.1.37"
+LINUX_VERSION ?= "6.1.38"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
index 529f515db1..be27537dbc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
# CVE exclusions
include recipes-kernel/linux/cve-exclusion_6.1.inc
-LINUX_VERSION ?= "6.1.37"
+LINUX_VERSION ?= "6.1.38"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
index 4eb2fb11bb..b6a275c363 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.1/standard/base"
KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617"
-SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd"
-SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f"
-SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355"
-SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb"
+SRCREV_machine:qemuarm ?= "a74344429a095a5941cd8dfac532160349344c92"
+SRCREV_machine:qemuarm64 ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemuloongarch64 ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemumips ?= "78c81e178f8e2ffbb7c03cd324cf50ee0c5c4cf2"
+SRCREV_machine:qemuppc ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemuriscv64 ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemuriscv32 ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemux86 ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemux86-64 ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_machine:qemumips64 ?= "6c6b1170464e1f64f78a45cf7e78d5c678f38f48"
+SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4"
+SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
# meta SRCREV as the linux-yocto-standard builds. Select your version using the
# normal PREFERRED_VERSION settings.
BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c"
+SRCREV_machine:class-devupstream ?= "61fd484b2cf6bc8022e8e5ea6f693a9991740ac2"
PN:class-devupstream = "linux-yocto-upstream"
KBRANCH:class-devupstream = "v6.1/base"
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
SRC_URI += "file://0001-perf-cpumap-Make-counter-as-unsigned-ints.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.1.37"
+LINUX_VERSION ?= "6.1.38"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 13/15] conf/machine: set preferred kernel to be 6.4
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (11 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 12/15] linux-yocto/6.1: update to v6.1.38 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 14/15] poky/poky-tiny: set preferred linux-yocto version to 6.4 bruce.ashfield
` (2 subsequent siblings)
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/conf/machine/include/x86/x86-base.inc | 2 +-
meta/conf/machine/qemuarmv5.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc
index c3cc0dbff6..050c20af70 100644
--- a/meta/conf/machine/include/x86/x86-base.inc
+++ b/meta/conf/machine/include/x86/x86-base.inc
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
# kernel-related variables
#
PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ??= "6.1%"
+PREFERRED_VERSION_linux-yocto ??= "6.4%"
#
# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index ef1b4ece23..deb4869c0a 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -16,5 +16,5 @@ QB_GRAPHICS = "-device virtio-gpu-pci"
QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
-PREFERRED_VERSION_linux-yocto ??= "6.1%"
+PREFERRED_VERSION_linux-yocto ??= "6.4%"
KMACHINE:qemuarmv5 = "arm-versatile-926ejs"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 14/15] poky/poky-tiny: set preferred linux-yocto version to 6.4
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (12 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 13/15] conf/machine: set preferred kernel to be 6.4 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 3:20 ` [PATCH 15/15] linux-yocto-tiny/6.4: fix configuration warnings (HID) bruce.ashfield
2023-07-10 14:54 ` [OE-core] [PATCH 00/15] kernel: consolidated pull request Ross Burton
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Bumping poky and poky tiny to test the latest refernce kernel. We
leave poky-alt on 6.1 for LTS coverage.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta-poky/conf/distro/poky-tiny.conf | 2 +-
meta-poky/conf/distro/poky.conf | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
index f65d2dabf3..09729178ab 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -44,7 +44,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}"
# Distro config is evaluated after the machine config, so we have to explicitly
# set the kernel provider to override a machine config.
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
-PREFERRED_VERSION_linux-yocto-tiny ?= "6.1%"
+PREFERRED_VERSION_linux-yocto-tiny ?= "6.4%"
# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny
#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot"
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index d137527624..23d51a7be5 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -19,8 +19,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
-PREFERRED_VERSION_linux-yocto ?= "6.1%"
-PREFERRED_VERSION_linux-yocto-rt ?= "6.1%"
+PREFERRED_VERSION_linux-yocto ?= "6.4%"
+PREFERRED_VERSION_linux-yocto-rt ?= "6.4%"
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}"
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 15/15] linux-yocto-tiny/6.4: fix configuration warnings (HID)
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (13 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 14/15] poky/poky-tiny: set preferred linux-yocto version to 6.4 bruce.ashfield
@ 2023-07-10 3:20 ` bruce.ashfield
2023-07-10 14:54 ` [OE-core] [PATCH 00/15] kernel: consolidated pull request Ross Burton
15 siblings, 0 replies; 25+ messages in thread
From: bruce.ashfield @ 2023-07-10 3:20 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
When building -tiny for qemux86 on 6.4, CONFIG_HID related warnings
were observed.
[NOTE]: 'CONFIG_HID_WACOM' last val (y) and .config val (n) do not match
[NOTE]: 'CONFIG_USB_HID' last val (y) and .config val (n) do not match
[NOTE]: 'CONFIG_USB_HIDDEV' last val (y) and .config val (n) do not match
This is due to our allnoconfig baseline disabling HID, which dependent
drivers require.
Rather than universally enabling CONFIG_HID in the base tiny ktype, we
can create a fragment and include it from the common-pc tiny kernel
entry point.
252c55e236c common-pc/tiny: enable HID by default
849f920aa1b cfg: add CONFIG_HID base fragment
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_6.4.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index bd340adc15..a860232bf0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -15,7 +15,7 @@ python () {
}
SRCREV_machine ?= "0c7d2016a3a548fd8f7caf7b1f46abd71008cd5c"
-SRCREV_meta ?= "8a09ea80e6905baf80940dc8c4fe9326bd8d19e2"
+SRCREV_meta ?= "4655de57a68a86e651fcea2eb2c7e88f3de3bbfb"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index 6490c69b93..d4b36d0e50 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
-SRCREV_meta ?= "8a09ea80e6905baf80940dc8c4fe9326bd8d19e2"
+SRCREV_meta ?= "4655de57a68a86e651fcea2eb2c7e88f3de3bbfb"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index e514251673..9ae3fc4221 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
SRCREV_machine:qemux86-64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
SRCREV_machine:qemumips64 ?= "4dddf5763b3a26b7892ed75d02bcb9c25a3fe703"
SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20"
-SRCREV_meta ?= "8a09ea80e6905baf80940dc8c4fe9326bd8d19e2"
+SRCREV_meta ?= "4655de57a68a86e651fcea2eb2c7e88f3de3bbfb"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
# get the <version>/base branch, which is pure upstream -stable, and the same
--
2.34.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 00/15] kernel: consolidated pull request
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
` (14 preceding siblings ...)
2023-07-10 3:20 ` [PATCH 15/15] linux-yocto-tiny/6.4: fix configuration warnings (HID) bruce.ashfield
@ 2023-07-10 14:54 ` Ross Burton
2023-07-10 20:59 ` Alexandre Belloni
[not found] ` <17709D3D34AB3A9D.28523@lists.openembedded.org>
15 siblings, 2 replies; 25+ messages in thread
From: Ross Burton @ 2023-07-10 14:54 UTC (permalink / raw)
To: bruce.ashfield@gmail.com
Cc: Richard Purdie, openembedded-core@lists.openembedded.org
On 10 Jul 2023, at 04:20, Bruce Ashfield via lists.openembedded.org <bruce.ashfield=gmail.com@lists.openembedded.org> wrote:
> Here's the latest queued kernel changes. There are the expectd -stable updates
> 6.1, but those of course aren't the most interesting part of this queue.
I’ve not triaged them yet as it’s still building, but https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5577 is just this branch on top of master and has some new failures/warnings.
Ross
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 00/15] kernel: consolidated pull request
2023-07-10 14:54 ` [OE-core] [PATCH 00/15] kernel: consolidated pull request Ross Burton
@ 2023-07-10 20:59 ` Alexandre Belloni
2023-07-10 22:58 ` Bruce Ashfield
[not found] ` <1770A3C5B7BBB722.31955@lists.openembedded.org>
[not found] ` <17709D3D34AB3A9D.28523@lists.openembedded.org>
1 sibling, 2 replies; 25+ messages in thread
From: Alexandre Belloni @ 2023-07-10 20:59 UTC (permalink / raw)
To: Ross Burton
Cc: bruce.ashfield@gmail.com, Richard Purdie,
openembedded-core@lists.openembedded.org
Hello,
On 10/07/2023 14:54:50+0000, Ross Burton wrote:
> On 10 Jul 2023, at 04:20, Bruce Ashfield via lists.openembedded.org <bruce.ashfield=gmail.com@lists.openembedded.org> wrote:
> > Here's the latest queued kernel changes. There are the expectd -stable updates
> > 6.1, but those of course aren't the most interesting part of this queue.
>
>
> I’ve not triaged them yet as it’s still building, but https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5577 is just this branch on top of master and has some new failures/warnings.
>
It mostly worked on my branch, there is this new failure though:
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/7413/steps/12/logs/stdio
Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
return func(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^
File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 393, in test_parselogs
self.assertEqual(errcount, 0, msg=self.msg)
AssertionError: 4 != 0 : No ignore list found for this machine, using default
No ignore list found for this machine, using default
No ignore list found for this machine, using default
No ignore list found for this machine, using default
No ignore list found for this machine, using default
No ignore list found for this machine, using default
No ignore list found for this machine, using default
No ignore list found for this machine, using default
Log: /home/pokybuild/yocto-worker/qemuarm-oecore/build/build/tmp-glibc/work/qemuarm-oe-linux-gnueabi/core-image-sato/1.0-r0/target_logs/Xorg.0.log
-----------------------
Central error: [ 17.416] (II) FBDEV(0): mode "640x480" test failed
***********************
[ 17.381] compiled for 1.21.1.8, module version = 0.0.2
[ 17.381] ABI class: X.Org Video Driver, version 25.2
[ 17.384] (II) FBDEV(0): using default device
[ 17.389] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32
[ 17.389] (==) FBDEV(0): RGB weight 888
[ 17.389] (==) FBDEV(0): Default visual is TrueColor
[ 17.403] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0)
[ 17.406] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory: 4000kB)
[ 17.407] (DB) xf86MergeOutputClassOptions unsupported bus type 0
[ 17.411] (II) FBDEV(0): checking modes against framebuffer device...
[ 17.416] (II) FBDEV(0): mode "640x480" test failed
[ 17.417] (II) FBDEV(0): mode "640x480" test failed
[ 17.418] (II) FBDEV(0): mode "640x480" test failed
[ 17.419] (II) FBDEV(0): mode "640x480" test failed
[ 17.441] (II) FBDEV(0): mode "640x480" not found
[ 17.442] (II) FBDEV(0): checking modes against monitor...
[ 17.444] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280)
[ 17.445] (**) FBDEV(0): Built-in mode "current"
[ 17.446] (==) FBDEV(0): DPI set to (96, 96)
[ 17.447] (II) Loading sub module "fb"
[ 17.448] (II) LoadModule: "fb"
> Ross
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184081): https://lists.openembedded.org/g/openembedded-core/message/184081
> Mute This Topic: https://lists.openembedded.org/mt/100051814/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 00/15] kernel: consolidated pull request
[not found] ` <17709D3D34AB3A9D.28523@lists.openembedded.org>
@ 2023-07-10 21:16 ` Alexandre Belloni
0 siblings, 0 replies; 25+ messages in thread
From: Alexandre Belloni @ 2023-07-10 21:16 UTC (permalink / raw)
To: Ross Burton, bruce.ashfield@gmail.com, Richard Purdie,
openembedded-core@lists.openembedded.org
On 10/07/2023 22:59:02+0200, Alexandre Belloni via lists.openembedded.org wrote:
> Hello,
>
> On 10/07/2023 14:54:50+0000, Ross Burton wrote:
> > On 10 Jul 2023, at 04:20, Bruce Ashfield via lists.openembedded.org <bruce.ashfield=gmail.com@lists.openembedded.org> wrote:
> > > Here's the latest queued kernel changes. There are the expectd -stable updates
> > > 6.1, but those of course aren't the most interesting part of this queue.
> >
> >
> > I’ve not triaged them yet as it’s still building, but https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5577 is just this branch on top of master and has some new failures/warnings.
> >
>
> It mostly worked on my branch, there is this new failure though:
And I just realized I forgot to take the meta-poky patch which would
explain the successes.
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/7413/steps/12/logs/stdio
>
> Traceback (most recent call last):
> File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
> return func(*args, **kwargs)
> ^^^^^^^^^^^^^^^^^^^^^
> File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 393, in test_parselogs
> self.assertEqual(errcount, 0, msg=self.msg)
> AssertionError: 4 != 0 : No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> Log: /home/pokybuild/yocto-worker/qemuarm-oecore/build/build/tmp-glibc/work/qemuarm-oe-linux-gnueabi/core-image-sato/1.0-r0/target_logs/Xorg.0.log
> -----------------------
> Central error: [ 17.416] (II) FBDEV(0): mode "640x480" test failed
> ***********************
> [ 17.381] compiled for 1.21.1.8, module version = 0.0.2
> [ 17.381] ABI class: X.Org Video Driver, version 25.2
> [ 17.384] (II) FBDEV(0): using default device
> [ 17.389] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32
> [ 17.389] (==) FBDEV(0): RGB weight 888
> [ 17.389] (==) FBDEV(0): Default visual is TrueColor
> [ 17.403] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0)
> [ 17.406] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory: 4000kB)
> [ 17.407] (DB) xf86MergeOutputClassOptions unsupported bus type 0
> [ 17.411] (II) FBDEV(0): checking modes against framebuffer device...
> [ 17.416] (II) FBDEV(0): mode "640x480" test failed
> [ 17.417] (II) FBDEV(0): mode "640x480" test failed
> [ 17.418] (II) FBDEV(0): mode "640x480" test failed
> [ 17.419] (II) FBDEV(0): mode "640x480" test failed
> [ 17.441] (II) FBDEV(0): mode "640x480" not found
> [ 17.442] (II) FBDEV(0): checking modes against monitor...
> [ 17.444] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280)
> [ 17.445] (**) FBDEV(0): Built-in mode "current"
> [ 17.446] (==) FBDEV(0): DPI set to (96, 96)
> [ 17.447] (II) Loading sub module "fb"
> [ 17.448] (II) LoadModule: "fb"
>
> > Ross
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184097): https://lists.openembedded.org/g/openembedded-core/message/184097
> Mute This Topic: https://lists.openembedded.org/mt/100051814/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 00/15] kernel: consolidated pull request
2023-07-10 20:59 ` Alexandre Belloni
@ 2023-07-10 22:58 ` Bruce Ashfield
[not found] ` <1770A3C5B7BBB722.31955@lists.openembedded.org>
1 sibling, 0 replies; 25+ messages in thread
From: Bruce Ashfield @ 2023-07-10 22:58 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Ross Burton, Richard Purdie,
openembedded-core@lists.openembedded.org
On Mon, Jul 10, 2023 at 4:59 PM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello,
>
> On 10/07/2023 14:54:50+0000, Ross Burton wrote:
> > On 10 Jul 2023, at 04:20, Bruce Ashfield via lists.openembedded.org <bruce.ashfield=gmail.com@lists.openembedded.org> wrote:
> > > Here's the latest queued kernel changes. There are the expectd -stable updates
> > > 6.1, but those of course aren't the most interesting part of this queue.
> >
> >
> > I’ve not triaged them yet as it’s still building, but https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5577 is just this branch on top of master and has some new failures/warnings.
> >
>
> It mostly worked on my branch, there is this new failure though:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/7413/steps/12/logs/stdio
>
> Traceback (most recent call last):
> File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
> return func(*args, **kwargs)
> ^^^^^^^^^^^^^^^^^^^^^
> File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 393, in test_parselogs
> self.assertEqual(errcount, 0, msg=self.msg)
> AssertionError: 4 != 0 : No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> No ignore list found for this machine, using default
> Log: /home/pokybuild/yocto-worker/qemuarm-oecore/build/build/tmp-glibc/work/qemuarm-oe-linux-gnueabi/core-image-sato/1.0-r0/target_logs/Xorg.0.log
It's odd.
I can build and test qemuarm core-image-sato and I don't get any warnings.
I wasn't able to see the exact configuration of that specific run (is
it under build-properties?).
Bruce
> -----------------------
> Central error: [ 17.416] (II) FBDEV(0): mode "640x480" test failed
> ***********************
> [ 17.381] compiled for 1.21.1.8, module version = 0.0.2
> [ 17.381] ABI class: X.Org Video Driver, version 25.2
> [ 17.384] (II) FBDEV(0): using default device
> [ 17.389] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32
> [ 17.389] (==) FBDEV(0): RGB weight 888
> [ 17.389] (==) FBDEV(0): Default visual is TrueColor
> [ 17.403] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0)
> [ 17.406] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory: 4000kB)
> [ 17.407] (DB) xf86MergeOutputClassOptions unsupported bus type 0
> [ 17.411] (II) FBDEV(0): checking modes against framebuffer device...
> [ 17.416] (II) FBDEV(0): mode "640x480" test failed
> [ 17.417] (II) FBDEV(0): mode "640x480" test failed
> [ 17.418] (II) FBDEV(0): mode "640x480" test failed
> [ 17.419] (II) FBDEV(0): mode "640x480" test failed
> [ 17.441] (II) FBDEV(0): mode "640x480" not found
> [ 17.442] (II) FBDEV(0): checking modes against monitor...
> [ 17.444] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280)
> [ 17.445] (**) FBDEV(0): Built-in mode "current"
> [ 17.446] (==) FBDEV(0): DPI set to (96, 96)
> [ 17.447] (II) Loading sub module "fb"
> [ 17.448] (II) LoadModule: "fb"
>
> > Ross
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#184081): https://lists.openembedded.org/g/openembedded-core/message/184081
> > Mute This Topic: https://lists.openembedded.org/mt/100051814/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 00/15] kernel: consolidated pull request
[not found] ` <1770A3C5B7BBB722.31955@lists.openembedded.org>
@ 2023-07-10 23:11 ` Bruce Ashfield
0 siblings, 0 replies; 25+ messages in thread
From: Bruce Ashfield @ 2023-07-10 23:11 UTC (permalink / raw)
To: bruce.ashfield
Cc: Alexandre Belloni, Ross Burton, Richard Purdie,
openembedded-core@lists.openembedded.org
On Mon, Jul 10, 2023 at 6:58 PM Bruce Ashfield via
lists.openembedded.org
<bruce.ashfield=gmail.com@lists.openembedded.org> wrote:
>
> On Mon, Jul 10, 2023 at 4:59 PM Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> >
> > Hello,
> >
> > On 10/07/2023 14:54:50+0000, Ross Burton wrote:
> > > On 10 Jul 2023, at 04:20, Bruce Ashfield via lists.openembedded.org <bruce.ashfield=gmail.com@lists.openembedded.org> wrote:
> > > > Here's the latest queued kernel changes. There are the expectd -stable updates
> > > > 6.1, but those of course aren't the most interesting part of this queue.
> > >
> > >
> > > I’ve not triaged them yet as it’s still building, but https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5577 is just this branch on top of master and has some new failures/warnings.
> > >
> >
> > It mostly worked on my branch, there is this new failure though:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/7413/steps/12/logs/stdio
> >
> > Traceback (most recent call last):
> > File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
> > return func(*args, **kwargs)
> > ^^^^^^^^^^^^^^^^^^^^^
> > File "/home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/lib/oeqa/runtime/cases/parselogs.py", line 393, in test_parselogs
> > self.assertEqual(errcount, 0, msg=self.msg)
> > AssertionError: 4 != 0 : No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > No ignore list found for this machine, using default
> > Log: /home/pokybuild/yocto-worker/qemuarm-oecore/build/build/tmp-glibc/work/qemuarm-oe-linux-gnueabi/core-image-sato/1.0-r0/target_logs/Xorg.0.log
>
> It's odd.
>
> I can build and test qemuarm core-image-sato and I don't get any warnings.
>
> I wasn't able to see the exact configuration of that specific run (is
> it under build-properties?).
I'm using systemd vs sysvinit, it could be masking the messages. I'll
try that change locally.
Bruce
>
> Bruce
>
>
> > -----------------------
> > Central error: [ 17.416] (II) FBDEV(0): mode "640x480" test failed
> > ***********************
> > [ 17.381] compiled for 1.21.1.8, module version = 0.0.2
> > [ 17.381] ABI class: X.Org Video Driver, version 25.2
> > [ 17.384] (II) FBDEV(0): using default device
> > [ 17.389] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32
> > [ 17.389] (==) FBDEV(0): RGB weight 888
> > [ 17.389] (==) FBDEV(0): Default visual is TrueColor
> > [ 17.403] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0)
> > [ 17.406] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory: 4000kB)
> > [ 17.407] (DB) xf86MergeOutputClassOptions unsupported bus type 0
> > [ 17.411] (II) FBDEV(0): checking modes against framebuffer device...
> > [ 17.416] (II) FBDEV(0): mode "640x480" test failed
> > [ 17.417] (II) FBDEV(0): mode "640x480" test failed
> > [ 17.418] (II) FBDEV(0): mode "640x480" test failed
> > [ 17.419] (II) FBDEV(0): mode "640x480" test failed
> > [ 17.441] (II) FBDEV(0): mode "640x480" not found
> > [ 17.442] (II) FBDEV(0): checking modes against monitor...
> > [ 17.444] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280)
> > [ 17.445] (**) FBDEV(0): Built-in mode "current"
> > [ 17.446] (==) FBDEV(0): DPI set to (96, 96)
> > [ 17.447] (II) Loading sub module "fb"
> > [ 17.448] (II) LoadModule: "fb"
> >
> > > Ross
> >
> > >
> > >
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
>
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184105): https://lists.openembedded.org/g/openembedded-core/message/184105
> Mute This Topic: https://lists.openembedded.org/mt/100051814/1050810
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+
2023-07-10 3:20 ` [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+ bruce.ashfield
@ 2023-10-10 11:44 ` Rasmus Villemoes
2023-10-10 12:31 ` Bruce Ashfield
0 siblings, 1 reply; 25+ messages in thread
From: Rasmus Villemoes @ 2023-10-10 11:44 UTC (permalink / raw)
To: bruce.ashfield, richard.purdie; +Cc: openembedded-core
On 10/07/2023 05.20, Bruce Ashfield via lists.openembedded.org wrote:
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> kernel version 6.4 introduces a new file that need to have
> absolute paths removed, so we can avoid the buildpaths QA
> warning and have relocatable packages.
>
> We add pmu-flex.h to the processing, and the issue is resolved.
Hi Bruce
We've seen those buildpaths qa warning when building perf for a long
time, and they happen whether we build against a 5.15, 6.2 or 6.5
kernel. More specifically, what we see is
WARNING: perf-1.0-r9 do_package_qa: QA Issue: File /usr/bin/.debug/perf
in package perf-dbg contains reference to TMPDIR [buildpaths]
WARNING: perf-1.0-r9 do_package_qa: QA Issue: File /usr/bin/trace in
package perf contains reference to TMPDIR
File /usr/bin/perf in package perf contains reference to TMPDIR [buildpaths]
Looking at the .o.cmd files, there is indeed nowhere a
-fmacro-prefix-map or -fdebug-prefix-map, and apart from the bison/yacc
stuff, I also don't see where the perf recipe attempts to pass such flags.
It seems we can fix it with
$ git diff
diff --git a/meta/recipes-kernel/perf/perf.bb
b/meta/recipes-kernel/perf/perf.bb
index 420286e..59c0c10 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -81,7 +81,7 @@ EXTRA_OEMAKE = '\
LDSHARED="${CC} -shared" \
AR="${AR}" \
LD="${LD}" \
- EXTRA_CFLAGS="-ldw -I${S}" \
+ EXTRA_CFLAGS="-ldw -I${S} ${DEBUG_PREFIX_MAP}" \
YFLAGS='-y
--file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
perfexecdir=${libexecdir} \
but I'm quite curious what the difference between our setups is, since
apparently the only problem oe-core has/had was that new file introduced
in v6.4.
FWIW, what we build are vanilla -stable kernels, i.e. "6.2" means
v6.2.16 as tagged by Greg. The only modification of the perf recipe we
do is removing "scripting" from PACKAGECONFIG.
Rasmus
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+
2023-10-10 11:44 ` [OE-core] " Rasmus Villemoes
@ 2023-10-10 12:31 ` Bruce Ashfield
2023-10-10 14:37 ` Rasmus Villemoes
0 siblings, 1 reply; 25+ messages in thread
From: Bruce Ashfield @ 2023-10-10 12:31 UTC (permalink / raw)
To: Rasmus Villemoes; +Cc: richard.purdie, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3221 bytes --]
On Tue, Oct 10, 2023 at 7:44 AM Rasmus Villemoes <rasmus.villemoes@prevas.dk>
wrote:
> On 10/07/2023 05.20, Bruce Ashfield via lists.openembedded.org wrote:
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > kernel version 6.4 introduces a new file that need to have
> > absolute paths removed, so we can avoid the buildpaths QA
> > warning and have relocatable packages.
> >
> > We add pmu-flex.h to the processing, and the issue is resolved.
>
> Hi Bruce
>
> We've seen those buildpaths qa warning when building perf for a long
> time, and they happen whether we build against a 5.15, 6.2 or 6.5
> kernel. More specifically, what we see is
>
> WARNING: perf-1.0-r9 do_package_qa: QA Issue: File /usr/bin/.debug/perf
> in package perf-dbg contains reference to TMPDIR [buildpaths]
> WARNING: perf-1.0-r9 do_package_qa: QA Issue: File /usr/bin/trace in
> package perf contains reference to TMPDIR
> File /usr/bin/perf in package perf contains reference to TMPDIR
> [buildpaths]
>
> Looking at the .o.cmd files, there is indeed nowhere a
> -fmacro-prefix-map or -fdebug-prefix-map, and apart from the bison/yacc
> stuff, I also don't see where the perf recipe attempts to pass such flags.
>
> It seems we can fix it with
>
> $ git diff
> diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> index 420286e..59c0c10 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -81,7 +81,7 @@ EXTRA_OEMAKE = '\
> LDSHARED="${CC} -shared" \
> AR="${AR}" \
> LD="${LD}" \
> - EXTRA_CFLAGS="-ldw -I${S}" \
> + EXTRA_CFLAGS="-ldw -I${S} ${DEBUG_PREFIX_MAP}" \
> YFLAGS='-y
> --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
> EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
> perfexecdir=${libexecdir} \
>
> but I'm quite curious what the difference between our setups is, since
> apparently the only problem oe-core has/had was that new file introduced
> in v6.4.
>
You can see any patches that we have against perf in the kernel-cache
repository (https://git.yoctoproject.org/yocto-kernel-cache/). That being
said, we unfortunately cannot really patch perf, since the recipe is
supported against more than our reference kernels.
The debug prefix didn't initially work on some kernels (and hence perf),
so we went with the more manual approach.
It is very possible that with a newer window of supported kernels that
we could change how we deal with TMPDIR.
Other than that, there's no special setup (in particular no setup that
I have) as it is the autobuilder infrastructure that typically finds and
reports these issues.
>
> FWIW, what we build are vanilla -stable kernels, i.e. "6.2" means
> v6.2.16 as tagged by Greg. The only modification of the perf recipe we
> do is removing "scripting" from PACKAGECONFIG.
>
>
FWIW, you could save some effort and simply build v6.<x>/base on
linux-yocto and you'd have exactly the same source.
Bruce
> Rasmus
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
[-- Attachment #2: Type: text/html, Size: 5756 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+
2023-10-10 12:31 ` Bruce Ashfield
@ 2023-10-10 14:37 ` Rasmus Villemoes
2023-10-10 14:58 ` Bruce Ashfield
0 siblings, 1 reply; 25+ messages in thread
From: Rasmus Villemoes @ 2023-10-10 14:37 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: richard.purdie, openembedded-core
On 10/10/2023 14.31, Bruce Ashfield wrote:
>
>
> On Tue, Oct 10, 2023 at 7:44 AM Rasmus Villemoes
> It seems we can fix it with
>
> $ git diff
> diff --git a/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> b/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> index 420286e..59c0c10 100644
> --- a/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> +++ b/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> @@ -81,7 +81,7 @@ EXTRA_OEMAKE = '\
> LDSHARED="${CC} -shared" \
> AR="${AR}" \
> LD="${LD}" \
> - EXTRA_CFLAGS="-ldw -I${S}" \
> + EXTRA_CFLAGS="-ldw -I${S} ${DEBUG_PREFIX_MAP}" \
> YFLAGS='-y
> --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
> EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
> perfexecdir=${libexecdir} \
>
> but I'm quite curious what the difference between our setups is, since
> apparently the only problem oe-core has/had was that new file introduced
> in v6.4.
>
>
> You can see any patches that we have against perf in the kernel-cache
> repository (https://git.yoctoproject.org/yocto-kernel-cache/
> <https://git.yoctoproject.org/yocto-kernel-cache/>). That being
> said, we unfortunately cannot really patch perf, since the recipe is
> supported against more than our reference kernels.
I didn't suggest to patch perf, I suggested to patch the perf recipe.
>
> Other than that, there's no special setup (in particular no setup that
> I have) as it is the autobuilder infrastructure that typically finds and
> reports these issues.
So I found the difference, and those autobuilder builds do in fact make
the compiler use all the right -f*-prefix-map options. It's because
meta/conf/distro/include/security_flags.inc contains
TARGET_CC_ARCH:append:pn-perf = " ${SELECTED_OPTIMIZATION}"
and that includes the DEBUG_PREFIX_MAP setting, and in turn gets
included in the CC setting via HOST_CC_ARCH. And of course the poky
distro includes that security_flags.inc file, while our custom distro
does not (up until five minutes ago, I never knew that file existed).
Of course one wonders why those :append:pn-* settings that don't
actually append any security related flags, but do affect stuff like the
recipes passing QA, are hidden away in a file called security_flags.inc
instead of those settings just being directly in the recipes themselves.
There's no explanation in oe-core e93765ffb57 ; it removed a whole bunch
of append_pn-* stuff which had apparently become redundant (the commit
log hints as much), but doesn't offer any explanation as to why pn-perf
should grow that setting. And AFAICT that long predates the invention of
the -f*-prefix-map flags, so it seems to be mostly by accident that
perf, with the poky distro, actually does build with those flags.
Rasmus
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [OE-core] [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+
2023-10-10 14:37 ` Rasmus Villemoes
@ 2023-10-10 14:58 ` Bruce Ashfield
0 siblings, 0 replies; 25+ messages in thread
From: Bruce Ashfield @ 2023-10-10 14:58 UTC (permalink / raw)
To: Rasmus Villemoes; +Cc: richard.purdie, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3945 bytes --]
On Tue, Oct 10, 2023 at 10:37 AM Rasmus Villemoes <
rasmus.villemoes@prevas.dk> wrote:
> On 10/10/2023 14.31, Bruce Ashfield wrote:
> >
> >
> > On Tue, Oct 10, 2023 at 7:44 AM Rasmus Villemoes
> > It seems we can fix it with
> >
> > $ git diff
> > diff --git a/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> > b/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> > index 420286e..59c0c10 100644
> > --- a/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> > +++ b/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
> > @@ -81,7 +81,7 @@ EXTRA_OEMAKE = '\
> > LDSHARED="${CC} -shared" \
> > AR="${AR}" \
> > LD="${LD}" \
> > - EXTRA_CFLAGS="-ldw -I${S}" \
> > + EXTRA_CFLAGS="-ldw -I${S} ${DEBUG_PREFIX_MAP}" \
> > YFLAGS='-y
> >
> --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
> > EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
> > perfexecdir=${libexecdir} \
> >
> > but I'm quite curious what the difference between our setups is,
> since
> > apparently the only problem oe-core has/had was that new file
> introduced
> > in v6.4.
> >
> >
> > You can see any patches that we have against perf in the kernel-cache
> > repository (https://git.yoctoproject.org/yocto-kernel-cache/
> > <https://git.yoctoproject.org/yocto-kernel-cache/>). That being
> > said, we unfortunately cannot really patch perf, since the recipe is
> > supported against more than our reference kernels.
>
> I didn't suggest to patch perf, I suggested to patch the perf recipe.
>
I also didn't mean that. You asked what the differences might
be in our setup, which largely means linux-yocto. Hence why
the patches would be relevant to that question.
> >
> > Other than that, there's no special setup (in particular no setup that
> > I have) as it is the autobuilder infrastructure that typically finds and
> > reports these issues.
>
> So I found the difference, and those autobuilder builds do in fact make
> the compiler use all the right -f*-prefix-map options. It's because
> meta/conf/distro/include/security_flags.inc contains
>
> TARGET_CC_ARCH:append:pn-perf = " ${SELECTED_OPTIMIZATION}"
>
> and that includes the DEBUG_PREFIX_MAP setting, and in turn gets
> included in the CC setting via HOST_CC_ARCH. And of course the poky
> distro includes that security_flags.inc file, while our custom distro
> does not (up until five minutes ago, I never knew that file existed).
>
> Of course one wonders why those :append:pn-* settings that don't
> actually append any security related flags, but do affect stuff like the
> recipes passing QA, are hidden away in a file called security_flags.inc
> instead of those settings just being directly in the recipes themselves.
> There's no explanation in oe-core e93765ffb57 ; it removed a whole bunch
> of append_pn-* stuff which had apparently become redundant (the commit
> log hints as much), but doesn't offer any explanation as to why pn-perf
> should grow that setting. And AFAICT that long predates the invention of
> the -f*-prefix-map flags, so it seems to be mostly by accident that
> perf, with the poky distro, actually does build with those flags.
>
The settings and debug maps are typically distro policies, so that's
why they were historically controlled there. If we pull it out to the
recipe, we'd want to check a similar distro flag to enable/disable
(mainly for debug purposes).
I wouldn't say by accident at all, but there's been a lot of changes
over time, so there's bits and pieces that are stitched together
differently, with variable names that have had their meaning change
over time.
Bruce
>
> Rasmus
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
[-- Attachment #2: Type: text/html, Size: 6687 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2023-10-10 14:58 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-10 3:20 [PATCH 00/15] kernel: consolidated pull request bruce.ashfield
2023-07-10 3:20 ` [PATCH 01/15] linux-yocto/6.1: update to v6.1.36 bruce.ashfield
2023-07-10 3:20 ` [PATCH 02/15] linux-yocto/6.1: update to v6.1.37 bruce.ashfield
2023-07-10 3:20 ` [PATCH 03/15] linux-libc-headers: bump to 6.4 bruce.ashfield
2023-07-10 3:20 ` [PATCH 04/15] perf: fix buildpaths QA warning in 6.4+ bruce.ashfield
2023-10-10 11:44 ` [OE-core] " Rasmus Villemoes
2023-10-10 12:31 ` Bruce Ashfield
2023-10-10 14:37 ` Rasmus Villemoes
2023-10-10 14:58 ` Bruce Ashfield
2023-07-10 3:20 ` [PATCH 05/15] kernel: fix localversion in v6.3+ bruce.ashfield
2023-07-10 3:20 ` [PATCH 06/15] linux-yocto: introduce 6.4 reference kernel recipes bruce.ashfield
2023-07-10 3:20 ` [PATCH 07/15] linux-yocto/6.4: update to latest bruce.ashfield
2023-07-10 3:20 ` [PATCH 08/15] linux-yocto/6.4: aufs6 integration bruce.ashfield
2023-07-10 3:20 ` [PATCH 09/15] linux-yocto/6.4: refresh configuration bruce.ashfield
2023-07-10 3:20 ` [PATCH 10/15] linux-yocto-rt/6.4: integrate -rt6 bruce.ashfield
2023-07-10 3:20 ` [PATCH 11/15] linux-yocto/6.4: update to v6.4.2 bruce.ashfield
2023-07-10 3:20 ` [PATCH 12/15] linux-yocto/6.1: update to v6.1.38 bruce.ashfield
2023-07-10 3:20 ` [PATCH 13/15] conf/machine: set preferred kernel to be 6.4 bruce.ashfield
2023-07-10 3:20 ` [PATCH 14/15] poky/poky-tiny: set preferred linux-yocto version to 6.4 bruce.ashfield
2023-07-10 3:20 ` [PATCH 15/15] linux-yocto-tiny/6.4: fix configuration warnings (HID) bruce.ashfield
2023-07-10 14:54 ` [OE-core] [PATCH 00/15] kernel: consolidated pull request Ross Burton
2023-07-10 20:59 ` Alexandre Belloni
2023-07-10 22:58 ` Bruce Ashfield
[not found] ` <1770A3C5B7BBB722.31955@lists.openembedded.org>
2023-07-10 23:11 ` Bruce Ashfield
[not found] ` <17709D3D34AB3A9D.28523@lists.openembedded.org>
2023-07-10 21:16 ` Alexandre Belloni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.