bitbake.conf: add GITHUB_GIT

PATCH In review Robert Yang 5 participants 13 messages Jul 29, 2015 – Jul 31, 2015

lore

Share & tools

lore

Robert Yang

author

2015-07-29 09:11 UTC #0 lore raw

cover bitbake.conf: add GITHUB_GIT

The following changes since commit 27d068d05239c26a3848eb101571acab54635e37:

harfbuzz: upgrade to 1.0.1 (2015-07-27 23:28:23 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/github
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/github

Robert Yang (2):
bitbake.conf: add GITHUB_GIT
meta: git://github.com -> ${GITHUB_GIT}

 meta/conf/bitbake.conf                             |    1 +
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 meta/recipes-core/update-rc.d/update-rc.d_0.7.bb   |    2 +-
 meta/recipes-devtools/bootchart2/bootchart2_git.bb |    2 +-
 .../build-compare/build-compare_git.bb             |    2 +-
 meta/recipes-devtools/remake/remake.inc            |    2 +-
 .../recipes-devtools/sgmlspl/sgmlspl-native_git.bb |    2 +-
 .../squashfs-tools/squashfs-tools_git.bb           |    2 +-
 .../chkconfig-alternatives-native_1.3.59.bb        |    2 +-
 meta/recipes-extended/ltp/ltp_20150420.bb          |    2 +-
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb      |    2 +-
 meta/recipes-graphics/eglinfo/eglinfo.inc          |    2 +-
 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb           |    2 +-
 .../xinput-calibrator/xinput-calibrator_git.bb     |    2 +-
 .../recipes-multimedia/gstreamer/gst-player_git.bb |    2 +-
 meta/recipes-multimedia/libav/libpostproc_git.bb   |    2 +-
 meta/recipes-support/lz4/lz4.bb                    |    2 +-
 17 files changed, 17 insertions(+), 16 deletions(-)

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-07-29 09:11 UTC #1 lore raw

PATCH 1/2 bitbake.conf: add GITHUB_GIT

Signed-off-by Robert Yang <[email protected]>

---
 meta/conf/bitbake.conf |    1 +
 1 file changed, 1 insertion(+)

meta/conf/bitbake.conf +1 -0

index 730ab80..6775393 100644
@@ -577,6 +577,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 SAVANNAH_GNU_MIRROR = "http://download.savannah.gnu.org/releases"
 SAVANNAH_NONGNU_MIRROR = "http://download.savannah.nongnu.org/releases"
 CPAN_MIRROR = "http://search.cpan.org/CPAN"
+GITHUB_GIT = "git://github.com"
 
 # You can use the mirror of your country to get faster downloads by putting
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-07-29 09:11 UTC #2 lore raw

PATCH 2/2 meta: git://github.com -> ${GITHUB_GIT}

In reply to Robert Yang

Signed-off-by Robert Yang <[email protected]>

---
 .../connman/connman-gnome_0.7.bb                   |    2 +-
 meta/recipes-core/update-rc.d/update-rc.d_0.7.bb   |    2 +-
 meta/recipes-devtools/bootchart2/bootchart2_git.bb |    2 +-
 .../build-compare/build-compare_git.bb             |    2 +-
 meta/recipes-devtools/remake/remake.inc            |    2 +-
 .../recipes-devtools/sgmlspl/sgmlspl-native_git.bb |    2 +-
 .../squashfs-tools/squashfs-tools_git.bb           |    2 +-
 .../chkconfig-alternatives-native_1.3.59.bb        |    2 +-
 meta/recipes-extended/ltp/ltp_20150420.bb          |    2 +-
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb      |    2 +-
 meta/recipes-graphics/eglinfo/eglinfo.inc          |    2 +-
 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb           |    2 +-
 .../xinput-calibrator/xinput-calibrator_git.bb     |    2 +-
 .../recipes-multimedia/gstreamer/gst-player_git.bb |    2 +-
 meta/recipes-multimedia/libav/libpostproc_git.bb   |    2 +-
 meta/recipes-support/lz4/lz4.bb                    |    2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -1

index f5575d2..5a0e37a 100644
@@ -10,7 +10,7 @@ DEPENDS = "gtk+ dbus-glib intltool-native"
 
 # 0.7 tag
 SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
-SRC_URI = "git://github.com/connectivity/connman-gnome.git \
+SRC_URI = "${GITHUB_GIT}/connectivity/connman-gnome.git \
            file://0001-Removed-icon-from-connman-gnome-about-applet.patch \
            file://null_check_for_ipv4_config.patch \
            file://images/* \

meta/recipes-core/update-rc.d/update-rc.d_0.7.bb +1 -1

index c15cb78..b5a1727 100644
@@ -10,7 +10,7 @@ PR = "r5"
 # Revision corresponding to tag update-rc.d_0.7
 SRCREV = "eca680ddf28d024954895f59a241a622dd575c11"
 
-SRC_URI = "git://github.com/philb/update-rc.d.git \
+SRC_URI = "${GITHUB_GIT}/philb/update-rc.d.git \
            file://add-verbose.patch \
            file://check-if-symlinks-are-valid.patch \
            file://fix-to-handle-priority-numbers-correctly.patch \

meta/recipes-devtools/bootchart2/bootchart2_git.bb +1 -1

index ea9f179..9018bbe 100644
@@ -91,7 +91,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
 # one commit beyond 1.14.6 for a systemd-related bugfix
 PV = "0.14.6+git${SRCPV}"
 
-SRC_URI = "git://github.com/mmeeks/bootchart.git \
+SRC_URI = "${GITHUB_GIT}/mmeeks/bootchart.git \
            file://bootchartd_stop.sh \
            file://bootchartd-no-bashism.patch \
           "

meta/recipes-devtools/build-compare/build-compare_git.bb +1 -1

index 418aee0..036f906 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/openSUSE/build-compare"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "git://github.com/openSUSE/build-compare.git"
+SRC_URI = "${GITHUB_GIT}/openSUSE/build-compare.git"
 SRC_URI += "file://Rename-rpm-check.sh-to-pkg-diff.sh.patch;striplevel=1"
 SRC_URI += "file://Ignore-DWARF-sections.patch;striplevel=1"
 PATCHTOOL = "git"

meta/recipes-devtools/remake/remake.inc +1 -1

index 6ac833e..04605cf 100644
@@ -6,7 +6,7 @@ execution in a comprehensible way, and a debugger."
 HOMEPAGE = "http://bashdb.sourceforge.net/remake/"
 SECTION = "devel"
 
-SRC_URI = "git://github.com/rocky/remake.git"
+SRC_URI = "${GITHUB_GIT}/rocky/remake.git"
 
 inherit autotools gettext update-alternatives

meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb +1 -1

index 5e3460f..e402c59 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
-SRC_URI = "git://github.com/gitpan/SGMLSpm \
+SRC_URI = "${GITHUB_GIT}/gitpan/SGMLSpm \
           "
 
 SRCREV = "71595b9b5e36bfc00046995e058926bd27793fef"

meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +1 -1

index 497b282..944ca13 100644
@@ -10,7 +10,7 @@ DEPENDS = "attr zlib xz lzo lz4"
 
 PV = "4.3+gitr${SRCPV}"
 SRCREV = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"
-SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \
+SRC_URI = "${GITHUB_GIT}/plougher/squashfs-tools.git;protocol=https \
            http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2;name=lzma \
 "
 SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759"

meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb +1 -1

index 7fd34aa..8b4e1b6 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 # The sysroot branch is 1.3.59 + some git commits from master + --sysroot
 # support for alternatives.
-SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot"
+SRC_URI = "${GITHUB_GIT}/kergoth/chkconfig;branch=sysroot"
 S = "${WORKDIR}/git"
 
 SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee"

meta/recipes-extended/ltp/ltp_20150420.bb +1 -1

index 108ebf1..55a74ee 100644
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "\
 DEPENDS = "attr libaio libcap acl openssl zip-native"
 SRCREV = "77d0b7fd0148ce657c5a25060667e978c07662a0"
 
-SRC_URI = "git://github.com/linux-test-project/ltp.git \
+SRC_URI = "${GITHUB_GIT}/linux-test-project/ltp.git \
     file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
     file://ltp-Do-not-link-against-libfl.patch \
     file://make-setregid02-work.patch \

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +1 -1

index ffc03e5..c8a8eeb 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
 DEPENDS = ""
 PR = "r2"
 
-SRC_URI = "git://github.com/xinetd-org/xinetd.git;protocol=https \
+SRC_URI = "${GITHUB_GIT}/xinetd-org/xinetd.git;protocol=https \
       file://xinetd.init \
       file://xinetd.conf \
       file://xinetd.default \

meta/recipes-graphics/eglinfo/eglinfo.inc +1 -1

index b87688a..4d00036 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c"
 
 DEPENDS = "virtual/egl"
 
-SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master"
+SRC_URI = "${GITHUB_GIT}/dv1/eglinfo.git;branch=master"
 SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de"
 
 S = "${WORKDIR}/git"

meta/recipes-graphics/mx/mx-1.0_1.4.7.bb +1 -1

index ce35b61..4e4fc96 100644
@@ -4,7 +4,7 @@ require mx.inc
 SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f"
 PV = "1.4.7+git${SRCPV}"
 
-SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \
+SRC_URI = "${GITHUB_GIT}/clutter-project/mx.git;branch=mx-1.4 \
 	   file://fix-build-dir.patch \
 	   file://fix-test-includes.patch \
 	  "

meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +1 -1

index a9de3d7..425a6b0 100644
@@ -12,7 +12,7 @@ inherit autotools pkgconfig distro_features_check
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
-SRC_URI = "git://github.com/tias/xinput_calibrator.git \
+SRC_URI = "${GITHUB_GIT}/tias/xinput_calibrator.git \
            file://30xinput_calibrate.sh \
            file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch"

meta/recipes-multimedia/gstreamer/gst-player_git.bb +1 -1

index 54cfbbc..f7ef4c5 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5
 
 DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+"
 
-SRC_URI = "git://github.com/sdroege/gst-player.git \
+SRC_URI = "${GITHUB_GIT}/sdroege/gst-player.git \
            file://filechooser.patch \
            file://gtk2.patch \
            file://Fix-pause-play.patch \

meta/recipes-multimedia/libav/libpostproc_git.bb +1 -1

index 4aaa50f..8774f4b 100644
@@ -11,7 +11,7 @@ LICENSE_FLAGS = "commercial"
 PV = "52.3.0+git${SRCPV}"
 
 SRCREV = "811db3b957dfde24aef2d0f82e297e5bf552d873"
-SRC_URI = "git://github.com/lu-zero/postproc;protocol=https"
+SRC_URI = "${GITHUB_GIT}/lu-zero/postproc;protocol=https"
 
 S = "${WORKDIR}/git"

meta/recipes-support/lz4/lz4.bb +1 -1

index 0b0c632..e3da4d0 100644
@@ -8,7 +8,7 @@ SRCREV = "5780864c0ce08622238a267c46fb489d7066cad4"
 
 PV = "128+git${SRCPV}"
 
-SRC_URI = "git://github.com/Cyan4973/lz4.git;protocol=http"
+SRC_URI = "${GITHUB_GIT}/Cyan4973/lz4.git;protocol=http"
 
 S = "${WORKDIR}/git"

Signature · 1 line

1.7.9.5

Paul Eggleton

2015-07-29 10:11 UTC #3 lore raw

In reply to Robert Yang

Hi Robert,

Quoted 6 lines · On Wednesday 29 July 2015 02:11:53 Robert Yang wrote:

The following changes since commit 27d068d05239c26a3848eb101571acab54635e37:
harfbuzz: upgrade to 1.0.1 (2015-07-27 23:28:23 +0100)
are available in the git repository at:

Quoted 8 lines

git://git.openembedded.org/openembedded-core-contrib rbt/github
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/
github
Robert Yang (2):
bitbake.conf: add GITHUB_GIT
meta: git://github.com -> ${GITHUB_GIT}

Interesting, but you don't explain why this change is needed in the commit messages.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Robert Yang

author

2015-07-29 10:19 UTC #4 lore raw

Quoted 14 lines · Paul Eggleton

Hi Robert,
Quoted 11 lines · On Wednesday 29 July 2015 02:11:53 Robert Yang wrote:
The following changes since commit 27d068d05239c26a3848eb101571acab54635e37:
   harfbuzz: upgrade to 1.0.1 (2015-07-27 23:28:23 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/github
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/
github

Quoted 6 lines

Quoted 3 lines
Robert Yang (2):
bitbake.conf: add GITHUB_GIT
meta: git://github.com -> ${GITHUB_GIT}
Interesting, but you don't explain why this change is needed in the commit messages.

Hi Paul,

It is just like what GNOME_GIT, GNU_MIRROR and others did.

// Robert

Quoted 4 lines

Cheers,
Paul

Olof Johansson

2015-07-29 11:49 UTC #5 lore raw

Excerpts from Robert Yang's message of 2015-07-29 12:19:06 +0200:

Quoted 1 line

It is just like what GNOME_GIT, GNU_MIRROR and others did.

Tbh, I don't understand them either, but maybe that's just me. What is the reason? I think it makes it harder to see what is happening.

Signature · 1 line

olof johansson

Otavio Salvador

2015-07-29 16:27 UTC #6 lore raw

Quoted 5 lines · Olof Johansson

Excerpts from Robert Yang's message of 2015-07-29 12:19:06 +0200:
Quoted 1 line
It is just like what GNOME_GIT, GNU_MIRROR and others did.
Tbh, I don't understand them either, but maybe that's just me. What is the reason? I think it makes it harder to see what is happening.

It allows for people to add local mirrors for example and even remap fetching without touching the recipes. It is a good addition IMO.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Robert Yang

author

2015-07-30 01:51 UTC #7 lore raw

Quoted 10 lines · Otavio Salvador

Quoted 5 lines · Olof Johansson
Excerpts from Robert Yang's message of 2015-07-29 12:19:06 +0200:
Quoted 1 line
It is just like what GNOME_GIT, GNU_MIRROR and others did.
Tbh, I don't understand them either, but maybe that's just me. What is the reason? I think it makes it harder to see what is happening.
It allows for people to add local mirrors for example and even remap fetching without touching the recipes. It is a good addition IMO.

Thanks, I updated the commit message in the repo:

git://git.openembedded.org/openembedded-core-contrib rbt/github

commit 8b6d701aa812536dc5d4350d8a7646f54942ebac

Author: Robert Yang <[email protected]>
Date:   Tue Jul 28 03:00:37 2015 -0700

meta: git://github.com -> ${GITHUB_GIT}

It allows for people to add local mirrors for example and even remap fetching without touching the recipes.

Signed-off-by Robert Yang <[email protected]>

// Robert

Olof Johansson

2015-07-30 07:04 UTC #8 lore raw

In reply to Otavio Salvador

Excerpts from Otavio Salvador's message of 2015-07-29 18:27:32 +0200:

Quoted 2 lines

It allows for people to add local mirrors for example and even remap fetching without touching the recipes. It is a good addition IMO.

Can't you use PREMIRRORS for that?

Signature · 1 line

olof johansson

Robert Yang

author

2015-07-30 07:09 UTC #9 lore raw

Quoted 6 lines · Olof Johansson

Excerpts from Otavio Salvador's message of 2015-07-29 18:27:32 +0200:
Quoted 2 lines
It allows for people to add local mirrors for example and even remap fetching without touching the recipes. It is a good addition IMO.
Can't you use PREMIRRORS for that?

PREMIRRORS is for all the recipes/protocols ? I think that another benefit is we can uniform github's SRC_URI ?

// Robert

Olof Johansson

2015-07-30 08:32 UTC #10 lore raw

Excerpts from Robert Yang's message of 2015-07-30 09:09:07 +0200:

Quoted 1 line

PREMIRRORS is for all the recipes/protocols ?

No, PREMIRRORS is quite expressive, for instance:

PREMIRRORS = " \
https?$://downloads.example.org$/.* http://mirror.example.com/ \n \
"

This should only premirror downloads.example.com files, fetched via http or https. See the bitbake fetcher's uri_replace method in bitbake/lib/bb/fetch2/__init__.py for the implementation.

Signature · 1 line

olof johansson

Otavio Salvador

2015-07-30 11:34 UTC #11 lore raw

Quoted 5 lines · Olof Johansson

Excerpts from Robert Yang's message of 2015-07-30 09:09:07 +0200:
Quoted 1 line
PREMIRRORS is for all the recipes/protocols ?
No, PREMIRRORS is quite expressive, for instance:

Quoted 7 lines

PREMIRRORS = " \
https?$://downloads.example.org$/.* http://mirror.example.com/ \n \
"
This should only premirror downloads.example.com files, fetched via http or https. See the bitbake fetcher's uri_replace method in bitbake/lib/bb/fetch2/__init__.py for the implementation.

Yes, you can.

But the mirrors scheme allows for, for example, map it for git:// and
https:// protocols without changing the recipes.

I am in favor of consistency here and having a unique var for github helps.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Richard Purdie

2015-07-31 14:31 UTC #12 lore raw

Quoted 14 lines · Otavio Salvador

Quoted 5 lines · Olof Johansson
Excerpts from Robert Yang's message of 2015-07-30 09:09:07 +0200:
Quoted 1 line
PREMIRRORS is for all the recipes/protocols ?
No, PREMIRRORS is quite expressive, for instance:
Quoted 7 lines
PREMIRRORS = " \
https?$://downloads.example.org$/.* http://mirror.example.com/ \n \
"
This should only premirror downloads.example.com files, fetched via http or https. See the bitbake fetcher's uri_replace method in bitbake/lib/bb/fetch2/__init__.py for the implementation.

Quoted 6 lines

Yes, you can.
But the mirrors scheme allows for, for example, map it for git:// and
https:// protocols without changing the recipes.
I am in favor of consistency here and having a unique var for github helps.

I came to review this as Ross pulled it into mut and I reached the same conclusion as Olof here. We have PREMIRRORS, we can also exclude networks from the fetcher and therefore have a ton of ways of rewriting this already.

Yes, we do want standardisation, but all the urls look standardised to me already.

IMO, we want to see less of these global variables, not more. There once was a time when they might have been useful but the fetcher is pretty good about dealing with this now so lets not complicate this more than we need to.

Cheers,

Richard