From 31c639f2d9f57e0493d4936fd0d4f1302c40c3a3 Mon Sep 17 00:00:00 2001 From: Qubot <1445788683@qq.com> Date: Wed, 18 Oct 2023 19:32:56 +0800 Subject: [PATCH] fix bug change to wiringPi --- external/config/sources/families/sun50iw9.conf | 2 +- output/debug/logs-.tgz | Bin 45 -> 0 bytes output/debug/logs-17_10_2023-17_46_53.tgz | Bin 266 -> 0 bytes output/debug/logs-17_10_2023-17_47_39.tgz | Bin 243 -> 0 bytes output/debug/logs-18_10_2023-09_45_19.tgz | Bin 266 -> 0 bytes output/debug/logs-18_10_2023-10_10_58.tgz | Bin 241 -> 0 bytes output/debug/logs-18_10_2023-10_16_51.tgz | Bin 509 -> 0 bytes output/debug/logs-18_10_2023-10_17_14.tgz | Bin 509 -> 0 bytes output/debug/logs-18_10_2023-10_19_13.tgz | Bin 5535 -> 0 bytes output/debug/output.log | 3 --- output/debug/timestamp | 1 - scripts/distributions.sh | 2 +- scripts/general.sh | 6 +++--- 13 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 output/debug/logs-.tgz delete mode 100644 output/debug/logs-17_10_2023-17_46_53.tgz delete mode 100644 output/debug/logs-17_10_2023-17_47_39.tgz delete mode 100644 output/debug/logs-18_10_2023-09_45_19.tgz delete mode 100644 output/debug/logs-18_10_2023-10_10_58.tgz delete mode 100644 output/debug/logs-18_10_2023-10_16_51.tgz delete mode 100644 output/debug/logs-18_10_2023-10_17_14.tgz delete mode 100644 output/debug/logs-18_10_2023-10_19_13.tgz delete mode 100644 output/debug/output.log delete mode 100644 output/debug/timestamp diff --git a/external/config/sources/families/sun50iw9.conf b/external/config/sources/families/sun50iw9.conf index 117bbb0..39c9512 100644 --- a/external/config/sources/families/sun50iw9.conf +++ b/external/config/sources/families/sun50iw9.conf @@ -96,7 +96,7 @@ family_tweaks_s() SERIALCON="ttyAS0" fi - install_wiringop + install_wiringpi install_docker } diff --git a/output/debug/logs-.tgz b/output/debug/logs-.tgz deleted file mode 100644 index 872c01559ea7ac2302b7d73ae653f7ad29f8981d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45 qcmb2|=3oE==C=nKd4a4$3%>j3@|iDyhyuw5bLLt1WYrlo7#IN4*9i&$ diff --git a/output/debug/logs-17_10_2023-17_46_53.tgz b/output/debug/logs-17_10_2023-17_46_53.tgz deleted file mode 100644 index f1de6625e812ac12b3fad501ac082d4fa6927e1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmb2|=3oE==C>ET{f-#$usvA!Tx1_Z?k|^FtlTWw0r>(^+g&Cf3zhS@Gw)o-QI3x{ z44gdvZ!b)V-Z**B1d;0^#oEPXidmOS&uZq`xrJ`e4KvG)G|yeUN-H?E^6pg0mEO7~ zdaWyL1E0A*DzCM_`hTUhaM`@EjTnmZMx3Pn_YHfrk6o3t@m zZr=B;SubC;9eQw9%6VhP8N0|30Bcjf>9 diff --git a/output/debug/logs-17_10_2023-17_47_39.tgz b/output/debug/logs-17_10_2023-17_47_39.tgz deleted file mode 100644 index 8a67fc32a612e4bd26db47050fc3ac9b176e6a1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmb2|=3oE==C>Do{SF%luqLdp?%K)F>HDZ@R|0Fa!_G#}v diff --git a/output/debug/logs-18_10_2023-09_45_19.tgz b/output/debug/logs-18_10_2023-09_45_19.tgz deleted file mode 100644 index a72018c0d8da61c9c7bbab4d72d1001984a84e7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmb2|=3oE==C>ET{f-#$usvA!Tx1_Z?RMp}O{`6(E6h21qm?f0IK|v~`?BOl2}L<+ zH;$M8&H8e*%O;6WdNeC3FZG<>k~?2&tGj0RZ_L@HxBAw)tY6F4{y^L!)LR+;84YjqAVmVc2a@s8c7Z`qS$8Ak#qJaJ#Pr^4sh zD;pcxS(_HG&gNQdp3QS~QIGYq*SjqJ&%e2$UA<(kXZ2 KJ~C)9FaQ8B)OcS2 diff --git a/output/debug/logs-18_10_2023-10_10_58.tgz b/output/debug/logs-18_10_2023-10_10_58.tgz deleted file mode 100644 index 77756732d6b6aab3d228375a5af2d5302e29f69f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmb2|=3oE==C>ET{SF%lusv8)-L;dUv-h^kt3}#3m`?HfSn*Di@qco>>GtF)zO5B& zxSW3NKO14Z-$eO(?-ZNqG1Zc*wFA4i-JSRPQF5r;YOnnATU(axjxCNVU%S#H_Vog9 z)l})uRT`7_pZ;s|fBCzZS$k_s6PI)bZ&H5$a^HLT>Y_$JRi2xk3shA3d`dsZ%(1`r zGBy87Umo9-winOl%sRPi!?x1vvD@7FWY)&3cUc@eoBmp^C8aL@@Vxdj?!SzFi=;-} jn_}swccb`P>*Sn&zvLMqK0+evZc9J#>ThMxU|;|M{~K&n diff --git a/output/debug/logs-18_10_2023-10_16_51.tgz b/output/debug/logs-18_10_2023-10_16_51.tgz deleted file mode 100644 index 98a17d41aac9d14e0dcb8935cae6c2bf21977f7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 zcmVh^LM5DY8v7$=zU5s{?o!P;|gxMJS7$(Ygqk&|oEQ|dU-G81=i(-@)vwT_> zSvH-IvOJ&TcF2Y*=vefDJAje1HaxZOx%hwTqx8MvJ83%5!h7C{3NE%m7%#1XwMYTp zG@=0?%~pHK)Pwx*R`bUa{+ z6whaQiVIBZ3|F@sn77f@!n2lZsU&{D3TB!7^KOzhR4@CEG_{J2VEgLJVpUtMF)J<~ z4!A2y+}+uyiZVEPx-ps?TyfAli|IUeVtN$)Cc?%x9%`An1*v-_v@l`c2M^M; z_GGaU^>xZATVNZj1^XS>Hn8){uj4Oeel|W&y=M2X-3WgjY|nmit#?eA8|kb`XM5He zJOw0{al@tJYbBty4!F~0fjM6@3$sS;R(SdV*Vwl8@V7`whP=d^{1y+s$jjyTWy;t_ zQ>WJt4ukUw!(3!%$MH@W;kY^sm2i)g;~cgD%lYTD3O@Y!wEB5``}^P-sK#Uh`V z1qRM1S)QNa0ohmu9TR=v4q)P}4bR2>&HtbBUix0~y)+$Y;XUs}1(&-ZjF;BHMkEJs z8qt7{W+$h?TIHdt?u?r~%-AMM)y(|1nr91`z6D=9*$2-wm*!wTJv%nn*0i#Vjt7)T z{(O-qzd%`MxVj5q-bPmo&swgflK6lXEHe4)%`62}|MreFwTg{khw95>U0bbD70p9} z`=Z2s&puU@!O8Q3(cGZLLGLWed7Q-j$ooZvt!+HiT;Z^|dCUt^_eyAC!eI^`q-pKR zax3baq$yiqTdM{888uGmPi1~Sy-2fW58G~pzX`TyKe*O=Cd{pL)}-8?bq2G5 z#4>KVRD7cZwAKN4x-3xhB~_R;YQM(pBebz=>+!otB4al3D&OMKi@aKWT_wdfnmS!S z7#8ORmbu8zkNur6!f`b$m2gj#;~b6w%lRW)1@FFnSbx91Tz_0H)6}BzBEXYbu7+I% z9F&%Z2VBZwsb2dZOArJ>5ClOG1VIo4K@bE%5ClOG1VIo4F($tOrCL~%04M+ent}1( diff --git a/output/debug/logs-18_10_2023-10_19_13.tgz b/output/debug/logs-18_10_2023-10_19_13.tgz deleted file mode 100644 index 932645adfa5c4450826fe1149366782339f9ed21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5535 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 diff --git a/output/debug/output.log b/output/debug/output.log deleted file mode 100644 index ae54591..0000000 --- a/output/debug/output.log +++ /dev/null @@ -1,3 +0,0 @@ -Displaying message: ERROR in function source ./build.sh:305 -> scripts/main.sh:300 -> scripts/general.sh:0 err -Displaying message: No option selected err -Displaying message: Process terminated info diff --git a/output/debug/timestamp b/output/debug/timestamp deleted file mode 100644 index e5efae5..0000000 --- a/output/debug/timestamp +++ /dev/null @@ -1 +0,0 @@ -18_10_2023-10_44_52 diff --git a/scripts/distributions.sh b/scripts/distributions.sh index 576afd8..e423dc3 100755 --- a/scripts/distributions.sh +++ b/scripts/distributions.sh @@ -1046,7 +1046,7 @@ install_opi_specific() install -m 755 "${EXTER}/packages/raspi/bananapi/common/files/bananapi-hardware-optimize.service" "${SDCARD}/usr/lib/systemd/system/" chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable bananapi-hardware-optimize.service >/dev/null 2>&1" - install_wiringop + install_wiringpi rm $SDCARD/root/*.deb >/dev/null 2>&1 } diff --git a/scripts/general.sh b/scripts/general.sh index 19d6ab2..e75ac19 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -1867,7 +1867,7 @@ show_checklist_variables () done } -install_wiringop() +install_wiringpi() { install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.51.deb" chroot "${SDCARD}" /bin/bash -c "apt-mark hold wiringpi" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 @@ -1879,8 +1879,8 @@ install_wiringop() fi - cp ${EXTER}/cache/sources/wiringPi/next ${SDCARD}/usr/src/wiringPi -rfa - cp ${EXTER}/cache/sources/wiringPi-Python/next ${SDCARD}/usr/src/wiringPi-Python -rfa + cp ${EXTER}/cache/sources/wiringPi/main ${SDCARD}/usr/src/wiringPi -rfa + cp ${EXTER}/cache/sources/wiringPi-Python/main ${SDCARD}/usr/src/wiringPi-Python -rfa } install_docker() {