Advertisement
Guest User

Untitled

a guest
Sep 9th, 2016
196
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.71 KB | None | 0 0
  1. daniel@daniel-desktop:~/source$ git am /home/daniel/Downloads/swrt-2016-09-07/*Applying: squashfs4: use upstream xz compression header format
  2. error: target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch: does not exist in index
  3. error: target/linux/generic/patches-4.1/520-squashfs_update_xz_comp_opts.patch: does not exist in index
  4. error: target/linux/generic/patches-4.4/520-squashfs_update_xz_comp_opts.patch: does not exist in index
  5. error: patch failed: tools/squashfs4/patches/160-expose_lzma_xz_options.patch:40
  6. error: tools/squashfs4/patches/160-expose_lzma_xz_options.patch: patch does not apply
  7. Patch failed at 0001 squashfs4: use upstream xz compression header format
  8. The copy of the patch that failed is found in: .git/rebase-apply/patch
  9. When you have resolved this problem, run "git am --continue".
  10. If you prefer to skip this patch, run "git am --skip" instead.
  11. To restore the original branch and stop patching, run "git am --abort".
  12. daniel@daniel-desktop:~/source$ git am --skip
  13. Applying: kernel: remove switch driver kmod packages
  14. error: package/kernel/linux/modules/dsa.mk: does not exist in index
  15. Patch failed at 0002 kernel: remove switch driver kmod packages
  16. The copy of the patch that failed is found in: .git/rebase-apply/patch
  17. When you have resolved this problem, run "git am --continue".
  18. If you prefer to skip this patch, run "git am --skip" instead.
  19. To restore the original branch and stop patching, run "git am --abort".
  20. daniel@daniel-desktop:~/source$ git am --skip
  21. Applying: kernel: add kmod-ubi
  22. Applying: kernel: add kmod-fs-ubifs
  23. Applying: perf: fix automagic libcrypto dependency
  24. error: patch failed: package/devel/perf/Makefile:49
  25. error: package/devel/perf/Makefile: patch does not apply
  26. Patch failed at 0005 perf: fix automagic libcrypto dependency
  27. The copy of the patch that failed is found in: .git/rebase-apply/patch
  28. When you have resolved this problem, run "git am --continue".
  29. If you prefer to skip this patch, run "git am --skip" instead.
  30. To restore the original branch and stop patching, run "git am --abort".
  31. daniel@daniel-desktop:~/source$ git am --skip
  32. Applying: perf: drop sched_getcpu wrapper
  33. error: patch failed: package/devel/perf/musl-compat.h:7
  34. error: package/devel/perf/musl-compat.h: patch does not apply
  35. Patch failed at 0006 perf: drop sched_getcpu wrapper
  36. The copy of the patch that failed is found in: .git/rebase-apply/patch
  37. When you have resolved this problem, run "git am --continue".
  38. If you prefer to skip this patch, run "git am --skip" instead.
  39. To restore the original branch and stop patching, run "git am --abort".
  40. daniel@daniel-desktop:~/source$ git am --skip
  41. Applying: strace: bump to 4.13
  42. error: patch failed: package/devel/strace/Makefile:1
  43. error: package/devel/strace/Makefile: patch does not apply
  44. Patch failed at 0007 strace: bump to 4.13
  45. The copy of the patch that failed is found in: .git/rebase-apply/patch
  46. When you have resolved this problem, run "git am --continue".
  47. If you prefer to skip this patch, run "git am --skip" instead.
  48. To restore the original branch and stop patching, run "git am --abort".
  49. daniel@daniel-desktop:~/source$ git am --skip
  50. Applying: sysupgrade: fix flashing factory images
  51. Applying: kernel: drop files support
  52. error: patch failed: include/kernel.mk:31
  53. error: include/kernel.mk: patch does not apply
  54. error: patch failed: include/quilt.mk:89
  55. error: include/quilt.mk: patch does not apply
  56. error: patch failed: package/kernel/linux/modules/crypto.mk:631
  57. error: package/kernel/linux/modules/crypto.mk: patch does not apply
  58. error: patch failed: package/kernel/linux/modules/leds.mk:54
  59. error: package/kernel/linux/modules/leds.mk: patch does not apply
  60. Patch failed at 0009 kernel: drop files support
  61. The copy of the patch that failed is found in: .git/rebase-apply/patch
  62. When you have resolved this problem, run "git am --continue".
  63. If you prefer to skip this patch, run "git am --skip" instead.
  64. To restore the original branch and stop patching, run "git am --abort".
  65. daniel@daniel-desktop:~/source$ git am --skip
  66. Applying: kmod-swconfig: add package
  67. .git/rebase-apply/patch:1302: trailing whitespace.
  68.  
  69. .git/rebase-apply/patch:1314: new blank line at EOF.
  70. +
  71. warning: 2 lines add whitespace errors.
  72. Applying: kmod-switch-mvsw61xx: add package
  73. Applying: swconfig: add missing dep kmod-swconfig
  74. Applying: kmod-ledtrig-morse: add package
  75. .git/rebase-apply/patch:56: new blank line at EOF.
  76. +
  77. warning: 1 line adds whitespace errors.
  78. Applying: kmod-ledtrig-netdev: add package
  79. Applying: kmod-ledtrig-usbdev: add package
  80. .git/rebase-apply/patch:217: space before tab in indent.
  81. struct device_attribute *attr,
  82. warning: 1 line adds whitespace errors.
  83. Applying: kmod-ledtrig-disk: add module
  84. Applying: cryptodev-linux: add to base
  85. Applying: openssl: fix dependencies for using cryptodev
  86. error: patch failed: package/libs/openssl/Makefile:26
  87. error: package/libs/openssl/Makefile: patch does not apply
  88. Patch failed at 0018 openssl: fix dependencies for using cryptodev
  89. The copy of the patch that failed is found in: .git/rebase-apply/patch
  90. When you have resolved this problem, run "git am --continue".
  91. If you prefer to skip this patch, run "git am --skip" instead.
  92. To restore the original branch and stop patching, run "git am --abort".
  93. daniel@daniel-desktop:~/source$ git am --skip
  94. Applying: netifd-hooks-mac80211: add package
  95. .git/rebase-apply/patch:323: trailing whitespace.
  96.  
  97. .git/rebase-apply/patch:948: new blank line at EOF.
  98. +
  99. warning: 2 lines add whitespace errors.
  100. Applying: kmod-net-cfg80211: add module
  101. Applying: kmod-net-mac80211: add module
  102. Applying: hostapd: support in kernel cfg80211 and mac80211
  103. error: patch failed: package/network/services/hostapd/Makefile:27
  104. error: package/network/services/hostapd/Makefile: patch does not apply
  105. Patch failed at 0022 hostapd: support in kernel cfg80211 and mac80211
  106. The copy of the patch that failed is found in: .git/rebase-apply/patch
  107. When you have resolved this problem, run "git am --continue".
  108. If you prefer to skip this patch, run "git am --skip" instead.
  109. To restore the original branch and stop patching, run "git am --abort".
  110. daniel@daniel-desktop:~/source$ git am --skip
  111. Applying: iwinfo: support in kernel cfg80211 and mac80211
  112. Applying: mwlwifi-firmware: add package
  113. Applying: kmod-mwlwifi-nocompat: add package
  114. Applying: initramfs: generic support
  115. Applying: initramfs-busybox: add package
  116. Applying: initramfs-mvebu: add package
  117. Applying: procd: initramfs
  118. .git/rebase-apply/patch:32: space before tab in indent.
  119. unsigned int oldumask = umask(0);
  120. .git/rebase-apply/patch:33: trailing whitespace.
  121.  
  122. .git/rebase-apply/patch:38: space before tab in indent.
  123. mount("cgroup", "/sys/fs/cgroup", "cgroup", MS_NODEV | MS_NOEXEC | MS_NOSUID, 0);
  124. .git/rebase-apply/patch:41: space before tab in indent.
  125. ignore(symlink("/tmp/shm", "/dev/shm"));
  126. .git/rebase-apply/patch:42: space before tab in indent.
  127. mkdir("/dev/pts", 0755);
  128. error: patch failed: package/base-files/files/etc/preinit:4
  129. error: package/base-files/files/etc/preinit: patch does not apply
  130. Patch failed at 0029 procd: initramfs
  131. The copy of the patch that failed is found in: .git/rebase-apply/patch
  132. When you have resolved this problem, run "git am --continue".
  133. If you prefer to skip this patch, run "git am --skip" instead.
  134. To restore the original branch and stop patching, run "git am --abort".
  135. daniel@daniel-desktop:~/source$ git am --skip
  136. Applying: linux-headers-musl-hacks: add package
  137. Applying: arptables: bump to 2015-05-20 and fix building with musl
  138. .git/rebase-apply/patch:75: trailing whitespace.
  139.  
  140. .git/rebase-apply/patch:77: trailing whitespace.
  141.  
  142. warning: 2 lines add whitespace errors.
  143. Applying: ebtables: musl compat
  144. .git/rebase-apply/patch:109: trailing whitespace.
  145.  
  146. .git/rebase-apply/patch:121: trailing whitespace.
  147.  
  148. .git/rebase-apply/patch:135: trailing whitespace.
  149. --
  150. .git/rebase-apply/patch:137: new blank line at EOF.
  151. +
  152. error: patch failed: package/network/utils/ebtables/patches/100-musl_fix.patch:1
  153. error: package/network/utils/ebtables/patches/100-musl_fix.patch: patch does not apply
  154. Patch failed at 0032 ebtables: musl compat
  155. The copy of the patch that failed is found in: .git/rebase-apply/patch
  156. When you have resolved this problem, run "git am --continue".
  157. If you prefer to skip this patch, run "git am --skip" instead.
  158. To restore the original branch and stop patching, run "git am --abort".
  159. daniel@daniel-desktop:~/source$ git am --skip
  160. Applying: libnetfilter-conntrack: bump to 1.0.6
  161. error: patch failed: package/libs/libnetfilter-conntrack/Makefile:8
  162. error: package/libs/libnetfilter-conntrack/Makefile: patch does not apply
  163. Patch failed at 0033 libnetfilter-conntrack: bump to 1.0.6
  164. The copy of the patch that failed is found in: .git/rebase-apply/patch
  165. When you have resolved this problem, run "git am --continue".
  166. If you prefer to skip this patch, run "git am --skip" instead.
  167. To restore the original branch and stop patching, run "git am --abort".
  168. daniel@daniel-desktop:~/source$ git am --skip
  169. Applying: conntrack-tools: musl compat
  170. error: patch failed: package/network/utils/conntrack-tools/Makefile:16
  171. error: package/network/utils/conntrack-tools/Makefile: patch does not apply
  172. Patch failed at 0034 conntrack-tools: musl compat
  173. The copy of the patch that failed is found in: .git/rebase-apply/patch
  174. When you have resolved this problem, run "git am --continue".
  175. If you prefer to skip this patch, run "git am --skip" instead.
  176. To restore the original branch and stop patching, run "git am --abort".
  177. daniel@daniel-desktop:~/source$ git am --skip
  178. Applying: firewall: musl compat, bump to 2016-08-08
  179. .git/rebase-apply/patch:63: trailing whitespace.
  180.  
  181. .git/rebase-apply/patch:70: trailing whitespace.
  182. --
  183. error: patch failed: package/network/config/firewall/Makefile:8
  184. error: package/network/config/firewall/Makefile: patch does not apply
  185. .git/rebase-apply/patch:72: new blank line at EOF.
  186. +
  187. Patch failed at 0035 firewall: musl compat, bump to 2016-08-08
  188. The copy of the patch that failed is found in: .git/rebase-apply/patch
  189. When you have resolved this problem, run "git am --continue".
  190. If you prefer to skip this patch, run "git am --skip" instead.
  191. To restore the original branch and stop patching, run "git am --abort".
  192. daniel@daniel-desktop:~/source$ git am --skip
  193. Applying: netifd: musl and linux-4.8 compat
  194. .git/rebase-apply/patch:60: trailing whitespace.
  195.  
  196. error: patch failed: package/network/config/netifd/Makefile:1
  197. error: package/network/config/netifd/Makefile: patch does not apply
  198. Patch failed at 0036 netifd: musl and linux-4.8 compat
  199. The copy of the patch that failed is found in: .git/rebase-apply/patch
  200. When you have resolved this problem, run "git am --continue".
  201. If you prefer to skip this patch, run "git am --skip" instead.
  202. To restore the original branch and stop patching, run "git am --abort".
  203. daniel@daniel-desktop:~/source$ git am --skip
  204. Applying: xtables-addons: bump to 2.11 and linux-4.5 compat
  205. .git/rebase-apply/patch:83: trailing whitespace.
  206.  
  207. error: patch failed: package/network/utils/xtables-addons/Makefile:9
  208. error: package/network/utils/xtables-addons/Makefile: patch does not apply
  209. error: package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch: does not exist in index
  210. error: patch failed: package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch:1
  211. error: package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch: patch does not apply
  212. Patch failed at 0037 xtables-addons: bump to 2.11 and linux-4.5 compat
  213. The copy of the patch that failed is found in: .git/rebase-apply/patch
  214. When you have resolved this problem, run "git am --continue".
  215. If you prefer to skip this patch, run "git am --skip" instead.
  216. To restore the original branch and stop patching, run "git am --abort".
  217. daniel@daniel-desktop:~/source$ git am --skip
  218. Applying: xfsprogs: bump to 4.7.0
  219. .git/rebase-apply/patch:105: space before tab in indent.
  220. *total += dirent->d_reclen;
  221. .git/rebase-apply/patch:110: space before tab in indent.
  222. count++;
  223. .git/rebase-apply/patch:111: trailing whitespace.
  224.  
  225. .git/rebase-apply/patch:119: trailing whitespace.
  226.  
  227. .git/rebase-apply/patch:122: trailing whitespace.
  228.  
  229. warning: squelched 17 whitespace errors
  230. warning: 22 lines add whitespace errors.
  231. Applying: linux-atm: fix build with linux 4.8-rc5
  232. .git/rebase-apply/patch:25: trailing whitespace.
  233.  
  234. .git/rebase-apply/patch:26: trailing whitespace.
  235.  
  236. .git/rebase-apply/patch:25: new blank line at EOF.
  237. +
  238. warning: 3 lines add whitespace errors.
  239. Applying: libncurses: restore package
  240. error: patch failed: package/libs/ncurses/Makefile:11
  241. error: package/libs/ncurses/Makefile: patch does not apply
  242. Patch failed at 0040 libncurses: restore package
  243. The copy of the patch that failed is found in: .git/rebase-apply/patch
  244. When you have resolved this problem, run "git am --continue".
  245. If you prefer to skip this patch, run "git am --skip" instead.
  246. To restore the original branch and stop patching, run "git am --abort".
  247. daniel@daniel-desktop:~/source$ git am --skip
  248. Applying: kernel-config: drop KERNEL_PRINTK_TIME
  249. Applying: kmod-crypto-iv: drop module
  250. Applying: kmod-dma-buf: drop module
  251. Applying: kernel: versions
  252. error: patch failed: include/kernel-version.mk:2
  253. error: include/kernel-version.mk: patch does not apply
  254. error: patch failed: include/kernel.mk:30
  255. error: include/kernel.mk: patch does not apply
  256. error: patch failed: include/target.mk:111
  257. error: include/target.mk: patch does not apply
  258. Patch failed at 0044 kernel: versions
  259. The copy of the patch that failed is found in: .git/rebase-apply/patch
  260. When you have resolved this problem, run "git am --continue".
  261. If you prefer to skip this patch, run "git am --skip" instead.
  262. To restore the original branch and stop patching, run "git am --abort".
  263. daniel@daniel-desktop:~/source$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement