automatically depend .tar.xz SRC_URIs on xz-native
RFC PATCH 1/1 automatically depend .tar.xz SRC_URIs on xz-native
Hi,
The attached RFC would automatically depend do_unpack on xz-native to help people who do not have xz packaged for their buildhost ¹).
It contains extra work for situations where autoconf comes from an .xz compressed tarball: In these situations, we know that we can configure the xz-native tarball right away without autoreconf'ing.
I've successfully built micro-image for qemux86 after moving my host's xz out of the way and with the following packages in .tar.xz format:
m4, mpfr.
Comments?
TIA and cheers,
¹) Ideally we would see if xz (or any sanity.bbclass::required_utilities) is on the host and fallback to build the native variant otherwise. This may not be worth the effort though.
classes/autotools.bbclass +12 -5
@@ -1,8 +1,14 @@ # use autotools_stage_all for native packages AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" -def autotools_deps(d): - if bb.data.getVar('INHIBIT_AUTOTOOLS_DEPS', d, 1): +def autotools_deps(d, virtclass=None): + if virtclass: + virtclass_str = "_virtclass-%s" % (virtclass) + else: + virtclass_str = "" + if ((virtclass and bb.data.inherits_class(virtclass, d)) \ + or (virtclass is None)) \ + and bb.data.getVar('INHIBIT_AUTOTOOLS_DEPS' + virtclass_str, d, 1): return '' pn = bb.data.getVar('PN', d, 1)
@@ -17,7 +23,7 @@ def autotools_deps(d): if not bb.data.inherits_class('native', d) \ and not bb.data.inherits_class('cross', d) \ and not bb.data.inherits_class('sdk', d) \ - and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): + and not bb.data.getVar('INHIBIT_DEFAULT_DEPS' + virtclass_str, d, 1): deps += 'libtool-cross ' return deps + 'gnu-config-native '
@@ -25,8 +31,8 @@ def autotools_deps(d): EXTRA_OEMAKE = "" DEPENDS_prepend = "${@autotools_deps(d)}" -DEPENDS_virtclass-native_prepend = "${@autotools_deps(d)}" -DEPENDS_virtclass-nativesdk_prepend = "${@autotools_deps(d)}" +DEPENDS_virtclass-native_prepend = "${@autotools_deps(d, 'native')}" +DEPENDS_virtclass-nativesdk_prepend = "${@autotools_deps(d, 'nativesdk')}" inherit siteinfo
@@ -86,6 +92,7 @@ oe_runconf () { } autotools_do_configure() { + [ "x${INHIBIT_AUTORECONF}" = "x" ] && case ${PN} in autoconf*) ;;
classes/base.bbclass +14 -6
@@ -57,7 +57,11 @@ oe_runmake() { ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed" } -def base_deps(d): +def base_deps(d, virtclass=None): + if virtclass: + virtclass_str = "_virtclass-%s" % (virtclass) + else: + virtclass_str = "" # # Ideally this will check a flag so we will operate properly in # the case where host == build == target, for now we don't work in
@@ -71,7 +75,7 @@ def base_deps(d): # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. - if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): + if not bb.data.getVar('INHIBIT_DEFAULT_DEPS' + virtclass_str, d): if (bb.data.getVar('HOST_SYS', d, 1) != bb.data.getVar('BUILD_SYS', d, 1)): deps += " virtual/${TARGET_PREFIX}gcc virtual/libc "
@@ -84,8 +88,8 @@ def base_deps(d): return deps DEPENDS_prepend="${@base_deps(d)} " -DEPENDS_virtclass-native_prepend="${@base_deps(d)} " -DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d)} " +DEPENDS_virtclass-native_prepend="${@base_deps(d, 'native')} " +DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d, 'nativesdk')} " SCENEFUNCS += "base_scenefunction"
@@ -420,12 +424,16 @@ python () { # unzip-native should already be staged before unpacking ZIP recipes need_unzip = bb.data.getVar('NEED_UNZIP_FOR_UNPACK', d, 1) - src_uri = bb.data.getVar('SRC_URI', d, 1) - if ".zip" in src_uri or need_unzip == "1": + if ".zip" in srcuri or need_unzip == "1": depends = bb.data.getVarFlag('do_unpack', 'depends', d) or "" depends = depends + " unzip-native:do_populate_sysroot" bb.data.setVarFlag('do_unpack', 'depends', depends, d) + for ext in ['xz']: #['gzip', 'bzip2', 'xz']: + if '.' + ext in srcuri: + depends = bb.data.getVarFlag('do_unpack', 'depends', d) or "" + depends += ' ' + ext + '-native:do_populate_sysroot' + bb.data.setVarFlag('do_unpack', 'depends', depends, d) # 'multimachine' handling mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1)
classes/native.bbclass +2 -4
@@ -88,8 +88,7 @@ PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" PKG_CONFIG_SYSROOT_DIR = "" ORIG_DEPENDS := "${DEPENDS}" - -DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" +DEPENDS_virtclass-native ?= "${@base_conditional('INHIBIT_DEFAULT_DEPS_virtclass-native', '1', '', '${ORIG_DEPENDS}', d)}" python __anonymous () { # If we've a legacy native do_stage, we need to neuter do_install
@@ -111,7 +110,6 @@ python __anonymous () { if dep.endswith("-cross"): newdeps.append(dep.replace("-cross", "-native")) elif not dep.endswith("-native"): - newdeps.append(dep + "-native") else: newdeps.append(dep)
@@ -121,9 +119,9 @@ python __anonymous () { if prov.find(pn) != -1: continue if not prov.endswith("-native"): - provides = provides.replace(prov, prov + "-native") bb.data.setVar("PROVIDES", provides, d) bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-native", d) + bb.data.setVar("INHIBIT_AUTORECONF", bb.data.getVar("INHIBIT_AUTORECONF_virtclass-native", d, True), d) }
recipes/grep/grep_2.6.3.bb +0 -2
@@ -3,8 +3,6 @@ SECTION = "console/utils" DESCRIPTION = "grep GNU utility" PR = "r2" -do_unpack[depends] += "xz-native:do_populate_sysroot" - SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ file://uclibc-fix.patch"
recipes/xz/xz_4.999.9beta.bb +4 -1
@@ -1,5 +1,8 @@ +INHIBIT_AUTOTOOLS_DEPS_virtclass-native = "1" +INHIBIT_DEFAULT_DEPS_virtclass-native = "1" +INHIBIT_AUTORECONF_virtclass-native = "1" require xz.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz" SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"