|
cip/linux-4.4.y-cip build: 109 builds: 0 failed, 109 passed, 6 warnings (v4.4.287-cip64)
#kernelci
kernelci.org bot <bot@...>
cip/linux-4.4.y-cip build: 109 builds: 0 failed, 109 passed, 6 warnings (v4.4.287-cip64)
Full Build Summary: https://kernelci.org/build/cip/branch/linux-4.4.y-cip/kernel/v4.4.287-cip64/ Tree: cip Branch: linux-4.4.y-cip Git Describe: v4.4.287-cip64 Git Commit: 18599fbc73711361d2880d2051b2e1f15bcebc10 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git Built: 3 unique architectures Warnings Detected: arm: clps711x_defconfig (gcc-8): 1 warning davinci_all_defconfig (gcc-8): 1 warning lpc32xx_defconfig (gcc-8): 1 warning multi_v7_defconfig+CONFIG_SMP=n (gcc-8): 1 warning mxs_defconfig (gcc-8): 1 warning omap2plus_defconfig (gcc-8): 1 warning i386: x86_64: Warnings summary: 1 include/linux/cpumask.h:565:26: warning: passing argument 2 of ‘dev_pm_opp_set_sharing_cpus’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] 1 drivers/cpufreq/ti-cpufreq.c:250:24: warning: passing argument 1 of ‘PTR_ERR_OR_ZERO’ makes pointer from integer without a cast [-Wint-conversion] 1 arch/arm/mach-mxs/mach-mxs.c:285:26: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] 1 arch/arm/mach-lpc32xx/phy3250.c:215:36: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] 1 arch/arm/mach-davinci/da8xx-dt.c:23:34: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] 1 arch/arm/mach-clps711x/board-autcpu12.c:163:26: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- acs5k_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- acs5k_tiny_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (x86_64, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (i386, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- am200epdkit_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- assabet_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- at91_dt_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- axm55xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bcm2835_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- bcm_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cerfcube_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- clps711x_defconfig (arm, gcc-8) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: arch/arm/mach-clps711x/board-autcpu12.c:163:26: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] -------------------------------------------------------------------------------- cm_x2xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- cm_x300_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- colibri_pxa270_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- colibri_pxa300_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- collie_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- corgi_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- davinci_all_defconfig (arm, gcc-8) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: arch/arm/mach-davinci/da8xx-dt.c:23:34: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] -------------------------------------------------------------------------------- dove_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ebsa110_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- efm32_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- em_x270_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ep93xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- eseries_pxa_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- exynos_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ezx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- footbridge_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- h3600_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- h5000_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- hackkit_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- hisi_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- i386_defconfig (i386, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imote2_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imx_v4_v5_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- integrator_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- iop13xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- iop32x_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- iop33x_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- jornada720_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- keystone_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- ks8695_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lart_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lpc18xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lpc32xx_defconfig (arm, gcc-8) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: arch/arm/mach-lpc32xx/phy3250.c:215:36: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] -------------------------------------------------------------------------------- lpd270_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- lubbock_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mini2440_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mmp2_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig+CONFIG_CPU_BIG_ENDIAN=y (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig+CONFIG_EFI=y+CONFIG_ARM_LPAE=y (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig+CONFIG_SMP=n (arm, gcc-8) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: include/linux/cpumask.h:565:26: warning: passing argument 2 of ‘dev_pm_opp_set_sharing_cpus’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] -------------------------------------------------------------------------------- multi_v7_defconfig+crypto (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig+ima (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mv78xx0_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mvebu_v5_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mvebu_v7_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- mxs_defconfig (arm, gcc-8) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: arch/arm/mach-mxs/mach-mxs.c:285:26: warning: duplicate ‘const’ declaration specifier [-Wduplicate-decl-specifier] -------------------------------------------------------------------------------- neponset_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- netwinder_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- netx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nhk8815_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nuc910_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nuc950_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nuc960_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap1_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm, gcc-8) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: drivers/cpufreq/ti-cpufreq.c:250:24: warning: passing argument 1 of ‘PTR_ERR_OR_ZERO’ makes pointer from integer without a cast [-Wint-conversion] -------------------------------------------------------------------------------- palmz72_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pcm027_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pleb_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- prima2_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa255-idp_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa3xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- pxa910_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- qcom_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- realview-smp_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- realview_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rpc_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- s3c2410_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- s3c6400_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- s5pv210_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- sama5_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- shannon_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- shmobile_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- simpad_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- socfpga_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spear3xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spear6xx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- spitz_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- stm32_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- sunxi_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tct_hammer_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tegra_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- trizeps4_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- u300_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- u8500_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- versatile_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vexpress_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- viper_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vt8500_v6_v7_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig (x86_64, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig+crypto (x86_64, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig+ima (x86_64, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig+x86-chromebook (x86_64, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- xcep_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- zeus_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- zx_defconfig (arm, gcc-8) — PASS, 0 errors, 0 warnings, 0 section mismatches --- For more info write to <info@...>
|
|
|
|
Re: deby: No certificate for https://git.yoctoproject.org
Kazuhiro Hayashi
Hello Toyooka-san,
toggle quoted messageShow quoted text
Thank you very much for your information. I confirmed that the same issue happens in Debian 8 jessie environment and it can be solved with the latest packages in ELTS [0]. I will update the packages in the container used for building cip-core/deby images. [0] https://github.com/meta-debian/meta-debian/commit/19e00ae5964c2691b35a9f2f9c497135007f6cea Best regards, Kazu
-----Original Message-----
|
|
|
|
[ANNOUNCE] Release v4.19.209-cip59 and v4.4.287-cip64
Nobuhiro Iwamatsu
Hi all,
CIP kernel team has released Linux kernel v4.19.209-cip59 and v4.4.287-cip64. The linux-4.19.y-cip tree has been updated from v4.19.207 to v4.19.209, and the linux-4.4.y-cip tree has been updated from v4.4.285 to v4.4.287. The release information is shown below. v4.19.209-cip59: repository: https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git branch: linux-4.19.y-cip commit hash: 11e803e05e061dc32e92deb7bd73c20dfbc48ae5 Fixed CVEs:: CVE-2021-37159: usb: hso: fix error handling code of hso_create_net_device added commits: CIP: Bump version suffix to -cip59 after merge from stable v4.4.287-cip64: repository: https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git branch: linux-4.4.y-cip commit hash: 18599fbc73711361d2880d2051b2e1f15bcebc10 Fixed CVEs: None added commits: CIP: Bump version suffix to -cip64 after merge from stable Best regards, Nobuhiro
|
|
|
|
Re: New CVE entry this week
Masami Ichikawa
Hi !
On Thu, Oct 7, 2021 at 4:31 PM Pavel Machek <pavel@...> wrote: Yes. I'll track the patch goes into the mainline. I agree.* Updated CVEsIt may make sense to help with this backport. I see. We don't have to track this CVE.CVE-2021-38300: bpf, mips: Validate conditional branch offsetsI guess we don't care about MIPS. Best regards,Regards, -- Masami Ichikawa Cybertrust Japan Co., Ltd. Email :masami.ichikawa@... :masami.ichikawa@...
|
|
|
|
Re: deby: No certificate for https://git.yoctoproject.org
Hiraku Toyooka
Hi Kazu,
This seems to be related to recent Let's Encrypt changes. Please see my comments on the issue. https://gitlab.com/cip-project/cip-core/deby/-/issues/15 Best regards, Hiraku Toyooka On Thu, Oct 7, 2021 at 2:08 PM Kazuhiro Hayashi <kazuhiro3.hayashi@...> wrote:
-- Hiraku Toyooka Cybertrust Japan Co., Ltd.
|
|
|
|
Re: New CVE entry this week
Pavel Machek
Hi!
It's this week's CVE report.... Fixed statusI guess we can wait for this to be merged through normal channels. * Updated CVEsIt may make sense to help with this backport. CVE-2021-37159: net: hso: do not call unregister if not registeredNot sure why this has CVE number. We probably need not care. CVE-2021-38300: bpf, mips: Validate conditional branch offsetsI guess we don't care about MIPS. Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
|
|
|
|
CIP IRC weekly meeting today on libera.chat
Jan Kiszka
Hi all,
Kindly be reminded to attend the weekly meeting through IRC to discuss technical topics with CIP kernel today. Please note that we moved from Freenode to libera.chat. Our channel is the following: irc:irc.libera.chat:6667/cip Furthermore note that the IRC meeting is now scheduled to UTC (GMT) 13:00: https://www.timeanddate.com/worldclock/meetingdetails.html?year=2021&month=10&day=7&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 14:00 15:00 21:00 22:00 Last meeting minutes: https://irclogs.baserock.org/meetings/cip/2021/09/cip.2021-09-30-13.00.log.html * Action item 1. Combine root filesystem with kselftest binary - iwamatsu & alicef 2. Document new LAVA domains in wiki - patersonc * Kernel maintenance updates * Kernel testing * AOB Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux
|
|
|
|
deby: No certificate for https://git.yoctoproject.org
Kazuhiro Hayashi
Hi,
In deby CI, cloning repositories from https://git.yoctoproject.org is now failing (for a development branch): https://gitlab.com/cip-project/cip-core/deby/-/issues/15 It was working on Apr 13, 2021. https://gitlab.com/cip-project/cip-core/deby/-/jobs/1172425075 Do Anyone know if there are any changes in certficates in the containers? Best regards, Kazu
|
|
|
|
Re: Deby project status?
Kazuhiro Hayashi
Hello Sergey,
Thank you for your questions. - last commit in cip-core/deby was in AprilSorry for these bad states. As the upstream project [0] that deby is based on has been updated already, so it should be updated immediately. It seems like a bad sign. Are all efforts aimed to isar-cip-core?Not all, but many efforts are recently prioritized to isar-cip-core actually. The basic plan is to implement features in isar-cip-core first where various packages and features from Debian are available already, then port them to deby in which partial features are implemented. Anyway, is there any plans to develop Deby (or any other distro underdeby is now supporting Debian 8 jessie and 10 buster source packages in each branch and both versions will be maintained at least 10 years following the lifecycle information of CIP [1]. On the other hand, there is no plan to develop new deby metadata for newer Debian source packages (e.g. 11 bullseye) at the moment. The demand and way of images for devices with storage restrictions is under consideration. There are several ideas that directly use binary packages of Debian to create small images (e.g. Debian initramfs based custom image, etc. ), but more time for discussions would be required to implement a related repository or recipes in cip-core. [0] https://github.com/meta-debian/meta-debian [1] https://gitlab.com/cip-project/cip-lifecycle/-/tree/master/data Best regards, Kazu -----Original Message-----
|
|
|
|
New CVE entry this week
Masami Ichikawa
Hi !
It's this week's CVE report. This week reported new CVEs. * New CVEs CVE-2021-41864: bpf: Fix integer overflow in prealloc_elems_and_freelist() CVSS v3 score is not provided. Patch 30e29a9a2bc6 (bpf: Fix integer overflow in prealloc_elems_and_freelist() ) fixes commit 557c0c6e7df8 ("bpf: convert stackmap to pre-allocation") which has been introduced in 4.6-rc1. Therefore 4.4 kernel isn't affected this issue. For 4.19 and 5.4, patch can be applied by "git am". For 4.9, patch can be applied by "git am -3". Fixed status Fix patch has been merged into bpf tree, but not in the mainline yet. CVE-2021-42008: net: 6pack: fix slab-out-of-bounds in decode_data The 6pack module has slab out-of-bounds vulnerability in decode_data() which allow local attacker can gain their privileges. This bug has been fixed since 5.14-rc7. All stable kernels have already been fixed. Fixed status cip/4.19: [4e370cc081a78ee23528311ca58fd98a06768ec7] cip/4.19-rt: [4e370cc081a78ee23528311ca58fd98a06768ec7] cip/4.4: [d66736076bd84742c18397785476e9a84d5b54ef] cip/4.4-rt: [d66736076bd84742c18397785476e9a84d5b54ef] mainline: [19d1532a187669ce86d5a2696eb7275310070793] stable/4.14: [5e0e782874ad03ae6d47d3e55aff378da0b51104] stable/4.19: [4e370cc081a78ee23528311ca58fd98a06768ec7] stable/4.4: [d66736076bd84742c18397785476e9a84d5b54ef] stable/4.9: [de9171c1d9a5c2c4c5ec5e64f420681f178152fa] stable/5.10: [85e0518f181a0ff060f5543d2655fb841a83d653] stable/5.4: [a73b9aa142691c2ae313980a8734997a78f74b22] * Updated CVEs CVE-2019-19449: mounting a crafted f2fs filesystem image can lead to slab-out-of-bounds read access in f2fs_build_segment_manager in fs/f2fs/segment.c This patch has been merged since 5.10-rc1. For 5.4, patch can be applied via git-am. For 4.4 and 4.19, patch can be applied via git-am with -3 option. Fixed status mainline: [3a22e9ac71585bcb7667e44641f1bbb25295f0ce] stable/5.10: [3a22e9ac71585bcb7667e44641f1bbb25295f0ce] CVE-2021-37159: net: hso: do not call unregister if not registered 4.14, 4.19, and 5.4 have been fixed. 4.4 and 4.9 haven't been fixed yet. However, patch can be applied to 4.4 and 4.9 without any modification. According to cip-kernel-config, no CIP member use HSO module. Fixed status mainline: [a6ecfb39ba9d7316057cea823b196b734f6b18ca] stable/4.14: [4c0db9c4b3701c29f47bac0721e2f7d2b15d8edb] stable/4.19: [f6cf22a1ef49f8e131f99c3f5fd80ab6b23a2d21] stable/5.10: [115e4f5b64ae8d9dd933167cafe2070aaac45849] stable/5.13: [eeaa4b8d1e2e6f10362673d283a97dccc7275afa] stable/5.4: [fe57d53dd91d7823f1ceef5ea8e9458a4aeb47fa] CVE-2021-38300: bpf, mips: Validate conditional branch offsets This vulnerability is only affected to MIPS architecture. No cip member use MIPS architecture. 5.10 has been fixed. Applying this fix to 4.4, 4.9, 4.19, and 5.4, it needs to modify the patch. Fixed status mainline: [37cb28ec7d3a36a5bace7063a3dba633ab110f8b] stable/5.10: [c61736a994fe68b0e5498e4e84e1c9108dc41075] 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-2021-3640: UAF in sco_send_frame function Fixed in bluetooth-next tree. https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/net/bluetooth/sco.c?id=99c23da0eed4fd20cae8243f2b51e10e66aa0951 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@... :masami.ichikawa@...
|
|
|
|
Re: [isar-cip-core][PATCH 2/4] swupdate: Use dpkg-gbp build with salsa
Jan Kiszka
On 05.10.21 16:13, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>Extra linefeed. +def get_bootloader_build_profile(d):expand=True is the default for for getVar, so you can drop the True. + if bootloader == "efibootguard":Missing indentions of the continued lines. +Rather than writing what it does, it might make more sense to document the reason. +GBP_EXTRA_OPTIONS += "--git-compression=xz"Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-core][PATCH 1/4] swupdate: Move handler to own recipe
Jan Kiszka
On 05.10.21 16:13, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>Why handlers? Can the recipe handle multiple handlers? As far as I read the recipe, it can't. @@ -0,0 +1,37 @@One linefeed too much. +SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG ?= "swupdate.handler.${SWUPDATE_BOOTLOADER}.ini"I wonder if we shouldn't make this recipe "swupdate-handler-roundrobin", maybe add generic PROVIDES = "swupdate-handler" and remove the configurability. Or is there really that much to reuse for a different handler? That could still be moved into a swupdate-handler.inc then. Are we aware of any alternative handler in some (likely internal) layer that could act as check for reusability? +}^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bbJan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-dev] [PATCH] Uprevision the ISAR to latest one
Jan Kiszka
On 06.10.21 12:14, Srinuvasan A wrote:
From: Srinuvasan A <srinuvasan_a@...>Thanks, applied. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux
|
|
|
|
Re: [isar-cip-core][PATCH] scripts/wic/efibootguard-boot: Add missing whitespace
Jan Kiszka
On 27.09.21 10:38, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@...>Thanks, applied. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux
|
|
|
|
Deby project status?
Sergey Nazaryev
Hi all,
Recently I've found the Deby project and I consider it as a candidate for using on our new device. However, as I can see, there is no activity in this project: - last commit in cip-core/deby was in April - it builds with errors - there are no updates in Deby section of CIP core meetings reports - all issues related to Deby (e.g. swupdate support) weren't updated since last year It seems like a bad sign. Are all efforts aimed to isar-cip-core? Anyway, is there any plans to develop Deby (or any other distro under the aegis of CIP project for devices with storage restrictions) in future? Thank you in advance. Best regards, Sergey Nazaryev
|
|
|
|
[isar-cip-dev] [PATCH] Uprevision the ISAR to latest one
Srinuvasan A
From: Srinuvasan A <srinuvasan_a@...>
Update to latest ISAR. When we build the images with efibootguard wic plugin it is expecting the KERNEL_IMAGE and INITRD_IMAGE variable, but it is removed in Upstream ISAR due to cleanup the unused variables. Ref: https://github.com/ilbers/isar/commit/6fa0197ac36a86b2ae5c27f5b7804dd9a46d3c0b But those variables we used in downstream layer with efibootguard wic plugin hence added required WIC variables in efibootguard.yml to genereate successful wic images. Signed-off-by: Srinuvasan A <srinuvasan_a@...> --- kas-cip.yml | 2 +- kas/opt/efibootguard.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kas-cip.yml b/kas-cip.yml index 8522957..4eadaa7 100644 --- a/kas-cip.yml +++ b/kas-cip.yml @@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: 03124cca669f50b682336a0bdf4ede5a4238e144 + refspec: 9b31dae3284127d4aed4b9331af1b1c3c31152f5 layers: meta: diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml index 705a76d..580c315 100644 --- a/kas/opt/efibootguard.yml +++ b/kas/opt/efibootguard.yml @@ -22,7 +22,7 @@ local_conf_header: efibootguard-wic: | WDOG_TIMEOUT ?= "60" - WICVARS += "WDOG_TIMEOUT" + WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE" IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" -- 2.25.1
|
|
|
|
Re: Prompt timeouts on ipc227e board -- randomness related?
Pavel Machek
Hi!
Thank you, but that board seems to still have problems:We investigated the failure job and looks like before getting login prompt jobThank you for your investigation. https://lava.ciplatform.org/scheduler/job/458108 expect-shell-connection: Wait for prompt ['root@ebsy-isar:~#'] (timeout 00:10:00) Waiting using forced prompt support (timeout 00:05:00) end: 2.3.5 expect-shell-connection (duration 00:00:00) [common] start: 2.3.6 export-device-env (timeout 00:01:00) [common] Sending with 500 millisecond of delay export NFS_ROOTFS='/var/lib/lava/dispatcher/tmp/458108/extract-nfsrootfs-5xpf3q6i' root@ebsy-isar:~# export NFS_ROOTFS='/var/lib/lava/dispatcher/tmp/458108/extract-nfsrootfs-5xpf3q6i' export NFS_ROOTFS='/var/lib/lava/dispatcher/tmp/458108/extract -nfsrootfs-5xpf3q6i' Sending with 500 millisecond of delay export NFS_SERVER_IP='134.86.254.28' export-device-env timed out after 60 seconds end: 2.3.6 export-device-env (duration 00:01:00) [common] case: export-device-env case_id: 9715377 definition: lava (Of course, I can't rule out kernel problem at the moment, but failing at setting environment variable would be strange.) Best regards, Pavel -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
|
|
|
|
[isar-cip-core][PATCH 4/4] swupdate: remove version 2021.04+isar-git
Quirin Gylstorff
From: Quirin Gylstorff <quirin.gylstorff@...>
This version is replace by 2021.04-1+debian-gbp. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> --- classes/kconfig-snippets.bbclass | 90 ------------------- classes/swupdate-config.bbclass | 81 ----------------- conf/distro/cip-core-bullseye.conf | 1 - conf/distro/cip-core-buster.conf | 1 - .../swupdate/files/debian/changelog.tmpl | 6 -- recipes-core/swupdate/files/debian/compat | 1 - .../swupdate/files/debian/control.tmpl | 15 ---- recipes-core/swupdate/files/debian/copyright | 36 -------- recipes-core/swupdate/files/debian/rules.tmpl | 31 ------- .../swupdate/files/debian/swupdate.examples | 2 - .../swupdate/files/debian/swupdate.install | 2 - .../swupdate/files/debian/swupdate.manpages | 5 -- .../swupdate/files/debian/swupdate.tmpfile | 2 - recipes-core/swupdate/files/debian/watch | 12 --- recipes-core/swupdate/files/postinst | 2 - recipes-core/swupdate/files/swupdate.cfg | 6 -- .../swupdate/files/swupdate.service.example | 11 --- .../swupdate/files/swupdate.socket.example | 11 --- .../swupdate/files/swupdate.socket.tmpl | 13 --- .../swupdate/files/swupdate_defconfig | 83 ----------------- .../swupdate_defconfig_efibootguard.snippet | 3 - .../files/swupdate_defconfig_lua.snippet | 2 - .../swupdate_defconfig_luahandler.snippet | 4 - .../files/swupdate_defconfig_mtd.snippet | 1 - .../files/swupdate_defconfig_u-boot.snippet | 3 - .../files/swupdate_defconfig_ubi.snippet | 6 -- recipes-core/swupdate/swupdate.bb | 48 ---------- 27 files changed, 478 deletions(-) delete mode 100644 classes/kconfig-snippets.bbclass delete mode 100644 classes/swupdate-config.bbclass delete mode 100644 recipes-core/swupdate/files/debian/changelog.tmpl delete mode 100644 recipes-core/swupdate/files/debian/compat delete mode 100644 recipes-core/swupdate/files/debian/control.tmpl delete mode 100644 recipes-core/swupdate/files/debian/copyright delete mode 100755 recipes-core/swupdate/files/debian/rules.tmpl delete mode 100644 recipes-core/swupdate/files/debian/swupdate.examples delete mode 100644 recipes-core/swupdate/files/debian/swupdate.install delete mode 100644 recipes-core/swupdate/files/debian/swupdate.manpages delete mode 100644 recipes-core/swupdate/files/debian/swupdate.tmpfile delete mode 100644 recipes-core/swupdate/files/debian/watch delete mode 100644 recipes-core/swupdate/files/postinst delete mode 100644 recipes-core/swupdate/files/swupdate.cfg delete mode 100644 recipes-core/swupdate/files/swupdate.service.example delete mode 100644 recipes-core/swupdate/files/swupdate.socket.example delete mode 100644 recipes-core/swupdate/files/swupdate.socket.tmpl delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig_efibootguard.snippet delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig_lua.snippet delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig_luahandler.snippet delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig_mtd.snippet delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig_u-boot.snippet delete mode 100644 recipes-core/swupdate/files/swupdate_defconfig_ubi.snippet delete mode 100644 recipes-core/swupdate/swupdate.bb diff --git a/classes/kconfig-snippets.bbclass b/classes/kconfig-snippets.bbclass deleted file mode 100644 index d754654..0000000 --- a/classes/kconfig-snippets.bbclass +++ /dev/null @@ -1,90 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2020 -# -# Authors: -# Christian Storm <christian.storm@...> -# -# SPDX-License-Identifier: MIT - -KCONFIG_SNIPPETS = "" - -# The following function defines the kconfig snippet system -# with automatich debian dependency injection -# -# To define a feature set, the user has to define the following -# variable to an empty string: -# -# KFEATURE_featurename = "" -# -# Then, required additions to the variables can be defined: -# -# KFEATURE_featurename[KCONFIG_SNIPPETS] = "file://snippet-file-name.snippet" -# KFEATURE_featurename[SRC_URI] = "file://required-file.txt" -# KFEATURE_featurename[DEPENDS] = "deb-pkg1 deb-pkg2 deb-pkg3" -# KFEATURE_featurename[DEBIAN_DEPENDS] = "deb-pkg1" -# KFEATURE_featurename[BUILD_DEB_DEPENDS] = "deb-pkg1,deb-pkg2,deb-pkg3" - -# The 'KCONFIG_SNIPPETS' flag gives a list of URI entries, where only -# file:// is supported. These snippets are appended to the DEFCONFIG file. -# -# Features can depend on other features via the following mechanism: -# -# KFEATURE_DEPS[feature1] = "feature2" - -python () { - requested_features = d.getVar("KFEATURES", True) or "" - - features = set(requested_features.split()) - old_features = set() - feature_deps = d.getVarFlags("KFEATURE_DEPS") or {} - while old_features != features: - diff_features = old_features.symmetric_difference(features) - old_features = features.copy() - for i in diff_features: - features.update(feature_deps.get(i, "").split()) - - for f in sorted(features): - bb.debug(2, "Feature: " + f) - varname = "KFEATURE_" + f - dummyvar = d.getVar(varname, False) - if dummyvar == None: - bb.error("Feature var " + f + " must be defined with needed flags.") - else: - feature_flags = d.getVarFlags(varname) - for feature_varname in sorted(feature_flags): - if feature_flags.get(feature_varname, "") != "": - sep = " " - - # Required to add KCONFIG_SNIPPETS to SRC_URI here, - # because 'SRC_URI += "${KCONFIG_SNIPPETS}"' would - # conflict with SRC_APT feature. - if feature_varname == "KCONFIG_SNIPPETS": - d.appendVar('SRC_URI', - " " + feature_flags[feature_varname].strip()) - - # BUILD_DEP_DEPENDS and DEBIAN_DEPENDS is ',' separated - # Only add ',' if there is already something there - if feature_varname in ["BUILD_DEB_DEPENDS", - "DEBIAN_DEPENDS"]: - sep = "," if d.getVar(feature_varname) else "" - - d.appendVar(feature_varname, - sep + feature_flags[feature_varname].strip()) -} - -# DEFCONFIG must be a predefined bitbake variable and the corresponding file -# must exist in the WORKDIR. -# The resulting generated config is the same file suffixed with ".gen" - -do_prepare_build_prepend() { - sh -x - GENCONFIG="${WORKDIR}/${DEFCONFIG}".gen - rm -f "$GENCONFIG" - cp "${WORKDIR}/${DEFCONFIG}" "$GENCONFIG" - for CONFIG_SNIPPET in $(echo "${KCONFIG_SNIPPETS}" | sed 's#file://##g') - do - cat ${WORKDIR}/$CONFIG_SNIPPET >> "$GENCONFIG" - done -} diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass deleted file mode 100644 index 1d57ce1..0000000 --- a/classes/swupdate-config.bbclass +++ /dev/null @@ -1,81 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2020 -# -# Authors: -# Christian Storm <christian.storm@...> -# -# SPDX-License-Identifier: MIT - -# This class manages the config snippets together with their dependencies -# to build SWUpdate - -inherit kconfig-snippets - -BUILD_DEB_DEPENDS = " \ - zlib1g-dev, debhelper, libconfig-dev, libarchive-dev, \ - python-sphinx:native, dh-systemd, libsystemd-dev, libssl-dev, pkg-config" - -KFEATURE_lua = "" -KFEATURE_lua[BUILD_DEB_DEPENDS] = "liblua5.3-dev" -KFEATURE_lua[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_lua.snippet" - -KFEATURE_luahandler = "" -KFEATURE_luahandler[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_luahandler.snippet" -KFEATURE_luahandler[SRC_URI] = "${@ 'file://${SWUPDATE_LUASCRIPT}' \ - if d.getVar('SWUPDATE_USE_ROUND_ROBIN_HANDLER_REPO') == '0' else '' }" -KFEATURE_DEPS = "" -KFEATURE_DEPS[luahandler] = "lua" - -KFEATURE_efibootguard = "" -KFEATURE_efibootguard[BUILD_DEB_DEPENDS] = "efibootguard-dev" -KFEATURE_efibootguard[DEBIAN_DEPENDS] = "" -KFEATURE_efibootguard[DEPENDS] = "efibootguard-dev" -KFEATURE_efibootguard[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_efibootguard.snippet" - -KFEATURE_mtd = "" -KFEATURE_mtd[BUILD_DEB_DEPENDS] = "libmtd-dev" -KFEATURE_mtd[DEPENDS] = "mtd-utils" -KFEATURE_mtd[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_mtd.snippet" - -KFEATURE_ubi = "" -KFEATURE_ubi[BUILD_DEB_DEPENDS] = "libubi-dev" -KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet" - -KFEATURE_DEPS[ubi] = "mtd" - -KFEATURE_u-boot = "" -KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev" -# we need u-boot-${MACHINE}-config for fw_env.config -# only custom build u-boot provides this package -# for u-boot provided by debian u-boot-tools provides -# example configurations at /usr/share/doc/u-boot-tools/examples -KFEATURE_u-boot[DEBIAN_DEPENDS] = "${@ 'libubootenv0.1, u-boot-${MACHINE}-config' \ - if d.getVar("U_BOOT_CONFIG_PACKAGE", True) == "1" \ - else 'libubootenv0.1'}" -KFEATURE_u-boot[DEPENDS] = "${@ 'libubootenv u-boot-${MACHINE}-config' \ - if d.getVar("U_BOOT_CONFIG_PACKAGE", True) == "1" \ - else 'libubootenv'}" -KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet" - -def get_bootloader_featureset(d): - bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "" - if bootloader == "efibootguard": - return "efibootguard" - if bootloader == "u-boot": - return "u-boot" - return "" - -SWUPDATE_KFEATURES ??= "" -KFEATURES = "${SWUPDATE_KFEATURES}" -KFEATURES += "${@get_bootloader_featureset(d)}" - -# Astonishingly, as an anonymous python function, SWUPDATE_BOOTLOADER is always None -# one time before it gets set. So the following must be a task. -python do_check_bootloader () { - bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "None" - if not bootloader in ["efibootguard", "u-boot"]: - bb.warn("swupdate: SWUPDATE_BOOTLOADER set to incompatible value: " + bootloader) -} -addtask check_bootloader before do_fetch diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf index 9357b6c..38014b4 100644 --- a/conf/distro/cip-core-bullseye.conf +++ b/conf/distro/cip-core-bullseye.conf @@ -14,4 +14,3 @@ require cip-core-common.inc PREFERRED_VERSION_linux-cip ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" -PREFERRED_VERSION_swupdate ?= "2021.04-1+debian-gbp" diff --git a/conf/distro/cip-core-buster.conf b/conf/distro/cip-core-buster.conf index 61fcb41..c5cb39c 100644 --- a/conf/distro/cip-core-buster.conf +++ b/conf/distro/cip-core-buster.conf @@ -14,4 +14,3 @@ require cip-core-common.inc PREFERRED_VERSION_linux-cip ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" -PREFERRED_VERSION_swupdate ?= "2021.4-git+isar" diff --git a/recipes-core/swupdate/files/debian/changelog.tmpl b/recipes-core/swupdate/files/debian/changelog.tmpl deleted file mode 100644 index 81087d3..0000000 --- a/recipes-core/swupdate/files/debian/changelog.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -swupdate (${PV}) unstable; urgency=medium - - * SWUpdate - - -- Christian Storm <christian.storm@...> Thu, 31 Jan 2019 15:23:56 +0100 - diff --git a/recipes-core/swupdate/files/debian/compat b/recipes-core/swupdate/files/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/recipes-core/swupdate/files/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/recipes-core/swupdate/files/debian/control.tmpl b/recipes-core/swupdate/files/debian/control.tmpl deleted file mode 100644 index 2b92850..0000000 --- a/recipes-core/swupdate/files/debian/control.tmpl +++ /dev/null @@ -1,15 +0,0 @@ -Source: swupdate -Section: embedded -Priority: optional -Maintainer: Stefano Babic <sbabic@...> -Build-Depends: ${BUILD_DEB_DEPENDS} -Standards-Version: 4.2.1 -Homepage: http://sbabic.github.io/swupdate - -Package: swupdate -Architecture: any -Depends: ${DEBIAN_DEPENDS} -Description: reliable way to update an embedded system - This project is thought to help to update an embedded system from a storage media or from network. - However, it should be mainly considered as a framework, where further protocols or installers - (in SWUpdate they are called handlers) can be easily added to the application. diff --git a/recipes-core/swupdate/files/debian/copyright b/recipes-core/swupdate/files/debian/copyright deleted file mode 100644 index f920942..0000000 --- a/recipes-core/swupdate/files/debian/copyright +++ /dev/null @@ -1,36 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: swupdate -Maintainer: Stefano Babic <sbabic@...> -Source: http://github.com/sbabic/swupdate - -Files: * -Copyright: 2014-2017 Stefano Babic <sbabic@...> - -License: GPL-2 with OpenSSL exception - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - In addition, as a special exception, the author of this - program gives permission to link the code of its - release with the OpenSSL project's "OpenSSL" library (or - with modified versions of it that use the same license as - the "OpenSSL" library), and distribute the linked - executables. You must obey the GNU General Public - License in all respects for all of the code used other - than "OpenSSL". If you modify this file, you may extend - this exception to your version of the file, but you are - not obligated to do so. If you do not wish to do so, - delete this exception statement from your version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/> - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/recipes-core/swupdate/files/debian/rules.tmpl b/recipes-core/swupdate/files/debian/rules.tmpl deleted file mode 100755 index ec83a88..0000000 --- a/recipes-core/swupdate/files/debian/rules.tmpl +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/make -f - -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- -export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_GNU_TYPE)/pkgconfig -export CC=$(DEB_HOST_GNU_TYPE)-gcc -export LD=$(DEB_HOST_GNU_TYPE)-gcc -endif - -export DH_VERBOSE = 1 - -export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow - -documentation: configure - make man - -configure: - make ${DEFCONFIG} - -build: documentation configure - dh $@ - -%: - echo $@ - dh $@ - -override_dh_installchangelogs: - true - -override_dh_installdocs: - true diff --git a/recipes-core/swupdate/files/debian/swupdate.examples b/recipes-core/swupdate/files/debian/swupdate.examples deleted file mode 100644 index c257b75..0000000 --- a/recipes-core/swupdate/files/debian/swupdate.examples +++ /dev/null @@ -1,2 +0,0 @@ -examples/configuration -examples/description diff --git a/recipes-core/swupdate/files/debian/swupdate.install b/recipes-core/swupdate/files/debian/swupdate.install deleted file mode 100644 index 8957cc6..0000000 --- a/recipes-core/swupdate/files/debian/swupdate.install +++ /dev/null @@ -1,2 +0,0 @@ -swupdate usr/bin -swupdate.cfg /etc diff --git a/recipes-core/swupdate/files/debian/swupdate.manpages b/recipes-core/swupdate/files/debian/swupdate.manpages deleted file mode 100644 index c3438e0..0000000 --- a/recipes-core/swupdate/files/debian/swupdate.manpages +++ /dev/null @@ -1,5 +0,0 @@ -doc/build/man/swupdate.1 -doc/build/man/client.1 -doc/build/man/sendtohawkbit.1 -doc/build/man/hawkbitcfg.1 -doc/build/man/progress.1 diff --git a/recipes-core/swupdate/files/debian/swupdate.tmpfile b/recipes-core/swupdate/files/debian/swupdate.tmpfile deleted file mode 100644 index 4743672..0000000 --- a/recipes-core/swupdate/files/debian/swupdate.tmpfile +++ /dev/null @@ -1,2 +0,0 @@ -X /tmp/datadst -X /tmp/scripts diff --git a/recipes-core/swupdate/files/debian/watch b/recipes-core/swupdate/files/debian/watch deleted file mode 100644 index bc4c53e..0000000 --- a/recipes-core/swupdate/files/debian/watch +++ /dev/null @@ -1,12 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 4 file -version=4 - -# GitHub hosted projects -opts="filenamemangle="s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%<project>-$1.tar.gz%" \ - https://github.com/<user>/swupdate/tags \ - (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate diff --git a/recipes-core/swupdate/files/postinst b/recipes-core/swupdate/files/postinst deleted file mode 100644 index f15ac10..0000000 --- a/recipes-core/swupdate/files/postinst +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -deb-systemd-helper enable swupdate.socket || true diff --git a/recipes-core/swupdate/files/swupdate.cfg b/recipes-core/swupdate/files/swupdate.cfg deleted file mode 100644 index e0222f1..0000000 --- a/recipes-core/swupdate/files/swupdate.cfg +++ /dev/null @@ -1,6 +0,0 @@ -globals : -{ - verbose = true; - loglevel = 10; - syslog = false; -}; diff --git a/recipes-core/swupdate/files/swupdate.service.example b/recipes-core/swupdate/files/swupdate.service.example deleted file mode 100644 index d0b821e..0000000 --- a/recipes-core/swupdate/files/swupdate.service.example +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SWUpdate daemon -Documentation=https://github.com/sbabic/swupdate - -[Service] -Type=simple -ExecStart=/usr/bin/swupdate -f /etc/swupdate.cfg -KillMode=mixed - -[Install] -WantedBy=multi-user.target diff --git a/recipes-core/swupdate/files/swupdate.socket.example b/recipes-core/swupdate/files/swupdate.socket.example deleted file mode 100644 index 2b75671..0000000 --- a/recipes-core/swupdate/files/swupdate.socket.example +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=SWUpdate socket listener -Documentation=https://github.com/sbabic/swupdate -Documentation=https://sbabic.github.io/swupdate - -[Socket] -ListenStream=/tmp/sockinstctrl -ListenStream=/tmp/swupdateprog - -[Install] -WantedBy=sockets.target diff --git a/recipes-core/swupdate/files/swupdate.socket.tmpl b/recipes-core/swupdate/files/swupdate.socket.tmpl deleted file mode 100644 index 8e7fc1d..0000000 --- a/recipes-core/swupdate/files/swupdate.socket.tmpl +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=SWUpdate socket listener -Documentation=https://github.com/sbabic/swupdate -Documentation=https://sbabic.github.io/swupdate - -[Socket] -SocketUser=${SWUPDATE_SOCKET_OWNER} -SocketGroup=root -ListenStream=/tmp/sockinstctrl -ListenStream=/tmp/swupdateprog - -[Install] -WantedBy=sockets.target diff --git a/recipes-core/swupdate/files/swupdate_defconfig b/recipes-core/swupdate/files/swupdate_defconfig deleted file mode 100644 index 9ae7cb5..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig +++ /dev/null @@ -1,83 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Swupdate Configuration -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Swupdate Settings -# - -# -# General Configuration -# -# CONFIG_CURL is not set -# CONFIG_CURL_SSL is not set -CONFIG_SYSTEMD=y -CONFIG_SCRIPTS=y -# CONFIG_HW_COMPATIBILITY is not set -CONFIG_SW_VERSIONS_FILE="/etc/sw-versions" - -# -# Socket Paths -# -CONFIG_SOCKET_CTRL_PATH="/tmp/sockinstctrl" -CONFIG_SOCKET_PROGRESS_PATH="/tmp/swupdateprog" -CONFIG_SOCKET_REMOTE_HANDLER_DIRECTORY="/tmp/" -# CONFIG_MTD is not set -# CONFIG_LUA is not set -# CONFIG_LUAPKG is not set -# CONFIG_FEATURE_SYSLOG is not set - -# -# Build Options -# -CONFIG_CROSS_COMPILE="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_WERROR is not set -# CONFIG_NOCLEANUP is not set -# CONFIG_BOOTLOADER_EBG is not set -# CONFIG_UBOOT is not set -# CONFIG_BOOTLOADER_NONE is not set -# CONFIG_BOOTLOADER_GRUB is not set -# CONFIG_DOWNLOAD is not set -# CONFIG_DOWNLOAD_SSL is not set -# CONFIG_CHANNEL_CURL is not set -# CONFIG_HASH_VERIFY=y -# CONFIG_SIGNED_IMAGES is not set -# CONFIG_ENCRYPTED_IMAGES is not set -# CONFIG_SURICATTA is not set -# CONFIG_WEBSERVER is not set -CONFIG_GUNZIP=y - -# -# Parser Features -# -CONFIG_LIBCONFIG=y -CONFIG_PARSERROOT="" -# CONFIG_JSON is not set -# CONFIG_LUAEXTERNAL is not set -# CONFIG_SETEXTPARSERNAME is not set -# CONFIG_SETSWDESCRIPTION is not set - -# -# Image Handlers -# -CONFIG_RAW=y -# CONFIG_LUASCRIPTHANDLER is not set -# CONFIG_SHELLSCRIPTHANDLER is not set -# CONFIG_HANDLER_IN_LUA is not set -# CONFIG_EMBEDDED_LUA_HANDLER is not set -# CONFIG_EMBEDDED_LUA_HANDLER_SOURCE is not set -CONFIG_ARCHIVE=y -# CONFIG_REMOTE_HANDLER is not set -# CONFIG_SWUFORWARDER_HANDLER is not set -# CONFIG_BOOTLOADERHANDLER is not set diff --git a/recipes-core/swupdate/files/swupdate_defconfig_efibootguard.snippet b/recipes-core/swupdate/files/swupdate_defconfig_efibootguard.snippet deleted file mode 100644 index 8e3688c..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig_efibootguard.snippet +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_BOOTLOADER_NONE=n -CONFIG_BOOTLOADER_EBG=y -CONFIG_BOOTLOADERHANDLER=y diff --git a/recipes-core/swupdate/files/swupdate_defconfig_lua.snippet b/recipes-core/swupdate/files/swupdate_defconfig_lua.snippet deleted file mode 100644 index b39f9df..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig_lua.snippet +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_LUA=y -CONFIG_LUAPKG="lua53" diff --git a/recipes-core/swupdate/files/swupdate_defconfig_luahandler.snippet b/recipes-core/swupdate/files/swupdate_defconfig_luahandler.snippet deleted file mode 100644 index b4a2de8..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig_luahandler.snippet +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_LUASCRIPTHANDLER=y -CONFIG_HANDLER_IN_LUA=y -CONFIG_EMBEDDED_LUA_HANDLER=y -CONFIG_EMBEDDED_LUA_HANDLER_SOURCE="swupdate_handlers.lua" diff --git a/recipes-core/swupdate/files/swupdate_defconfig_mtd.snippet b/recipes-core/swupdate/files/swupdate_defconfig_mtd.snippet deleted file mode 100644 index eab98dd..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig_mtd.snippet +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MTD=y diff --git a/recipes-core/swupdate/files/swupdate_defconfig_u-boot.snippet b/recipes-core/swupdate/files/swupdate_defconfig_u-boot.snippet deleted file mode 100644 index 6b5832a..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig_u-boot.snippet +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_UBOOT=y -CONFIG_UBOOT_FWENV="/etc/fw_env.config" -CONFIG_BOOTLOADERHANDLER=y diff --git a/recipes-core/swupdate/files/swupdate_defconfig_ubi.snippet b/recipes-core/swupdate/files/swupdate_defconfig_ubi.snippet deleted file mode 100644 index d1c7732..0000000 --- a/recipes-core/swupdate/files/swupdate_defconfig_ubi.snippet +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_UBIVOL=y -CONFIG_UBIATTACH=y -CONFIG_UBIBLACKLIST="" -CONFIG_UBIWHITELIST="" -CONFIG_UBIVIDOFFSET=0 -CONFIG_CFI=y diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb deleted file mode 100644 index a29a797..0000000 --- a/recipes-core/swupdate/swupdate.bb +++ /dev/null @@ -1,48 +0,0 @@ -# -# CIP Core, generic profile -# -# Copyright (c) Siemens AG, 2020 -# -# Authors: -# Quirin Gylstorff <quirin.gylstorff@...> -# -# SPDX-License-Identifier: MIT - -DESCRIPTION = "swupdate utility for software updates" -HOMEPAGE= "https://github.com/sbabic/swupdate" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "git://github.com/sbabic/swupdate.git;branch=master;protocol=https" - -SRCREV = "47a1246435fdb78fba15cc969596994130412956" -PV = "2021.4-git+isar" - -DEFCONFIG := "swupdate_defconfig" - -SRC_URI += "file://debian \ - file://${DEFCONFIG} \ - file://${PN}.cfg" - -DEBIAN_DEPENDS = "${shlibs:Depends}, ${misc:Depends}" - -inherit dpkg -inherit swupdate-config - -KFEATURES += "luahandler" - -S = "${WORKDIR}/git" - -TEMPLATE_FILES = "debian/changelog.tmpl debian/control.tmpl debian/rules.tmpl" -TEMPLATE_VARS += "BUILD_DEB_DEPENDS DEFCONFIG DEBIAN_DEPENDS" - -do_prepare_build() { - cp -R ${WORKDIR}/debian ${S} - - install -m 0644 ${WORKDIR}/${PN}.cfg ${S}/swupdate.cfg - install -m 0644 ${WORKDIR}/${DEFCONFIG}.gen ${S}/configs/${DEFCONFIG} - - if ! grep -q "configs/${DEFCONFIG}" ${S}/.gitignore; then - echo "configs/${DEFCONFIG}" >> ${S}/.gitignore - fi -} -- 2.30.2
|
|
|
|
[isar-cip-core][PATCH 2/4] swupdate: Use dpkg-gbp build with salsa
Quirin Gylstorff
From: Quirin Gylstorff <quirin.gylstorff@...>
This reduce the maintaince effort for SWUpdate in Debian 11(Bullseye) and later. Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> --- conf/distro/cip-core-bullseye.conf | 1 + conf/distro/cip-core-buster.conf | 1 + ...dd-option-to-build-with-efibootguard.patch | 39 ++++++++++ .../0002-debian-rules-Add-CONFIG_MTD.patch | 27 +++++++ ...-debian-config-Make-signing-optional.patch | 40 +++++++++++ ...onfig-Make-image-encryption-optional.patch | 40 +++++++++++ ...ules-Add-Embedded-Lua-handler-option.patch | 30 ++++++++ ...es-Add-option-to-disable-fs-creation.patch | 47 ++++++++++++ ...ules-Add-option-to-disable-webserver.patch | 42 +++++++++++ ...Make-CONFIG_HW_COMPATIBILTY-optional.patch | 40 +++++++++++ ...ules-Add-Embedded-Lua-handler-option.patch | 30 ++++++++ ...prepare-build-for-isar-debian-buster.patch | 72 +++++++++++++++++++ recipes-core/swupdate/swupdate.inc | 54 ++++++++++++++ .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 47 ++++++++++++ 14 files changed, 510 insertions(+) create mode 100644 recipes-core/swupdate/files/0001-debian-Add-option-to-build-with-efibootguard.patch create mode 100644 recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch create mode 100644 recipes-core/swupdate/files/0003-debian-config-Make-signing-optional.patch create mode 100644 recipes-core/swupdate/files/0004-debian-config-Make-image-encryption-optional.patch create mode 100644 recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch create mode 100644 recipes-core/swupdate/files/0005-debian-rules-Add-option-to-disable-fs-creation.patch create mode 100644 recipes-core/swupdate/files/0006-debian-rules-Add-option-to-disable-webserver.patch create mode 100644 recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch create mode 100644 recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch create mode 100644 recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch create mode 100644 recipes-core/swupdate/swupdate.inc create mode 100644 recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf index 38014b4..9357b6c 100644 --- a/conf/distro/cip-core-bullseye.conf +++ b/conf/distro/cip-core-bullseye.conf @@ -14,3 +14,4 @@ require cip-core-common.inc PREFERRED_VERSION_linux-cip ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" +PREFERRED_VERSION_swupdate ?= "2021.04-1+debian-gbp" diff --git a/conf/distro/cip-core-buster.conf b/conf/distro/cip-core-buster.conf index c5cb39c..61fcb41 100644 --- a/conf/distro/cip-core-buster.conf +++ b/conf/distro/cip-core-buster.conf @@ -14,3 +14,4 @@ require cip-core-common.inc PREFERRED_VERSION_linux-cip ?= "4.19.%" PREFERRED_VERSION_linux-cip-rt ?= "4.19.%" +PREFERRED_VERSION_swupdate ?= "2021.4-git+isar" 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 new file mode 100644 index 0000000..00f9a5f --- /dev/null +++ b/recipes-core/swupdate/files/0001-debian-Add-option-to-build-with-efibootguard.patch @@ -0,0 +1,39 @@ +From fe3f090e3764e1e2625d509a56bd521bab507ce7 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +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@...> +--- + 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/0002-debian-rules-Add-CONFIG_MTD.patch b/recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch new file mode 100644 index 0000000..0921aef --- /dev/null +++ b/recipes-core/swupdate/files/0002-debian-rules-Add-CONFIG_MTD.patch @@ -0,0 +1,27 @@ +From 43365f98d70d83dac42913ff907a8a9dd25a4333 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Wed, 29 Sep 2021 11:29:57 +0200 +Subject: [PATCH 2/9] debian/rules: Add CONFIG_MTD + +if pkg.swupdate.bpo is set CONFIG_MTD is disable but not enabled. + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + debian/rules | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/debian/rules b/debian/rules +index c076839..292133b 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -20,6 +20,7 @@ endif + override_dh_auto_configure: + cp debian/configs/defconfig configs/debian_defconfig + ifeq (,$(filter pkg.swupdate.bpo,$(DEB_BUILD_PROFILES))) ++ echo CONFIG_MTD=y >> configs/debian_defconfig + echo CONFIG_SWUFORWARDER_HANDLER=y >> configs/debian_defconfig + echo CONFIG_CFI=y >> configs/debian_defconfig + echo CONFIG_CFIHAMMING1=y >> configs/debian_defconfig +-- +2.30.2 + 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 new file mode 100644 index 0000000..347b316 --- /dev/null +++ b/recipes-core/swupdate/files/0003-debian-config-Make-signing-optional.patch @@ -0,0 +1,40 @@ +From 37f9afeeac5483f677b5be41b3d31e6557fcc146 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +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@...> +--- + 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/0004-debian-config-Make-image-encryption-optional.patch b/recipes-core/swupdate/files/0004-debian-config-Make-image-encryption-optional.patch new file mode 100644 index 0000000..45990f8 --- /dev/null +++ b/recipes-core/swupdate/files/0004-debian-config-Make-image-encryption-optional.patch @@ -0,0 +1,40 @@ +From b0cfcc9980c6daf6383c6dc51fdbe90e1c7625d5 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Wed, 29 Sep 2021 15:28:21 +0200 +Subject: [PATCH 4/9] debian/config: Make image encryption optional + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + 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 f959e44..8e1a810 100644 +--- a/debian/configs/defconfig ++++ b/debian/configs/defconfig +@@ -3,7 +3,6 @@ CONFIG_HW_COMPATIBILITY=y + CONFIG_DOWNLOAD=y + CONFIG_DOWNLOAD_SSL=y + CONFIG_SIGALG_CMS=y +-CONFIG_ENCRYPTED_IMAGES=y + CONFIG_SURICATTA=y + CONFIG_SURICATTA_SSL=y + CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER=y +diff --git a/debian/rules b/debian/rules +index 4793c84..6d32d50 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -42,6 +42,9 @@ endif + ifeq (,$(filter pkg.swupdate.nosigning,$(DEB_BUILD_PROFILES))) + echo CONFIG_SIGNED_IMAGES=y >> configs/debian_defconfig + endif ++ifeq (,$(filter pkg.swupdate.noencryption,$(DEB_BUILD_PROFILES))) ++ echo CONFIG_ENCRYPTED_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-Embedded-Lua-handler-option.patch b/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch new file mode 100644 index 0000000..84665cd --- /dev/null +++ b/recipes-core/swupdate/files/0005-debian-rules-Add-Embedded-Lua-handler-option.patch @@ -0,0 +1,30 @@ +From 0200687ad67d6e5a0e9bbdf2e8c86e3f8e717c5e Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Wed, 29 Sep 2021 11:32:41 +0200 +Subject: [PATCH 5/6] debian/rules: Add Embedded Lua handler option + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + debian/rules | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/debian/rules b/debian/rules +index 69fd790..9ace348 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -52,7 +52,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 ++ifneq (,$(filter pkg.swupdate.embeddedlua,$(DEB_BUILD_PROFILES))) ++ echo CONFIG_EMBEDDED_LUA_HANDLER=y >> configs/debian_defconfig ++ echo CONFIG_EMBEDDED_LUA_HANDLER_SOURCE=\"/usr/share/lua/$(LUA_VERSION)/swupdate_handlers.lua\" >> configs/debian_defconfig + endif ++endif ++ + echo CONFIG_EXTRA_CFLAGS=\"$(CFLAGS) $(CPPFLAGS)\" >> configs/debian_defconfig + echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig + echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig +-- +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/0005-debian-rules-Add-option-to-disable-fs-creation.patch new file mode 100644 index 0000000..1121923 --- /dev/null +++ b/recipes-core/swupdate/files/0005-debian-rules-Add-option-to-disable-fs-creation.patch @@ -0,0 +1,47 @@ +From 22a96e95676123c6ce8800b9d911402704dce9e2 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Mon, 4 Oct 2021 17:15:56 +0200 +Subject: [PATCH 5/9] debian/rules: Add option to disable fs creation + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + debian/configs/defconfig | 4 ---- + debian/rules | 7 +++++++ + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/debian/configs/defconfig b/debian/configs/defconfig +index 8e1a810..d011deb 100644 +--- a/debian/configs/defconfig ++++ b/debian/configs/defconfig +@@ -9,10 +9,6 @@ CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER=y + CONFIG_WEBSERVER=y + CONFIG_MONGOOSESSL=y + CONFIG_ZSTD=y +-CONFIG_DISKPART=y +-CONFIG_DISKFORMAT=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 +--- a/debian/rules ++++ b/debian/rules +@@ -45,6 +45,13 @@ 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 ++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/0006-debian-rules-Add-option-to-disable-webserver.patch b/recipes-core/swupdate/files/0006-debian-rules-Add-option-to-disable-webserver.patch new file mode 100644 index 0000000..23a456d --- /dev/null +++ b/recipes-core/swupdate/files/0006-debian-rules-Add-option-to-disable-webserver.patch @@ -0,0 +1,42 @@ +From 9caabe416aca7ca2bf1cd2d8be89cfc89cedf6cd Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Mon, 4 Oct 2021 17:27:11 +0200 +Subject: [PATCH 6/9] debian/rules: Add option to disable webserver + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + debian/configs/defconfig | 2 -- + debian/rules | 4 ++++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/debian/configs/defconfig b/debian/configs/defconfig +index d011deb..337fcce 100644 +--- a/debian/configs/defconfig ++++ b/debian/configs/defconfig +@@ -6,8 +6,6 @@ CONFIG_SIGALG_CMS=y + CONFIG_SURICATTA=y + CONFIG_SURICATTA_SSL=y + CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER=y +-CONFIG_WEBSERVER=y +-CONFIG_MONGOOSESSL=y + CONFIG_ZSTD=y + CONFIG_UNIQUEUUID=y + CONFIG_RAW=y +diff --git a/debian/rules b/debian/rules +index 9349c22..4574b18 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -39,6 +39,10 @@ else ifneq (,$(filter pkg.swupdate.efibootguard,$(DEB_BUILD_PROFILES))) + else + echo CONFIG_BOOTLOADER_NONE=y >> configs/debian_defconfig + endif ++ifeq (,$(filter pkg.swupdate.nowebserver,$(DEB_BUILD_PROFILES))) ++ echo CONFIG_WEBSERVER=y >> configs/debian_defconfig ++ echo CONFIG_MONGOOSESSL=y >> configs/debian_defconfig ++endif + ifeq (,$(filter pkg.swupdate.nosigning,$(DEB_BUILD_PROFILES))) + echo CONFIG_SIGNED_IMAGES=y >> configs/debian_defconfig + endif +-- +2.30.2 + diff --git a/recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch b/recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch new file mode 100644 index 0000000..c2d37a9 --- /dev/null +++ b/recipes-core/swupdate/files/0007-debian-Make-CONFIG_HW_COMPATIBILTY-optional.patch @@ -0,0 +1,40 @@ +From 538e54a36b24eb6caf49d7dca91598fa9fc86713 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Tue, 5 Oct 2021 10:56:25 +0200 +Subject: [PATCH 7/9] debian: Make CONFIG_HW_COMPATIBILTY optional + +Add option for qemu. + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + 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 337fcce..6fc1137 100644 +--- a/debian/configs/defconfig ++++ b/debian/configs/defconfig +@@ -1,5 +1,4 @@ + CONFIG_SYSTEMD=y +-CONFIG_HW_COMPATIBILITY=y + CONFIG_DOWNLOAD=y + CONFIG_DOWNLOAD_SSL=y + CONFIG_SIGALG_CMS=y +diff --git a/debian/rules b/debian/rules +index 4574b18..9a4b0d4 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 ++ifneq (,$(filter pkg.swupdate.hwcompatibility,$(DEB_BUILD_PROFILES))) ++ echo CONFIG_HW_COMPATIBILITY=y >> configs/debian_defconfig ++endif + ifeq (,$(filter pkg.swupdate.nowebserver,$(DEB_BUILD_PROFILES))) + echo CONFIG_WEBSERVER=y >> configs/debian_defconfig + echo CONFIG_MONGOOSESSL=y >> configs/debian_defconfig +-- +2.30.2 + diff --git a/recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch b/recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch new file mode 100644 index 0000000..44a83c4 --- /dev/null +++ b/recipes-core/swupdate/files/0008-debian-rules-Add-Embedded-Lua-handler-option.patch @@ -0,0 +1,30 @@ +From c2f07b552c6d83562fed5452bc778ae0e5e19cd4 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Wed, 29 Sep 2021 11:32:41 +0200 +Subject: [PATCH 8/9] debian/rules: Add Embedded Lua handler option + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + debian/rules | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/debian/rules b/debian/rules +index 9a4b0d4..a1f73fd 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -66,7 +66,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 ++ifneq (,$(filter pkg.swupdate.embeddedlua,$(DEB_BUILD_PROFILES))) ++ echo CONFIG_EMBEDDED_LUA_HANDLER=y >> configs/debian_defconfig ++ echo CONFIG_EMBEDDED_LUA_HANDLER_SOURCE=\"/usr/share/lua/$(LUA_VERSION)/swupdate_handlers.lua\" >> configs/debian_defconfig + endif ++endif ++ + echo CONFIG_EXTRA_CFLAGS=\"$(CFLAGS) $(CPPFLAGS)\" >> configs/debian_defconfig + echo CONFIG_EXTRA_LDFLAGS=\"$(LDFLAGS)\" >> configs/debian_defconfig + echo CONFIG_EXTRA_LDLIBS=\"$(LDLIBS)\" >> configs/debian_defconfig +-- +2.30.2 + diff --git a/recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch b/recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch new file mode 100644 index 0000000..8462951 --- /dev/null +++ b/recipes-core/swupdate/files/0009-debian-prepare-build-for-isar-debian-buster.patch @@ -0,0 +1,72 @@ +From 16dd48c2282aba91f8fc1f458f7b0c06504cac19 Mon Sep 17 00:00:00 2001 +From: Quirin Gylstorff <quirin.gylstorff@...> +Date: Wed, 29 Sep 2021 16:17:03 +0200 +Subject: [PATCH 9/9] debian: prepare build for isar debian buster + +Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> +--- + debian/compat | 1 + + debian/control | 10 +++++----- + debian/rules | 4 +++- + 3 files changed, 9 insertions(+), 6 deletions(-) + create mode 100644 debian/compat + +diff --git a/debian/compat b/debian/compat +new file mode 100644 +index 0000000..f599e28 +--- /dev/null ++++ b/debian/compat +@@ -0,0 +1 @@ ++10 +diff --git a/debian/control b/debian/control +index 6031537..710cb2d 100644 +--- a/debian/control ++++ b/debian/control +@@ -4,7 +4,7 @@ Priority: optional + Maintainer: Stefano Babic <sbabic@...> + Uploaders: SZ Lin (林上智) <szlin@...>, + Nobuhiro Iwamatsu <iwamatsu@...> +-Build-Depends: debhelper-compat (= 13), ++Build-Depends: debhelper, + dh-lua:native <!nolua>, + liblua5.2-dev <!nolua>, + libfdisk-dev, +@@ -23,10 +23,10 @@ Build-Depends: debhelper-compat (= 13), + libzstd-dev, + libp11-kit-dev <pkg.swupdate.p11>, + libwolfssl-dev <pkg.swupdate.p11>, +- libmtd-dev <!pkg.swupdate.bpo>, +- libubi-dev <!pkg.swupdate.bpo>, +- libwebsockets-dev (>= 3.2.0) <!pkg.swupdate.bpo>, +- liburiparser-dev <!pkg.swupdate.bpo>, ++ libmtd-dev <pkg.swupdate.mtd> <pkg.swupdate.ubi>, ++ libubi-dev <pkg.swupdate.ubi>, ++ libwebsockets-dev, ++ liburiparser-dev, + libubootenv-dev <pkg.swupdate.uboot>, + efibootguard-dev <pkg.swupdate.efibootguard>, + libcmocka-dev, +diff --git a/debian/rules b/debian/rules +index a1f73fd..a2ae1ac 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -19,13 +19,15 @@ endif + + override_dh_auto_configure: + cp debian/configs/defconfig configs/debian_defconfig +-ifeq (,$(filter pkg.swupdate.bpo,$(DEB_BUILD_PROFILES))) ++ifneq (,$(filter pkg.swupdate.mtd,$(DEB_BUILD_PROFILES))) + echo CONFIG_MTD=y >> configs/debian_defconfig ++ifneq (,$(filter pkg.swupdate.ubi,$(DEB_BUILD_PROFILES))) + echo CONFIG_SWUFORWARDER_HANDLER=y >> configs/debian_defconfig + echo CONFIG_CFI=y >> configs/debian_defconfig + echo CONFIG_CFIHAMMING1=y >> configs/debian_defconfig + echo CONFIG_UBIVOL=y >> configs/debian_defconfig + echo CONFIG_SSBLSWITCH=y >> configs/debian_defconfig ++endif + else + echo "# CONFIG_MTD is not set" >> configs/debian_defconfig + endif +-- +2.30.2 + diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc new file mode 100644 index 0000000..a7fd662 --- /dev/null +++ b/recipes-core/swupdate/swupdate.inc @@ -0,0 +1,54 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@...> +# +# SPDX-License-Identifier: MIT + +DESCRIPTION = "swupdate utility for software updates" +HOMEPAGE= "https://github.com/sbabic/swupdate" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" + + +def get_bootloader_build_profile(d): + bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "" + if bootloader == "efibootguard": + return "pkg.swupdate.efibootguard" + if bootloader == "u-boot": + return "pkg.swupdate.uboot" + return "" + +SWUPDATE_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}" + +def get_bootloader_dependencies(d): + bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "" + if bootloader == "efibootguard": + return "efibootguard-dev" + if bootloader == "u-boot": + if d.getVar("U_BOOT_CONFIG_PACKAGE", True) == "1": + return "libubootenv u-boot-{}-config".format(d.getVar("MACHINE", TRUE)) + else: + return "libubootenv" + return "" + +DEPENDS += "${@get_bootloader_dependencies(d)}" +DEPENDS += "${@bb.utils.contains('SWUPDATE_BUILD_PROFILES', 'mtd', 'mtd-utils', '', d)}" + +do_install_builddeps_prepend() { + export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}" +} + +dpkg_runbuild_prepend() { + export DEB_BUILD_PROFILES="${SWUPDATE_BUILD_PROFILES}" +} + +python do_check_bootloader () { + bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "None" + if not bootloader in ["efibootguard", "u-boot"]: + bb.warn("swupdate: SWUPDATE_BOOTLOADER set to incompatible value: " + bootloader) +} +addtask check_bootloader before do_fetch diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb new file mode 100644 index 0000000..3b8da36 --- /dev/null +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb @@ -0,0 +1,47 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021 +# +# Authors: +# Quirin Gylstorff <quirin.gylstorff@...> +# +# SPDX-License-Identifier: MIT + +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" + +# add options to DEB_BUILD_PROFILES +SRC_URI += "file://0001-debian-Add-option-to-build-with-efibootguard.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" + +# deactivate signing and encryption for simple a/b rootfs update +SWUPDATE_BUILD_PROFILES += "pkg.swupdate.nosigning pkg.swupdate.noencryption" + +# If the luahandler shall be embedded into the swupdate binary +# include the following lines. +# DEPENDS += "swupdate-handlers" +# GBP_DEPENDS += "swupdate-handlers" +# SWUPDATE_BUILD_PROFILES += "pkg.swupdate.embeddedlua" + +# modify for debian buster build +SRC_URI_append_cip-core-buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" + +# disable documentation due to missing packages in debian buster +# disable create filesystem due to missing symbols in debian buster +# disable webserver due to missing symbols in debian buster +SWUPDATE_BUILD_PROFILES_append_cip-core-buster = " nodoc \ + pkg.swupdate.nocreatefs \ + pkg.swupdate.nowebserver " +# set compression to xz +GBP_EXTRA_OPTIONS += "--git-compression=xz" -- 2.30.2
|
|
|
|
[isar-cip-core][PATCH 3/4] swupdate-handler: Use same lua version as swupdate-debian-gbp
Quirin Gylstorff
From: Quirin Gylstorff <quirin.gylstorff@...>
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@...> --- .../swupdate-handlers/swupdate-handlers_0.1.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-core/swupdate-handlers/swupdate-handlers_0.1.bb b/recipes-core/swupdate-handlers/swupdate-handlers_0.1.bb index b6cb30d..b96a6af 100644 --- a/recipes-core/swupdate-handlers/swupdate-handlers_0.1.bb +++ b/recipes-core/swupdate-handlers/swupdate-handlers_0.1.bb @@ -10,26 +10,25 @@ inherit dpkg-raw -DEPENDS = "swupdate" -DEBIAN_DEPENDS = "swupdate" - SRC_URI += " ${@ 'git://gitlab.com/cip-project/cip-sw-updates/swupdate-handler-roundrobin.git;protocol=https;destsuffix=swupdate-handler-roundrobin;name=swupdate-handler-roundrobin;nobranch=1' \ if d.getVar('SWUPDATE_USE_ROUND_ROBIN_HANDLER_REPO') == '1' else '' \ }" SRCREV_swupdate-handler-roundrobin ?= "6f561f136fdbe51d2e9066b934dfcb06b94c6624" SWUPDATE_USE_ROUND_ROBIN_HANDLER_REPO ?= "1" -SWUPDATE_LUASCRIPT ?= "swupdate-handler-roundrobin/swupdate_handlers_roundrobin.lua" +SWUPDATE_LUASCRIPT ?= "${@ 'swupdate-handler-roundrobin/swupdate_handlers_roundrobin.lua' \ + if d.getVar('SWUPDATE_USE_ROUND_ROBIN_HANDLER_REPO') == '1' else '' }" SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG ?= "swupdate.handler.${SWUPDATE_BOOTLOADER}.ini" SRC_URI += "${@('file://' + d.getVar('SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG')) if d.getVar('SWUPDATE_BOOTLOADER') else ''}" +# lua version 5.2 is currently hard coded in swupdate @ debian salsa do_install[cleandirs] = "${D}/etc \ - ${D}/usr/share/lua/5.3" + ${D}/usr/share/lua/5.2" do_install() { if [ -e ${WORKDIR}/${SWUPDATE_LUASCRIPT} ]; then - install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${D}/usr/share/lua/5.3/swupdate_handlers.lua + install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${D}/usr/share/lua/5.2/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 -- 2.30.2
|
|
|