Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

patches: openwrt/imagebuilder-custom-postinst-script: does not apply on recent OpenWrt-19.07 #830

Closed
SvenRoederer opened this issue Jul 8, 2020 · 2 comments
Closed

patches: openwrt/imagebuilder-custom-postinst-script: does not apply on recent OpenWrt-19.07 #830

SvenRoederer opened this issue Jul 8, 2020 · 2 comments
Labels
blocker bug

Comments

@SvenRoederer
Copy link
Contributor

SvenRoederer commented Jul 8, 2020 •
edited
Loading

I just tried to compile branch "master-monthly" (c8d5270) and found it fails on patching.

--- Patching module 'openwrt' ---
Applying: tools/mkimake: fix handling of long pathnames
Applying: tools/u-boot: enlage max pathlength for mkimage
Applying: enable "sysupgrade -u" by default
Applying: kernel: avoid underscore in *6lowpan package names
Applying: mac80211_mesh_no_fwding_by_default
Applying: openwrt-release_use_configured_revision
Applying: hostapd_nolegacy_by_default
Applying: imagebuilder-custom-postinst-script
error: patch failed: target/imagebuilder/files/Makefile:105
error: target/imagebuilder/files/Makefile: patch does not apply
Patch failed at 0001 imagebuilder-custom-postinst-script
hint: Use 'git am --show-current-patch' to see the failed patch

So there must be something conflicting in 520581d.
@SvenRoederer
Copy link
Contributor Author

To get such things detected automatically it would be really great to get a CI / CT working. It might be the buildbot or an alternative as discussed in #804 .

To ease updating the patches merging #794 would also much appreciated.

SvenRoederer added a commit that referenced this issue Jul 12, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
835bcb9 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes #830
SvenRoederer added a commit that referenced this issue Jul 15, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
9d62f88 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes #830
@SvenRoederer
Copy link
Contributor Author

fixed by 835bcb9 & 9d62f88 (for daily-branch)

SvenRoederer added a commit to SvenRoederer/freifunk-berlin-firmware that referenced this issue Jul 17, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
baec8f3 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes freifunk-berlin#830
SvenRoederer added a commit that referenced this issue Jul 17, 2020
@SvenRoederer
patches/openwrt: update "imagebuilder-custom-postinst-script" to appl…
276fd81 
…y on OpenWrt HEAD

* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes #830
SvenRoederer added a commit that referenced this issue Jul 17, 2020
@SvenRoederer
patches/openwrt: update "imagebuilder-custom-postinst-script" to appl…
a7dcccf 
…y on OpenWrt HEAD

* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes #830
SvenRoederer added a commit to SvenRoederer/freifunk-berlin-firmware that referenced this issue Jul 17, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
a53ffe9 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes freifunk-berlin#830
SvenRoederer added a commit to SvenRoederer/freifunk-berlin-firmware that referenced this issue Jul 17, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
b2b3d2d 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes freifunk-berlin#830
SvenRoederer added a commit that referenced this issue Sep 4, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
57fc033 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes #830
SvenRoederer added a commit that referenced this issue Sep 7, 2020
@SvenRoederer
patches/openwrt: update the apply on OpenWrt HEAD
0e29db3 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes #830
SvenRoederer added a commit to SvenRoederer/freifunk-berlin-firmware that referenced this issue Sep 9, 2020
@SvenRoederer
patches/openwrt: update to apply on OpenWrt HEAD
94b23ec 
* very likely caused by OpenWrt-commit: 3572711e3cea24dd5276666860f57a2c3a72525e
* fixes freifunk-berlin#830
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
blocker bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@SvenRoederer