Merge pull request #4618 from samveen/fix_4614

Relocate `/*bin` into `/usr/` to fix conflict between Genesis base and `scripts`

xCAT-genesis-scripts/debian/rules

@@ -33,8 +33,8 @@ install:
 	dh_installdirs $(installdir)
 	dh_install -X".svn"
 	dh_install ./etc/ $(installtodir)
-	dh_install ./bin/ $(installtodir)
-	dh_install ./sbin/ $(installtodir)
+	dh_install ./usr/bin/ $(installtodir)
+	dh_install ./usr/sbin/ $(installtodir)
 	dh_compress
 	dh_installdeb
 	dh_gencontrol

xCAT-genesis-scripts/xCAT-genesis-scripts.spec

@@ -71,32 +71,32 @@ touch /etc/xcat/genesis-scripts-updated
 %Files
 %defattr(-,root,root)
 #%dir %attr(-,root,root) %{rpminstallroot}
-%{rpminstallroot}/bin/allowcred.awk
-%{rpminstallroot}/bin/bmcsetup
-%{rpminstallroot}/bin/raidcmd
-%{rpminstallroot}/bin/raidutils
-%{rpminstallroot}/bin/diskdiscover
-%{rpminstallroot}/bin/configraid
-%{rpminstallroot}/bin/dodiscovery
-%{rpminstallroot}/bin/dosysclone
-%{rpminstallroot}/bin/doxcat
-%{rpminstallroot}/bin/getadapter
-%{rpminstallroot}/bin/getcert
-%{rpminstallroot}/bin/getdestiny
-%{rpminstallroot}/bin/getipmi
-%{rpminstallroot}/bin/ifup
-%{rpminstallroot}/bin/minixcatd.awk
-%{rpminstallroot}/bin/nextdestiny
-%{rpminstallroot}/bin/remoteimmsetup
-%{rpminstallroot}/bin/udpcat.awk
-%{rpminstallroot}/bin/updateflag.awk
-%{rpminstallroot}/bin/pseries_platform
-%{rpminstallroot}/bin/update_flash
-%{rpminstallroot}/bin/update_flash_nv
-%{rpminstallroot}/bin/restart
+%{rpminstallroot}/usr/bin/allowcred.awk
+%{rpminstallroot}/usr/bin/bmcsetup
+%{rpminstallroot}/usr/bin/raidcmd
+%{rpminstallroot}/usr/bin/raidutils
+%{rpminstallroot}/usr/bin/diskdiscover
+%{rpminstallroot}/usr/bin/configraid
+%{rpminstallroot}/usr/bin/dodiscovery
+%{rpminstallroot}/usr/bin/dosysclone
+%{rpminstallroot}/usr/bin/doxcat
+%{rpminstallroot}/usr/bin/getadapter
+%{rpminstallroot}/usr/bin/getcert
+%{rpminstallroot}/usr/bin/getdestiny
+%{rpminstallroot}/usr/bin/getipmi
+%{rpminstallroot}/usr/bin/ifup
+%{rpminstallroot}/usr/bin/minixcatd.awk
+%{rpminstallroot}/usr/bin/nextdestiny
+%{rpminstallroot}/usr/bin/remoteimmsetup
+%{rpminstallroot}/usr/bin/udpcat.awk
+%{rpminstallroot}/usr/bin/updateflag.awk
+%{rpminstallroot}/usr/bin/pseries_platform
+%{rpminstallroot}/usr/bin/update_flash
+%{rpminstallroot}/usr/bin/update_flash_nv
+%{rpminstallroot}/usr/bin/restart
 %{rpminstallroot}/etc/init.d/functions
 %{rpminstallroot}/etc/udev/rules.d/99-imm.rules
 %{rpminstallroot}/etc/udev/rules.d/98-mlx.rules
-%{rpminstallroot}/sbin/setupimmnic
-%{rpminstallroot}/sbin/loadmlxeth
+%{rpminstallroot}/usr/sbin/setupimmnic
+%{rpminstallroot}/usr/sbin/loadmlxeth
 %exclude %{rpminstallroot}/debian/*