* [PATCH 1/8] linux-yocto/5.10: update to v5.10.47
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-02 15:13 ` [PATCH 2/8] linux-yocto/5.4: update to v5.4.129 Bruce Ashfield
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.10 to the latest korg -stable release that comprises
the following commits:
4357ae26d4cd Linux 5.10.47
1573d595e239 integrity: Load mokx variables into the blacklist keyring
c6ae6f89fc4f certs: Add ability to preload revocation certs
72d6f5d982f0 certs: Move load_system_certificate_list to a common function
45109066f686 certs: Add EFI_CERT_X509_GUID support for dbx entries
0ba128fa68a4 Revert "drm: add a locked version of drm_is_current_master"
0463b49e0239 netfs: fix test for whether we can skip read when writing beyond EOF
e6108147dd91 swiotlb: manipulate orig_addr when tlb_addr has offset
7570a8b5dd49 KVM: SVM: Call SEV Guest Decommission if ASID binding fails
377a796e7a71 mm, futex: fix shared futex pgoff on shmem huge page
ab9d178167ea mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk()
915c3a262c49 mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes
90073aecc3cc mm: page_vma_mapped_walk(): get vma_address_end() earlier
bf60fc2314b9 mm: page_vma_mapped_walk(): use goto instead of while (1)
9f85dcaf1533 mm: page_vma_mapped_walk(): add a level of indentation
e56bdb397663 mm: page_vma_mapped_walk(): crossing page table boundary
8dc191ed9c5f mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block
7b55a4bcfccf mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd
1cb0b9059f9e mm: page_vma_mapped_walk(): settle PageHuge on entry
65febb41b4d6 mm: page_vma_mapped_walk(): use page for pvmw->page
825c28052b4d mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split
0010275ca243 mm/thp: unmap_mapping_page() to fix THP truncate_cleanup_page()
38cda6b5ab83 mm/thp: fix page_address_in_vma() on file THP tails
37ffe9f4d7ff mm/thp: fix vma_address() if virtual address below file offset
66be14a92609 mm/thp: try_to_unmap() use TTU_SYNC for safe splitting
6527d8ef68c3 mm/thp: make is_huge_zero_pmd() safe and quicker
a8f4ea1d38ac mm/thp: fix __split_huge_pmd_locked() on shmem migration entry
32f954e961ca mm, thp: use head page in __migration_entry_wait()
bfd90b56d7f6 mm/rmap: use page_not_mapped in try_to_unmap()
ff81af8259bb mm/rmap: remove unneeded semicolon in page_not_mapped()
a0ad7ea018e7 mm: add VM_WARN_ON_ONCE_PAGE() macro
130a1d76ee0b x86/fpu: Make init_fpstate correct with optimized XSAVE
51d8011782ed x86/fpu: Preserve supervisor states in sanitize_restored_user_xstate()
2b35a4eaaaae kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
bfe28af78a20 kthread_worker: split code for canceling the delayed work timer
02c303f3b9fb ceph: must hold snap_rwsem when filling inode for async create
de0af2651daa i2c: robotfuzz-osif: fix control-request directions
dd8ed6c9bc22 KVM: do not allow mapping valid but non-reference-counted pages
5fd0c2cf7b11 s390/stack: fix possible register corruption with stack switch helper
ab5bef978038 nilfs2: fix memory leak in nilfs_sysfs_delete_device_group
ace31c91fd59 scsi: sd: Call sd_revalidate_disk() for ioctl(BLKRRPART)
b9e6c20d4c9d gpiolib: cdev: zero padding during conversion to gpioline_info_changed
0221a5a4db46 i2c: i801: Ensure that SMBHSTSTS_INUSE_STS is cleared when leaving i801_access
018d03fcf77a pinctrl: stm32: fix the reported number of GPIO lines per bank
df654cd3d300 perf/x86: Track pmu in per-CPU cpu_hw_events
f9e73b2967f6 net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY
1c9cf96f5652 net: ll_temac: Add memory-barriers for TX BD access
bafb6cdd4f70 PCI: Add AMD RS690 quirk to enable 64-bit DMA
d91c50e6a678 recordmcount: Correct st_shndx handling
fb71d81ccd69 mac80211: handle various extensible elements correctly
676a7cb1a96b mac80211: reset profile_periodicity/ema_ap
ca0e1fefbb53 net: qed: Fix memcpy() overflow of qed_dcbx_params()
4658a8d30791 KVM: selftests: Fix kvm_check_cap() assertion
e83e3c5d85a7 r8169: Avoid memcpy() over-reading of ETH_SS_STATS
992b105abf57 sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
a10856ea6066 r8152: Avoid memcpy() over-reading of ETH_SS_STATS
196b22ef6cd1 net/packet: annotate accesses to po->ifindex
da8b3aeff4ad net/packet: annotate accesses to po->bind
18ed1789bbce net: caif: fix memory leak in ldisc_open
edcd7594ada9 riscv32: Use medany C model for modules
47c07f919fab net: phy: dp83867: perform soft reset and retain established link
f57132a887ea net/packet: annotate data race in packet_sendmsg()
9707960ecfdc inet: annotate date races around sk->sk_txhash
7293f63b7b62 net: annotate data race in sock_error()
61b132f67c0d ping: Check return value of function 'ping_queue_rcv_skb'
08c389de6d53 inet: annotate data race in inet_send_prepare() and inet_dgram_connect()
c2311fd6de78 net: ethtool: clear heap allocations for ethtool function
c2813d1966ba mac80211: drop multicast fragments
fedc4d4f548c net: ipv4: Remove unneed BUG() function
93c2aac13b08 dmaengine: mediatek: use GFP_NOWAIT instead of GFP_ATOMIC in prep_dma
0f48f9277182 dmaengine: mediatek: do not issue a new desc if one is still current
63fa5b2d4b55 dmaengine: mediatek: free the proper desc in desc_free handler
78fa0f707d73 dmaengine: rcar-dmac: Fix PM reference leak in rcar_dmac_probe()
6a07cf36064a cfg80211: call cfg80211_leave_ocb when switching away from OCB
a9028333001f mac80211_hwsim: drop pending frames on stop
8cfe765afd5a mac80211: remove warning in ieee80211_get_sband()
b671b9816982 dmaengine: xilinx: dpdma: Limit descriptor IDs to 16 bits
524f70b30ef8 dmaengine: xilinx: dpdma: Add missing dependencies to Kconfig
13b245a7bd59 dmaengine: stm32-mdma: fix PM reference leak in stm32_mdma_alloc_chan_resourc()
86f3e72dcb72 dmaengine: zynqmp_dma: Fix PM reference leak in zynqmp_dma_alloc_chan_resourc()
4df9ed0edb9f perf/x86/intel/lbr: Zero the xstate buffer on allocation
56bc20e5fc64 perf/x86/lbr: Remove cpuc->lbr_xsave allocation from atomic context
ca2acbd5483f locking/lockdep: Improve noinstr vs errors
59aa5c91f863 x86/xen: Fix noinstr fail in exc_xen_unknown_trap()
cb83c99cf675 x86/entry: Fix noinstr fail in __do_fast_syscall_32()
cf5935487594 drm/vc4: hdmi: Make sure the controller is powered in detect
f73aca83fd83 drm/vc4: hdmi: Move the HSM clock enable to runtime_pm
f11f9ff8a7c9 Revert "PCI: PM: Do not read power state in pci_enable_device_flags()"
4b06ebab4a82 spi: spi-nxp-fspi: move the register operation after the clock enable
50a1312a29d1 arm64: Force NO_BLOCK_MAPPINGS if crashkernel reservation is required
bd5d4df4dcc1 arm64: Ignore any DMA offsets in the max_zone_phys() calculation
3bbdf5a6fcd2 MIPS: generic: Update node names to avoid unit addresses
03096a46019e mmc: meson-gx: use memcpy_to/fromio for dram-access-quirk
b8fd230ae085 ARM: 9081/1: fix gcc-10 thumb2-kernel regression
3d6c4f78ec61 drm/amdgpu: wait for moving fence after pinning
694bb36aa75d drm/radeon: wait for moving fence after pinning
bcfea2412f4b drm/nouveau: wait for moving fence after pinning v2
3ef0ca0ec995 drm: add a locked version of drm_is_current_master
fea853aca321 Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
1bd81429d53d Revert "drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue."
3051f230f19f module: limit enabling module.sig_enforce
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_5.10.bb | 6 ++---
.../linux/linux-yocto-tiny_5.10.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index f511f233b6..1c5bb9753c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "4a59bc57b2be77da9394b10eb37067da7d63b7a4"
-SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3"
+SRCREV_machine ?= "42032770803ba26765376967cef09945f48abe04"
+SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.10.46"
+LINUX_VERSION ?= "5.10.47"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index f5ade2992c..bdc49fb9e2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.10.46"
+LINUX_VERSION ?= "5.10.47"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "dd1f9602f3e4e9dc177421ba12ce073ad2099a58"
-SRCREV_machine ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3"
+SRCREV_machine_qemuarm ?= "eaad1adbc817d996edf44fdd520da4810e57e66d"
+SRCREV_machine ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index dd4aef7f89..abe837c2f4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base"
KBRANCH_qemux86-64 ?= "v5.10/standard/base"
KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "17e89ca08f67fdcbaf0a3ae4c429602f76463923"
-SRCREV_machine_qemuarm64 ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_machine_qemumips ?= "bdcaaee7b7ce0e865670a2cee55b1974eb67357b"
-SRCREV_machine_qemuppc ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_machine_qemuriscv64 ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_machine_qemuriscv32 ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_machine_qemux86 ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_machine_qemux86-64 ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_machine_qemumips64 ?= "2f11a726a60ad9e8a48de6bc2101a993b461e8d1"
-SRCREV_machine ?= "139fe7d68413054f850e206ab749f97a968867a8"
-SRCREV_meta ?= "b969f83647833d21d8826c4667492f58895213c3"
+SRCREV_machine_qemuarm ?= "8950bba5dc5b6139af3711cf82b6c35ea3ef873f"
+SRCREV_machine_qemuarm64 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_machine_qemumips ?= "271e6f3b206246da2937788d83c3b4e57cb33da0"
+SRCREV_machine_qemuppc ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_machine_qemuriscv64 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_machine_qemuriscv32 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_machine_qemux86 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_machine_qemux86-64 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_machine_qemumips64 ?= "1112c8f8594df02dd6f2bd1cf13848536ca3f536"
+SRCREV_machine ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
+SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "5.10.46"
+LINUX_VERSION ?= "5.10.47"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/8] linux-yocto/5.4: update to v5.4.129
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
2021-07-02 15:13 ` [PATCH 1/8] linux-yocto/5.10: update to v5.10.47 Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-02 15:13 ` [PATCH 3/8] linux-yocto/5.10: scsi-debug needs scsi-disk Bruce Ashfield
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:
82ffbc138a1f Linux 5.4.129
9011aaab90b8 certs: Move load_system_certificate_list to a common function
e20b90e4f81b certs: Add EFI_CERT_X509_GUID support for dbx entries
06ab9df09eb3 x86/efi: move common keyring handler functions to new file
ac7d3f554472 certs: Add wrapper function to check blacklisted binary hash
61168eafe024 mm, futex: fix shared futex pgoff on shmem huge page
a33b70d62552 mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk()
e045e9e79d2a mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes
037a1d67d236 mm: page_vma_mapped_walk(): get vma_address_end() earlier
fa89d536948a mm: page_vma_mapped_walk(): use goto instead of while (1)
a499febd9935 mm: page_vma_mapped_walk(): add a level of indentation
b1783bf8c8e4 mm: page_vma_mapped_walk(): crossing page table boundary
80b2270a14b8 mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block
ef161ccaca70 mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd
4961160272b7 mm: page_vma_mapped_walk(): settle PageHuge on entry
52e2b20fb5e4 mm: page_vma_mapped_walk(): use page for pvmw->page
82ee7326af7a mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split
bd4389215227 mm/thp: unmap_mapping_page() to fix THP truncate_cleanup_page()
b767134ec30a mm/thp: fix page_address_in_vma() on file THP tails
41432a8a6776 mm/thp: fix vma_address() if virtual address below file offset
4b0a34e222e5 mm/thp: try_to_unmap() use TTU_SYNC for safe splitting
bd092a0f1942 mm/thp: make is_huge_zero_pmd() safe and quicker
4c37d7f269f8 mm/thp: fix __split_huge_pmd_locked() on shmem migration entry
7ce4b73d349b mm, thp: use head page in __migration_entry_wait()
68ce37ebe0f2 mm/rmap: use page_not_mapped in try_to_unmap()
432b61863ac7 mm/rmap: remove unneeded semicolon in page_not_mapped()
cfe575954ddd mm: add VM_WARN_ON_ONCE_PAGE() macro
42f11f0fe977 kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync()
06ab015d1849 kthread_worker: split code for canceling the delayed work timer
d77c9c8537db i2c: robotfuzz-osif: fix control-request directions
bb85717e3797 KVM: do not allow mapping valid but non-reference-counted pages
d6f751ecccfb nilfs2: fix memory leak in nilfs_sysfs_delete_device_group
702acfcbfa68 pinctrl: stm32: fix the reported number of GPIO lines per bank
76c10e10ba7b net: ll_temac: Avoid ndo_start_xmit returning NETDEV_TX_BUSY
aa00b9780482 net: ll_temac: Add memory-barriers for TX BD access
d807b93f9bca PCI: Add AMD RS690 quirk to enable 64-bit DMA
5830f2081d98 recordmcount: Correct st_shndx handling
70866199220e net: qed: Fix memcpy() overflow of qed_dcbx_params()
b7168ec176fd KVM: selftests: Fix kvm_check_cap() assertion
58687d143515 r8169: Avoid memcpy() over-reading of ETH_SS_STATS
cb4a2e4e224a sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
97e0102e1824 r8152: Avoid memcpy() over-reading of ETH_SS_STATS
f12a5b48bcc8 net/packet: annotate accesses to po->ifindex
cdcedd3c8683 net/packet: annotate accesses to po->bind
343406f9c198 net: caif: fix memory leak in ldisc_open
8707ce86e927 net: phy: dp83867: perform soft reset and retain established link
9f2d04dfb3c4 inet: annotate date races around sk->sk_txhash
d40ff07a7b7d ping: Check return value of function 'ping_queue_rcv_skb'
9df4f031536b net: ethtool: clear heap allocations for ethtool function
62aed2df294a mac80211: drop multicast fragments
eb2b1216bc8f net: ipv4: Remove unneed BUG() function
e0c950d2fddb dmaengine: mediatek: use GFP_NOWAIT instead of GFP_ATOMIC in prep_dma
f7b1926c7c5d dmaengine: mediatek: do not issue a new desc if one is still current
3d995587c3ea dmaengine: mediatek: free the proper desc in desc_free handler
c09af3877b53 dmaengine: rcar-dmac: Fix PM reference leak in rcar_dmac_probe()
f2c027a7750f cfg80211: call cfg80211_leave_ocb when switching away from OCB
78bf3c613148 mac80211_hwsim: drop pending frames on stop
ae9de9444b54 mac80211: remove warning in ieee80211_get_sband()
0e486713779a dmaengine: zynqmp_dma: Fix PM reference leak in zynqmp_dma_alloc_chan_resourc()
456367b24190 Revert "PCI: PM: Do not read power state in pci_enable_device_flags()"
1442186236ad spi: spi-nxp-fspi: move the register operation after the clock enable
7bc73260c4b1 MIPS: generic: Update node names to avoid unit addresses
0855fe6d8835 arm64: link with -z norelro for LLD or aarch64-elf
3173390b8dbc kbuild: add CONFIG_LD_IS_LLD
3450f5eb8c9e mmc: meson-gx: use memcpy_to/fromio for dram-access-quirk
48a5449c0be1 ARM: 9081/1: fix gcc-10 thumb2-kernel regression
4a8e89e0fd0b drm/radeon: wait for moving fence after pinning
4577708b2a22 drm/nouveau: wait for moving fence after pinning v2
c77c617e26e2 Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
6bd0da6c9b12 Revert "drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue."
e2dc07ca4e01 module: limit enabling module.sig_enforce
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_5.4.bb | 6 ++---
.../linux/linux-yocto-tiny_5.4.bb | 8 +++----
meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++----------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index 3e97058f68..7a4267531f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "f3ac47f313e4ce608b3567c006f61d1d8b820ae2"
-SRCREV_meta ?= "78949176d073f5cf04c9e0c4be699e39528f2880"
+SRCREV_machine ?= "c86c4081f4764f57bbb26df8a9202c01799c3771"
+SRCREV_meta ?= "c5e5dc4e13bd4882a8ed96b8026e6fd268b68f8a"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
-LINUX_VERSION ?= "5.4.128"
+LINUX_VERSION ?= "5.4.129"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 2eb5ebdbbd..5d487ac23f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
require recipes-kernel/linux/linux-yocto.inc
-LINUX_VERSION ?= "5.4.128"
+LINUX_VERSION ?= "5.4.129"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine_qemuarm ?= "987d6fd6c916297cde5cc7e988c28ef1e458f1cf"
-SRCREV_machine ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_meta ?= "78949176d073f5cf04c9e0c4be699e39528f2880"
+SRCREV_machine_qemuarm ?= "ca636d1a2ccbb2626c4eacbdb0da2c30654b108c"
+SRCREV_machine ?= "d46f8ecb3f81bdba8131b90dc90174ecb36a1b78"
+SRCREV_meta ?= "c5e5dc4e13bd4882a8ed96b8026e6fd268b68f8a"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 5a7e9f0a35..94605b3942 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base"
KBRANCH_qemux86-64 ?= "v5.4/standard/base"
KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "69874edb0838e4d26002a8d30e14a5e1b355e397"
-SRCREV_machine_qemuarm64 ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_machine_qemumips ?= "1bfafb3ce048d4a30aca35e847168855980f5dbc"
-SRCREV_machine_qemuppc ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_machine_qemuriscv64 ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_machine_qemux86 ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_machine_qemux86-64 ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_machine_qemumips64 ?= "2a0ea1bced3f4b8ebebb19debc19b7930a4924a8"
-SRCREV_machine ?= "befa5fba9b9f972f68acc891f2ca143d6b3e4011"
-SRCREV_meta ?= "78949176d073f5cf04c9e0c4be699e39528f2880"
+SRCREV_machine_qemuarm ?= "dfb964733268c1e6f932900a384a793a0ca8de34"
+SRCREV_machine_qemuarm64 ?= "7d3eac73a6edc8fdcd701bbb0aa8c21030eb2027"
+SRCREV_machine_qemumips ?= "a40b68f2f4be601dfe020940ad29ac894cc31298"
+SRCREV_machine_qemuppc ?= "a3258c8b1690ecfa620eae9552a75cec9224ecd4"
+SRCREV_machine_qemuriscv64 ?= "e211c039dcd85ad2d4c1f1a70909d0eefef49778"
+SRCREV_machine_qemux86 ?= "e211c039dcd85ad2d4c1f1a70909d0eefef49778"
+SRCREV_machine_qemux86-64 ?= "e211c039dcd85ad2d4c1f1a70909d0eefef49778"
+SRCREV_machine_qemumips64 ?= "dded4f6e58cd90c7333b5257c9327e5e30f78e26"
+SRCREV_machine ?= "e211c039dcd85ad2d4c1f1a70909d0eefef49778"
+SRCREV_meta ?= "c5e5dc4e13bd4882a8ed96b8026e6fd268b68f8a"
# remap qemuarm to qemuarma15 for the 5.4 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.128"
+LINUX_VERSION ?= "5.4.129"
DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
DEPENDS += "openssl-native util-linux-native"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/8] linux-yocto/5.10: scsi-debug needs scsi-disk
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
2021-07-02 15:13 ` [PATCH 1/8] linux-yocto/5.10: update to v5.10.47 Bruce Ashfield
2021-07-02 15:13 ` [PATCH 2/8] linux-yocto/5.4: update to v5.4.129 Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-02 15:13 ` [PATCH 4/8] linux-libc-headers: update to 5.13 Bruce Ashfield
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
It was pointed out that the default scsi-debug feature didn't behave
the same as other distros, since it doesn't have disk supporrt enabled.
We already have a disk.cfg for scsi so we include it into the debug
fragment to get the support we want.
Integrating the following commit(s) to linux-yocto/.:
66a4b5fc619 scsi: debug needs disk support
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 1c5bb9753c..e0d8280128 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "42032770803ba26765376967cef09945f48abe04"
-SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31"
+SRCREV_meta ?= "82899c6a7119b9668be9ae508159f5ac96554cc2"
SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index bdc49fb9e2..6b71573a39 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "eaad1adbc817d996edf44fdd520da4810e57e66d"
SRCREV_machine ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
-SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31"
+SRCREV_meta ?= "82899c6a7119b9668be9ae508159f5ac96554cc2"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index abe837c2f4..0315808989 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
SRCREV_machine_qemux86-64 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
SRCREV_machine_qemumips64 ?= "1112c8f8594df02dd6f2bd1cf13848536ca3f536"
SRCREV_machine ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
-SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31"
+SRCREV_meta ?= "82899c6a7119b9668be9ae508159f5ac96554cc2"
# remap qemuarm to qemuarma15 for the 5.8 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/8] linux-libc-headers: update to 5.13
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
` (2 preceding siblings ...)
2021-07-02 15:13 ` [PATCH 3/8] linux-yocto/5.10: scsi-debug needs scsi-disk Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-06 17:42 ` [OE-core] " Khem Raj
2021-07-02 15:13 ` [PATCH 5/8] kernel-devsrc: fix scripts/prepare for ARM64 Bruce Ashfield
` (4 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Bumping the libc-headers to match the latest OE core reference
kernel.
We refresh one of the musl patches to udpate to the 5.12+ context of
the header, but otherwise everything is unchanged.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
...3-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 ++++++------
| 5 ++---
3 files changed, 9 insertions(+), 10 deletions(-)
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.10.bb => linux-libc-headers_5.13.bb} (80%)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index c6e5ac61d7..68e5d848ba 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.36%"
GDBVERSION ?= "10.%"
GLIBCVERSION ?= "2.33"
-LINUXLIBCVERSION ?= "5.10%"
+LINUXLIBCVERSION ?= "5.13%"
QEMUVERSION ?= "6.0%"
GOVERSION ?= "1.16%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
index b5c4e1750e..b0e7014138 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
@@ -13,17 +13,17 @@ Upstream-Status: Submitted
include/uapi/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)
-Index: linux-4.8-rc4/include/uapi/linux/kernel.h
+Index: linux-5.12.11/include/uapi/linux/kernel.h
===================================================================
---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
-+++ linux-4.8-rc4/include/uapi/linux/kernel.h
-@@ -1,7 +1,9 @@
+--- linux-5.12.11.orig/include/uapi/linux/kernel.h
++++ linux-5.12.11/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
#ifndef _UAPI_LINUX_KERNEL_H
#define _UAPI_LINUX_KERNEL_H
+#ifdef __GLIBC__
#include <linux/sysinfo.h>
+ #include <linux/const.h>
+#endif
- /*
- * 'kernel.h' contains some often-used function prototypes etc
+ #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
similarity index 80%
rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
index d6a4d5aa61..251d00440d 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
@@ -14,6 +14,5 @@ SRC_URI_append = "\
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3"
-SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43"
-
+SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4"
+SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [OE-core] [PATCH 4/8] linux-libc-headers: update to 5.13
2021-07-02 15:13 ` [PATCH 4/8] linux-libc-headers: update to 5.13 Bruce Ashfield
@ 2021-07-06 17:42 ` Khem Raj
2021-07-06 18:02 ` Bruce Ashfield
0 siblings, 1 reply; 15+ messages in thread
From: Khem Raj @ 2021-07-06 17:42 UTC (permalink / raw)
To: Bruce Ashfield
Cc: Richard Purdie, Patches and discussions about the oe-core layer
Hi Bruce
On Fri, Jul 2, 2021 at 8:14 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> Bumping the libc-headers to match the latest OE core reference
> kernel.
>
> We refresh one of the musl patches to udpate to the 5.12+ context of
> the header, but otherwise everything is unchanged.
>
This is primarily going ok, I see one failure however with keepalived here
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1388
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> meta/conf/distro/include/tcmode-default.inc | 2 +-
> ...3-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 ++++++------
> ...bc-headers_5.10.bb => linux-libc-headers_5.13.bb} | 5 ++---
> 3 files changed, 9 insertions(+), 10 deletions(-)
> rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.10.bb => linux-libc-headers_5.13.bb} (80%)
>
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index c6e5ac61d7..68e5d848ba 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.36%"
> GDBVERSION ?= "10.%"
> GLIBCVERSION ?= "2.33"
> -LINUXLIBCVERSION ?= "5.10%"
> +LINUXLIBCVERSION ?= "5.13%"
> QEMUVERSION ?= "6.0%"
> GOVERSION ?= "1.16%"
> # This can not use wildcards like 8.0.% since it is also used in mesa to denote
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> index b5c4e1750e..b0e7014138 100644
> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> @@ -13,17 +13,17 @@ Upstream-Status: Submitted
> include/uapi/linux/kernel.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> -Index: linux-4.8-rc4/include/uapi/linux/kernel.h
> +Index: linux-5.12.11/include/uapi/linux/kernel.h
> ===================================================================
> ---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
> -+++ linux-4.8-rc4/include/uapi/linux/kernel.h
> -@@ -1,7 +1,9 @@
> +--- linux-5.12.11.orig/include/uapi/linux/kernel.h
> ++++ linux-5.12.11/include/uapi/linux/kernel.h
> +@@ -2,7 +2,9 @@
> #ifndef _UAPI_LINUX_KERNEL_H
> #define _UAPI_LINUX_KERNEL_H
>
> +#ifdef __GLIBC__
> #include <linux/sysinfo.h>
> + #include <linux/const.h>
> +#endif
>
> - /*
> - * 'kernel.h' contains some often-used function prototypes etc
> + #endif /* _UAPI_LINUX_KERNEL_H */
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> similarity index 80%
> rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> index d6a4d5aa61..251d00440d 100644
> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> @@ -14,6 +14,5 @@ SRC_URI_append = "\
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
>
> -SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3"
> -SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43"
> -
> +SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4"
> +SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9"
> --
> 2.19.1
>
>
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [OE-core] [PATCH 4/8] linux-libc-headers: update to 5.13
2021-07-06 17:42 ` [OE-core] " Khem Raj
@ 2021-07-06 18:02 ` Bruce Ashfield
2021-07-06 22:01 ` Khem Raj
0 siblings, 1 reply; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-06 18:02 UTC (permalink / raw)
To: Khem Raj; +Cc: Richard Purdie, Patches and discussions about the oe-core layer
On Tue, Jul 6, 2021 at 1:43 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> Hi Bruce
>
> On Fri, Jul 2, 2021 at 8:14 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > Bumping the libc-headers to match the latest OE core reference
> > kernel.
> >
> > We refresh one of the musl patches to udpate to the 5.12+ context of
> > the header, but otherwise everything is unchanged.
> >
>
> This is primarily going ok, I see one failure however with keepalived here
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1388
>
I launched a build for keepalived, I'll see if the issue reproduces here.
Were you going to debug, or did you want me to have a look ? (We've
both looked at this at the same time in the past, and that's not a
great use of time).
I'll just start looking at a version bump, since that is the easiest
place to start.
Bruce
>
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ---
> > meta/conf/distro/include/tcmode-default.inc | 2 +-
> > ...3-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 ++++++------
> > ...bc-headers_5.10.bb => linux-libc-headers_5.13.bb} | 5 ++---
> > 3 files changed, 9 insertions(+), 10 deletions(-)
> > rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.10.bb => linux-libc-headers_5.13.bb} (80%)
> >
> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> > index c6e5ac61d7..68e5d848ba 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.36%"
> > GDBVERSION ?= "10.%"
> > GLIBCVERSION ?= "2.33"
> > -LINUXLIBCVERSION ?= "5.10%"
> > +LINUXLIBCVERSION ?= "5.13%"
> > QEMUVERSION ?= "6.0%"
> > GOVERSION ?= "1.16%"
> > # This can not use wildcards like 8.0.% since it is also used in mesa to denote
> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > index b5c4e1750e..b0e7014138 100644
> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > @@ -13,17 +13,17 @@ Upstream-Status: Submitted
> > include/uapi/linux/kernel.h | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > -Index: linux-4.8-rc4/include/uapi/linux/kernel.h
> > +Index: linux-5.12.11/include/uapi/linux/kernel.h
> > ===================================================================
> > ---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
> > -+++ linux-4.8-rc4/include/uapi/linux/kernel.h
> > -@@ -1,7 +1,9 @@
> > +--- linux-5.12.11.orig/include/uapi/linux/kernel.h
> > ++++ linux-5.12.11/include/uapi/linux/kernel.h
> > +@@ -2,7 +2,9 @@
> > #ifndef _UAPI_LINUX_KERNEL_H
> > #define _UAPI_LINUX_KERNEL_H
> >
> > +#ifdef __GLIBC__
> > #include <linux/sysinfo.h>
> > + #include <linux/const.h>
> > +#endif
> >
> > - /*
> > - * 'kernel.h' contains some often-used function prototypes etc
> > + #endif /* _UAPI_LINUX_KERNEL_H */
> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > similarity index 80%
> > rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> > rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > index d6a4d5aa61..251d00440d 100644
> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > @@ -14,6 +14,5 @@ SRC_URI_append = "\
> >
> > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> >
> > -SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3"
> > -SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43"
> > -
> > +SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4"
> > +SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9"
> > --
> > 2.19.1
> >
> >
> >
> >
--
- 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] 15+ messages in thread* Re: [OE-core] [PATCH 4/8] linux-libc-headers: update to 5.13
2021-07-06 18:02 ` Bruce Ashfield
@ 2021-07-06 22:01 ` Khem Raj
2021-07-07 5:36 ` Khem Raj
0 siblings, 1 reply; 15+ messages in thread
From: Khem Raj @ 2021-07-06 22:01 UTC (permalink / raw)
To: Bruce Ashfield
Cc: Richard Purdie, Patches and discussions about the oe-core layer
On Tue, Jul 6, 2021 at 11:03 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Tue, Jul 6, 2021 at 1:43 PM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > Hi Bruce
> >
> > On Fri, Jul 2, 2021 at 8:14 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> > >
> > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > >
> > > Bumping the libc-headers to match the latest OE core reference
> > > kernel.
> > >
> > > We refresh one of the musl patches to udpate to the 5.12+ context of
> > > the header, but otherwise everything is unchanged.
> > >
> >
> > This is primarily going ok, I see one failure however with keepalived here
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1388
> >
>
> I launched a build for keepalived, I'll see if the issue reproduces here.
>
> Were you going to debug, or did you want me to have a look ? (We've
> both looked at this at the same time in the past, and that's not a
> great use of time).
>
> I'll just start looking at a version bump, since that is the easiest
> place to start.
thats good. If it does not fail for you, it means its due to glibc
2.34 and I can take care of that
>
> Bruce
>
> >
> > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > ---
> > > meta/conf/distro/include/tcmode-default.inc | 2 +-
> > > ...3-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 ++++++------
> > > ...bc-headers_5.10.bb => linux-libc-headers_5.13.bb} | 5 ++---
> > > 3 files changed, 9 insertions(+), 10 deletions(-)
> > > rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.10.bb => linux-libc-headers_5.13.bb} (80%)
> > >
> > > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> > > index c6e5ac61d7..68e5d848ba 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.36%"
> > > GDBVERSION ?= "10.%"
> > > GLIBCVERSION ?= "2.33"
> > > -LINUXLIBCVERSION ?= "5.10%"
> > > +LINUXLIBCVERSION ?= "5.13%"
> > > QEMUVERSION ?= "6.0%"
> > > GOVERSION ?= "1.16%"
> > > # This can not use wildcards like 8.0.% since it is also used in mesa to denote
> > > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > > index b5c4e1750e..b0e7014138 100644
> > > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > > @@ -13,17 +13,17 @@ Upstream-Status: Submitted
> > > include/uapi/linux/kernel.h | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > -Index: linux-4.8-rc4/include/uapi/linux/kernel.h
> > > +Index: linux-5.12.11/include/uapi/linux/kernel.h
> > > ===================================================================
> > > ---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
> > > -+++ linux-4.8-rc4/include/uapi/linux/kernel.h
> > > -@@ -1,7 +1,9 @@
> > > +--- linux-5.12.11.orig/include/uapi/linux/kernel.h
> > > ++++ linux-5.12.11/include/uapi/linux/kernel.h
> > > +@@ -2,7 +2,9 @@
> > > #ifndef _UAPI_LINUX_KERNEL_H
> > > #define _UAPI_LINUX_KERNEL_H
> > >
> > > +#ifdef __GLIBC__
> > > #include <linux/sysinfo.h>
> > > + #include <linux/const.h>
> > > +#endif
> > >
> > > - /*
> > > - * 'kernel.h' contains some often-used function prototypes etc
> > > + #endif /* _UAPI_LINUX_KERNEL_H */
> > > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > > similarity index 80%
> > > rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> > > rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > > index d6a4d5aa61..251d00440d 100644
> > > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> > > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > > @@ -14,6 +14,5 @@ SRC_URI_append = "\
> > >
> > > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> > >
> > > -SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3"
> > > -SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43"
> > > -
> > > +SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4"
> > > +SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9"
> > > --
> > > 2.19.1
> > >
> > >
> > >
> > >
>
>
>
> --
> - 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] 15+ messages in thread* Re: [OE-core] [PATCH 4/8] linux-libc-headers: update to 5.13
2021-07-06 22:01 ` Khem Raj
@ 2021-07-07 5:36 ` Khem Raj
0 siblings, 0 replies; 15+ messages in thread
From: Khem Raj @ 2021-07-07 5:36 UTC (permalink / raw)
To: Bruce Ashfield
Cc: Richard Purdie, Patches and discussions about the oe-core layer
On Tue, Jul 6, 2021 at 3:01 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Tue, Jul 6, 2021 at 11:03 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >
> > On Tue, Jul 6, 2021 at 1:43 PM Khem Raj <raj.khem@gmail.com> wrote:
> > >
> > > Hi Bruce
> > >
> > > On Fri, Jul 2, 2021 at 8:14 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> > > >
> > > > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > >
> > > > Bumping the libc-headers to match the latest OE core reference
> > > > kernel.
> > > >
> > > > We refresh one of the musl patches to udpate to the 5.12+ context of
> > > > the header, but otherwise everything is unchanged.
> > > >
> > >
> > > This is primarily going ok, I see one failure however with keepalived here
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1388
> > >
> >
> > I launched a build for keepalived, I'll see if the issue reproduces here.
> >
> > Were you going to debug, or did you want me to have a look ? (We've
> > both looked at this at the same time in the past, and that's not a
> > great use of time).
> >
> > I'll just start looking at a version bump, since that is the easiest
> > place to start.
>
> thats good. If it does not fail for you, it means its due to glibc
> 2.34 and I can take care of that
>
another failure observed with ltrace/mips
see https://errors.yoctoproject.org/Errors/Details/587409/
> >
> > Bruce
> >
> > >
> > > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > > > ---
> > > > meta/conf/distro/include/tcmode-default.inc | 2 +-
> > > > ...3-remove-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 ++++++------
> > > > ...bc-headers_5.10.bb => linux-libc-headers_5.13.bb} | 5 ++---
> > > > 3 files changed, 9 insertions(+), 10 deletions(-)
> > > > rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.10.bb => linux-libc-headers_5.13.bb} (80%)
> > > >
> > > > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> > > > index c6e5ac61d7..68e5d848ba 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.36%"
> > > > GDBVERSION ?= "10.%"
> > > > GLIBCVERSION ?= "2.33"
> > > > -LINUXLIBCVERSION ?= "5.10%"
> > > > +LINUXLIBCVERSION ?= "5.13%"
> > > > QEMUVERSION ?= "6.0%"
> > > > GOVERSION ?= "1.16%"
> > > > # This can not use wildcards like 8.0.% since it is also used in mesa to denote
> > > > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > > > index b5c4e1750e..b0e7014138 100644
> > > > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > > > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
> > > > @@ -13,17 +13,17 @@ Upstream-Status: Submitted
> > > > include/uapi/linux/kernel.h | 2 ++
> > > > 1 file changed, 2 insertions(+)
> > > >
> > > > -Index: linux-4.8-rc4/include/uapi/linux/kernel.h
> > > > +Index: linux-5.12.11/include/uapi/linux/kernel.h
> > > > ===================================================================
> > > > ---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
> > > > -+++ linux-4.8-rc4/include/uapi/linux/kernel.h
> > > > -@@ -1,7 +1,9 @@
> > > > +--- linux-5.12.11.orig/include/uapi/linux/kernel.h
> > > > ++++ linux-5.12.11/include/uapi/linux/kernel.h
> > > > +@@ -2,7 +2,9 @@
> > > > #ifndef _UAPI_LINUX_KERNEL_H
> > > > #define _UAPI_LINUX_KERNEL_H
> > > >
> > > > +#ifdef __GLIBC__
> > > > #include <linux/sysinfo.h>
> > > > + #include <linux/const.h>
> > > > +#endif
> > > >
> > > > - /*
> > > > - * 'kernel.h' contains some often-used function prototypes etc
> > > > + #endif /* _UAPI_LINUX_KERNEL_H */
> > > > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > > > similarity index 80%
> > > > rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> > > > rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > > > index d6a4d5aa61..251d00440d 100644
> > > > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb
> > > > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
> > > > @@ -14,6 +14,5 @@ SRC_URI_append = "\
> > > >
> > > > LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> > > >
> > > > -SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3"
> > > > -SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43"
> > > > -
> > > > +SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4"
> > > > +SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9"
> > > > --
> > > > 2.19.1
> > > >
> > > >
> > > >
> > > >
> >
> >
> >
> > --
> > - 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] 15+ messages in thread
* [PATCH 5/8] kernel-devsrc: fix scripts/prepare for ARM64
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
` (3 preceding siblings ...)
2021-07-02 15:13 ` [PATCH 4/8] linux-libc-headers: update to 5.13 Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-02 15:13 ` [PATCH 6/8] kernel-devsrc: fix scripts prepare for powerpc Bruce Ashfield
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
There are two new tools in 5.13+ required for on target
recreation of the build environment.
We conditionally add them to the devsrc recipe to support
both 5.13 and older kernels.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 84e99233e6..b1837b3a51 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -163,6 +163,14 @@ do_install() {
cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/
cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || :
+
+ # 5.13+ needs these tools
+ cp -a --parents arch/arm64/tools/gen-cpucaps.awk $kerneldir/build/ 2>/dev/null || :
+ cp -a --parents arch/arm64/tools/cpucaps $kerneldir/build/ 2>/dev/null || :
+
+ if [ -e $kerneldir/build/arch/arm64/tools/gen-cpucaps.awk ]; then
+ sed -i -e "s,#!.*awk.*,#!${USRBINPATH}/env awk," $kerneldir/build/arch/arm64/tools/gen-cpucaps.awk
+ fi
fi
if [ "${ARCH}" = "powerpc" ]; then
@@ -307,3 +315,5 @@ RDEPENDS_${PN} += "openssl-dev util-linux"
RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}"
# 5.8+ needs gcc-plugins libmpc-dev
RDEPENDS_${PN} += "gcc-plugins libmpc-dev"
+# 5.13+ needs awk for arm64
+RDEPENDS_${PN}_append_aarch64 = " gawk"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/8] kernel-devsrc: fix scripts prepare for powerpc
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
` (4 preceding siblings ...)
2021-07-02 15:13 ` [PATCH 5/8] kernel-devsrc: fix scripts/prepare for ARM64 Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-02 15:13 ` [PATCH 7/8] kernel-devsrc: powerpc64 add scripts prepare support Bruce Ashfield
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
5.13 introduces some new tweaks required to get on target scripts
and prepare working for powerpc:
- 'nm' is detected as 'nm --synthetic', so we adjust our replacement
- more vdso is required on target, so we copy those files (like arm64
does)
- grep is required during processing, so we add it to the redpends
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index b1837b3a51..92076ac8b0 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -112,6 +112,9 @@ do_install() {
if [ "${ARCH}" = "arm64" ]; then
cp -a --parents arch/arm64/kernel/vdso/vdso.lds $kerneldir/build/
fi
+ if [ "${ARCH}" = "powerpc" ]; then
+ cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || :
+ fi
cp -a include $kerneldir/build/include
@@ -178,6 +181,7 @@ do_install() {
cp -a --parents arch/${ARCH}/kernel/syscalls/syscall.tbl $kerneldir/build/ 2>/dev/null || :
cp -a --parents arch/${ARCH}/kernel/syscalls/syscalltbl.sh $kerneldir/build/ 2>/dev/null || :
cp -a --parents arch/${ARCH}/kernel/syscalls/syscallhdr.sh $kerneldir/build/ 2>/dev/null || :
+ cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || :
fi
# include the machine specific headers for ARM variants, if available.
@@ -281,7 +285,11 @@ do_install() {
sed -i 's/ifneq "$(LD)" ".*-linux-.*ld.bfd.*$/ifneq "$(LD)" "ld"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(AR)" ".*-linux-.*ar.*$/ifneq "$(AR)" "ar"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(OBJCOPY)" ".*-linux-.*objcopy.*$/ifneq "$(OBJCOPY)" "objcopy"/' "$kerneldir/build/include/config/auto.conf.cmd"
- sed -i 's/ifneq "$(NM)" ".*-linux-.*nm.*$/ifneq "$(NM)" "nm"/' "$kerneldir/build/include/config/auto.conf.cmd"
+ if [ "${ARCH}" = "powerpc" ]; then
+ sed -i 's/ifneq "$(NM)" ".*-linux-.*nm.*$/ifneq "$(NM)" "nm --synthetic"/' "$kerneldir/build/include/config/auto.conf.cmd"
+ else
+ sed -i 's/ifneq "$(NM)" ".*-linux-.*nm.*$/ifneq "$(NM)" "nm"/' "$kerneldir/build/include/config/auto.conf.cmd"
+ fi
sed -i 's/ifneq "$(HOSTCXX)" ".*$/ifneq "$(HOSTCXX)" "g++"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(HOSTCC)" ".*$/ifneq "$(HOSTCC)" "gcc"/' "$kerneldir/build/include/config/auto.conf.cmd"
sed -i 's/ifneq "$(CC_VERSION_TEXT)".*\(gcc.*\)"/ifneq "$(CC_VERSION_TEXT)" "\1"/' "$kerneldir/build/include/config/auto.conf.cmd"
@@ -317,3 +325,5 @@ RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}"
RDEPENDS_${PN} += "gcc-plugins libmpc-dev"
# 5.13+ needs awk for arm64
RDEPENDS_${PN}_append_aarch64 = " gawk"
+# 5.13+ needs grep for powerpc
+RDEPENDS_${PN}_append_powerpc = " grep"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 7/8] kernel-devsrc: powerpc64 add scripts prepare support
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
` (5 preceding siblings ...)
2021-07-02 15:13 ` [PATCH 6/8] kernel-devsrc: fix scripts prepare for powerpc Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-02 15:13 ` [PATCH 8/8] linux-yocto: introduce 5.13 recipes Bruce Ashfield
2021-07-03 22:02 ` [PATCH 0/8] linux-yocto: consolidated pull request Richard Purdie
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Similar to 32bit powerpc, we need more vdso bits in devsrc to
support on target scripts prepare for powerpc64.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 92076ac8b0..21b42833ba 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -114,6 +114,7 @@ do_install() {
fi
if [ "${ARCH}" = "powerpc" ]; then
cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || :
+ cp -a --parents arch/powerpc/kernel/vdso64/vdso64.lds $kerneldir/build 2>/dev/null || :
fi
cp -a include $kerneldir/build/include
@@ -182,6 +183,7 @@ do_install() {
cp -a --parents arch/${ARCH}/kernel/syscalls/syscalltbl.sh $kerneldir/build/ 2>/dev/null || :
cp -a --parents arch/${ARCH}/kernel/syscalls/syscallhdr.sh $kerneldir/build/ 2>/dev/null || :
cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || :
+ cp -a --parents arch/${ARCH}/kernel/vdso64/* $kerneldir/build/ 2>/dev/null || :
fi
# include the machine specific headers for ARM variants, if available.
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 8/8] linux-yocto: introduce 5.13 recipes
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
` (6 preceding siblings ...)
2021-07-02 15:13 ` [PATCH 7/8] kernel-devsrc: powerpc64 add scripts prepare support Bruce Ashfield
@ 2021-07-02 15:13 ` Bruce Ashfield
2021-07-03 22:02 ` [PATCH 0/8] linux-yocto: consolidated pull request Richard Purdie
8 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-02 15:13 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
5.13 will be the next release/reference kernel (matched with a
libc-headers version bump), this commit creates the recipes, but
does not make it the default kernel (yet).
This has been built and booted on all supported qemu platforms,
as well as with musl and glibc based userspace stacks. Full
core-image-kernel-dev, sato and minimal images have been
tested and show no obvous issues (either locally or on the
autobuilder).
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../linux/linux-yocto-rt_5.13.bb | 45 ++++++++++++++
.../linux/linux-yocto-tiny_5.13.bb | 32 ++++++++++
meta/recipes-kernel/linux/linux-yocto_5.13.bb | 58 +++++++++++++++++++
3 files changed, 135 insertions(+)
create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.13.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb
new file mode 100644
index 0000000000..f87ab6bcfd
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb
@@ -0,0 +1,45 @@
+KBRANCH ?= "v5.13/standard/preempt-rt/base"
+
+require recipes-kernel/linux/linux-yocto.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 ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_meta ?= "ceb5fa598d08902fe2934c041875aa92d9a6fa19"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}"
+
+LINUX_VERSION ?= "5.13"
+
+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_5.13.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb
new file mode 100644
index 0000000000..f01133c761
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb
@@ -0,0 +1,32 @@
+KBRANCH ?= "v5.13/standard/tiny/base"
+KBRANCH_qemuarm ?= "v5.13/standard/tiny/arm-versatile-926ejs"
+
+LINUX_KERNEL_TYPE = "tiny"
+KCONFIG_MODE = "--allnoconfig"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+LINUX_VERSION ?= "5.13"
+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_qemuarm ?= "84e5292c5adf2e715e842a9eb3985034941e0798"
+SRCREV_machine ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_meta ?= "ceb5fa598d08902fe2934c041875aa92d9a6fa19"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}"
+
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
+
+# Functionality flags
+KERNEL_FEATURES = ""
+
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.13.bb b/meta/recipes-kernel/linux/linux-yocto_5.13.bb
new file mode 100644
index 0000000000..66384d8f7d
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto_5.13.bb
@@ -0,0 +1,58 @@
+KBRANCH ?= "v5.13/standard/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# board specific branches
+KBRANCH_qemuarm ?= "v5.13/standard/arm-versatile-926ejs"
+KBRANCH_qemuarm64 ?= "v5.13/standard/qemuarm64"
+KBRANCH_qemumips ?= "v5.13/standard/mti-malta32"
+KBRANCH_qemuppc ?= "v5.13/standard/qemuppc"
+KBRANCH_qemuriscv64 ?= "v5.13/standard/base"
+KBRANCH_qemuriscv32 ?= "v5.13/standard/base"
+KBRANCH_qemux86 ?= "v5.13/standard/base"
+KBRANCH_qemux86-64 ?= "v5.13/standard/base"
+KBRANCH_qemumips64 ?= "v5.13/standard/mti-malta64"
+
+SRCREV_machine_qemuarm ?= "9c2fd4b59ebf57f1900f82d49d6bf4fe074cf818"
+SRCREV_machine_qemuarm64 ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_machine_qemumips ?= "1ea414ef9e3a9744ec09f7ecebcc3b9aeffe39d0"
+SRCREV_machine_qemuppc ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_machine_qemuriscv64 ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_machine_qemuriscv32 ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_machine_qemux86 ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_machine_qemux86-64 ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_machine_qemumips64 ?= "b74fe3dcca0653609fcb75aad883b1db07619081"
+SRCREV_machine ?= "b1cead8d98582ca687f93e06438543b97144e5bf"
+SRCREV_meta ?= "ceb5fa598d08902fe2934c041875aa92d9a6fa19"
+
+# remap qemuarm to qemuarma15 for the 5.8 kernel
+# KMACHINE_qemuarm ?= "qemuarma15"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+LINUX_VERSION ?= "5.13"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+DEPENDS += "gmp-native"
+
+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"
+
+# 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"
+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)}"
--
2.19.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 0/8] linux-yocto: consolidated pull request
2021-07-02 15:13 [PATCH 0/8] linux-yocto: consolidated pull request Bruce Ashfield
` (7 preceding siblings ...)
2021-07-02 15:13 ` [PATCH 8/8] linux-yocto: introduce 5.13 recipes Bruce Ashfield
@ 2021-07-03 22:02 ` Richard Purdie
2021-07-04 2:43 ` Bruce Ashfield
8 siblings, 1 reply; 15+ messages in thread
From: Richard Purdie @ 2021-07-03 22:02 UTC (permalink / raw)
To: bruce.ashfield; +Cc: openembedded-core, Alexandre Belloni
Hi Bruce,
On Fri, 2021-07-02 at 11:13 -0400, bruce.ashfield@gmail.com wrote:
> Here's the next consolidated pull request. It has two normal -stable updates
> for 5.10 and 5.4, as well as the first steps in bringing 5.13 in as the
> reference kernel (and then dropping 5.4 from master).
>
> I've built and booted 5.13 as the default for qemu*, as well as building it
> against both musl and glibc with the 5.13 libc-headers. I didn't run into
> any issues, and neither did my AB runs (I'd like to think it is all the
> other patches that have been sent as linux-yocto-dev moved foward that made
> this relatively few patches now).
>
> I've also ensured that AB intermittent fixes are in place for 5.13, so it
> is safe from that point of vew as well. Folks without exlcit versions set,
> will get 5.13, but it is already sane and fit for that purpose.
>
> Obviously you can pick and chose what you need from this if there are issues,
> and I'm around to trouble shoot anything that pops up.
Thanks for this. In general it looks good, there is just one failure worrying
me a bit:
https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/425
which in diffoscope speak is:
http://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210702-c3hu90kc/packages/diff-html/
You may wonder what this pull request has to do with a gcc-sanitisers failure?
If you don't speak dwarfish or elvish, it means that perf_branch_sample_type_shift
was declared on line 162 in one build and 182 in another. I wondered about a
bit flip however it is two bits and linux/perf_events.h has
perf_branch_sample_type_shift at line number 162 in 5.10 and 182 is 5.13 and that
file comes from linux-libc-headers. The logical conclusion is that one was built
with one header and the other, from the other header. Why/how this could happen
I simply don't know. The problem build came from sstate so there is no real
audit trail to follow :(.
I'm not sure this blocks the pull request as the issue is probably somewhere else
and this just exposed it but any ideas on what happened are very welcome...
Cheers,
Richard
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 0/8] linux-yocto: consolidated pull request
2021-07-03 22:02 ` [PATCH 0/8] linux-yocto: consolidated pull request Richard Purdie
@ 2021-07-04 2:43 ` Bruce Ashfield
0 siblings, 0 replies; 15+ messages in thread
From: Bruce Ashfield @ 2021-07-04 2:43 UTC (permalink / raw)
To: Richard Purdie
Cc: Patches and discussions about the oe-core layer, Alexandre Belloni
On Sat, Jul 3, 2021 at 6:02 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Hi Bruce,
>
> On Fri, 2021-07-02 at 11:13 -0400, bruce.ashfield@gmail.com wrote:
> > Here's the next consolidated pull request. It has two normal -stable updates
> > for 5.10 and 5.4, as well as the first steps in bringing 5.13 in as the
> > reference kernel (and then dropping 5.4 from master).
> >
> > I've built and booted 5.13 as the default for qemu*, as well as building it
> > against both musl and glibc with the 5.13 libc-headers. I didn't run into
> > any issues, and neither did my AB runs (I'd like to think it is all the
> > other patches that have been sent as linux-yocto-dev moved foward that made
> > this relatively few patches now).
> >
> > I've also ensured that AB intermittent fixes are in place for 5.13, so it
> > is safe from that point of vew as well. Folks without exlcit versions set,
> > will get 5.13, but it is already sane and fit for that purpose.
> >
> > Obviously you can pick and chose what you need from this if there are issues,
> > and I'm around to trouble shoot anything that pops up.
>
> Thanks for this. In general it looks good, there is just one failure worrying
> me a bit:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/425
>
> which in diffoscope speak is:
>
> http://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20210702-c3hu90kc/packages/diff-html/
>
> You may wonder what this pull request has to do with a gcc-sanitisers failure?
>
> If you don't speak dwarfish or elvish, it means that perf_branch_sample_type_shift
> was declared on line 162 in one build and 182 in another. I wondered about a
> bit flip however it is two bits and linux/perf_events.h has
> perf_branch_sample_type_shift at line number 162 in 5.10 and 182 is 5.13 and that
> file comes from linux-libc-headers. The logical conclusion is that one was built
> with one header and the other, from the other header. Why/how this could happen
> I simply don't know. The problem build came from sstate so there is no real
> audit trail to follow :(.
I've done multiple header fixups with perf and libc-headers disagreeing, due to
captured copies being different from the uapi.
This is likely a variant of that.
... that being said, I've never seen anything that varied between
builds. It either
broke or it didn't.
This is libc-headers 5.13 and the 5.10 perf ?
Bruce
>
> I'm not sure this blocks the pull request as the issue is probably somewhere else
> and this just exposed it but any ideas on what happened are very welcome...
>
> Cheers,
>
> Richard
>
>
>
--
- 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] 15+ messages in thread