Auto merge of #1102 - brson:rust-installer-v2, r=brson

Needs to merge directly after rust-lang/rust#20317

Author: bors

Makefile.in

@@ -91,7 +91,8 @@ style:
 
 no-exes:
 	find $$(git ls-files) -perm +111 -type f \
-		-not -name configure -not -name '*.sh' -not -name '*.rs' | \
+		-not -name configure -not -name '*.sh' -not -name '*.rs' \
+		-not -wholename "*/rust-installer/*" | \
 		grep '.*' \
 		&& exit 1 || exit 0
 
@@ -178,7 +179,9 @@ $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz: prepare-image-$(1)
 		--work-dir=./$$(DISTDIR_$(1)) \
 		--output-dir=./$$(DISTDIR_$(1)) \
 		--non-installed-prefixes=$$(NON_INSTALLED_PREFIXES) \
-		--package-name=$$(PKG_NAME)-$(1)
+		--package-name=$$(PKG_NAME)-$(1) \
+		--component-name=cargo \
+		--legacy-manifest-dirs=rustlib,cargo
 	rm -Rf $$(IMGDIR_$(1))
 
 install-$(1): $$(DISTDIR_$(1))/$$(PKG_NAME)-$(1).tar.gz