search

quintus-lab / openwrt-rockchip

OpenWRT Official master source code + CTCGFW & Lean's packages code
MIT License
239 stars 50 forks source link

Takedown Notice and other reviews #4

Closed 1715173329 closed 4 years ago

1715173329 commented 4 years ago

https://github.com/quintus-lab/Openwrt-R2S/blob/39edb2ffd40a1a8f4a2f565530f34c31134f5f92/script/zzz-default-settings-18.06#L33 Takedown Notice You have ability to add yourself as a new author, but you must keep original author.

BTW, I've no idea why you used a new one with lots of errors. https://github.com/1715173329/nanopi-r2s-openwrt/blob/master/patches/1806-modify_for_r2s.patch#L9 This is the only change you may need attention.

https://github.com/quintus-lab/Openwrt-R2S/blob/39edb2ffd40a1a8f4a2f565530f34c31134f5f92/step/18.06.sh#L13 https://github.com/quintus-lab/Openwrt-R2S/blob/39edb2ffd40a1a8f4a2f565530f34c31134f5f92/step/18.06.sh#L16 We always keep it up-to-date, and sometimes it's newer than OpenWrt mainline.

https://github.com/quintus-lab/Openwrt-R2S/blob/39edb2ffd40a1a8f4a2f565530f34c31134f5f92/step/18.06.sh#L20 The package had beed added alreadly.

https://github.com/quintus-lab/Openwrt-R2S/blob/39edb2ffd40a1a8f4a2f565530f34c31134f5f92/step/18.06.sh#L39 https://github.com/quintus-lab/Openwrt-R2S/blob/39edb2ffd40a1a8f4a2f565530f34c31134f5f92/step/18.06.sh#L40 I've no idea why you need them.

quintus-lab commented 4 years ago

Sorry & thanks buddy, it's been fixed.

1715173329 commented 4 years ago

Not at all.

https://github.com/quintus-lab/Openwrt-R2S/blob/e595c5488fb135728d7027f5a6d0e23297a598cf/step/18.06.sh#L36 They've been upstreamed alreadly, so it makes no sence to replace them.

https://github.com/quintus-lab/Openwrt-R2S/blob/master/script/zzz-default-settings-18.06 Instead of including the whole file, using patch may be a good idea.

https://github.com/quintus-lab/Openwrt-R2S/blob/e595c5488fb135728d7027f5a6d0e23297a598cf/script/zzz-default-settings-18.06#L26 https://github.com/quintus-lab/Openwrt-R2S/blob/e595c5488fb135728d7027f5a6d0e23297a598cf/script/zzz-default-settings-18.06#L29

They've been upstreamed alreadly.

https://github.com/quintus-lab/Openwrt-R2S/blob/e595c5488fb135728d7027f5a6d0e23297a598cf/script/zzz-default-settings-18.06#L45 Mod20.08 alreadly included the date info, so you may simply change the following line:

- echo "DISTRIB_REVISION='| Mod20.08 by CTCGFW'" >> /etc/openwrt_release
+ echo "DISTRIB_REVISION='| Mod20.08 by CTCGFW | Build by Quintus on $(date +%m.%d)'" >> /etc/openwrt_release

Considering using sed command in 18.06.sh, as date +%m.%d should read from the time which the firmware was generated.

quintus-lab commented 4 years ago

Great, thanks a lot!