Thanks Martin and Mike for your explanations and tips.

So, I've done a lot of testing today and it seems I simplified the
example in my first email a bit too much. The example as-is works fine
when switching DISTROs as far as I can tell. The problem only arises
when wildcards are used.

Changing my initial example like this should trigger the behaviour I've
initially described:

SRC_URI:append:mydistro-dev = " file://application-dbg.service"

do_install {
# ...snip...
# systemd service
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir}
}

do_install:append:mydistro-dev() {
# debug systemd services
install -d ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/application-dbg.service
${D}${systemd_system_unitdir}
}

Notice the *.service in do_install.

From my testing, this is how contamination happens:

1) Build with 'DISTRO=mydistro bitbake application'. All tasks for the
recipe are run and the directories in WORKDIR are populated, including
the "application.service" file.
2) Build with 'DISTRO=mydistro-dev bitbake application'. do_unpack is
rerun and places the additional "application-dbg.service" file in
WORKDIR.
3) Switching back to 'mydistro' will get the recipe from sstate cache,
which works fine.
4) Changing application.bb and rebuilding with 'DISTRO=mydistro bitbake
application' reruns do_install (as expected). This leads to the
packages do_install picking up the additional "application-dbg.service"
file left behind by the invocation in step 2).

Mike, Martin: Do you remember in which cases you encountered problems
when sharing the build directory?

On Tue, 2022-07-12 at 09:15 -0700, Khoi Dinh Trinh wrote:

Thank you Nicolas for asking this question since I will probably run
into this issue soon if not for this email thread. The answers so far
have been very helpful but I just want to clarify a bit more on why
doesn't the package get rebuilt? From my understanding, Yocto should
rerun a task when the signature of the task changes and since
do_install has an override on mydistro-dev, shouldn't the content and
thus the signature of do_install change when switching distro and so
Yocto should rerun it?

As far as I can tell, all the relevant tasks are rerun correctly when
something is changed. Relevant tasks meaning only the tasks that are
actually different.

The specific issue I experienced is due to the WORKDIR not being
cleaned between different task invocations and the recipe (probably
wrongfully) relying on wildcards to gather files, see example above.

I have a lot of tasks with override not just on DISTRO but other
things like MACHINE or custom variables so I want to understand the
rebuild mechanism as best I can.

There's surely someone more knowledgeable here that could clarify the
inner workings of this mechanism a lot better than me.

Best,
Khoi Trinh

On Tue, Jul 12, 2022 at 8:05 AM Mike Looijmans
<mike.looijmans@...> wrote:

Quick answer: Don't build multiple distros in one build directory.

It's really a bummer that it's not reliably possible to switch between
DISTROs inside one build directory.

You might get away with setting TMPDIR = "tmp-${DISTRO}" to give
each
its own.

But I'd rather advice to set up two separate builds and just point
the
downloads and sstate-cache to the same location. It'll be faster
than
the TMPDIR option.

Or figure out how to put the difference in the IMAGE only. Then you
can
just build both images (in parallel, woot), which is faster, more
convenient and saves on diskspace.

As I'm currently working with something close to what you describe, I
think I'll try to stay away from multiple DISTROs if possible and
improve on what I'm already doing.

What I often do is have my-application.bb generate a
my-application-utils package that only gets installed in the "dev"
image
but not in the production one, which only installs "my-
application".

This is probably what Martin meant with his A.bb and A-xx.bb example.
It's so far one of the best approaches I've seen, thanks.

You could also create a "my-application-dev.bb" recipe that
includes
my-application.bb and just changes what it needs to be different.




Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@...
W: www.topic.nl

Please consider the environment before printing this e-mail
On 12-07-2022 15:37, Nicolas Jeker via lists.yoctoproject.org
wrote:

Hi all,

I'm currently using an additional layer and image to
differentiate
between a release and development build (enabling NFS, SSH, root
login,
etc.). To create a development build, I manually add the layer to
bblayers.conf. This works quite well, but feels a bit clumsy to
integrate into a CI/CD pipeline.

Per these past discussions here [1][2], I'm now trying to migrate
to
multiple DISTROs, something like "mydistro" and "mydistro-dev".

While migrating some of the changes, I discovered that I run into
caching(?) issues. I have a recipe for an internal application
and want
to include additional systemd service files in the development
image.

What I did was this:

Added "application-dbg.service" to recipes-
internal/application/files

Adapted application.bb recipe:

SRC_URI:append:mydistro-dev = " file://application-dbg.service"

do_install {
      # ...snip...
      # systemd service
      install -d ${D}${systemd_system_unitdir}
      install -m 0644 ${WORKDIR}/application.service
${D}${systemd_system_unitdir}
}

do_install:append:mydistro-dev() {
      # debug systemd services
      install -d ${D}${systemd_system_unitdir}
      install -m 0644 ${WORKDIR}/application-dbg.service
${D}${systemd_system_unitdir}
}


When I run "DISTRO=mydistro-dev bitbake application" followed by
"DISTRO=mydistro bitbake application", the debug service file is
still
present in the package. This seems to be caused by the "image"
directory in the recipe WORKDIR not being cleaned between
subsequent
do_install runs. Is this expected behaviour? What's the best
solution?

Kind regards,
Nicolas

[1]:
https://lore.kernel.org/yocto/CAH9dsRiArf_9GgQS4hCg5=J_Jk6cd3eiGaOiQd788+iSLTuU+g@mail.gmail.com/
[2]:
https://lore.kernel.org/yocto/VI1PR0602MB3549F83AC93A53785DE48677D3FD9@VI1PR0602MB3549.eurprd06.prod.outlook.com/

--
Mike Looijmans

Hello Alexander

I am putting some of lines of qemu output of nographic here .

