diff --git a/Makefile.in b/Makefile.in index 8f76f7c8..e651fe6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,7 @@ ifeq ($(CONTAINER_ENGINE),) endif DOCKER_BASE = $(CONTAINER_ENGINE) run --rm -v $(SRC):$(SRC)$(CONTAINER_MOUNT_OPTS) -v $(OBJ):$(OBJ)$(CONTAINER_MOUNT_OPTS) \ + -v $(SRC)/gitconfig-gstreamer-redirect:/etc/gitconfig \ -w $(OBJ) -e MAKEFLAGS \ $(DOCKER_OPTS) $(STEAMRT_IMAGE) diff --git a/gitconfig-gstreamer-redirect b/gitconfig-gstreamer-redirect new file mode 100644 index 00000000..d6561e02 --- /dev/null +++ b/gitconfig-gstreamer-redirect @@ -0,0 +1,2 @@ +[url "https://gitlab.codeweavers.com/gstreamer-mirror/"] + insteadOf = https://gitlab.freedesktop.org/gstreamer/ diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk index e7f15292..2dbfe75f 100644 --- a/make/rules-cargo.mk +++ b/make/rules-cargo.mk @@ -7,12 +7,7 @@ define create-rules-cargo $(call create-rules-common,$(1),$(2),$(3)) ifeq ($(CONTAINER),1) -$$(OBJ)/.$(1)-pre-configure: - @echo ":: setting freedesktop url override..." >&2 - git config --global url."https://gitlab.codeweavers.com/gstreamer-mirror/".insteadOf "https://gitlab.freedesktop.org/gstreamer/" - touch $$@ - -$$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure +$$(OBJ)/.$(1)-configure$(3): @echo ":: configuring $(3)bit $(1)..." >&2 touch $$@