change needed for mjpg-streamer repository move

[ooker]

Hi Folks,

After performing a pull from master and building Gargoyle (make ar71xx) I ran into an error indicating that the mjpg-streamer repository had been relocated.

Code: Select all

 svn co https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer/
svn: Repository moved permanently to 'https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer'; please relocate

It seems that a Makefile needs to be updated. What is the best process for submitting this fix?

Edit line17 of gargoyle/package/gargoyle-mjpg-streamer/Makefile:

Change: PKG_SOURCE_URL:=https://mjpg-streamer.svn.sourceforge.n ... -streamer/

To: PKG_SOURCE_URL:=https://svn.code.sf.net/p/mjpg-streamer ... g-streamer

[BashfulBladder]

This commit address your issue: https://dev.openwrt.org/changeset/37929/

[ooker]

O.K. I see that the change made it into OpenWrt based on the changeset you referenced, but when I pulled from the gargoyle git repo and built, I did not get that change. In fact it looks like the change needs to go here:
package/gargoyle-mjpg-streamer/Makefile

Is that a gargoyle-specific package (in which case, I'd expect that the change would need to be committed to the gargoyle-mjpg-streamer/Makefile) , or is it somehow generated/copied from OpenWrt (in which case the Gargoyle build may be pulling a version of OpenWrt that is older than Sep 10).

Do you know which is the case?

[BashfulBladder]

> is it somehow generated/copied from OpenWrt (in which case the Gargoyle build may be pulling a version of OpenWrt that is older than Sep 10).

Exactly. build.sh controls which revision of OpenWrt is checked out. Its the rnum variable.

[BashfulBladder]

Woops, I didn't see that mjpeg-streamer is now gargoyle-mjpeg-streamer & outside of OpenWrt control. Man, suddenly I'm forced to build packages that I've got zero interest in - and its failing too.

So, you can either register @ github, fork the gargoyle repostitory, make the changes (hopefully test them out), commit the changes to your repository & do a pull request.

Or register @ github & file a but report.

Or nag the maintainer. That'll probably be Eric. Use a few extra 4 letter words on my behalf.

[ooker]

I created a pull request:
https://github.com/ericpaulbishop/gargoyle/pull/222

[BashfulBladder]

Well done. Kinda envious how smooth it went for you.