[ 0.053290] ACPI: INT_SRC_OVR (bus 0 bus_irq 10 global_irq 10 high level)
[ 0.053300] ACPI: INT_SRC_OVR (bus 0 bus_irq 11 global_irq 11 high level)
[ 0.053495] Using ACPI (MADT) for SMP configuration information
[ 0.053544] ACPI: HPET id: 0x8086a201 base: 0xfed00000
[ 0.053830] smpboot: Allowing 1 CPUs, 0 hotplug CPUs
[ 0.054483] [mem 0x10000000-0xfffbffff] available for PCI devices
[ 0.054526] Booting paravirtualized kernel on bare hardware
[ 0.054875] clocksource: refined-jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 1910s
[ 0.055308] setup_percpu: NR_CPUS:64 nr_cpumask_bits:64 nr_cpu_ids:1 nr_node_ids:1
[ 0.066824] percpu: Embedded 56 pages/cpu s191384 r8192 d29800 u2097152
[ 0.068969] Built 1 zonelists, mobility grouping on. Total pages: 64356
[ 0.069155] Kernel command line: root=/dev/vda rw console=ttyS0 mem=256M ip=192.168.7.2::192.168.7.
[ 0.135277] Dentry cache hash table entries: 32768 (order: 6, 262144 bytes, linear)
[ 0.135665] Inode-cache hash table entries: 16384 (order: 5, 131072 bytes, linear)
[ 0.137117] mem auto-init: stack:off, heap alloc:off, heap free:off
[ 0.140409] Memory: 232140K/261604K available (14340K kernel code, 1407K rwdata, 3196K rodata, 1612K)
[ 0.152763] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=1, Nodes=1
[ 0.153835] Kernel/User page tables isolation: enabled
[ 0.155757] ftrace: allocating 41816 entries in 164 pages
[ 0.232233] rcu: Preemptible hierarchical RCU implementation.
[ 0.232365] rcu: RCU restricting CPUs from NR_CPUS=64 to nr_cpu_ids=1.
[ 0.232452] Tasks RCU enabled.
[ 0.232526] rcu: RCU calculated value of scheduler-enlistment delay is 100 jiffies.
[ 0.232562] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=1
[ 0.253797] NR_IRQS: 4352, nr_irqs: 256, preallocated irqs: 16
[ 0.263911] random: get_random_bytes called from start_kernel+0x325/0x4db with crng_init=0
[ 0.268071] Console: colour VGA+ 80x25
[ 0.310885] printk: console [ttyS0] enabled
[ 0.314617] ACPI: Core revision 20190816
[ 0.323461] clocksource: hpet: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604467 ns
[ 0.331315] APIC: Switch to symmetric I/O mode setup
[ 0.375864] ..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1
[ 0.381414] clocksource: tsc-early: mask: 0xffffffffffffffff max_cycles: 0x185aca918fe, max_idle_ns:s
[ 0.383024] Calibrating delay loop (skipped), value calculated using timer frequency.. 3379.20 BogoM)
[ 0.385009] pid_max: default: 32768 minimum: 301
[ 0.386726] LSM: Security Framework initializing
[ 0.388807] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
[ 0.388944] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear)
[ 0.415798] process: using mwait in idle threads
[ 0.416144] Last level iTLB entries: 4KB 0, 2MB 0, 4MB 0
[ 0.416930] Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
[ 0.418102] Spectre V1 : Mitigation: usercopy/swapgs barriers and __user pointer sanitization
[ 0.419029] Spectre V2 : Mitigation: Retpolines
[ 0.419928] Spectre V2 : Spectre v2 / SpectreRSB mitigation: Filling RSB on context switch
[ 0.420958] Speculative Store Bypass: Vulnerable
[ 0.421698] MDS: Vulnerable: Clear CPU buffers attempted, no microcode
[ 0.626147] random: fast init done
[ 0.772307] Freeing SMP alternatives memory: 44K
[ 0.879347] smpboot: CPU0: Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz (family: 0x6, model: 0xf,)
[ 0.887084] Performance Events: unsupported p6 CPU model 15 no PMU driver, software events only.
[ 0.889602] rcu: Hierarchical SRCU implementation.
[ 0.894836] smp: Bringing up secondary CPUs ...
[ 0.894970] smp: Brought up 1 node, 1 CPU
[ 0.895954] smpboot: Max logical packages: 1
[ 0.896451] smpboot: Total of 1 processors activated (3379.20 BogoMIPS)
[ 0.909320] devtmpfs: initialized
[ 0.921047] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 191126044627s
[ 0.922081] futex hash table entries: 256 (order: 2, 16384 bytes, linear)
[ 0.924750] xor: measuring software checksum speed
[ 0.935030] prefetch64-sse: 2032.000 MB/sec
[ 0.945932] generic_sse: 2136.000 MB/sec
[ 0.946519] xor: using function: generic_sse (2136.000 MB/sec)
[ 0.947198] pinctrl core: initialized pinctrl subsystem
[ 0.955770] NET: Registered protocol family 16
[ 0.966246] cpuidle: using governor menu
[ 0.967806] ACPI: bus type PCI registered
[ 0.970419] PCI: Using configuration type 1 for base access
[ 1.026186] raid6: sse2x4 gen() 492 MB/s
[ 1.044095] raid6: sse2x4 xor() 261 MB/s
[ 1.061027] raid6: sse2x2 gen() 523 MB/s
[ 1.078256] raid6: sse2x2 xor() 259 MB/s
[ 1.096030] raid6: sse2x1 gen() 425 MB/s
[ 1.113986] raid6: sse2x1 xor() 246 MB/s
[ 1.114936] raid6: using algorithm sse2x2 gen() 523 MB/s
[ 1.115975] raid6: .... xor() 259 MB/s, rmw enabled
[ 1.117147] raid6: using ssse3x2 recovery algorithm
[ 1.119767] ACPI: Added _OSI(Module Device)
[ 1.119947] ACPI: Added _OSI(Processor Device)
[ 1.120422] ACPI: Added _OSI(3.0 _SCP Extensions)
[ 1.120918] ACPI: Added _OSI(Processor Aggregator Device)
[ 1.122005] ACPI: Added _OSI(Linux-Dell-Video)
[ 1.122506] ACPI: Added _OSI(Linux-Lenovo-NV-HDMI-Audio)
[ 1.122922] ACPI: Added _OSI(Linux-HPI-Hybrid-Graphics)
[ 1.140652] ACPI: 1 ACPI AML tables successfully acquired and loaded
[ 1.161811] ACPI: Interpreter enabled
[ 1.163464] ACPI: (supports S0 S3 S5)
[ 1.163979] ACPI: Using IOAPIC for interrupt routing
[ 1.165261] PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug
[ 1.167766] ACPI: Enabled 2 GPEs in block 00 to 0F
[ 1.207391] ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])
[ 1.208367] acpi PNP0A03:00: _OSC: OS supports [ASPM ClockPM Segments MSI HPX-Type3]
[ 1.210180] acpi PNP0A03:00: fail to add MMCONFIG information, can't access extended PCI configurati.
[ 1.214285] PCI host bridge to bus 0000:00
[ 1.215024] pci_bus 0000:00: root bus resource [io 0x0000-0x0cf7 window]
[ 1.215968] pci_bus 0000:00: root bus resource [io 0x0d00-0xffff window]
[ 1.216981] pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000bffff window]
[ 1.217926] pci_bus 0000:00: root bus resource [mem 0x10000000-0xfebfffff window]
[ 1.218920] pci_bus 0000:00: root bus resource [mem 0x100000000-0x17fffffff window]
[ 1.220119] pci_bus 0000:00: root bus resource [bus 00-ff]
[ 1.228162] pci 0000:00:01.1: [8086:7010] type 00 class 0x010180
[ 1.233048] pci 0000:00:01.1: reg 0x20: [io 0xc0e0-0xc0ef]
[ 1.234367] pci 0000:00:01.1: legacy IDE quirk: reg 0x10: [io 0x01f0-0x01f7]
[ 1.235947] pci 0000:00:01.1: legacy IDE quirk: reg 0x14: [io 0x03f6]
[ 1.236934] pci 0000:00:01.1: legacy IDE quirk: reg 0x18: [io 0x0170-0x0177]
[ 1.237717] pci 0000:00:01.1: legacy IDE quirk: reg 0x1c: [io 0x0376]
[ 1.239483] pci 0000:00:01.2: [8086:7020] type 00 class 0x0c0300
[ 1.241609] pci 0000:00:01.2: reg 0x20: [io 0xc080-0xc09f]
[ 1.245137] pci 0000:00:01.3: [8086:7113] type 00 class 0x068000
[ 1.246990] pci 0000:00:01.3: quirk: [io 0x0600-0x063f] claimed by PIIX4 ACPI
[ 1.248982] pci 0000:00:01.3: quirk: [io 0x0700-0x070f] claimed by PIIX4 SMB
[ 1.250849] pci 0000:00:02.0: [1234:1111] type 00 class 0x030000
[ 1.252532] pci 0000:00:02.0: reg 0x10: [mem 0xfd000000-0xfdffffff pref]
[ 1.254439] pci 0000:00:02.0: reg 0x18: [mem 0xfebd0000-0xfebd0fff]
[ 1.259319] pci 0000:00:02.0: reg 0x30: [mem 0xfebc0000-0xfebcffff pref]
[ 1.261511] pci 0000:00:03.0: [1af4:1000] type 00 class 0x020000
[ 1.262963] pci 0000:00:03.0: reg 0x10: [io 0xc0a0-0xc0bf]
[ 1.264399] pci 0000:00:03.0: reg 0x14: [mem 0xfebd1000-0xfebd1fff]
[ 1.267584] pci 0000:00:03.0: reg 0x20: [mem 0xfe000000-0xfe003fff 64bit pref]
[ 1.269382] pci 0000:00:03.0: reg 0x30: [mem 0xfeb80000-0xfebbffff pref]
[ 1.271515] pci 0000:00:04.0: [1af4:1005] type 00 class 0x00ff00
[ 1.273410] pci 0000:00:04.0: reg 0x10: [io 0xc0c0-0xc0df]
[ 1.276581] pci 0000:00:04.0: reg 0x20: [mem 0xfe004000-0xfe007fff 64bit pref]
[ 1.278443] pci 0000:00:05.0: [1af4:1001] type 00 class 0x010000
[ 1.279958] pci 0000:00:05.0: reg 0x10: [io 0xc000-0xc07f]
[ 1.281211] pci 0000:00:05.0: reg 0x14: [mem 0xfebd2000-0xfebd2fff]
[ 1.284515] pci 0000:00:05.0: reg 0x20: [mem 0xfe008000-0xfe00bfff 64bit pref]
[ 1.294292] ACPI: PCI Interrupt Link [LNKA] (IRQs 5 *10 11)
[ 1.295942] ACPI: PCI Interrupt Link [LNKB] (IRQs 5 *10 11)
[ 1.297224] ACPI: PCI Interrupt Link [LNKC] (IRQs 5 10 *11)
[ 1.298272] ACPI: PCI Interrupt Link [LNKD] (IRQs 5 10 *11)
[ 1.299118] ACPI: PCI Interrupt Link [LNKS] (IRQs *9)
[ 1.305368] pci 0000:00:02.0: vgaarb: setting as boot VGA device
[ 1.305905] pci 0000:00:02.0: vgaarb: VGA device added: decodes=io+mem,owns=io+mem,locks=none
[ 1.305970] pci 0000:00:02.0: vgaarb: bridge control possible
[ 1.306637] vgaarb: loaded
[ 1.308290] SCSI subsystem initialized
[ 1.309565] ACPI: bus type USB registered
[ 1.310261] usbcore: registered new interface driver usbfs
[ 1.311172] usbcore: registered new interface driver hub
[ 1.311974] usbcore: registered new device driver usb
[ 1.314504] pps_core: LinuxPPS API ver. 1 registered
[ 1.314975] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@...>
[ 1.316037] PTP clock support registered
[ 1.318393] PCI: Using ACPI for IRQ routing
[ 1.332774] Bluetooth: Core ver 2.22
[ 1.333104] NET: Registered protocol family 31
[ 1.333949] Bluetooth: HCI device and connection manager initialized
[ 1.335055] Bluetooth: HCI socket layer initialized
[ 1.335724] Bluetooth: L2CAP socket layer initialized
[ 1.336097] Bluetooth: SCO socket layer initialized
[ 1.340083] hpet: 3 channels of 0 reserved for per-cpu timers
[ 1.341256] hpet0: at MMIO 0xfed00000, IRQs 2, 8, 0
[ 1.342941] hpet0: 3 comparators, 64-bit 100.000000 MHz counter
[ 1.349759] clocksource: Switched to clocksource tsc-early
[ 1.783492] pnp: PnP ACPI init
[ 1.789182] pnp: PnP ACPI: found 7 devices
[ 1.807251] thermal_sys: Registered thermal governor 'step_wise'
[ 1.807387] thermal_sys: Registered thermal governor 'user_space'
[ 1.824442] clocksource: acpi_pm: mask: 0xffffff max_cycles: 0xffffff, max_idle_ns: 2085701024 ns
[ 1.828445] pci_bus 0000:00: resource 4 [io 0x0000-0x0cf7 window]
[ 1.830071] pci_bus 0000:00: resource 5 [io 0x0d00-0xffff window]
[ 1.832002] pci_bus 0000:00: resource 6 [mem 0x000a0000-0x000bffff window]
[ 1.833410] pci_bus 0000:00: resource 7 [mem 0x10000000-0xfebfffff window]
[ 1.834741] pci_bus 0000:00: resource 8 [mem 0x100000000-0x17fffffff window]
[ 1.837537] NET: Registered protocol family 2
[ 1.839729] IP idents hash table entries: 4096 (order: 3, 32768 bytes, linear)
[ 1.865735] tcp_listen_portaddr_hash hash table entries: 256 (order: 0, 4096 bytes, linear)
[ 1.867608] TCP established hash table entries: 2048 (order: 2, 16384 bytes, linear)
[ 1.868746] TCP bind hash table entries: 2048 (order: 3, 32768 bytes, linear)
[ 1.869797] TCP: Hash tables configured (established 2048 bind 2048)
[ 1.883744] UDP hash table entries: 256 (order: 1, 8192 bytes, linear)
[ 1.884827] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes, linear)
[ 1.888819] NET: Registered protocol family 1
[ 1.893298] RPC: Registered named UNIX socket transport module.
[ 1.894880] RPC: Registered udp transport module.
[ 1.895821] RPC: Registered tcp transport module.
[ 1.896792] RPC: Registered tcp NFSv4.1 backchannel transport module.
[ 1.898265] pci 0000:00:01.0: PIIX3: Enabling Passive Release
[ 1.899583] pci 0000:00:00.0: Limiting direct PCI/PCI transfers
[ 1.901234] pci 0000:00:01.0: Activating ISA DMA hang workarounds
[ 1.914435] pci 0000:00:01.0: quirk_isa_dma_hangs+0x0/0x20 took 12838 usecs
[ 2.135341] PCI Interrupt Link [LNKD] enabled at IRQ 11
[ 2.341888] pci 0000:00:01.2: quirk_usb_early_handoff+0x0/0x650 took 415769 usecs
[ 2.343275] pci 0000:00:02.0: Video device with shadowed ROM at [mem 0x000c0000-0x000dffff]
[ 2.345068] PCI: CLS 0 bytes, default 64
[ 2.359823] check: Scanning for low memory corruption every 60 seconds
[ 2.364056] Initialise system trusted keyrings
[ 2.365862] workingset: timestamp_bits=46 max_order=16 bucket_order=0
[ 2.393568] NFS: Registering the id_resolver key type
[ 2.394661] Key type id_resolver registered
[ 2.395253] Key type id_legacy registered
[ 2.398828] Key type cifs.idmap registered
[ 2.426560] Key type asymmetric registered
[ 2.427166] Asymmetric key parser 'x509' registered
[ 2.427826] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 251)
[ 2.428763] io scheduler mq-deadline registered
[ 2.429376] io scheduler kyber registered
[ 2.443085] input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input0
[ 2.452480] ACPI: Power Button [PWRF]
[ 2.636339] PCI Interrupt Link [LNKC] enabled at IRQ 10
[ 3.043706] PCI Interrupt Link [LNKA] enabled at IRQ 10
[ 3.046003] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
[ 3.080365] 00:05: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200) is a 16550A
[ 3.115413] 00:06: ttyS1 at I/O 0x2f8 (irq = 3, base_baud = 115200) is a 16550A
[ 3.130219] Linux agpgart interface v0.103
[ 3.132176] bochs-drm 0000:00:02.0: remove_conflicting_pci_framebuffers: bar 0: 0xfd000000 -> 0xfdfff
[ 3.141489] crng init done
3.142481] bochs-drm 0000:00:02.0: remove_conflicting_pci_framebuffers: bar 2: 0xfebd0000 -> 0xfebdf
[ 3.145663] bochs-drm 0000:00:02.0: vgaarb: deactivate vga console
[ 3.147438] Console: switching to colour dummy device 80x25
[ 3.150326] [drm] Found bochs VGA, ID 0xb0c0.
[ 3.150809] [drm] Framebuffer size 16384 kB @ 0xfd000000, mmio @ 0xfebd0000.
[ 3.152273] [TTM] Zone kernel: Available graphics memory: 116092 KiB
[ 3.153052] [TTM] Initializing pool allocator
[ 3.153658] [TTM] Initializing DMA pool allocator
[ 3.157316] [drm] Found EDID data blob.
[ 3.162182] [drm] Initialized bochs-drm 1.0.0 20130925 for 0000:00:02.0 on minor 0
[ 3.200140] fbcon: bochs-drmdrmfb (fb0) is primary device
[ 3.232092] Console: switching to colour frame buffer device 128x48
[ 3.247507] bochs-drm 0000:00:02.0: fb0: bochs-drmdrmfb frame buffer device
[ 3.287157] brd: module loaded
[ 3.338996] loop: module loaded
[ 3.346707] virtio_blk virtio2: [vda] 23994 512-byte logical blocks (12.3 MB/11.7 MiB)
[ 3.389639] Uniform Multi-Platform E-IDE driver
[ 3.390654] piix 0000:00:01.1: IDE controller (0x8086:0x7010 rev 0x00)
[ 3.392365] piix 0000:00:01.1: not 100% native mode: will probe irqs later
[ 3.393854] legacy IDE will be removed in 2021, please switch to libata
[ 3.393854] Report any missing HW support to linux-ide@...
[ 3.396536] ide0: BM-DMA at 0xc0e0-0xc0e7
[ 3.405884] ide1: BM-DMA at 0xc0e8-0xc0ef
[ 3.410281] tsc: Refined TSC clocksource calibration: 1689.599 MHz
[ 3.411557] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x185ac5ca321, max_idle_ns: 44079s
[ 3.413037] clocksource: Switched to clocksource tsc
[ 4.627674] hdc: QEMU DVD-ROM, ATAPI CD/DVD-ROM drive
[ 5.254056] hdc: MWDMA2 mode selected
[ 5.255216] ide0 at 0x1f0-0x1f7,0x3f6 on irq 14
[ 5.255797] ide1 at 0x170-0x177,0x376 on irq 15
[ 5.257637] ide-gd driver 1.18
[ 5.258220] ide-cd driver 5.00
[ 5.261670] ide-cd: hdc: ATAPI 4X DVD-ROM drive, 512kB Cache
[ 5.262259] cdrom: Uniform CD-ROM driver Revision: 3.20
[ 5.325752] e100: Intel(R) PRO/100 Network Driver, 3.5.24-k2-NAPI
[ 5.326801] e100: Copyright(c) 1999-2006 Intel Corporation
[ 5.327565] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
[ 5.328444] e1000: Copyright (c) 1999-2006 Intel Corporation.
[ 5.329179] e1000e: Intel(R) PRO/1000 Network Driver - 3.2.6-k
[ 5.329878] e1000e: Copyright(c) 1999 - 2015 Intel Corporation.
[ 5.330642] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.6.0-k
[ 5.331302] igb: Copyright (c) 2007-2014 Intel Corporation.
[ 5.331892] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
[ 5.332454] ehci-pci: EHCI PCI platform driver
[ 5.333094] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
[ 5.333846] ohci-pci: OHCI PCI platform driver
[ 5.334450] uhci_hcd: USB Universal Host Controller Interface driver
[ 5.485426] uhci_hcd 0000:00:01.2: UHCI Host Controller
[ 5.486339] uhci_hcd 0000:00:01.2: new USB bus registered, assigned bus number 1
[ 5.487652] uhci_hcd 0000:00:01.2: irq 11, io base 0x0000c080
[ 5.493247] hub 1-0:1.0: USB hub found
[ 5.494019] hub 1-0:1.0: 2 ports detected
[ 5.502529] usbcore: registered new interface driver usb-storage
[ 5.503369] usbcore: registered new interface driver usbserial_generic
[ 5.504629] usbserial: USB Serial support registered for generic
[ 5.505283] usbcore: registered new interface driver ftdi_sio
[ 5.505839] usbserial: USB Serial support registered for FTDI USB Serial Device
[ 5.506584] usbcore: registered new interface driver pl2303
[ 5.507128] usbserial: USB Serial support registered for pl2303
[ 5.508227] i8042: PNP: PS/2 Controller [PNP0303:KBD,PNP0f13:MOU] at 0x60,0x64 irq 1,12
[ 5.510883] serio: i8042 KBD port at 0x60,0x64 irq 1
[ 5.511896] serio: i8042 AUX port at 0x60,0x64 irq 12
[ 5.522420] mousedev: PS/2 mouse device common for all mice
[ 5.526890] input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input1
[ 5.528503] rtc_cmos 00:00: RTC can wake from S4
[ 5.534544] rtc_cmos 00:00: registered as rtc0
[ 5.556479] rtc_cmos 00:00: alarms up to one day, y3k, 114 bytes nvram, hpet irqs
[ 5.561094] device-mapper: ioctl: 4.41.0-ioctl (2019-09-16) initialised: dm-devel@...
[ 5.563200] intel_pstate: CPU model not supported
[ 5.563869] sdhci: Secure Digital Host Controller Interface driver
[ 5.564514] sdhci: Copyright(c) Pierre Ossman
[ 5.565088] sdhci-pltfm: SDHCI platform and OF driver helper
[ 5.566636] usbcore: registered new interface driver usbhid
[ 5.567241] usbhid: USB HID core driver
[ 5.567922] drop_monitor: Initializing network drop monitor service
[ 5.568892] u32 classifier
[ 5.569207] input device check on
[ 5.569564] Actions configured
[ 5.571099] NET: Registered protocol family 10
[ 5.586617] Segment Routing with IPv6
[ 5.587629] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver
[ 5.590474] NET: Registered protocol family 17
[ 5.591687] Key type dns_resolver registered
[ 5.593676] IPI shorthand broadcast: enabled
[ 5.594374] sched_clock: Marking stable (5485271338, 108914060)->(5981448748, -387263350)
[ 5.595828] Loading compiled-in X.509 certificates
[ 5.596642] Key type ._fscrypt registered
[ 5.597146] Key type .fscrypt registered
[ 5.601249] Btrfs loaded, crc32c=crc32c-generic
[ 5.622879] Key type encrypted registered
[ 5.626265] printk: console [netcon0] enabled
[ 5.626738] netconsole: network logging started
[ 5.627736] rtc_cmos 00:00: setting system clock to 2022-07-20T10:36:10 UTC (1658313370)
[ 5.673637] IP-Config: Complete:
[ 5.674257] device=eth0, hwaddr=52:54:00:12:34:02, ipaddr=192.168.7.2, mask=255.255.255.0, gw=11
[ 5.675261] host=192.168.7.2, domain=, nis-domain=(none)
[ 5.675828] bootserver=255.255.255.255, rootserver=255.255.255.255, rootpath=
[ 5.729332] usb 1-1: new full-speed USB device number 2 using uhci_hcd
[ 5.922791] input: QEMU QEMU USB Tablet as /devices/pci0000:00/0000:00:01.2/usb1/1-1/1-1:1.0/0003:064
[ 5.924768] hid-generic 0003:0627:0001.0001: input: USB HID v0.01 Mouse [QEMU QEMU USB Tablet] on us0
[ 6.155241] input: ImExPS/2 Generic Explorer Mouse as /devices/platform/i8042/serio1/input/input3
[ 6.157869] md: Waiting for all devices to be available before autodetect
6.158853] md: If you don't use raid, use raid=noautodetect
[ 6.162222] md: Autodetecting RAID arrays.
[ 6.162754] md: autorun ...
[ 6.163171] md: ... autorun DONE.
[ 6.272996] EXT4-fs (vda): recovery complete
[ 6.276592] EXT4-fs (vda): mounted filesystem with ordered data mode. Opts: (null)
[ 6.278241] VFS: Mounted root (ext4 filesystem) on device 253:0.
[ 6.322833] devtmpfs: mounted
[ 6.354516] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
[ 6.465480] Freeing unused kernel image memory: 1612K
[ 6.467795] Write protecting the kernel read-only data: 20480k
[ 6.471841] Freeing unused kernel image memory: 2004K
[ 6.473580] Freeing unused kernel image memory: 900K
[ 6.474647] Run /sbin/init as init process
INIT: version 2.96 booting
Starting udev
[ 7.915621] udevd[106]: starting version 3.2.9
[ 8.067716] udevd[107]: starting eudev-3.2.9
[ 10.295030] EXT4-fs (vda): re-mounted. Opts: (null)
INIT: Entering runlevel: 5
Configuring network interfaces... ip: RTNETLINK answers: File exists
Starting syslogd/klogd: done

