| Message ID | 46758adea9ab24c5624eb1953ba8ca5143036e5e.1726065189.git.liezhi.yang@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/2] classes: Print bitbake branch and revision | expand |
> -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Robert Yang via lists.openembedded.org > Sent: den 11 september 2024 16:36 > To: openembedded-core@lists.openembedded.org > Cc: alex.kanavin@gmail.com > Subject: [OE-core] [PATCH v3 2/2] lib/buildcfg: Add is_bitbake_in_separate_repo() > > From: Robert Yang <liezhi.yang@windriver.com> > > This would help various tooling that is being developed for setting up layers > and builds, or creating configurations for those tasks out of pre-existing > yocto setups. > > Suggested-by: Alexander Kanavin <alex.kanavin@gmail.com> > Signed-off-by: Robert Yang <liezhi.yang@windriver.com> > --- > meta/lib/oe/buildcfg.py | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py > index dab4aa7831..9256b327ed 100644 > --- a/meta/lib/oe/buildcfg.py > +++ b/meta/lib/oe/buildcfg.py > @@ -71,6 +71,16 @@ def is_layer_modified(path): > # output and a 129 return code when a layer isn't a git repo at all. > return " -- modified" > > +def is_bitbake_in_separate_repo(bitbake_dir): > + """ > + Check whether bitbake is in a separate git repo > + """ > + bitbake_git_dir = os.path.join(bitbake_dir, '.git') > + if os.path.exists(bitbake_git_dir): > + return True > + else: > + return False That if-statement can be simplified to: return os.path.exists(bitbake_git_dir) > + > def get_branch_rev3(revisions): > # Return 3 items for each revision > return ["%-20s = \"%s:%s\"" % (r[1], r[2], r[3]) for r in revisions] > -- > 2.44.1 //Peter
On 9/12/24 13:13, Peter Kjellerstedt wrote: >> -----Original Message----- >> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Robert Yang via lists.openembedded.org >> Sent: den 11 september 2024 16:36 >> To: openembedded-core@lists.openembedded.org >> Cc: alex.kanavin@gmail.com >> Subject: [OE-core] [PATCH v3 2/2] lib/buildcfg: Add is_bitbake_in_separate_repo() >> >> From: Robert Yang <liezhi.yang@windriver.com> >> >> This would help various tooling that is being developed for setting up layers >> and builds, or creating configurations for those tasks out of pre-existing >> yocto setups. >> >> Suggested-by: Alexander Kanavin <alex.kanavin@gmail.com> >> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> >> --- >> meta/lib/oe/buildcfg.py | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py >> index dab4aa7831..9256b327ed 100644 >> --- a/meta/lib/oe/buildcfg.py >> +++ b/meta/lib/oe/buildcfg.py >> @@ -71,6 +71,16 @@ def is_layer_modified(path): >> # output and a 129 return code when a layer isn't a git repo at all. >> return " -- modified" >> >> +def is_bitbake_in_separate_repo(bitbake_dir): >> + """ >> + Check whether bitbake is in a separate git repo >> + """ >> + bitbake_git_dir = os.path.join(bitbake_dir, '.git') >> + if os.path.exists(bitbake_git_dir): >> + return True >> + else: >> + return False > > That if-statement can be simplified to: > > return os.path.exists(bitbake_git_dir) Thanks, updated in the pull request: https://github.com/robertlinux/yocto rbt/bbrev https://github.com/robertlinux/yocto/tree/rbt/bbrev // Robert > >> + >> def get_branch_rev3(revisions): >> # Return 3 items for each revision >> return ["%-20s = \"%s:%s\"" % (r[1], r[2], r[3]) for r in revisions] >> -- >> 2.44.1 > > //Peter >
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py index dab4aa7831..9256b327ed 100644 --- a/meta/lib/oe/buildcfg.py +++ b/meta/lib/oe/buildcfg.py @@ -71,6 +71,16 @@ def is_layer_modified(path): # output and a 129 return code when a layer isn't a git repo at all. return " -- modified" +def is_bitbake_in_separate_repo(bitbake_dir): + """ + Check whether bitbake is in a separate git repo + """ + bitbake_git_dir = os.path.join(bitbake_dir, '.git') + if os.path.exists(bitbake_git_dir): + return True + else: + return False + def get_branch_rev3(revisions): # Return 3 items for each revision return ["%-20s = \"%s:%s\"" % (r[1], r[2], r[3]) for r in revisions]