I plan to release. but now some problems with health, time and some others
Hi Andrey,
I hope things are going better. To help out, I made an attempt to do a dry run merge with the latest code from asuswrt-merlin, and although I am stuck now, I wanted to share what I have found to potentially save you some time.
Merge Conflicts:
- Merge conflict in release/src/router/Makefile: In GPL 378_4950, a few flags got added to a couple of lines that are causing a merge conflict. More specifically this is the blame. In my dry run, I took Asus's code and added --strip-unneeded which you were using.
- Merge conflict in release/src/router/rc/init.c: In GPL 378_4585, Asus added a country code check when setting "sb/1/eu_edthresh2g" in nvram to "-69" for CE adaptivity certification. Here is where this merge conflict happened.
- Merge conflict in Readme.md: I ignored the upstream changes and took rt-n changes.
Build Issue:
I used assarbad/build-asuswrt-merlin script on Ubuntu 14.04 and the script. The script created the .TRX file for the latest code in asuswrt-merlin. It did not create the image for your latest github code for rt-n {make[3]: *** [libxml2] Error 2}, but it looks like that in my merged code build script even fails to scan through and create the ./config.status when attempting to build libxml2 like the current rt-n code that you have. The build script in my merge ends with the following is how the build script ended:
====
Enabled Schematron support
Enabled Schemas/Relax-NG support
Disabling code coverage for GCC
checking that generated files are newer than configure... done
configure: creating ./config.status
Done configuring
make[4]: Leaving directory `~/release/src/router/libxml2'
make[3]: *** [libxml2] Error 2
make[3]: Leaving directory `~/release/src/router'
make[2]: *** [all] Error 2
make[2]: Leaving directory `~/release/src-rt'
make[1]: *** [bin] Error 2
make[1]: Leaving directory `~/release/src-rt'
make: *** [rt-n16] Error 2
make: Leaving directory `~/release/src-rt'
Your image can be found here:
release/src-rt/image/*.trx
CLEANUP: extended cleanup of source tree changes
+ mv ~/release/src/router/libxml2/configure.in.BAK-build-image ~/release/src/router/libxml2/configure.in
+ mv ~/release/src/router/wpa_supplicant-0.7.3/wpa_supplicant/defconfig.BAK-build-image ~/release/src/router/wpa_supplicant-0.7.3/wpa_supplicant/defconfig
+ mv ~/release/src/router/wpa_supplicant/wpa_supplicant/defconfig.BAK-build-image ~/release/src/router/wpa_supplicant/wpa_supplicant/defconfig
Runtime: 16:30
====