Poky (Yocto Project Reference Distro) 3.1.16 qemux86-64 /dev/ttyS0

qemux86-64 login:
Poky (Yocto Project Reference Distro) 3.1.16 qemux86-64 /dev/ttyS0

qemux86-64 login: clear
Password:
Login incorrect
qemux86-64 login: root
root@qemux86-64:~# ls

Hello Alexander

Please find the output of 'env' below .

SHELL=/bin/bash
SESSION_MANAGER=local/Linux:@/tmp/.ICE-unix/1288,unix/Linux:/tmp/.ICE-unix/1288
QT_ACCESSIBILITY=1
COLORTERM=truecolor
XDG_CONFIG_DIRS=/etc/xdg/xdg-ubuntu:/etc/xdg
SSH_AGENT_LAUNCHER=gnome-keyring
XDG_MENU_PREFIX=gnome-
GNOME_DESKTOP_SESSION_ID=this-is-deprecated
LANGUAGE=en_IN:en
GNOME_SHELL_SESSION_MODE=ubuntu
SSH_AUTH_SOCK=/run/user/1000/keyring/ssh
XMODIFIERS=@im=ibus
DESKTOP_SESSION=ubuntu
GTK_MODULES=gail:atk-bridge
PWD=/home/nikita/yoctoproject/poky/build
LOGNAME=nikita
XDG_SESSION_DESKTOP=ubuntu
XDG_SESSION_TYPE=x11
GPG_AGENT_INFO=/run/user/1000/gnupg/S.gpg-agent:0:1
SYSTEMD_EXEC_PID=1439
XAUTHORITY=/run/user/1000/gdm/Xauthority
WINDOWPATH=2
HOME=/home/nikita
USERNAME=nikita
IM_CONFIG_PHASE=1
LANG=en_IN
LS_COLORS=rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:
XDG_CURRENT_DESKTOP=ubuntu:GNOME
VTE_VERSION=6402
GNOME_TERMINAL_SCREEN=/org/gnome/Terminal/screen/7cf77da7_bb58_4735_9e5a_bfd6073b4d65
BBPATH=/home/nikita/yoctoproject/poky/build
BB_ENV_EXTRAWHITE=ALL_PROXY BBPATH_EXTRA BB_LOGCONFIG BB_NO_NETWORK BB_NUMBER_THREADS BB_SETSCENE_ENFORCE BB_SRCREV_POLICY DISTRO FTPS_PROXY FTP_PROXY GIT_PROXY_COMMAND HTTPS_PROXY HTTP_PROXY MACHINE NO_PROXY PARALLEL_MAKE SCREENDIR SDKMACHINE SOCKS5_PASSWD SOCKS5_USER SSH_AGENT_PID SSH_AUTH_SOCK STAMPS_DIR TCLIBC TCMODE all_proxy ftp_proxy ftps_proxy http_proxy https_proxy no_proxy
LESSCLOSE=/usr/bin/lesspipe %s %s
XDG_SESSION_CLASS=user
TERM=xterm-256color
LESSOPEN=| /usr/bin/lesspipe %s
USER=nikita
GNOME_TERMINAL_SERVICE=:1.73
DISPLAY=:1
SHLVL=1
QT_IM_MODULE=ibus
XDG_RUNTIME_DIR=/run/user/1000
XDG_DATA_DIRS=/usr/share/ubuntu:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop
PATH=/home/nikita/yoctoproject/poky/scripts:/home/nikita/yoctoproject/poky/bitbake/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin
GDMSESSION=ubuntu
DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
BUILDDIR=/home/nikita/yoctoproject/poky/build
OLDPWD=/home/nikita/yoctoproject/poky
_=/usr/bin/env

