From 8ab91bab70fb3aa8901eba43761a6fe1a6056c41 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 30 Oct 2024 09:35:35 +0800
Subject: [PATCH 1/3] make package support ba deb

---
 mkpkg.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mkpkg.sh b/mkpkg.sh
index 322a7654..48114084 100755
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -53,7 +53,13 @@ case "$1" in
         make deb
         cd $ReleaseDir/"$1"s/$RelArch
         rm -f omc-md5sum.txt
-#        rpm --addsign *.rpm
+        md5sum $DebPkgName >omc-md5sum.txt        
+    ;;
+    ba-deb)
+        cd $EmsBEDir
+        make ba-deb
+        cd $ReleaseDir/"$1"s/$RelArch
+        rm -f omc-md5sum.txt
         md5sum $DebPkgName >omc-md5sum.txt        
     ;;
     *)

From 8348ecc30bbd0c26a5d705857e49b5d669be7a87 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 30 Oct 2024 11:14:43 +0800
Subject: [PATCH 2/3] update make package

---
 makefile | 6 +++---
 mkpkg.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index 8e0abff1..07d31ef9 100644
--- a/makefile
+++ b/makefile
@@ -107,7 +107,7 @@ dist:
 		--exclude=../crontask/crontask \
 		--exclude=../initems/initems 
 
-prep_deb: $(BINNAME) 
+pre_build: $(BINNAME) 
 	# clear build cache
 	rm -rf $(FrontBuildDir)/front/*
 	rm -rf $(DebFEBuildDir)/front/*
@@ -134,7 +134,7 @@ replace_chinese:
 	@find $(DebBuildOMCDir)/etc/db -type f -name '*.sql' -exec sed -i '' 's/[一-龥]//g' {} +
 	@echo "Replace all chinese charecter."
 
-deb: prep_deb
+deb: pre_build
 	cp -rf $(CustomizedDir)/agt.d $(DebBuildOMCDir)/static
 	cp -rf $(CustomizedDir)/omc.d $(DebBuildOMCDir)/static
 	#cp -rf $(BuildDir)/nginx/*  $(DebBuildDir)/etc/nginx/conf.d
@@ -145,7 +145,7 @@ deb: prep_deb
 	perl -0777 -i -pe 's/ne:\n  user: root/ne:\n  user: omcuser/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml
 	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile)
 
-ba-deb: prep_deb replace_chinese 
+badeb: pre_build replace_chinese 
 	cp -rf $(CustomizedDir)/ba.d $(DebBuildOMCDir)/static
 	#cp -rf $(BuildDir)/nginx/*  $(DebBuildDir)/etc/nginx/conf.d
 	#cp -rf $(BuildDir)/systemd/*.service  $(DebBuildDir)/lib/systemd/system/
diff --git a/mkpkg.sh b/mkpkg.sh
index 48114084..58ce1b0b 100755
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -55,15 +55,15 @@ case "$1" in
         rm -f omc-md5sum.txt
         md5sum $DebPkgName >omc-md5sum.txt        
     ;;
-    ba-deb)
+    badeb)
         cd $EmsBEDir
-        make ba-deb
+        make badeb
         cd $ReleaseDir/"$1"s/$RelArch
         rm -f omc-md5sum.txt
         md5sum $DebPkgName >omc-md5sum.txt        
     ;;
     *)
         echo "make omc package"
-        echo "Usage: $0 rpm|deb <db>"
+        echo "Usage: $0 rpm|deb|badeb <db>"
     ;;
 esac  
\ No newline at end of file

From e335c75b536a6f55788744740420544b86e3df98 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 30 Oct 2024 17:14:53 +0800
Subject: [PATCH 3/3] support agt customized

---
 misc/setomc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc/setomc.sh b/misc/setomc.sh
index d1c83353..955292d4 100755
--- a/misc/setomc.sh
+++ b/misc/setomc.sh
@@ -20,6 +20,9 @@ check_args() {
                 elif [ "${C_ARG_LOWER}" == "omc" ]; then
                         C_ARG_UPPER="OMC"
                         sed -i 's/VENDORS=.*/VENDORS=OMC/' /usr/local/omc/etc/omc.conf
+                elif [ "${C_ARG_LOWER}" == "agt" ]; then
+                        C_ARG_UPPER="AGT"
+                        sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf
                 fi
                 ;;  
             m)