poky: subtree update:488e39b623..c8075ed8f1
Alejandro Hernandez Samaniego (1):
bitbake: fetch2/wget: Avoid crashing when connection drops mid checkstatus
Alexander Kanavin (17):
webkit/wpe: only check even versions
syslinux: use NO_INLINE_FUNCS in CFLAGS
dosfstools: update 4.1 -> 4.2
e2fsprogs: update 1.45.7 -> 1.46.1
elfutils: update 0.182 -> 0.183
meson: update 0.56.2 -> 0.57.1
perl: update 5.32.0 -> 5.32.1
openssl: address ptest failures caused by perl 5.32.1
ptest-perl/run-ptest: address failures caused by perl 5.32.1
pango: update 1.48.0 -> 1.48.2
vulkan-samples: update to latest revision
webkitgtk: update 2.30.4 -> 2.30.5
libgcrypt: update 1.8.7 -> 1.9.2
pinentry: update 1.1.0 -> 1.1.1
libmd: add a recipe
libbsd: udpate 0.10.0 -> 0.11.3
scripts/lib/wic/partition.py: do not set FAT size
Charlie Davies (2):
bitbake: bitbake: providers: fix incorrect return type bug
bitbake: bitbake: providers: use pythonic empty list check
Colin Finck (1):
dosfstools: Build --without-iconv
Diego Santa Cruz (4):
packagegroup-base: use amixer instead of alsamixer
packagegroup-base: do not force hdparm and e2fsprogs
sysklogd: do not open any network sockets by default
createrepo-c: set path to magic database for native and nativesdk
Dorinda (7):
gdb-common.inc: add PACKAGECONFIG for debuginfod
meta/recipes-bsp: Add HOMEPAGE / DESCRIPTION
meta/recipes-connectivity: Add HOMEPAGE / DESCRIPTION
meta/recipes-devtools: Add HOMEPAGE / DESCRIPTION
meta/recipes-core: Add HOMEPAGE / DESCRIPTION
scripts/oe-debuginfod: script that fetches package manager directory
binutils: add PACKAGECONFIG for debuginfod
Florian Bezdeka (1):
wic: Warn if an ext filesystem affected by the Y2038 problem is used
He Zhe (1):
glibc: Disable CPU ISA level requirement check
Jan Brzezanski (1):
bitbake: Force parser shutdown after catching an exception
Jan-Simon Moeller (1):
Add core-image-weston to reproducible build tests
Jan-Simon Möller (2):
reproducible_builds: SOURCE_DATE_EPOCH should not be 0
oe-selftests: add rpm to reproducible build selftest
Jate Sujjavanich (1):
iputils: Fix cap_net_raw for installed binaries
Joel Stanley (1):
conf/machine-sdk: Add ppc64le SDK machine
Joshua Watt (2):
bitbake: event: Fix broken builds when multiconfig has a hyphen in the name
diffoscope: Add python3-rpm as dependency
Khem Raj (23):
nettle: Upgrade to 3.7.1
runqemu: Add new option to disable vga emulation
linuxloader: Deal with little-endian ppc64 ldso name
musl: Install /lib directory
goarch.bbclass: Fix ppc64le detection
bitbake.conf: Do not use lib64 for baselib on musl/ppc64
glibc: Build for power9 cpu when using powerpc64le tunes
tune-power9: Enable qemu-usermode
selftest: Replace building dep tool with direnv
goarch: Use softfloat instead of 387 for 386 goarch
go: Upgrade compiler to 1.16 major release
go: Enable CGO and pie buildmode on rv64
go-helloworld: Turn into a go module enabled build
binutils: Upgrade to 2.36.1 release
llvm: Upgrade to 11.1.0 release
oeqa/pam: Need shadow installed for the tests
glibc: Fix rawmemchr
rxvt-unicode: Do not use throw specifications
llvm: Fix build with c++17
dtc: Fix array-bounds error
puzzles: Fix stringop-overflow warning
igt-gpu-tools: Fix warnings with gcc 11
kea: Fix configure test error with gcc11
Klaus Heinrich Kiwi (1):
kernel-fitimage: Don't use unit addresses on FIT
Martin Jansa (3):
sstatesig.py: show an error instead of warning when sstate manifest isn't found
glib-2.0: replace THISDIR instead of COREBASE in find_meson_cross_files --cross-file paths
coreutils: use u-a for base32
Meh Mbeh Ida Delphine (7):
licenses: Update license file to match current SPDX names
recipes-gnome: Add missing HOMEPAGE and DESCRIPTION for recipes
recipes-graphics: Add missing HOMEPAGE and DESCRIPTION for recipes.
recipes-kernel: Add missing HOMEPAGE and DESCRIPTION for recipes.
recipes-multimedia: Add missing HOMEPAGE and DESCRIPTION for recipes.
recipes-sato: Add missing HOMEPAGE and DESCRIPTION for recipes
recipes-support: Add missing HOMEPAGE and DESCRIPTION for recipes
Michael Halstead (2):
releases: update to include 3.2.2
releases: update to include 3.1.6
Mike Crowe (2):
externalsrc: Pass through npmsw URIs in SRC_URI
gcc-sanitizers: Move content from gcclibdir into libdir
Milan Shah (1):
report-error.bbclass: Add layer and bitbake version info to error report
Mingli Yu (1):
python3: Fix python interpreter line length for nativesdk
Oleksandr Kravchuk (4):
python3: update to 3.9.2
ell: update to 0.38
net-tools: update to 2.10
busybox: update 1.33.0
Peter Kjellerstedt (1):
asciidoc: Switch to using the main branch
Randy MacLeod (3):
Add libgit2, libssh2 from meta-oe for rust
libssh2: pull in additional commits from meta-oe
libgit2: pull in updates from meta-oe
Richard Purdie (61):
maintainers: Update email address for Victor
figures/yp-how-it-works-new-diagram.png: Fix spelling error underline
recipes: Update common-licenses references to match new names
licenses.conf: Add missing 'or-later' mappings
licenses: Fix canonical license for 'or-later' handling
licenses: Update INCOMPATIBLE_LICENSE for 'or-later' handling
license_image: Don't canonicalise INCOMPATIBLE_LICENSE
selftest/incompatible_lic: Update the tests after the 'or-later' license handling changes
gma500-gfx-check: Update licence to match changes in OE-Core
diffoscope: Upgrade 166 -> 167
linux-firmware: upgrade 20201218 -> 20210208
python3-pycryptodome/pycryptodomex: upgrade 3.9.9 -> 3.10.1
apt: Upgrade 1.8.2.1 -> 1.8.2.2
python3-magic: upgrade 0.4.18 -> 0.4.20
libproxy: Avoid /etc/sysconfig determinism issue
rsync: Fix a file sorting determinism issue
rsync: Fix group name determinism issue
libcap-ng: Fix python bindings determinism issue
libcap-ng: Replace python patch with a better fix
libevdev: Update patch status to backport
ca-certificates: Clean up two patches and submit upstream
libpcre: Drop old/stale patch
diffoscope: Ensure the correct magic file is used
babeltrace2: Fix reproducibility
reproducible: Improve SOURCE_DATE_EPOCH_FALLBACK handling
selftest/reproducible: Remove exclusions for recipes which now reproduce
diffoscope: Ensure rpm is configured correctly
package/package_rpm: Disable font_provides configuration for reproducibilty
fonts: Bump HASHEQUIV_HASH_VERSION after rpmdeps change
reproduce: Fix exclusion list for rpm
maintainers: add entries libssh2 libgit2
cups: Fix reproducibility issues
gcr: Fix reproducibility issue
rsync: Update patch status
gtk-doc: Fix reproducibility issue
epiphany: Fix reproducibility issue
epiphany: Fix distributor contamination from /etc/os-release
gst-devtools: Fix reproducibility issue
parted: Fix reproducibility issue
libsecret: Improve determimism
libhandy: Fix reproducibility issue
selftest/reproducible: Don't call sync between each file compare
image: Add directories to PSEUDO_IGNORE_PATHS
populate_sdk: Add directories to PSEUDO_IGNORE_PATHS
bitbake.conf/image: Move image specific PSEUDO_IGNORE_PATHS to image class
bitbake.conf: Split PSEUDO_IGNORE_PATHS to be more readable
bootchart2: Fix manpage reproducibility issue
igt-gpu-tools: Fix reproducibility issue
libid3tag: Fix reproducibility issue
apr-util: Fix CFLAGS used in build
gstreamer1.0-python: Set internal python library path correcty
diffoscope: Upgrade 167 -> 168
syslinux: Fix reproducibility issues
swig: Fix reproducibility issue
efivar: Fix reproducibility issue
systemd-bootchart: Disable LTO to fix reproducibility
selftest/reproducible: Add ability to pull some objects from sstate
qemu: Determinism fixes
lttng: Fix reproducibility issues
ltp: Fixing determinism issues
python3-cython: Remove build paths from debug sources
Ross Burton (1):
grub: shuffle packaging for aarch64 builds
Scott Murray (1):
screen: fix CVE-2021-26937
Stefan Ghinea (2):
wpa-supplicant: fix CVE-2021-0326
cups: fix CVE-2020-10001
Tomasz Dziendzielski (1):
bitbake.conf: Introduce FAKEROOTLOGS variable used by bitbake to print pseudo.log
Vivien Didelot (1):
systemd: Fix importd requirements comment
Wang Mingyu (12):
util-linux: upgrade 2.36.1 -> 2.36.2
xkeyboard-config: upgrade 2.31 -> 2.32
liburcu: upgrade 0.12.1 -> 0.12.2
lttng-ust: upgrade 2.12.0 -> 2.12.1
openssl: upgrade 1.1.1i -> 1.1.1j
bluez5: upgrade 5.55 -> 5.56
libxcrypt: upgrade 4.4.17 -> 4.4.18
nfs-utils: upgrade 2.5.2 -> 2.5.3
ccache: upgrade 4.1 -> 4.2
eudev: upgrade 3.2.9 -> 3.2.10
glslang: upgrade 11.1.0 -> 11.2.0
iproute2: upgrade 5.10.0 -> 5.11.0
Yi Fan Yu (3):
libnl: add ptest support
gdb: Remove "ALLOW_EMPTY_gdbserver" on riscv
valgrind: Increase timeout duration 30 -> 90 s
zhengruoqin (8):
glibc-package.inc: Fix arm multlib header issue with struct_stat.h
glibc: Unify wordsize.h with arm multilibs
libxcrypt-compat: upgrade 4.4.17 -> 4.4.18
log4cplus: upgrade 2.0.5 -> 2.0.6
python3-cython: upgrade 0.29.21 -> 0.29.22
python3-git: upgrade 3.1.13 -> 3.1.14
sysvinit: upgrade 2.98 -> 2.99
python3-magic: upgrade 0.4.20 -> 0.4.22
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I69b5102d327da636a9c36642b46841e4341368d8
diff --git a/poky/meta/classes/devicetree.bbclass b/poky/meta/classes/devicetree.bbclass
index c772ab2..ece883a 100644
--- a/poky/meta/classes/devicetree.bbclass
+++ b/poky/meta/classes/devicetree.bbclass
@@ -18,7 +18,7 @@
# device trees built with them are at least GPLv2 (and in some cases dual
# licensed). Default to GPLv2 if the recipe does not specify a license.
LICENSE ?= "GPLv2"
-LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "dtc-native"
diff --git a/poky/meta/classes/externalsrc.bbclass b/poky/meta/classes/externalsrc.bbclass
index 64e94e3..c7b2bf2 100644
--- a/poky/meta/classes/externalsrc.bbclass
+++ b/poky/meta/classes/externalsrc.bbclass
@@ -68,6 +68,7 @@
url_data = fetch.ud[url]
parm = url_data.parm
if (url_data.type == 'file' or
+ url_data.type == 'npmsw' or
'type' in parm and parm['type'] == 'kmeta'):
local_srcuri.append(url)
diff --git a/poky/meta/classes/go.bbclass b/poky/meta/classes/go.bbclass
index fa14789..77ec98d 100644
--- a/poky/meta/classes/go.bbclass
+++ b/poky/meta/classes/go.bbclass
@@ -54,7 +54,6 @@
export GOTOOLDIR
export CGO_ENABLED ?= "1"
-export CGO_ENABLED_riscv64 = "0"
export CGO_CFLAGS ?= "${CFLAGS}"
export CGO_CPPFLAGS ?= "${CPPFLAGS}"
export CGO_CXXFLAGS ?= "${CXXFLAGS}"
@@ -147,10 +146,10 @@
INSANE_SKIP_${PN} += "ldflags"
# Add -buildmode=pie to GOBUILDFLAGS to satisfy "textrel" QA checking, but mips
-# doesn't support -buildmode=pie, so skip the QA checking for mips and its
+# doesn't support -buildmode=pie, so skip the QA checking for mips/rv32 and its
# variants.
python() {
- if 'mips' in d.getVar('TARGET_ARCH') or 'riscv' in d.getVar('TARGET_ARCH'):
+ if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'):
d.appendVar('INSANE_SKIP_%s' % d.getVar('PN'), " textrel")
else:
d.appendVar('GOBUILDFLAGS', ' -buildmode=pie')
diff --git a/poky/meta/classes/goarch.bbclass b/poky/meta/classes/goarch.bbclass
index 1099b95..e4e0ca3 100644
--- a/poky/meta/classes/goarch.bbclass
+++ b/poky/meta/classes/goarch.bbclass
@@ -47,7 +47,6 @@
COMPATIBLE_HOST_linux-muslx32 = "null"
COMPATIBLE_HOST_powerpc = "null"
COMPATIBLE_HOST_powerpc64 = "null"
-COMPATIBLE_HOST_powerpc64le = "null"
COMPATIBLE_HOST_mipsarchn32 = "null"
ARM_INSTRUCTION_SET_armv4 = "arm"
@@ -79,10 +78,10 @@
return 'mips'
elif a == 'mipsel':
return 'mipsle'
+ elif re.match('p(pc|owerpc)(64le)', a):
+ return 'ppc64le'
elif re.match('p(pc|owerpc)(64)', a):
return 'ppc64'
- elif re.match('p(pc|owerpc)(64el)', a):
- return 'ppc64le'
elif a == 'riscv64':
return 'riscv64'
else:
@@ -99,7 +98,7 @@
if ('core2' in f) or ('corei7' in f):
return 'sse2'
else:
- return '387'
+ return 'softfloat'
return ''
def go_map_mips(a, f, d):
@@ -115,5 +114,3 @@
if o.startswith('linux'):
return 'linux'
return o
-
-
diff --git a/poky/meta/classes/image.bbclass b/poky/meta/classes/image.bbclass
index cda866c..41fc329 100644
--- a/poky/meta/classes/image.bbclass
+++ b/poky/meta/classes/image.bbclass
@@ -180,6 +180,8 @@
# aren't yet available.
PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"
+PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/intercept_scripts,${WORKDIR}/oe-rootfs-repo,${WORKDIR}/sstate-build-image_complete"
+
PACKAGE_EXCLUDE ??= ""
PACKAGE_EXCLUDE[type] = "list"
diff --git a/poky/meta/classes/kernel-fitimage.bbclass b/poky/meta/classes/kernel-fitimage.bbclass
index 2414870..f5082c9 100644
--- a/poky/meta/classes/kernel-fitimage.bbclass
+++ b/poky/meta/classes/kernel-fitimage.bbclass
@@ -161,7 +161,7 @@
fi
cat << EOF >> ${1}
- kernel@${2} {
+ kernel-${2} {
description = "Linux kernel";
data = /incbin/("${3}");
type = "kernel";
@@ -170,7 +170,7 @@
compression = "${4}";
load = <${UBOOT_LOADADDRESS}>;
entry = <${ENTRYPOINT}>;
- hash@1 {
+ hash-1 {
algo = "${kernel_csum}";
};
};
@@ -179,7 +179,7 @@
if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${kernel_sign_keyname}" ] ; then
sed -i '$ d' ${1}
cat << EOF >> ${1}
- signature@1 {
+ signature-1 {
algo = "${kernel_csum},${kernel_sign_algo}";
key-name-hint = "${kernel_sign_keyname}";
};
@@ -210,14 +210,14 @@
dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;"
fi
cat << EOF >> ${1}
- fdt@${2} {
+ fdt-${2} {
description = "Flattened Device Tree blob";
data = /incbin/("${3}");
type = "flat_dt";
arch = "${UBOOT_ARCH}";
compression = "none";
${dtb_loadline}
- hash@1 {
+ hash-1 {
algo = "${dtb_csum}";
};
};
@@ -226,7 +226,7 @@
if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${dtb_sign_keyname}" ] ; then
sed -i '$ d' ${1}
cat << EOF >> ${1}
- signature@1 {
+ signature-1 {
algo = "${dtb_csum},${dtb_sign_algo}";
key-name-hint = "${dtb_sign_keyname}";
};
@@ -283,7 +283,7 @@
setup_csum="${FIT_HASH_ALG}"
cat << EOF >> ${1}
- setup@${2} {
+ setup-${2} {
description = "Linux setup.bin";
data = /incbin/("${3}");
type = "x86_setup";
@@ -292,7 +292,7 @@
compression = "none";
load = <0x00090000>;
entry = <0x00090000>;
- hash@1 {
+ hash-1 {
algo = "${setup_csum}";
};
};
@@ -321,7 +321,7 @@
fi
cat << EOF >> ${1}
- ramdisk@${2} {
+ ramdisk-${2} {
description = "${INITRAMFS_IMAGE}";
data = /incbin/("${3}");
type = "ramdisk";
@@ -330,7 +330,7 @@
compression = "none";
${ramdisk_loadline}
${ramdisk_entryline}
- hash@1 {
+ hash-1 {
algo = "${ramdisk_csum}";
};
};
@@ -339,7 +339,7 @@
if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${ramdisk_sign_keyname}" ] ; then
sed -i '$ d' ${1}
cat << EOF >> ${1}
- signature@1 {
+ signature-1 {
algo = "${ramdisk_csum},${ramdisk_sign_algo}";
key-name-hint = "${ramdisk_sign_keyname}";
};
@@ -377,7 +377,7 @@
# Test if we have any DTBs at all
sep=""
conf_desc=""
- conf_node="conf@"
+ conf_node="conf-"
kernel_line=""
fdt_line=""
ramdisk_line=""
@@ -396,19 +396,19 @@
if [ -n "${kernel_id}" ]; then
conf_desc="Linux kernel"
sep=", "
- kernel_line="kernel = \"kernel@${kernel_id}\";"
+ kernel_line="kernel = \"kernel-${kernel_id}\";"
fi
if [ -n "${dtb_image}" ]; then
conf_desc="${conf_desc}${sep}FDT blob"
sep=", "
- fdt_line="fdt = \"fdt@${dtb_image}\";"
+ fdt_line="fdt = \"fdt-${dtb_image}\";"
fi
if [ -n "${ramdisk_id}" ]; then
conf_desc="${conf_desc}${sep}ramdisk"
sep=", "
- ramdisk_line="ramdisk = \"ramdisk@${ramdisk_id}\";"
+ ramdisk_line="ramdisk = \"ramdisk-${ramdisk_id}\";"
fi
if [ -n "${bootscr_id}" ]; then
@@ -419,16 +419,16 @@
if [ -n "${config_id}" ]; then
conf_desc="${conf_desc}${sep}setup"
- setup_line="setup = \"setup@${config_id}\";"
+ setup_line="setup = \"setup-${config_id}\";"
fi
if [ "${default_flag}" = "1" ]; then
# default node is selected based on dtb ID if it is present,
# otherwise its selected based on kernel ID
if [ -n "${dtb_image}" ]; then
- default_line="default = \"conf@${dtb_image}\";"
+ default_line="default = \"conf-${dtb_image}\";"
else
- default_line="default = \"conf@${kernel_id}\";"
+ default_line="default = \"conf-${kernel_id}\";"
fi
fi
@@ -441,7 +441,7 @@
${ramdisk_line}
${bootscr_line}
${setup_line}
- hash@1 {
+ hash-1 {
algo = "${conf_csum}";
};
EOF
@@ -478,7 +478,7 @@
sign_line="${sign_line};"
cat << EOF >> ${its_file}
- signature@1 {
+ signature-1 {
algo = "${conf_csum},${conf_sign_algo}";
key-name-hint = "${conf_sign_keyname}";
${sign_line}
diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass
index dc91118..bcea0b3 100644
--- a/poky/meta/classes/license.bbclass
+++ b/poky/meta/classes/license.bbclass
@@ -252,16 +252,9 @@
def canonical_license(d, license):
"""
Return the canonical (SPDX) form of the license if available (so GPLv3
- becomes GPL-3.0), for the license named 'X+', return canonical form of
- 'X' if available and the tailing '+' (so GPLv3+ becomes GPL-3.0+),
- or the passed license if there is no canonical form.
+ becomes GPL-3.0) or the passed license if there is no canonical form.
"""
- lic = d.getVarFlag('SPDXLICENSEMAP', license) or ""
- if not lic and license.endswith('+'):
- lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'))
- if lic:
- lic += '+'
- return lic or license
+ return d.getVarFlag('SPDXLICENSEMAP', license) or license
def available_licenses(d):
"""
@@ -288,6 +281,12 @@
wildcards from SPDXLICENSEMAP flags and AVAILABLE_LICENSES.
"""
import fnmatch
+
+ # Assume if we're passed "GPLv3" or "*GPLv3" it means -or-later as well
+ for lic in wildcard_licenses[:]:
+ if not lic.endswith(("-or-later", "-only", "*")):
+ wildcard_licenses.append(lic + "+")
+
licenses = wildcard_licenses[:]
spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys()
for wld_lic in wildcard_licenses:
diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass
index 36ddd84..c96b032 100644
--- a/poky/meta/classes/license_image.bbclass
+++ b/poky/meta/classes/license_image.bbclass
@@ -40,7 +40,6 @@
import stat
bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split()
- bad_licenses = [canonical_license(d, l) for l in bad_licenses]
bad_licenses = expand_wildcard_licenses(d, bad_licenses)
whitelist = []
diff --git a/poky/meta/classes/linuxloader.bbclass b/poky/meta/classes/linuxloader.bbclass
index b161c51..30925ac 100644
--- a/poky/meta/classes/linuxloader.bbclass
+++ b/poky/meta/classes/linuxloader.bbclass
@@ -9,8 +9,8 @@
ldso_arch = "mips${ABIEXTENSION}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}"
elif targetarch == "powerpc":
ldso_arch = "powerpc${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}"
- elif targetarch == "powerpc64":
- ldso_arch = "powerpc64"
+ elif targetarch.startswith("powerpc64"):
+ ldso_arch = "powerpc64${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'le', d)}"
elif targetarch == "x86_64":
ldso_arch = "x86_64"
elif re.search("i.86", targetarch):
diff --git a/poky/meta/classes/meson.bbclass b/poky/meta/classes/meson.bbclass
index 83aa854..a7644e7 100644
--- a/poky/meta/classes/meson.bbclass
+++ b/poky/meta/classes/meson.bbclass
@@ -99,6 +99,8 @@
pkgconfig = 'pkg-config'
llvm-config = 'llvm-config${LLVMVERSION}'
cups-config = 'cups-config'
+g-ir-scanner = '${STAGING_BINDIR}/g-ir-scanner-wrapper'
+g-ir-compiler = '${STAGING_BINDIR}/g-ir-compiler-wrapper'
[properties]
needs_exe_wrapper = true
diff --git a/poky/meta/classes/package.bbclass b/poky/meta/classes/package.bbclass
index 417e225..e3f0a70 100644
--- a/poky/meta/classes/package.bbclass
+++ b/poky/meta/classes/package.bbclass
@@ -1710,7 +1710,7 @@
fi
}
-RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps"
+RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provides %{nil}'"
# Collect perfile run-time dependency metadata
# Output:
diff --git a/poky/meta/classes/package_rpm.bbclass b/poky/meta/classes/package_rpm.bbclass
index c182430..84a9a6d 100644
--- a/poky/meta/classes/package_rpm.bbclass
+++ b/poky/meta/classes/package_rpm.bbclass
@@ -689,6 +689,7 @@
cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
cmd = cmd + " --define '_buildhost reproducible'"
+ cmd = cmd + " --define '__font_provides %{nil}'"
if perfiledeps:
cmd = cmd + " --define '__find_requires " + outdepends + "'"
cmd = cmd + " --define '__find_provides " + outprovides + "'"
diff --git a/poky/meta/classes/populate_sdk_base.bbclass b/poky/meta/classes/populate_sdk_base.bbclass
index 4db0511..c8a7084 100644
--- a/poky/meta/classes/populate_sdk_base.bbclass
+++ b/poky/meta/classes/populate_sdk_base.bbclass
@@ -178,7 +178,7 @@
do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}"
do_populate_sdk[stamp-extra-info] = "${MACHINE_ARCH}${SDKMACHINE}"
-PSEUDO_IGNORE_PATHS .= ",${SDKDEPLOYDIR}"
+PSEUDO_IGNORE_PATHS .= ",${SDKDEPLOYDIR},${WORKDIR}/oe-sdk-repo,${WORKDIR}/sstate-build-populate_sdk"
fakeroot create_sdk_files() {
cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/
diff --git a/poky/meta/classes/report-error.bbclass b/poky/meta/classes/report-error.bbclass
index 1a12db1..9cb6b0b 100644
--- a/poky/meta/classes/report-error.bbclass
+++ b/poky/meta/classes/report-error.bbclass
@@ -6,6 +6,8 @@
#
# Licensed under the MIT license, see COPYING.MIT for details
+inherit base
+
ERR_REPORT_DIR ?= "${LOG_DIR}/error-report"
def errorreport_getdata(e):
@@ -64,6 +66,8 @@
data['failures'] = []
data['component'] = " ".join(e.getPkgs())
data['branch_commit'] = str(base_detect_branch(e.data)) + ": " + str(base_detect_revision(e.data))
+ data['bitbake_version'] = e.data.getVar("BB_VERSION")
+ data['layer_version'] = get_layers_branch_rev(e.data)
data['local_conf'] = get_conf_data(e, 'local.conf')
data['auto_conf'] = get_conf_data(e, 'auto.conf')
lock = bb.utils.lockfile(datafile + '.lock')
diff --git a/poky/meta/classes/reproducible_build.bbclass b/poky/meta/classes/reproducible_build.bbclass
index 2f3bd90..f06e00d 100644
--- a/poky/meta/classes/reproducible_build.bbclass
+++ b/poky/meta/classes/reproducible_build.bbclass
@@ -37,10 +37,13 @@
BUILD_REPRODUCIBLE_BINARIES ??= '1'
inherit ${@oe.utils.ifelse(d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1', 'reproducible_build_simple', '')}
-SDE_DIR ="${WORKDIR}/source-date-epoch"
+SDE_DIR = "${WORKDIR}/source-date-epoch"
SDE_FILE = "${SDE_DIR}/__source_date_epoch.txt"
SDE_DEPLOYDIR = "${WORKDIR}/deploy-source-date-epoch"
+# A SOURCE_DATE_EPOCH of '0' might be misinterpreted as no SDE
+export SOURCE_DATE_EPOCH_FALLBACK ??= "1302044400"
+
SSTATETASKS += "do_deploy_source_date_epoch"
do_deploy_source_date_epoch () {
@@ -93,15 +96,19 @@
return cached
epochfile = d.getVar('SDE_FILE')
- source_date_epoch = 0
+ source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
if os.path.isfile(epochfile):
with open(epochfile, 'r') as f:
s = f.read()
try:
source_date_epoch = int(s)
+ # workaround for old sstate with SDE_FILE content being 0 - use SOURCE_DATE_EPOCH_FALLBACK
+ if source_date_epoch == 0 :
+ source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
+ bb.warn("SOURCE_DATE_EPOCH value from sstate '%s' is deprecated/invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK '%s'" % (s, source_date_epoch))
except ValueError:
- bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to 0" % s)
- source_date_epoch = 0
+ bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK" % s)
+ source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK'))
bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch)
else:
bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch))