[-next] Update dbus and dbus-cynara for YP 2.6
Description
Environment
None
Activity
Walt Miner
September 6, 2019 at 8:36 PM
Close for Halibut 8.0.1 release
jose bollo
June 20, 2019 at 9:03 AM
@Tom Rini I should check your solution in July. That's why I keep the ticket opened.
Tom Rini
November 29, 2018 at 9:56 PM
Note that when we do this update we should also rework how we're applying all of this. As part of looking into eSDK (which sadly has another issue once this is fixed), can really simplify our lives a lot. Leaving out all of the file renames, we can just have dbus_VERSION.bbapppend with:
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI_append_class-target = "\
file://0001-Integration-of-Cynara-asynchronous-security-checks.patch \
file://0002-Disable-message-dispatching-when-send-rule-result-is.patch \
file://0003-Handle-unavailability-of-policy-results-for-broadcas.patch \
file://0004-Add-own-rule-result-unavailability-handling.patch \
file://0005-Perform-Cynara-runtime-policy-checks-by-default.patch \
"
DEPENDS_append_class-target = " cynara smack"
EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynara --disable-selinux','',d)}"
And whatever race condition we had before is no longer present (tested for aarch64 and x86_64).
Jan-Simon Moeller
October 25, 2018 at 11:16 AM
(edited)
It already fails early at dbus-native ...
ERROR: dbus-native-1.12.10-r0 do_patch: Command Error: 'quilt --quiltrc /home/scratch/user/git/AGL/build-next/build-q64/tmp/work/x86_64-linux/dbus-native/1.12.10-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch 0001-Integration-of-Cynara-asynchronous-security-checks.patch
patching file bus/Makefile.am
Hunk #1 succeeded at 13 (offset 4 lines).
Hunk #2 succeeded at 31 (offset 6 lines).
Hunk #3 FAILED at 84.
1 out of 3 hunks FAILED -- rejects in file bus/Makefile.am
patching file bus/bus.c
Hunk #1 FAILED at 37.
Hunk #2 succeeded at 67 (offset 2 lines).
Hunk #3 succeeded at 1004 (offset 15 lines).
Hunk #4 succeeded at 1132 (offset 15 lines).
Hunk #5 succeeded at 1267 (offset 15 lines).
Hunk #6 succeeded at 1468 (offset -5 lines).
Hunk #7 succeeded at 1498 (offset -5 lines).
Hunk #8 succeeded at 1510 (offset -5 lines).
Hunk #9 FAILED at 1540.
Hunk #11 succeeded at 1586 (offset 1 line).
Hunk #12 succeeded at 1616 (offset 1 line).
Hunk #13 succeeded at 1645 (offset 3 lines).
Hunk #14 succeeded at 1667 with fuzz 2 (offset 4 lines).
Hunk #15 succeeded at 1681 (offset 4 lines).
Hunk #16 succeeded at 1692 (offset 4 lines).
Hunk #17 succeeded at 1741 (offset 4 lines).
Hunk #18 succeeded at 1772 (offset 4 lines).
Hunk #19 succeeded at 1804 (offset 4 lines).
Hunk #20 succeeded at 1828 (offset 8 lines).
2 out of 20 hunks FAILED -- rejects in file bus/bus.c
patching file bus/bus.h
Hunk #1 FAILED at 44.
Hunk #2 succeeded at 101 (offset 4 lines).
Hunk #3 FAILED at 132.
2 out of 3 hunks FAILED -- rejects in file bus/bus.h
patching file bus/check.c
patching file bus/check.h
patching file bus/config-parser-common.c
patching file bus/config-parser-common.h
patching file bus/config-parser.c
Hunk #1 succeeded at 1318 (offset 146 lines).
Hunk #2 succeeded at 1360 with fuzz 1 (offset 165 lines).
Hunk #3 succeeded at 1391 (offset 168 lines).
Hunk #4 FAILED at 1232.
Hunk #5 succeeded at 1440 (offset 192 lines).
Hunk #6 FAILED at 1445.
Hunk #7 FAILED at 1527.
Hunk #8 succeeded at 1751 (offset 194 lines).
Hunk #9 succeeded at 1777 (offset 194 lines).
Hunk #10 succeeded at 1792 (offset 194 lines).
Hunk #11 succeeded at 1809 (offset 194 lines).
Hunk #12 succeeded at 1824 (offset 194 lines).
Hunk #13 succeeded at 1848 (offset 194 lines).
Hunk #14 succeeded at 1927 (offset 195 lines).
Hunk #15 succeeded at 1942 (offset 195 lines).
Hunk #16 succeeded at 1951 (offset 195 lines).
Hunk #17 succeeded at 2328 (offset 196 lines).
Hunk #18 succeeded at 2645 (offset 203 lines).
Hunk #19 succeeded at 3173 (offset 265 lines).
3 out of 19 hunks FAILED -- rejects in file bus/config-parser.c
patching file bus/connection.c
Hunk #9 succeeded at 455 (offset -3 lines).
Hunk #10 succeeded at 1089 (offset 15 lines).
Hunk #11 succeeded at 2360 (offset 44 lines).
Hunk #12 FAILED at 2354.
Hunk #13 succeeded at 2416 (offset 46 lines).
1 out of 13 hunks FAILED -- rejects in file bus/connection.c
patching file bus/connection.h
Hunk #2 succeeded at 125 (offset 2 lines).
patching file bus/cynara.c
patching file bus/cynara.h
patching file bus/dispatch.c
Hunk #2 FAILED at 65.
Hunk #3 succeeded at 131 (offset 1 line).
Hunk #4 FAILED at 146.
Hunk #5 FAILED at 381.
3 out of 5 hunks FAILED -- rejects in file bus/dispatch.c
patching file bus/policy.c
Hunk #2 succeeded at 34 (offset 1 line).
Hunk #3 succeeded at 44 (offset 1 line).
Hunk #4 succeeded at 56 (offset 1 line).
Hunk #5 succeeded at 124 with fuzz 2 (offset 5 lines).
Hunk #6 succeeded at 438 (offset 8 lines).
Hunk #7 succeeded at 879 (offset 11 lines).
Hunk #8 succeeded at 903 (offset 11 lines).
Hunk #9 succeeded at 934 (offset 11 lines).
Hunk #10 succeeded at 949 (offset 11 lines).
Hunk #11 succeeded at 972 (offset 11 lines).
Hunk #12 succeeded at 1093 (offset 50 lines).
Hunk #13 succeeded at 1162 (offset 50 lines).
Hunk #14 succeeded at 1185 (offset 50 lines).
Hunk #15 succeeded at 1208 (offset 50 lines).
Hunk #16 succeeded at 1223 (offset 50 lines).
Hunk #17 succeeded at 1246 (offset 50 lines).
Hunk #18 succeeded at 1342 with fuzz 2 (offset 65 lines).
Hunk #19 succeeded at 1429 (offset 65 lines).
patching file bus/policy.h
Hunk #1 succeeded at 46 with fuzz 2 (offset 7 lines).
Hunk #2 succeeded at 64 (offset 7 lines).
Hunk #3 succeeded at 127 (offset 12 lines).
Hunk #4 succeeded at 161 (offset 12 lines).
patching file configure.ac
Hunk #1 succeeded at 1761 (offset -112 lines).
Hunk #2 succeeded at 1854 (offset -109 lines).
patching file test/Makefile.am
Hunk #1 succeeded at 439 with fuzz 2 (offset 98 lines).
patching file test/data/invalid-config-files/badcheck-1.conf
patching file test/data/invalid-config-files/badcheck-2.conf
patching file test/data/valid-config-files/check-1.conf
patching file test/data/valid-config-files/debug-check-some.conf.in
patching file tools/dbus-send.c
Hunk #1 FAILED at 458.
1 out of 1 hunk FAILED -- rejects in file tools/dbus-send.c
Patch 0001-Integration-of-Cynara-asynchronous-security-checks.patch does not apply (enforce with -f)
ERROR: dbus-native-1.12.10-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/scratch/user/git/AGL/build-next/build-q64/tmp/work/x86_64-linux/dbus-native/1.12.10-r0/temp/log.do_patch.23547
ERROR: Task (virtual:native:/home/scratch/user/git/AGL/build-next/poky/meta/recipes-core/dbus/dbus_1.12.10.bb:do_patch) failed with exit code '1'
Fixed
Details
Details
Assignee
jose bollo
jose bolloReporter
Jan-Simon Moeller
Jan-Simon MoellerFix versions
Contract ID
Priority
Created October 25, 2018 at 11:09 AM
Updated September 19, 2019 at 12:07 PM
Resolved August 29, 2019 at 2:05 PM
meta-agl/meta-security-smack/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb
AGL_FIXME_EXTRA_OECONF += "--enable-cynara --disable-selinux"
meta-agl/meta-security-smack/recipes-core/dbus-cynara/dbus_%.bbappend
AGL_FIXME_SRC_URI_append = "\ file://0001-Integration-of-Cynara-asynchronous-security-checks.patch \ file://0002-Disable-message-dispatching-when-send-rule-result-is.patch \ file://0003-Handle-unavailability-of-policy-results-for-broadcas.patch \ file://0004-Add-own-rule-result-unavailability-handling.patch \ file://0005-Perform-Cynara-runtime-policy-checks-by-default.patch \ "
Both need to be uprev'ed (related).
Assigning to @jose bollo as it is related to cynara.
Reproduce:
mkdir build-next ; cd build-next repo init -b next -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo source meta-agl/scripts/aglsetup.sh -m qemux86-64 -b build-systemd agl-demo agl-devel # CHANGE meta-agl/meta-agl-profile-core/recipes-core/systemd/systemd_239.bbappend sed -i -e "s#AGL_FIXME_##g" ../meta-agl/meta-security-smack/recipes-core/dbus-cynara/dbus_%.bbappend sed -i -e "s#AGL_FIXME_##g" meta-agl/meta-security-smack/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb # to include the artifact bitbake dbus-cynara bitbake dbus