-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
connman: refresh patch to apply on 1.36 version
:Release Notes: :Detailed Notes: WARNING: connman-1.36-r0 do_patch: Fuzz detected: Applying patch 0004-Support-WPS-PBC-and-PIN-mode.patch patching file gsupplicant/gsupplicant.h patching file gsupplicant/supplicant.c Hunk #2 succeeded at 2956 (offset 38 lines). Hunk #3 succeeded at 5079 (offset 38 lines). patching file include/device.h Hunk #1 succeeded at 129 with fuzz 1 (offset 3 lines). patching file include/technology.h patching file plugins/wifi.c Hunk #1 succeeded at 61 with fuzz 1. Hunk #2 succeeded at 78 (offset 1 line). Hunk #3 succeeded at 163 (offset 7 lines). Hunk #4 succeeded at 214 (offset 7 lines). Hunk #5 succeeded at 805 (offset 7 lines). Hunk #6 succeeded at 2055 (offset 95 lines). Hunk #7 succeeded at 2277 with fuzz 2 (offset 96 lines). Hunk #8 succeeded at 2303 (offset 96 lines). Hunk #9 succeeded at 2333 (offset 96 lines). Hunk #10 succeeded at 2454 (offset 96 lines). Hunk #11 succeeded at 2499 (offset 95 lines). Hunk #12 succeeded at 2637 (offset 95 lines). Hunk #13 succeeded at 2707 (offset 95 lines). Hunk #14 succeeded at 2773 (offset 95 lines). Hunk #15 succeeded at 2810 (offset 98 lines). Hunk #16 succeeded at 2838 (offset 98 lines). Hunk #17 succeeded at 2848 (offset 98 lines). Hunk #18 succeeded at 2857 (offset 98 lines). Hunk #19 succeeded at 2906 with fuzz 1 (offset 101 lines). Hunk #20 succeeded at 3561 (offset 139 lines). patching file src/connman.h Hunk #1 succeeded at 562 (offset 2 lines). patching file src/device.c Hunk #1 succeeded at 1154 with fuzz 1 (offset 46 lines). patching file src/service.c patching file src/technology.c Hunk #1 succeeded at 1090 (offset -2 lines). Hunk #2 succeeded at 1142 (offset -2 lines). The context lines in the patches can be updated with devtool: devtool modify connman devtool finish --force-patch-refresh connman <layer_path> Don't forget to review changes done by devtool! WARNING: connman-1.36-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Applying patch 0010-Support-channel-frequency-of-scanned-AP.patch patching file gsupplicant/gsupplicant.h patching file gsupplicant/supplicant.c Hunk #2 succeeded at 1121 (offset 2 lines). Hunk #3 succeeded at 1302 (offset 2 lines). Hunk #4 succeeded at 2331 (offset 14 lines). Hunk #5 succeeded at 2488 (offset 14 lines). Hunk #6 succeeded at 6022 (offset 38 lines). patching file include/device.h Hunk #2 succeeded at 92 (offset 1 line). Hunk #3 succeeded at 118 (offset 1 line). Hunk #4 succeeded at 145 (offset 3 lines). patching file include/network.h patching file plugins/wifi.c Hunk #1 succeeded at 170 (offset 6 lines). Hunk #2 succeeded at 187 (offset 6 lines). Hunk #3 succeeded at 2293 (offset 94 lines). Hunk #4 succeeded at 2351 with fuzz 1 (offset 95 lines). Hunk #5 succeeded at 3182 (offset 100 lines). Hunk #6 succeeded at 3202 (offset 100 lines). Hunk #7 succeeded at 3269 (offset 102 lines). Hunk #8 succeeded at 3282 (offset 75 lines). Hunk #9 FAILED at 3224. 1 out of 9 hunks FAILED -- rejects in file plugins/wifi.c patching file src/device.c Hunk #2 succeeded at 563 (offset 22 lines). Hunk #3 succeeded at 829 (offset 38 lines). Hunk #4 succeeded at 874 (offset 38 lines). Hunk #5 succeeded at 1319 (offset 46 lines). patching file src/network.c Hunk #1 succeeded at 51 (offset 7 lines). Hunk #2 succeeded at 66 (offset 7 lines). Hunk #3 succeeded at 107 with fuzz 1 (offset 8 lines). Hunk #4 succeeded at 922 (offset 9 lines). Hunk #5 succeeded at 966 (offset 9 lines). Hunk #6 succeeded at 1728 (offset 9 lines). patching file src/service.c Hunk #1 succeeded at 145 (offset 4 lines). Hunk #2 succeeded at 1574 (offset 15 lines). Hunk #3 succeeded at 2424 (offset 76 lines). Hunk #4 succeeded at 2540 (offset 76 lines). patching file src/technology.c Hunk #4 succeeded at 1257 (offset -2 lines). Hunk #5 succeeded at 1354 (offset -2 lines). Patch 0010-Support-channel-frequency-of-scanned-AP.patch does not apply (enforce with -f) :Testing Performed: Only build tested. :QA Notes: No change to image. :Issues Addressed: [PLAT-77937] Create GPVB with Yocto 2.7 [PLAT-115142] CCC: Upgrade to Yocto 2.7 Warrior Change-Id: Icefeedb4cbf648309db3c73bf95dbc91087ebc89
- Loading branch information
1 parent
eb4edbf
commit c175d91
Showing
9 changed files
with
141 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.