From 179b1cdf6c9a642eafc2d53e3f9b92d7fb559ecb Mon Sep 17 00:00:00 2001
From: zet809 <ertaozh@cn.ibm.com>
Date: Thu, 18 Jan 2018 13:48:13 +0800
Subject: [PATCH] modify directory to copy bmcsetup/getipmi scripts (#4649)

---
 build-ubunturepo                  | 2 +-
 makerpm                           | 2 +-
 xCAT-genesis-scripts/debian/rules | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build-ubunturepo b/build-ubunturepo
index 729067680..2f9457727 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -250,7 +250,7 @@ then
                             # shipping bmcsetup and getipmi scripts as part of postscripts
                             files=("bmcsetup" "getipmi")
                             for f in "${files[@]}"; do
-                                 cp ${CURDIR}/../xCAT-genesis-scripts/bin/$f ${CURDIR}/postscripts/$f
+                                 cp ${CURDIR}/../xCAT-genesis-scripts/usr/bin/$f ${CURDIR}/postscripts/$f
                                  sed -i "s/xcat.genesis.$f/$f/g" ${CURDIR}/postscripts/$f
                             done
                         fi
diff --git a/makerpm b/makerpm
index b093e116d..1e874662f 100755
--- a/makerpm
+++ b/makerpm
@@ -126,7 +126,7 @@ function makexcat {
 			# shipping bmcsetup and getipmi scripts as part of postscripts
 			files=("bmcsetup" "getipmi")
 			for f in "${files[@]}"; do
-				cp "xCAT-genesis-scripts/bin/"$f ${RPMNAME}/postscripts/$f
+				cp "xCAT-genesis-scripts/usr/bin/"$f ${RPMNAME}/postscripts/$f
 				sed -i  "s/xcat.genesis.$f/$f/g" ${RPMNAME}/postscripts/$f
 			done
 			cd `dirname $0`/$RPMNAME
diff --git a/xCAT-genesis-scripts/debian/rules b/xCAT-genesis-scripts/debian/rules
index 6da840833..16d3fc804 100755
--- a/xCAT-genesis-scripts/debian/rules
+++ b/xCAT-genesis-scripts/debian/rules
@@ -33,8 +33,7 @@ install:
 	dh_installdirs $(installdir)
 	dh_install -X".svn"
 	dh_install ./etc/ $(installtodir)
-	dh_install ./usr/bin/ $(installtodir)
-	dh_install ./usr/sbin/ $(installtodir)
+	dh_install ./usr/ $(installtodir)
 	dh_compress
 	dh_installdeb
 	dh_gencontrol