BaseTools/Upt: Fix several bugs

1. Fix a bug of generating additional EOL in file header.
2. Fix a bug of format error for Defines section.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yingke Liu <yingke.d.liu@Intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16153 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/UPT/GenMetaFile/GenDecFile.py

@@ -344,7 +344,7 @@ def PackageToDec(Package, DistHeader = None):
     Content += GenHeaderCommentSection(PackageAbstract, \
                                        PackageDescription, \
                                        PackageCopyright, \
-                                       PackageLicense)
+                                       PackageLicense).replace('\r\n', '\n')
 
     #
     # Generate Binary header