- ofgwrite: build from own repo

make/environment.mk

@@ -302,6 +302,7 @@ NI_BUILD-GENERIC-PC	= ni-build-generic-pc
 
 NI_LIBSTB-HAL		= ni-libstb-hal
 NI_STREAMRIPPER		= ni-streamripper
+NI_OFGWRITE		= ni-ofgwrite
 
 NI_LINUX-KERNEL		= ni-linux-kernel
 NI_DRIVERS-BIN		= ni-drivers-bin

make/prerequisites.mk

@@ -79,6 +79,14 @@ $(SOURCE_DIR)/$(NI_LINUX-KERNEL):
 		git remote add torvalds https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git && \
 		git fetch --all
 
+# upstream for rebase
+$(SOURCE_DIR)/$(NI_OFGWRITE):
+	cd $(SOURCE_DIR) && \
+		git clone $(NI_GIT)/$(notdir $@).git
+	cd $@ && \
+		git remote add upstream https://github.com/oe-alliance/ofgwrite.git && \
+		git fetch --all
+
 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
 $(SOURCE_DIR)/$(NI_DRIVERS-BIN) \
 $(SOURCE_DIR)/$(NI_LOGO_STUFF) \
@@ -186,4 +194,5 @@ ni-git: \
 	$(SOURCE_DIR)/$(NI_LINUX-KERNEL) \
 	$(SOURCE_DIR)/$(NI_LOGO_STUFF) \
 	$(SOURCE_DIR)/$(NI_STREAMRIPPER) \
+	$(SOURCE_DIR)/$(NI_OFGWRITE) \
 	$(SOURCE_DIR)/$(NI_OPENTHREADS)

make/system-tools.mk

@@ -971,17 +971,15 @@ $(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/libiconv-$(LIBICONV_VER)
 	touch $@
 
-$(D)/ofgwrite: | $(TARGETPREFIX)
-	$(REMOVE)/ofgwrite
-	cd $(BUILD_TMP); \
-	git clone git://github.com/oe-alliance/ofgwrite.git ofgwrite; \
-	cd ofgwrite; \
+$(D)/ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGETPREFIX)
+	$(REMOVE)/$(NI_OFGWRITE)
+	tar -C $(SOURCE_DIR) -cp $(NI_OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x
+	cd $(BUILD_TMP)/$(NI_OFGWRITE); \
 		$(BUILDENV) \
 		$(MAKE) && \
-	install -m 755 $(BUILD_TMP)/ofgwrite/ofgwrite_bin $(TARGETPREFIX)/bin
-	install -m 755 $(BUILD_TMP)/ofgwrite/ofgwrite $(TARGETPREFIX)/bin
-	sed -i "s,/usr/bin/,/bin/," $(TARGETPREFIX)/bin/ofgwrite
-	$(REMOVE)/ofgwrite
+	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite_bin $(TARGETPREFIX)/bin
+	install -m 755 $(BUILD_TMP)/$(NI_OFGWRITE)/ofgwrite $(TARGETPREFIX)/bin
+	$(REMOVE)/$(NI_OFGWRITE)
 	touch $@
 
 $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGETPREFIX)

make/update.mk

@@ -52,6 +52,7 @@ endif
 	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git pull --all && git checkout $(NI_FFMPEG_BRANCH)
 	cd $(SOURCE_DIR)/$(NI_LOGO_STUFF) && git pull
 	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git pull
+	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git pull
 	cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git pull
 
 ni-update:
@@ -82,4 +83,5 @@ endif
 	cd $(SOURCE_DIR)/$(NI_FFMPEG) && git push
 	cd $(SOURCE_DIR)/$(NI_LOGO_STUFF) && git push
 	cd $(SOURCE_DIR)/$(NI_STREAMRIPPER) && git push
+	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && git push
 	cd $(SOURCE_DIR)/$(NI_OPENTHREADS) && git push