|
Re: New CVE entries in this week
Nobuhiro Iwamatsu
Hi,
toggle quoted messageShow quoted text
-----Original Message-----Because commit 61fad68 was not backported to 4.4 and 4.9. I think we need to make sure this is also needed for 4.4. Best regards, Nobuhiro
|
|
|
|
CIP IRC weekly meeting today on libera.chat External
Jan Kiszka
Hi all,
Kindly be reminded to attend the weekly meeting through IRC to discuss technical topics with CIP kernel today. Our channel is the following: irc:irc.libera.chat:6667/cip The IRC meeting is scheduled to UTC (GMT) 13:00: https://www.timeanddate.com/worldclock/meetingdetails.html?year=2022&month=1&day=27&hour=13&min=0&sec=0&p1=224&p2=179&p3=136&p4=37&p5=241&p6=248 USWest USEast UK DE TW JP 06:00 09:00 13:00 14:00 21:00 22:00 Last meeting minutes: https://irclogs.baserock.org/meetings/cip/2022/01/cip.2022-01-20-13.02.log.html * Action items 1. Merge kernelci support in isar-cip-core - jan 2. Clarify with KernelCI whether CIP maintainers can get accounts - alicef * Kernel maintenance updates * Kernel testing * AOB Jan
|
|
|
|
New CVE entries in this week
Masami Ichikawa
Hi !
It's this week's CVE report. This week reported 4 new CVEs. * New CVEs CVE-2022-0322: sctp: account stream padding length for reconf chunk CVSS v3 score is not provided This issue was introduced by commit cc16f00 ("sctp: add support for generating stream reconf ssn reset request chunk") at 4.11-rc1 so 4.9 and 4.4 aren't affected by this issue. All kernels have been fixed. Fixed status mainline: [a2d859e3fc97e79d907761550dbc03ff1b36479c] stable/4.14: [41f0bcc7d9eac315259d4e9fb441552f60e8ec9e] stable/4.19: [c57fdeff69b152185fafabd37e6bfecfce51efda] stable/5.10: [d84a69ac410f6228873d05d35120f6bdddab7fc3] stable/5.4: [d88774539539dcbf825a25e61234f110513f5963] CVE-2022-0264: bpf: Fix kernel address leakage in atomic fetch CVSS v3 score is not provided A local user who has certain privileges is able to gather kernel internal memory addresses. This issue was introduced by commit 38086bf ("bpf: Propagate stack bounds to registers in atomics w/ BPF_FETCH") that was merged in 5.12-rc1-dontuse. Fixed in 5.17-rc1. so before 5.12 kernels aren't affected this issue. Fixed status mainline: [7d3baf0afa3aa9102d6a521a8e4c41888bb79882] stable/5.15: [423628125a484538111c2c6d9bb1588eb086053b] CVE-2022-0330: drm/i915: Flush TLBs before releasing backing store CVSS v3 score is not provided Vulnerability in the i915 driver. Without an active IOMMU malicious userspace can gain access (from the code executing on the GPU) to random memory pages. Fixed status mainline: [7938d61591d33394a21bdd7797a245b65428f44c] CVE-2021-22600: net/packet: rx_owner_map depends on pg_vec CVSS v3 score: NIST: not provided CVSS v3 score: CNA: 6.6 medium A double free bug in packet_set_ring() in net/packet/af_packet.c can be exploited by a local user through crafted syscalls to escalate privileges or deny service. This issue was introduced by commit 61fad68 ("net/packet: tpacket_rcv: avoid a producer race condition"). This commit was merged in 5.6. However, it was backported to 5.4, 4.19, and 4.14 so that these kernels are also affected but 4.4 and 4.9 are not backported. Fixed status mainline: [ec6af094ea28f0f2dda1a6a33b14cd57e36a9755] stable/4.14: [a829ff7c8ec494eca028824628a964cde543dc76] stable/4.19: [18c73170de6719491f79b04c727ea8314c246b03] stable/5.10: [7da349f07e457cad135df0920a3f670e423fb5e9] stable/5.15: [feb116a0ecc5625d6532c616d9a10ef4ef81514b] stable/5.4: [027a13973dadb64ef4f19db56c9b619ee82c3375] * Updated CVEs CVE-2022-0185: vfs: fs_context: fix up param length parsing in legacy_parse_param This issue was affected from 5.8 or later kernels so that all stable kernels have been fixed. Fixed status mainline: [722d94847de29310e8aa03fcbdb41fc92c521756] stable/5.10: [eadde287a62e66b2f9e62d007c59a8f50d4b8413] stable/5.15: [e192ccc17ecf3e78a1c6fb81badf9b50bd791115] stable/5.16: [8b1530a3772ae5b49c6d8d171fd3146bb947430f] stable/5.4: [bd2aed0464ae3d6e83ce064cd91fc1a7fec48826] CVE-2021-43976: mwifiex_usb: Fix skb_over_panic in mwifiex_usb_recv An attacker who can connect a crafted USB device to cause a DoS by this issue. Fixed in the mainline. Fixed status mainline: [04d80663f67ccef893061b49ec8a42ff7045ae84] CVE-2021-45469: f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr() Fixed in the mainline this week. For 4.4, commit ba38c27 ("f2fs: enhance lookup xattr") and commit 2777e65 ("f2fs: fix to avoid accessing xattr across the boundary"), and more patches are also needed. Fixed status mainline: [645a3c40ca3d40cc32b4b5972bf2620f2eb5dba6] stable/4.14: [88dedecc24763c2e0bc1e8eeb35f9f2cd785a7e5] stable/4.19: [f9dfa44be0fb5e8426183a70f69a246cf5827f49] stable/5.10: [fffb6581a23add416239dfcf7e7f3980c6b913da] stable/5.15: [a8a9d753edd7f71e6a2edaa580d8182530b68791] stable/5.4: [b0406b5ef4e2c4fb21d9e7d5c36a0453b4279e9b] CVE-2021-4204: eBPF Improper Input Validation Vulnerability The mainline kernel was fixed this week. A local attacker can escalate privileges via this bug. This bug is affecting the 5.8 or later kernel. The commit 457f4436 ("bpf: Implement BPF ring buffer and verifier support for it") introduced this issue. To mitigate this issue, set kernel.unprivileged_bpf_disabled to 1. Fixed status mainline: [be80a1d3f9dbe5aee79a325964f7037fe2d92f30, d400a6cf1c8a57cdf10f35220ead3284320d85ff, 6788ab23508bddb0a9d88e104284922cb2c22b77, 64620e0a1e712a778095bd35cbb277dc2259281f, a672b2e36a648afb04ad3bda93b6bda947a479a5, 722e4db3ae0d52b2e3801280afbe19cf2d188e91, 37c8d4807d1b8b521b30310dce97f6695dc2c2c6] Currently tracking CVEs CVE-2021-31615: Unencrypted Bluetooth Low Energy baseband links in Bluetooth Core Specifications 4.0 through 5.2 There is no fix information. CVE-2020-26555: BR/EDR pin code pairing broken No fix information CVE-2020-26556: kernel: malleable commitment Bluetooth Mesh Provisioning No fix information. CVE-2020-26557: kernel: predictable Authvalue in Bluetooth Mesh Provisioning Leads to MITM No fix information. CVE-2020-26559: kernel: Authvalue leak in Bluetooth Mesh Provisioning No fix information. CVE-2020-26560: kernel: impersonation attack in Bluetooth Mesh Provisioning No fix information. Regards, -- Masami Ichikawa Cybertrust Japan Co., Ltd. Email :masami.ichikawa@cybertrust.co.jp :masami.ichikawa@miraclelinux.com
|
|
|
|
Re: [PATCH 5.10.y-cip] can: rcar_canfd: rcar_canfd_channel_probe(): make sure we free CAN network device
Lad Prabhakar
Hi Pavel,
toggle quoted messageShow quoted text
Thank you for the review.
-----Original Message-----It is being used [0]. But more importantly... staring at the code some more:Good catch, do agree register_candev() has to be done last. (And sorry for not noticing that earlier).No worries. [0] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/tree/drivers/net/can/rcar/rcar_canfd.c?h=linux-5.10.y-cip#n1664 Cheers, Prabhakar Best regards,
|
|
|
|
Re: [PATCH 5.10.y-cip] can: rcar_canfd: rcar_canfd_channel_probe(): make sure we free CAN network device
Pavel Machek
Hi!
commit 72b1e360572f9fa7d08ee554f1da29abce23f288 upstream.Are they? I see fail label being unused in our 5.10 tree (but mainline uses it and I don't think we need it removed). But more importantly... staring at the code some more: err = register_candev(ndev); if (err) { dev_err(&pdev->dev, "register_candev() failed, error %d\n", err); goto fail_candev; } spin_lock_init(&priv->tx_lock); devm_can_led_init(ndev); gpriv->ch[priv->channel] = priv; dev_info(&pdev->dev, "device registered (channel %u)\n", priv->channel)\ ; return 0; Device is registered before being fully ready, and I don't see anything preventing the device from being used. Should register_candev be done last? (And sorry for not noticing that earlier). Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
|
|
|
|
Re: [PATCH 5.10.y-cip] can: rcar_canfd: rcar_canfd_channel_probe(): make sure we free CAN network device
Pavel Machek
Hi!
Looks good to me, go ahead :-).make sure we free CAN network deviceLGTM. Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
|
|
|
|
Re: [PATCH 5.10.y-cip] can: rcar_canfd: rcar_canfd_channel_probe(): make sure we free CAN network device
Nobuhiro Iwamatsu
Hi,
toggle quoted messageShow quoted text
-----Original Message-----LGTM. If there is no other opinion, I can apply this. Test: https://gitlab.com/cip-project/cip-kernel/linux-cip/-/pipelines/457123034 Best regards, Nobuhiro
|
|
|
|
[PATCH 5.10.y-cip] can: rcar_canfd: rcar_canfd_channel_probe(): make sure we free CAN network device
Lad Prabhakar
commit 72b1e360572f9fa7d08ee554f1da29abce23f288 upstream.
Make sure we free CAN network device in the error path. There are several jumps to fail label after allocating the CAN network device successfully. This patch places the free_candev() under fail label so that in failure path a jump to fail label frees the CAN network device. Fixes: 76e9353a80e9 ("can: rcar_canfd: Add support for RZ/G2L family") Link: https://lore.kernel.org/all/20220106114801.20563-1-prabhakar.mahadev-lad.rj@bp.renesas.com Reported-by: Pavel Machek <pavel@denx.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- drivers/net/can/rcar/rcar_canfd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index 52629c6c1970..6c8e7a51b04d 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -1640,8 +1640,7 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch, ndev = alloc_candev(sizeof(*priv), RCANFD_FIFO_DEPTH); if (!ndev) { dev_err(&pdev->dev, "alloc_candev() failed\n"); - err = -ENOMEM; - goto fail; + return -ENOMEM; } priv = netdev_priv(ndev); @@ -1735,8 +1734,8 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch, fail_candev: netif_napi_del(&priv->napi); - free_candev(ndev); fail: + free_candev(ndev); return err; } -- 2.17.1
|
|
|
|
Re: [isar-cip-core][PATCH v2 0/4] Add cip-core-image-kernelci building and uploading system
Jan Kiszka
On 26.01.22 12:43, Alice Ferrazzi wrote:
On Wed, Jan 26, 2022 at 7:37 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:I misinterpreted this.Is not as we are adding dmesg.sh script (please check the next commit). Then I'll merge and clean up on top. Duplications should be avoided where possible, and it is perfectly possible here, to a certain degree. Jan -- Siemens AG, Technology Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-core][PATCH v2 0/4] Add cip-core-image-kernelci building and uploading system
Alice Ferrazzi
On Wed, Jan 26, 2022 at 7:37 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
Is not as we are adding dmesg.sh script (please check the next commit). KernelCI have a different environment than CIP current gitlab testing. That's why the last time we decided to merge as is. https://lists.cip-project.org/g/cip-dev/topic/88235357#7341 https://lists.cip-project.org/g/cip-dev/message/7337 https://lists.cip-project.org/g/cip-dev/message/7340 -- ====================================== Cybertrust Japan Co.,Ltd. Alice Ferrazzi alice.ferrazzi@miraclelinux.com ======================================
|
|
|
|
Re: [isar-cip-core][PATCH v2 0/4] Add cip-core-image-kernelci building and uploading system
Jan Kiszka
On 26.01.22 11:27, Alice Ferrazzi wrote:
On Wed, Jan 26, 2022 at 6:37 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:Fork where there is relevant different, use the same one where there is not. Duplicating files/99-silent-printk.conf and files/ethernet is surely pointless. The latter will actually cause unneeded maintenance efforts when adding new boards.from my understanding we decided to don't go in that way, Please also avoid needless diffs between the recipes so that they can be re-aligned easily when boards are added. And I still think we will eventually miss the wireless setting from the generic customization packages in kernelci, ie. the only real difference in those recipes now. Jan -- Siemens AG, Technology Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-core][PATCH v2 0/4] Add cip-core-image-kernelci building and uploading system
Alice Ferrazzi
On Wed, Jan 26, 2022 at 6:37 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
from my understanding we decided to don't go in that way, because changes in the common part could break the more generics KernelCI settings. Thanks, Alicef -- ====================================== Cybertrust Japan Co.,Ltd. Alice Ferrazzi alice.ferrazzi@miraclelinux.com ======================================
|
|
|
|
Re: [isar-cip-core][PATCH] Update ISAR
Jan Kiszka
On 24.01.22 16:37, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>Thanks, applied. Jan -- Siemens AG, Technology Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-core][PATCH] update SWUpdate to 2021.11
Jan Kiszka
On 24.01.22 16:08, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>Thanks, applied. Jan -- Siemens AG, Technology Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-core][PATCH v2 0/4] Add cip-core-image-kernelci building and uploading system
Jan Kiszka
On 20.01.22 13:54, Alice Ferrazzi wrote:
This patch series add a new image with settings forDidn't you also want to de-duplicate the customization recipe, build kernelci on top of the common one? Jan -- Siemens AG, Technology Competence Center Embedded Linux
|
|
|
|
Re: Preparing a container for kernel compilation using the Debian compiler
Nobuhiro Iwamatsu
Hi Jan,
toggle quoted messageShow quoted text
-----Original Message-----I see. I think that is also a good idea. I will check the latest isar-cip-core. Best regards, Nobuhiro
|
|
|
|
Scheduled down time for lab-cip-renesas
Chris Paterson
Hello all,
Just a quick note to say that lab-cip-renesas will be offline tomorrow (Wed 26th) for a couple of hours, starting from about 1130 UTC. Kind regards, Chris
|
|
|
|
[isar-cip-core][PATCH] Update ISAR
Quirin Gylstorff
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Update ISAR to commit 33b5aa65fa3f28987525799d0731fb4e7050207d and fix warnings. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- conf/machine/bbb.conf | 2 +- conf/machine/hihope-rzg2m.conf | 2 +- conf/machine/iwg20m.conf | 2 +- conf/machine/qemu-amd64.conf | 2 +- conf/machine/qemu-arm.conf | 2 +- conf/machine/qemu-arm64.conf | 2 +- conf/machine/simatic-ipc227e.conf | 2 +- kas-cip.yml | 2 +- kas/opt/ebg-secure-boot-snakeoil.yml | 2 +- kas/opt/efibootguard.yml | 2 +- kas/opt/swupdate.yml | 2 +- kas/opt/targz-img.yml | 2 +- kas/opt/wic-targz-img.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/machine/bbb.conf b/conf/machine/bbb.conf index 6d8facb..81e624e 100644 --- a/conf/machine/bbb.conf +++ b/conf/machine/bbb.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "armhf" -IMAGE_TYPE ?= "wic-img" +IMAGE_FSTYPES ?= "wic-img" IMAGER_INSTALL += "u-boot-omap" IMAGE_INSTALL += "u-boot-script" diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf index 18a86d4..bc80ddd 100644 --- a/conf/machine/hihope-rzg2m.conf +++ b/conf/machine/hihope-rzg2m.conf @@ -11,7 +11,7 @@ DISTRO_ARCH = "arm64" -IMAGE_TYPE ?= "wic-img" +IMAGE_FSTYPES ?= "wic-img" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig" USE_CIP_KERNEL_CONFIG = "1" diff --git a/conf/machine/iwg20m.conf b/conf/machine/iwg20m.conf index 91bfd94..a26f7fe 100644 --- a/conf/machine/iwg20m.conf +++ b/conf/machine/iwg20m.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "armhf" # see wic/iwg20m.wks -IMAGE_TYPE ?= "wic-img" +IMAGE_FSTYPES ?= "wic-img" # sets serial login getty MACHINE_SERIAL = "ttySC0" diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf index d9605ca..a60f818 100644 --- a/conf/machine/qemu-amd64.conf +++ b/conf/machine/qemu-amd64.conf @@ -8,6 +8,6 @@ DISTRO_ARCH = "amd64" -IMAGE_TYPE ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4-img" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig" diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf index e439d49..aca6d7d 100644 --- a/conf/machine/qemu-arm.conf +++ b/conf/machine/qemu-arm.conf @@ -9,6 +9,6 @@ DISTRO_ARCH = "armhf" -IMAGE_TYPE ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4-img" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig" diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf index f2a301b..0d21262 100644 --- a/conf/machine/qemu-arm64.conf +++ b/conf/machine/qemu-arm64.conf @@ -8,6 +8,6 @@ DISTRO_ARCH = "arm64" -IMAGE_TYPE ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4-img" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig" diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf index 552a0b0..50d1f8a 100644 --- a/conf/machine/simatic-ipc227e.conf +++ b/conf/machine/simatic-ipc227e.conf @@ -8,7 +8,7 @@ DISTRO_ARCH = "amd64" -IMAGE_TYPE ?= "wic-img" +IMAGE_FSTYPES ?= "wic-img" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" USE_CIP_KERNEL_CONFIG = "1" KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig" diff --git a/kas-cip.yml b/kas-cip.yml index 8226954..9c8ac9f 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: ceb7e21154fc4862f704bb5c7739e87a26db6eb3 + refspec: 33b5aa65fa3f28987525799d0731fb4e7050207d layers: meta: patches: diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml index 5aa5eff..1f4d668 100644 --- a/kas/opt/ebg-secure-boot-snakeoil.yml +++ b/kas/opt/ebg-secure-boot-snakeoil.yml @@ -24,7 +24,7 @@ local_conf_header: verity-img: | SECURE_IMAGE_FSTYPE = "squashfs" - IMAGE_TYPE = "secure-swupdate-img" + IMAGE_FSTYPES = "secure-swupdate-img" WKS_FILE = "${MACHINE}-efibootguard-secureboot.wks.in" secure-boot: | diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml index 580c315..75d4ab1 100644 --- a/kas/opt/efibootguard.yml +++ b/kas/opt/efibootguard.yml @@ -23,6 +23,6 @@ local_conf_header: efibootguard-wic: | WDOG_TIMEOUT ?= "60" WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE" - IMAGE_TYPE ?= "wic-img" + IMAGE_FSTYPES ?= "wic-img" WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index 974eacb..a8b903f 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -20,5 +20,5 @@ local_conf_header: IMAGE_INSTALL_append = " swupdate-handler-roundrobin" wic-swu: | - IMAGE_TYPE = "wic-swu-img" + IMAGE_FSTYPES = "wic-swu-img" WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" diff --git a/kas/opt/targz-img.yml b/kas/opt/targz-img.yml index bdb5231..d555a8a 100644 --- a/kas/opt/targz-img.yml +++ b/kas/opt/targz-img.yml @@ -14,4 +14,4 @@ header: local_conf_header: image-type: | - IMAGE_TYPE = "targz-img" + IMAGE_FSTYPES = "targz-img" diff --git a/kas/opt/wic-targz-img.yml b/kas/opt/wic-targz-img.yml index 7e9081f..2e83760 100644 --- a/kas/opt/wic-targz-img.yml +++ b/kas/opt/wic-targz-img.yml @@ -17,4 +17,4 @@ header: local_conf_header: image-type: | - IMAGE_TYPE = "wic-targz-img" + IMAGE_FSTYPES = "wic-targz-img" -- 2.34.1
|
|
|
|
[isar-cip-core][PATCH] update SWUpdate to 2021.11
Quirin Gylstorff
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- .../swupdate-handler-roundrobin_0.1.bb | 4 +- ...dd-option-to-build-with-efibootguard.patch | 39 ---- ...nfig-Make-image-encryption-optional.patch} | 14 +- ...an-patches-add-patches-for-dm-verity.patch | 191 ------------------ .../0002-debian-rules-Add-CONFIG_MTD.patch | 8 +- ...-debian-config-Make-signing-optional.patch | 40 ---- ...s-Add-option-to-disable-fs-creation.patch} | 32 +-- ...les-Add-option-to-disable-webserver.patch} | 10 +- ...ake-CONFIG_HW_COMPATIBILTY-optional.patch} | 10 +- ...les-Add-Embedded-Lua-handler-option.patch} | 10 +- ...repare-build-for-isar-debian-buster.patch} | 18 +- ...bp.bb => swupdate_2021.11-1+debian-gbp.bb} | 19 +- 12 files changed, 63 insertions(+), 332 deletions(-) delete mode 100644 recipes-core/swupdate/files/0001-debian-Add-option-to-build-with-efibootguard.patch rename recipes-core/swupdate/files/{0004-debian-config-Make-image-encryption-optional.patch => 0001-debian-config-Make-image-encryption-optional.patch} (80%) delete mode 100644 recipes-core/swupdate/files/0001-debian-patches-add-patches-for-dm-verity.patch delete mode 100644 recipes-core/swupdate/files/0003-debian-config-Make-signing-optional.patch rename recipes-core/swupdate/files/{0005-debian-rules-Add-option-to-disable-fs-creation.patch => 0003-debian-rules-Add-option-to-disable-fs-creation.patch} (51%) rename recipes-core/swupdate/files/{0006-debian-rules-Add-option-to-disable-webserver.patch => 0004-debian-rules-Add-option-to-disable-webserver.patch} (85%) rename recipes-core/swupdate/files/{0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch => 0005-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch} (85%) rename recipes-core/swupdate/files/{0008-debian-rules-Add-Embedded-Lua-handler-option.patch => 0006-debian-rules-Add-Embedded-Lua-handler-option.patch} (83%) rename recipes-core/swupdate/files/{0009-debian-prepare-build-for-isar-debian-buster.patch => 0007-debian-prepare-build-for-isar-debian-buster.patch} (84%) rename recipes-core/swupdate/{swupdate_2021.04-1+debian-gbp.bb => swupdate_2021.11-1+debian-gbp.bb} (68%) diff --git a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb index 3a5a51e..1f0a620 100644 --- a/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb +++ b/recipes-core/swupdate-handler-roundrobin/swupdate-handler-roundrobin_0.1.bb @@ -22,10 +22,10 @@ SRC_URI += "${@('file://' + d.getVar('SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG')) if # lua version 5.2 is currently hard coded in swupdate @ debian salsa do_install[cleandirs] = "${D}/etc \ - ${D}/usr/share/lua/5.2" + ${D}/usr/share/lua/5.3" do_install() { if [ -e ${WORKDIR}/${SWUPDATE_LUASCRIPT} ]; then - install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${D}/usr/share/lua/5.2/swupdate_handlers.lua + install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${D}/usr/share/lua/5.3/swupdate_handlers.lua fi if [ -e ${WORKDIR}/${SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG} ]; then install -m 0644 ${WORKDIR}/${SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG} ${D}/etc/swupdate.handler.ini diff --git a/recipes-core/swupdate/files/0001-debian-Add-option-to-build-with-efibootguard.patch b/recipes-core/swupdate/files/0001-debian-Add-option-to-build-with-efibootguard.patch deleted file mode 100644 index 00f9a5f..0000000 --- a/recipes-core/swupdate/files/0001-debian-Add-option-to-build-with-efibootguard.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe3f090e3764e1e2625d509a56bd521bab507ce7 Mon Sep 17 00:00:00 2001 -From: Quirin Gylstorff <quirin.gylstorff@siemens.com> -Date: Wed, 15 Sep 2021 12:36:09 +0200 -Subject: [PATCH 1/9] debian: Add option to build with efibootguard - -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> ---- - debian/control | 1 + - debian/rules | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/debian/control b/debian/control -index 9e43eab..6031537 100644 ---- a/debian/control -+++ b/debian/control -@@ -28,6 +28,7 @@ Build-Depends: debhelper-compat (= 13), - libwebsockets-dev (>= 3.2.0) <!pkg.swupdate.bpo>, - liburiparser-dev <!pkg.swupdate.bpo>, - libubootenv-dev <pkg.swupdate.uboot>, -+ efibootguard-dev <pkg.swupdate.efibootguard>, - libcmocka-dev, - pkg-config, - gawk, -diff --git a/debian/rules b/debian/rules -index 4b55be2..c076839 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -33,6 +33,8 @@ ifneq (,$(filter pkg.swupdate.uboot,$(DEB_BUILD_PROFILES))) - else ifneq (,$(filter pkg.swupdate.grub,$(DEB_BUILD_PROFILES))) - echo CONFIG_BOOTLOADER_GRUB=y >> configs/debian_defconfig - echo CONFIG_GRUBENV_PATH=\"/boot/grub/grubenv\" >> configs/debian_defconfig -+else ifneq (,$(filter pkg.swupdate.efibootguard,$(DEB_BUILD_PROFILES))) -+ echo CONFIG_BOOTLOADER_EBG=y >> configs/debian_defconfig - else - echo CONFIG_BOOTLOADER_NONE=y >> configs/debian_defconfig - endif --- -2.30.2 - diff --git a/recipes-core/swupdate/files/0004-debian-config-Make-image-encryption-optional.patch b/recipes-core/swupdate/files/0001-debian-config-Make-image-encryption-optional.patch similarity index 80% rename from recipes-core/swupdate/files/0004-debian-config-Make-image-encryption-optional.patch rename to recipes-core/swupdate/files/0001-debian-config-Make-image-encryption-optional.patch index 45990f8..c07b103 100644 --- a/recipes-core/swupdate/files/0004-debian-config-Make-image-encryption-optional.patch +++ b/recipes-core/swupdate/files/0001-debian-config-Make-image-encryption-optional.patch @@ -1,7 +1,9 @@ -From b0cfcc9980c6daf6383c6dc51fdbe90e1c7625d5 Mon Sep 17 00:00:00 2001 +From 20bb45563fe8f3ec95ef22d715d1add014156543 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Wed, 29 Sep 2021 15:28:21 +0200 -Subject: [PATCH 4/9] debian/config: Make image encryption optional +Subject: [PATCH 1/7] debian/config: Make image encryption optional + +This can be use to ease the setup with SWUpdate. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- @@ -10,7 +12,7 @@ Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/configs/defconfig b/debian/configs/defconfig -index f959e44..8e1a810 100644 +index 02681e53..b34168e3 100644 --- a/debian/configs/defconfig +++ b/debian/configs/defconfig @@ -3,7 +3,6 @@ CONFIG_HW_COMPATIBILITY=y @@ -22,10 +24,10 @@ index f959e44..8e1a810 100644 CONFIG_SURICATTA_SSL=y CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER=y diff --git a/debian/rules b/debian/rules -index 4793c84..6d32d50 100755 +index 864add23..08b74a1d 100755 --- a/debian/rules +++ b/debian/rules -@@ -42,6 +42,9 @@ endif +@@ -41,6 +41,9 @@ endif ifeq (,$(filter pkg.swupdate.nosigning,$(DEB_BUILD_PROFILES))) echo CONFIG_SIGNED_IMAGES=y >> configs/debian_defconfig endif @@ -36,5 +38,5 @@ index 4793c84..6d32d50 100755 echo CONFIG_PKCS11=y >> configs/debian_defconfig endif -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/files/0001-debian-patches-add-patches-for-dm-verity.patch b/recipes-core/swupdate/files/0001-debian-patches-add-patches-for-dm-verity.patch deleted file mode 100644 index a4c8856..0000000 --- a/recipes-core/swupdate/files/0001-debian-patches-add-patches-for-dm-verity.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 9904222a872e1707d8e1205009962fd68c3e5c7d Mon Sep 17 00:00:00 2001 -From: Quirin Gylstorff <quirin.gylstorff@siemens.com> -Date: Mon, 25 Oct 2021 14:43:07 +0200 -Subject: [PATCH] debian/patches: add patches for dm-verity - -Backport the following patches to detect the correct partition to -update. -388f1777 util: Add get_root source /proc/self/mountinfo -3914d2b7 util: Extend get_root to find LUKS devices - -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> ---- - ...d-get_root-source-proc-self-mountinfo.diff | 67 +++++++++++++++ - ...-Extend-get_root-to-find-LUKS-devices.diff | 82 +++++++++++++++++++ - debian/patches/series | 2 + - 3 files changed, 151 insertions(+) - create mode 100644 debian/patches/0001-util-Add-get_root-source-proc-self-mountinfo.diff - create mode 100644 debian/patches/0002-util-Extend-get_root-to-find-LUKS-devices.diff - -diff --git a/debian/patches/0001-util-Add-get_root-source-proc-self-mountinfo.diff b/debian/patches/0001-util-Add-get_root-source-proc-self-mountinfo.diff -new file mode 100644 -index 0000000..2b25a19 ---- /dev/null -+++ b/debian/patches/0001-util-Add-get_root-source-proc-self-mountinfo.diff -@@ -0,0 +1,67 @@ -+From 388f1777e3e9e7dfbe41768aa7ce86bc0ee25c37 Mon Sep 17 00:00:00 2001 -+From: Christian Storm <christian.storm@siemens.com> -+Date: Thu, 10 Jun 2021 00:30:24 +0200 -+Subject: [PATCH 1/2] util: Add get_root source /proc/self/mountinfo -+ -+Filesystems such as BTRFS report synthetic device major:minor -+numbers in stat(2)'s st_dev value. Hence, such a root filesystem -+won't be found by get_root_from_partitions(). -+ -+As /proc/self/mountinfo's information is subject to mount- -+namespacing, it complements get_root_from_partitions() rather -+than replacing it. -+ -+Signed-off-by: Christian Storm <christian.storm@siemens.com> -+--- -+ core/util.c | 28 ++++++++++++++++++++++++++++ -+ 1 file changed, 28 insertions(+) -+ -+diff --git a/core/util.c b/core/util.c -+index 7d7673a..51a16b6 100644 -+--- a/core/util.c -++++ b/core/util.c -+@@ -883,6 +883,32 @@ static char *get_root_from_partitions(void) -+ return NULL; -+ } -+ -++/* -++ * Return the rootfs's device name from /proc/self/mountinfo. -++ * Needed for filesystems having synthetic stat(2) st_dev -++ * values such as BTRFS. -++ */ -++static char *get_root_from_mountinfo(void) -++{ -++ char *mnt_point, *device = NULL; -++ FILE *fp = fopen("/proc/self/mountinfo", "r"); -++ while (fp && !feof(fp)){ -++ /* format: https://www.kernel.org/doc/Documentation/filesystems/proc.txt */ -++ if (fscanf(fp, "%*s %*s %*u:%*u %*s %ms %*s %*[-] %*s %ms %*s", -++ &mnt_point, &device) == 2) { -++ if ( (!strcmp(mnt_point, "/")) && (strcmp(device, "none")) ) { -++ free(mnt_point); -++ break; -++ } -++ free(mnt_point); -++ free(device); -++ } -++ device = NULL; -++ } -++ (void)fclose(fp); -++ return device; -++} -++ -+ #define MAX_CMDLINE_LENGTH 4096 -+ static char *get_root_from_cmdline(void) -+ { -+@@ -936,6 +962,8 @@ char *get_root_device(void) -+ root = get_root_from_partitions(); -+ if (!root) -+ root = get_root_from_cmdline(); -++ if (!root) -++ root = get_root_from_mountinfo(); -+ -+ return root; -+ } -+-- -+2.30.2 -+ -diff --git a/debian/patches/0002-util-Extend-get_root-to-find-LUKS-devices.diff b/debian/patches/0002-util-Extend-get_root-to-find-LUKS-devices.diff -new file mode 100644 -index 0000000..039bfb8 ---- /dev/null -+++ b/debian/patches/0002-util-Extend-get_root-to-find-LUKS-devices.diff -@@ -0,0 +1,82 @@ -+From 3914d2b73bf80b24aba015d9225082c2965c7a02 Mon Sep 17 00:00:00 2001 -+From: Stefano Babic <sbabic@denx.de> -+Date: Thu, 10 Jun 2021 16:14:44 +0200 -+Subject: [PATCH 2/2] util: Extend get_root to find LUKS devices -+ -+This helps in case of encrypted filesystem or device mapper. -+The returned device read from partitions is usually a dm-X device and -+this does not show which is the block device that contains it. Look in -+sysfs and check if the device has "slaves" entries, indicating the -+presence of an underlying device. If found, return this instead of the -+device returned parsing /proc/partitions. -+ -+Signed-off-by: Stefano Babic <sbabic@denx.de> -+--- -+ core/util.c | 26 ++++++++++++++++++++++++-- -+ 1 file changed, 24 insertions(+), 2 deletions(-) -+ -+diff --git a/core/util.c b/core/util.c -+index 51a16b6..3b81c09 100644 -+--- a/core/util.c -++++ b/core/util.c -+@@ -24,6 +24,7 @@ -+ #include <libgen.h> -+ #include <regex.h> -+ #include <string.h> -++#include <dirent.h> -+ -+ #if defined(__linux__) -+ #include <sys/statvfs.h> -+@@ -851,6 +852,10 @@ size_t snescape(char *dst, size_t n, const char *src) -+ /* -+ * This returns the device name where rootfs is mounted -+ */ -++ -++static int filter_slave(const struct dirent *ent) { -++ return (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")); -++} -+ static char *get_root_from_partitions(void) -+ { -+ struct stat info; -+@@ -858,11 +863,28 @@ static char *get_root_from_partitions(void) -+ char *devname = NULL; -+ unsigned long major, minor, nblocks; -+ char buf[256]; -+- int ret; -++ int ret, dev_major, dev_minor, n; -++ struct dirent **devlist = NULL; -+ -+ if (stat("/", &info) < 0) -+ return NULL; -+ -++ dev_major = info.st_dev / 256; -++ dev_minor = info.st_dev % 256; -++ -++ /* -++ * Check if this is just a container, for example in case of LUKS -++ * Search if the device has slaves pointing to another device -++ */ -++ snprintf(buf, sizeof(buf) - 1, "/sys/dev/block/%d:%d/slaves", dev_major, dev_minor); -++ n = scandir(buf, &devlist, filter_slave, NULL); -++ if (n == 1) { -++ devname = strdup(devlist[0]->d_name); -++ free(devlist); -++ return devname; -++ } -++ free(devlist); -++ -+ fp = fopen("/proc/partitions", "r"); -+ if (!fp) -+ return NULL; -+@@ -872,7 +894,7 @@ static char *get_root_from_partitions(void) -+ &major, &minor, &nblocks, &devname); -+ if (ret != 4) -+ continue; -+- if ((major == info.st_dev / 256) && (minor == info.st_dev % 256)) { -++ if ((major == dev_major) && (minor == dev_minor)) { -+ fclose(fp); -+ return devname; -+ } -+-- -+2.30.2 -+ -diff --git a/debian/patches/series b/debian/patches/series -index 8c5564a..f3bd00e 100644 ---- a/debian/patches/series -+++ b/debian/patches/series -@@ -1 +1,3 @@ - use-gcc-compiler.diff -+0002-util-Extend-get_root-to-find-LUKS-devices.diff -+0001-util-Add-get_root-source-proc-self-mountinfo.diff --- -2.30.2 - diff --git a/recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch b/recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch index 0921aef..8ebd09e 100644 --- a/recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch +++ b/recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch @@ -1,7 +1,7 @@ -From 43365f98d70d83dac42913ff907a8a9dd25a4333 Mon Sep 17 00:00:00 2001 +From 1d52fe25e72f9e33525bca7efa5efe901cb32c65 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Wed, 29 Sep 2021 11:29:57 +0200 -Subject: [PATCH 2/9] debian/rules: Add CONFIG_MTD +Subject: [PATCH 2/7] debian/rules: Add CONFIG_MTD if pkg.swupdate.bpo is set CONFIG_MTD is disable but not enabled. @@ -11,7 +11,7 @@ Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules -index c076839..292133b 100755 +index 08b74a1d..6705140b 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ endif @@ -23,5 +23,5 @@ index c076839..292133b 100755 echo CONFIG_CFI=y >> configs/debian_defconfig echo CONFIG_CFIHAMMING1=y >> configs/debian_defconfig -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/files/0003-debian-config-Make-signing-optional.patch b/recipes-core/swupdate/files/0003-debian-config-Make-signing-optional.patch deleted file mode 100644 index 347b316..0000000 --- a/recipes-core/swupdate/files/0003-debian-config-Make-signing-optional.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 37f9afeeac5483f677b5be41b3d31e6557fcc146 Mon Sep 17 00:00:00 2001 -From: Quirin Gylstorff <quirin.gylstorff@siemens.com> -Date: Wed, 29 Sep 2021 15:27:51 +0200 -Subject: [PATCH 3/9] debian/config: Make signing optional - -Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> ---- - debian/configs/defconfig | 1 - - debian/rules | 3 +++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/debian/configs/defconfig b/debian/configs/defconfig -index b38aa62..f959e44 100644 ---- a/debian/configs/defconfig -+++ b/debian/configs/defconfig -@@ -2,7 +2,6 @@ CONFIG_SYSTEMD=y - CONFIG_HW_COMPATIBILITY=y - CONFIG_DOWNLOAD=y - CONFIG_DOWNLOAD_SSL=y --CONFIG_SIGNED_IMAGES=y - CONFIG_SIGALG_CMS=y - CONFIG_ENCRYPTED_IMAGES=y - CONFIG_SURICATTA=y -diff --git a/debian/rules b/debian/rules -index 292133b..4793c84 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -39,6 +39,9 @@ else ifneq (,$(filter pkg.swupdate.efibootguard,$(DEB_BUILD_PROFILES))) - else - echo CONFIG_BOOTLOADER_NONE=y >> configs/debian_defconfig - endif -+ifeq (,$(filter pkg.swupdate.nosigning,$(DEB_BUILD_PROFILES))) -+ echo CONFIG_SIGNED_IMAGES=y >> configs/debian_defconfig -+endif - ifneq (,$(filter pkg.swupdate.p11,$(DEB_BUILD_PROFILES))) - echo CONFIG_PKCS11=y >> configs/debian_defconfig - endif --- -2.30.2 - diff --git a/recipes-core/swupdate/files/0005-debian-rules-Add-option-to-disable-fs-creation.patch b/recipes-core/swupdate/files/0003-debian-rules-Add-option-to-disable-fs-creation.patch similarity index 51% rename from recipes-core/swupdate/files/0005-debian-rules-Add-option-to-disable-fs-creation.patch rename to recipes-core/swupdate/files/0003-debian-rules-Add-option-to-disable-fs-creation.patch index 1121923..876e164 100644 --- a/recipes-core/swupdate/files/0005-debian-rules-Add-option-to-disable-fs-creation.patch +++ b/recipes-core/swupdate/files/0003-debian-rules-Add-option-to-disable-fs-creation.patch @@ -1,47 +1,51 @@ -From 22a96e95676123c6ce8800b9d911402704dce9e2 Mon Sep 17 00:00:00 2001 +From 8b6f01b6126933723963497d0db0c256e5251c5b Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Mon, 4 Oct 2021 17:15:56 +0200 -Subject: [PATCH 5/9] debian/rules: Add option to disable fs creation +Subject: [PATCH 3/7] debian/rules: Add option to disable fs creation Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- - debian/configs/defconfig | 4 ---- - debian/rules | 7 +++++++ - 2 files changed, 7 insertions(+), 4 deletions(-) + debian/configs/defconfig | 6 ------ + debian/rules | 9 +++++++++ + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/configs/defconfig b/debian/configs/defconfig -index 8e1a810..d011deb 100644 +index b34168e3..d011deb1 100644 --- a/debian/configs/defconfig +++ b/debian/configs/defconfig -@@ -9,10 +9,6 @@ CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER=y +@@ -9,12 +9,6 @@ CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER=y CONFIG_WEBSERVER=y CONFIG_MONGOOSESSL=y CONFIG_ZSTD=y -CONFIG_DISKPART=y +-CONFIG_DISKPART_FORMAT=y -CONFIG_DISKFORMAT=y +-CONFIG_DISKFORMAT_HANDLER=y -CONFIG_FAT_FILESYSTEM=y -CONFIG_EXT_FILESYSTEM=y CONFIG_UNIQUEUUID=y CONFIG_RAW=y CONFIG_RDIFFHANDLER=y diff --git a/debian/rules b/debian/rules -index 6d32d50..9349c22 100755 +index 6705140b..983e122f 100755 --- a/debian/rules +++ b/debian/rules -@@ -45,6 +45,13 @@ endif +@@ -45,6 +45,15 @@ endif ifeq (,$(filter pkg.swupdate.noencryption,$(DEB_BUILD_PROFILES))) echo CONFIG_ENCRYPTED_IMAGES=y >> configs/debian_defconfig endif +ifeq (,$(filter pkg.swupdate.nocreatefs,$(DEB_BUILD_PROFILES))) -+ echo CONFIG_DISKPART=y >> configs/debian_defconfig -+ echo CONFIG_DISKFORMAT=y >> configs/debian_defconfig -+ echo CONFIG_FAT_FILESYSTEM=y >> configs/debian_defconfig -+ echo CONFIG_EXT_FILESYSTEM=y >> configs/debian_defconfig ++ echo CONFIG_DISKPART=y >> configs/debian_defconfig ++ echo CONFIG_DISKPART_FORMAT=y >> configs/debian_defconfig ++ echo CONFIG_DISKFORMAT=y >> configs/debian_defconfig ++ echo CONFIG_DISKFORMAT_HANDLER=y >> configs/debian_defconfig ++ echo CONFIG_FAT_FILESYSTEM=y >> configs/debian_defconfig ++ echo CONFIG_EXT_FILESYSTEM=y >> configs/debian_defconfig +endif + ifneq (,$(filter pkg.swupdate.p11,$(DEB_BUILD_PROFILES))) echo CONFIG_PKCS11=y >> configs/debian_defconfig endif -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/files/0006-debian-rules-Add-option-to-disable-webserver.patch b/recipes-core/swupdate/files/0004-debian-rules-Add-option-to-disable-webserver.patch similarity index 85% rename from recipes-core/swupdate/files/0006-debian-rules-Add-option-to-disable-webserver.patch rename to recipes-core/swupdate/files/0004-debian-rules-Add-option-to-disable-webserver.patch index 23a456d..66e48e6 100644 --- a/recipes-core/swupdate/files/0006-debian-rules-Add-option-to-disable-webserver.patch +++ b/recipes-core/swupdate/files/0004-debian-rules-Add-option-to-disable-webserver.patch @@ -1,7 +1,7 @@ -From 9caabe416aca7ca2bf1cd2d8be89cfc89cedf6cd Mon Sep 17 00:00:00 2001 +From c1f46ecb2ac3aed3a711dec767321afa92b600d8 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Mon, 4 Oct 2021 17:27:11 +0200 -Subject: [PATCH 6/9] debian/rules: Add option to disable webserver +Subject: [PATCH 4/7] debian/rules: Add option to disable webserver Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- @@ -10,7 +10,7 @@ Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/configs/defconfig b/debian/configs/defconfig -index d011deb..337fcce 100644 +index d011deb1..337fcce0 100644 --- a/debian/configs/defconfig +++ b/debian/configs/defconfig @@ -6,8 +6,6 @@ CONFIG_SIGALG_CMS=y @@ -23,7 +23,7 @@ index d011deb..337fcce 100644 CONFIG_UNIQUEUUID=y CONFIG_RAW=y diff --git a/debian/rules b/debian/rules -index 9349c22..4574b18 100755 +index 983e122f..6078ed89 100755 --- a/debian/rules +++ b/debian/rules @@ -39,6 +39,10 @@ else ifneq (,$(filter pkg.swupdate.efibootguard,$(DEB_BUILD_PROFILES))) @@ -38,5 +38,5 @@ index 9349c22..4574b18 100755 echo CONFIG_SIGNED_IMAGES=y >> configs/debian_defconfig endif -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch b/recipes-core/swupdate/files/0005-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch similarity index 85% rename from recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch rename to recipes-core/swupdate/files/0005-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch index c2d37a9..4cca3bf 100644 --- a/recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch +++ b/recipes-core/swupdate/files/0005-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch @@ -1,7 +1,7 @@ -From 538e54a36b24eb6caf49d7dca91598fa9fc86713 Mon Sep 17 00:00:00 2001 +From ccc6f5d04aba0f1270f7d6b6de298b2084ad3bfd Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Tue, 5 Oct 2021 10:56:25 +0200 -Subject: [PATCH 7/9] debian: Make CONFIG_HW_COMPATIBILTY optional +Subject: [PATCH 5/7] debian: Make CONFIG_HW_COMPATIBILTY optional Add option for qemu. @@ -12,7 +12,7 @@ Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/configs/defconfig b/debian/configs/defconfig -index 337fcce..6fc1137 100644 +index 337fcce0..6fc1137f 100644 --- a/debian/configs/defconfig +++ b/debian/configs/defconfig @@ -1,5 +1,4 @@ @@ -22,7 +22,7 @@ index 337fcce..6fc1137 100644 CONFIG_DOWNLOAD_SSL=y CONFIG_SIGALG_CMS=y diff --git a/debian/rules b/debian/rules -index 4574b18..9a4b0d4 100755 +index 6078ed89..19870e98 100755 --- a/debian/rules +++ b/debian/rules @@ -39,6 +39,9 @@ else ifneq (,$(filter pkg.swupdate.efibootguard,$(DEB_BUILD_PROFILES))) @@ -36,5 +36,5 @@ index 4574b18..9a4b0d4 100755 echo CONFIG_WEBSERVER=y >> configs/debian_defconfig echo CONFIG_MONGOOSESSL=y >> configs/debian_defconfig -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch b/recipes-core/swupdate/files/0006-debian-rules-Add-Embedded-Lua-handler-option.patch similarity index 83% rename from recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch rename to recipes-core/swupdate/files/0006-debian-rules-Add-Embedded-Lua-handler-option.patch index 44a83c4..447f6ad 100644 --- a/recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch +++ b/recipes-core/swupdate/files/0006-debian-rules-Add-Embedded-Lua-handler-option.patch @@ -1,7 +1,7 @@ -From c2f07b552c6d83562fed5452bc778ae0e5e19cd4 Mon Sep 17 00:00:00 2001 +From 7107052e6aa1a35a2900070797ac013d49814f0b Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Wed, 29 Sep 2021 11:32:41 +0200 -Subject: [PATCH 8/9] debian/rules: Add Embedded Lua handler option +Subject: [PATCH 6/7] debian/rules: Add Embedded Lua handler option Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- @@ -9,10 +9,10 @@ Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules -index 9a4b0d4..a1f73fd 100755 +index 19870e98..12eb0ba5 100755 --- a/debian/rules +++ b/debian/rules -@@ -66,7 +66,12 @@ ifneq (,$(LUA_VERSION)) +@@ -68,7 +68,12 @@ ifneq (,$(LUA_VERSION)) echo CONFIG_LUAPKG=\"lua$(LUA_VERSION)\" >> configs/debian_defconfig echo CONFIG_LUASCRIPTHANDLER=y >> configs/debian_defconfig echo CONFIG_HANDLER_IN_LUA=y >> configs/debian_defconfig @@ -26,5 +26,5 @@ index 9a4b0d4..a1f73fd 100755 echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch b/recipes-core/swupdate/files/0007-debian-prepare-build-for-isar-debian-buster.patch similarity index 84% rename from recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch rename to recipes-core/swupdate/files/0007-debian-prepare-build-for-isar-debian-buster.patch index 8462951..3ff4ca9 100644 --- a/recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch +++ b/recipes-core/swupdate/files/0007-debian-prepare-build-for-isar-debian-buster.patch @@ -1,7 +1,7 @@ -From 16dd48c2282aba91f8fc1f458f7b0c06504cac19 Mon Sep 17 00:00:00 2001 +From 123190b2aa72818186ba12a04d793ff7d4244828 Mon Sep 17 00:00:00 2001 From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Date: Wed, 29 Sep 2021 16:17:03 +0200 -Subject: [PATCH 9/9] debian: prepare build for isar debian buster +Subject: [PATCH 7/7] debian: prepare build for isar debian buster Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- @@ -13,23 +13,23 @@ Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> diff --git a/debian/compat b/debian/compat new file mode 100644 -index 0000000..f599e28 +index 00000000..f599e28b --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control -index 6031537..710cb2d 100644 +index 192c4a2a..9318fa12 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional - Maintainer: Stefano Babic <sbabic@denx.de> + Maintainer: Bastian Germann <bage@debian.org> Uploaders: SZ Lin (林上智) <szlin@debian.org>, Nobuhiro Iwamatsu <iwamatsu@debian.org> -Build-Depends: debhelper-compat (= 13), +Build-Depends: debhelper, dh-lua:native <!nolua>, - liblua5.2-dev <!nolua>, + liblua5.3-dev <!nolua>, libfdisk-dev, @@ -23,10 +23,10 @@ Build-Depends: debhelper-compat (= 13), libzstd-dev, @@ -44,10 +44,10 @@ index 6031537..710cb2d 100644 + libwebsockets-dev, + liburiparser-dev, libubootenv-dev <pkg.swupdate.uboot>, - efibootguard-dev <pkg.swupdate.efibootguard>, + libebgenv-dev <pkg.swupdate.efibootguard> | efibootguard-dev <pkg.swupdate.efibootguard>, libcmocka-dev, diff --git a/debian/rules b/debian/rules -index a1f73fd..a2ae1ac 100755 +index 12eb0ba5..e1c4a921 100755 --- a/debian/rules +++ b/debian/rules @@ -19,13 +19,15 @@ endif @@ -68,5 +68,5 @@ index a1f73fd..a2ae1ac 100755 echo "# CONFIG_MTD is not set" >> configs/debian_defconfig endif -- -2.30.2 +2.34.1 diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb similarity index 68% rename from recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb rename to recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb index e25ee4c..48a6cc1 100644 --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb +++ b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb @@ -13,20 +13,15 @@ inherit dpkg-gbp include swupdate.inc SRC_URI = "git://salsa.debian.org/debian/swupdate.git;protocol=https;branch=debian/master" -SRCREV ="debian/2021.04-1" +SRCREV ="debian/2021.11-1" # add options to DEB_BUILD_PROFILES -SRC_URI += "file://0001-debian-Add-option-to-build-with-efibootguard.patch \ +SRC_URI += "file://0001-debian-config-Make-image-encryption-optional.patch \ file://0002-debian-rules-Add-CONFIG_MTD.patch \ - file://0003-debian-config-Make-signing-optional.patch \ - file://0004-debian-config-Make-image-encryption-optional.patch \ - file://0005-debian-rules-Add-option-to-disable-fs-creation.patch \ - file://0006-debian-rules-Add-option-to-disable-webserver.patch \ - file://0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch \ - file://0008-debian-rules-Add-Embedded-Lua-handler-option.patch" - -# Patch for dm-verity based images - can be removed with next SWUpdate release -SRC_URI += "file://0001-debian-patches-add-patches-for-dm-verity.patch" + file://0003-debian-rules-Add-option-to-disable-fs-creation.patch \ + file://0004-debian-rules-Add-option-to-disable-webserver.patch \ + file://0005-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch \ + file://0006-debian-rules-Add-Embedded-Lua-handler-option.patch" # end patching for dm-verity based images @@ -42,7 +37,7 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" # SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua" # modify for debian buster build -SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" +SRC_URI_append_buster = " file://0007-debian-prepare-build-for-isar-debian-buster.patch" # disable documentation due to missing packages SWUPDATE_BUILD_PROFILES_append = " nodoc " -- 2.34.1
|
|
|
|
Re: 4.4.X-stable and 4.4.X-rt maintainance ends in less than two weeks
Jan Kiszka
On 20.01.22 03:26, Masami Ichikawa wrote:
On Wed, Jan 19, 2022 at 11:12 PM Pavel Machek <pavel@denx.de> wrote:I do agree that, if we need to integrate patches anyway, providing them as a prolonged LTS should not be extra effort. But what will and can people expect from that?Thank you for asking the actual EOL date. The original LTS kernels conceptually covers everything that is code-wise included. Our CIP kernels do not. While it might be still ok to fix trivial build issues or even runtime problems for things CIP does not cover in the configs when they only occasionally occur, we will not be able to commit on doing that all the time - resources are limited, and the focus needs to be on CIP-defined setups. Jan -- Siemens AG, Technology Competence Center Embedded Linux
|
|
|