Siteinfo improvements
PATCH 1/1 Siteinfo improvements
- Do the sanity checks for missing site information at ConfigParsed time
- This required making the siteinfo bbclass come in automatically via base.bbclass again. I could have done the check at RecipeParsed time instead, but I think this makes more sense.
- Also sets SITEINFO_ENDIANNESS and SITEINFO_BITS at config parsed time
- Don't supply site files for native
- Split up the site information, so we don't need to add every single combination of os and architecture to the siteinfo.bbclass
- Fix 'endianess' typo in the variablename, but keeping the old one around for compatibility reasons
- Instead of specifically looking for '${FILE_DIRNAME}/site-${PV}/<sitefile>', leverage FILESPATH. Now it searches the paths in both BBPATH and FILESPATH for "site/<sitefile>".
Signed-off-by Chris Larson <[email protected]>
classes/autotools.bbclass +1 -3
@@ -28,11 +28,9 @@ DEPENDS_prepend = "${@autotools_dep_prepend(d)}" DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}" DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}" -inherit siteinfo - # Space separated list of shell scripts with variables defined to supply test # results for autoconf tests we cannot run at build time. -export CONFIG_SITE = "${@siteinfo_get_files(d)}" +export CONFIG_SITE = "${@' '.join(siteinfo_get_files(d))}" acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint"
classes/base.bbclass +1 -0
@@ -1,5 +1,6 @@ BB_DEFAULT_TASK ?= "build" +inherit siteinfo inherit patch inherit staging
classes/siteinfo.bbclass +91 -109
212 lines not on this page · raw message
recipes/apex/apex-nslu2-16mb_1.5.14.bb +0 -2
@@ -5,8 +5,6 @@ HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" PR = "r3" -inherit siteinfo - SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://defconfig" S = ${WORKDIR}/apex-${PV}
recipes/apex/apex-nslu2_1.5.14.bb +0 -2
@@ -5,8 +5,6 @@ HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" PR = "r3" -inherit siteinfo - SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://defconfig" S = ${WORKDIR}/apex-${PV}
recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb +0 -2
@@ -18,8 +18,6 @@ SRC_URI[sha256sum] = "20fc8f095b2d6894e5fd8156c870686aced5edee964b0dd7163163327a S = ${WORKDIR}/arm-kernel-shim-${PV} -inherit siteinfo - CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc"
recipes/espeak/espeak_1.37.bb +0 -1
@@ -1,5 +1,4 @@ require espeak.inc -inherit siteinfo EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be", "espeak-data (= ${PV})", "", d)}' RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
recipes/hping/hping2_1.9.9+2.0.0rc3.bb +0 -2
@@ -14,8 +14,6 @@ SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \ file://hping2_configure.patch" S = "${WORKDIR}/hping2-rc3" -inherit siteinfo - # # We've patched configure to accept byte order and ostype as env # variables Pass those values in to stop it trying to figure it out
recipes/openssl/openssl.inc +0 -2
@@ -6,8 +6,6 @@ SECTION = "libs/network" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz;name=src" S = "${WORKDIR}/openssl-${PV}" -inherit siteinfo - INC_PR = "r12" AR_append = " r"
recipes/openttd/openttd.inc +1 -1
@@ -13,7 +13,7 @@ SRC_URI = "http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2" APPIMAGE = "media/openttd.48.png" -inherit siteinfo sdl +inherit sdl do_configure() { # The way the OTTD configure system handles the application's directories
recipes/openttd/openttd_0.7.4.bb +1 -1
@@ -5,7 +5,7 @@ DEPENDS = "libsdl-net libpng zlib freetype fontconfig" RRECOMMENDS_${PN} = "openttd-gfx openttd-sfx" PR = "r1" -inherit siteinfo sdl +inherit sdl SRC_URI ="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2 " SRC_URI_append_shr = " file://openttd.cfg"
recipes/perl/perl_5.8.8.bb +0 -2
@@ -41,8 +41,6 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/5.0/perl-5.8.8.tar.gz;name=perl588ta file://config.sh-64-le \ file://config.sh-64-be" -inherit siteinfo - # Where to find the native perl HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}"
recipes/qt4/qt4_arch.inc +0 -2
@@ -1,5 +1,3 @@ -inherit siteinfo - ARM_INSTRUCTION_SET = "arm" def qt_arch(d):
Signature · 1 line
1.7.0.4