mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-04 16:10:04 +00:00
f59a7df3fe
Removing all the S = ${WORKDIR}/git assignments works because BB_GIT_DEFAULT_DESTSUFFIX
is set to match S from bitbake.conf (which itself is set to match typical tarball
releases).
A few recipes are setting S to a sub-directory of the git tree and need
to be adjusted accordingly.
bzip2 recipe is fetching a tarball and separately cloning tests;
adjust the recipe to put the latter into 'bzip2-tests', instead of 'git'.
devupstream.bbclass no longer needs to rewrite S, and is adjusted accordingly.
Adjust scripts/lib/recipetool/append.py to not hardcode 'git' as unpack
destination.
Adjust kernel-yocto.bbclass to use the git unpack variable instead
of hardcoding 'git' (there's also removal of repetition of
string constants and a correction of workdir/unpackdir mismatch in
one of the if-else branches).
Ensure build-appliance-image recipe does not use 'git' as checkout directory for
poky repo, but rather explicitly name it 'poky'.
Ensure reproducible.py code that looks for git repositories does not
hardcode 'git' but uses the destination set by BB_GIT_DEFAULT_DESTSUFFIX.
Ensure recipetool does not write out unneeded S settings into newly
created recipes that fetch from git.
Adjust selftest to not hardcode 'git' as unpack directory.
(From OE-Core rev: f80c07019ddadaf9c5fb890faabfda7920ecd15e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
2.0 KiB
Plaintext
56 lines
2.0 KiB
Plaintext
#
|
|
# Copyright OpenEmbedded Contributors
|
|
#
|
|
# SPDX-License-Identifier: MIT
|
|
#
|
|
|
|
# Class for use in BBCLASSEXTEND to make it easier to have a single recipe that
|
|
# can build both stable tarballs and snapshots from upstream source
|
|
# repositories.
|
|
#
|
|
# Usage:
|
|
# BBCLASSEXTEND = "devupstream:target"
|
|
# SRC_URI:class-devupstream = "git://git.example.com/example;branch=master"
|
|
# SRCREV:class-devupstream = "abcdef"
|
|
#
|
|
# There are a few caveats that remain to be solved:
|
|
# - You can't build native or nativesdk recipes using for example
|
|
# devupstream:native, you can only build target recipes.
|
|
# - If the fetcher requires native tools (such as subversion-native) then
|
|
# bitbake won't be able to add them automatically.
|
|
|
|
python devupstream_virtclass_handler () {
|
|
# Do nothing if this is inherited, as it's for BBCLASSEXTEND
|
|
if "devupstream" not in (d.getVar('BBCLASSEXTEND') or ""):
|
|
bb.error("Don't inherit devupstream, use BBCLASSEXTEND")
|
|
return
|
|
|
|
variant = d.getVar("BBEXTENDVARIANT")
|
|
if variant not in ("target", "native"):
|
|
bb.error("Unsupported variant %s. Pass the variant when using devupstream, for example devupstream:target" % variant)
|
|
return
|
|
|
|
# Develpment releases are never preferred by default
|
|
d.setVar("DEFAULT_PREFERENCE", "-1")
|
|
|
|
src_uri = d.getVar("SRC_URI:class-devupstream") or d.getVar("SRC_URI")
|
|
uri = bb.fetch2.URI(src_uri.split()[0])
|
|
|
|
# Modify the PV if the recipe hasn't already overridden it
|
|
pv = d.getVar("PV")
|
|
proto_marker = "+" + uri.scheme
|
|
if proto_marker not in pv and not d.getVar("PV:class-devupstream"):
|
|
d.setVar("PV", pv + proto_marker)
|
|
|
|
if variant == "native":
|
|
pn = d.getVar("PN")
|
|
d.setVar("PN", "%s-native" % (pn))
|
|
fn = d.getVar("FILE")
|
|
bb.parse.BBHandler.inherit("native", fn, 0, d)
|
|
|
|
d.appendVar("CLASSOVERRIDE", ":class-devupstream")
|
|
}
|
|
|
|
addhandler devupstream_virtclass_handler
|
|
devupstream_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise"
|