Skip to contentSkip to conversation

libav: Fix git URI

PATCH In review Gary Thomas 2 participants 5 messages Oct 18, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libav: Fix git URI

Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created.

Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy.

---
 meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +2 -2
index 66a32c9..f9a2e06 100644
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 PV = "0.8.3+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # When bumping SRCREV make sure you bump PR here and in dependant
 # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
 # changes
 SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 4 lines · Gary Thomas

Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created.

That's fetcher fault.

Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path.

Also AUTOREV wont work without branch specified in SRC_URI.

Fix bitbake fetcher instead.

Cheers,

Quoted 36 lines

Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy.

---
 meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +2 -2
index 66a32c9..f9a2e06 100644
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 PV = "0.8.3+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # When bumping SRCREV make sure you bump PR here and in dependant
 # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
 # changes
 SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
Signature · 7 lines
1.7.9.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 6 lines · Martin Jansa
Quoted 4 lines · Gary Thomas

Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created.

Quoted 6 lines

That's fetcher fault.

Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path.

Also AUTOREV wont work without branch specified in SRC_URI.

AUTOREV is not being used, so how does your comment apply?

Quoted 50 lines

Fix bitbake fetcher instead.

Cheers,

Quoted 32 lines

Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy.

---
  meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +2 -3
index 66a32c9..f9a2e06 100644
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                      file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
  PV = "0.8.3+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
  # When bumping SRCREV make sure you bump PR here and in dependant
  # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
  # changes
  SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
  S = "${WORKDIR}/git"
 
--

1.7.9.5

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#3 lore raw
Quoted 7 lines · Gary Thomas
Quoted 6 lines · Martin Jansa
Quoted 4 lines · Gary Thomas

Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created.

Quoted 8 lines
Quoted 6 lines

That's fetcher fault.

Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path.

Also AUTOREV wont work without branch specified in SRC_URI.

AUTOREV is not being used, so how does your comment apply?

yes it's good practise to use it from some .inc even or local.conf, _without_ need to change SRC_URI

Quoted 60 lines
Quoted 49 lines

Fix bitbake fetcher instead.

Cheers,

Quoted 32 lines

Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy.

---
  meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +2 -3
index 66a32c9..f9a2e06 100644
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                      file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
  PV = "0.8.3+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
  # When bumping SRCREV make sure you bump PR here and in dependant
  # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
  # changes
  SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
  S = "${WORKDIR}/git"
 
--

1.7.9.5

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 9 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw
Quoted 13 lines · Martin Jansa
Quoted 12 lines · Gary Thomas
Quoted 11 lines · Martin Jansa
Quoted 4 lines · Gary Thomas

Specifying SRCREV and branch in the git SRC_URI confuses the bitbake fetcher. This ends up with a saved tarball which contains neither the SRCREV nor the branch, which in turn means the git tree needs to be fetched every time even though a saved tarball has been created.

That's fetcher fault.

Branch is part of persistent db key for LOCALCOUNT, so this breaks upgrade path.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Also AUTOREV wont work without branch specified in SRC_URI.

AUTOREV is not being used, so how does your comment apply?

yes it's good practise to use it from some .inc even or local.conf, _without_ need to change SRC_URI

But the whole point is to have a specific SRCREV, not AUTOREV. Having a recipe which always gets the latest revision is often not advised nor even allowed in some circles.

This particular recipe obviously wanted to use a particular revision, not the tip of the "releases/0.8" branch. Specifying both is contradictory.

Quoted 69 lines
Quoted 57 lines
Quoted 38 lines

Fix bitbake fetcher instead.

Cheers,

Quoted 32 lines

Simply removing the branch (which is redundant anyway) from the SRC_URI makes everything happy.

---
   meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-multimedia/libav/libav_0.8.3.bb +2 -3
index 66a32c9..f9a2e06 100644
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                       file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
   PV = "0.8.3+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
   # When bumping SRCREV make sure you bump PR here and in dependant
   # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
   # changes
   SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
   S = "${WORKDIR}/git"
 
--

1.7.9.5

Quoted 12 lines
Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------