| Message ID | 20211106125852.151733-1-pierre-jean.texier@lafon.fr |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [meta-swupdate] recipes: use https protocol and add explicit branch parameter | expand |
Hi Pierre-Jean, On 06.11.21 13:58, Pierre-Jean Texier wrote: > From: Pierre-Jean Texier <texier.pj2@gmail.com> > > Due to https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git > it is required to use https protocol for github repo accessing. > > Update created with oe-core/scripts/contrib/convert-srcuri.py (see [0]) > > [0] - https://git.openembedded.org/openembedded-core/tree/scripts/contrib/convert-srcuri.py > Ok, but.... > Signed-off-by: Pierre-Jean Texier <pierre-jean.texier@lafon.fr> > --- > recipes-lua/luafilesystem/luafilesystem_git.bb | 2 +- > recipes-lua/luasocket/luasocket_git.bb | 2 +- > recipes-support/rescuegui/rescuegui_git.bb | 2 +- > recipes-support/swupdate/swupdate.inc | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/recipes-lua/luafilesystem/luafilesystem_git.bb b/recipes-lua/luafilesystem/luafilesystem_git.bb > index dccce34..66792cc 100644 > --- a/recipes-lua/luafilesystem/luafilesystem_git.bb > +++ b/recipes-lua/luafilesystem/luafilesystem_git.bb > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9b7e441d51a96b17511ee3be5a75857" > DEPENDS = "lua" > > > -SRC_URI = "git://github.com/keplerproject/luafilesystem;protocol=https \ > +SRC_URI = "git://github.com/keplerproject/luafilesystem;protocol=https;branch=master \ Access is already via https. > file://0001-Fix-for-OE.patch" > > # Modify these as desired > diff --git a/recipes-lua/luasocket/luasocket_git.bb b/recipes-lua/luasocket/luasocket_git.bb > index 7d24450..c5325ff 100644 > --- a/recipes-lua/luasocket/luasocket_git.bb > +++ b/recipes-lua/luasocket/luasocket_git.bb > @@ -5,7 +5,7 @@ DEPENDS = "lua" > > RDEPENDS:${PN} += "lua" > > -SRC_URI = "git://github.com/diegonehab/luasocket;protocol=https \ > +SRC_URI = "git://github.com/diegonehab/luasocket;protocol=https;branch=master \ > file://0001-fix-for-OE.patch \ > " > Ditto > diff --git a/recipes-support/rescuegui/rescuegui_git.bb b/recipes-support/rescuegui/rescuegui_git.bb > index 5575a48..a6b3e9e 100644 > --- a/recipes-support/rescuegui/rescuegui_git.bb > +++ b/recipes-support/rescuegui/rescuegui_git.bb > @@ -10,7 +10,7 @@ inherit update-rc.d > DEPENDS += "swupdate lua luafilesystem" > RDEPENDS:${PN} += "swupdate-tools swupdate-lua" > > -SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https \ > +SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https;branch=master \ > file://rescuegui \ > file://config.lua \ > " Ditto > diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc > index c0d6c29..82911f9 100644 > --- a/recipes-support/swupdate/swupdate.inc > +++ b/recipes-support/swupdate/swupdate.inc > @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ > > inherit cml1 update-rc.d systemd pkgconfig > > -SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https \ > +SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https;branch=master \ > file://defconfig \ > file://swupdate \ > file://swupdate.sh \ > The change is unrelated and just set the branch, but master is the default branch for all these projects. So what is this patch supposed to fix ? Best regards, Stefano
Hi Steafno, Le 06/11/2021 à 14:15, Stefano Babic a écrit : > Hi Pierre-Jean, > > On 06.11.21 13:58, Pierre-Jean Texier wrote: >> From: Pierre-Jean Texier <texier.pj2@gmail.com> >> >> Due to >> https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git >> >> it is required to use https protocol for github repo accessing. >> >> Update created with oe-core/scripts/contrib/convert-srcuri.py (see [0]) >> >> [0] - >> https://git.openembedded.org/openembedded-core/tree/scripts/contrib/convert-srcuri.py >> >> > > Ok, but.... > >> Signed-off-by: Pierre-Jean Texier <pierre-jean.texier@lafon.fr> >> --- >> recipes-lua/luafilesystem/luafilesystem_git.bb | 2 +- >> recipes-lua/luasocket/luasocket_git.bb | 2 +- >> recipes-support/rescuegui/rescuegui_git.bb | 2 +- >> recipes-support/swupdate/swupdate.inc | 2 +- >> 4 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/recipes-lua/luafilesystem/luafilesystem_git.bb >> b/recipes-lua/luafilesystem/luafilesystem_git.bb >> index dccce34..66792cc 100644 >> --- a/recipes-lua/luafilesystem/luafilesystem_git.bb >> +++ b/recipes-lua/luafilesystem/luafilesystem_git.bb >> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = >> "file://LICENSE;md5=d9b7e441d51a96b17511ee3be5a75857" >> DEPENDS = "lua" >> -SRC_URI = "git://github.com/keplerproject/luafilesystem;protocol=https \ >> +SRC_URI = >> "git://github.com/keplerproject/luafilesystem;protocol=https;branch=master >> \ > > Access is already via https. > >> file://0001-Fix-for-OE.patch" >> # Modify these as desired >> diff --git a/recipes-lua/luasocket/luasocket_git.bb >> b/recipes-lua/luasocket/luasocket_git.bb >> index 7d24450..c5325ff 100644 >> --- a/recipes-lua/luasocket/luasocket_git.bb >> +++ b/recipes-lua/luasocket/luasocket_git.bb >> @@ -5,7 +5,7 @@ DEPENDS = "lua" >> RDEPENDS:${PN} += "lua" >> -SRC_URI = "git://github.com/diegonehab/luasocket;protocol=https \ >> +SRC_URI = >> "git://github.com/diegonehab/luasocket;protocol=https;branch=master \ >> file://0001-fix-for-OE.patch \ >> " > > Ditto > >> diff --git a/recipes-support/rescuegui/rescuegui_git.bb >> b/recipes-support/rescuegui/rescuegui_git.bb >> index 5575a48..a6b3e9e 100644 >> --- a/recipes-support/rescuegui/rescuegui_git.bb >> +++ b/recipes-support/rescuegui/rescuegui_git.bb >> @@ -10,7 +10,7 @@ inherit update-rc.d >> DEPENDS += "swupdate lua luafilesystem" >> RDEPENDS:${PN} += "swupdate-tools swupdate-lua" >> -SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https \ >> +SRC_URI = >> "git://github.com/sbabic/SWUpdateGUI.git;protocol=https;branch=master \ >> file://rescuegui \ >> file://config.lua \ >> " > > Ditto > >> diff --git a/recipes-support/swupdate/swupdate.inc >> b/recipes-support/swupdate/swupdate.inc >> index c0d6c29..82911f9 100644 >> --- a/recipes-support/swupdate/swupdate.inc >> +++ b/recipes-support/swupdate/swupdate.inc >> @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = >> "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ >> inherit cml1 update-rc.d systemd pkgconfig >> -SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https \ >> +SRC_URI = >> "git://github.com/sbabic/swupdate.git;protocol=https;branch=master \ >> file://defconfig \ >> file://swupdate \ >> file://swupdate.sh \ >> > > The change is unrelated and just set the branch, but master is the > default branch for all these projects. So what is this patch supposed to > fix ? Agree, commit title/log is hazardous. I'll fix it in v2 ;) In fact, since commit [1] in oe-core, we have a warning when the branch parameter is not set (to avoid issues when switching default from master to main). See [2] as an example. Thanks, [1] - https://github.com/openembedded/bitbake/commit/86a9c26828479be55865bcce72bcc7e12b93caa7 [2] - https://github.com/openembedded/meta-openembedded/commit/b402a3076fbafe05d0b8621e50603b65c3fe8147
diff --git a/recipes-lua/luafilesystem/luafilesystem_git.bb b/recipes-lua/luafilesystem/luafilesystem_git.bb index dccce34..66792cc 100644 --- a/recipes-lua/luafilesystem/luafilesystem_git.bb +++ b/recipes-lua/luafilesystem/luafilesystem_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9b7e441d51a96b17511ee3be5a75857" DEPENDS = "lua" -SRC_URI = "git://github.com/keplerproject/luafilesystem;protocol=https \ +SRC_URI = "git://github.com/keplerproject/luafilesystem;protocol=https;branch=master \ file://0001-Fix-for-OE.patch" # Modify these as desired diff --git a/recipes-lua/luasocket/luasocket_git.bb b/recipes-lua/luasocket/luasocket_git.bb index 7d24450..c5325ff 100644 --- a/recipes-lua/luasocket/luasocket_git.bb +++ b/recipes-lua/luasocket/luasocket_git.bb @@ -5,7 +5,7 @@ DEPENDS = "lua" RDEPENDS:${PN} += "lua" -SRC_URI = "git://github.com/diegonehab/luasocket;protocol=https \ +SRC_URI = "git://github.com/diegonehab/luasocket;protocol=https;branch=master \ file://0001-fix-for-OE.patch \ " diff --git a/recipes-support/rescuegui/rescuegui_git.bb b/recipes-support/rescuegui/rescuegui_git.bb index 5575a48..a6b3e9e 100644 --- a/recipes-support/rescuegui/rescuegui_git.bb +++ b/recipes-support/rescuegui/rescuegui_git.bb @@ -10,7 +10,7 @@ inherit update-rc.d DEPENDS += "swupdate lua luafilesystem" RDEPENDS:${PN} += "swupdate-tools swupdate-lua" -SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https \ +SRC_URI = "git://github.com/sbabic/SWUpdateGUI.git;protocol=https;branch=master \ file://rescuegui \ file://config.lua \ " diff --git a/recipes-support/swupdate/swupdate.inc b/recipes-support/swupdate/swupdate.inc index c0d6c29..82911f9 100644 --- a/recipes-support/swupdate/swupdate.inc +++ b/recipes-support/swupdate/swupdate.inc @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ inherit cml1 update-rc.d systemd pkgconfig -SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https \ +SRC_URI = "git://github.com/sbabic/swupdate.git;protocol=https;branch=master \ file://defconfig \ file://swupdate \ file://swupdate.sh \