FX merge/build, onu2360

  • Posted on
  • by
  • in

  • Continuing on with merge/build of US_FX branch. Seems this is impedding further development. There were 2 files that required manual merging. I was told to simply copy r_ingress.asmi from 2.3. I'm not particularly comfortable with that because there are merge issues for that file from the 2.2 branch.
  • Tried to figure out why 2.4 was not building onu2360. Seems that onu2360 was not included in the cards script (in /Tools/adm/etc) so the build process was not building it. Added it to cards