Signed-off-by: Alexander Kanavin <alex@...>
---
.../rpm/files/0001-CVE-2021-3521.patch | 57 ---
...lib-rpm-as-the-installation-path-for.patch | 14 +-
.../rpm/files/0002-CVE-2021-3521.patch | 64 ----
.../rpm/files/0003-CVE-2021-3521.patch | 329 ------------------
.../rpm/{rpm_4.17.0.bb => rpm_4.17.1.bb} | 5 +-
5 files changed, 8 insertions(+), 461 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0003-CVE-2021-3521.patch
rename meta/recipes-devtools/rpm/{rpm_4.17.0.bb => rpm_4.17.1.bb} (97%)

diff --git a/meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch b/meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch
deleted file mode 100644
index 044b4dd2a0..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-CVE-2021-3521.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9a6871126f472feea057d5f803505ec8cc78f083 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@...>
-Date: Thu, 30 Sep 2021 09:56:20 +0300
-Subject: [PATCH 1/3] Refactor pgpDigParams construction to helper function
-
-No functional changes, just to reduce code duplication and needed by
-the following commits.
-
-CVE: CVE-2021-3521
-Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/9f03f42e2]
-
-Signed-off-by: Changqing Li <changqing.li@...>
----
- rpmio/rpmpgp.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
-index d0688ebe9a..e472b5320f 100644
---- a/rpmio/rpmpgp.c
-+++ b/rpmio/rpmpgp.c
-@@ -1041,6 +1041,13 @@ unsigned int pgpDigParamsAlgo(pgpDigParams digp, unsigned int algotype)
- return algo;
- }
-
-+static pgpDigParams pgpDigParamsNew(uint8_t tag)
-+{
-+ pgpDigParams digp = xcalloc(1, sizeof(*digp));
-+ digp->tag = tag;
-+ return digp;
-+}
-+
- int pgpPrtParams(const uint8_t * pkts, size_t pktlen, unsigned int pkttype,
- pgpDigParams * ret)
- {
-@@ -1058,8 +1065,7 @@ int pgpPrtParams(const uint8_t * pkts, size_t pktlen, unsigned int pkttype,
- if (pkttype && pkt.tag != pkttype) {
- break;
- } else {
-- digp = xcalloc(1, sizeof(*digp));
-- digp->tag = pkt.tag;
-+ digp = pgpDigParamsNew(pkt.tag);
- }
- }
-
-@@ -1105,8 +1111,7 @@ int pgpPrtParamsSubkeys(const uint8_t *pkts, size_t pktlen,
- digps = xrealloc(digps, alloced * sizeof(*digps));
- }
-
-- digps[count] = xcalloc(1, sizeof(**digps));
-- digps[count]->tag = PGPTAG_PUBLIC_SUBKEY;
-+ digps[count] = pgpDigParamsNew(PGPTAG_PUBLIC_SUBKEY);
- /* Copy UID from main key to subkey */
- digps[count]->userid = xstrdup(mainkey->userid);
-
---
-2.17.1
-
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
index 6d236ac400..c6cf9d4c88 100644
--- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
@@ -1,4 +1,4 @@
-From 8d013fe154a162305f76141151baf767dd04b598 Mon Sep 17 00:00:00 2001
+From 4ab6a4c5bbad65c3401016bb26b87214cdd0c59b Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@...>
Date: Mon, 27 Feb 2017 09:43:30 +0200
Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@...>
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
-index eb7d6941b..10a889b5d 100644
+index 372875fc4..1b7add9ee 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -871,7 +871,7 @@ else
+@@ -884,7 +884,7 @@ else
usrprefix=$prefix
fi

@@ -27,10 +27,10 @@ index eb7d6941b..10a889b5d 100644

AC_SUBST(OBJDUMP)
diff --git a/macros.in b/macros.in
-index a1f795e5f..689e784ef 100644
+index d53ab5ed5..9d10441c8 100644
--- a/macros.in
+++ b/macros.in
-@@ -933,7 +933,7 @@ package or when debugging this package.\
+@@ -911,7 +911,7 @@ package or when debugging this package.\
%_sharedstatedir %{_prefix}/com
%_localstatedir %{_prefix}/var
%_lib lib
@@ -40,7 +40,7 @@ index a1f795e5f..689e784ef 100644
%_infodir %{_datadir}/info
%_mandir %{_datadir}/man
diff --git a/rpm.am b/rpm.am
-index 7b57f433b..9bbb9ee96 100644
+index ebe4e40d1..e6920e258 100644
--- a/rpm.am
+++ b/rpm.am
@@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index 7b57f433b..9bbb9ee96 100644
+rpmconfigdir = $(libdir)/rpm

# Libtool version (current-revision-age) for all our libraries
- rpm_version_info = 11:0:2
+ rpm_version_info = 12:0:3
diff --git a/meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch b/meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch
deleted file mode 100644
index 683b57d455..0000000000
--- a/meta/recipes-devtools/rpm/files/0002-CVE-2021-3521.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c4b1bee51bbdd732b94b431a951481af99117703 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@...>
-Date: Thu, 30 Sep 2021 09:51:10 +0300
-Subject: [PATCH 2/3] Process MPI's from all kinds of signatures
-
-No immediate effect but needed by the following commits.
-
-CVE: CVE-2021-3521
-Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b5e8bc74b]
-
-Signed-off-by: Changqing Li <changqing.li@...>
-
----
- rpmio/rpmpgp.c | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
-index 25f67048fd..509e777e6d 100644
---- a/rpmio/rpmpgp.c
-+++ b/rpmio/rpmpgp.c
-@@ -543,7 +543,7 @@ pgpDigAlg pgpDigAlgFree(pgpDigAlg alg)
- return NULL;
- }
-
--static int pgpPrtSigParams(pgpTag tag, uint8_t pubkey_algo, uint8_t sigtype,
-+static int pgpPrtSigParams(pgpTag tag, uint8_t pubkey_algo,
- const uint8_t *p, const uint8_t *h, size_t hlen,
- pgpDigParams sigp)
- {
-@@ -556,10 +556,8 @@ static int pgpPrtSigParams(pgpTag tag, uint8_t pubkey_algo, uint8_t sigtype,
- int mpil = pgpMpiLen(p);
- if (pend - p < mpil)
- break;
-- if (sigtype == PGPSIGTYPE_BINARY || sigtype == PGPSIGTYPE_TEXT) {
-- if (sigalg->setmpi(sigalg, i, p))
-- break;
-- }
-+ if (sigalg->setmpi(sigalg, i, p))
-+ break;
- p += mpil;
- }
-
-@@ -619,7 +617,7 @@ static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen,
- }
-
- p = ((uint8_t *)v) + sizeof(*v);
-- rc = pgpPrtSigParams(tag, v->pubkey_algo, v->sigtype, p, h, hlen, _digp);
-+ rc = pgpPrtSigParams(tag, v->pubkey_algo, p, h, hlen, _digp);
- } break;
- case 4:
- { pgpPktSigV4 v = (pgpPktSigV4)h;
-@@ -677,8 +675,7 @@ static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen,
- p += 2;
- if (p > hend)
- return 1;
--
-- rc = pgpPrtSigParams(tag, v->pubkey_algo, v->sigtype, p, h, hlen, _digp);
-+ rc = pgpPrtSigParams(tag, v->pubkey_algo, p, h, hlen, _digp);
- } break;
- default:
- rpmlog(RPMLOG_WARNING, _("Unsupported version of signature: V%d\n"), version);
---
-2.17.1
-
diff --git a/meta/recipes-devtools/rpm/files/0003-CVE-2021-3521.patch b/meta/recipes-devtools/rpm/files/0003-CVE-2021-3521.patch
deleted file mode 100644
index a5ec802501..0000000000
--- a/meta/recipes-devtools/rpm/files/0003-CVE-2021-3521.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-From 07676ca03ad8afcf1ca95a2353c83fbb1d970b9b Mon Sep 17 00:00:00 2001
-From: Panu Matilainen <pmatilai@...>
-Date: Thu, 30 Sep 2021 09:59:30 +0300
-Subject: [PATCH 3/3] Validate and require subkey binding signatures on PGP
- public keys
-
-All subkeys must be followed by a binding signature by the primary key
-as per the OpenPGP RFC, enforce the presence and validity in the parser.
-
-The implementation is as kludgey as they come to work around our
-simple-minded parser structure without touching API, to maximise
-backportability. Store all the raw packets internally as we decode them
-to be able to access previous elements at will, needed to validate ordering
-and access the actual data. Add testcases for manipulated keys whose
-import previously would succeed.
-
-Depends on the two previous commits:
-7b399fcb8f52566e6f3b4327197a85facd08db91 and
-236b802a4aa48711823a191d1b7f753c82a89ec5
-
-Fixes CVE-2021-3521.
-
-Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/bd36c5dc9]
-CVE:CVE-2021-3521
-
-Signed-off-by: Changqing Li <changqing.li@...>
-
----
- rpmio/rpmpgp.c | 99 +++++++++++++++++--
- tests/Makefile.am | 3 +
- tests/data/keys/CVE-2021-3521-badbind.asc | 25 +++++
- .../data/keys/CVE-2021-3521-nosubsig-last.asc | 25 +++++
- tests/data/keys/CVE-2021-3521-nosubsig.asc | 37 +++++++
- tests/rpmsigdig.at | 28 ++++++
- 6 files changed, 209 insertions(+), 8 deletions(-)
- create mode 100644 tests/data/keys/CVE-2021-3521-badbind.asc
- create mode 100644 tests/data/keys/CVE-2021-3521-nosubsig-last.asc
- create mode 100644 tests/data/keys/CVE-2021-3521-nosubsig.asc
-
-diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
-index 509e777e6d..371ad4d9b6 100644
---- a/rpmio/rpmpgp.c
-+++ b/rpmio/rpmpgp.c
-@@ -1061,33 +1061,116 @@ static pgpDigParams pgpDigParamsNew(uint8_t tag)
- return digp;
- }
-
-+static int hashKey(DIGEST_CTX hash, const struct pgpPkt *pkt, int exptag)
-+{
-+ int rc = -1;
-+ if (pkt->tag == exptag) {
-+ uint8_t head[] = {
-+ 0x99,
-+ (pkt->blen >> 8),
-+ (pkt->blen ),
-+ };
-+
-+ rpmDigestUpdate(hash, head, 3);
-+ rpmDigestUpdate(hash, pkt->body, pkt->blen);
-+ rc = 0;
-+ }
-+ return rc;
-+}
-+
-+static int pgpVerifySelf(pgpDigParams key, pgpDigParams selfsig,
-+ const struct pgpPkt *all, int i)
-+{
-+ int rc = -1;
-+ DIGEST_CTX hash = NULL;
-+
-+ switch (selfsig->sigtype) {
-+ case PGPSIGTYPE_SUBKEY_BINDING:
-+ hash = rpmDigestInit(selfsig->hash_algo, 0);
-+ if (hash) {
-+ rc = hashKey(hash, &all[0], PGPTAG_PUBLIC_KEY);
-+ if (!rc)
-+ rc = hashKey(hash, &all[i-1], PGPTAG_PUBLIC_SUBKEY);
-+ }
-+ break;
-+ default:
-+ /* ignore types we can't handle */
-+ rc = 0;
-+ break;
-+ }
-+
-+ if (hash && rc == 0)
-+ rc = pgpVerifySignature(key, selfsig, hash);
-+
-+ rpmDigestFinal(hash, NULL, NULL, 0);
-+
-+ return rc;
-+}
-+
- int pgpPrtParams(const uint8_t * pkts, size_t pktlen, unsigned int pkttype,
- pgpDigParams * ret)
- {
- const uint8_t *p = pkts;
- const uint8_t *pend = pkts + pktlen;
- pgpDigParams digp = NULL;
-- struct pgpPkt pkt;
-+ pgpDigParams selfsig = NULL;
-+ int i = 0;
-+ int alloced = 16; /* plenty for normal cases */
-+ struct pgpPkt *all = xmalloc(alloced * sizeof(*all));
- int rc = -1; /* assume failure */
-+ int expect = 0;
-+ int prevtag = 0;
-
- while (p < pend) {
-- if (decodePkt(p, (pend - p), &pkt))
-+ struct pgpPkt *pkt = &all[i];
-+ if (decodePkt(p, (pend - p), pkt))
- break;
-
- if (digp == NULL) {
-- if (pkttype && pkt.tag != pkttype) {
-+ if (pkttype && pkt->tag != pkttype) {
- break;
- } else {
-- digp = pgpDigParamsNew(pkt.tag);
-+ digp = pgpDigParamsNew(pkt->tag);
- }
- }
-
-- if (pgpPrtPkt(&pkt, digp))
-+ if (expect) {
-+ if (pkt->tag != expect)
-+ break;
-+ selfsig = pgpDigParamsNew(pkt->tag);
-+ }
-+ if (pgpPrtPkt(pkt, selfsig ? selfsig : digp))
- break;
-
-- p += (pkt.body - pkt.head) + pkt.blen;
-- if (pkttype == PGPTAG_SIGNATURE)
-- break;
-+ if (selfsig) {
-+ /* subkeys must be followed by binding signature */
-+ if (prevtag == PGPTAG_PUBLIC_SUBKEY) {
-+ if (selfsig->sigtype != PGPSIGTYPE_SUBKEY_BINDING)
-+ break;
-+ }
-+
-+ int xx = pgpVerifySelf(digp, selfsig, all, i);
-+
-+ selfsig = pgpDigParamsFree(selfsig);
-+ if (xx)
-+ break;
-+ expect = 0;
-+ }
-+
-+ if (pkt->tag == PGPTAG_PUBLIC_SUBKEY)
-+ expect = PGPTAG_SIGNATURE;
-+ prevtag = pkt->tag;
-+
-+ i++;
-+ p += (pkt->body - pkt->head) + pkt->blen;
-+ if (pkttype == PGPTAG_SIGNATURE)
-+ break;
-+
-+ if (alloced <= i) {
-+ alloced *= 2;
-+ all = xrealloc(all, alloced * sizeof(*all));
-+ }
-+
- }
-
- rc = (digp && (p == pend)) ? 0 : -1;
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a41ce10de8..7bb23247f1 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -107,6 +107,9 @@ EXTRA_DIST += data/SPECS/hello-config-buildid.spec
- EXTRA_DIST += data/SPECS/hello-cd.spec
- EXTRA_DIST += data/keys/rpm.org-rsa-2048-test.pub
- EXTRA_DIST += data/keys/rpm.org-rsa-2048-test.secret
-+EXTRA_DIST += data/keys/CVE-2021-3521-badbind.asc
-+EXTRA_DIST += data/keys/CVE-2022-3521-nosubsig.asc
-+EXTRA_DIST += data/keys/CVE-2022-3521-nosubsig-last.asc
- EXTRA_DIST += data/macros.testfile
- EXTRA_DIST += data/macros.debug
- EXTRA_DIST += data/SOURCES/foo.c
-diff --git a/tests/data/keys/CVE-2021-3521-badbind.asc b/tests/data/keys/CVE-2021-3521-badbind.asc
-new file mode 100644
-index 0000000000..aea00f9d7a
---- /dev/null
-+++ b/tests/data/keys/CVE-2021-3521-badbind.asc
-@@ -0,0 +1,25 @@
-+-----BEGIN PGP PUBLIC KEY BLOCK-----
-+Version: rpm-4.17.90 (NSS-3)
-+
-+mQENBFjmORgBCAC7TMEk6wnjSs8Dr4yqSScWdU2pjcqrkTxuzdWvowcIUPZI0w/g
-+HkRqGd4apjvY2V15kjL10gk3QhFP3pZ/9p7zh8o8NHX7aGdSGDK7NOq1eFaErPRY
-+91LW9RiZ0lbOjXEzIL0KHxUiTQEmdXJT43DJMFPyW9fkCWg0OltiX618FUdWWfI8
-+eySdLur1utnqBvdEbCUvWK2RX3vQZQdvEBODnNk2pxqTyV0w6VPQ96W++lF/5Aas
-+7rUv3HIyIXxIggc8FRrnH+y9XvvHDonhTIlGnYZN4ubm9i4y3gOkrZlGTrEw7elQ
-+1QeMyG2QQEbze8YjpTm4iLABCBrRfPRaQpwrABEBAAG0IXJwbS5vcmcgUlNBIHRl
-+c3RrZXkgPHJzYUBycG0ub3JnPokBNwQTAQgAIQUCWOY5GAIbAwULCQgHAgYVCAkK
-+CwIEFgIDAQIeAQIXgAAKCRBDRFkeGWTF/MxxCACnjqFL+MmPh9W9JQKT2DcLbBzf
-+Cqo6wcEBoCOcwgRSk8dSikhARoteoa55JRJhuMyeKhhEAogE9HRmCPFdjezFTwgB
-+BDVBpO2dZ023mLXDVCYX3S8pShOgCP6Tn4wqCnYeAdLcGg106N4xcmgtcssJE+Pr
-+XzTZksbZsrTVEmL/Ym+R5w5jBfFnGk7Yw7ndwfQsfNXQb5AZynClFxnX546lcyZX
-+fEx3/e6ezw57WNOUK6WT+8b+EGovPkbetK/rGxNXuWaP6X4A/QUm8O98nCuHYFQq
-++mvNdsCBqGf7mhaRGtpHk/JgCn5rFvArMDqLVrR9hX0LdCSsH7EGE+bR3r7wuQEN
-+BFjmORgBCACk+vDZrIXQuFXEYToZVwb2attzbbJJCqD71vmZTLsW0QxuPKRgbcYY
-+zp4K4lVBnHhFrF8MOUOxJ7kQWIJZMZFt+BDcptCYurbD2H4W2xvnWViiC+LzCMzz
-+iMJT6165uefL4JHTDPxC2fFiM9yrc72LmylJNkM/vepT128J5Qv0gRUaQbHiQuS6
-+Dm/+WRnUfx3i89SV4mnBxb/Ta93GVqoOciWwzWSnwEnWYAvOb95JL4U7c5J5f/+c
-+KnQDHsW7sIiIdscsWzvgf6qs2Ra1Zrt7Fdk4+ZS2f/adagLhDO1C24sXf5XfMk5m
-+L0OGwZSr9m5s17VXxfspgU5ugc8kBJfzABEBAAE=
-+=WCfs
-+-----END PGP PUBLIC KEY BLOCK-----
-+
-diff --git a/tests/data/keys/CVE-2021-3521-nosubsig-last.asc b/tests/data/keys/CVE-2021-3521-nosubsig-last.asc
-new file mode 100644
-index 0000000000..aea00f9d7a
---- /dev/null
-+++ b/tests/data/keys/CVE-2021-3521-nosubsig-last.asc
-@@ -0,0 +1,25 @@
-+-----BEGIN PGP PUBLIC KEY BLOCK-----
-+Version: rpm-4.17.90 (NSS-3)
-+
-+mQENBFjmORgBCAC7TMEk6wnjSs8Dr4yqSScWdU2pjcqrkTxuzdWvowcIUPZI0w/g
-+HkRqGd4apjvY2V15kjL10gk3QhFP3pZ/9p7zh8o8NHX7aGdSGDK7NOq1eFaErPRY
-+91LW9RiZ0lbOjXEzIL0KHxUiTQEmdXJT43DJMFPyW9fkCWg0OltiX618FUdWWfI8
-+eySdLur1utnqBvdEbCUvWK2RX3vQZQdvEBODnNk2pxqTyV0w6VPQ96W++lF/5Aas
-+7rUv3HIyIXxIggc8FRrnH+y9XvvHDonhTIlGnYZN4ubm9i4y3gOkrZlGTrEw7elQ
-+1QeMyG2QQEbze8YjpTm4iLABCBrRfPRaQpwrABEBAAG0IXJwbS5vcmcgUlNBIHRl
-+c3RrZXkgPHJzYUBycG0ub3JnPokBNwQTAQgAIQUCWOY5GAIbAwULCQgHAgYVCAkK
-+CwIEFgIDAQIeAQIXgAAKCRBDRFkeGWTF/MxxCACnjqFL+MmPh9W9JQKT2DcLbBzf
-+Cqo6wcEBoCOcwgRSk8dSikhARoteoa55JRJhuMyeKhhEAogE9HRmCPFdjezFTwgB
-+BDVBpO2dZ023mLXDVCYX3S8pShOgCP6Tn4wqCnYeAdLcGg106N4xcmgtcssJE+Pr
-+XzTZksbZsrTVEmL/Ym+R5w5jBfFnGk7Yw7ndwfQsfNXQb5AZynClFxnX546lcyZX
-+fEx3/e6ezw57WNOUK6WT+8b+EGovPkbetK/rGxNXuWaP6X4A/QUm8O98nCuHYFQq
-++mvNdsCBqGf7mhaRGtpHk/JgCn5rFvArMDqLVrR9hX0LdCSsH7EGE+bR3r7wuQEN
-+BFjmORgBCACk+vDZrIXQuFXEYToZVwb2attzbbJJCqD71vmZTLsW0QxuPKRgbcYY
-+zp4K4lVBnHhFrF8MOUOxJ7kQWIJZMZFt+BDcptCYurbD2H4W2xvnWViiC+LzCMzz
-+iMJT6165uefL4JHTDPxC2fFiM9yrc72LmylJNkM/vepT128J5Qv0gRUaQbHiQuS6
-+Dm/+WRnUfx3i89SV4mnBxb/Ta93GVqoOciWwzWSnwEnWYAvOb95JL4U7c5J5f/+c
-+KnQDHsW7sIiIdscsWzvgf6qs2Ra1Zrt7Fdk4+ZS2f/adagLhDO1C24sXf5XfMk5m
-+L0OGwZSr9m5s17VXxfspgU5ugc8kBJfzABEBAAE=
-+=WCfs
-+-----END PGP PUBLIC KEY BLOCK-----
-+
-diff --git a/tests/data/keys/CVE-2021-3521-nosubsig.asc b/tests/data/keys/CVE-2021-3521-nosubsig.asc
-new file mode 100644
-index 0000000000..3a2e7417f8
---- /dev/null
-+++ b/tests/data/keys/CVE-2021-3521-nosubsig.asc
-@@ -0,0 +1,37 @@
-+-----BEGIN PGP PUBLIC KEY BLOCK-----
-+Version: rpm-4.17.90 (NSS-3)
-+
-+mQENBFjmORgBCAC7TMEk6wnjSs8Dr4yqSScWdU2pjcqrkTxuzdWvowcIUPZI0w/g
-+HkRqGd4apjvY2V15kjL10gk3QhFP3pZ/9p7zh8o8NHX7aGdSGDK7NOq1eFaErPRY
-+91LW9RiZ0lbOjXEzIL0KHxUiTQEmdXJT43DJMFPyW9fkCWg0OltiX618FUdWWfI8
-+eySdLur1utnqBvdEbCUvWK2RX3vQZQdvEBODnNk2pxqTyV0w6VPQ96W++lF/5Aas
-+7rUv3HIyIXxIggc8FRrnH+y9XvvHDonhTIlGnYZN4ubm9i4y3gOkrZlGTrEw7elQ
-+1QeMyG2QQEbze8YjpTm4iLABCBrRfPRaQpwrABEBAAG0IXJwbS5vcmcgUlNBIHRl
-+c3RrZXkgPHJzYUBycG0ub3JnPokBNwQTAQgAIQUCWOY5GAIbAwULCQgHAgYVCAkK
-+CwIEFgIDAQIeAQIXgAAKCRBDRFkeGWTF/MxxCACnjqFL+MmPh9W9JQKT2DcLbBzf
-+Cqo6wcEBoCOcwgRSk8dSikhARoteoa55JRJhuMyeKhhEAogE9HRmCPFdjezFTwgB
-+BDVBpO2dZ023mLXDVCYX3S8pShOgCP6Tn4wqCnYeAdLcGg106N4xcmgtcssJE+Pr
-+XzTZksbZsrTVEmL/Ym+R5w5jBfFnGk7Yw7ndwfQsfNXQb5AZynClFxnX546lcyZX
-+fEx3/e6ezw57WNOUK6WT+8b+EGovPkbetK/rGxNXuWaP6X4A/QUm8O98nCuHYFQq
-++mvNdsCBqGf7mhaRGtpHk/JgCn5rFvArMDqLVrR9hX0LdCSsH7EGE+bR3r7wuQEN
-+BFjmORgBCACk+vDZrIXQuFXEYToZVwb2attzbbJJCqD71vmZTLsW0QxuPKRgbcYY
-+zp4K4lVBnHhFrF8MOUOxJ7kQWIJZMZFt+BDcptCYurbD2H4W2xvnWViiC+LzCMzz
-+iMJT6165uefL4JHTDPxC2fFiM9yrc72LmylJNkM/vepT128J5Qv0gRUaQbHiQuS6
-+Dm/+WRnUfx3i89SV4mnBxb/Ta93GVqoOciWwzWSnwEnWYAvOb95JL4U7c5J5f/+c
-+KnQDHsW7sIiIdscsWzvgf6qs2Ra1Zrt7Fdk4+ZS2f/adagLhDO1C24sXf5XfMk5m
-+L0OGwZSr9m5s17VXxfspgU5ugc8kBJfzABEBAAG5AQ0EWOY5GAEIAKT68NmshdC4
-+VcRhOhlXBvZq23NtskkKoPvW+ZlMuxbRDG48pGBtxhjOngriVUGceEWsXww5Q7En
-+uRBYglkxkW34ENym0Ji6tsPYfhbbG+dZWKIL4vMIzPOIwlPrXrm558vgkdMM/ELZ
-+8WIz3KtzvYubKUk2Qz+96lPXbwnlC/SBFRpBseJC5LoOb/5ZGdR/HeLz1JXiacHF
-+v9Nr3cZWqg5yJbDNZKfASdZgC85v3kkvhTtzknl//5wqdAMexbuwiIh2xyxbO+B/
-+qqzZFrVmu3sV2Tj5lLZ/9p1qAuEM7ULbixd/ld8yTmYvQ4bBlKv2bmzXtVfF+ymB
-+Tm6BzyQEl/MAEQEAAYkBHwQYAQgACQUCWOY5GAIbDAAKCRBDRFkeGWTF/PANB/9j
-+mifmj6z/EPe0PJFhrpISt9PjiUQCt0IPtiL5zKAkWjHePIzyi+0kCTBF6DDLFxos
-+3vN4bWnVKT1kBhZAQlPqpJTg+m74JUYeDGCdNx9SK7oRllATqyu+5rncgxjWVPnQ
-+zu/HRPlWJwcVFYEVXYL8xzfantwQTqefjmcRmBRdA2XJITK+hGWwAmrqAWx+q5xX
-+Pa8wkNMxVzNS2rUKO9SoVuJ/wlUvfoShkJ/VJ5HDp3qzUqncADfdGN35TDzscngQ
-+gHvnMwVBfYfSCABV1hNByoZcc/kxkrWMmsd/EnIyLd1Q1baKqc3cEDuC6E6/o4yJ
-+E4XX4jtDmdZPreZALsiB
-+=rRop
-+-----END PGP PUBLIC KEY BLOCK-----
-+
-diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at
-index 8e7c759b8f..e2d30a7f1b 100644
---- a/tests/rpmsigdig.at
-+++ b/tests/rpmsigdig.at
-@@ -2,6 +2,34 @@
-
- AT_BANNER([RPM signatures and digests])
-
-+AT_SETUP([rpmkeys --import invalid keys])
-+AT_KEYWORDS([rpmkeys import])
-+RPMDB_INIT
-+
-+AT_CHECK([
-+runroot rpmkeys --import /data/keys/CVE-2021-3521-badbind.asc
-+],
-+[1],
-+[],
-+[error: /data/keys/CVE-2021-3521-badbind.asc: key 1 import failed.]
-+)
-+AT_CHECK([
-+runroot rpmkeys --import /data/keys/CVE-2021-3521-nosubsig.asc
-+],
-+[1],
-+[],
-+[error: /data/keys/CVE-2021-3521-nosubsig.asc: key 1 import failed.]
-+)
-+
-+AT_CHECK([
-+runroot rpmkeys --import /data/keys/CVE-2021-3521-nosubsig-last.asc
-+],
-+[1],
-+[],
-+[error: /data/keys/CVE-2021-3521-nosubsig-last.asc: key 1 import failed.]
-+)
-+AT_CLEANUP
-+
- # ------------------------------
- # Test pre-built package verification
- AT_SETUP([rpmkeys -Kv <unsigned> 1])
---
-2.17.1
-
diff --git a/meta/recipes-devtools/rpm/rpm_4.17.0.bb b/meta/recipes-devtools/rpm/rpm_4.17.1.bb
similarity index 97%
rename from meta/recipes-devtools/rpm/rpm_4.17.0.bb
rename to meta/recipes-devtools/rpm/rpm_4.17.1.bb
index c392ac0db4..e3015172f8 100644
--- a/meta/recipes-devtools/rpm/rpm_4.17.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.17.1.bb
@@ -39,13 +39,10 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.17.x;protoc
file://0001-tools-Add-error.h-for-non-glibc-case.patch \
file://0001-docs-do-not-build-manpages-requires-pandoc.patch \
file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \
- file://0001-CVE-2021-3521.patch \
- file://0002-CVE-2021-3521.patch \
- file://0003-CVE-2021-3521.patch \
"

PE = "1"
-SRCREV = "3e74e8ba2dd5e76a5353d238dc7fc38651ce27b3"
+SRCREV = "5bef402da334595ed9302b8bca1acdf5e88bfe11"

S = "${WORKDIR}/git"

--
2.30.2

Hello Alexander,

Please find the output file in attachment .

Thanks