| Message ID | 507a19c6164d34669ff09794134257835063af64.1710177387.git.enrico.scholz@sigma-chemnitz.de |
|---|---|
| State | New |
| Headers | show |
| Series | Replace sshd_config patching by snippets | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/2-7-openssh-config-initial-checkin.patch FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files) PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test lic files chksum presence (test_metadata.TestMetadata.test_lic_files_chksum_presence) PASS: test license presence (test_metadata.TestMetadata.test_license_presence) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files) PASS: test summary presence (test_metadata.TestMetadata.test_summary_presence) SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
patchtest@automation.yoctoproject.org writes:
> FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
This failure seems to be bogus; patch creates a new recipe with a new
LIC_FILES_CHKSUM. It does not change/update an existing tag.
Enrico
On 2024-03-11 14:12, Enrico Scholz via lists.openembedded.org wrote: > patchtest@automation.yoctoproject.org writes: > >> FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) > This failure seems to be bogus; patch creates a new recipe with a new > LIC_FILES_CHKSUM. It does not change/update an existing tag. Noted. We'll have to tweak the test... > > > Enrico > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#196963): https://lists.openembedded.org/g/openembedded-core/message/196963 > Mute This Topic: https://lists.openembedded.org/mt/104868543/7611679 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [tgamblin@baylibre.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-connectivity/openssh/openssh-config.bb b/meta/recipes-connectivity/openssh/openssh-config.bb new file mode 100644 index 000000000000..2ef6a770fcfe --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh-config.bb @@ -0,0 +1,30 @@ +SUMMARY = "OE openssh configuration" +DESCRIPTION = "Provides openssh configuration snippets which correspond to IMAGE_FEATURE" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "\ + file://80-oe.conf \ +" + +do_install() { + d=${D}${sysconfdir}/ssh/sshd_config.d + install -d "$d" + install -p -m 0644 \ + ${WORKDIR}/80-oe.conf \ + "$d"/ +} + +python populate_packages:prepend() { + dir = d.expand('${sysconfdir}/ssh/sshd_config.d') + + do_split_packages(d, dir, '^60-(.*)\.conf', + output_pattern='${PN}-%s', + description="openssh config for '%s' feature", + extra_depends='', + prepend=True) +} + +PACKAGES_DYNAMIC = "${PN}-*" + +FILES:${PN} = "${sysconfdir}/ssh/sshd_config.d/80-oe.conf" diff --git a/meta/recipes-connectivity/openssh/openssh-config/80-oe.conf b/meta/recipes-connectivity/openssh/openssh-config/80-oe.conf new file mode 100644 index 000000000000..9a92d3c8d197 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh-config/80-oe.conf @@ -0,0 +1,5 @@ +KbdInteractiveAuthentication no + +Compression no +ClientAliveInterval 15 +ClientAliveCountMax 4 diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb index d500ca6019fe..406b349f8283 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb @@ -191,6 +191,8 @@ RCONFLICTS:${PN}-sshd = "dropbear" CONFFILES:${PN}-sshd = "${sysconfdir}/ssh/sshd_config" CONFFILES:${PN}-ssh = "${sysconfdir}/ssh/ssh_config" +RRECOMMENDS:${PN} += "openssh-config" + ALTERNATIVE_PRIORITY = "90" ALTERNATIVE:${PN}-scp = "scp" ALTERNATIVE:${PN}-ssh = "ssh"