Merge pull request #5694 from ashwin9390/private/ashwin/CP-49896

CP-49896:Move xe-scsi-dev-map to bin directory under python3.
xapi-project · Jun 17, 2024 · 207f49c · 207f49c
2 parents e4b0be9 + a79ce2a
commit 207f49c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/python3/Makefile b/python3/Makefile
@@ -19,3 +19,4 @@ install:
 
 	$(IPROG) bin/hfx_filename $(DESTDIR)$(OPTDIR)/bin
 	$(IPROG) bin/perfmon $(DESTDIR)$(OPTDIR)/bin
+	$(IPROG) bin/xe-scsi-dev-map $(DESTDIR)$(OPTDIR)/bin
diff --git a/scripts/xe-scsi-dev-map → python3/bin/xe-scsi-dev-map b/scripts/xe-scsi-dev-map → python3/bin/xe-scsi-dev-map
diff --git a/scripts/Makefile b/scripts/Makefile
@@ -90,7 +90,6 @@ install:
 	$(IPROG) update-ca-bundle.sh $(DESTDIR)$(OPTDIR)/bin
 	mkdir -p $(DESTDIR)$(OPTDIR)/debug
 	$(IPROG) debug_ha_query_liveset $(DESTDIR)$(OPTDIR)/debug
-	$(IPROG) xe-scsi-dev-map $(DESTDIR)$(OPTDIR)/bin
 	$(IPROG) xe-mount-iso-sr $(DESTDIR)$(OPTDIR)/bin
 	$(IPROG) xe-reset-networking $(DESTDIR)$(OPTDIR)/bin
 	$(IPROG) xe-toolstack-restart $(DESTDIR)$(OPTDIR)/bin
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ install:

		$(IPROG) bin/hfx_filename $(DESTDIR)$(OPTDIR)/bin
		$(IPROG) bin/perfmon $(DESTDIR)$(OPTDIR)/bin
		$(IPROG) bin/xe-scsi-dev-map $(DESTDIR)$(OPTDIR)/bin